mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-09 22:24:58 +00:00
Fixed location signpost not appearing properly when using Fly, fixed wild/trainer Pokémon with a "getForm" handler not using it
This commit is contained in:
@@ -14,6 +14,7 @@ class LocationWindow
|
||||
@window.viewport.z = 99999
|
||||
@currentmap = $game_map.map_id
|
||||
@timer_start = System.uptime
|
||||
@delayed = !$game_temp.fly_destination.nil?
|
||||
end
|
||||
|
||||
def disposed?
|
||||
@@ -25,7 +26,11 @@ class LocationWindow
|
||||
end
|
||||
|
||||
def update
|
||||
return if @window.disposed?
|
||||
return if @window.disposed? || $game_temp.fly_destination
|
||||
if @delayed
|
||||
@timer_start = System.uptime
|
||||
@delayed = false
|
||||
end
|
||||
@window.update
|
||||
if $game_temp.message_window_showing || @currentmap != $game_map.map_id
|
||||
@window.dispose
|
||||
|
||||
@@ -443,6 +443,7 @@ def pbGenerateWildPokemon(species, level, isRoamer = false)
|
||||
end
|
||||
end
|
||||
# Trigger events that may alter the generated Pokémon further
|
||||
genwildpoke.form_simple = genwildpoke.form if MultipleForms.hasFunction?(genwildpoke.species, "getForm")
|
||||
EventHandlers.trigger(:on_wild_pokemon_created, genwildpoke)
|
||||
return genwildpoke
|
||||
end
|
||||
|
||||
@@ -487,7 +487,6 @@ def pbFlyToNewLocation(pkmn = nil, move = :FLY)
|
||||
$game_temp.player_new_x = $game_temp.fly_destination[1]
|
||||
$game_temp.player_new_y = $game_temp.fly_destination[2]
|
||||
$game_temp.player_new_direction = 2
|
||||
$game_temp.fly_destination = nil
|
||||
pbDismountBike
|
||||
$scene.transfer_player
|
||||
$game_map.autoplay
|
||||
@@ -496,6 +495,7 @@ def pbFlyToNewLocation(pkmn = nil, move = :FLY)
|
||||
pbWait(0.25)
|
||||
end
|
||||
pbEraseEscapePoint
|
||||
$game_temp.fly_destination = nil
|
||||
return true
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user