rain for Feebas

This commit is contained in:
infinitefusion
2022-07-01 16:12:59 -04:00
parent 1f3eb29c31
commit c9248d379e
8 changed files with 25 additions and 3 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -271,6 +271,18 @@ Events.onMapChanging += proc { |_sender, e|
end end
$game_screen.weather(:None, 0, 0) $game_screen.weather(:None, 0, 0)
} }
Events.onMapChange += proc { |_sender, e|
next if !Settings::SEVII_ROAMING.include?($game_map.map_id)
new_map_ID = e[0]
new_map_metadata = GameData::MapMetadata.try_get(new_map_ID)
next if new_map_metadata && new_map_metadata.weather
feebas_map = $PokemonGlobal.roamPosition[4]
if $game_map.map_id == feebas_map
$game_screen.weather(:Rain, 4, 0)
else
$game_screen.weather(:None, 0, 0)
end
}
# Set up various data related to the new map # Set up various data related to the new map
Events.onMapChange += proc { |_sender, e| Events.onMapChange += proc { |_sender, e|
@@ -293,6 +305,9 @@ Events.onMapChange += proc { |_sender, e|
$game_screen.weather(new_weather[0], 9, 0) if rand(100) < new_weather[1] $game_screen.weather(new_weather[0], 9, 0) if rand(100) < new_weather[1]
} }
Events.onMapSceneChange += proc { |_sender, e| Events.onMapSceneChange += proc { |_sender, e|
scene = e[0] scene = e[0]
mapChanged = e[1] mapChanged = e[1]

View File

@@ -121,7 +121,7 @@ end
# Returns whether the given category of encounter contains the actual encounter # Returns whether the given category of encounter contains the actual encounter
# method that will occur in the player's current position. # method that will occur in the player's current position.
def pbRoamingMethodAllowed(roamer_method) def pbRoamingMethodAllowed(roamer_method)
enc_type = $PokemonEncounters.encounter_type enc_type = $PokemonTemp.encounterType #$PokemonEncounters.encounter_type
type = GameData::EncounterType.get(enc_type).type type = GameData::EncounterType.get(enc_type).type
case roamer_method case roamer_method
when 0 # Any step-triggered method (except Bug Contest) when 0 # Any step-triggered method (except Bug Contest)
@@ -145,7 +145,7 @@ EncounterModifier.register(proc { |encounter|
next encounter if $PokemonGlobal.roamedAlready next encounter if $PokemonGlobal.roamedAlready
next encounter if $PokemonGlobal.partner next encounter if $PokemonGlobal.partner
next encounter if $PokemonTemp.pokeradar next encounter if $PokemonTemp.pokeradar
next encounter if rand(100) < 75 # 25% chance of encountering a roaming Pokémon #next encounter if rand(100) < 75 # 25% chance of encountering a roaming Pokémon
# Look at each roaming Pokémon in turn and decide whether it's possible to # Look at each roaming Pokémon in turn and decide whether it's possible to
# encounter it # encounter it
currentRegion = pbGetCurrentRegion currentRegion = pbGetCurrentRegion

Binary file not shown.

View File

@@ -1941,6 +1941,13 @@ Items = MAXPOTION
Pokemon = B95H24,32 #Arbix, Pokemon = B95H24,32 #Arbix,
Pokemon = B131H111,32 #Rhyras, Pokemon = B131H111,32 #Rhyras,
Pokemon = B115H93,35 #Hauntkan, Pokemon = B115H93,35 #Hauntkan,
[ROCKETBOSS,Giovanni,4] #Silph co
Items = MAXPOTION
Pokemon = B33H57,45 #nidorino + primeape
Pokemon = B131H112,45 #rhydon + lapras
Pokemon = B115H94,47 #gengar + kangaskhan
Pokemon = B31H28,51 #nidoqueen + Sandslash
############################## ##############################
################## ##################
@@ -3487,7 +3494,7 @@ Pokemon = B145H150,45 #Mewdos
[ROCKETBOSS,Giovanni,3] [ROCKETBOSS,Giovanni,3]
Items = FULLHEAL Items = FULLHEAL
Pokemon = BIRDBOSS,50 # Pokemon = BIRDBOSS,60 #
Moves = TRIATTACK2,DRILLPECK,SKYATTACK,HAZE Moves = TRIATTACK2,DRILLPECK,SKYATTACK,HAZE
Ball = MASTERBALL Ball = MASTERBALL
AbilityIndex = 2 AbilityIndex = 2