Condensed references to Unnerve, fixed Copycat always using Copycat

This commit is contained in:
Maruno17
2021-01-10 19:00:03 +00:00
parent 831555616e
commit 386396cdf6
4 changed files with 36 additions and 26 deletions

View File

@@ -491,7 +491,7 @@ FINAL_DMG_MULT = 3
def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg)
return false if !forced && !battler.canHeal?
return false if !forced && !battler.pbCanConsumeBerry?(item,false)
return false if !forced && !battler.canConsumePinchBerry?(item,false)
itemName = PBItems.getName(item)
battle.pbCommonAnimation("EatBerry",battler) if !forced
amt = (NEWEST_BATTLE_MECHANICS) ? battler.pbRecoverHP(battler.totalhp/2) : battler.pbRecoverHP(battler.totalhp/8)
@@ -513,7 +513,7 @@ def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg)
end
def pbBattleStatIncreasingBerry(battler,battle,item,forced,stat,increment=1)
return false if !forced && !battler.pbCanConsumeBerry?(item)
return false if !forced && !battler.canConsumePinchBerry?(item)
return false if !battler.pbCanRaiseStatStage?(stat,battler)
itemName = PBItems.getName(item)
if forced