diff --git a/js/client-battle-tooltips.js b/js/client-battle-tooltips.js index 199e86f1d..951c13e6a 100644 --- a/js/client-battle-tooltips.js +++ b/js/client-battle-tooltips.js @@ -294,7 +294,7 @@ var BattleTooltips = (function () { if (additionalInfo) text += '

' + additionalInfo + '

'; text += '

Accuracy: ' + accuracy + '

'; if (move.desc) { - if (this.battle.gen < 7) { + if (this.battle.gen < 7 || this.battle.hardcoreMode) { var desc = move.shortDesc; for (var i = this.battle.gen; i < 7; i++) { if (move.id in BattleTeambuilderTable['gen' + i].overrideMoveDesc) { @@ -417,13 +417,17 @@ var BattleTooltips = (function () { text += ''; if (pokemon.fainted) { text += '

HP: (fainted)

'; + } else if (this.battle.hardcoreMode) { + if (pokemonData) { + text += '

HP: ' + pokemonData.hp + '/' + pokemonData.maxhp + (pokemon.status ? ' ' + pokemon.status.toUpperCase() + '' : '') + '

'; + } } else { var exacthp = ''; if (pokemonData) exacthp = ' (' + pokemonData.hp + '/' + pokemonData.maxhp + ')'; else if (pokemon.maxhp == 48) exacthp = ' (' + pokemon.hp + '/' + pokemon.maxhp + ' pixels)'; text += '

HP: ' + pokemon.hpDisplay() + exacthp + (pokemon.status ? ' ' + pokemon.status.toUpperCase() + '' : '') + '

'; } - var showOtherSees = isActive; + var showOtherSees = !this.battle.hardcoreMode && isActive; if (pokemonData) { if (this.battle.gen > 2) { var abilityText = ''; @@ -448,7 +452,7 @@ var BattleTooltips = (function () { text += ' SpA / ' + pokemonData.stats['spd'] + ' SpD / '; } text += pokemonData.stats['spe'] + ' Spe

'; - if (isActive) { + if (showOtherSees) { if (this.battle.gen > 1) { var modifiedStats = this.calculateModifiedStats(pokemon, pokemonData); var statsText = this.makeModifiedStatText(pokemonData, modifiedStats); @@ -460,7 +464,7 @@ var BattleTooltips = (function () { text += '

Opponent sees:

'; } } else { - showOtherSees = true; + showOtherSees = !this.battle.hardcoreMode; } if (this.battle.gen > 2 && showOtherSees) { if (!pokemon.baseAbility && !pokemon.ability) { @@ -523,7 +527,7 @@ var BattleTooltips = (function () { text += '• ' + name + '
'; } text += '

'; - } else if (pokemon.moveTrack && pokemon.moveTrack.length) { + } else if (!this.battle.hardcoreMode && pokemon.moveTrack && pokemon.moveTrack.length) { text += '

'; for (var i = 0; i < pokemon.moveTrack.length; i++) { text += '• ' + this.getPPUseText(pokemon.moveTrack[i]) + '
';