From 6bcf4e008a77026a47a22605c482b1045a4243a0 Mon Sep 17 00:00:00 2001 From: Charlie Giang <146129103+charliegiang@users.noreply.github.com> Date: Fri, 17 May 2024 15:03:55 -0500 Subject: [PATCH 1/3] Fix sparkly swirl cure status (#1051) --- src/data/move.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index 99ef179ad30..8814aa745bf 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -6483,7 +6483,8 @@ export function initMoves() { new AttackMove(Moves.FREEZY_FROST, Type.ICE, MoveCategory.SPECIAL, 100, 90, 10, -1, 0, 7) .attr(ResetStatsAttr), new AttackMove(Moves.SPARKLY_SWIRL, Type.FAIRY, MoveCategory.SPECIAL, 120, 85, 5, -1, 0, 7) - .attr(PartyStatusCureAttr, null, Abilities.NONE), + .attr(PartyStatusCureAttr, null, Abilities.NONE) + .target(MoveTarget.PARTY), new AttackMove(Moves.VEEVEE_VOLLEY, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 20, -1, 0, 7) .attr(FriendshipPowerAttr), new AttackMove(Moves.DOUBLE_IRON_BASH, Type.STEEL, MoveCategory.PHYSICAL, 60, 100, 5, 30, 0, 7) From 1f1c243415cdc58d9049f9dc176f4f897da88869 Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Fri, 17 May 2024 15:37:34 -0500 Subject: [PATCH 2/3] Revert "Fix sparkly swirl cure status (#1051)" This reverts commit 6bcf4e008a77026a47a22605c482b1045a4243a0. --- 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 8814aa745bf..99ef179ad30 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -6483,8 +6483,7 @@ export function initMoves() { new AttackMove(Moves.FREEZY_FROST, Type.ICE, MoveCategory.SPECIAL, 100, 90, 10, -1, 0, 7) .attr(ResetStatsAttr), new AttackMove(Moves.SPARKLY_SWIRL, Type.FAIRY, MoveCategory.SPECIAL, 120, 85, 5, -1, 0, 7) - .attr(PartyStatusCureAttr, null, Abilities.NONE) - .target(MoveTarget.PARTY), + .attr(PartyStatusCureAttr, null, Abilities.NONE), new AttackMove(Moves.VEEVEE_VOLLEY, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 20, -1, 0, 7) .attr(FriendshipPowerAttr), new AttackMove(Moves.DOUBLE_IRON_BASH, Type.STEEL, MoveCategory.PHYSICAL, 60, 100, 5, 30, 0, 7) From 5dd017fa30c5e0423b0169881d7b23efbcadb599 Mon Sep 17 00:00:00 2001 From: Matthew Olker Date: Fri, 17 May 2024 18:13:12 -0400 Subject: [PATCH 3/3] Begin shiny weekend --- src/field/pokemon.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index eb08af3da55..0a5e0a6a991 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1096,8 +1096,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let shinyThreshold = new Utils.IntegerHolder(32); if (thresholdOverride === undefined) { - if (!this.hasTrainer()) + if (!this.hasTrainer()) { + if (new Date() < new Date('2024-05-21')) + shinyThreshold.value *= 3; this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); + } } else shinyThreshold.value = thresholdOverride;