mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-06 08:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use move.type instead of type.value

Browse Source 
The type effectiveness now works again.
This commit is contained in:
Madmadness65 2024-06-07 17:59:17 -05:00
parent cf2ac89741
commit 66d1de42a2
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/data/move.ts
View File

@ -3323,64 +3323,63 @@ export class VariableMoveTypeAttr extends MoveAttr {
export class FormChangeItemTypeAttr extends VariableMoveTypeAttr { export class FormChangeItemTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if ([user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.ARCEUS || Species.SILVALLY)) { if ([user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.ARCEUS && Species.SILVALLY)) {
const form = user.species.speciesId === Species.ARCEUS || Species.SILVALLY ? user.formIndex : user.fusionSpecies.formIndex; const form = user.species.speciesId === Species.ARCEUS || user.species.speciesId === Species.SILVALLY ? user.formIndex : user.fusionSpecies.formIndex;
const type = (args[0] as Utils.IntegerHolder);
switch (form) { switch (form) {
case 1: // Fist Plate / Fighting Memory case 1: // Fist Plate / Fighting Memory
type.value = Type.FIGHTING; move.type = Type.FIGHTING;
break; break;
case 2: // Sky Plate / Flying Memory case 2: // Sky Plate / Flying Memory
type.value = Type.FLYING; move.type = Type.FLYING;
break; break;
case 3: // Toxic Plate / Poison Memory case 3: // Toxic Plate / Poison Memory
type.value = Type.POISON; move.type = Type.POISON;
break; break;
case 4: // Earth Plate / Ground Memory case 4: // Earth Plate / Ground Memory
type.value = Type.GROUND; move.type = Type.GROUND;
break; break;
case 5: // Stone Plate / Rock Memory case 5: // Stone Plate / Rock Memory
type.value = Type.ROCK; move.type = Type.ROCK;
break; break;
case 6: // Insect Plate / Bug Memory case 6: // Insect Plate / Bug Memory
type.value = Type.BUG; move.type = Type.BUG;
break; break;
case 7: // Spooky Plate / Ghost Memory case 7: // Spooky Plate / Ghost Memory
type.value = Type.GHOST; move.type = Type.GHOST;
break; break;
case 8: // Iron Plate / Steel Memory case 8: // Iron Plate / Steel Memory
type.value = Type.STEEL; move.type = Type.STEEL;
break; break;
case 9: // Flame Plate / Fire Memory case 9: // Flame Plate / Fire Memory
type.value = Type.FIRE; move.type = Type.FIRE;
break; break;
case 10: // Splash Plate / Water Memory case 10: // Splash Plate / Water Memory
type.value = Type.WATER; move.type = Type.WATER;
break; break;
case 11: // Meadow Plate / Grass Memory case 11: // Meadow Plate / Grass Memory
type.value = Type.GRASS; move.type = Type.GRASS;
break; break;
case 12: // Zap Plate / Electric Memory case 12: // Zap Plate / Electric Memory
type.value = Type.ELECTRIC; move.type = Type.ELECTRIC;
break; break;
case 13: // Mind Plate / Psychic Memory case 13: // Mind Plate / Psychic Memory
type.value = Type.PSYCHIC; move.type = Type.PSYCHIC;
break; break;
case 14: // Icicle Plate / Ice Memory case 14: // Icicle Plate / Ice Memory
type.value = Type.ICE; move.type = Type.ICE;
break; break;
case 15: // Draco Plate / Dragon Memory case 15: // Draco Plate / Dragon Memory
type.value = Type.DRAGON; move.type = Type.DRAGON;
break; break;
case 16: // Dread Plate / Dark Memory case 16: // Dread Plate / Dark Memory
type.value = Type.DARK; move.type = Type.DARK;
break; break;
case 17: // Pixie Plate / Fairy Memory case 17: // Pixie Plate / Fairy Memory
type.value = Type.FAIRY; move.type = Type.FAIRY;
break; break;
default: default:
type.value = Type.NORMAL; move.type = Type.NORMAL;
break; break;
} }
return true; return true;