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

Max Move Tooltips: Account for memories and drives (#1681)

Browse Source
This commit is contained in:
MacChaeger 2020-11-24 11:00:09 -06:00 committed by GitHub
parent c6a7c6595a
commit 2329993a95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/battle-tooltips.ts
View File

@ -499,11 +499,11 @@ class BattleTooltips {
// TODO: move this somewhere it makes more sense
if (pokemon.ability === '(suppressed)') serverPokemon.ability = '(suppressed)';
let ability = toID(serverPokemon.ability || pokemon.ability || serverPokemon.baseAbility);
let item = this.battle.dex.getItem(serverPokemon.item);
let value = new ModifiableValue(this.battle, pokemon, serverPokemon);
if (isZOrMax === 'zmove') {
let item = this.battle.dex.getItem(serverPokemon.item);
if (item.zMoveFrom === move.name) {
move = this.battle.dex.getMove(item.zMove as string);
} else if (move.category === 'Status') {
@ -556,7 +556,6 @@ class BattleTooltips {
maxMove = this.battle.dex.getMove(BattleTooltips.maxMoveTable['Dark']);
}
if (move.id === 'weatherball') {
const item = this.battle.dex.getItem(pokemon.item);
switch (this.battle.weather) {
case 'sunnyday':
case 'desolateland':
@ -587,6 +586,12 @@ class BattleTooltips {
maxMove = this.battle.dex.getMove(BattleTooltips.maxMoveTable['Psychic']);
}
}
if (move.id === 'multiattack' && item.onMemory) {
maxMove = this.battle.dex.getMove(BattleTooltips.maxMoveTable[item.onMemory]);
}
if (move.id === 'technoblast' && item.onDrive) {
maxMove = this.battle.dex.getMove(BattleTooltips.maxMoveTable[item.onDrive]);
}
const basePower = ['gmaxdrumsolo', 'gmaxfireball', 'gmaxhydrosnipe'].includes(maxMove.id) ?
maxMove.basePower : move.maxMove.basePower;
move = new Move(maxMove.id, maxMove.name, {
@ -1278,7 +1283,7 @@ class BattleTooltips {
// can happen in obscure situations
if (!value.pokemon) return [moveType, category];
let pokemonTypes = value.pokemon!.getTypeList(value.serverPokemon);
let pokemonTypes = value.pokemon.getTypeList(value.serverPokemon);
value.reset();
if (move.id === 'revelationdance') {
moveType = pokemonTypes[0];