atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Quick Claw chance (#3737)

Browse source
This commit is contained in:
Alex 2023-12-15 17:05:11 +01:00 committed by GitHub
parent 9cb1b9750e
commit 94ffeb2cf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/battle_main.c
View file

@ -5107,7 +5107,7 @@ static void TryChangingTurnOrderEffects(u32 battler1, u32 battler2)
gProtectStructs[battler1].quickDraw = TRUE; gProtectStructs[battler1].quickDraw = TRUE;
// Quick Claw and Custap Berry // Quick Claw and Custap Berry
if (!gProtectStructs[battler1].quickDraw if (!gProtectStructs[battler1].quickDraw
&& ((holdEffectBattler1 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, 10)) && ((holdEffectBattler1 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, GetBattlerHoldEffectParam(battler1)))
|| (holdEffectBattler1 == HOLD_EFFECT_CUSTAP_BERRY && HasEnoughHpToEatBerry(battler1, 4, gBattleMons[battler1].item)))) || (holdEffectBattler1 == HOLD_EFFECT_CUSTAP_BERRY && HasEnoughHpToEatBerry(battler1, 4, gBattleMons[battler1].item))))
gProtectStructs[battler1].usedCustapBerry = TRUE; gProtectStructs[battler1].usedCustapBerry = TRUE;
@ -5117,7 +5117,7 @@ static void TryChangingTurnOrderEffects(u32 battler1, u32 battler2)
gProtectStructs[battler2].quickDraw = TRUE; gProtectStructs[battler2].quickDraw = TRUE;
// Quick Claw and Custap Berry // Quick Claw and Custap Berry
if (!gProtectStructs[battler2].quickDraw if (!gProtectStructs[battler2].quickDraw
&& ((holdEffectBattler2 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, 10)) && ((holdEffectBattler2 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, GetBattlerHoldEffectParam(battler2)))
|| (holdEffectBattler2 == HOLD_EFFECT_CUSTAP_BERRY && HasEnoughHpToEatBerry(battler2, 4, gBattleMons[battler2].item)))) || (holdEffectBattler2 == HOLD_EFFECT_CUSTAP_BERRY && HasEnoughHpToEatBerry(battler2, 4, gBattleMons[battler2].item))))
gProtectStructs[battler2].usedCustapBerry = TRUE; gProtectStructs[battler2].usedCustapBerry = TRUE;
} }

2
test/battle/hold_effect/quick_claw.c
View file

@ -8,7 +8,7 @@ ASSUMPTIONS
SINGLE_BATTLE_TEST("Quick Claw activates 10% of the time") SINGLE_BATTLE_TEST("Quick Claw activates 10% of the time")
{ {
PASSES_RANDOMLY(1, 10, RNG_QUICK_CLAW); PASSES_RANDOMLY(2, 10, RNG_QUICK_CLAW);
GIVEN { GIVEN {
PLAYER(SPECIES_WOBBUFFET) { Speed(1); Item(ITEM_QUICK_CLAW); } PLAYER(SPECIES_WOBBUFFET) { Speed(1); Item(ITEM_QUICK_CLAW); }
OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } OPPONENT(SPECIES_WOBBUFFET) { Speed(100); }