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

Bug fixes

Browse Source
This commit is contained in:
Maruno17
2025-02-28 21:55:11 +00:00
parent 39a11e8ea8
commit 8d0061bf3d
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Data/Scripts/016b_UI redesign/017_UI_PokemonStorage.rb
View File

@@ -737,6 +737,7 @@ class UI::PokemonStorageVisuals < UI::BaseVisuals
ret = UI::PokemonStorageVisualsBox.new(@storage, box_index, @viewport) ret = UI::PokemonStorageVisualsBox.new(@storage, box_index, @viewport)
ret.x = 184 ret.x = 184
ret.y = 18 ret.y = 18
ret.set_visible_proc(@visible_proc)
ret.refresh ret.refresh
return ret return ret
end end
@@ -832,7 +833,7 @@ class UI::PokemonStorageVisuals < UI::BaseVisuals
@sprites[:cursor].quick_swap_mode = (@sub_mode != :none) @sprites[:cursor].quick_swap_mode = (@sub_mode != :none)
@visible_proc = nil @visible_proc = nil
if @sub_mode == :rearrange_items if @sub_mode == :rearrange_items
@visible_proc = proc { |pkmn| pkmn.hasItem? } @visible_proc = proc { |pkmn| pkmn&.hasItem? }
end end
@sprites[:box].set_visible_proc(@visible_proc) @sprites[:box].set_visible_proc(@visible_proc)
@sprites[:party_panel].set_visible_proc(@visible_proc) @sprites[:party_panel].set_visible_proc(@visible_proc)
@@ -2070,8 +2071,8 @@ UIActionHandlers.add(UI::PokemonStorage::SCREEN_ID, :interact_box_name_menu, {
UIActionHandlers.add(UI::PokemonStorage::SCREEN_ID, :jump_to_box, { UIActionHandlers.add(UI::PokemonStorage::SCREEN_ID, :jump_to_box, {
:effect => proc { |screen| :effect => proc { |screen|
new_box = screen.choose_box(_INTL("Jump to which Box?")) new_box = screen.choose_box(_INTL("Jump to which Box?"))
next if !new_box || new_box == box next if !new_box || new_box == screen.box
(new_box > box) ? screen.visuals.go_to_next_box(new_box) : screen.visuals.go_to_previous_box(new_box) (new_box > screen.box) ? screen.visuals.go_to_next_box(new_box) : screen.visuals.go_to_previous_box(new_box)
} }
}) })

17
Data/Scripts/021_Compiler/001_Compiler.rb
View File

@@ -487,8 +487,13 @@ module Compiler
when Array when Array
file.write(enumer[value]) file.write(enumer[value])
when Symbol, String when Symbol, String
mod = Object.const_get(enumer.to_sym) mod = GameData.const_get(enumer.to_sym)
file.write(getConstantName(mod, value)) if mod
file.write(mod.get(value).id.to_s)
else
mod = Object.const_get(enumer.to_sym)
file.write(getConstantName(mod, value))
end
when Module when Module
file.write(getConstantName(enumer, value)) file.write(getConstantName(enumer, value))
when Hash when Hash
@@ -504,8 +509,12 @@ module Compiler
when Array when Array
file.write((enumer[value].nil?) ? value : enumer[value]) file.write((enumer[value].nil?) ? value : enumer[value])
when Symbol, String when Symbol, String
mod = Object.const_get(enumer.to_sym) if mod
file.write(getConstantNameOrValue(mod, value)) file.write(mod.get(value).id.to_s)
else
mod = Object.const_get(enumer.to_sym)
file.write(getConstantNameOrValue(mod, value))
end
when Module when Module
file.write(getConstantNameOrValue(enumer, value)) file.write(getConstantNameOrValue(enumer, value))
when Hash when Hash