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

Fixed location signpost not appearing properly when using Fly, fixed wild/trainer Pokémon with a "getForm" handler not using it

Browse Source
This commit is contained in:
Maruno17
2023-11-20 22:11:32 +00:00
parent e0dcdef321
commit 1080f69a0d
10 changed files with 89 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/006_Map renderer/002_TilesetWrapper.rb
View File

@@ -15,8 +15,6 @@
# 4096px -> 65536px (enough to load pretty much any tileset)
# 8192px -> 262144px
# 16384px -> 1048576px (what most people have at this point)
#
# ~Roza/Zoroark
#===============================================================================
class TilemapRenderer
module TilesetWrapper

5
Data/Scripts/010_Data/002_PBS data/015_Trainer.rb
View File

@@ -131,10 +131,7 @@ module GameData
pkmn = Pokemon.new(species, pkmn_data[:level], trainer, false)
trainer.party.push(pkmn)
# Set Pokémon's properties if defined
if pkmn_data[:form]
pkmn.forced_form = pkmn_data[:form] if MultipleForms.hasFunction?(species, "getForm")
pkmn.form_simple = pkmn_data[:form]
end
pkmn.form_simple = pkmn_data[:form] if pkmn_data[:form]
pkmn.item = pkmn_data[:item]
if pkmn_data[:moves] && pkmn_data[:moves].length > 0
pkmn_data[:moves].each { |move| pkmn.learn_move(move) }

7
Data/Scripts/012_Overworld/001_Overworld visuals/002_Overworld_Overlays.rb
View File

@@ -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

1
Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb
View File

@@ -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

2
Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
View File

@@ -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

2
Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb
View File

@@ -88,7 +88,7 @@ class Scene_Credits
ret.push("")
ret.push(_INTL("\"mkxp-z\" by:"))
add_names_to_credits(ret, [
"Roza",
"Anon",
_INTL("Based on \"mkxp\" by Ancurio et al.")
])
ret.push(_INTL("\"RPG Maker XP\" by:"))

8
Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb
View File

@@ -348,7 +348,7 @@ def pbTrainerTypeEditor
if tr_type
case button
when Input::ACTION
if tr_type.is_a?(Symbol) && pbConfirmMessageSerious("Delete this trainer type?")
if tr_type.is_a?(Symbol) && pbConfirmMessageSerious(_INTL("Delete this trainer type?"))
GameData::TrainerType::DATA.delete(tr_type)
GameData::TrainerType.save
pbConvertTrainerData
@@ -481,7 +481,7 @@ def pbTrainerBattleEditor
if trainer_id
case button
when Input::ACTION
if trainer_id.is_a?(Array) && pbConfirmMessageSerious("Delete this trainer battle?")
if trainer_id.is_a?(Array) && pbConfirmMessageSerious(_INTL("Delete this trainer battle?"))
tr_data = GameData::Trainer::DATA[trainer_id]
GameData::Trainer::DATA.delete(trainer_id)
modified = true
@@ -825,7 +825,7 @@ def pbItemEditor
if item
case button
when Input::ACTION
if item.is_a?(Symbol) && pbConfirmMessageSerious("Delete this item?")
if item.is_a?(Symbol) && pbConfirmMessageSerious(_INTL("Delete this item?"))
GameData::Item::DATA.delete(item)
GameData::Item.save
Compiler.write_items
@@ -929,7 +929,7 @@ def pbPokemonEditor
if species
case button
when Input::ACTION
if species.is_a?(Symbol) && pbConfirmMessageSerious("Delete this species?")
if species.is_a?(Symbol) && pbConfirmMessageSerious(_INTL("Delete this species?"))
GameData::Species::DATA.delete(species)
GameData::Species.save
Compiler.write_pokemon