DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 21:24:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of wrong variable in Protean

Browse Source
This commit is contained in:
m3rein
2020-09-05 13:01:41 +02:00
parent 296b1088ec
commit 990be3757c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb
View File

@@ -65,7 +65,7 @@ class PokeBattle_Battler
end end
#============================================================================= #=============================================================================
# #
#============================================================================= #=============================================================================
def pbBeginTurn(choice) def pbBeginTurn(choice)
# Cancel some lingering effects which only apply until the user next moves # Cancel some lingering effects which only apply until the user next moves
@@ -255,7 +255,7 @@ class PokeBattle_Battler
end end
@battle.lastMoveUsed = move.id # For Copycat @battle.lastMoveUsed = move.id # For Copycat
@battle.lastMoveUser = @index # For "self KO" battle clause to avoid draws @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) # Find the default user (self or Snatcher) and target(s)
user = pbFindUser(choice,move) user = pbFindUser(choice,move)
user = pbChangeUser(choice,move,user) user = pbChangeUser(choice,move,user)
@@ -360,7 +360,7 @@ class PokeBattle_Battler
end end
# Protean # Protean
if user.hasActiveAbility?(:PROTEAN) && !move.callsAnotherMove? && !move.snatched 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) @battle.pbShowAbilitySplash(user)
user.pbChangeTypes(move.calcType) user.pbChangeTypes(move.calcType)
typeName = PBTypes.getName(move.calcType) typeName = PBTypes.getName(move.calcType)
@@ -726,4 +726,4 @@ class PokeBattle_Battler
user.pbFaint if user.fainted? user.pbFaint if user.fainted?
return true return true
end end
end end