diff --git a/play.pokemonshowdown.com/js/client-teambuilder.js b/play.pokemonshowdown.com/js/client-teambuilder.js index 306062624..f48abbdde 100644 --- a/play.pokemonshowdown.com/js/client-teambuilder.js +++ b/play.pokemonshowdown.com/js/client-teambuilder.js @@ -2907,7 +2907,12 @@ buf += '

Details

'; buf += '
'; - buf += '
'; + buf += '
' + + '
'; if (this.curTeam.gen > 1) { buf += '
'; @@ -2926,7 +2931,7 @@ buf += '
'; if (isLetsGo) { - buf += '
'; + buf += '
'; } else { if (this.curTeam.gen < 8 || isNatDex) buf += '
'; } diff --git a/play.pokemonshowdown.com/src/battle-tooltips.ts b/play.pokemonshowdown.com/src/battle-tooltips.ts index 2ea62eea7..e241987f1 100644 --- a/play.pokemonshowdown.com/src/battle-tooltips.ts +++ b/play.pokemonshowdown.com/src/battle-tooltips.ts @@ -3253,7 +3253,7 @@ export class BattleStatGuesser { if (!moveCount['PhysicalAttack']) evs.atk = 0; if (!moveCount['SpecialAttack']) evs.spa = 0; if (hasMove['gyroball'] || hasMove['trickroom']) evs.spe = 0; - } else if (!this.supportsEVs) { + } else if (!this.supportsEVs && !this.useStatPoints) { // Let's Go, AVs disabled // no change } else if (this.ignoreEVLimits) { @@ -3346,20 +3346,22 @@ export class BattleStatGuesser { if (hp || evs['hp']) evs['hp'] = hp; } - if (species.id === 'tentacruel') { - evTotal = this.ensureMinEVs(evs, 'spe', 16, evTotal); - } else if (species.id === 'skarmory') { - evTotal = this.ensureMinEVs(evs, 'spe', 24, evTotal); - } else if (species.id === 'jirachi') { - evTotal = this.ensureMinEVs(evs, 'spe', 32, evTotal); - } else if (species.id === 'celebi') { - evTotal = this.ensureMinEVs(evs, 'spe', 36, evTotal); - } else if (species.id === 'volcarona') { - evTotal = this.ensureMinEVs(evs, 'spe', 52, evTotal); - } else if (species.id === 'gliscor') { - evTotal = this.ensureMinEVs(evs, 'spe', 72, evTotal); - } else if (species.id === 'dragonite' && evs['hp']) { - evTotal = this.ensureMaxEVs(evs, 'spe', 220, evTotal); + if (this.supportsEVs) { + if (species.id === 'tentacruel') { + evTotal = this.ensureMinEVs(evs, 'spe', 16, evTotal); + } else if (species.id === 'skarmory') { + evTotal = this.ensureMinEVs(evs, 'spe', 24, evTotal); + } else if (species.id === 'jirachi') { + evTotal = this.ensureMinEVs(evs, 'spe', 32, evTotal); + } else if (species.id === 'celebi') { + evTotal = this.ensureMinEVs(evs, 'spe', 36, evTotal); + } else if (species.id === 'volcarona') { + evTotal = this.ensureMinEVs(evs, 'spe', 52, evTotal); + } else if (species.id === 'gliscor') { + evTotal = this.ensureMinEVs(evs, 'spe', 72, evTotal); + } else if (species.id === 'dragonite' && evs['hp']) { + evTotal = this.ensureMaxEVs(evs, 'spe', 220, evTotal); + } } if (evTotal < totalPoints) {