DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 14:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrote BP Shop code, tidied PC menu code, fixed message display bug involving instant speed and \wtnp, fixed mail vanishing bug, tweaks to other rewritten UI

Browse Source
This commit is contained in:
Maruno17
2024-09-27 22:10:26 +01:00
parent 48292c2a28
commit b80de83b0d
20 changed files with 967 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Data/Scripts/016b_UI redesign/007_UI_Bag.rb
View File

@@ -544,7 +544,7 @@ class UI::BagVisuals < UI::BaseVisuals
use_type = item_data.field_use
# TODO: If @mode == :choose_item_in_battle, also check for item usage on a
# battler.
return if !pbCanUseOnPokemon?(item)
return if !pbCanUseItemOnPokemon?(item)
icon_x = 0
icon_y = 0
icon_size = [@bitmaps[:party_icons].height, @bitmaps[:party_icons].height]
@@ -710,6 +710,8 @@ class UI::BagVisuals < UI::BaseVisuals
return update_interaction_choose_item(Input::USE)
elsif Input.trigger?(Input::BACK)
return update_interaction_choose_item(Input::BACK)
elsif Input.trigger?(Input::ACTION)
return update_interaction_choose_item(Input::ACTION)
end
return nil
end
@@ -723,6 +725,13 @@ class UI::BagVisuals < UI::BaseVisuals
end
pbPlayDecisionSE
return :chosen
when Input::ACTION
if item && @pocket == :Machines
pbPlayDecisionSE
@show_move_details = !@show_move_details
refresh_move_details
refresh_input_indicators
end
when Input::BACK
pbPlayCloseMenuSE
return :quit
@@ -974,7 +983,7 @@ UIActionHandlers.add(UI::Bag::SCREEN_ID, :debug, {
:effect => proc { |screen|
command = 0
loop do
command = screen.show_choice_message(
command = screen.show_menu(
_INTL("Do what with {1}?", screen.item.name),
[_INTL("Change quantity"), _INTL("Make Mystery Gift"), _INTL("Cancel")], command)
case command
@@ -1076,3 +1085,38 @@ MenuHandlers.add(:bag_screen_interact, :cancel, {
"name" => _INTL("Cancel"),
"order" => 9999
})
#===============================================================================
# Methods for choosing an item from the Bag.
#===============================================================================
def pbChooseItem(game_variable = 0, *args)
ret = nil
pbFadeOutIn do
bag_screen = UI::Bag.new($bag, mode: :choose_item)
ret = bag_screen.choose_item
end
$game_variables[game_variable] = ret || :NONE if game_variable > 0
return ret
end
def pbChooseApricorn(game_variable = 0)
ret = nil
pbFadeOutIn do
bag_screen = UI::Bag.new($bag, mode: :choose_item)
bag_screen.set_filter_proc(proc { |item| GameData::Item.get(item).is_apricorn? })
ret = bag_screen.choose_item
end
$game_variables[game_variable] = ret || :NONE if game_variable > 0
return ret
end
def pbChooseFossil(game_variable = 0)
ret = nil
pbFadeOutIn do
bag_screen = UI::Bag.new($bag, mode: :choose_item)
bag_screen.set_filter_proc(proc { |item| GameData::Item.get(item).is_fossil? })
ret = bag_screen.choose_item
end
$game_variables[game_variable] = ret || :NONE if game_variable > 0
return ret
end