From 78a9191936cb93c6c3d94cad323e6b5d80d96527 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sat, 14 Sep 2024 15:07:04 +0800
Subject: [PATCH 1/6] Upd: Config update

---
 module/config/argument/args.json | 10 +---------
 module/config/i18n/zh-TW.json    |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/module/config/argument/args.json b/module/config/argument/args.json
index 9567105892..3794e24e60 100644
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -1714,7 +1714,6 @@
         "display": "hide",
         "option_bold": [
           "event_20220324_cn",
-          "event_20240829_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
@@ -2054,7 +2053,6 @@
         ],
         "option_bold": [
           "event_20220324_cn",
-          "event_20240829_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
@@ -2509,12 +2507,11 @@
         ],
         "option_bold": [
           "event_20220324_cn",
-          "event_20240829_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
-        "jp": "eevent_20240912_cn",
+        "jp": "event_20240912_cn",
         "tw": "event_20220324_cn"
       },
       "Mode": {
@@ -3922,7 +3919,6 @@
         ],
         "option_bold": [
           "event_20220324_cn",
-          "event_20240829_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
@@ -4394,7 +4390,6 @@
         ],
         "option_bold": [
           "event_20220324_cn",
-          "event_20240829_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
@@ -4866,7 +4861,6 @@
         ],
         "option_bold": [
           "event_20220324_cn",
-          "event_20240829_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
@@ -5338,7 +5332,6 @@
         ],
         "option_bold": [
           "event_20220324_cn",
-          "event_20240829_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
@@ -5800,7 +5793,6 @@
         ],
         "option_bold": [
           "event_20220324_cn",
-          "event_20240829_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json
index 4ae0ed48f1..b8c62ade8e 100644
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@@ -732,7 +732,7 @@
       "event_20240725_cn": "Interlude of Illusions",
       "event_20240815_cn": "Windborne Steel Wings",
       "event_20240829_cn": "Whence Flowers Bear No Fruit",
-      "event_20240912_cn": "喚醒蒼紅之炎",
+      "event_20240912_cn": "Ode of Everblooming Crimson",
       "raid_20200624": "特別演習埃塞克斯級(復刻)",
       "raid_20210708": "復刻穿越彼方的水線",
       "raid_20220127": "演習神秘事件調查",

From 67ae28ac612c9fd23d23a1df20f842585094625c Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sat, 14 Sep 2024 22:27:03 +0800
Subject: [PATCH 2/6] Fix: Get info after loading DLL, so DLL existence can act
 as a version check

---
 module/device/method/ldopengl.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/device/method/ldopengl.py b/module/device/method/ldopengl.py
index b3f593ea45..038618bbf5 100644
--- a/module/device/method/ldopengl.py
+++ b/module/device/method/ldopengl.py
@@ -188,9 +188,6 @@ def __init__(self, ld_folder: str, instance_id: int):
             f'ldopengl_dll={ldopengl_dll}, '
             f'instance_id={instance_id}'
         )
-        self.console = LDConsole(ld_folder)
-        self.info = self.get_player_info_by_index(instance_id)
-
         # Load dll
         try:
             self.lib = ctypes.WinDLL(ldopengl_dll)
@@ -206,6 +203,10 @@ def __init__(self, ld_folder: str, instance_id: int):
                     f'ldopengl_dll={ldopengl_dll} exist, '
                     f'but cannot be loaded'
                 )
+        # Get info after loading DLL, so DLL existence can act as a version check
+        self.console = LDConsole(ld_folder)
+        self.info = self.get_player_info_by_index(instance_id)
+
         self.lib.CreateScreenShotInstance.restype = ctypes.c_void_p
 
         # Get screenshot instance

From cccee9cc2c0fe247dbffb237ccb0cfec4bd0fda7 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sun, 15 Sep 2024 02:41:35 +0800
Subject: [PATCH 3/6] Fix: fix camera_data as buff bar covers upperleft (fixed
 #4188)

---
 campaign/event_20240912_cn/a1.py | 2 +-
 campaign/event_20240912_cn/b1.py | 2 +-
 campaign/event_20240912_cn/c1.py | 2 +-
 campaign/event_20240912_cn/d1.py | 2 +-
 campaign/event_20240912_cn/sp.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/campaign/event_20240912_cn/a1.py b/campaign/event_20240912_cn/a1.py
index db081a3fb6..9e9cdd9e16 100644
--- a/campaign/event_20240912_cn/a1.py
+++ b/campaign/event_20240912_cn/a1.py
@@ -6,7 +6,7 @@
 MAP = CampaignMap('A1')
 MAP.shape = 'I7'
 MAP.camera_data = ['D5', 'F2', 'F5']
-MAP.camera_data_spawn_point = ['D2']
+MAP.camera_data_spawn_point = ['D1']
 MAP.map_data = """
     SP -- SP ++ ++ -- ME -- --
     -- -- -- ++ ++ ME -- MB --
diff --git a/campaign/event_20240912_cn/b1.py b/campaign/event_20240912_cn/b1.py
index dc5c9a912d..bd4a4caa42 100644
--- a/campaign/event_20240912_cn/b1.py
+++ b/campaign/event_20240912_cn/b1.py
@@ -6,7 +6,7 @@
 MAP = CampaignMap('B1')
 MAP.shape = 'K8'
 MAP.camera_data = ['D3', 'D6', 'G2', 'G6']
-MAP.camera_data_spawn_point = ['G2']
+MAP.camera_data_spawn_point = ['E2']
 MAP.map_data = """
     -- ++ ++ ++ SP -- SP ++ -- -- --
     ME -- Me -- -- __ -- -- -- MB --
diff --git a/campaign/event_20240912_cn/c1.py b/campaign/event_20240912_cn/c1.py
index 1738b0901e..4389218faf 100644
--- a/campaign/event_20240912_cn/c1.py
+++ b/campaign/event_20240912_cn/c1.py
@@ -6,7 +6,7 @@
 MAP = CampaignMap('C1')
 MAP.shape = 'I7'
 MAP.camera_data = ['D5', 'F2', 'F5']
-MAP.camera_data_spawn_point = ['D2']
+MAP.camera_data_spawn_point = ['D1']
 MAP.map_data = """
     SP -- SP ++ ++ -- ME -- --
     -- -- -- ++ ++ ME -- MB --
diff --git a/campaign/event_20240912_cn/d1.py b/campaign/event_20240912_cn/d1.py
index 65bfb3ebe7..95cced7363 100644
--- a/campaign/event_20240912_cn/d1.py
+++ b/campaign/event_20240912_cn/d1.py
@@ -6,7 +6,7 @@
 MAP = CampaignMap('D1')
 MAP.shape = 'K8'
 MAP.camera_data = ['D3', 'D6', 'G2', 'G6']
-MAP.camera_data_spawn_point = ['G2']
+MAP.camera_data_spawn_point = ['E2']
 MAP.map_data = """
     -- ++ ++ ++ SP -- SP ++ -- -- --
     ME -- Me -- -- __ -- -- -- MB --
diff --git a/campaign/event_20240912_cn/sp.py b/campaign/event_20240912_cn/sp.py
index 9fb4a44c05..3b7bf7286f 100644
--- a/campaign/event_20240912_cn/sp.py
+++ b/campaign/event_20240912_cn/sp.py
@@ -6,7 +6,7 @@
 MAP = CampaignMap('SP')
 MAP.shape = 'K5'
 MAP.camera_data = ['D3', 'F3']
-MAP.camera_data_spawn_point = ['I3']
+MAP.camera_data_spawn_point = ['I2']
 MAP.map_data = """
     ++ -- ME -- ++ -- ME -- ++ ++ ++
     -- -- -- ME ++ ME -- MS -- -- SP

From afb6015286f47d05fa602cf97e267996005aef13 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sun, 15 Sep 2024 02:22:39 +0800
Subject: [PATCH 4/6] Opt: [ALAS] Skip trying nemu_ipc on MuMu Global

---
 module/device/method/nemu_ipc.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/module/device/method/nemu_ipc.py b/module/device/method/nemu_ipc.py
index 0fde50d512..86948783ab 100644
--- a/module/device/method/nemu_ipc.py
+++ b/module/device/method/nemu_ipc.py
@@ -469,6 +469,9 @@ def nemu_ipc(self) -> NemuIpcImpl:
         """
         # Try existing settings first
         if self.config.EmulatorInfo_path:
+            if 'MuMuPlayerGlobal' in self.config.EmulatorInfo_path:
+                logger.info(f'nemu_ipc is not available on MuMuPlayerGlobal, {self.config.EmulatorInfo_path}')
+                raise RequestHumanTakeover
             folder = os.path.abspath(os.path.join(self.config.EmulatorInfo_path, '../../'))
             index = NemuIpcImpl.serial_to_id(self.serial)
             if index is not None:
@@ -488,6 +491,9 @@ def nemu_ipc(self) -> NemuIpcImpl:
         if self.emulator_instance is None:
             logger.error('Unable to use NemuIpc because emulator instance not found')
             raise RequestHumanTakeover
+        if 'MuMuPlayerGlobal' in self.emulator_instance.path:
+            logger.info(f'nemu_ipc is not available on MuMuPlayerGlobal, {self.emulator_instance.path}')
+            raise RequestHumanTakeover
         try:
             return NemuIpcImpl(
                 nemu_folder=self.emulator_instance.emulator.abspath('../'),

From 93a47bf08c52982996e139f978fd70ca9d642d3f Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sun, 15 Sep 2024 03:07:02 +0800
Subject: [PATCH 5/6] Fix: Re-fit MAP_SWIPE_MULTIPLY

---
 campaign/event_20240912_cn/a1.py |  7 ++++---
 campaign/event_20240912_cn/b3.py |  7 ++++---
 campaign/event_20240912_cn/c1.py | 11 +++++++----
 campaign/event_20240912_cn/d3.py |  7 ++++---
 campaign/event_20240912_cn/sp.py |  1 +
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/campaign/event_20240912_cn/a1.py b/campaign/event_20240912_cn/a1.py
index 9e9cdd9e16..2b1071b956 100644
--- a/campaign/event_20240912_cn/a1.py
+++ b/campaign/event_20240912_cn/a1.py
@@ -65,10 +65,11 @@ class Config:
         'distance': 50,
         'wlen': 1000
     }
+    HOMO_CANNY_THRESHOLD = (75, 100)
     STAGE_ENTRANCE = ['half', '20240725']
-    MAP_SWIPE_MULTIPLY = (1.157, 1.179)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.119, 1.140)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.086, 1.106)
+    MAP_SWIPE_MULTIPLY = (1.234, 1.257)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.193, 1.215)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.158, 1.179)
 
 
 class Campaign(CampaignBase):
diff --git a/campaign/event_20240912_cn/b3.py b/campaign/event_20240912_cn/b3.py
index cb93467aa9..69990f65e0 100644
--- a/campaign/event_20240912_cn/b3.py
+++ b/campaign/event_20240912_cn/b3.py
@@ -61,9 +61,10 @@ class Config(ConfigBase):
     MAP_HAS_AMBUSH = False
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
-    MAP_SWIPE_MULTIPLY = (1.365, 1.391)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.320, 1.344)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.282, 1.305)
+
+    MAP_SWIPE_MULTIPLY = (1.035, 1.055)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.001, 1.019)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (0.972, 0.989)
 
 
 class Campaign(CampaignBase):
diff --git a/campaign/event_20240912_cn/c1.py b/campaign/event_20240912_cn/c1.py
index 4389218faf..a913d5022c 100644
--- a/campaign/event_20240912_cn/c1.py
+++ b/campaign/event_20240912_cn/c1.py
@@ -53,7 +53,7 @@ class Config:
     MAP_HAS_AMBUSH = False
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
-    STAGE_ENTRANCE = ['half', '20240725']
+
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (120, 255 - 49),
         'width': (1.5, 10),
@@ -66,9 +66,12 @@ class Config:
         'distance': 50,
         'wlen': 1000
     }
-    MAP_SWIPE_MULTIPLY = (1.149, 1.170)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.111, 1.132)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.079, 1.098)
+    HOMO_CANNY_THRESHOLD = (75, 100)
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_SWIPE_MULTIPLY = (1.234, 1.257)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.193, 1.215)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.158, 1.179)
+
 
 class Campaign(CampaignBase):
     MAP = MAP
diff --git a/campaign/event_20240912_cn/d3.py b/campaign/event_20240912_cn/d3.py
index 88bb608e9f..9c5e0fab31 100644
--- a/campaign/event_20240912_cn/d3.py
+++ b/campaign/event_20240912_cn/d3.py
@@ -62,9 +62,10 @@ class Config(ConfigBase):
     MAP_HAS_AMBUSH = False
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
-    MAP_SWIPE_MULTIPLY = (1.365, 1.391)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.320, 1.344)
-    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.282, 1.305)
+
+    MAP_SWIPE_MULTIPLY = (1.035, 1.055)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.001, 1.019)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (0.972, 0.989)
 
 
 class Campaign(CampaignBase):
diff --git a/campaign/event_20240912_cn/sp.py b/campaign/event_20240912_cn/sp.py
index 3b7bf7286f..1ada0f37e4 100644
--- a/campaign/event_20240912_cn/sp.py
+++ b/campaign/event_20240912_cn/sp.py
@@ -68,6 +68,7 @@ class Config:
         'distance': 50,
         'wlen': 1000
     }
+    HOMO_CANNY_THRESHOLD = (75, 100)
     MAP_SWIPE_MULTIPLY = (1.194, 1.217)
     MAP_SWIPE_MULTIPLY_MINITOUCH = (1.155, 1.176)
     MAP_SWIPE_MULTIPLY_MAATOUCH = (1.121, 1.142)

From d1eeb02bd2822d194e2f9aab71d8b3fedcaff315 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sun, 15 Sep 2024 03:29:54 +0800
Subject: [PATCH 6/6] Add: Support Battle UI theme

---
 .../cn/{combat => combat_ui}/PAUSE.BUTTON.png | Bin
 assets/{tw/combat => cn/combat_ui}/PAUSE.png  | Bin 5553 -> 6717 bytes
 .../PAUSE_DOUBLE_CHECK.png                    | Bin
 .../cn/combat_ui/PAUSE_Iridescent_Fantasy.png | Bin 0 -> 8774 bytes
 assets/cn/combat_ui/PAUSE_New.png             | Bin 0 -> 5698 bytes
 .../QUIT_CONFIRM.png => combat_ui/QUIT.png}   | Bin
 .../cn/combat_ui/QUIT_Iridescent_Fantasy.png  | Bin 0 -> 7598 bytes
 assets/cn/combat_ui/QUIT_New.png              | Bin 0 -> 7547 bytes
 .../en/{combat => combat_ui}/PAUSE.BUTTON.png | Bin
 assets/en/{combat => combat_ui}/PAUSE.png     | Bin
 .../PAUSE_DOUBLE_CHECK.png                    | Bin
 .../en/combat_ui/PAUSE_Iridescent_Fantasy.png | Bin 0 -> 8774 bytes
 assets/en/combat_ui/PAUSE_New.png             | Bin 0 -> 5698 bytes
 .../QUIT_CONFIRM.png => combat_ui/QUIT.png}   | Bin
 .../jp/{combat => combat_ui}/PAUSE.BUTTON.png | Bin
 assets/jp/{combat => combat_ui}/PAUSE.png     | Bin
 .../PAUSE_DOUBLE_CHECK.png                    | Bin
 .../jp/combat_ui/PAUSE_Iridescent_Fantasy.png | Bin 0 -> 8774 bytes
 assets/jp/combat_ui/PAUSE_New.png             | Bin 0 -> 5698 bytes
 .../QUIT_CONFIRM.png => combat_ui/QUIT.png}   | Bin
 .../tw/{combat => combat_ui}/PAUSE.BUTTON.png | Bin
 assets/{cn/combat => tw/combat_ui}/PAUSE.png  | Bin
 .../PAUSE_DOUBLE_CHECK.png                    | Bin
 .../tw/combat_ui/PAUSE_Iridescent_Fantasy.png | Bin 0 -> 8774 bytes
 assets/tw/combat_ui/PAUSE_New.png             | Bin 0 -> 5698 bytes
 .../QUIT_CONFIRM.png => combat_ui/QUIT.png}   | Bin
 module/combat/assets.py                       |   2 --
 module/combat/combat.py                       |  28 ++++++++++++++++--
 module/combat_ui/assets.py                    |  13 ++++++++
 module/exercise/assets.py                     |   1 -
 module/exercise/combat.py                     |   5 ++--
 module/os/map.py                              |   6 ++--
 32 files changed, 45 insertions(+), 10 deletions(-)
 rename assets/cn/{combat => combat_ui}/PAUSE.BUTTON.png (100%)
 rename assets/{tw/combat => cn/combat_ui}/PAUSE.png (77%)
 rename assets/cn/{combat => combat_ui}/PAUSE_DOUBLE_CHECK.png (100%)
 create mode 100644 assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png
 create mode 100644 assets/cn/combat_ui/PAUSE_New.png
 rename assets/cn/{exercise/QUIT_CONFIRM.png => combat_ui/QUIT.png} (100%)
 create mode 100644 assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png
 create mode 100644 assets/cn/combat_ui/QUIT_New.png
 rename assets/en/{combat => combat_ui}/PAUSE.BUTTON.png (100%)
 rename assets/en/{combat => combat_ui}/PAUSE.png (100%)
 rename assets/en/{combat => combat_ui}/PAUSE_DOUBLE_CHECK.png (100%)
 create mode 100644 assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png
 create mode 100644 assets/en/combat_ui/PAUSE_New.png
 rename assets/en/{exercise/QUIT_CONFIRM.png => combat_ui/QUIT.png} (100%)
 rename assets/jp/{combat => combat_ui}/PAUSE.BUTTON.png (100%)
 rename assets/jp/{combat => combat_ui}/PAUSE.png (100%)
 rename assets/jp/{combat => combat_ui}/PAUSE_DOUBLE_CHECK.png (100%)
 create mode 100644 assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png
 create mode 100644 assets/jp/combat_ui/PAUSE_New.png
 rename assets/jp/{exercise/QUIT_CONFIRM.png => combat_ui/QUIT.png} (100%)
 rename assets/tw/{combat => combat_ui}/PAUSE.BUTTON.png (100%)
 rename assets/{cn/combat => tw/combat_ui}/PAUSE.png (100%)
 rename assets/tw/{combat => combat_ui}/PAUSE_DOUBLE_CHECK.png (100%)
 create mode 100644 assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png
 create mode 100644 assets/tw/combat_ui/PAUSE_New.png
 rename assets/tw/{exercise/QUIT_CONFIRM.png => combat_ui/QUIT.png} (100%)
 create mode 100644 module/combat_ui/assets.py

diff --git a/assets/cn/combat/PAUSE.BUTTON.png b/assets/cn/combat_ui/PAUSE.BUTTON.png
similarity index 100%
rename from assets/cn/combat/PAUSE.BUTTON.png
rename to assets/cn/combat_ui/PAUSE.BUTTON.png
diff --git a/assets/tw/combat/PAUSE.png b/assets/cn/combat_ui/PAUSE.png
similarity index 77%
rename from assets/tw/combat/PAUSE.png
rename to assets/cn/combat_ui/PAUSE.png
index 75e27a4ea94223309eb33dcfaba4bef45058192f..4dd3fa9dc47d742441e8dec53bb6bb665e67344a 100644
GIT binary patch
delta 1400
zcmV-;1&8{vE4?(Zy$XL1YDq*vRCwC#-LY#N*&PS)Utka3f(~Xu0WDm>8(etJT_KSx
zEO24LHNNTsDGre;RYJO?&OZ?DPe>K63UP`fDq_x897u%^DR76@V8IwHm<0=FAcB41
zDN@YJ+Le9o;tlBYK}fs5dGm^gnlHciW+DIp0000000000005H>42XY#Rr`r000013
zmA^muIwHp7(dfn~A|L&`tm`HsqMhZ4)a!R2I>lfxSWAz-Ju07;^HOjAH?0+a{N3)x
zdJz$O4-bx>l-<?MTci8;?&LNi;=xyY<+ExQ5pCo)fAOc^3%~#X0K6l!+3Zc_6m8CJ
zPANsCE7$(=*9Viy<f4C`BU1EYI4u6~+uhVl5s`CVx}i58ncIjqN2G{coz}NM`uTNR
z?Vf))004khdGOVvox9sbks@O9Lm3fu&drND^<wMet&}1n?|(Omh<F)IQ|I$sJ+D%v
zd=YNDbh~qBEA>)tqdYB##b7xB=V%wcwK*c^HebWl7JvZ&09Jn{^-{5xa*n!b#vhI%
zqI_1(cR0_xwb760+QdaMh$14z;p55t_K1iWjfR^aj=Ki${=resv3+MVy_WX!MGT%i
zEsuYg2*3aU0K7Y!AKi|K)QjPI(e-IZ9}GvI56frO<(OZL7bElJNjiKyd9^WmFerBJ
z-Rbr@=Qi?r&TW5;J{Y8wqK)Q!snc7mrHH7iX*1IS1^@uy9V(xf)3YLav9UfFt``x}
zoagGa$~g~;K^KYlA0OQwkGpNskG?r*&g#V(#y5wf8^ee$(9Vze&L=;u_8uP0lV2Of
zTH5{9{dtVOma8oQ0{{T5%;ZTK5h<nO&Spf>6^r%3bXtFPdzh<fb@1Ks@MjxEF^q`)
zgTq)nzT1o3MswB_>&0cUo&O9shP$8b%r165_tU&f+?>@*r-B7w0002~*M9TsUtXyc
zYpL6)oKnhd92`w9Gwqv_-0?{{JI}kH-=7bQ95JiT>XiCdW}f9d%ej179-oxgbF~Fv
z004lMDW88;-2<76wZU+s=qh^;AB}I0`X6r{PbTF_)oozD`f{ViT)WT{9^V=b-Y@cb
z&KIYDFR!&ZBKq&APw#Elb^XPk1z-RG0N#}^|FJh*9}G7(inXR`iioKHlSem3X>CxR
zlua`m-x@_PsuxYuG#4>0E$xC{KF>QC6yuwt#Y%s^y4yKNL^Un0;c5%O00021^D;&s
zY;51%epOfuujA#hsTcqJ*Zx~3Tg<xUX;oFtmFxX}8s8dS&jY{$FaQ9+D&=-*i*os_
zdaYp_DaGi<=rZ3fwSOZ=j`lM8md~rY&Rd(~l={P;UQ9l}C8b`9Hp<iL@cZj{3|IgL
z004hjeGu;Q?c`}Wd+n@mKcy}JUk;6kcK&js=*8j<)#<csr(2ujK~Y3eT;8$R9DZI+
zzMlxd0002I+vt1ogy+<Y`=4z8NL;&kqE)+)W*2{7q}<#_KA(O0x4o{KQu_3h?e2|A
zkG?r9r_+eY=XJi8Yb^i+006AcLSr_!aeRML#>>3?T&vuFFO6@F-gwJvl^hYXHqWM2
z_kFOIqRr7u5m7ZwRn^^?Bme^d0I<3+oSPSQZX;rLk!DjwY^<kO33(pl-jadah?fx&
z@m>r!hAE}1o#giVF0cR$006KudEq_1DW#peTW=YBd{Vy3x_Nn$h0n9@>ma4w&vry!
z)$8+ImSwb&ukmUNzyJUMt5lv&_r5)xXW$<R$q`XEO?g`7ctZzx*3PQ4IwErJo(P>&
z#H>wSF(R6#*?&CAZ<rOc0SuA}k_!zV;QzsY0RRC1{{sNkHyduZ5Oo0n0000<MNUMn
GLSTY!JFhhW

delta 230
zcmdmMvQc}(UM_X6d!8<iAr-gYTvz04FyL{x=%|)e{onbVpU(r%q_&m|-%~;_uevWa
z*^s-nKH%a*76t}}9I0fN{@VrXX3o4H|L==EP((}M0FZps)zO~F&&UI0GD!dl76Tx`
zkpLvX(h3cX$Sem2W(I}^1~vwU2kz5A6a!A3dlqnmOyNZs1Jt~^QD82oJcC23I8f^U
ae`W@ma`q?#YleA1E`z75pUXO@geCwgH9F@2

diff --git a/assets/cn/combat/PAUSE_DOUBLE_CHECK.png b/assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png
similarity index 100%
rename from assets/cn/combat/PAUSE_DOUBLE_CHECK.png
rename to assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png
diff --git a/assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png b/assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b5b6145227eb3d87438da7f749f8f64abfec140
GIT binary patch
literal 8774
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
PN1Og-qe~?^4$=Pu1kcK%

literal 0
HcmV?d00001

diff --git a/assets/cn/combat_ui/PAUSE_New.png b/assets/cn/combat_ui/PAUSE_New.png
new file mode 100644
index 0000000000000000000000000000000000000000..d11e4a2ec534b85d13583a881c3357671af902c0
GIT binary patch
literal 5698
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%0D-6inP=-Cfh9z=j
z24})dQKb({eV&F9)93kr)epY?yj7g@K4-k*8|uqMk6L@g%RNK69Dy#oRyDHL<|@T%
z=626)UTIEg%LaB)-agpg+J3K5*yv5JRQ~WeROeWm%~T`tj-#r&+O6HbC0g~5>X4^l
zPve@NH;GTGHAzGcM`lGb?C0-Y+9e(&|8AZ}uk);3r+1|JKr>I%7|kF3hSrN#gf5Hj
z8G|x?BK`Yg^2gP=wU0BhSc~|l`VwI40y{3}$K7PI2e`YTdE7SycF*-lA%urdB;D_a
zPO?Y(KHots^}K_|Pw9Eb<3&99vS2$ATxZTImdpJ#sWA<_9Y~QG#?4vpxiu!OC6_&_
zyENwc&Og`<=jn~~c3IBBWANqp=+L;|x@(ynft)89S02o@jkKvfm<@m|dS{={oy#`M
z2z05OA1|tdEiCmB^FuCMD_dj3RbroTWWLszj}g^2mghB^FZD4L;#|L%6KkZ~RFqg`
zQeBHTxcqn_&mw(WW#UqV&aV4?qpLw5&ode!rO_#TkLx5h3@xq<f5-KIyZue}Vp?um
zZZVR@Bcn$8>$%#~wMMSe(y1(S=mk`_Kx$k!WlmxzU}KEiI~FleT!XAMX5~T1zmN{K
z;k60H!yDl@zMP+QJ^Z;N!F-n|yb)VvjIVk#f)BM`n-Xu<ea|D2U<wP7Q?NtU-wgFw
z9gHBl6JKW>7|&QC&DTBA<LgPtn89bybfoWEDy5gDbrF3kH*eIra66^nG$(sz4%t{l
zorR@4;QVkeDt}j9#V^cQUUwJ@-$J8CN531?cCV1&q!N-3j$+;X%AnCxYv|McRh9~Y
zwZwS=2b970z``)kt)$+X-tJynWhdnoo1S;LvGu|W#oJ+dQFcU&gNm26P2Z$Ohnput
z?rgBe2ytKfPEK2Hcq<)h>D8zkvE?)P>+VD{zq3Gn^FrhVUN6L`JwN%*vpWpix@3}P
zps)A%tLEm{j40%VL}9q9-+T_ncQj`uJLIk3jkByRTJs-HO+F95Gi&^#u&;HzwRbWr
zs&)%Xf}^DeRhxrwvc;$ZwZca7k4MFMLiR#>O|^d_$qKVBK^@A;miYyFr`6VW=I*A>
zmfkGQ&%3Un_9bf^O+oBudD)rRHM;5a=WD<Me<5leC|w)h7nAK)8~irKDb8b(wbv@t
zD%JEN{SKz#uWWotw<yFF%gdF4n}(!I1LV(9yPkxhfUm#5%Go_dH<CXt3)K2ZO$g#8
z>$iRfZ?C{Yn0_I~?ZT2nU+p)I9{gn3W&0Ubb69<gfSUU4NO0_LwPqu;GREZ}rv3RG
zH$AA=qc<dRRU$DtPeeq3g}-tAW?$-b>FZL?{_aSNKWI|G%f-oqnZ0ZMR{JBX%sUDF
z&6Vh~4S({>vRA4d5*;E9eQ33{=ld0XV-aLLxqh;vQ6%g1zUHCv#=x#iN9iXciuz*s
z;l4cO-o~Ef;M4O|w<+oZM;ZbUCJ6v027sME)VKsd&^Z8pIs%~j1OS-tV~6&uR5$9Y
ze?`kIbaZ*N+MrcakT4x}vXx$N#zKpMA&!+bLh6)>txS_iIMCXI25l$^3iYz9#1&l~
zXqR$cq8QeV)3;1)#w1W%{?FEh8&1sBX1un2=m~q-V{*enrBt6yxNsWv*Jn%AImj%2
zEiJ=Il*hZjFa6eqtMm8{lMxZ_?_W4D+GaZyQkw{l0pR%NvfdYznQv?Tih6$tYAmA0
zgMY))Hu`VMY>2Ht$`H^3P{mD0MFt>Lvkv~PppI0<PM{v57-~DszmG6~>j4_7!TgW<
zFJD&44Od`i#4GZfZK|>jPn<~UHuzhKKu&*0Erm%zB$rxd!Vdl!^7+Yjib2nTXL)D~
zu3@UeM$I0}46v`YOo&bx;&!KAkJb@^BLYVRjtCqPI3jRF;E2HgB>_j&E9zW-{?LL#
WIY}5Pz3A!RG4*w?U#Zk~y!$VL)3;9m

literal 0
HcmV?d00001

diff --git a/assets/cn/exercise/QUIT_CONFIRM.png b/assets/cn/combat_ui/QUIT.png
similarity index 100%
rename from assets/cn/exercise/QUIT_CONFIRM.png
rename to assets/cn/combat_ui/QUIT.png
diff --git a/assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png b/assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe22a8f416c20037fdde3ccbe8a1bb91d2179d24
GIT binary patch
literal 7598
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
E0~+HBQ2+n{

literal 0
HcmV?d00001

diff --git a/assets/cn/combat_ui/QUIT_New.png b/assets/cn/combat_ui/QUIT_New.png
new file mode 100644
index 0000000000000000000000000000000000000000..8690f5cb2b38b46c277c66cc643fb75c4046241a
GIT binary patch
literal 7547
zcmeI0`8U*G+`vDmY@tL`DTI`)5!ttr8QFJbNkY~UV;IZOs*;_iF-8lSFvyazkCN;&
z+1Ej~Nn?y9rfDpXzUTQ9o}Zr6J?EbHJ?H*#&wbtZeZB9wPpvIY1^7<z0RSKX0bj8N
zfc<+z&Tl-Nd%;k`jAJkGhJand0D%9<-_8MK=Ntn7J`2Cgm#wYuKw;3ZJJ1kG$mPqD
zA)!zozd&yQh#bS(ML1_LkLph`y@ec&M^?&Ff%gC@X*^H+A(yv@(gDwhhlCAVA3fo7
z6cIg~19tdwe~=H1eKPa<T#c{MvnSUR9b7e+B_?nmW1|>!I(wMiK+U0Ukq~5|_`|}o
zX$x=t0WI4{y4oWWDOTVw9gXpvqTuO$l7|+$KKt%(1%MSUL?jaS!C;G{3<_`pA%jXX
z!foGoAJkdPIsuYtz_gSwm7gQk7HC(pZx;dDj{zU-DsS@vnE()oh%uG|iUfeAUl9HM
zz(`@n1PB;;d$N!RNa6s{=S*cd4eNoM4)<&oIGaBMuknUbO8c5iIpSTaRZThL8}|e7
zWam^N!<#@n+E}3*kksS^E{h-O;gU4xdacq&oG$bTc~k@D0Ghk9dQjK;)I@5szMY6z
zTbZ6YJ@YxR+}IN&cgTl#PAUh5kv;;Za+#A30>BAY@24G2gH-Cm-1h|^Y9QlR>)V}x
z6{wW{>D8&7hUc97fJ2sK#+b+a{18`28^?!mVnE>yV9XJ?GsSXK8|Qs}o$p%|D-of&
zWhkEe#=2ei)JZ;me)^ePZyHr*6ZLo1zC))Ik(+z7JL6F+z};*^bV+mGgYCPX!SGVs
zWNOzw;|sw|s`O6Vqqyy4x!#$J<*o{%&sLqE)>unfv>|G3)2^KE$eIyej8k2ec(Ki!
z5g`EJA6qqBR&#&s3T#F$b8sdKI`_c=L*%;R^Ar4Oz#-p@st6_kWDr>?hVmRh4=R5a
z02+QAbA6u)GXKg009Rh$JO9Cm``{-Le6wKAr&A5hAWqK%R}2rzH0vHRJ}?)5lJCv2
z7e>eJo3%&wef+?6;`QO|?}w^BUC<PuP7Ax<qlJJD+&q^1`B=ka-hD>xJV!iFYd<-B
zD|tkU!~;Sn@00QbUrdkBmt1@zVk6bs9-7ZtXzZWn29{n^3>DEzay9&uI^Hg+`fTf2
zgXx9LdlfcZ1DxT8weKZPJp1}OtQU4s$SwZG+koB^RpNT_)o*dV*M5Y<fY@irUh%yb
z1bv>5db&POFuD2E`GjoSQLlMtb;lHSuT##K;G$y9xt<Ij8P3G`BTGE)4-b6~yq}tC
z>TK?O`TdzC=_=tm9w*)h4=;Q^E0yuys_IOXFzZX?E$#AD=c{<x<<sJ)bI-V+6+GgR
z0hST$NT0LhJAEcq6~Ye*0FQ$e^X>BW`wsc#n9I^qgE}VXcq-!YlBhI7s!*y`I=iD~
zjv%7l`eeqO_pOX=ex|UQy0^jnzIU%wjnS`*Y<dcF2Y8B}XurA+33?5;R<=thJaRES
z`%Dk!=;f|_#k|39*?zu$%sa}9usUAK19217H&kE15AH?k;)7oi2L&DrJZJ;oI(Iza
zc=U1HF~V_Ww0Xh)eiXXhUS(KS4DI_;=q1#_`TXYj7}2y&;VkVe$1G$PwaDHf%)wv~
zQN(Xw>>yO^?igEe)uGaQwvcz=Xz^g-DTn$(jZ%_rgl&p7*~TNU$z%KeA1{H5$B(YQ
zehkjD_ab~fo^<-?S5@y-XXBwzM=qK|z)Oo;H!4_5=J5S&F}QNHx!vWkA|Jd@nh$p2
zZV!jx*YfEVt<fAa(rJ<aDO!<B(Lk|$$iKv=1X*%vENZN2>=r$gew0odV}yrb4Y3N?
z4ecOpW;k!1Mx9OFqq^~M@=yJKFB)QzccXJdaFNn$x)Jm%Zv*s`F~sPVxTJECM<exk
z-~~;umF`rp9|14@YI;{5et&<s>rP$TmpggAki4@svdam+v+9u`eIGpZ<SqQgN$-gO
zUC&#7s^j@z@>}Pc<a#m#vVH1$tNLNx-R%k!_z`@^QnJ=yPC%|_(`du^R??$)CONHU
zi5iJ*FUDTPbnSm(@q&qe>8S6BaNKYl#zTf&X$rKUA*VoVF(=GHj5emL`h5we<O>`V
zG$k@4k|Nh9w_z7Nc4292iEk-;=>T18({uC8X3!@2RQE~YQ$sp1otRKqcsD#Sq=A<I
z{bEbum%^4sCtoq&H(}Uybx^^z)GlEZ90jrq!ac(Uzl!S0nm@5z*Y~l1BM(!LnJ5_z
z8lZIRwZ;~+EtD`~9d0dp45MEwOy`-q-LqI62KRYAm8$FxcXx4TH;P+T=E&v_sRXr;
zf4MQ;*cE+KTVK!n4{4E0|EoUdtEg8AO$AL-Q+iF($RQ*e$-R}!*7?)5o${Ob9kF(F
z)pGw$j!zu(9F6x*+^ggY;F8#f-uI4MeSgya`UA=b^+k;j@(Q>}gl0gSL2F_xFSQ9@
zh3sC@P9Ci2b+JDx-LmH5Lx+<elX<2NA)y5<^TqCJo+s0$flq2A{EnkRtXL7b^QuKk
zKW(b)V0U3mg(3W$3){Cbc{Qc*d9BX4e|0F_7w;cv8|bx!sfn*Cs<{`L@Y`e+B@8<v
z!%KfU_hsaZ-qYDIPHJGbTFzXy{R@~^>HNgoTF}BGsVg@^*G1hWHAeH%OJP)n!TbYB
zV{7GOR`a-Ei&IC|9%3F@nKZpkdTUcos4>$`U%)zMZE8|<VlV%>^VsTY_*XSvD_eO)
z+VS*S>2(XoD?^ib^61@BMXk)7%$z)10lybj^1~{Ga|A0NdHD>1ImALxr&vZpCv#4k
z6}CPu8u-Y(H?PXJ)LQVUx$=AY$Q#FQMAm>C!Pf`WrhImOvZVR%AB|~D{a{`5p>m`q
z(q(m8ifB@QR65ZP6rps%&9?4#q~A(kY}cKxiWl3~GtRaSYyOCdwPf1|eed2~mcQ?G
zF{?1Mqbs=d*Y#R2QO~T~4h(<P;0?#P^Pnsbd<g!1>F*C$YZhjlEIkHeHV{E$W0Pit
zPC5-t%clk7nJ&aKvqpcT!EcXO1WLqKljg-dg3KmiZ=(D+l6$IpI(xX(J=N(qx~uWy
zYi~62Hlwg{Ze5PsCB=lMQQ5H}A|)bvUGTvvQJqOf=2F8)`ADaLMw8f$;J)Sil#~;<
z#OjC(NJ@=qgjH*9O7y#E?oAU0%^wC0oG2p_D|mx!HIl@^+9C6pc<300o*nTq<obER
z&qni~&Q2A?M9*6PctdKLXz7_k#}PJoXkdhVpEfZZub3C~TJKFG<Hz$n>?!wCrcH!h
zB;&%YS9qIxic{`u>^Z$v*4+J!S=?=0F4odOZvZ`kV482C1Ke!f8htO5a}7YSWpjcD
zvtxadn&P(75b{fkd29R(;aZ7ash%k^Wcxd~>;{zP&FrE(>6XHNS<rNP8U1m8{F?{E
zhJOz$xxGR(GQKW}5rSnYCu`2sZTyCB(m@e?%jOeqQ7MsSTTNrzKe_)1{fw*HDfey;
zn*M#W`6ju=MTjBDn~=Mcx!a%cz0b7UbWr-LbW#ddLPAX7MC00RQpR^&1?~vB6Y02%
zpoJAvr?zL<*T~LWBP;x@L^81yQMew;C@w71Zj)}4Xdof<RtvUDNaL}L8b;kzTcZT}
z+?L^v^?L6guQuE_E2cg*W@k&8`EZ?mrtg*7-fL6R3v6ov08wWEApQXWuy*(2A^?P|
z0Km_i0HFO606@@mkJhUIAp9P3#mGK#Y>DzIz<xBBdxi19zvdo~L+WF`k(>AK51xbN
zKSHfU_1<$CNlGkVOj0c-#H>4YBVSZzqu;3|Cg{H`m^D`6Pq^JI>-V92-y`{R_V<k4
zR8slfU%Ct^77K^JNFn@=X`fk$3X@-GzNbtKL!SNnApY0>5%@>oAAx@a{t@^`;Qx%k
z^e$5;j&mB?zq`!v)+TLp`~8Ha^S8vXDQ90b5i>#u+%G|FZZ~3N5pEw1kl|_uI~O23
z8?V*_Gi6;A`)INqHD*6IeQEjN^ocDyl28Q^MXC2oU(m#6!O|JQb2R!^1*(lbIzifT
z@3hf|r031zORE?z5_1!hRzj*JV{Gi)s~trMJOWABZd~0D{HD=<9|7X>nkLQNaCUP$
zmf70H6xWlo9mSB)hRCHQNr*UIu@8Ed)qtT9`ec}l1@F<xIOvN|0}t{?F~9T#9fXEi
z`X9|!-A_kN9P730^3hWa8H+U~xo5EGMH!Sv<q$b;r%P(SS}h=rcB!8}|5+u08-aWo
zu`vVs-TjRd;AsZBcBn=>AF$AByWvra%f9w)?!pvM<#0-zt1EeL?M3|DmI_2Xd|kCL
zYzFO;6!CFfKdk1GRqJ}@c=yzl8#&~q$f8VH=kqptS+Cq0z8jjr@|Q+chcZY~+v2CF
z>r#U<+Z(PE;J8$fhYypQ>CJA|xy%np0$d8?6bJ#e-ZBu53G`KhD&+dDrTrRL7>vfe
zbLhbpG#*j^j-V5?T)6dh+CSc)Z&(r3O8N%q*R(rYumk<NdYWlSC#SVi(lQwlliEYi
zkyx1d`t;$%z}KUIA#lK1wInp|Y>LoYB<xn{PX+H`5;vrVB`FG$h-QUaL^`sAUcD-V
zBX^-2F}2}1u&=mBeWUASyT39vE2a{=TZbtK?q{H-ptMZyf{XzNSuw5BFjwWtQMu=e
zKs<0Tq_3-j@~M7l)$`}9NvEDcj&iiS8IeJ)-ib;sl5uf^GVmq1?1IYlkM7abSV^}@
znoie<a;NTuUqCxGp*H5sHZmQ?W^E>jn6Niij5;eUh{M728=7R(<0!eV%-I|{;plh{
zVBgJnt6F59MWvN#(9{CD3lro;wd;2d3l;s<Jy>!u0n&$Uqx8_>hd2BgU)t2KEi$*o
zXZ^E#Gd6bydtw@Ee}D7Ot}{zt)hsKnCa<?9xsI9JQ9obpwAo=BB^RF@_Dj$6y3F_Y
zG-A3J;L$e2#}!NNE2S5J%lnipkv2Xhs9?rybUb@IKW^ru#AJsp{gR0-!6MhUuCdyO
z{X?a!Sf&;(4G~|K2`{B|SE?3{lVjZ%zFTTkhX$waL^U0&QY=U*NNk7=6jJ$%?ZeV=
zi|bgsf3Jook}+vH6vgt<amd={)-o`U({Uo$TC7JBEr`%I);jU*dSesz_KNonB8Ad{
zx%*SQHD+=BM~Dsklwer6JY?tqBy`p6hIVjzG@;VN$6Gu;r9exkebh+Fd`)xx1Ve_X
z+g_{+dd!N_@#WUarVF^64ajc-T>s@fJdRXr<jBUIEkfm8d>}%}k?#w9X8^Xz*C*Kw
z7ECGsVJ)y_5LKwqsyoT*{LN%jM9epMV_icUf6Kw9?rj~kV_`}dJoVZ&w}Rn17ff9A
zE<9U%c2+}|$sLqb7t>cTHG2MsUluAFp+<tGi^vIC=6kFw{g*dmG)T795++uQv|Z1t
zXN;M%$34ZD^A*M&zERwfM09u5ouqU-DlnXwOAes1w&7ycw0ApX<<67K%KFO;Xf>!Z
z^M=DBbB}>9cVUsPo@@RT6B4Q2fy|O+#iRz8m3WbJh_?d&%bhbl9W<r|=2CU#_1m#}
z29yrM6mH6jfQj<^xL$ZXnB_X9fHk(4P<AvT+pe;gT?S=R#H*f0#Ol?eWuUZ8g((Oc
zX+V7psi@Cbt+F7>Q((_rf4m#F=)Go>KO8WACF0q;0m`N7y$^kr=C%dgo+c~G2a#+#
z9CLnm7M@(>TAx+<z?GP0FhzoezU6YX%w4TtYO$YylZ!wSWBO{uO53?0tc*9hOrsx?
zn-W@sQXX2bHp_5jpQZ#qlfq_+m^@p4y8C(QVu4J?)AIemp?D5U3mbVzpZu6+_FRul
z#$ERmwZguEJrRcK7)+Y^B8Qd>>+Y7rV$W~q7KsvY5{iQfPEPvz9wd^3+1iQ`Nu(Aj
zU$1jqucOwpj-o+x>_3^MRkR+JQ(zgElc&AAf|EgPd};nqjn_)2zyyp8sBG>!wxWBs
z#k|u#yrBQ0gIIuR-q!q{t)Y9hz<2S<bXN=hD8zQSR>i6Wbtx47%{}gd^OxCq`xtmC
zX7_g*Z|FM=&0ub8%K>yiE<I6fPgjGgLJ{ft*|HEj>U&FdOB~p4-p$rx9B|b+!26%Q
zG-%~pG|xY@(Fse3`5w*2;K`vx?~ckN=_HXw{OvFu=5kf>YhRK8$b}i}$1E;s)uvj}
zIoxS+w{gp@dt%VKw0F@LJ(Ysyic8>UL)>r~TXm>KO%v#(KtT4OyLLF{Sv`s4z+a&H
z^SFA%s!VaC>&b=BS*{azTKvO81u^vL652$`*c_`U=j?b!^iwN0!ZzAqgi9BF8<tvU
ziEB4YGYBMCz)1pO_VYVfbJ@i*-;!5@!O2DDofjeMK~}o{(MDt|gKWxf;7;%Vu4P$6
z%rK4CDzY<I6{jwqE2iK#Y+)cz)sA}B&{SQg4R%2jTD%3j1c|=M=uQ~M?iHVw(KlDZ
z>-qllXcCvG-e}Wk7rC+OzP513^eMr<y~@*|kfF_7zU?I+K+zo|S7i@JqXLNQzsBkF
vm2+;Y==_X^l09YrYySxR|0J;GussC`_sh+GJG;aFyG4kJ<&{$7oA>_*ft}t7

literal 0
HcmV?d00001

diff --git a/assets/en/combat/PAUSE.BUTTON.png b/assets/en/combat_ui/PAUSE.BUTTON.png
similarity index 100%
rename from assets/en/combat/PAUSE.BUTTON.png
rename to assets/en/combat_ui/PAUSE.BUTTON.png
diff --git a/assets/en/combat/PAUSE.png b/assets/en/combat_ui/PAUSE.png
similarity index 100%
rename from assets/en/combat/PAUSE.png
rename to assets/en/combat_ui/PAUSE.png
diff --git a/assets/en/combat/PAUSE_DOUBLE_CHECK.png b/assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png
similarity index 100%
rename from assets/en/combat/PAUSE_DOUBLE_CHECK.png
rename to assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png
diff --git a/assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png b/assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b5b6145227eb3d87438da7f749f8f64abfec140
GIT binary patch
literal 8774
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
PN1Og-qe~?^4$=Pu1kcK%

literal 0
HcmV?d00001

diff --git a/assets/en/combat_ui/PAUSE_New.png b/assets/en/combat_ui/PAUSE_New.png
new file mode 100644
index 0000000000000000000000000000000000000000..d11e4a2ec534b85d13583a881c3357671af902c0
GIT binary patch
literal 5698
zcmeH}c{mi_8pn@823fL=eT^1dL_aBeGBm>2vs3m#_K{^IQNqZUHCu^>C}qepS+a~J
zie$-78XEg#?N0Zf`{(`dKKBpjdCqyi=XuY0-}m|a^?hJ`U5|x{p9uiKq7T1<1c06@
zA)lZSYS0uhprHmvKe%-O0L+|!Hx0<n<pqGr&_hSZ*x21S&^N%{*H2VmM@Q7p-`CZ{
z`xXG9qj{zwR;d&o^-0PtHVf^M)#^;|Xdo_ugLbl87qLGEPWRY3G}~k2nJl=tPvpYQ
z+wKlA!Smv03QptQv>wLaNHDim`6V)5`Zgkryt1<Qb+2JDcX7WD-Oq+O!6B8hP~-_N
zB4aPBj)){1!P~kTF%WL}6rCvh0<p!7z8!#7T6Ab+V3o!`%`0C30e(YrCpkK%|HRZA
zOIZTZ6fh;uvB*q=MS@N_vraD1$qTAX-`r#ZX#jYm!?ndhISW|c)K{kmBW0=MFfdXi
zSOx`&G$8A=-bsk&d*Emujg)~9T0j9#Q(TUYP)UQaey6Ah!8Fo?;3O+7o2DbcWNFLv
z08teP&=KbBr4>cc7MvSwo+@+ji^aof0D+j^n|W>UJQqIw6MxA1>eP(bOpAB5wiE0O
zyDQ_Icy4Bn1Sfov7SVSc0REkU4~Hrm*u{mp=>^wCZ}Mh)(V^F>ueiF{+T>xwBM2Q}
zzur$Cb(o(YruFNfsS0ZLDzgEj7QlUS$L{<XW5ErkPhmR=XqA0U;rv45&dWlAOw7zH
zlFo&V=VlYs|D2!pol1z@re+Vv!dAiUY|X3+LUGK&Z6}}LN@UU^kxpB|hq5Sf*by6b
zkaT8XMyc9XhWp`~)dRe-xM2sn4w-UAtSfznV<}2;O(f%hF*Sq*;O-j{uD@e=OY|m0
z{-S{-uv!fU1I@?{*+=}$DS+KgNfAu}AhmfXSyP$@^k$aK0?_b-*Y-sk4Dk^Pz?FjN
zvsGFQ$3Jl42&}mugc=Aih|{qvn#WHPF0*SNo5Kh)74l|i@tF}+N9f*G(ef9Z$ew1e
z`JkY}vN*+I8%^?q9dqQ(Z{cmY&q$}$3FUMWQ;k32oHQcd2Zd!N(TO|3l^$bCM3>^Z
zOvKwe{YxNa+MX$PaEWzUf3Ay(wwk-xu})FNhx-p3^c2#fUz^Z=fdpyRy%6Dl_^}{h
zAW(_T4wF&jHNamZtcH14R620&M^GS$c$nmZ8Bkz#ee})A_EDU!;{z*xsSX~Oc`Id$
zWMvm2tAB#I1qk_0Wavpq0)}%LYJZQt#rrN6t7nC<(s?1dEK$Qz54B{Bxu?)_N<8(2
zQH^96$4*<QvuZWg>MBm^mzc0vzNGyrR!)ah_(|5T$8*=2#3Zqb`po)X@G-b-iD`-Y
zAiGB{LW+b%b$y?MzQ*80GgE4@Y*?emdtI$_wOp$0@iPd<qLavyG!6shTN?9p&z>r3
zXBCv2^p@p+ftJUsKE0ujDhM`~H;pUfR0_(L?9JiPA(qG%4}Hq^aPy$J%P$4iGfu<^
z>t=q+9Q69Zu(Y@ovl()n<vvSH2i*BIpBLX9zEa*=KKU%fbNbJjS)FF*zA6f2xjkWf
z;%jbocKd8NcS<)$x@x*bdSv=yxtV!@xyBH>oZ0N9IonHni-_k}&EFW$mN9<ec{x-j
zWd6SFLS-K^1et8yZ{kqg<Zy6z*M;Tv{n)Do_u<86F0~)|62*8vD&AVN(jNA=pe4z8
zJu!5)dA+lY2&Uf?2$sKtFx3etcg4A;xaKX~?xkV<SUt6R@msDzpI9GD-yK<6Sq<6h
zVb2QJipYw8M#Dy%Mx9suS9n%PqvRmJJk30rye(CfDkX@q{zAP;eQf<$Q2$T$&n_hN
z6603)7VFZ)fZi5rvv>>klRQiw5c%hv67&L=&s#yoWwi(E^26(i2Yz7n-t>zTMEClX
zHuvHI{o+%2sb6t!v&x|`byu9PpfgVC`>k=W%TCT7ien{hCGB%fXL{4TvR&&3YCZ?{
z^mNLM<3?~@%Sji9a=r4Mn!YuR?I*@Q)6H!+NVt&DkujPPPNdH;%%I?&Sg2c|Ew(Ja
z;`E1YNirnVu%)-LfMw3{9Mv4+yB8HX6>Y&es7bCFuH-X=XSPgzMirL#mzkEcmyfMn
z+;-ZQ+(vEp3-t(c2n}BfycF&q7}OK&?bkpmnO15oYb$GAvUC%0D-6inP=-Cfh9z=j
z24})dQKb({eV&F9)93kr)epY?yj7g@K4-k*8|uqMk6L@g%RNK69Dy#oRyDHL<|@T%
z=626)UTIEg%LaB)-agpg+J3K5*yv5JRQ~WeROeWm%~T`tj-#r&+O6HbC0g~5>X4^l
zPve@NH;GTGHAzGcM`lGb?C0-Y+9e(&|8AZ}uk);3r+1|JKr>I%7|kF3hSrN#gf5Hj
z8G|x?BK`Yg^2gP=wU0BhSc~|l`VwI40y{3}$K7PI2e`YTdE7SycF*-lA%urdB;D_a
zPO?Y(KHots^}K_|Pw9Eb<3&99vS2$ATxZTImdpJ#sWA<_9Y~QG#?4vpxiu!OC6_&_
zyENwc&Og`<=jn~~c3IBBWANqp=+L;|x@(ynft)89S02o@jkKvfm<@m|dS{={oy#`M
z2z05OA1|tdEiCmB^FuCMD_dj3RbroTWWLszj}g^2mghB^FZD4L;#|L%6KkZ~RFqg`
zQeBHTxcqn_&mw(WW#UqV&aV4?qpLw5&ode!rO_#TkLx5h3@xq<f5-KIyZue}Vp?um
zZZVR@Bcn$8>$%#~wMMSe(y1(S=mk`_Kx$k!WlmxzU}KEiI~FleT!XAMX5~T1zmN{K
z;k60H!yDl@zMP+QJ^Z;N!F-n|yb)VvjIVk#f)BM`n-Xu<ea|D2U<wP7Q?NtU-wgFw
z9gHBl6JKW>7|&QC&DTBA<LgPtn89bybfoWEDy5gDbrF3kH*eIra66^nG$(sz4%t{l
zorR@4;QVkeDt}j9#V^cQUUwJ@-$J8CN531?cCV1&q!N-3j$+;X%AnCxYv|McRh9~Y
zwZwS=2b970z``)kt)$+X-tJynWhdnoo1S;LvGu|W#oJ+dQFcU&gNm26P2Z$Ohnput
z?rgBe2ytKfPEK2Hcq<)h>D8zkvE?)P>+VD{zq3Gn^FrhVUN6L`JwN%*vpWpix@3}P
zps)A%tLEm{j40%VL}9q9-+T_ncQj`uJLIk3jkByRTJs-HO+F95Gi&^#u&;HzwRbWr
zs&)%Xf}^DeRhxrwvc;$ZwZca7k4MFMLiR#>O|^d_$qKVBK^@A;miYyFr`6VW=I*A>
zmfkGQ&%3Un_9bf^O+oBudD)rRHM;5a=WD<Me<5leC|w)h7nAK)8~irKDb8b(wbv@t
zD%JEN{SKz#uWWotw<yFF%gdF4n}(!I1LV(9yPkxhfUm#5%Go_dH<CXt3)K2ZO$g#8
z>$iRfZ?C{Yn0_I~?ZT2nU+p)I9{gn3W&0Ubb69<gfSUU4NO0_LwPqu;GREZ}rv3RG
zH$AA=qc<dRRU$DtPeeq3g}-tAW?$-b>FZL?{_aSNKWI|G%f-oqnZ0ZMR{JBX%sUDF
z&6Vh~4S({>vRA4d5*;E9eQ33{=ld0XV-aLLxqh;vQ6%g1zUHCv#=x#iN9iXciuz*s
z;l4cO-o~Ef;M4O|w<+oZM;ZbUCJ6v027sME)VKsd&^Z8pIs%~j1OS-tV~6&uR5$9Y
ze?`kIbaZ*N+MrcakT4x}vXx$N#zKpMA&!+bLh6)>txS_iIMCXI25l$^3iYz9#1&l~
zXqR$cq8QeV)3;1)#w1W%{?FEh8&1sBX1un2=m~q-V{*enrBt6yxNsWv*Jn%AImj%2
zEiJ=Il*hZjFa6eqtMm8{lMxZ_?_W4D+GaZyQkw{l0pR%NvfdYznQv?Tih6$tYAmA0
zgMY))Hu`VMY>2Ht$`H^3P{mD0MFt>Lvkv~PppI0<PM{v57-~DszmG6~>j4_7!TgW<
zFJD&44Od`i#4GZfZK|>jPn<~UHuzhKKu&*0Erm%zB$rxd!Vdl!^7+Yjib2nTXL)D~
zu3@UeM$I0}46v`YOo&bx;&!KAkJb@^BLYVRjtCqPI3jRF;E2HgB>_j&E9zW-{?LL#
WIY}5Pz3A!RG4*w?U#Zk~y!$VL)3;9m

literal 0
HcmV?d00001

diff --git a/assets/en/exercise/QUIT_CONFIRM.png b/assets/en/combat_ui/QUIT.png
similarity index 100%
rename from assets/en/exercise/QUIT_CONFIRM.png
rename to assets/en/combat_ui/QUIT.png
diff --git a/assets/jp/combat/PAUSE.BUTTON.png b/assets/jp/combat_ui/PAUSE.BUTTON.png
similarity index 100%
rename from assets/jp/combat/PAUSE.BUTTON.png
rename to assets/jp/combat_ui/PAUSE.BUTTON.png
diff --git a/assets/jp/combat/PAUSE.png b/assets/jp/combat_ui/PAUSE.png
similarity index 100%
rename from assets/jp/combat/PAUSE.png
rename to assets/jp/combat_ui/PAUSE.png
diff --git a/assets/jp/combat/PAUSE_DOUBLE_CHECK.png b/assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png
similarity index 100%
rename from assets/jp/combat/PAUSE_DOUBLE_CHECK.png
rename to assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png
diff --git a/assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png b/assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b5b6145227eb3d87438da7f749f8f64abfec140
GIT binary patch
literal 8774
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
PN1Og-qe~?^4$=Pu1kcK%

literal 0
HcmV?d00001

diff --git a/assets/jp/combat_ui/PAUSE_New.png b/assets/jp/combat_ui/PAUSE_New.png
new file mode 100644
index 0000000000000000000000000000000000000000..d11e4a2ec534b85d13583a881c3357671af902c0
GIT binary patch
literal 5698
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%0D-6inP=-Cfh9z=j
z24})dQKb({eV&F9)93kr)epY?yj7g@K4-k*8|uqMk6L@g%RNK69Dy#oRyDHL<|@T%
z=626)UTIEg%LaB)-agpg+J3K5*yv5JRQ~WeROeWm%~T`tj-#r&+O6HbC0g~5>X4^l
zPve@NH;GTGHAzGcM`lGb?C0-Y+9e(&|8AZ}uk);3r+1|JKr>I%7|kF3hSrN#gf5Hj
z8G|x?BK`Yg^2gP=wU0BhSc~|l`VwI40y{3}$K7PI2e`YTdE7SycF*-lA%urdB;D_a
zPO?Y(KHots^}K_|Pw9Eb<3&99vS2$ATxZTImdpJ#sWA<_9Y~QG#?4vpxiu!OC6_&_
zyENwc&Og`<=jn~~c3IBBWANqp=+L;|x@(ynft)89S02o@jkKvfm<@m|dS{={oy#`M
z2z05OA1|tdEiCmB^FuCMD_dj3RbroTWWLszj}g^2mghB^FZD4L;#|L%6KkZ~RFqg`
zQeBHTxcqn_&mw(WW#UqV&aV4?qpLw5&ode!rO_#TkLx5h3@xq<f5-KIyZue}Vp?um
zZZVR@Bcn$8>$%#~wMMSe(y1(S=mk`_Kx$k!WlmxzU}KEiI~FleT!XAMX5~T1zmN{K
z;k60H!yDl@zMP+QJ^Z;N!F-n|yb)VvjIVk#f)BM`n-Xu<ea|D2U<wP7Q?NtU-wgFw
z9gHBl6JKW>7|&QC&DTBA<LgPtn89bybfoWEDy5gDbrF3kH*eIra66^nG$(sz4%t{l
zorR@4;QVkeDt}j9#V^cQUUwJ@-$J8CN531?cCV1&q!N-3j$+;X%AnCxYv|McRh9~Y
zwZwS=2b970z``)kt)$+X-tJynWhdnoo1S;LvGu|W#oJ+dQFcU&gNm26P2Z$Ohnput
z?rgBe2ytKfPEK2Hcq<)h>D8zkvE?)P>+VD{zq3Gn^FrhVUN6L`JwN%*vpWpix@3}P
zps)A%tLEm{j40%VL}9q9-+T_ncQj`uJLIk3jkByRTJs-HO+F95Gi&^#u&;HzwRbWr
zs&)%Xf}^DeRhxrwvc;$ZwZca7k4MFMLiR#>O|^d_$qKVBK^@A;miYyFr`6VW=I*A>
zmfkGQ&%3Un_9bf^O+oBudD)rRHM;5a=WD<Me<5leC|w)h7nAK)8~irKDb8b(wbv@t
zD%JEN{SKz#uWWotw<yFF%gdF4n}(!I1LV(9yPkxhfUm#5%Go_dH<CXt3)K2ZO$g#8
z>$iRfZ?C{Yn0_I~?ZT2nU+p)I9{gn3W&0Ubb69<gfSUU4NO0_LwPqu;GREZ}rv3RG
zH$AA=qc<dRRU$DtPeeq3g}-tAW?$-b>FZL?{_aSNKWI|G%f-oqnZ0ZMR{JBX%sUDF
z&6Vh~4S({>vRA4d5*;E9eQ33{=ld0XV-aLLxqh;vQ6%g1zUHCv#=x#iN9iXciuz*s
z;l4cO-o~Ef;M4O|w<+oZM;ZbUCJ6v027sME)VKsd&^Z8pIs%~j1OS-tV~6&uR5$9Y
ze?`kIbaZ*N+MrcakT4x}vXx$N#zKpMA&!+bLh6)>txS_iIMCXI25l$^3iYz9#1&l~
zXqR$cq8QeV)3;1)#w1W%{?FEh8&1sBX1un2=m~q-V{*enrBt6yxNsWv*Jn%AImj%2
zEiJ=Il*hZjFa6eqtMm8{lMxZ_?_W4D+GaZyQkw{l0pR%NvfdYznQv?Tih6$tYAmA0
zgMY))Hu`VMY>2Ht$`H^3P{mD0MFt>Lvkv~PppI0<PM{v57-~DszmG6~>j4_7!TgW<
zFJD&44Od`i#4GZfZK|>jPn<~UHuzhKKu&*0Erm%zB$rxd!Vdl!^7+Yjib2nTXL)D~
zu3@UeM$I0}46v`YOo&bx;&!KAkJb@^BLYVRjtCqPI3jRF;E2HgB>_j&E9zW-{?LL#
WIY}5Pz3A!RG4*w?U#Zk~y!$VL)3;9m

literal 0
HcmV?d00001

diff --git a/assets/jp/exercise/QUIT_CONFIRM.png b/assets/jp/combat_ui/QUIT.png
similarity index 100%
rename from assets/jp/exercise/QUIT_CONFIRM.png
rename to assets/jp/combat_ui/QUIT.png
diff --git a/assets/tw/combat/PAUSE.BUTTON.png b/assets/tw/combat_ui/PAUSE.BUTTON.png
similarity index 100%
rename from assets/tw/combat/PAUSE.BUTTON.png
rename to assets/tw/combat_ui/PAUSE.BUTTON.png
diff --git a/assets/cn/combat/PAUSE.png b/assets/tw/combat_ui/PAUSE.png
similarity index 100%
rename from assets/cn/combat/PAUSE.png
rename to assets/tw/combat_ui/PAUSE.png
diff --git a/assets/tw/combat/PAUSE_DOUBLE_CHECK.png b/assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png
similarity index 100%
rename from assets/tw/combat/PAUSE_DOUBLE_CHECK.png
rename to assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png
diff --git a/assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png b/assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b5b6145227eb3d87438da7f749f8f64abfec140
GIT binary patch
literal 8774
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
PN1Og-qe~?^4$=Pu1kcK%

literal 0
HcmV?d00001

diff --git a/assets/tw/combat_ui/PAUSE_New.png b/assets/tw/combat_ui/PAUSE_New.png
new file mode 100644
index 0000000000000000000000000000000000000000..d11e4a2ec534b85d13583a881c3357671af902c0
GIT binary patch
literal 5698
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%0D-6inP=-Cfh9z=j
z24})dQKb({eV&F9)93kr)epY?yj7g@K4-k*8|uqMk6L@g%RNK69Dy#oRyDHL<|@T%
z=626)UTIEg%LaB)-agpg+J3K5*yv5JRQ~WeROeWm%~T`tj-#r&+O6HbC0g~5>X4^l
zPve@NH;GTGHAzGcM`lGb?C0-Y+9e(&|8AZ}uk);3r+1|JKr>I%7|kF3hSrN#gf5Hj
z8G|x?BK`Yg^2gP=wU0BhSc~|l`VwI40y{3}$K7PI2e`YTdE7SycF*-lA%urdB;D_a
zPO?Y(KHots^}K_|Pw9Eb<3&99vS2$ATxZTImdpJ#sWA<_9Y~QG#?4vpxiu!OC6_&_
zyENwc&Og`<=jn~~c3IBBWANqp=+L;|x@(ynft)89S02o@jkKvfm<@m|dS{={oy#`M
z2z05OA1|tdEiCmB^FuCMD_dj3RbroTWWLszj}g^2mghB^FZD4L;#|L%6KkZ~RFqg`
zQeBHTxcqn_&mw(WW#UqV&aV4?qpLw5&ode!rO_#TkLx5h3@xq<f5-KIyZue}Vp?um
zZZVR@Bcn$8>$%#~wMMSe(y1(S=mk`_Kx$k!WlmxzU}KEiI~FleT!XAMX5~T1zmN{K
z;k60H!yDl@zMP+QJ^Z;N!F-n|yb)VvjIVk#f)BM`n-Xu<ea|D2U<wP7Q?NtU-wgFw
z9gHBl6JKW>7|&QC&DTBA<LgPtn89bybfoWEDy5gDbrF3kH*eIra66^nG$(sz4%t{l
zorR@4;QVkeDt}j9#V^cQUUwJ@-$J8CN531?cCV1&q!N-3j$+;X%AnCxYv|McRh9~Y
zwZwS=2b970z``)kt)$+X-tJynWhdnoo1S;LvGu|W#oJ+dQFcU&gNm26P2Z$Ohnput
z?rgBe2ytKfPEK2Hcq<)h>D8zkvE?)P>+VD{zq3Gn^FrhVUN6L`JwN%*vpWpix@3}P
zps)A%tLEm{j40%VL}9q9-+T_ncQj`uJLIk3jkByRTJs-HO+F95Gi&^#u&;HzwRbWr
zs&)%Xf}^DeRhxrwvc;$ZwZca7k4MFMLiR#>O|^d_$qKVBK^@A;miYyFr`6VW=I*A>
zmfkGQ&%3Un_9bf^O+oBudD)rRHM;5a=WD<Me<5leC|w)h7nAK)8~irKDb8b(wbv@t
zD%JEN{SKz#uWWotw<yFF%gdF4n}(!I1LV(9yPkxhfUm#5%Go_dH<CXt3)K2ZO$g#8
z>$iRfZ?C{Yn0_I~?ZT2nU+p)I9{gn3W&0Ubb69<gfSUU4NO0_LwPqu;GREZ}rv3RG
zH$AA=qc<dRRU$DtPeeq3g}-tAW?$-b>FZL?{_aSNKWI|G%f-oqnZ0ZMR{JBX%sUDF
z&6Vh~4S({>vRA4d5*;E9eQ33{=ld0XV-aLLxqh;vQ6%g1zUHCv#=x#iN9iXciuz*s
z;l4cO-o~Ef;M4O|w<+oZM;ZbUCJ6v027sME)VKsd&^Z8pIs%~j1OS-tV~6&uR5$9Y
ze?`kIbaZ*N+MrcakT4x}vXx$N#zKpMA&!+bLh6)>txS_iIMCXI25l$^3iYz9#1&l~
zXqR$cq8QeV)3;1)#w1W%{?FEh8&1sBX1un2=m~q-V{*enrBt6yxNsWv*Jn%AImj%2
zEiJ=Il*hZjFa6eqtMm8{lMxZ_?_W4D+GaZyQkw{l0pR%NvfdYznQv?Tih6$tYAmA0
zgMY))Hu`VMY>2Ht$`H^3P{mD0MFt>Lvkv~PppI0<PM{v57-~DszmG6~>j4_7!TgW<
zFJD&44Od`i#4GZfZK|>jPn<~UHuzhKKu&*0Erm%zB$rxd!Vdl!^7+Yjib2nTXL)D~
zu3@UeM$I0}46v`YOo&bx;&!KAkJb@^BLYVRjtCqPI3jRF;E2HgB>_j&E9zW-{?LL#
WIY}5Pz3A!RG4*w?U#Zk~y!$VL)3;9m

literal 0
HcmV?d00001

diff --git a/assets/tw/exercise/QUIT_CONFIRM.png b/assets/tw/combat_ui/QUIT.png
similarity index 100%
rename from assets/tw/exercise/QUIT_CONFIRM.png
rename to assets/tw/combat_ui/QUIT.png
diff --git a/module/combat/assets.py b/module/combat/assets.py
index ce2e8e1dc6..9010ee6ee7 100644
--- a/module/combat/assets.py
+++ b/module/combat/assets.py
@@ -40,8 +40,6 @@
 MOVE_LEFT_DOWN = Button(area={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, color={'cn': (65, 80, 100), 'en': (65, 80, 100), 'jp': (65, 80, 100), 'tw': (65, 80, 100)}, button={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, file={'cn': './assets/cn/combat/MOVE_LEFT_DOWN.png', 'en': './assets/en/combat/MOVE_LEFT_DOWN.png', 'jp': './assets/jp/combat/MOVE_LEFT_DOWN.png', 'tw': './assets/tw/combat/MOVE_LEFT_DOWN.png'})
 NEW_SHIP = Button(area={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, color={'cn': (235, 171, 60), 'en': (235, 171, 60), 'jp': (235, 171, 60), 'tw': (235, 171, 60)}, button={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, file={'cn': './assets/cn/combat/NEW_SHIP.png', 'en': './assets/en/combat/NEW_SHIP.png', 'jp': './assets/jp/combat/NEW_SHIP.png', 'tw': './assets/tw/combat/NEW_SHIP.png'})
 OPTS_INFO_D = Button(area={'cn': (602, 151, 703, 179), 'en': (565, 143, 692, 179), 'jp': (512, 154, 605, 176), 'tw': (602, 152, 702, 177)}, color={'cn': (157, 115, 123), 'en': (171, 116, 110), 'jp': (201, 187, 191), 'tw': (164, 130, 137)}, button={'cn': (583, 605, 677, 628), 'en': (590, 587, 627, 647), 'jp': (574, 596, 685, 635), 'tw': (583, 604, 676, 627)}, file={'cn': './assets/cn/combat/OPTS_INFO_D.png', 'en': './assets/en/combat/OPTS_INFO_D.png', 'jp': './assets/jp/combat/OPTS_INFO_D.png', 'tw': './assets/tw/combat/OPTS_INFO_D.png'})
-PAUSE = Button(area={'cn': (1217, 36, 1225, 59), 'en': (1155, 38, 1216, 51), 'jp': (1232, 36, 1240, 60), 'tw': (1217, 36, 1225, 59)}, color={'cn': (247, 243, 247), 'en': (164, 169, 181), 'jp': (244, 241, 246), 'tw': (247, 243, 247)}, button={'cn': (1157, 34, 1241, 61), 'en': (1136, 26, 1270, 63), 'jp': (1141, 38, 1220, 57), 'tw': (1157, 34, 1241, 61)}, file={'cn': './assets/cn/combat/PAUSE.png', 'en': './assets/en/combat/PAUSE.png', 'jp': './assets/jp/combat/PAUSE.png', 'tw': './assets/tw/combat/PAUSE.png'})
-PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, color={'cn': (96, 104, 136), 'en': (83, 98, 118), 'jp': (97, 102, 120), 'tw': (96, 104, 136)}, button={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, file={'cn': './assets/cn/combat/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat/PAUSE_DOUBLE_CHECK.png', 'jp': './assets/jp/combat/PAUSE_DOUBLE_CHECK.png', 'tw': './assets/tw/combat/PAUSE_DOUBLE_CHECK.png'})
 READY_AIR_RAID = Button(area={'cn': (887, 618, 907, 628), 'en': (887, 618, 907, 628), 'jp': (887, 618, 907, 628), 'tw': (887, 618, 907, 628)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (887, 618, 907, 628), 'en': (887, 618, 907, 628), 'jp': (887, 618, 907, 628), 'tw': (887, 618, 907, 628)}, file={'cn': './assets/cn/combat/READY_AIR_RAID.png', 'en': './assets/en/combat/READY_AIR_RAID.png', 'jp': './assets/jp/combat/READY_AIR_RAID.png', 'tw': './assets/tw/combat/READY_AIR_RAID.png'})
 READY_TORPEDO = Button(area={'cn': (1038, 611, 1046, 619), 'en': (1038, 611, 1046, 619), 'jp': (1038, 611, 1046, 619), 'tw': (1038, 611, 1046, 619)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (1038, 611, 1046, 619), 'en': (1038, 611, 1046, 619), 'jp': (1038, 611, 1046, 619), 'tw': (1038, 611, 1046, 619)}, file={'cn': './assets/cn/combat/READY_TORPEDO.png', 'en': './assets/en/combat/READY_TORPEDO.png', 'jp': './assets/jp/combat/READY_TORPEDO.png', 'tw': './assets/tw/combat/READY_TORPEDO.png'})
 SUBMARINE_AVAILABLE_CHECK_1 = Button(area={'cn': (707, 660, 712, 665), 'en': (707, 660, 712, 665), 'jp': (707, 660, 712, 665), 'tw': (707, 660, 712, 665)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (707, 660, 712, 665), 'en': (707, 660, 712, 665), 'jp': (707, 660, 712, 665), 'tw': (707, 660, 712, 665)}, file={'cn': './assets/cn/combat/SUBMARINE_AVAILABLE_CHECK_1.png', 'en': './assets/en/combat/SUBMARINE_AVAILABLE_CHECK_1.png', 'jp': './assets/jp/combat/SUBMARINE_AVAILABLE_CHECK_1.png', 'tw': './assets/tw/combat/SUBMARINE_AVAILABLE_CHECK_1.png'})
diff --git a/module/combat/combat.py b/module/combat/combat.py
index adacabf1e3..1efdc1a086 100644
--- a/module/combat/combat.py
+++ b/module/combat/combat.py
@@ -3,6 +3,7 @@
 from module.base.timer import Timer
 from module.base.utils import get_color, color_similar
 from module.combat.assets import *
+from module.combat_ui.assets import *
 from module.combat.combat_auto import CombatAuto
 from module.combat.combat_manual import CombatManual
 from module.combat.hp_balancer import HPBalancer
@@ -81,13 +82,36 @@ def is_combat_executing(self):
             bool:
         """
         self.device.stuck_record_add(PAUSE)
-        if self.config.SERVER in ['en']:
-            return PAUSE.match_luma(self.device.image, offset=(20, 20))
+        if self.config.SERVER in ['cn', 'en']:
+            if PAUSE.match_luma(self.device.image, offset=(20, 20)):
+                return True
         else:
             color = get_color(self.device.image, PAUSE.area)
             if color_similar(color, PAUSE.color) or color_similar(color, (238, 244, 248)):
                 if np.max(self.image_crop(PAUSE_DOUBLE_CHECK, copy=False)) < 153:
                     return True
+        if PAUSE_New.match_luma(self.device.image, offset=(20, 20)):
+            return True
+        if PAUSE_Iridescent_Fantasy.match_luma(self.device.image, offset=(20, 20)):
+            return True
+        return False
+
+    def handle_combat_quit(self, offset=(20, 20), interval=3):
+        timer = self.get_interval_timer(QUIT, interval=interval)
+        if not timer.reached():
+            return False
+        if QUIT.match_luma(self.device.image, offset=offset):
+            self.device.click(QUIT)
+            timer.reset()
+            return True
+        if QUIT_New.match_luma(self.device.image, offset=offset):
+            self.device.click(QUIT_New)
+            timer.reset()
+            return True
+        if QUIT_Iridescent_Fantasy.match_luma(self.device.image, offset=offset):
+            self.device.click(QUIT_Iridescent_Fantasy)
+            timer.reset()
+            return True
         return False
 
     def ensure_combat_oil_loaded(self):
diff --git a/module/combat_ui/assets.py b/module/combat_ui/assets.py
new file mode 100644
index 0000000000..4e2ae99750
--- /dev/null
+++ b/module/combat_ui/assets.py
@@ -0,0 +1,13 @@
+from module.base.button import Button
+from module.base.template import Template
+
+# This file was automatically generated by dev_tools/button_extract.py.
+# Don't modify it manually.
+
+PAUSE = Button(area={'cn': (1158, 40, 1199, 58), 'en': (1155, 38, 1216, 51), 'jp': (1232, 36, 1240, 60), 'tw': (1217, 36, 1225, 59)}, color={'cn': (189, 190, 202), 'en': (164, 169, 181), 'jp': (244, 241, 246), 'tw': (247, 243, 247)}, button={'cn': (1157, 34, 1241, 61), 'en': (1136, 26, 1270, 63), 'jp': (1141, 38, 1220, 57), 'tw': (1157, 34, 1241, 61)}, file={'cn': './assets/cn/combat_ui/PAUSE.png', 'en': './assets/en/combat_ui/PAUSE.png', 'jp': './assets/jp/combat_ui/PAUSE.png', 'tw': './assets/tw/combat_ui/PAUSE.png'})
+PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, color={'cn': (96, 104, 136), 'en': (83, 98, 118), 'jp': (97, 102, 120), 'tw': (96, 104, 136)}, button={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, file={'cn': './assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png', 'jp': './assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png', 'tw': './assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png'})
+PAUSE_Iridescent_Fantasy = Button(area={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, color={'cn': (124, 139, 190), 'en': (124, 139, 190), 'jp': (124, 139, 190), 'tw': (124, 139, 190)}, button={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png', 'tw': './assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png'})
+PAUSE_New = Button(area={'cn': (1231, 29, 1253, 56), 'en': (1231, 29, 1253, 56), 'jp': (1231, 29, 1253, 56), 'tw': (1231, 29, 1253, 56)}, color={'cn': (156, 158, 166), 'en': (156, 158, 166), 'jp': (156, 158, 166), 'tw': (156, 158, 166)}, button={'cn': (1231, 29, 1253, 56), 'en': (1231, 29, 1253, 56), 'jp': (1231, 29, 1253, 56), 'tw': (1231, 29, 1253, 56)}, file={'cn': './assets/cn/combat_ui/PAUSE_New.png', 'en': './assets/en/combat_ui/PAUSE_New.png', 'jp': './assets/jp/combat_ui/PAUSE_New.png', 'tw': './assets/tw/combat_ui/PAUSE_New.png'})
+QUIT = Button(area={'cn': (420, 490, 593, 548), 'en': (459, 508, 582, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, color={'cn': (199, 122, 114), 'en': (221, 177, 174), 'jp': (196, 120, 113), 'tw': (200, 126, 118)}, button={'cn': (420, 490, 593, 548), 'en': (459, 508, 582, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, file={'cn': './assets/cn/combat_ui/QUIT.png', 'en': './assets/en/combat_ui/QUIT.png', 'jp': './assets/jp/combat_ui/QUIT.png', 'tw': './assets/tw/combat_ui/QUIT.png'})
+QUIT_Iridescent_Fantasy = Button(area={'cn': (391, 522, 464, 540), 'en': (391, 522, 464, 540), 'jp': (391, 522, 464, 540), 'tw': (391, 522, 464, 540)}, color={'cn': (121, 73, 79), 'en': (121, 73, 79), 'jp': (121, 73, 79), 'tw': (121, 73, 79)}, button={'cn': (391, 522, 464, 540), 'en': (391, 522, 464, 540), 'jp': (391, 522, 464, 540), 'tw': (391, 522, 464, 540)}, file={'cn': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png', 'en': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png', 'jp': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png', 'tw': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png'})
+QUIT_New = Button(area={'cn': (394, 506, 467, 524), 'en': (394, 506, 467, 524), 'jp': (394, 506, 467, 524), 'tw': (394, 506, 467, 524)}, color={'cn': (255, 180, 171), 'en': (255, 180, 171), 'jp': (255, 180, 171), 'tw': (255, 180, 171)}, button={'cn': (394, 506, 467, 524), 'en': (394, 506, 467, 524), 'jp': (394, 506, 467, 524), 'tw': (394, 506, 467, 524)}, file={'cn': './assets/cn/combat_ui/QUIT_New.png', 'en': './assets/cn/combat_ui/QUIT_New.png', 'jp': './assets/cn/combat_ui/QUIT_New.png', 'tw': './assets/cn/combat_ui/QUIT_New.png'})
diff --git a/module/exercise/assets.py b/module/exercise/assets.py
index e14c1a0ada..b9e21bc9e8 100644
--- a/module/exercise/assets.py
+++ b/module/exercise/assets.py
@@ -18,5 +18,4 @@
 OPPONENT_2 = Button(area={'cn': (348, 77, 560, 381), 'en': (348, 77, 562, 381), 'jp': (348, 77, 560, 381), 'tw': (348, 77, 560, 381)}, color={'cn': (105, 123, 149), 'en': (105, 122, 150), 'jp': (105, 123, 149), 'tw': (105, 123, 149)}, button={'cn': (348, 77, 560, 381), 'en': (348, 77, 562, 381), 'jp': (348, 77, 560, 381), 'tw': (348, 77, 560, 381)}, file={'cn': './assets/cn/exercise/OPPONENT_2.png', 'en': './assets/en/exercise/OPPONENT_2.png', 'jp': './assets/jp/exercise/OPPONENT_2.png', 'tw': './assets/tw/exercise/OPPONENT_2.png'})
 OPPONENT_3 = Button(area={'cn': (592, 77, 804, 381), 'en': (592, 77, 806, 381), 'jp': (592, 77, 804, 381), 'tw': (592, 77, 804, 381)}, color={'cn': (106, 131, 158), 'en': (105, 129, 156), 'jp': (106, 131, 158), 'tw': (106, 131, 158)}, button={'cn': (592, 77, 804, 381), 'en': (592, 77, 806, 381), 'jp': (592, 77, 804, 381), 'tw': (592, 77, 804, 381)}, file={'cn': './assets/cn/exercise/OPPONENT_3.png', 'en': './assets/en/exercise/OPPONENT_3.png', 'jp': './assets/jp/exercise/OPPONENT_3.png', 'tw': './assets/tw/exercise/OPPONENT_3.png'})
 OPPONENT_4 = Button(area={'cn': (836, 77, 1048, 381), 'en': (836, 77, 1050, 381), 'jp': (836, 77, 1048, 381), 'tw': (836, 77, 1048, 381)}, color={'cn': (103, 118, 141), 'en': (112, 127, 152), 'jp': (103, 118, 141), 'tw': (103, 118, 141)}, button={'cn': (836, 77, 1048, 381), 'en': (836, 77, 1050, 381), 'jp': (836, 77, 1048, 381), 'tw': (836, 77, 1048, 381)}, file={'cn': './assets/cn/exercise/OPPONENT_4.png', 'en': './assets/en/exercise/OPPONENT_4.png', 'jp': './assets/jp/exercise/OPPONENT_4.png', 'tw': './assets/tw/exercise/OPPONENT_4.png'})
-QUIT_CONFIRM = Button(area={'cn': (420, 490, 593, 548), 'en': (459, 508, 582, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, color={'cn': (199, 122, 114), 'en': (221, 177, 174), 'jp': (196, 120, 113), 'tw': (200, 126, 118)}, button={'cn': (420, 490, 593, 548), 'en': (459, 508, 582, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, file={'cn': './assets/cn/exercise/QUIT_CONFIRM.png', 'en': './assets/en/exercise/QUIT_CONFIRM.png', 'jp': './assets/jp/exercise/QUIT_CONFIRM.png', 'tw': './assets/tw/exercise/QUIT_CONFIRM.png'})
 QUIT_RECONFIRM = Button(area={'cn': (703, 492, 877, 550), 'en': (731, 488, 846, 533), 'jp': (703, 482, 877, 539), 'tw': (754, 491, 825, 522)}, color={'cn': (195, 111, 102), 'en': (195, 112, 105), 'jp': (193, 112, 104), 'tw': (211, 158, 152)}, button={'cn': (703, 492, 877, 550), 'en': (731, 488, 846, 533), 'jp': (703, 482, 877, 539), 'tw': (703, 502, 876, 559)}, file={'cn': './assets/cn/exercise/QUIT_RECONFIRM.png', 'en': './assets/en/exercise/QUIT_RECONFIRM.png', 'jp': './assets/jp/exercise/QUIT_RECONFIRM.png', 'tw': './assets/tw/exercise/QUIT_RECONFIRM.png'})
diff --git a/module/exercise/combat.py b/module/exercise/combat.py
index ca117bacc4..fb519e24db 100644
--- a/module/exercise/combat.py
+++ b/module/exercise/combat.py
@@ -1,4 +1,5 @@
 from module.combat.combat import *
+from module.combat.combat import PAUSE, QUIT
 from module.exercise.assets import *
 from module.exercise.equipment import ExerciseEquipment
 from module.exercise.hp_daemon import HpDaemon
@@ -75,13 +76,13 @@ def _combat_execute(self):
                 continue
 
             # Quit
-            if self.appear_then_click(QUIT_CONFIRM, offset=(20, 20), interval=5):
+            if self.handle_combat_quit():
                 pause_interval.reset()
                 success = False
                 end = True
                 continue
             if self.appear_then_click(QUIT_RECONFIRM, offset=(20, 20), interval=5):
-                self.interval_reset(QUIT_CONFIRM)
+                self.interval_reset(QUIT)
                 pause_interval.reset()
                 continue
             if not end:
diff --git a/module/os/map.py b/module/os/map.py
index 9760ca54b9..310583f576 100644
--- a/module/os/map.py
+++ b/module/os/map.py
@@ -4,10 +4,10 @@
 import inflection
 
 from module.base.timer import Timer
-from module.combat.assets import PAUSE
+from module.combat_ui.assets import PAUSE
 from module.config.utils import get_os_reset_remain
 from module.exception import CampaignEnd, GameTooManyClickError, MapWalkError, RequestHumanTakeover, ScriptError
-from module.exercise.assets import QUIT_CONFIRM, QUIT_RECONFIRM
+from module.exercise.assets import QUIT_RECONFIRM
 from module.handler.login import LoginHandler, MAINTENANCE_ANNOUNCE
 from module.logger import logger
 from module.map.map import Map
@@ -558,7 +558,7 @@ def interrupt_auto_search(self, skip_first_screenshot=True):
                 self.interval_reset(MAINTENANCE_ANNOUNCE)
                 pause_interval.reset()
                 continue
-            if self.appear_then_click(QUIT_CONFIRM, offset=(20, 20), interval=5):
+            if self.handle_combat_quit():
                 self.interval_reset(MAINTENANCE_ANNOUNCE)
                 pause_interval.reset()
                 continue