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

Update move animations

Browse Source
This commit is contained in:
Ridaz 2018-04-01 09:11:28 +01:00
parent 8994e9e704
commit af903221e7
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data/graphics.js
View File

@ -234,6 +234,10 @@ var BattleEffects = {
url: 'ultra.png', // by Pokemon Showdown user Modeling Clay
w: 113, h: 165
},
hitmark: {
url: 'hitmarker.png', // by Pokemon Showdown user Ridaz
w: 100, h: 100
},
none: {
// this is for passing to battle.pos() and battle.posT() for CSS effects
w: 100, h: 100
@ -2873,6 +2877,21 @@ var BattleOtherAnims = {
}
};
var BattleStatusAnims = {
hitmark: {
anim: function (battle, args) {
var attacker = args[0];
battle.showEffect('hitmark', {
x: attacker.x,
y: attacker.y,
z: attacker.z,
scale: 0.5,
opacity: 1
}, {
opacity: 0.5,
time: 250
}, 'linear', 'fade');
}
},
brn: {
anim: function (battle, args) {
var attacker = args[0];

BIN
fx/hitmarker.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 58 KiB

7
js/battle.js
View File

@ -3485,6 +3485,12 @@ var Battle = (function () {
} else if (window.Config && Config.server && Config.server.afd && move.id === 'stealthrock') {
var srNames = ['Sneaky Pebbles', 'Sly Rubble', 'Subtle Sediment', 'Buried Bedrock', 'Camouflaged Cinnabar', 'Clandestine Cobblestones', 'Cloaked Clay', 'Concealed Ore', 'Covert Crags', 'Crafty Coal', 'Discreet Bricks', 'Disguised Debris', 'Espionage Pebbles', 'Furtive Fortress', 'Hush-Hush Hardware', 'Incognito Boulders', 'Invisible Quartz', 'Masked Minerals', 'Mischievous Masonry', 'Obscure Ornaments', 'Private Paragon', 'Secret Solitaire', 'Sheltered Sand', 'Surreptitious Sapphire', 'Undercover Ultramarine'];
this.message(pokemon.getName() + ' used <strong>' + srNames[Math.floor(Math.random() * srNames.length)] + '</strong>!');
} else if (window.Config && Config.server && Config.server.afd && move.id === 'extremespeed') {
var fastWords = ['H-Hayai', 'Masaka', 'Its fast']
this.message(pokemon.getName() + ' used <strong>' + move.name + '</strong>!');
this.message('<strong>' + fastWords[Math.floor(Math.random() * fastWords.length)] + '</strong>!');
} else if (window.Config && Config.server && Config.server.afd && move.id === 'aerialace') {
this.message(pokemon.getName() + ' used <strong>Tsubame Gaeshi</strong>!');
// } else if (window.Config && Config.server && Config.server.afd && (move.id === 'metronome' || move.id === 'sleeptalk' || move.id === 'assist')) {
// this.message(pokemon.getName() + ' used <strong>' + move.name + '</strong>!');
// var buttons = ["A", "B", "START", "SELECT", "UP", "DOWN", "LEFT", "RIGHT", "DEMOCRACY", "ANARCHY"];
@ -4197,6 +4203,7 @@ var Battle = (function () {
var poke = this.getPokemon(args[1]);
for (var j = 1; !poke && j < 10; j++) poke = this.getPokemon(minors[i + j][0][1]);
if (poke) this.resultAnim(poke, 'Super-effective', 'bad');
if (!this.fastForward) BattleStatusAnims['hitmark'].anim(this, [poke.sprite]);
actions += "It's super effective" + (this.activeMoveIsSpread ? " on " + poke.getLowerName() : "") + "! ";
break;