Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix Pokemoves Bugs: Category, Validator, and Hitting Substitute (#11026)
Some checks are pending
Node.js CI / build (18.x) (push) Waiting to run
Details

Browse Source 
* Fix Pokemoves Bugs: Category, Validator, and Hitting Substitute

* Fix Pokemove Validator Again

* Remove Pokemove Re-Check

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Format Pokemove Category

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update config/formats.ts

---------

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
This commit is contained in:
prunyy 2025-04-13 10:12:35 -07:00 committed by GitHub
parent 61d5684b4d
commit 789456572d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
config/formats.ts
View File

@ -1814,21 +1814,27 @@ export const Formats: import('../sim/dex-formats').FormatList = [
problems.push(`${set.name} has ${set.moves.length} moves, which is more than the limit of ${this.ruleTable.maxMoveCount}.`);
return problems;
}
for (const [i, moveid] of set.moves.entries()) {
const originalMoves = [...set.moves];
set.moves = [];
for (const moveid of originalMoves) {
const pokemove = this.dex.species.get(moveid);
if (!pokemove.exists) continue;
if (!pokemove.exists) {
set.moves.push(moveid);
continue;
}
if (pokemove.isNonstandard &&
!(this.ruleTable.has(`+pokemontag:${this.toID(pokemove.isNonstandard)}`) ||
this.ruleTable.has(`+pokemon:${pokemove.id}`) ||
this.ruleTable.has(`+basepokemon:${this.toID(pokemove.baseSpecies)}`))) {
problems.push(`${pokemove.isNonstandard} Pok\u00e9mon are not allowed to be used as Pokemoves.`);
continue;
}
if (this.ruleTable.isRestrictedSpecies(pokemove) || this.ruleTable.isBannedSpecies(pokemove)) {
problems.push(`${pokemove.name} is unable to be used as a Pokemove.`);
continue;
}
pokemoves++;
moves.push(moveid);
set.moves.splice(i, 1);
}
}
const allowedPokemoves = Number(this.ruleTable.valueRules.get('allowedpokemoves') || '1');
@ -1846,10 +1852,11 @@ export const Formats: import('../sim/dex-formats').FormatList = [
},
onBegin() {
for (const pokemon of this.getAllPokemon()) {
pokemon.m.pokemoves = [];
for (const move of pokemon.moves) {
const pokemove = this.dex.species.get(move);
if (pokemove.exists) {
pokemon.m.pokemove = pokemove;
pokemon.m.pokemoves.push(pokemove);
const idx = pokemon.moveSlots.findIndex(x => x.id === pokemove.id);
if (idx >= 0) {
pokemon.moveSlots[idx] = pokemon.baseMoveSlots[idx] = {
@ -1868,11 +1875,10 @@ export const Formats: import('../sim/dex-formats').FormatList = [
}
},
onSwitchIn(pokemon) {
if (!pokemon.m.pokemove) return;
const pokemove = pokemon.m.pokemove;
if (!pokemove.exists) return;
// Place volatiles on the Pokémon to show the pokemove.
this.add('-start', pokemon, pokemove.name, '[silent]');
if (!pokemon.m.pokemoves?.length) return;
for (const pokemove of pokemon.m.pokemoves) {
this.add('-start', pokemon, pokemove.name, '[silent]');
}
},
onModifyMovePriority: 999,
onModifyMove(move, pokemon, target) {
@ -1883,7 +1889,10 @@ export const Formats: import('../sim/dex-formats').FormatList = [
move.accuracy = 100;
move.flags = {};
move.flags['protect'] = 1;
move.category = species.baseStats['spa'] >= species.baseStats['atk'] ? 'Special' : 'Physical';
move.category = species.baseStats['spa'] > species.baseStats['atk'] ? 'Special' :
species.baseStats['spa'] < species.baseStats['atk'] ? 'Physical' :
pokemon.getStat('atk', false, true) > pokemon.getStat('spa', false, true) ? 'Physical' :
'Special';
move.onAfterHit = function (t, s, m) {
if (s.getAbility().name === species.abilities['0']) return;
const effect = 'ability:' + this.toID(species.abilities['0']);
@ -1894,6 +1903,16 @@ export const Formats: import('../sim/dex-formats').FormatList = [
(s.volatiles[effect] as any).target = s;
}
};
move.onAfterSubDamage = function (d, t, s, m) {
if (s.getAbility().name === species.abilities['0']) return;
const effect = 'ability:' + this.toID(species.abilities['0']);
if (s.volatiles[effect]) return;
s.addVolatile(effect);
if (s.volatiles[effect]) {
(s.volatiles[effect] as any).id = this.toID(effect);
(s.volatiles[effect] as any).target = s;
}
};
}
},
},