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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-01-10 19:11:26 +00:00
parent d4a7de4bdd 386396cdf6
commit b11bc133bd
7 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,8 +124,13 @@ class PokeBattle_Battler
#=============================================================================
# Held item consuming/removing
#=============================================================================
def pbCanConsumeBerry?(_item, check_gluttony = true)
def canConsumeBerry?
return false if @battle.pbCheckOpposingAbility(:UNNERVE, @index)
return true
end
def canConsumePinchBerry?(_item, check_gluttony = true)
return false if !canConsumeBerry?
return true if @hp <= @totalhp / 4
return true if @hp <= @totalhp / 2 && (!check_gluttony || hasActiveAbility?(:GLUTTONY))
return false