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

Fixed error when gaining happiness while at/above the happiness soft cap

Browse Source
This commit is contained in:
Maruno17
2023-01-01 18:34:54 +00:00
parent 522f78b75d
commit 9dd774a767
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb
View File

@@ -191,5 +191,5 @@ Battle::PokeBallEffects::OnCatch.add(:HEALBALL, proc { |ball, battle, pkmn|
}) })
Battle::PokeBallEffects::OnCatch.add(:FRIENDBALL, proc { |ball, battle, pkmn| Battle::PokeBallEffects::OnCatch.add(:FRIENDBALL, proc { |ball, battle, pkmn|
pkmn.happiness = 200 pkmn.happiness = (Settings::APPLY_HAPPINESS_SOFT_CAP) ? 150 : 200
}) })

2
Data/Scripts/014_Pokemon/001_Pokemon.rb
View File

@@ -962,7 +962,7 @@ class Pokemon
gain += 1 if @poke_ball == :LUXURYBALL gain += 1 if @poke_ball == :LUXURYBALL
gain = (gain * 1.5).floor if hasItem?(:SOOTHEBELL) gain = (gain * 1.5).floor if hasItem?(:SOOTHEBELL)
if Settings::APPLY_HAPPINESS_SOFT_CAP && method != "evberry" if Settings::APPLY_HAPPINESS_SOFT_CAP && method != "evberry"
gain = gain.clamp(0, 179 - @happiness) gain = (@happiness >= 179) ? 0 : gain.clamp(0, 179 - @happiness)
end end
end end
@happiness = (@happiness + gain).clamp(0, 255) @happiness = (@happiness + gain).clamp(0, 255)