mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
indoor rain fix
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -271,18 +271,8 @@ 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|
|
||||||
@@ -295,17 +285,37 @@ Events.onMapChange += proc { |_sender, e|
|
|||||||
$PokemonEncounters.setup($game_map.map_id) if $PokemonEncounters
|
$PokemonEncounters.setup($game_map.map_id) if $PokemonEncounters
|
||||||
$PokemonGlobal.visitedMaps[$game_map.map_id] = true
|
$PokemonGlobal.visitedMaps[$game_map.map_id] = true
|
||||||
next if old_map_ID == 0 || old_map_ID == $game_map.map_id
|
next if old_map_ID == 0 || old_map_ID == $game_map.map_id
|
||||||
next if !new_map_metadata || !new_map_metadata.weather
|
|
||||||
|
if !new_map_metadata || !new_map_metadata.weather
|
||||||
|
$game_screen.weather(:None, 0, 0)
|
||||||
|
next
|
||||||
|
end
|
||||||
map_infos = pbLoadMapInfos
|
map_infos = pbLoadMapInfos
|
||||||
if $game_map.name == map_infos[old_map_ID].name
|
if $game_map.name == map_infos[old_map_ID].name
|
||||||
old_map_metadata = GameData::MapMetadata.try_get(old_map_ID)
|
old_map_metadata = GameData::MapMetadata.try_get(old_map_ID)
|
||||||
next if old_map_metadata && old_map_metadata.weather
|
next if old_map_metadata && old_map_metadata.weather
|
||||||
end
|
end
|
||||||
new_weather = new_map_metadata.weather
|
new_weather = new_map_metadata.weather
|
||||||
|
|
||||||
|
if !new_map_metadata.outdoor_map
|
||||||
|
$game_screen.weather(:None, 0, 0)
|
||||||
|
next
|
||||||
|
end
|
||||||
$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.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
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Events.onMapSceneChange += proc { |_sender, e|
|
Events.onMapSceneChange += proc { |_sender, e|
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user