Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix Stomping Tantrum incorrectly doubling after canceled two-turn moves (#11760)

Browse Source 
* fix stomping tantrum not doubling when fly is canceled by smack down

* Update sim/battle-actions.ts

Co-authored-by: André Bastos Dias <80102738+andrebastosdias@users.noreply.github.com>

---------

Co-authored-by: TurboRx <TurboRx@users.noreply.github.com>
Co-authored-by: André Bastos Dias <80102738+andrebastosdias@users.noreply.github.com>
This commit is contained in:
TurboRx 2026-02-13 22:27:20 +05:30 committed by GitHub
parent ae43883ed1
commit 7a55285dd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sim/battle-actions.ts
View File

@ -485,10 +485,13 @@ export class BattleActions {
}
}
if (!this.battle.singleEvent('TryMove', move, null, pokemon, target, move) ||
!this.battle.runEvent('TryMove', pokemon, target, move)) {
let tryMoveResult = this.battle.singleEvent('TryMove', move, null, pokemon, target, move);
if (tryMoveResult) {
tryMoveResult = this.battle.runEvent('TryMove', pokemon, target, move);
}
if (!tryMoveResult) {
move.mindBlownRecoil = false;
return false;
return tryMoveResult;
}
this.battle.singleEvent('UseMoveMessage', move, null, pokemon, target, move);

2
test/sim/moves/stompingtantrum.js
View File

@ -90,7 +90,7 @@ describe('Stomping Tantrum', () => {
battle.makeChoices('move stompingtantrum', 'auto');
});
it.skip(`should not double its Base Power if the user dropped mid-Fly due to Smack Down`, () => {
it(`should not double its Base Power if the user dropped mid-Fly due to Smack Down`, () => {
battle = common.createBattle([[
{ species: 'Magikarp', moves: ['fly', 'stompingtantrum'] },
], [