Skip to content

Commit

Permalink
Revert "used getMoveType() instead of move.type"
Browse files Browse the repository at this point in the history
This reverts commit 03445df.
  • Loading branch information
geeilhan committed Nov 12, 2024
1 parent deb8dbf commit 64fda7a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion public/locales
Submodule locales updated 45 files
+1 −1 de/dialogue.json
+1 −1 de/modifier-type.json
+2 −1 de/move-trigger.json
+13 −13 de/move.json
+8 −8 de/mystery-encounters/bug-type-superfan-dialogue.json
+6 −6 de/mystery-encounters/lost-at-sea-dialogue.json
+1 −1 en/modifier-type.json
+2 −1 en/move-trigger.json
+0 −3 es-ES/modifier-type.json
+1 −1 fr/modifier-type.json
+2 −1 fr/move-trigger.json
+1 −1 fr/mystery-encounters/uncommon-breed-dialogue.json
+3 −0 he/dialogue-final-boss.json
+7 −3 he/mystery-encounters/an-offer-you-cant-refuse-dialogue.json
+81 −1 he/pokemon.json
+2 −1 it/arena-flyout.json
+2 −1 it/arena-tag.json
+2 −0 it/battle.json
+3 −1 it/battler-tags.json
+27 −14 it/modifier-type.json
+2 −1 it/move-trigger.json
+18 −0 it/status-effect.json
+2 −0 ja/battle.json
+3 −1 ja/battler-tags.json
+4 −3 ja/modifier-type.json
+2 −1 ja/move-trigger.json
+1 −0 ja/splash-texts.json
+1 −1 ko/modifier-type.json
+2 −1 pt-BR/arena-flyout.json
+2 −1 pt-BR/arena-tag.json
+2 −0 pt-BR/battle.json
+3 −1 pt-BR/battler-tags.json
+4 −3 pt-BR/modifier-type.json
+2 −1 pt-BR/move-trigger.json
+1 −0 pt-BR/mystery-encounters/fun-and-games-dialogue.json
+1 −1 pt-BR/mystery-encounters/part-timer-dialogue.json
+1 −1 pt-BR/mystery-encounters/shady-vitamin-dealer-dialogue.json
+1 −1 pt-BR/mystery-encounters/training-session-dialogue.json
+2 −1 zh-CN/arena-flyout.json
+2 −1 zh-CN/arena-tag.json
+2 −0 zh-CN/battle.json
+3 −1 zh-CN/battler-tags.json
+5 −1 zh-CN/modifier-type.json
+2 −1 zh-CN/move-trigger.json
+1 −1 zh-TW/modifier-type.json
2 changes: 1 addition & 1 deletion src/data/move.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4997,7 +4997,7 @@ export class FreezeDryAttr extends VariableMoveTypeMultiplierAttr {

if (multipleTypes) {
const nonWaterType = target.getTypes().filter(type => type !== Type.WATER)[0];
const effectivenessAgainstTarget = new Utils.NumberHolder(getTypeDamageMultiplier(user.getMoveType(move), nonWaterType));
const effectivenessAgainstTarget = new Utils.NumberHolder(getTypeDamageMultiplier(move.type, nonWaterType));

applyChallenges(user.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, effectivenessAgainstTarget);

Expand Down

0 comments on commit 64fda7a

Please sign in to comment.