From 70b35b6ad019cb839ee0da49f3471412994833be Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 30 Dec 2021 23:12:22 +0800
Subject: [PATCH] Opt: Tower of Transcendence

- Lower HOMO_EDGE_COLOR_RANGE to 17
- Remove round_battle override
- Fix D3 which don't have movable enemies
---
 campaign/event_20211229_cn/b1.py            |  1 +
 campaign/event_20211229_cn/bs1.py           |  1 +
 campaign/event_20211229_cn/c1.py            |  1 +
 campaign/event_20211229_cn/campaign_base.py | 17 +++++++++--------
 campaign/event_20211229_cn/d1.py            |  1 +
 campaign/event_20211229_cn/d3.py            |  6 ++++--
 campaign/event_20211229_cn/ds1.py           |  1 +
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/campaign/event_20211229_cn/b1.py b/campaign/event_20211229_cn/b1.py
index 10cd123d8..ce4b85857 100644
--- a/campaign/event_20211229_cn/b1.py
+++ b/campaign/event_20211229_cn/b1.py
@@ -73,6 +73,7 @@ class Config:
         'distance': 50,
         'wlen': 1000
     }
+    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_SWIPE_MULTIPLY = 1.579
     MAP_SWIPE_MULTIPLY_MINITOUCH = 1.527
     MAP_WALK_USE_CURRENT_FLEET = True
diff --git a/campaign/event_20211229_cn/bs1.py b/campaign/event_20211229_cn/bs1.py
index ba1756072..c3a0fa21d 100644
--- a/campaign/event_20211229_cn/bs1.py
+++ b/campaign/event_20211229_cn/bs1.py
@@ -64,6 +64,7 @@ class Config:
         'distance': 50,
         'wlen': 1000
     }
+    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_IS_ONE_TIME_STAGE = True
     STAR_REQUIRE_1 = 0
     STAR_REQUIRE_2 = 0
diff --git a/campaign/event_20211229_cn/c1.py b/campaign/event_20211229_cn/c1.py
index 22bba2627..581e99079 100644
--- a/campaign/event_20211229_cn/c1.py
+++ b/campaign/event_20211229_cn/c1.py
@@ -64,6 +64,7 @@ class Config:
         'distance': 50,
         'wlen': 1000
     }
+    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_SWIPE_MULTIPLY = 1.743
     MAP_SWIPE_MULTIPLY_MINITOUCH = 1.685
     MAP_WALK_USE_CURRENT_FLEET = True
diff --git a/campaign/event_20211229_cn/campaign_base.py b/campaign/event_20211229_cn/campaign_base.py
index 532c20679..26d2e84a8 100644
--- a/campaign/event_20211229_cn/campaign_base.py
+++ b/campaign/event_20211229_cn/campaign_base.py
@@ -1,4 +1,5 @@
 from module.campaign.campaign_base import CampaignBase as CampaignBase_
+from module.logger import logger
 
 
 class CampaignBase(CampaignBase_):
@@ -20,11 +21,11 @@ class CampaignBase(CampaignBase_):
         Call this method after cleared an enemy.
         """
         super().round_battle()
-        new = {0: 0}
-        for spawn_round, count in self.enemy_round.items():
-            new[0] += count
-        if after_battle:
-            new[0] = max(new[0] - 1, 0)
-        self.enemy_round = new
-        from module.logger import logger
-        logger.info(f'Enemy round: {new}')
+        # new = {0: 0}
+        # for spawn_round, count in self.enemy_round.items():
+        #     new[0] += count
+        # if after_battle:
+        #     new[0] = max(new[0] - 1, 0)
+        # self.enemy_round = new
+        # from module.logger import logger
+        logger.info(f'Enemy round: {self.enemy_round}')
diff --git a/campaign/event_20211229_cn/d1.py b/campaign/event_20211229_cn/d1.py
index afd5e8a06..c27b54dea 100644
--- a/campaign/event_20211229_cn/d1.py
+++ b/campaign/event_20211229_cn/d1.py
@@ -73,6 +73,7 @@ class Config:
         'distance': 50,
         'wlen': 1000
     }
+    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_SWIPE_MULTIPLY = 1.579
     MAP_SWIPE_MULTIPLY_MINITOUCH = 1.527
     MAP_WALK_USE_CURRENT_FLEET = True
diff --git a/campaign/event_20211229_cn/d3.py b/campaign/event_20211229_cn/d3.py
index 2299f009c..ad30302a9 100644
--- a/campaign/event_20211229_cn/d3.py
+++ b/campaign/event_20211229_cn/d3.py
@@ -72,6 +72,8 @@ class Config(ConfigBase):
     MAP_HAS_SIREN = True
     MAP_SWIPE_MULTIPLY = 1.716
     MAP_SWIPE_MULTIPLY_MINITOUCH = 1.659
+    MAP_HAS_MOVABLE_ENEMY = False
+    MAP_HAS_MOVABLE_NORMAL_ENEMY = False
 
 
 class Campaign(CampaignBase):
@@ -85,7 +87,7 @@ class Campaign(CampaignBase):
             if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
                 return True
         else:
-            if self.clear_any_enemy(sort=('cost_2',)):
+            if self.clear_siren():
                 return True
 
         return self.battle_default()
@@ -97,7 +99,7 @@ class Campaign(CampaignBase):
             if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
                 return True
         else:
-            if self.clear_any_enemy(sort=('cost_2',)):
+            if self.clear_siren():
                 return True
 
         return self.battle_default()
diff --git a/campaign/event_20211229_cn/ds1.py b/campaign/event_20211229_cn/ds1.py
index 9cdd2f092..9b7119a42 100644
--- a/campaign/event_20211229_cn/ds1.py
+++ b/campaign/event_20211229_cn/ds1.py
@@ -65,6 +65,7 @@ class Config:
         'distance': 50,
         'wlen': 1000
     }
+    HOMO_EDGE_COLOR_RANGE = (0, 17)
     MAP_IS_ONE_TIME_STAGE = True
     STAR_REQUIRE_1 = 0
     STAR_REQUIRE_2 = 0