From 240d2aa91951fe06a81edf0bbb39d00989edf314 Mon Sep 17 00:00:00 2001
From: bakustarver <66978329+bakustarver@users.noreply.github.com>
Date: Sun, 24 Nov 2024 13:42:25 +0200
Subject: [PATCH] Add files via upload

---
 mkxp-z/Kawariki-patches/patches.rb | 16 ++++++++++++++--
 mkxp-z/Kawariki-patches/preload.rb |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mkxp-z/Kawariki-patches/patches.rb b/mkxp-z/Kawariki-patches/patches.rb
index dabaf29..4fc70ec 100644
--- a/mkxp-z/Kawariki-patches/patches.rb
+++ b/mkxp-z/Kawariki-patches/patches.rb
@@ -26,8 +26,20 @@ module Preload
         Patch.new("NWConst::Warp plugin fix")
             .include?('module NWConst::Warp')
             .include?('@popup_confirm_window.select(0)')
-            # .sub!('@popup_confirm_window.select(0)', '@popup_confirm_window.select'),
-            .replace!("tempcheckwarp.rb"),
+            .sub!('@popup_confirm_window.select(0)', "items = @popup_confirm_window.instance_variable_get(:@list)\nif items.is_a?(Array) && !items.empty?\n@popup_confirm_window.select(0)\nend"),
+            # .if? {|script| script.source&.gsub!('@popup_confirm_window.select(0)', 'items = @popup_confirm_window.instance_variable_get(:@list)')&.gsub!('@popup_confirm_window.select(0)', "if items.is_a?(Array) && !items.empty?\n@popup_confirm_window.select(0)\nend") },
+            # .replace!("tempcheckwarp.rb"),
+        Patch.new("NWRegexpBaseItemfix plugin fix")
+            .include?('module NWConst::Shop')
+            # .replace!("NWRegexpBaseItemfix.rb"),
+            .sub!('@select_actor_window.show.activate.select(0)', "if @select_actor_window.show.activate.is_a?(Array) && @select_actor_window.show.activate.empty?\n@select_actor_window.show.activate.select(0)\nend"),
+        Patch.new("NWConst::Synthesize plugin fix")
+            .include?('module NWConst::Synthesize')
+            .include?('Container.item')
+            # .replace!("NWRegexpBaseItemfix.rb"),
+            .sub!('@popup_confirm_window.select(0)', "if @popup_confirm_window.is_a?(Array) && @popup_confirm_window.empty?\n@popup_confirm_window.select(0)\nend")
+            .sub!('@before_actors_window.show.activate.select(0)', "if @before_actors_window.show.activate.is_a?(Array) && @before_actors_window.show.activate.empty?\n@before_actors_window.show.activate.select(0)\nend")
+            .sub!('@after_actors_window.show.activate.select(0)', "if @after_actors_window.show.activate.is_a?(Array) && @after_actors_window.show.activate.empty?\n@after_actors_window.show.activate.select(0)\nend"),
         Patch.new("AudioUtilities plugin fix")
             .include?('waveOutOpen=Win32API.new("winmm.dll","waveOutOpen","plplll","l")')
             .include?('def pbPlaySoundData(samples,volume,async=false,sampleFreq=11025)')
diff --git a/mkxp-z/Kawariki-patches/preload.rb b/mkxp-z/Kawariki-patches/preload.rb
index 77753ae..a064fc3 100644
--- a/mkxp-z/Kawariki-patches/preload.rb
+++ b/mkxp-z/Kawariki-patches/preload.rb
@@ -194,6 +194,7 @@ module Preload
             @script[3].gsub!(*p)
         end
 
+
         def source=(code)
             @script[3] = code
         end