From a9b0753a7e61b3b69befd97ac1704009704a81c5 Mon Sep 17 00:00:00 2001 From: Luc Dube Date: Mon, 22 Apr 2024 19:45:39 -0400 Subject: [PATCH 1/5] Implemented Quick Draw --- src/data/ability.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index bfc608dc7e0..45577a7e38f 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -3074,7 +3074,8 @@ export function initAbilities() { .attr(UnswappableAbilityAbAttr) .attr(NoTransformAbilityAbAttr) .attr(NoFusionAbilityAbAttr), - new Ability(Abilities.QUICK_DRAW, "Quick Draw (N)", "Enables the Pokémon to move first occasionally.", 8), + new Ability(Abilities.QUICK_DRAW, "Quick Draw", "Enables the Pokémon to move first occasionally.", 8) + .attr(IncrementMovePriorityAbAttr, (pokemon, move) => Math.random() <= 1/3), new Ability(Abilities.UNSEEN_FIST, "Unseen Fist (N)", "If the Pokémon uses moves that make direct contact, it can attack the target even if the target protects itself.", 8), new Ability(Abilities.CURIOUS_MEDICINE, "Curious Medicine (N)", "When the Pokémon enters a battle, it scatters medicine from its shell, which removes all stat changes from allies.", 8), new Ability(Abilities.TRANSISTOR, "Transistor", "Powers up Electric-type moves.", 8) From de3db9988f9f71bb4c42caca82e5303e97984553 Mon Sep 17 00:00:00 2001 From: Luc Dube Date: Tue, 23 Apr 2024 10:18:58 -0400 Subject: [PATCH 2/5] now goes first in priority bracket --- src/data/ability.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 45577a7e38f..723f5ee2f49 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1530,7 +1530,7 @@ export class BlockOneHitKOAbAttr extends AbAttr { export class IncrementMovePriorityAbAttr extends AbAttr { private moveIncrementFunc: (pokemon: Pokemon, move: Move) => boolean; - private increaseAmount: integer; + private increaseAmount: number; constructor(moveIncrementFunc: (pokemon: Pokemon, move: Move) => boolean, increaseAmount = 1) { super(true); @@ -3075,7 +3075,7 @@ export function initAbilities() { .attr(NoTransformAbilityAbAttr) .attr(NoFusionAbilityAbAttr), new Ability(Abilities.QUICK_DRAW, "Quick Draw", "Enables the Pokémon to move first occasionally.", 8) - .attr(IncrementMovePriorityAbAttr, (pokemon, move) => Math.random() <= 1/3), + .attr(IncrementMovePriorityAbAttr, (pokemon, move) => Math.random() <= 1/3, 0.5), new Ability(Abilities.UNSEEN_FIST, "Unseen Fist (N)", "If the Pokémon uses moves that make direct contact, it can attack the target even if the target protects itself.", 8), new Ability(Abilities.CURIOUS_MEDICINE, "Curious Medicine (N)", "When the Pokémon enters a battle, it scatters medicine from its shell, which removes all stat changes from allies.", 8), new Ability(Abilities.TRANSISTOR, "Transistor", "Powers up Electric-type moves.", 8) From 53aff71f52bc863d9ea51cb6d02d411b76911dc5 Mon Sep 17 00:00:00 2001 From: Luc Dube Date: Tue, 23 Apr 2024 10:20:33 -0400 Subject: [PATCH 3/5] changed to only attacking moves --- src/data/ability.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 723f5ee2f49..8d4bdab03f2 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -3075,7 +3075,7 @@ export function initAbilities() { .attr(NoTransformAbilityAbAttr) .attr(NoFusionAbilityAbAttr), new Ability(Abilities.QUICK_DRAW, "Quick Draw", "Enables the Pokémon to move first occasionally.", 8) - .attr(IncrementMovePriorityAbAttr, (pokemon, move) => Math.random() <= 1/3, 0.5), + .attr(IncrementMovePriorityAbAttr, (pokemon, move) => move.category !== MoveCategory.STATUS && Math.random() <= 1/3, 0.5), new Ability(Abilities.UNSEEN_FIST, "Unseen Fist (N)", "If the Pokémon uses moves that make direct contact, it can attack the target even if the target protects itself.", 8), new Ability(Abilities.CURIOUS_MEDICINE, "Curious Medicine (N)", "When the Pokémon enters a battle, it scatters medicine from its shell, which removes all stat changes from allies.", 8), new Ability(Abilities.TRANSISTOR, "Transistor", "Powers up Electric-type moves.", 8) From 2774251e6d65170194269aeeee359bff52b66e01 Mon Sep 17 00:00:00 2001 From: Luc Dube Date: Tue, 23 Apr 2024 10:26:42 -0400 Subject: [PATCH 4/5] reduced priority bonus to 0.01 --- src/data/ability.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 8d4bdab03f2..a71dcf5d140 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -3075,7 +3075,7 @@ export function initAbilities() { .attr(NoTransformAbilityAbAttr) .attr(NoFusionAbilityAbAttr), new Ability(Abilities.QUICK_DRAW, "Quick Draw", "Enables the Pokémon to move first occasionally.", 8) - .attr(IncrementMovePriorityAbAttr, (pokemon, move) => move.category !== MoveCategory.STATUS && Math.random() <= 1/3, 0.5), + .attr(IncrementMovePriorityAbAttr, (pokemon, move) => move.category !== MoveCategory.STATUS && Math.random() <= 1/3, 0.01), new Ability(Abilities.UNSEEN_FIST, "Unseen Fist (N)", "If the Pokémon uses moves that make direct contact, it can attack the target even if the target protects itself.", 8), new Ability(Abilities.CURIOUS_MEDICINE, "Curious Medicine (N)", "When the Pokémon enters a battle, it scatters medicine from its shell, which removes all stat changes from allies.", 8), new Ability(Abilities.TRANSISTOR, "Transistor", "Powers up Electric-type moves.", 8) From a762101f64f5045be0134817b6434d7cb2cde294 Mon Sep 17 00:00:00 2001 From: lucfd <83493765+lucfd@users.noreply.github.com> Date: Thu, 25 Apr 2024 01:07:08 -0400 Subject: [PATCH 5/5] fixing merge conflicts --- src/data/ability.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index cced00c6c7f..1bef03a8c26 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -3195,8 +3195,6 @@ export function initAbilities() { .attr(NoFusionAbilityAbAttr), new Ability(Abilities.QUICK_DRAW, "Quick Draw", "Enables the Pokémon to move first occasionally.", 8) .attr(IncrementMovePriorityAbAttr, (pokemon, move) => move.category !== MoveCategory.STATUS && Math.random() <= 1/3, 0.01), - new Ability(Abilities.QUICK_DRAW, 8) - .unimplemented(), new Ability(Abilities.UNSEEN_FIST, 8) .unimplemented(), new Ability(Abilities.CURIOUS_MEDICINE, 8)