Skip to content

Commit

Permalink
Fix Volt Switch animation (smogon#740)
Browse files Browse the repository at this point in the history
  • Loading branch information
SaintCoke authored Jul 10, 2016
1 parent 7522982 commit 3718be5
Showing 1 changed file with 33 additions and 15 deletions.
48 changes: 33 additions & 15 deletions data/graphics.js
Original file line number Diff line number Diff line change
Expand Up @@ -3408,44 +3408,62 @@ var BattleMoveAnims = {
battle.showEffect('electroball', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
opacity: 0.8
z: defender.behind(-130),
opacity: 0.8,
time: 275
}, {
x: defender.x,
y: defender.y,
z: defender.z,
time: 300
}, 'accel', 'fade');
time: 500
}, 'linear', 'explode');
battle.showEffect('electroball', {
x: defender.x,
y: defender.y,
z: defender.z,
z: defender.behind(10),
opacity: 0.7,
scale: 0,
time: 300
time: 500
}, {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 4,
opacity: 0,
time: 600
time: 800
}, 'linear');
battle.showEffect('electroball', {
x: defender.x,
y: defender.y,
z: defender.z,
opacity: 0.7,
scale: 0,
time: 500
time: 700
}, {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 4,
opacity: 0,
time: 800
time: 1000
}, 'linear');

attacker.anim({
z: attacker.behind(15),
time: 200
}, 'decel');
attacker.anim({
z: defender.behind(-170),
time: 100
}, 'accel');
attacker.anim({
z: attacker.z,
time: 300
}, 'swing');
defender.delay(500);
defender.anim({
x: defender.leftof(5),
y: defender.y,
z: defender.behind(15),
time: 50
}, 'swing');
defender.anim({
time: 300
}, 'swing');
}
},
thunderwave: {
Expand Down

0 comments on commit 3718be5

Please sign in to comment.