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

Fixes pokeradar in wild pokemon area mode

Browse Source
This commit is contained in:
infinitefusion
2022-09-24 15:15:59 -04:00
parent 695c4fa924
commit 68aae5f061
14 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/013_Items/005_Item_PokeRadar.rb
View File

@@ -49,6 +49,7 @@ def pbUsePokeRadar
$PokemonGlobal.pokeradarBattery = Settings::POKERADAR_BATTERY_STEPS
unseenPokemon = listPokemonInCurrentRoute($PokemonEncounters.encounter_type, false, true)
seenPokemon = listPokemonInCurrentRoute($PokemonEncounters.encounter_type, true, false)
rareAllowed = canEncounterRarePokemon(unseenPokemon)
displayPokeradarBanner(seenPokemon, unseenPokemon, rareAllowed)
playPokeradarLightAnimation(rareAllowed)
@@ -115,7 +116,8 @@ def listPokemonInCurrentRoute(encounterType, onlySeen = false, onlyUnseen = fals
seen = []
unseen = []
for encounter in $PokemonEncounters.listPossibleEncounters(encounterType)
species = $game_switches[SWITCH_RANDOM_WILD] ? getRandomizedTo(encounter[1]) : encounter[1]
species = $game_switches[SWITCH_RANDOM_WILD] && !$game_switches[SWITCH_RANDOM_WILD_AREA] ? getRandomizedTo(encounter[1]) : encounter[1]
if !processed.include?(species)
if $Trainer.seen?(species)
seen << species
@@ -273,7 +275,7 @@ EncounterModifier.register(proc { |encounter|
end
else
# Encounter triggered by stepping in non-rustling grass
pbPokeRadarCancel if encounter && $PokemonGlobal.repel <= 0
pbPokeRadarCancel if encounter && $PokemonGlobal.repel <= 0
end
next encounter
})