Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-03-21 17:50:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add G-Max Steelsurge hazard sprite (#1461)

Browse Source
This commit is contained in:
Kris Johnson 2020-02-08 09:31:06 -07:00 committed by GitHub
parent 70254a37c0
commit 4e92ebc3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fx/greenmetal1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
fx/greenmetal2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

45
src/battle-animations-moves.ts
View File

@ -16613,6 +16613,51 @@ const BattleMoveAnims: AnimTable = {
}, 'ballistic');
},
},
gmaxsteelsurge: {
anim(scene, [attacker, defender]) {
scene.showEffect('greenmetal1', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.1,
opacity: 0.5,
}, {
x: defender.leftof(-30),
y: defender.y - 20,
z: defender.z,
scale: 0.3,
opacity: 1,
}, 'ballistic');
scene.showEffect('greenmetal2', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.1,
opacity: 0.5,
time: 250,
}, {
x: defender.leftof(35),
y: defender.y - 15,
z: defender.z,
scale: 0.3,
opacity: 1,
}, 'ballistic');
scene.showEffect('greenmetal1', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.1,
opacity: 0.5,
time: 125,
}, {
x: defender.leftof(50),
y: defender.y - 10,
z: defender.z,
scale: 0.3,
opacity: 1,
}, 'ballistic');
},
},
spikes: {
anim(scene, [attacker, defender]) {
scene.showEffect('caltrop', {

39
src/battle-animations.ts
View File

@ -1124,6 +1124,37 @@ class BattleScene {
this.$spritesFront[siden].append(rock4.$el!);
this.sideConditions[siden][id] = [rock1, rock2, rock3, rock4];
break;
case 'gmaxsteelsurge':
const surge1 = new Sprite(BattleEffects.greenmetal1, {
display: 'block',
x: side.leftof(-30),
y: side.y - 20,
z: side.z,
opacity: 0.5,
scale: 0.8,
}, this);
const surge2 = new Sprite(BattleEffects.greenmetal2, {
display: 'block',
x: side.leftof(35),
y: side.y - 15,
z: side.z,
opacity: 0.5,
scale: 0.8,
}, this);
const surge3 = new Sprite(BattleEffects.greenmetal1, {
display: 'block',
x: side.leftof(50),
y: side.y - 10,
z: side.z,
opacity: 0.5,
scale: 0.8,
}, this);
this.$spritesFront[siden].append(surge1.$el!);
this.$spritesFront[siden].append(surge2.$el!);
this.$spritesFront[siden].append(surge3.$el!);
this.sideConditions[siden][id] = [surge1, surge2, surge3];
break;
case 'spikes':
let spikeArray = this.sideConditions[siden]['spikes'];
if (!spikeArray) {
@ -2904,6 +2935,14 @@ const BattleEffects: {[k: string]: SpriteData} = {
url: 'caltrop.png', // by Pokemon Showdown user SailorCosmos
w: 80, h: 80,
},
greenmetal1: {
url: 'greenmetal1.png', // by Pokemon Showdown user Kalalokki
w: 45, h: 45,
},
greenmetal2: {
url: 'greenmetal2.png', // by Pokemon Showdown user Kalalokki
w: 45, h: 45,
},
poisoncaltrop: {
url: 'poisoncaltrop.png', // by Pokemon Showdown user SailorCosmos
w: 80, h: 80,