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

Improve variable moves tooltip

Browse Source 
Improve the style for Nature Power called move.
Crashguard in doubles for weight moves check.
This crash happens when a battle is refreshed and one mon is just fainted.
This commit is contained in:
Juanma Serrano
2015-09-21 17:03:09 +02:00
parent 61bbb769df
commit ee9d2f697a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/client-battle.js
View File

@@ -995,20 +995,20 @@
if (this.battle.gen === 6) {
additionalInfo = 'Calls ';
if (this.battle.hasPseudoWeather('Electric Terrain')) {
additionalInfo += Tools.getTypeIcon('Electric') + 'Thunderbolt';
additionalInfo += Tools.getTypeIcon('Electric') + ' Thunderbolt';
} else if (this.battle.hasPseudoWeather('Grassy Terrain')) {
additionalInfo += Tools.getTypeIcon('Grass') + 'Energy Ball';
additionalInfo += Tools.getTypeIcon('Grass') + ' Energy Ball';
} else if (this.battle.hasPseudoWeather('Misty Terrain')) {
additionalInfo += Tools.getTypeIcon('Fairy') + 'Moonblast';
additionalInfo += Tools.getTypeIcon('Fairy') + ' Moonblast';
} else {
additionalInfo += Tools.getTypeIcon('Normal') + 'Tri Attack';
additionalInfo += Tools.getTypeIcon('Normal') + ' Tri Attack';
}
} else if (this.battle.gen > 3) {
// In gens 4 and 5 it calls Earthquake.
additionalInfo = 'Calls ' + Tools.getTypeIcon('Ground') + 'Earthquake';
additionalInfo = 'Calls ' + Tools.getTypeIcon('Ground') + ' Earthquake';
} else {
// In gen 3 it calls Swift, so it retains its normal typing.
additionalInfo = 'Calls ' + Tools.getTypeIcon('Normal') + 'Swift';
additionalInfo = 'Calls ' + Tools.getTypeIcon('Normal') + ' Swift';
}
}
@@ -1016,7 +1016,7 @@
text += '<h2>' + move.name + '<br />' + Tools.getTypeIcon(moveType) + ' <img src="' + Tools.resourcePrefix;
text += 'sprites/categories/' + move.category + '.png" alt="' + move.category + '" /></h2>';
text += basePowerText;
text += additionalInfo;
text += '<p>' + additionalInfo + '</p>';
text += '<p>Accuracy: ' + accuracy + '</p>';
var flags = {
"authentic": "Ignores a target's substitute.",
@@ -1404,7 +1404,7 @@
}
}
// Movements which have base power changed according to weight.
if (target.weightkg) {
if (target && target.weightkg) {
var targetWeight = target.weightkg;
var pokemonWeight = pokemon.weightkg;
// Autotomize cannot be really known on client, so we calculate it's one charge.