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 Heavy Ball's catch rate calculation being inaccurate, added Obstruct to some moves' blacklists

Browse Source
This commit is contained in:
Maruno17
2022-07-03 15:22:34 +01:00
parent 7e183a92aa
commit 94c6b6db0c
4 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ Battle::PokeBallEffects::ModifyCatchRate.add(:LUREBALL, proc { |ball, catchRate,
Battle::PokeBallEffects::ModifyCatchRate.add(:HEAVYBALL, proc { |ball, catchRate, battle, battler|
next 0 if catchRate == 0
weight = battler.pokemon.species_data.base_stats[:SPEED]
weight = battler.pbWeight
if Settings::NEW_POKE_BALL_CATCH_RATES
if weight >= 3000
catchRate += 30
@@ -141,8 +141,7 @@ Battle::PokeBallEffects::ModifyCatchRate.add(:HEAVYBALL, proc { |ball, catchRate
catchRate -= 20
end
end
catchRate = [catchRate, 1].max
next [catchRate, 255].min
next catchRate.clamp(1, 255)
})
Battle::PokeBallEffects::ModifyCatchRate.add(:LOVEBALL, proc { |ball, catchRate, battle, battler|