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

Fixed some items not being consumed when they should upon the holder being hit, and made them trigger Cheeck Pouch/Symbiosis where relevant

Browse Source
This commit is contained in:
Maruno17
2020-09-18 20:09:05 +01:00
parent a619300a7e
commit 7ac820beb6
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Data/Scripts/012_Battle/008_BattleHandlers_Items.rb
View File

@@ -1003,7 +1003,7 @@ BattleHandlers::TargetItemOnHit.add(:ABSORBBULB,
next if !target.pbCanRaiseStatStage?(PBStats::SPATK,target) next if !target.pbCanRaiseStatStage?(PBStats::SPATK,target)
battle.pbCommonAnimation("UseItem",target) battle.pbCommonAnimation("UseItem",target)
target.pbRaiseStatStageByCause(PBStats::SPATK,1,target,target.itemName) target.pbRaiseStatStageByCause(PBStats::SPATK,1,target,target.itemName)
target.pbConsumeItem target.pbHeldItemTriggered(item)
} }
) )
@@ -1011,6 +1011,7 @@ BattleHandlers::TargetItemOnHit.add(:AIRBALLOON,
proc { |item,user,target,move,battle| proc { |item,user,target,move,battle|
battle.pbDisplay(_INTL("{1}'s {2} popped!",target.pbThis,target.itemName)) battle.pbDisplay(_INTL("{1}'s {2} popped!",target.pbThis,target.itemName))
target.pbConsumeItem(false,true) target.pbConsumeItem(false,true)
target.pbSymbiosis
} }
) )
@@ -1020,7 +1021,7 @@ BattleHandlers::TargetItemOnHit.add(:CELLBATTERY,
next if !target.pbCanRaiseStatStage?(PBStats::ATTACK,target) next if !target.pbCanRaiseStatStage?(PBStats::ATTACK,target)
battle.pbCommonAnimation("UseItem",target) battle.pbCommonAnimation("UseItem",target)
target.pbRaiseStatStageByCause(PBStats::ATTACK,1,target,target.itemName) target.pbRaiseStatStageByCause(PBStats::ATTACK,1,target,target.itemName)
target.pbConsumeItem target.pbHeldItemTriggered(item)
} }
) )
@@ -1028,7 +1029,9 @@ BattleHandlers::TargetItemOnHit.add(:ENIGMABERRY,
proc { |item,user,target,move,battle| proc { |item,user,target,move,battle|
next if target.damageState.substitute || target.damageState.disguise next if target.damageState.substitute || target.damageState.disguise
next if !PBTypes.superEffective?(target.damageState.typeMod) next if !PBTypes.superEffective?(target.damageState.typeMod)
BattleHandlers.triggerTargetItemOnHitPositiveBerry(item,target,battle,false) if BattleHandlers.triggerTargetItemOnHitPositiveBerry(item,target,battle,false)
target.pbHeldItemTriggered(item)
end
} }
) )
@@ -1042,7 +1045,7 @@ BattleHandlers::TargetItemOnHit.add(:JABOCABERRY,
user.pbReduceHP(user.totalhp/8,false) user.pbReduceHP(user.totalhp/8,false)
battle.pbDisplay(_INTL("{1} consumed its {2} and hurt {3}!",target.pbThis, battle.pbDisplay(_INTL("{1} consumed its {2} and hurt {3}!",target.pbThis,
target.itemName,user.pbThis(true))) target.itemName,user.pbThis(true)))
target.pbConsumeItem target.pbHeldItemTriggered(item)
} }
) )
@@ -1054,7 +1057,9 @@ BattleHandlers::TargetItemOnHit.add(:JABOCABERRY,
BattleHandlers::TargetItemOnHit.add(:KEEBERRY, BattleHandlers::TargetItemOnHit.add(:KEEBERRY,
proc { |item,user,target,move,battle| proc { |item,user,target,move,battle|
next if !move.physicalMove? next if !move.physicalMove?
BattleHandlers.triggerTargetItemOnHitPositiveBerry(item,target,battle,false) if BattleHandlers.triggerTargetItemOnHitPositiveBerry(item,target,battle,false)
target.pbHeldItemTriggered(item)
end
} }
) )
@@ -1064,7 +1069,7 @@ BattleHandlers::TargetItemOnHit.add(:LUMINOUSMOSS,
next if !target.pbCanRaiseStatStage?(PBStats::SPDEF,target) next if !target.pbCanRaiseStatStage?(PBStats::SPDEF,target)
battle.pbCommonAnimation("UseItem",target) battle.pbCommonAnimation("UseItem",target)
target.pbRaiseStatStageByCause(PBStats::SPDEF,1,target,target.itemName) target.pbRaiseStatStageByCause(PBStats::SPDEF,1,target,target.itemName)
target.pbConsumeItem target.pbHeldItemTriggered(item)
} }
) )
@@ -1076,7 +1081,9 @@ BattleHandlers::TargetItemOnHit.add(:LUMINOUSMOSS,
BattleHandlers::TargetItemOnHit.add(:MARANGABERRY, BattleHandlers::TargetItemOnHit.add(:MARANGABERRY,
proc { |item,user,target,move,battle| proc { |item,user,target,move,battle|
next if !move.specialMove? next if !move.specialMove?
BattleHandlers.triggerTargetItemOnHitPositiveBerry(item,target,battle,false) if BattleHandlers.triggerTargetItemOnHitPositiveBerry(item,target,battle,false)
target.pbHeldItemTriggered(item)
end
} }
) )
@@ -1100,7 +1107,7 @@ BattleHandlers::TargetItemOnHit.add(:ROWAPBERRY,
user.pbReduceHP(user.totalhp/8,false) user.pbReduceHP(user.totalhp/8,false)
battle.pbDisplay(_INTL("{1} consumed its {2} and hurt {3}!",target.pbThis, battle.pbDisplay(_INTL("{1} consumed its {2} and hurt {3}!",target.pbThis,
target.itemName,user.pbThis(true))) target.itemName,user.pbThis(true)))
target.pbConsumeItem target.pbHeldItemTriggered(item)
} }
) )
@@ -1110,7 +1117,7 @@ BattleHandlers::TargetItemOnHit.add(:SNOWBALL,
next if !target.pbCanRaiseStatStage?(PBStats::ATTACK,target) next if !target.pbCanRaiseStatStage?(PBStats::ATTACK,target)
battle.pbCommonAnimation("UseItem",target) battle.pbCommonAnimation("UseItem",target)
target.pbRaiseStatStageByCause(PBStats::ATTACK,1,target,target.itemName) target.pbRaiseStatStageByCause(PBStats::ATTACK,1,target,target.itemName)
target.pbConsumeItem target.pbHeldItemTriggered(item)
} }
) )
@@ -1147,7 +1154,7 @@ BattleHandlers::TargetItemOnHit.add(:WEAKNESSPOLICY,
if target.pbCanRaiseStatStage?(PBStats::SPATK,target) if target.pbCanRaiseStatStage?(PBStats::SPATK,target)
target.pbRaiseStatStageByCause(PBStats::SPATK,2,target,target.itemName,showAnim) target.pbRaiseStatStageByCause(PBStats::SPATK,2,target,target.itemName,showAnim)
end end
target.pbConsumeItem target.pbHeldItemTriggered(item)
} }
) )