Fixes for Battle Arena

This commit is contained in:
Maruno17
2021-05-04 21:30:26 +01:00
parent 3d88b85f56
commit 6efca2f9a8
5 changed files with 113 additions and 105 deletions

View File

@@ -88,10 +88,10 @@ class PokeBattle_Battler
# Pursuit was used specially to intercept a switching foe.
# Cancels the use of multi-turn moves and counters thereof. Note that Hyper
# Beam's effect is NOT cancelled.
def pbCancelMoves
def pbCancelMoves(full_cancel = false)
# Outragers get confused anyway if they are disrupted during their final
# turn of using the move
if @effects[PBEffects::Outrage]==1 && pbCanConfuseSelf?(false)
if @effects[PBEffects::Outrage]==1 && pbCanConfuseSelf?(false) && !full_cancel
pbConfuse(_INTL("{1} became confused due to fatigue!",pbThis))
end
# Cancel usage of most multi-turn moves