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

Battlers now make use of Ability objects to be consistent with Pokemon objects

Browse Source
This commit is contained in:
Maruno17
2020-11-04 21:27:56 +00:00
parent 9dc6da0742
commit ff70791104
26 changed files with 189 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/013_Overworld/002_PField_Field.rb
View File

@@ -1161,7 +1161,7 @@ def pbFishingEnd
end
def pbFishing(hasEncounter,rodType=1)
speedup = ($Trainer.firstPokemon && [:STICKYHOLD, :SUCTIONCUPS].include?($Trainer.firstPokemon.ability))
speedup = ($Trainer.firstPokemon && [:STICKYHOLD, :SUCTIONCUPS].include?($Trainer.firstPokemon.ability_id))
biteChance = 20+(25*rodType) # 45, 70, 95
biteChance *= 1.5 if speedup # 67.5, 100, 100
hookChance = 100

41
Data/Scripts/013_Overworld/007_PField_Encounters.rb
View File

@@ -328,40 +328,33 @@ class PokemonEncounters
# modifiers applied, divided by 180 (numbers are multiplied by 16 below to
# increase precision).
encount = @density[enctype]*16
encount = encount*0.8 if $PokemonGlobal.bicycle
encount *= 0.8 if $PokemonGlobal.bicycle
if !NEWEST_BATTLE_MECHANICS
if $PokemonMap.blackFluteUsed
encount = encount/2
encount /= 2
elsif $PokemonMap.whiteFluteUsed
encount = encount*1.5
encount *= 1.5
end
end
firstPkmn = $Trainer.firstPokemon
if firstPkmn
if firstPkmn.hasItem?(:CLEANSETAG)
encount = encount*2/3
encount *= 2.0 / 3
elsif firstPkmn.hasItem?(:PUREINCENSE)
encount = encount*2/3
encount *= 2.0 / 3
else # Ignore ability effects if an item effect applies
if firstPkmn.hasAbility?(:STENCH)
encount = encount/2
elsif firstPkmn.hasAbility?(:WHITESMOKE)
encount = encount/2
elsif firstPkmn.hasAbility?(:QUICKFEET)
encount = encount/2
elsif firstPkmn.hasAbility?(:SNOWCLOAK)
encount = encount/2 if $game_screen.weather_type==PBFieldWeather::Snow ||
$game_screen.weather_type==PBFieldWeather::Blizzard
elsif firstPkmn.hasAbility?(:SANDVEIL)
encount = encount/2 if $game_screen.weather_type==PBFieldWeather::Sandstorm
elsif firstPkmn.hasAbility?(:SWARM)
encount = encount*1.5
elsif firstPkmn.hasAbility?(:ILLUMINATE)
encount = encount*2
elsif firstPkmn.hasAbility?(:ARENATRAP)
encount = encount*2
elsif firstPkmn.hasAbility?(:NOGUARD)
encount = encount*2
case firstPkmn.ability_id
when :STENCH, :WHITESMOKE, :QUICKFEET
encount /= 2
when :SNOWCLOAK
encount /= 2 if $game_screen.weather_type==PBFieldWeather::Snow ||
$game_screen.weather_type==PBFieldWeather::Blizzard
when :SANDVEIL
encount /= 2 if $game_screen.weather_type==PBFieldWeather::Sandstorm
when :SWARM
encount *= 1.5
when :ILLUMINATE, :ARENATRAP, :NOGUARD
encount *= 2
end
end
end