diff --git a/app/core/abilities/abilities.ts b/app/core/abilities/abilities.ts index 7a4a7a798..e6079d406 100644 --- a/app/core/abilities/abilities.ts +++ b/app/core/abilities/abilities.ts @@ -710,15 +710,8 @@ export class CrabHammerStrategy extends AbilityStrategy { crit: boolean ) { super.process(pokemon, state, board, target, crit) - let damage = 40 - if (pokemon.stars == 2) { - damage = 80 - } else if (pokemon.stars == 3) { - damage = 120 - } - if (pokemon.items.has(Item.REAPER_CLOTH)) { - crit = chance((3 * pokemon.critChance) / 100) - } + let damage = [40, 80, 120][pokemon.stars - 1] ?? 120 + crit = chance((pokemon.critChance + 30) / 100) // can crit by default with a 30% increased crit chance let attackType = AttackType.SPECIAL if (target.life / target.hp < 0.3) { damage = target.life @@ -7344,21 +7337,10 @@ export class SlashStrategy extends AbilityStrategy { crit: boolean ) { super.process(pokemon, state, board, target, crit) - const damage = pokemon.stars === 3 ? 40 : pokemon.stars === 2 ? 20 : 10 - const increasedCrit = crit - ? crit - : pokemon.stars === 3 - ? chance(0.9) - : pokemon.stars === 2 - ? chance(0.6) - : chance(0.3) - target.handleSpecialDamage( - damage, - board, - AttackType.SPECIAL, - pokemon, - increasedCrit - ) + const damage = [10, 20, 40][pokemon.stars - 1] ?? 40 + const increasedCrit = [30, 60, 90][pokemon.stars - 1] ?? 90 + crit = chance((pokemon.critChance + increasedCrit) / 100) // can crit by default + target.handleSpecialDamage(damage, board, AttackType.SPECIAL, pokemon, crit) } } diff --git a/app/public/dist/client/changelog/patch-5.6.md b/app/public/dist/client/changelog/patch-5.6.md index 66ff0bf23..051bf0b7b 100644 --- a/app/public/dist/client/changelog/patch-5.6.md +++ b/app/public/dist/client/changelog/patch-5.6.md @@ -61,6 +61,7 @@ - Buff Close Combat (Heracross): reduce user Def/SpeDef by ~~2~~ 1 - Buff Pawmot: Attack 27 → 35, HP: 230 → 240 - Zeraora is now Electric/Wild instead of Electric/Fighting +- Change Crabhammer (Poliwrath, Corphish): can now crit by default with a 30% increased crit chance # Changes to Synergies diff --git a/app/public/dist/client/locales/en/translation.json b/app/public/dist/client/locales/en/translation.json index ea335a517..540e3cacd 100644 --- a/app/public/dist/client/locales/en/translation.json +++ b/app/public/dist/client/locales/en/translation.json @@ -1331,7 +1331,7 @@ "HEAD_SMASH": "The user hurts itself for [10,20,40,SP] PHYSICAL and deals [40,80,150,SP] SPECIAL to the target. Execute the target if they are SLEEP or FREEZE", "ROCK_HEAD": "Deal [120,SP]% of ATK + DEF as SPECIAL", "CORRUPTED_NATURE": "WOUND adjacent enemy Pokémon for 5 seconds and deal [20,40,80,SP] SPECIAL to them. Restores HP for the amount of damage dealt", - "CRABHAMMER": "Deal [40,80,120,SP] SPECIAL to the target with a high chance to deal a critical hit. Execute the target if they are below 30% HP", + "CRABHAMMER": "Deal [40,80,120,SP] SPECIAL to the target. Execute the target if they are below 30% HP. Can crit by default with a 30% increased CRIT_CHANCE.", "DIAMOND_STORM": "Deal [200,SP]% of the user's DEF as SPECIAL to all adjacent enemy Pokémon", "DRACO_ENERGY": "Deal [100,SP]% of the user's HP as SPECIAL to the target", "DYNAMAX_CANNON": "Shoot a Dynamax beam in a straight line. Enemy Pokémon hit take [50,SP]% of their max HP as SPECIAL", @@ -1512,7 +1512,7 @@ "MAGIC_POWDER": "Gain [10,20,40,SP] SHIELD and SILENCE adjacent enemies for [2,3,4] seconds", "INFERNAL_PARADE": "Shoot a returning Flame Wheel, 50% chance to BURN for 3s and dealing twice [30, SP] SPECIAL to all enemy Pokémon hit", "RETALIATE": "Deals [15,30,60,SP] SPECIAL to the target + [10,15,25,SP] additional SPECIAL per fallen ally", - "SLASH": "Deals [10,20,40,SP] SPECIAL with a [30,60,90]% increased CRIT_CHANCE ratio", + "SLASH": "Deals [10,20,40,SP] SPECIAL with a [30,60,90]% increased CRIT_CHANCE ratio. Can crit by default.", "OUTRAGE": "The Pokémon is CONFUSION for 2 seconds and deals [100,150,200,SP]% ATK as SPECIAL to the target and adjacent enemies", "LUNGE": "Jumps to the opponent with the highest ATK, deals [50,SP] SPECIAL and reduce its ATK by [5,SP]", "KNOCK_OFF": "Deals [90,SP] SPECIAL. If target is holding items, they are removed and an additional [30,SP] SPECIAL is dealt per item", diff --git a/app/public/dist/client/locales/fr/translation.json b/app/public/dist/client/locales/fr/translation.json index 1d257b8be..907e39640 100644 --- a/app/public/dist/client/locales/fr/translation.json +++ b/app/public/dist/client/locales/fr/translation.json @@ -1331,7 +1331,7 @@ "HEAD_SMASH": "Le pokémon se blesse en perdant [10,20,40,SP] PHYSICAL et inflige [40,80,150,SP] SPECIAL. Exécute la cible si elle a le statut SLEEP ou FREEZE", "ROCK_HEAD": "Inflige [120,SP]% de la somme de son ATK et de sa DEF en SPECIAL", "CORRUPTED_NATURE": "Inflige WOUND aux ennemis adjacents pendant 5 secondes et vole leur vie à hauteur de [20,40,80,SP] SPECIAL", - "CRABHAMMER": "Inflige [40,80,120,SP] SPECIAL. Forte chance de critique. Exécute la cible si elle a moins de 30 % de ses HP", + "CRABHAMMER": "Inflige [40,80,120,SP] SPECIAL. Exécute la cible si elle a moins de 30 % de ses HP. Peut infliger un coup critique par défaut avec une CRIT_CHANCE augmentée de 30%.", "DIAMOND_STORM": "Inflige [200,SP] % de la DEF actuelle sous forme de SPECIAL aux ennemis adjacents", "DRACO_ENERGY": "Inflige [100,SP] % des HP de Regidraco en tant que SPECIAL", "DYNAMAX_CANNON": "Tire un rayon Dynamax en ligne droite, infligeant à chaque pokémon touché [50,SP]% de leurs HP max en SPECIAL", @@ -1512,7 +1512,7 @@ "MAGIC_POWDER": "Gagne [10,20,40,SP] SHIELD et SILENCE les ennemis adjacents pendant [2,3,4] secondes", "INFERNAL_PARADE": "Envoie une Roue de Feu en boomerang, ayant 50% de chance de BURN pendant 3 secondes et infligeant 2 fois [30,SP] SPECIAL à tous les pokémons adverses touchés.", "RETALIATE": "Inflige [15,30,60,SP] SPECIAL à la cible + [10,15,25,SP] SPECIAL additionels par allié KO", - "SLASH": "Inflige [10,20,40,SP] SPECIAL avec [30,60,90]% de CRIT_CHANCE augmentée", + "SLASH": "Inflige [10,20,40,SP] SPECIAL à la cible. Peut infliger un coup critique par défaut avec [30,60,90]% de CRIT_CHANCE augmentée", "OUTRAGE": "Le pokémon est CONFUSION pendant 2 secondes et inflige [100,150,200,SP]% ATK en SPECIAL à la cible et aux ennemis adjacents", "LUNGE": "Saute sur l'unité adverse avec la plus grosse ATK, inflige [50,SP] SPECIAL et réduit son ATK de [5,SP]", "KNOCK_OFF": "Inflige [90,SP] SPECIAL. Si la cible porte des objets, ils sont retirés et [30,SP] SPECIAL additionnels sont infligés par objet perdu",