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 being unable to force compiling of plugins, fixed crash when saving edited terrain tags, fixed invalid tile erase crashing, fixed crash when showing Pokédex for newly caught species

Browse Source
This commit is contained in:
Maruno17
2021-04-30 19:06:10 +01:00
parent 5130b097ce
commit 748ea472ba
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/Scripts/001_Technical/005_PluginManager.rb
View File

@@ -623,6 +623,7 @@ module PluginManager
# fixed actions # fixed actions
return false if !$DEBUG || safeExists?("Game.rgssad") return false if !$DEBUG || safeExists?("Game.rgssad")
return true if !safeExists?("Data/PluginScripts.rxdata") return true if !safeExists?("Data/PluginScripts.rxdata")
Input.update
return true if Input.press?(Input::CTRL) return true if Input.press?(Input::CTRL)
# analyze whether or not to push recompile # analyze whether or not to push recompile
mtime = File.mtime("Data/PluginScripts.rxdata") mtime = File.mtime("Data/PluginScripts.rxdata")

4
Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
View File

@@ -70,9 +70,11 @@ class PokemonPokedexInfo_Scene
def pbStartSceneBrief(species) # For standalone access, shows first page only def pbStartSceneBrief(species) # For standalone access, shows first page only
@viewport = Viewport.new(0,0,Graphics.width,Graphics.height) @viewport = Viewport.new(0,0,Graphics.width,Graphics.height)
@viewport.z = 99999 @viewport.z = 99999
dexnum = species dexnum = 0
dexnumshift = false dexnumshift = false
if $Trainer.pokedex.unlocked?(-1) # National Dex is unlocked if $Trainer.pokedex.unlocked?(-1) # National Dex is unlocked
species_data = GameData::Species.try_get(species)
dexnum = species_data.id_number if species_data
dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(-1) dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(-1)
else else
dexnum = 0 dexnum = 0

2
Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb
View File

@@ -178,7 +178,7 @@ class PokemonTilesetScene
end end
elsif Input.trigger?(Input::BACK) elsif Input.trigger?(Input::BACK)
if pbConfirmMessage(_INTL("Save changes?")) if pbConfirmMessage(_INTL("Save changes?"))
save_data("Data/Tilesets.rxdata", @tilesets_data) save_data(@tilesets_data, "Data/Tilesets.rxdata")
$data_tilesets = @tilesets_data $data_tilesets = @tilesets_data
if $game_map && $MapFactory if $game_map && $MapFactory
$MapFactory.setup($game_map.map_id) $MapFactory.setup($game_map.map_id)

8
Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb
View File

@@ -683,8 +683,8 @@ end
def pbDebugFixInvalidTiles def pbDebugFixInvalidTiles
num_errors = 0 num_errors = 0
num_error_maps = 0 num_error_maps = 0
@tilesets = $data_tilesets tilesets = $data_tilesets
mapData = MapData.new mapData = Compiler::MapData.new
t = Time.now.to_i t = Time.now.to_i
Graphics.update Graphics.update
for id in mapData.mapinfos.keys.sort for id in mapData.mapinfos.keys.sort
@@ -702,7 +702,7 @@ def pbDebugFixInvalidTiles
for y in 0...map.data.ysize for y in 0...map.data.ysize
for i in 0...map.data.zsize for i in 0...map.data.zsize
tile_id = map.data[x, y, i] tile_id = map.data[x, y, i]
next if pbCheckTileValidity(tile_id, map, @tilesets, passages) next if pbCheckTileValidity(tile_id, map, tilesets, passages)
map.data[x, y, i] = 0 map.data[x, y, i] = 0
changed = true changed = true
num_errors += 1 num_errors += 1
@@ -714,7 +714,7 @@ def pbDebugFixInvalidTiles
event = map.events[key] event = map.events[key]
for page in event.pages for page in event.pages
next if page.graphic.tile_id <= 0 next if page.graphic.tile_id <= 0
next if pbCheckTileValidity(page.graphic.tile_id, map, @tilesets, passages) next if pbCheckTileValidity(page.graphic.tile_id, map, tilesets, passages)
page.graphic.tile_id = 0 page.graphic.tile_id = 0
changed = true changed = true
num_errors += 1 num_errors += 1