Merge pull request LmeSzinc#5378 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

assets/cn/combat_ui/PAUSE_ShadowPuppetry.png

@@ -309,7 +309,6 @@
       "ServerUpdate": "00:00"
     },
     "GemsFarming": {
-      "ChangeFlagship": "ship",
       "CommonCV": "any",
       "ChangeVanguard": "ship",
       "CommonDD": "any",

assets/jp/ui_white/POPUP_CONFIRM_WHITE_BATTLEPASS.png

@@ -45,7 +45,7 @@ def get_alias(self, server):
     def filepath(self, path):
         return os.path.join(self.folder, self.server, path)
 
-    def _load_file(self, file):
+    def _load_file(self, file, keyword=None):
         """
         Args:
             file (str):
@@ -57,56 +57,21 @@ def _load_file(self, file):
             text = f.read()
 
         result = {}
-        matched = re.findall('function \(\)(.*?)end[()]', text, re.S)
-        if matched:
-            # Most files are in this format
-            """
-            pg = pg or {}
-            slot0 = pg
-            slot0.chapter_template = {}
-
-            (function ()
-                ...
-            end)()
-            """
-            for func in matched:
-                add = slpp.decode('{' + func + '}')
-                result.update(add)
-        elif text.startswith('pg'):
-            # Old format
-            """
-            pg = pg or {}
-            pg.item_data_statistics = {
-                ...
-            }
-            """
-            # or
-            """
-            pg = pg or {}
-
-            rawset(pg, "item_data_statistics", rawget(pg, "item_data_statistics") or {
-                ...
-            }
-            """
-            text = '{' + text.split('{', 2)[2]
-            result = slpp.decode(text)
-        else:
-            # Another format, just bare data
-            """
-            _G.pg.expedition_data_template[...] = {
-                ...
-            }
-            _G.pg.expedition_data_template[...] = {
-                ...
-            }
-            ...
-            """
+        if text.startswith('_G'):
             text = '{' + text + '}'
             result = slpp.decode(text)
-
+        else:
+            if keyword:
+                print(f'Finding keyword: {keyword}')
+                pattern = rf"^{re.escape(keyword)}.*?\{{\s*\n(.*?)^\}}"
+            else:
+                pattern = r"\{\s*\n(.*?)^\}"
+            m = re.search(pattern, text, re.S | re.M)
+            if m:
+                result = slpp.decode('{' + m.group(1) + '}')
         return result
 
-    def load(self, path):
+    def load(self, path, keyword=None):
         """
         Load a lua file to python dictionary, handling the differences
 
@@ -123,7 +88,7 @@ def load(self, path):
             for file in tqdm(os.listdir(self.filepath(path))):
                 result.update(self._load_file(f'./{path}/{file}'))
         else:
-            result = self._load_file(path)
+            result = self._load_file(path, keyword=keyword)
 
         print(f'{len(result.keys())} items loaded')
         return result

config/template.json

@@ -79,22 +79,10 @@ class GemsCampaign(GemsCampaignOverride, self.module.Campaign):
         self.campaign.config.override(Emotion_Mode='ignore')
         self.campaign.config.override(EnemyPriority_EnemyScaleBalanceWeight='S1_enemy_first')
 
-    @property
-    def change_flagship(self):
-        return 'ship' in self.config.GemsFarming_ChangeFlagship
-
-    @property
-    def change_flagship_equip(self):
-        return 'equip' in self.config.GemsFarming_ChangeFlagship
-
     @property
     def change_vanguard(self):
         return 'ship' in self.config.GemsFarming_ChangeVanguard
 
-    @property
-    def change_vanguard_equip(self):
-        return 'equip' in self.config.GemsFarming_ChangeVanguard
-
     @property
     def fleet_to_attack(self):
         if self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all':
@@ -110,31 +98,12 @@ def flagship_change(self):
         Returns:
             bool: True if flagship changed.
         """
-
-        if self.config.GemsFarming_CommonCV == 'any':
-            index_list = range(3, 5)
-        else:
-            index_list = range(0, 5)
         logger.hr('Change flagship', level=1)
-        logger.attr('ChangeFlagship', self.config.GemsFarming_ChangeFlagship)
         self.fleet_enter(self.fleet_to_attack)
-        if self.change_flagship_equip:
-            logger.hr('Record flagship equipment', level=2)
-            self.fleet_enter_ship(FLEET_DETAIL_ENTER_FLAGSHIP)
-            self.ship_equipment_record_image(index_list=index_list)
-            self.ship_equipment_take_off()
-            self.fleet_back()
 
         logger.hr('Change flagship', level=2)
         success = self.flagship_change_execute()
 
-        if self.change_flagship_equip:
-            logger.hr('Equip flagship equipment', level=2)
-            self.fleet_enter_ship(FLEET_DETAIL_ENTER_FLAGSHIP)
-            self.ship_equipment_take_off()
-            self.ship_equipment_take_on_image(index_list=index_list)
-            self.fleet_back()
-
         return success
 
     def vanguard_change(self):
@@ -148,23 +117,10 @@ def vanguard_change(self):
         logger.hr('Change vanguard', level=1)
         logger.attr('ChangeVanguard', self.config.GemsFarming_ChangeVanguard)
         self.fleet_enter(self.fleet_to_attack)
-        if self.change_vanguard_equip:
-            logger.hr('Record vanguard equipment', level=2)
-            self.fleet_enter_ship(FLEET_DETAIL_ENTER)
-            self.ship_equipment_record_image()
-            self.ship_equipment_take_off()
-            self.fleet_back()
 
         logger.hr('Change vanguard', level=2)
         success = self.vanguard_change_execute()
 
-        if self.change_vanguard_equip:
-            logger.hr('Equip vanguard equipment', level=2)
-            self.fleet_enter_ship(FLEET_DETAIL_ENTER)
-            self.ship_equipment_take_off()
-            self.ship_equipment_take_on_image()
-            self.fleet_back()
-
         return success
 
     def _dock_reset(self):
@@ -391,7 +347,7 @@ def vanguard_change_execute(self):
 
     def triggered_stop_condition(self, oil_check=True):
         # Lv32 limit
-        if self.change_flagship and self.campaign.config.LV32_TRIGGERED:
+        if self.campaign.config.LV32_TRIGGERED:
             self._trigger_lv32 = True
             logger.hr('TRIGGERED LV32 LIMIT')
             return True
@@ -411,7 +367,7 @@ def run(self, name, folder='campaign_main', mode='normal', total=0):
             mode (str): `normal` or `hard`
             total (int):
         """
-        self.config.STOP_IF_REACH_LV32 = self.change_flagship
+        self.config.override(STOP_IF_REACH_LV32=True)
 
         while 1:
             self._trigger_lv32 = False
@@ -427,9 +383,7 @@ def run(self, name, folder='campaign_main', mode='normal', total=0):
 
             # End
             if self._trigger_lv32 or self._trigger_emotion:
-                success = True
-                if self.change_flagship:
-                    success = self.flagship_change()
+                success = self.flagship_change()
                 if self.change_vanguard:
                     success = success and self.vanguard_change()
 

dev_tools/utils.py

@@ -119,6 +119,8 @@ def is_combat_executing(self):
             return PAUSE_Seaside
         if PAUSE_Ninja.match_template_color(self.device.image, offset=(10, 10)):
             return PAUSE_Ninja
+        if PAUSE_ShadowPuppetry.match_luma(self.device.image, offset=(10, 10)):
+            return PAUSE_ShadowPuppetry
         return False
 
     def handle_combat_quit(self, offset=(20, 20), interval=3):

module/campaign/gems_farming.py

@@ -17,6 +17,7 @@
 PAUSE_Nurse = Button(area={'cn': (1236, 33, 1251, 50), 'en': (1236, 33, 1251, 50), 'jp': (1236, 33, 1251, 50), 'tw': (1236, 33, 1251, 50)}, color={'cn': (200, 206, 209), 'en': (200, 206, 209), 'jp': (200, 206, 209), 'tw': (200, 206, 209)}, button={'cn': (1236, 33, 1251, 50), 'en': (1236, 33, 1251, 50), 'jp': (1236, 33, 1251, 50), 'tw': (1236, 33, 1251, 50)}, file={'cn': './assets/cn/combat_ui/PAUSE_Nurse.png', 'en': './assets/cn/combat_ui/PAUSE_Nurse.png', 'jp': './assets/cn/combat_ui/PAUSE_Nurse.png', 'tw': './assets/cn/combat_ui/PAUSE_Nurse.png'})
 PAUSE_Pharaoh = Button(area={'cn': (1229, 55, 1259, 62), 'en': (1229, 55, 1259, 62), 'jp': (1229, 55, 1259, 62), 'tw': (1229, 55, 1259, 62)}, color={'cn': (164, 119, 78), 'en': (164, 119, 78), 'jp': (164, 119, 78), 'tw': (164, 119, 78)}, button={'cn': (1229, 55, 1259, 62), 'en': (1229, 55, 1259, 62), 'jp': (1229, 55, 1259, 62), 'tw': (1229, 55, 1259, 62)}, file={'cn': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'en': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'jp': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'tw': './assets/cn/combat_ui/PAUSE_Pharaoh.png'})
 PAUSE_Seaside = Button(area={'cn': (1214, 31, 1239, 59), 'en': (1214, 31, 1239, 59), 'jp': (1214, 31, 1239, 59), 'tw': (1214, 31, 1239, 59)}, color={'cn': (172, 196, 212), 'en': (172, 196, 212), 'jp': (172, 196, 212), 'tw': (172, 196, 212)}, button={'cn': (1214, 31, 1239, 59), 'en': (1214, 31, 1239, 59), 'jp': (1214, 31, 1239, 59), 'tw': (1214, 31, 1239, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Seaside.png', 'en': './assets/cn/combat_ui/PAUSE_Seaside.png', 'jp': './assets/cn/combat_ui/PAUSE_Seaside.png', 'tw': './assets/cn/combat_ui/PAUSE_Seaside.png'})
+PAUSE_ShadowPuppetry = Button(area={'cn': (1216, 37, 1234, 55), 'en': (1216, 37, 1234, 55), 'jp': (1216, 37, 1234, 55), 'tw': (1216, 37, 1234, 55)}, color={'cn': (139, 112, 72), 'en': (139, 112, 72), 'jp': (139, 112, 72), 'tw': (139, 112, 72)}, button={'cn': (1216, 37, 1234, 55), 'en': (1216, 37, 1234, 55), 'jp': (1216, 37, 1234, 55), 'tw': (1216, 37, 1234, 55)}, file={'cn': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'en': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'jp': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'tw': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png'})
 PAUSE_Star = Button(area={'cn': (1234, 36, 1250, 57), 'en': (1234, 36, 1250, 57), 'jp': (1234, 36, 1250, 57), 'tw': (1234, 36, 1250, 57)}, color={'cn': (169, 179, 179), 'en': (169, 179, 179), 'jp': (169, 179, 179), 'tw': (169, 179, 179)}, button={'cn': (1234, 36, 1250, 57), 'en': (1234, 36, 1250, 57), 'jp': (1234, 36, 1250, 57), 'tw': (1234, 36, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Star.png', 'en': './assets/cn/combat_ui/PAUSE_Star.png', 'jp': './assets/cn/combat_ui/PAUSE_Star.png', 'tw': './assets/cn/combat_ui/PAUSE_Star.png'})
 QUIT = Button(area={'cn': (420, 490, 593, 548), 'en': (473, 508, 567, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, color={'cn': (199, 122, 114), 'en': (216, 168, 164), 'jp': (196, 120, 113), 'tw': (200, 126, 118)}, button={'cn': (420, 490, 593, 548), 'en': (473, 508, 567, 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_Christmas = Button(area={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, color={'cn': (195, 139, 166), 'en': (207, 166, 185), 'jp': (195, 139, 166), 'tw': (195, 139, 166)}, button={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Christmas.png', 'en': './assets/en/combat_ui/QUIT_Christmas.png', 'jp': './assets/cn/combat_ui/QUIT_Christmas.png', 'tw': './assets/cn/combat_ui/QUIT_Christmas.png'})

module/combat/combat.py

@@ -1590,14 +1590,6 @@
       }
     },
     "GemsFarming": {
-      "ChangeFlagship": {
-        "type": "select",
-        "value": "ship",
-        "option": [
-          "ship",
-          "ship_equip"
-        ]
-      },
       "CommonCV": {
         "type": "select",
         "value": "any",
@@ -1614,8 +1606,7 @@
         "value": "ship",
         "option": [
           "disabled",
-          "ship",
-          "ship_equip"
+          "ship"
         ]
       },
       "CommonDD": {

module/combat_ui/assets.py

@@ -265,15 +265,12 @@ C124LargeLeveling:
     value: 3
     option: [ 3, 4, 5 ]
 GemsFarming:
-  ChangeFlagship:
-    value: ship
-    option: [ ship, ship_equip ]
   CommonCV:
     value: any
     option: [ any, langley, bogue, ranger, hermes ]
   ChangeVanguard:
     value: ship
-    option: [ disabled, ship, ship_equip ]
+    option: [ disabled, ship ]
   CommonDD:
     value: any
     option: [ any, favourite, aulick_or_foote , cassin_or_downes, z20_or_z21 ]

module/config/argument/args.json

@@ -23,11 +23,11 @@
     "page": "setting",
     "tasks": [
       "EventGeneral",
-      "Coalition",
       "Event",
       "Event2",
       "Raid",
       "Hospital",
+      "Coalition",
       "MaritimeEscort",
       "WarArchives"
     ]