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

Fixing up after merge from master

Browse Source
This commit is contained in:
Maruno17
2021-01-10 19:25:27 +00:00
parent b11bc133bd
commit a5d1359dfe
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/012_Battle/001_Battler/006_Battler_AbilityAndItem.rb
View File

@@ -129,7 +129,7 @@ class PokeBattle_Battler
return true return true
end end
def canConsumePinchBerry?(_item, check_gluttony = true) def canConsumePinchBerry?(check_gluttony = true)
return false if !canConsumeBerry? return false if !canConsumeBerry?
return true if @hp <= @totalhp / 4 return true if @hp <= @totalhp / 4
return true if @hp <= @totalhp / 2 && (!check_gluttony || hasActiveAbility?(:GLUTTONY)) return true if @hp <= @totalhp / 2 && (!check_gluttony || hasActiveAbility?(:GLUTTONY))

4
Data/Scripts/012_Battle/006_BattleHandlers.rb
View File

@@ -491,7 +491,7 @@ FINAL_DMG_MULT = 3
def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg) def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg)
return false if !forced && !battler.canHeal? return false if !forced && !battler.canHeal?
return false if !forced && !battler.canConsumePinchBerry?(item, (MECHANICS_GENERATION >= 7)) return false if !forced && !battler.canConsumePinchBerry?(MECHANICS_GENERATION >= 7)
itemName = GameData::Item.get(item).name itemName = GameData::Item.get(item).name
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
fraction_to_heal = 8 # Gens 6 and lower fraction_to_heal = 8 # Gens 6 and lower
@@ -517,7 +517,7 @@ def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg)
end end
def pbBattleStatIncreasingBerry(battler,battle,item,forced,stat,increment=1) def pbBattleStatIncreasingBerry(battler,battle,item,forced,stat,increment=1)
return false if !forced && !battler.canConsumePinchBerry?(item) return false if !forced && !battler.canConsumePinchBerry?
return false if !battler.pbCanRaiseStatStage?(stat,battler) return false if !battler.pbCanRaiseStatStage?(stat,battler)
itemName = GameData::Item.get(item).name itemName = GameData::Item.get(item).name
if forced if forced

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

@@ -97,7 +97,7 @@ BattleHandlers::HPHealItem.add(:IAPAPABERRY,
BattleHandlers::HPHealItem.add(:LANSATBERRY, BattleHandlers::HPHealItem.add(:LANSATBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && !battler.canConsumePinchBerry?(item) next false if !forced && !battler.canConsumePinchBerry?
next false if battler.effects[PBEffects::FocusEnergy]>=2 next false if battler.effects[PBEffects::FocusEnergy]>=2
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
battler.effects[PBEffects::FocusEnergy] = 2 battler.effects[PBEffects::FocusEnergy] = 2
@@ -126,7 +126,7 @@ BattleHandlers::HPHealItem.add(:MAGOBERRY,
BattleHandlers::HPHealItem.add(:MICLEBERRY, BattleHandlers::HPHealItem.add(:MICLEBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && !battler.canConsumePinchBerry?(item) next false if !forced && !battler.canConsumePinchBerry?
next false if !battler.effects[PBEffects::MicleBerry] next false if !battler.effects[PBEffects::MicleBerry]
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
battler.effects[PBEffects::MicleBerry] = true battler.effects[PBEffects::MicleBerry] = true
@@ -145,8 +145,7 @@ BattleHandlers::HPHealItem.add(:MICLEBERRY,
BattleHandlers::HPHealItem.add(:ORANBERRY, BattleHandlers::HPHealItem.add(:ORANBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !battler.canHeal? next false if !battler.canHeal?
next false if !forced && !battler.canConsumeBerry? next false if !forced && !battler.canConsumePinchBerry?(false)
next false if !forced && battler.hp>battler.totalhp/2
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
battler.pbRecoverHP(10) battler.pbRecoverHP(10)
itemName = GameData::Item.get(item).name itemName = GameData::Item.get(item).name
@@ -175,8 +174,7 @@ BattleHandlers::HPHealItem.add(:SALACBERRY,
BattleHandlers::HPHealItem.add(:SITRUSBERRY, BattleHandlers::HPHealItem.add(:SITRUSBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !battler.canHeal? next false if !battler.canHeal?
next false if !forced && !battler.canConsumeBerry? next false if !forced && !battler.canConsumePinchBerry?(false)
next false if !forced && battler.hp>battler.totalhp/2
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
battler.pbRecoverHP(battler.totalhp/4) battler.pbRecoverHP(battler.totalhp/4)
itemName = GameData::Item.get(item).name itemName = GameData::Item.get(item).name
@@ -370,7 +368,7 @@ BattleHandlers::StatusCureItem.add(:RAWSTBERRY,
BattleHandlers::PriorityBracketChangeItem.add(:CUSTAPBERRY, BattleHandlers::PriorityBracketChangeItem.add(:CUSTAPBERRY,
proc { |item,battler,subPri,battle| proc { |item,battler,subPri,battle|
next if !battler.canConsumePinchBerry?(item) next if !battler.canConsumePinchBerry?
next 1 if subPri<1 next 1 if subPri<1
} }
) )