From 990be3757c2fe75cda6b133b96b3e0d0282686b7 Mon Sep 17 00:00:00 2001 From: m3rein Date: Sat, 5 Sep 2020 13:01:41 +0200 Subject: [PATCH] Fix use of wrong variable in Protean --- .../Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb b/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb index aa32fd603..dc94eda63 100644 --- a/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb +++ b/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb @@ -65,7 +65,7 @@ class PokeBattle_Battler end #============================================================================= - # + # #============================================================================= def pbBeginTurn(choice) # Cancel some lingering effects which only apply until the user next moves @@ -255,7 +255,7 @@ class PokeBattle_Battler end @battle.lastMoveUsed = move.id # For Copycat @battle.lastMoveUser = @index # For "self KO" battle clause to avoid draws - @battle.successStates[@index].useState = 1 # Battle Arena - assume failure + @battle.successStates[@index].useState = 1 # Battle Arena - assume failure # Find the default user (self or Snatcher) and target(s) user = pbFindUser(choice,move) user = pbChangeUser(choice,move,user) @@ -360,7 +360,7 @@ class PokeBattle_Battler end # Protean if user.hasActiveAbility?(:PROTEAN) && !move.callsAnotherMove? && !move.snatched - if user.pbHasOtherType?(moveType) && !PBTypes.isPseudoType?(move.calcType) + if user.pbHasOtherType?(move.calcType) && !PBTypes.isPseudoType?(move.calcType) @battle.pbShowAbilitySplash(user) user.pbChangeTypes(move.calcType) typeName = PBTypes.getName(move.calcType) @@ -726,4 +726,4 @@ class PokeBattle_Battler user.pbFaint if user.fainted? return true end -end \ No newline at end of file +end