Merge pull request #4506 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

assets/cn/template/TEMPLATE_ENEMY_Carrier20221222.png

@@ -27,7 +27,7 @@ def campaign_set_chapter(self, name, mode='normal'):
         if chapter.isdigit():
             self.ui_goto_campaign()
             self.campaign_ensure_mode('normal')
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
             if mode == 'hard':
                 self.campaign_ensure_mode('hard')
 
@@ -39,11 +39,11 @@ def campaign_set_chapter(self, name, mode='normal'):
                 self.campaign_ensure_mode('hard')
             elif chapter == 'ex_sp':
                 self.campaign_ensure_mode('ex')
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
 
         elif chapter == 'sp':
             self.ui_goto_sp()
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
 
         elif chapter in ['t', 'ts', 'ht', 'hts']:
             self.ui_goto_event()
@@ -60,7 +60,7 @@ def campaign_set_chapter(self, name, mode='normal'):
             if chapter == 'ex_sp':
                 self.campaign_ensure_mode('ex')
             # Get stage
-            self.campaign_ensure_chapter(index=1)
+            self.campaign_ensure_chapter(1)
         else:
             logger.warning(f'Unknown campaign chapter: {name}')
 

assets/cn/template/TEMPLATE_ENEMY_Light20221222.png

@@ -44,10 +44,10 @@ def campaign_set_chapter(self, name, mode='normal'):
         if chapter.isdigit():
             self.ui_goto_campaign()
             self.campaign_ensure_mode('normal')
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
             if mode == 'hard':
                 self.campaign_ensure_mode('hard')
-                self.campaign_ensure_chapter(index=chapter)
+                self.campaign_ensure_chapter(chapter)
 
         elif chapter in 'abcd' or chapter == 'ex_sp':
             self.ui_goto_event()
@@ -57,11 +57,11 @@ def campaign_set_chapter(self, name, mode='normal'):
                 self.campaign_ensure_mode('hard')
             elif chapter == 'ex_sp':
                 pass  # Difference
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
 
         elif chapter == 'sp':
             self.ui_goto_event()  # Difference
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
 
         else:
             logger.warning(f'Unknown campaign chapter: {name}')

assets/cn/template/TEMPLATE_ENEMY_Main20221222.png

@@ -54,7 +54,7 @@ def _campaign_get_chapter_index(name):
 
     def campaign_set_chapter_event(self, chapter, mode='normal'):
         self.ui_goto_event()
-        self.campaign_ensure_chapter(index=chapter)
+        self.campaign_ensure_chapter(chapter)
         return True
 
     def campaign_get_entrance(self, name):

campaign/event_20200917_cn/campaign_base.py

@@ -15,10 +15,10 @@ def campaign_set_chapter(self, name, mode='normal'):
         if chapter.isdigit():
             self.ui_weigh_anchor()
             self.campaign_ensure_mode('normal')
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
             if mode == 'hard':
                 self.campaign_ensure_mode('hard')
-                self.campaign_ensure_chapter(index=chapter)
+                self.campaign_ensure_chapter(chapter)
 
         elif chapter in 'abcd' or chapter == 'ex_sp' or chapter in ['as', 'cs']:
             self.ui_goto_event()
@@ -28,11 +28,11 @@ def campaign_set_chapter(self, name, mode='normal'):
                 self.campaign_ensure_mode('hard')
             elif chapter == 'ex_sp':
                 self.campaign_ensure_mode('ex')
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
 
         elif chapter == 'sp':
             self.ui_goto_sp()
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
 
         else:
             logger.warning(f'Unknown campaign chapter: {name}')

campaign/event_20201029_cn/campaign_base.py

@@ -72,10 +72,10 @@ def campaign_set_chapter(self, name, mode='normal'):
         if chapter.isdigit():
             self.ui_goto_campaign()
             self.campaign_ensure_mode('normal')
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
             if mode == 'hard':
                 self.campaign_ensure_mode('hard')
-                self.campaign_ensure_chapter(index=chapter)
+                self.campaign_ensure_chapter(chapter)
 
         elif chapter in ['a', 'b', 'c', 'd', 'ex_sp', 'as', 'bs', 'cs', 'ds']:
             self.ui_goto_event()
@@ -86,12 +86,12 @@ def campaign_set_chapter(self, name, mode='normal'):
             elif chapter == 'ex_sp':
                 # self.campaign_ensure_mode('ex')
                 pass  # Difference
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
 
         elif chapter == 'sp':
             # self.ui_goto_sp()
             self.ui_goto_event()  # Difference
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
 
         else:
             logger.warning(f'Unknown campaign chapter: {name}')

campaign/event_20201126_cn/campaign_base.py

@@ -5,7 +5,7 @@ class CampaignBase(CampaignBase_):
     def campaign_set_chapter_sp(self, chapter, mode='normal'):
         if chapter == 'sp':
             self.ui_goto_event()
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
             return True
         else:
             return False

campaign/event_20210121_cn/campaign_base.py

@@ -8,7 +8,7 @@ def campaign_set_chapter_sp(self, chapter, mode='normal'):
         logger.info('Set chapter SP')
         if chapter in ['sp', 'sp_sp']:
             self.ui_goto_event()
-            self.campaign_ensure_chapter(index=chapter)
+            self.campaign_ensure_chapter(chapter)
             return True
         else:
             return False