From e7504b0ff7fa3191fcf5b9c9bdb2c50993a60b33 Mon Sep 17 00:00:00 2001 From: 3ae3ae Date: Tue, 18 Jun 2024 13:59:57 +0900 Subject: [PATCH 1/9] Remove partial from Matcha Gotcha --- src/data/move.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 3f9d9685fd8..abed38a660d 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -8314,8 +8314,7 @@ export function initMoves() { .attr(HealStatusEffectAttr, false, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN) .target(MoveTarget.ALL_NEAR_ENEMIES) - .triageMove() - .partial(), + .triageMove(), new AttackMove(Moves.SYRUP_BOMB, Type.GRASS, MoveCategory.SPECIAL, 60, 85, 10, -1, 0, 9) .attr(StatChangeAttr, BattleStat.SPD, -1) //Temporary .ballBombMove() From 93d8082f2407975c6a1bcdf104b54fc557eb98d9 Mon Sep 17 00:00:00 2001 From: 3ae3ae Date: Wed, 3 Jul 2024 12:30:37 +0900 Subject: [PATCH 2/9] feat: Add conditional check for adding CONFUSED tag in FrenzyTag.onRemove --- src/data/battler-tags.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 015b8b44984..96a354bcfef 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -478,8 +478,9 @@ export class FrenzyTag extends BattlerTag { onRemove(pokemon: Pokemon): void { super.onRemove(pokemon); - - pokemon.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 4)); + if ([Moves.OUTRAGE, Moves.PETAL_DANCE, Moves.THRASH].includes(this.sourceMove)) { + pokemon.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 4)); + } } } From b3a10e52e53fa80657b17ea0887be8fa86207e87 Mon Sep 17 00:00:00 2001 From: 3ae3ae Date: Wed, 3 Jul 2024 12:34:17 +0900 Subject: [PATCH 3/9] feat: Add FrenzyAttr to Uproar. Update FrenzyAttr constructor to accept min and max parameters The FrenzyAttr class in move.ts has been updated to accept min and max parameters in its constructor. This allows for more flexibility in setting the turn count for the Frenzy effect. --- src/data/move.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 9964665c12a..2cb4e0f108c 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -3869,8 +3869,12 @@ export class DisableMoveAttr extends MoveEffectAttr { } export class FrenzyAttr extends MoveEffectAttr { - constructor() { + private min: number; + private max: number; + constructor(min: number = 2, max: number = 3) { super(true, MoveEffectTrigger.HIT, false, true); + this.min = min-1; + this.max = max-1; } canApply(user: Pokemon, target: Pokemon, move: Move, args: any[]) { @@ -3884,7 +3888,7 @@ export class FrenzyAttr extends MoveEffectAttr { if (!user.getMoveQueue().length) { if (!user.getTag(BattlerTagType.FRENZY)) { - const turnCount = user.randSeedIntRange(1, 2); + const turnCount = user.randSeedIntRange(this.min, this.max); new Array(turnCount).fill(null).map(() => user.getMoveQueue().push({ move: move.id, targets: [ target.getBattlerIndex() ], ignorePP: true })); user.addTag(BattlerTagType.FRENZY, 1, move.id, user.id); } else { @@ -6340,6 +6344,8 @@ export function initMoves() { .attr(FlinchAttr) .condition(new FirstMoveCondition()), new AttackMove(Moves.UPROAR, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3) + .attr(FrenzyAttr, 3, 3) + .attr(MissEffectAttr, frenzyMissFunc) .ignoresVirtual() .soundBased() .target(MoveTarget.RANDOM_NEAR_ENEMY) From 5d15c4a26d8f50a05c78bdf031da3c10a584acf9 Mon Sep 17 00:00:00 2001 From: 3ae3ae Date: Wed, 3 Jul 2024 17:22:17 +0900 Subject: [PATCH 4/9] feat: Changed Uproar to stop if it has no effect --- src/data/move.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/data/move.ts b/src/data/move.ts index 2cb4e0f108c..2d038792992 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -6345,6 +6345,7 @@ export function initMoves() { .condition(new FirstMoveCondition()), new AttackMove(Moves.UPROAR, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3) .attr(FrenzyAttr, 3, 3) + .attr(NoEffectAttr, frenzyMissFunc) .attr(MissEffectAttr, frenzyMissFunc) .ignoresVirtual() .soundBased() From cd5a0ef2ff2e1e26ca1c87d0e2e40382c273b92b Mon Sep 17 00:00:00 2001 From: 3ae3ae Date: Thu, 4 Jul 2024 11:55:00 +0900 Subject: [PATCH 5/9] feat: add Uproar message --- src/data/move.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/data/move.ts b/src/data/move.ts index 2d038792992..db2728a8594 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -3911,6 +3911,16 @@ export const frenzyMissFunc: UserMoveConditionFunc = (user: Pokemon, move: Move) return true; }; +export class UproarMessage extends MoveEffectAttr { + constructor() { + super(); + } + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + user.scene.queueMessage(getPokemonMessage(user, " caused\nan uproar!")); + return true; + } +} + export class AddBattlerTagAttr extends MoveEffectAttr { public tagType: BattlerTagType; public turnCountMin: integer; @@ -6344,6 +6354,7 @@ export function initMoves() { .attr(FlinchAttr) .condition(new FirstMoveCondition()), new AttackMove(Moves.UPROAR, Type.NORMAL, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 3) + .attr(UproarMessage) .attr(FrenzyAttr, 3, 3) .attr(NoEffectAttr, frenzyMissFunc) .attr(MissEffectAttr, frenzyMissFunc) From 1154baf04ec0f419d78163e4bad98e167075a258 Mon Sep 17 00:00:00 2001 From: 3ae3ae Date: Fri, 5 Jul 2024 09:25:19 +0900 Subject: [PATCH 6/9] feat: Make Uproar translatable --- src/data/move.ts | 4 +++- src/locales/en/battle.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index db2728a8594..7d8ee084056 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -3916,7 +3916,9 @@ export class UproarMessage extends MoveEffectAttr { super(); } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - user.scene.queueMessage(getPokemonMessage(user, " caused\nan uproar!")); + user.scene.queueMessage(i18next.t("battle:battlerTagsUproar", { + pokemonNameWithAffix: getPokemonNameWithAffix(user), + })); return true; } } diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts index d41ffc373dc..23174790b61 100644 --- a/src/locales/en/battle.ts +++ b/src/locales/en/battle.ts @@ -132,5 +132,6 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!", "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!", - "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!" + "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; From db7e357bf3b7a159cf88287b4a8f1619facfb972 Mon Sep 17 00:00:00 2001 From: 3ae3ae Date: Fri, 5 Jul 2024 10:54:09 +0900 Subject: [PATCH 7/9] feat: add new translation key for all language --- src/locales/de/battle.ts | 3 ++- src/locales/es/battle.ts | 3 ++- src/locales/fr/battle.ts | 3 ++- src/locales/it/battle.ts | 3 ++- src/locales/ko/battle.ts | 1 + src/locales/pt_BR/battle.ts | 3 ++- src/locales/zh_CN/battle.ts | 3 ++- src/locales/zh_TW/battle.ts | 1 + 8 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts index 67c2cd9a6b0..311e4a1dca2 100644 --- a/src/locales/de/battle.ts +++ b/src/locales/de/battle.ts @@ -132,5 +132,6 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} wurde eingepökelt!", "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} wurde durch {{moveName}} verletzt!", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} nimmt einen Teil seiner KP und legt einen Fluch auf {{pokemonName}}!", - "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} wurde durch den Fluch verletzt!" + "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} wurde durch den Fluch verletzt!", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts index 7f5832d069d..f1b7e23e056 100644 --- a/src/locales/es/battle.ts +++ b/src/locales/es/battle.ts @@ -132,5 +132,6 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!", "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!", - "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!" + "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts index 539b7c99094..b17e090c5d3 100644 --- a/src/locales/fr/battle.ts +++ b/src/locales/fr/battle.ts @@ -132,5 +132,6 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}}\nest couvert de sel !", "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} est blessé\npar la capacité {{moveName}} !", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} sacrifie des PV\net lance une malédiction sur {{pokemonName}} !", - "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} est touché par la malédiction !" + "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} est touché par la malédiction !", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts index d9af58893e5..b32f0a7d7e5 100644 --- a/src/locales/it/battle.ts +++ b/src/locales/it/battle.ts @@ -132,5 +132,6 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} è stato messo sotto sale!", "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} viene colpito da {{moveName}}!", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} ha sacrificato metà dei suoi PS per\nlanciare una maledizione su {{pokemonName}}!", - "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} subisce la maledizione!" + "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} subisce la maledizione!", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; diff --git a/src/locales/ko/battle.ts b/src/locales/ko/battle.ts index e9bfb7cb307..d055708452b 100644 --- a/src/locales/ko/battle.ts +++ b/src/locales/ko/battle.ts @@ -133,4 +133,5 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}}[[는]] 소금절이의\n데미지를 입고 있다.", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n자신의 체력을 깎아서\n{{pokemonName}}에게 저주를 걸었다!", "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}[[는]]\n저주받고 있다!", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts index 15f1d83c3c9..fd6f1121be7 100644 --- a/src/locales/pt_BR/battle.ts +++ b/src/locales/pt_BR/battle.ts @@ -132,5 +132,6 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} está sendo curado com sal!", "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} foi ferido pelo {{moveName}}!", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} cortou seus PS pela metade e amaldiçoou {{pokemonName}}!", - "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} foi ferido pelo Curse!" + "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} foi ferido pelo Curse!", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts index 3fde016d5cc..7487a3ec396 100644 --- a/src/locales/zh_CN/battle.ts +++ b/src/locales/zh_CN/battle.ts @@ -132,5 +132,6 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}}\n陷入了盐腌状态！", "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}}\n受到了{{moveName}}的伤害！", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}削减了自己的体力，\n并诅咒了{{pokemonName}}！", - "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}\n正受到诅咒！" + "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}\n正受到诅咒！", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; diff --git a/src/locales/zh_TW/battle.ts b/src/locales/zh_TW/battle.ts index 077933c46d6..ccb784e8509 100644 --- a/src/locales/zh_TW/battle.ts +++ b/src/locales/zh_TW/battle.ts @@ -130,4 +130,5 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} 受到了{{moveName}}的傷害！", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}削減了自己的體力，並詛咒了{{pokemonName}}！", "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}正受到詛咒！", + "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", } as const; From 44895d59565e794b0c74b7dea2d4a20a983588b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2?= <123510358+NicusPulcis@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:22:49 +0200 Subject: [PATCH 8/9] Update src/locales/it/battle.ts --- src/locales/it/battle.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts index 47943c2c0c3..12d64a852d2 100644 --- a/src/locales/it/battle.ts +++ b/src/locales/it/battle.ts @@ -134,5 +134,5 @@ export const battle: SimpleTranslationEntries = { "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} viene colpito da {{moveName}}!", "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} ha sacrificato metà dei suoi PS per\nlanciare una maledizione su {{pokemonName}}!", "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} subisce la maledizione!", - "battlerTagsUproar": "{{pokemonNameWithAffix}} caused\nan uproar!", + "battlerTagsUproar": "{{pokemonNameWithAffix}} scatena\nuna baraonda!", } as const; From a7c3d5140a25d5e4bf7e86e4d59f5ccc9d58b805 Mon Sep 17 00:00:00 2001 From: 3ae3ae <83870598+3ae3ae@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:53:00 +0900 Subject: [PATCH 9/9] Update src/locales/ko/battler-tags.json Co-authored-by: returntoice --- src/locales/ko/battler-tags.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ko/battler-tags.json b/src/locales/ko/battler-tags.json index 3077f68ef7b..87cd3d4fa93 100644 --- a/src/locales/ko/battler-tags.json +++ b/src/locales/ko/battler-tags.json @@ -74,5 +74,5 @@ "substituteOnAdd": "{{pokemonNameWithAffix}}의\n대타가 나타났다!", "substituteOnHit": "{{pokemonNameWithAffix}}[[를]] 대신하여\n대타가 공격을 받았다!", "substituteOnRemove": "{{pokemonNameWithAffix}}의\n대타는 사라져 버렸다...", - "uproarOnAdd": "{{pokemonNameWithAffix}} caused\nan uproar!" + "uproarOnAdd": "{{pokemonNameWithAffix}}[[는]]\n소란을 피우기 시작했다!" }