Skip to content

Commit

Permalink
Update move animations, round 11.5 (smogon#709)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SaintCoke @Zarel
SaintCoke authored and Zarel committed May 14, 2016
1 parent 2eecd4a commit 7c774b6
Showing 1 changed file with 285 additions and 8 deletions.
293 changes: 285 additions & 8 deletions data/graphics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4514,6 +4514,72 @@ var BattleMoveAnims = {
}, 'ballistic2Under', 'explode');
}
},
skillswap: {
anim: function (battle, args) {
var attacker = args[0];
var defender = args[1];
battle.showEffect('wisp', {
x: attacker.x,
y: attacker.y - 30,
z: attacker.z,
scale: 1,
opacity: 1,
time: 0
}, {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 0.5,
opacity: 0,
time: 400
}, 'ballistic2Under');
battle.showEffect('wisp', {
x: attacker.x,
y: attacker.y - 30,
z: attacker.z,
scale: 1,
opacity: 1,
time: 200
}, {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 0.5,
opacity: 0,
time: 600
}, 'ballistic2Under');
battle.showEffect('wisp', {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 1,
opacity: 1,
time: 200
}, {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.5,
opacity: 0,
time: 600
}, 'ballistic');
battle.showEffect('wisp', {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 1,
opacity: 1,
time: 400
}, {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.5,
opacity: 0,
time: 800
}, 'ballistic');
}
},
recover: {
anim: BattleOtherAnims.chargestatus.anim
},
Expand Down Expand Up @@ -5720,7 +5786,73 @@ var BattleMoveAnims = {
anim: BattleOtherAnims.contactattack.anim
},
heavyslam: {
anim: BattleOtherAnims.contactattack.anim
anim: function (battle, args) {
var attacker = args[0];
var defender = args[1];

battle.showEffect('shadowball', {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 0,
opacity: 0.5,
time: 450
}, {
scale: 2,
opacity: 0,
time: 700
}, 'linear');
battle.showEffect('wisp', {
x: defender.x,
y: defender.y - 30,
z: defender.z,
scale: 1,
time: 500
}, {
x: defender.x + 70,
scale: 0.8,
opacity: 0.3,
time: 800
}, 'linear', 'fade');
battle.showEffect('wisp', {
x: defender.x,
y: defender.y - 30,
z: defender.z,
scale: 1,
time: 500
}, {
x: defender.x - 70,
scale: 0.8,
opacity: 0.3,
time: 800
}, 'linear', 'fade');

attacker.anim({
x: defender.x,
y: defender.y + 80,
z: defender.behind(-30),
time: 400
}, 'ballistic');
attacker.anim({
x: defender.x,
y: defender.y + 5,
z: defender.z,
time: 100
});
attacker.anim({
time: 600
}, 'ballistic2Back');
defender.delay(450);
defender.anim({
y: defender.y - 30,
z: defender.behind(20),
yscale: 0.5,
time: 200
}, 'swing');
defender.anim({
time: 300
}, 'swing');
}
},
steamroller: {
anim: BattleOtherAnims.contactattack.anim
Expand Down Expand Up @@ -7991,6 +8123,153 @@ var BattleMoveAnims = {
BattleOtherAnims.contactattack.anim(battle, args);
}
},
zapcannon: {
anim: function (battle, args) {
var attacker = args[0];
var defender = args[1];

battle.backgroundEffect('#2630A9', 700, 0.6);
battle.showEffect('electroball', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: .4,
opacity: 0.6
}, {
x: defender.x + 30,
y: defender.y + 30,
z: defender.z,
scale: .6,
opacity: 0.3,
time: 200
}, 'linear', 'explode');
battle.showEffect('electroball', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: .4,
opacity: 0.6,
time: 75
}, {
x: defender.x + 20,
y: defender.y - 30,
z: defender.z,
scale: .6,
opacity: 0.3,
time: 275
}, 'linear', 'explode');
battle.showEffect('electroball', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: .4,
opacity: 0.6,
time: 150
}, {
x: defender.x - 30,
y: defender.y,
z: defender.z,
scale: .6,
opacity: 0.3,
time: 350
}, 'linear', 'explode');
battle.showEffect('electroball', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: .4,
opacity: 0.6,
time: 225
}, {
x: defender.x - 10,
y: defender.y + 10,
z: defender.z,
scale: .6,
opacity: 0.3,
time: 425
}, 'linear', 'explode');
battle.showEffect('electroball', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: .4,
opacity: 0.6,
time: 300
}, {
x: defender.x + 10,
y: defender.y - 10,
z: defender.z,
scale: .6,
opacity: 0.3,
time: 500
}, 'linear', 'explode');
battle.showEffect('electroball', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: .4,
opacity: 0.6,
time: 375
}, {
x: defender.x - 20,
y: defender.y,
z: defender.z,
scale: .6,
opacity: 0.3,
time: 575
}, 'linear', 'explode');

battle.showEffect('shadowball', {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 0,
opacity: 0.5,
time: 550
}, {
scale: 4,
opacity: 0,
time: 750
}, 'linear');
battle.showEffect('shadowball', {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 0,
opacity: 0.5,
time: 600
}, {
scale: 4,
opacity: 0,
time: 800
}, 'linear');

battle.showEffect('lightning', {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 0,
opacity: 0.5,
time: 550
}, {
scale: 4,
opacity: 0,
time: 750
}, 'linear');
battle.showEffect('lightning', {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 0,
opacity: 0.5,
time: 600
}, {
scale: 4,
opacity: 0,
time: 800
}, 'linear');
}
},
hyperbeam: {
anim: function (battle, args) {
var attacker = args[0];
Expand Down Expand Up @@ -18820,7 +19099,6 @@ BattleMoveAnims['thunderwave'] = {anim:BattleMoveAnims['voltswitch'].anim};
BattleMoveAnims['electrify'] = {anim:BattleMoveAnims['voltswitch'].anim};
BattleMoveAnims['volttackle'] = {anim:BattleMoveAnims['wildcharge'].anim};
BattleMoveAnims['nuzzle'] = {anim:BattleMoveAnims['spark'].anim};
BattleMoveAnims['zapcannon'] = {anim:BattleMoveAnims['chargebeam'].anim};
BattleMoveAnims['thundershock'] = {anim:BattleMoveAnims['electroball'].anim};

BattleMoveAnims['glaciate'] = {anim:BattleMoveAnims['freezedry'].anim};
Expand Down Expand Up @@ -18866,13 +19144,12 @@ BattleMoveAnims['shadowstrike'] = {anim:BattleMoveAnims['shadowclaw'].anim};
BattleMoveAnims['frenzyplant'] = {anim:BattleMoveAnims['leafstorm'].anim};
BattleMoveAnims['hydrocannon'] = {anim:BattleMoveAnims['hydropump'].anim};

BattleMoveAnims['guardsplit'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['powersplit'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['guardsplit'] = {anim:BattleMoveAnims['skillswap'].anim};
BattleMoveAnims['powersplit'] = {anim:BattleMoveAnims['skillswap'].anim};
BattleMoveAnims['guardswap'] = {anim:BattleMoveAnims['skillswap'].anim};
BattleMoveAnims['heartswap'] = {anim:BattleMoveAnims['skillswap'].anim};
BattleMoveAnims['powerswap'] = {anim:BattleMoveAnims['skillswap'].anim};
BattleMoveAnims['psychoshift'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['skillswap'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['guardswap'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['heartswap'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['powerswap'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['helpinghand'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['entrainment'] = {anim:BattleMoveAnims['painsplit'].anim};
BattleMoveAnims['roleplay'] = {anim:BattleMoveAnims['painsplit'].anim};
Expand Down

0 comments on commit 7c774b6

Please sign in to comment.