From 4a19fbc75440577975708f012f8117ded3d1d3f3 Mon Sep 17 00:00:00 2001 From: chardub Date: Sun, 27 Apr 2025 00:37:26 -0400 Subject: [PATCH] Outfits migration again --- .../Gameplay/Utils/GameplayUtils.rb | 4 ++++ .../Overrides/Outfits_Sprite_Character.rb | 2 +- .../{ => QoL}/Showdown/ShowdownUtils.rb | 0 .../{QoL => UI}/PIF_GameOptions/PIFOptions.rb | 0 .../PIF_GameOptions/PIF_PokemonSystem.rb | 0 .../998_InfiniteFusion/UI/PIF_PauseMenu.rb | 18 ++++++++++++++++++ 6 files changed, 23 insertions(+), 1 deletion(-) rename Data/Scripts/998_InfiniteFusion/{ => QoL}/Showdown/ShowdownUtils.rb (100%) rename Data/Scripts/998_InfiniteFusion/{QoL => UI}/PIF_GameOptions/PIFOptions.rb (100%) rename Data/Scripts/998_InfiniteFusion/{QoL => UI}/PIF_GameOptions/PIF_PokemonSystem.rb (100%) create mode 100644 Data/Scripts/998_InfiniteFusion/UI/PIF_PauseMenu.rb diff --git a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/GameplayUtils.rb b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/GameplayUtils.rb index 8e68f4a34..9398d0b8b 100644 --- a/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/GameplayUtils.rb +++ b/Data/Scripts/998_InfiniteFusion/Gameplay/Utils/GameplayUtils.rb @@ -560,4 +560,8 @@ def fossilsGuyBattle(level = 20, end_message = "") end_message ) +end + +def isOnPinkanIsland() + return false end \ No newline at end of file diff --git a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/Outfits_Sprite_Character.rb b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/Outfits_Sprite_Character.rb index be7b16c37..7be590ee2 100644 --- a/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/Outfits_Sprite_Character.rb +++ b/Data/Scripts/998_InfiniteFusion/Outfits/Overrides/Outfits_Sprite_Character.rb @@ -136,7 +136,7 @@ class Sprite_Character return if @character.is_a?(Game_Event) && !@character.should_update? super refresh_graphic - #return if !@charbitmap + return if !@charbitmap @charbitmap.update if @charbitmapAnimated bushdepth = @character.bush_depth if bushdepth == 0 diff --git a/Data/Scripts/998_InfiniteFusion/Showdown/ShowdownUtils.rb b/Data/Scripts/998_InfiniteFusion/QoL/Showdown/ShowdownUtils.rb similarity index 100% rename from Data/Scripts/998_InfiniteFusion/Showdown/ShowdownUtils.rb rename to Data/Scripts/998_InfiniteFusion/QoL/Showdown/ShowdownUtils.rb diff --git a/Data/Scripts/998_InfiniteFusion/QoL/PIF_GameOptions/PIFOptions.rb b/Data/Scripts/998_InfiniteFusion/UI/PIF_GameOptions/PIFOptions.rb similarity index 100% rename from Data/Scripts/998_InfiniteFusion/QoL/PIF_GameOptions/PIFOptions.rb rename to Data/Scripts/998_InfiniteFusion/UI/PIF_GameOptions/PIFOptions.rb diff --git a/Data/Scripts/998_InfiniteFusion/QoL/PIF_GameOptions/PIF_PokemonSystem.rb b/Data/Scripts/998_InfiniteFusion/UI/PIF_GameOptions/PIF_PokemonSystem.rb similarity index 100% rename from Data/Scripts/998_InfiniteFusion/QoL/PIF_GameOptions/PIF_PokemonSystem.rb rename to Data/Scripts/998_InfiniteFusion/UI/PIF_GameOptions/PIF_PokemonSystem.rb diff --git a/Data/Scripts/998_InfiniteFusion/UI/PIF_PauseMenu.rb b/Data/Scripts/998_InfiniteFusion/UI/PIF_PauseMenu.rb new file mode 100644 index 000000000..4ef7e59c6 --- /dev/null +++ b/Data/Scripts/998_InfiniteFusion/UI/PIF_PauseMenu.rb @@ -0,0 +1,18 @@ +MenuHandlers.add(:pause_menu, :outfit, { + "name" => _INTL("Outfit"), + "order" => 51, + "condition" => proc { $player.can_change_outfit }, + "effect" => proc { |menu| + + pbFadeOutIn do + #pbCommonEvent(COMMON_EVENT_OUTFIT) + #todo give Favorite outfit (used to be done through common event) + changeOutfit() + menu.silent_end_screen + end + next false + + + } +})# frozen_string_literal: true +