ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 8357e22fb4 into 787feceb14

This commit is contained in:
AJ Fontaine 2025-04-09 19:57:28 -05:00 committed by GitHub
parent 787feceb14 8357e22fb4
commit a52a6cf319
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 391 additions and 14288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14669
src/data/balance/tms.ts
View File

File diff suppressed because it is too large Load Diff

10
src/field/pokemon.ts
View File

@ -108,9 +108,9 @@ import {
FusionSpeciesFormEvolution,
} from "#app/data/balance/pokemon-evolutions";
import {
reverseCompatibleTms,
tmSpecies,
tmPoolTiers,
reverseTmSpecies,
} from "#app/data/balance/tms";
import {
BattlerTag,
@ -6306,7 +6306,8 @@ export class PlayerPokemon extends Pokemon {
this.compatibleTms = [];
const tms = Object.keys(tmSpecies);
for (const tm of tms) {
const rtms = Object.keys(reverseTmSpecies);
for (const tm of tms.concat(rtms)) {
const moveId = Number.parseInt(tm) as Moves;
let compatible = false;
for (const p of tmSpecies[tm]) {
@ -6328,7 +6329,10 @@ export class PlayerPokemon extends Pokemon {
break;
}
}
if (reverseCompatibleTms.indexOf(moveId) > -1) {
if (rtms.includes(tm) &&
(!reverseTmSpecies[moveId].includes(this.species.speciesId) ||
(this.fusionSpecies && !reverseTmSpecies[moveId].includes(this.fusionSpecies.speciesId)))
) {
compatible = !compatible;
}
if (compatible) {