mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Consolidated code for the player interacting in the overworld, fixed bad splash screen animations, added ShowQuantity property to items.txt, fixed Quick Draw and Aroma Veil, fixed text alignment in long list of regional Dexes in Pokédex, added better error message in load screen if player's charset is missing
This commit is contained in:
@@ -275,7 +275,6 @@ HiddenMoveHandlers::UseMove.add(:DIG, proc { |move, pokemon|
|
||||
# Dive
|
||||
#===============================================================================
|
||||
def pbDive
|
||||
return false if $game_player.pbFacingEvent
|
||||
map_metadata = $game_map.metadata
|
||||
return false if !map_metadata || !map_metadata.dive_map_id
|
||||
move = :DIVE
|
||||
@@ -308,7 +307,6 @@ end
|
||||
|
||||
def pbSurfacing
|
||||
return if !$PokemonGlobal.diving
|
||||
return false if $game_player.pbFacingEvent
|
||||
surface_map_id = nil
|
||||
GameData::MapMetadata.each do |map_data|
|
||||
next if !map_data.dive_map_id || map_data.dive_map_id != $game_map.map_id
|
||||
@@ -683,7 +681,6 @@ HiddenMoveHandlers::UseMove.add(:STRENGTH, proc { |move, pokemon|
|
||||
# Surf
|
||||
#===============================================================================
|
||||
def pbSurf
|
||||
return false if $game_player.pbFacingEvent
|
||||
return false if !$game_player.can_ride_vehicle_with_follower?
|
||||
move = :SURF
|
||||
movefinder = $player.get_pokemon_with_move(move)
|
||||
|
||||
@@ -425,7 +425,8 @@ module RandomDungeon
|
||||
#===========================================================================
|
||||
|
||||
def generate
|
||||
@rng_seed = @parameters.rng_seed || Random.new_seed
|
||||
@rng_seed = @parameters.rng_seed || $PokemonGlobal.dungeon_rng_seed || Random.new_seed
|
||||
$PokemonGlobal.dungeon_rng_seed = nil
|
||||
Random.srand(@rng_seed)
|
||||
maxWidth = @usable_width - (@buffer_x * 2)
|
||||
maxHeight = @usable_height - (@buffer_y * 2)
|
||||
@@ -1025,7 +1026,8 @@ end
|
||||
# dungeon.
|
||||
#===============================================================================
|
||||
class PokemonGlobalMetadata
|
||||
attr_writer :dungeon_area, :dungeon_version
|
||||
attr_writer :dungeon_area, :dungeon_version
|
||||
attr_accessor :dungeon_rng_seed
|
||||
|
||||
def dungeon_area
|
||||
return @dungeon_area || :none
|
||||
@@ -1070,21 +1072,3 @@ EventHandlers.add(:on_game_map_setup, :random_dungeon,
|
||||
end
|
||||
}
|
||||
)
|
||||
|
||||
#===============================================================================
|
||||
# TODO: Temporary debug function for testing random dungeon generation.
|
||||
#===============================================================================
|
||||
MenuHandlers.add(:debug_menu, :test_random_dungeon, {
|
||||
"name" => _INTL("Test Random Dungeon Generation"),
|
||||
"parent" => :main,
|
||||
"description" => _INTL("Generates a random dungeon and echoes it to the console."),
|
||||
"effect" => proc {
|
||||
tileset = :cave # :forest # :cave
|
||||
tileset_data = GameData::DungeonTileset.try_get((tileset == :forest) ? 23 : 7)
|
||||
params = GameData::DungeonParameters.try_get(tileset)
|
||||
dungeon = RandomDungeon::Dungeon.new(params.cell_count_x, params.cell_count_y, tileset_data, params)
|
||||
dungeon.generate
|
||||
echoln dungeon.rng_seed
|
||||
echoln dungeon.write
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user