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

Merge branch 'dev' into ai

Browse Source
This commit is contained in:
Maruno17
2023-01-08 21:56:33 +00:00
parent 3fa94bacc6 632b0f8b4b
commit a22f75f500
46 changed files with 1701 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -962,7 +962,7 @@ class Pokemon
gain += 1 if @poke_ball == :LUXURYBALL
gain = (gain * 1.5).floor if hasItem?(:SOOTHEBELL)
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
@happiness = (@happiness + gain).clamp(0, 255)