Skip to content

Commit

Permalink
Update move animations, round 12.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@SaintCoke
SaintCoke committed Aug 10, 2016
1 parent 4de3e3b commit bba7941
Show file tree
Hide file tree
Showing 2 changed files with 318 additions and 6 deletions.
322 changes: 316 additions & 6 deletions data/graphics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1531,6 +1531,156 @@ var BattleOtherAnims = {
}, 'ballistic2Under', 'fade');
}
},
bidecharge: {
anim: function (battle, args) {
var attacker = args[0];

battle.showEffect('wisp', {
x: attacker.x + 30,
y: attacker.y,
z: attacker.z,
scale: 1,
opacity: 1,
time: 0
}, {
y: attacker.y + 60,
opacity: 0.2,
time: 400
}, 'linear', 'fade');
battle.showEffect('wisp', {
x: attacker.x - 30,
y: attacker.y,
z: attacker.z,
scale: 1,
opacity: 1,
time: 100
}, {
y: attacker.y + 60,
opacity: 0.2,
time: 500
}, 'linear', 'fade');
battle.showEffect('wisp', {
x: attacker.x + 15,
y: attacker.y,
z: attacker.z,
scale: 1,
opacity: 1,
time: 200
}, {
y: attacker.y + 60,
opacity: 0.2,
time: 600
}, 'linear', 'fade');
battle.showEffect('wisp', {
x: attacker.x - 15,
y: attacker.y,
z: attacker.z,
scale: 1,
opacity: 1,
time: 300
}, {
y: attacker.y + 60,
opacity: 0.2,
time: 700
}, 'linear', 'fade');

attacker.anim({
x: attacker.x - 5,
yscale: 0.9,
time: 75
}, 'swing');
attacker.anim({
x: attacker.x + 5,
yscale: 0.9,
time: 75
}, 'swing');
attacker.anim({
x: attacker.x - 5,
yscale: 0.9,
time: 75
}, 'swing');
attacker.anim({
x: attacker.x + 5,
yscale: 0.9,
time: 75
}, 'swing');
attacker.anim({
x: attacker.x - 5,
yscale: 0.9,
time: 75
}, 'swing');
attacker.anim({
time: 100
}, 'accel');
}
},
bideunleash: {
anim: function (battle, args) {
var attacker = args[0];

battle.showEffect('fireball', {
x: attacker.x + 40,
y: attacker.y,
z: attacker.z,
scale: 0,
opacity: 0.6
}, {
scale: 6,
opacity: 0
}, 'linear');
battle.showEffect('fireball', {
x: attacker.x - 40,
y: attacker.y - 20,
z: attacker.z,
scale: 0,
opacity: 0.6,
time: 150
}, {
scale: 6,
opacity: 0
}, 'linear');
battle.showEffect('fireball', {
x: attacker.x + 10,
y: attacker.y + 20,
z: attacker.z,
scale: 0,
opacity: 0.6,
time: 300
}, {
scale: 6,
opacity: 0
}, 'linear');

attacker.anim({
x: attacker.x - 30,
time: 75
});
attacker.anim({
x: attacker.x + 30,
time: 100
});
attacker.anim({
x: attacker.x - 30,
time: 100
});
attacker.anim({
x: attacker.x + 30,
time: 100
});
attacker.anim({
x: attacker.x - 30,
time: 100
});
attacker.anim({
x: attacker.x + 30,
time: 100
});
attacker.anim({
x: attacker.x,
time: 100
});
}
},
primalalpha: {
anim: function (battle, args) {
var attacker = args[0];
Expand Down Expand Up @@ -2691,6 +2841,9 @@ var BattleMoveAnims = {
odorsleuth: {
anim: BattleOtherAnims.dance.anim
},
celebrate: {
anim: BattleOtherAnims.dance.anim
},
playnice: {
anim: BattleOtherAnims.dance.anim
},
Expand Down Expand Up @@ -3865,7 +4018,7 @@ var BattleMoveAnims = {
anim: BattleOtherAnims.selfstatus.anim
},
bide: {
anim: BattleOtherAnims.selfstatus.anim
anim: BattleOtherAnims.bidecharge.anim
},
focusenergy: {
anim: BattleOtherAnims.selfstatus.anim
Expand Down Expand Up @@ -4204,17 +4357,45 @@ var BattleMoveAnims = {
anim: BattleOtherAnims.selfstatus.anim
},
softboiled: {
anim: BattleOtherAnims.selfstatus.anim
anim: function (battle, args) {
var attacker = args[0];

battle.showEffect('electroball', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.75,
yscale: 1,
opacity: 0.2,
time: 0
}, {
scale: 0.5,
yscale: 0.75,
opacity: 0.5,
time: 400
}, 'linear', 'explode');
battle.showEffect('wisp', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 1,
yscale: 1.5,
opacity: 0.2,
time: 0
}, {
scale: 0.6,
yscale: 0.75,
opacity: 0.8,
time: 400
}, 'linear', 'explode');
}
},
milkdrink: {
anim: BattleOtherAnims.selfstatus.anim
},
slackoff: {
anim: BattleOtherAnims.selfstatus.anim
},
celebrate: {
anim: BattleOtherAnims.selfstatus.anim
},
happyhour: {
anim: BattleOtherAnims.selfstatus.anim
},
Expand Down Expand Up @@ -6644,6 +6825,136 @@ var BattleMoveAnims = {
}, 'linear', 'fade');
}
},
crosspoison: {
anim: function (battle, args) {
var attacker = args[0];
var defender = args[1];

attacker.anim({
x: defender.leftof(-30),
y: defender.y + 80,
z: defender.behind(-30),
time: 300
}, 'ballistic');
attacker.anim({
x: defender.leftof(30),
y: defender.y + 5,
z: defender.z,
time: 100
});
attacker.anim({
x: defender.leftof(30),
y: defender.y + 80,
z: defender.behind(-30),
time: 200
}, 'ballisticUp');
attacker.anim({
x: defender.leftof(-30),
y: defender.y + 5,
z: defender.z,
time: 100
});
attacker.anim({
time: 500
}, 'ballistic2Back');
defender.delay(450);
defender.anim({
z: defender.behind(20),
time: 100
}, 'swing');
defender.anim({
time: 200
}, 'swing');
defender.anim({
z: defender.behind(20),
time: 100
}, 'swing');
defender.anim({
time: 300
}, 'swing');
battle.activityWait(800);

battle.showEffect('rightslash', {
x: defender.x - 10,
y: defender.y,
z: defender.z,
scale: 1,
opacity: 1,
time: 425
}, {
scale: 2,
opacity: 0.5,
time: 725
}, 'linear', 'fade');
battle.showEffect('rightslash', {
x: defender.x - 10,
y: defender.y,
z: defender.z,
scale: 0,
opacity: 1,
time: 625
}, {
scale: 3,
opacity: 0,
time: 1000
}, 'linear', 'fade');
battle.showEffect('leftslash', {
x: defender.x + 10,
y: defender.y,
z: defender.z,
scale: 0,
opacity: 1,
time: 625
}, {
scale: 3,
opacity: 0,
time: 1000
}, 'linear', 'fade');

battle.showEffect('poisonwisp', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.2,
opacity: 1,
time: 0
}, {
x: attacker.x + 30,
y: attacker.y + 10,
scale: 1,
opacity: 0.5,
time: 300
}, 'decel', 'fade');
battle.showEffect('poisonwisp', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.2,
opacity: 1,
time: 100
}, {
x: attacker.x - 30,
y: attacker.y - 40,
scale: 1,
opacity: 0.5,
time: 400
}, 'decel', 'fade');
battle.showEffect('poisonwisp', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.2,
opacity: 1,
time: 200
}, {
x: attacker.x - 10,
y: attacker.y + 40,
scale: 1,
opacity: 0.5,
time: 500
}, 'decel', 'fade');
}
},
facade: {
anim: BattleOtherAnims.xattack.anim
},
Expand Down Expand Up @@ -21097,7 +21408,6 @@ BattleMoveAnims['lastresort'] = {anim:BattleMoveAnims['gigaimpact'].anim};
BattleMoveAnims['horndrill'] = {anim:BattleMoveAnims['gigaimpact'].anim};
BattleMoveAnims['trumpcard'] = {anim:BattleMoveAnims['gigaimpact'].anim};
BattleMoveAnims['doubleedge'] = {anim:BattleMoveAnims['gigaimpact'].anim};
BattleMoveAnims['crosspoison'] = {anim:BattleMoveAnims['xscissor'].anim};

BattleMoveAnims['paleowave'] = {anim:BattleMoveAnims['powergem'].anim};
BattleMoveAnims['ancientpower'] = {anim:BattleMoveAnims['powergem'].anim};
Expand Down
2 changes: 2 additions & 0 deletions js/battle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4914,6 +4914,7 @@ var Battle = (function () {
actions += '' + poke.getName() + "'s encore ended!";
break;
case 'bide':
if (!this.fastForward) BattleOtherAnims.bideunleash.anim(this, [poke.sprite]);
actions += "" + poke.getName() + " unleashed its energy!";
break;
case 'illusion':
Expand Down Expand Up @@ -5109,6 +5110,7 @@ var Battle = (function () {
actions += '' + poke.getName() + ' is in love with ' + ofpoke.getLowerName() + '!';
break;
case 'bide':
if (!this.fastForward) BattleOtherAnims.bidecharge.anim(this, [poke.sprite]);
actions += "" + poke.getName() + " is storing energy!";
break;
case 'mist':
Expand Down

0 comments on commit bba7941

Please sign in to comment.