Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-08-27 05:31:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update some contact move animations

Browse Source
This commit is contained in:
Ridaz
2016-07-13 17:09:07 +01:00
parent 3a40fae102
commit 23df10e4d4
1 changed files with 4 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
data/graphics.js
View File

@@ -5988,42 +5988,19 @@ var BattleMoveAnims = {
var attacker = args[0];
var defender = args[1];
BattleOtherAnims.contactattack.anim(battle, args);
battle.showEffect('shadowball', {
x: defender.x,
y: defender.y,
z: defender.z,
scale: 0,
opacity: 0.3,
opacity: 0.2,
time: 450
}, {
scale: 2,
opacity: 0,
time: 700
}, 'linear');
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: 500
}, 'ballistic2Back');
defender.delay(450);
defender.anim({
z: defender.behind(20),
time: 100
}, 'swing');
defender.anim({
time: 300
}, 'swing');
battle.activityWait(500);
}
},
heartstamp: {
@@ -6031,6 +6008,7 @@ var BattleMoveAnims = {
var attacker = args[0];
var defender = args[1];
BattleOtherAnims.contactattack.anim(battle, args);
battle.showEffect('heart', {
x: defender.leftof(-20),
y: defender.y + 15,
@@ -6043,30 +6021,6 @@ var BattleMoveAnims = {
opacity: 0,
time: 700
}, 'linear');
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: 500
}, 'ballistic2Back');
defender.delay(450);
defender.anim({
z: defender.behind(20),
time: 100
}, 'swing');
defender.anim({
time: 300
}, 'swing');
battle.activityWait(500);
}
},
slam: {
@@ -9708,6 +9662,7 @@ var BattleMoveAnims = {
var attacker = args[0];
var defender = args[1];
BattleOtherAnims.contactattack.anim(battle, args);
battle.showEffect('mistball', {
x: defender.x,
y: defender.y,
@@ -9720,30 +9675,6 @@ var BattleMoveAnims = {
opacity: 0,
time: 700
}, 'linear');
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: 500
}, 'ballistic2Back');
defender.delay(450);
defender.anim({
z: defender.behind(20),
time: 100
}, 'swing');
defender.anim({
time: 300
}, 'swing');
battle.activityWait(500);
}
},
fakeout: {