Upd: Enemy templates in event 20221222 to select weaker enemy

LmeSzinc · Jan 10, 2025 · 3995010 · 3995010
1 parent bad155d
commit 3995010
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 6 deletions.
diff --git a/assets/cn/template/TEMPLATE_ENEMY_Carrier20221222.png b/assets/cn/template/TEMPLATE_ENEMY_Carrier20221222.png
diff --git a/assets/cn/template/TEMPLATE_ENEMY_Light20221222.png b/assets/cn/template/TEMPLATE_ENEMY_Light20221222.png
diff --git a/assets/cn/template/TEMPLATE_ENEMY_Main20221222.png b/assets/cn/template/TEMPLATE_ENEMY_Main20221222.png
diff --git a/campaign/event_20221222_cn/a1.py b/campaign/event_20221222_cn/a1.py
@@ -58,6 +58,7 @@ class Config:
     # ===== End of generated config =====
 
     MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    MAP_ENEMY_TEMPLATE = ['Light20221222', 'Main20221222', 'Carrier20221222']
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (80, 255 - 33),
         'width': (1.5, 10),
@@ -80,9 +81,10 @@ class Config:
 
 class Campaign(CampaignBase):
     MAP = MAP
-    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+    ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
+        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

diff --git a/campaign/event_20221222_cn/a2.py b/campaign/event_20221222_cn/a2.py
@@ -62,9 +62,10 @@ class Config(ConfigBase):
 
 class Campaign(CampaignBase):
     MAP = MAP
-    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+    ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
+        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

diff --git a/campaign/event_20221222_cn/a3.py b/campaign/event_20221222_cn/a3.py
@@ -65,9 +65,10 @@ class Config(ConfigBase):
 
 class Campaign(CampaignBase):
     MAP = MAP
-    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+    ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
+        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

diff --git a/campaign/event_20221222_cn/b1.py b/campaign/event_20221222_cn/b1.py
@@ -59,6 +59,7 @@ class Config:
     # ===== End of generated config =====
 
     MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    MAP_ENEMY_TEMPLATE = ['Light20221222', 'Main20221222', 'Carrier20221222']
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (80, 255 - 33),
         'width': (1.5, 10),
@@ -81,9 +82,10 @@ class Config:
 
 class Campaign(CampaignBase):
     MAP = MAP
-    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+    ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
+        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

diff --git a/campaign/event_20221222_cn/b2.py b/campaign/event_20221222_cn/b2.py
@@ -70,9 +70,10 @@ class Config(ConfigBase):
 
 class Campaign(CampaignBase):
     MAP = MAP
-    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+    ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
+        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

diff --git a/campaign/event_20221222_cn/b3.py b/campaign/event_20221222_cn/b3.py
@@ -73,9 +73,10 @@ class Config(ConfigBase):
 
 class Campaign(CampaignBase):
     MAP = MAP
-    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+    ENEMY_FILTER = '1L > 1M > 2L > 2M > 3L > 3M > 1E > 2E > 3E > 1C > 2C > 3C'
 
     def battle_0(self):
+        self.config.override(EnemyPriority_EnemyScaleBalanceWeight='default_mode')
         if self.clear_siren():
             return True
         if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):

diff --git a/module/template/assets.py b/module/template/assets.py
@@ -12,14 +12,17 @@
 TEMPLATE_DORM_LOVE = Template(file={'cn': './assets/cn/template/TEMPLATE_DORM_LOVE.gif', 'en': './assets/en/template/TEMPLATE_DORM_LOVE.gif', 'jp': './assets/jp/template/TEMPLATE_DORM_LOVE.gif', 'tw': './assets/tw/template/TEMPLATE_DORM_LOVE.gif'})
 TEMPLATE_ENEMY_BOSS = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_BOSS.png', 'en': './assets/en/template/TEMPLATE_ENEMY_BOSS.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_BOSS.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_BOSS.png'})
 TEMPLATE_ENEMY_Carrier = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_Carrier.png', 'en': './assets/en/template/TEMPLATE_ENEMY_Carrier.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_Carrier.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_Carrier.png'})
+TEMPLATE_ENEMY_Carrier20221222 = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_Carrier20221222.png', 'en': './assets/cn/template/TEMPLATE_ENEMY_Carrier20221222.png', 'jp': './assets/cn/template/TEMPLATE_ENEMY_Carrier20221222.png', 'tw': './assets/cn/template/TEMPLATE_ENEMY_Carrier20221222.png'})
 TEMPLATE_ENEMY_CarrierInvertedOrthant = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_CarrierInvertedOrthant.png', 'en': './assets/en/template/TEMPLATE_ENEMY_CarrierInvertedOrthant.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_CarrierInvertedOrthant.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_CarrierInvertedOrthant.png'})
 TEMPLATE_ENEMY_CarrierPurple = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_CarrierPurple.png', 'en': './assets/en/template/TEMPLATE_ENEMY_CarrierPurple.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_CarrierPurple.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_CarrierPurple.png'})
 TEMPLATE_ENEMY_CarrierSpecial = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_CarrierSpecial.gif', 'en': './assets/cn/template/TEMPLATE_ENEMY_CarrierSpecial.gif', 'jp': './assets/cn/template/TEMPLATE_ENEMY_CarrierSpecial.gif', 'tw': './assets/cn/template/TEMPLATE_ENEMY_CarrierSpecial.gif'})
 TEMPLATE_ENEMY_L = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_L.png', 'en': './assets/en/template/TEMPLATE_ENEMY_L.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_L.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_L.png'})
 TEMPLATE_ENEMY_Light = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_Light.png', 'en': './assets/en/template/TEMPLATE_ENEMY_Light.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_Light.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_Light.png'})
+TEMPLATE_ENEMY_Light20221222 = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_Light20221222.png', 'en': './assets/cn/template/TEMPLATE_ENEMY_Light20221222.png', 'jp': './assets/cn/template/TEMPLATE_ENEMY_Light20221222.png', 'tw': './assets/cn/template/TEMPLATE_ENEMY_Light20221222.png'})
 TEMPLATE_ENEMY_LightInvertedOrthant = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_LightInvertedOrthant.png', 'en': './assets/en/template/TEMPLATE_ENEMY_LightInvertedOrthant.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_LightInvertedOrthant.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_LightInvertedOrthant.png'})
 TEMPLATE_ENEMY_M = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_M.png', 'en': './assets/en/template/TEMPLATE_ENEMY_M.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_M.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_M.png'})
 TEMPLATE_ENEMY_Main = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_Main.png', 'en': './assets/en/template/TEMPLATE_ENEMY_Main.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_Main.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_Main.png'})
+TEMPLATE_ENEMY_Main20221222 = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_Main20221222.png', 'en': './assets/cn/template/TEMPLATE_ENEMY_Main20221222.png', 'jp': './assets/cn/template/TEMPLATE_ENEMY_Main20221222.png', 'tw': './assets/cn/template/TEMPLATE_ENEMY_Main20221222.png'})
 TEMPLATE_ENEMY_MainInvertedOrthant = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_MainInvertedOrthant.png', 'en': './assets/en/template/TEMPLATE_ENEMY_MainInvertedOrthant.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_MainInvertedOrthant.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_MainInvertedOrthant.png'})
 TEMPLATE_ENEMY_MainPurple = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_MainPurple.png', 'en': './assets/en/template/TEMPLATE_ENEMY_MainPurple.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_MainPurple.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_MainPurple.png'})
 TEMPLATE_ENEMY_S = Template(file={'cn': './assets/cn/template/TEMPLATE_ENEMY_S.png', 'en': './assets/en/template/TEMPLATE_ENEMY_S.png', 'jp': './assets/jp/template/TEMPLATE_ENEMY_S.png', 'tw': './assets/tw/template/TEMPLATE_ENEMY_S.png'})