Fix: Move war archive events where others are, adjust code as needed

campaign/war_archives_20190329_cn/a1.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -16,10 +16,10 @@ MAP.map_data = """
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
+    50 50 30 30 30 50 20 50
+    50 50 10 50 50 50 20 10
+    50 50 50 10 50 50 50 10
+    50 50 50 50 10 50 10 10
 """
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 4},
@@ -49,6 +49,9 @@ class Campaign(CampaignBase):
     MAP = MAP
 
     def battle_0(self):
+        if self.fleet_2_push_forward():
+            return True
+
         return self.battle_default()
 
     def battle_5(self):

campaign/war_archives_20190329_cn/a2.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger

campaign/war_archives_20190329_cn/a3.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger

campaign/war_archives_20190329_cn/b1.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -17,9 +17,9 @@ MAP.map_data = """
 MAP.weight_data = """
     50 50 10 50 30 20 10 10 10 50
     50 50 50 50 30 50 20 50 50 10
-    50 50 50 50 50 50 50 50 30 50
+    50 50 50 50 50 50 50 50 10 50
     50 50 50 50 50 50 20 50 50 10
-    50 50 50 10 30 20 10 10 10 50
+    50 50 50 10 20 20 10 10 10 50
 """
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 4},

campaign/war_archives_20190329_cn/b2.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -18,12 +18,12 @@ MAP.map_data = """
     SP SP ++ -- -- -- ++ -- MM
 """
 MAP.weight_data = """
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
+    50 10 20 20 10 20 50 50 50
+    10 10 30 30 50 50 50 50 50
+    50 10 50 50 50 50 50 10 50
+    50 50 50 50 50 50 20 20 50
+    50 50 50 50 50 30 30 50 50
+    50 50 50 10 50 50 50 50 50
     50 50 50 50 50 50 50 50 50
 """
 MAP.spawn_data = [

campaign/war_archives_20190329_cn/b3.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -22,13 +22,13 @@ MAP.map_data = """
 """
 MAP.weight_data = """
     50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
+    50 10 50 50 10 50
+    50 10 50 50 10 50
+    50 10 40 40 10 50
+    50 20 40 40 20 50
+    50 30 20 20 30 50
+    20 50 50 50 50 20
+    20 20 50 50 20 20
     50 50 50 50 50 50
     50 50 50 50 50 50
 """

campaign/war_archives_20190329_cn/c1.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -16,10 +16,10 @@ MAP.map_data = """
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
+    50 50 30 30 30 50 20 50
+    50 50 10 50 50 50 20 10
+    50 50 50 10 50 50 50 10
+    50 50 50 50 10 50 10 10
 """
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 4},
@@ -49,6 +49,9 @@ class Campaign(CampaignBase):
     MAP = MAP
 
     def battle_0(self):
+        if self.fleet_2_push_forward():
+            return True
+
         return self.battle_default()
 
     def battle_5(self):

campaign/war_archives_20190329_cn/c2.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -18,11 +18,11 @@ MAP.map_data = """
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
+    20 50 10 10 10 10 50 50
+    50 50 50 50 50 10 50 50
+    50 50 20 50 50 10 50 50
+    50 50 50 10 10 10 50 50
+    50 50 50 10 20 20 50 50
 """
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 4},
@@ -54,6 +54,9 @@ class Campaign(CampaignBase):
     MAP = MAP
 
     def battle_0(self):
+        if self.fleet_2_push_forward():
+            return True
+
         return self.battle_default()
 
     def battle_6(self):

campaign/war_archives_20190329_cn/c3.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -19,11 +19,11 @@ MAP.map_data = """
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
+    50 50 20 50 20 50 50 50
+    50 50 50 30 20 50 50 50
+    50 50 50 50 50 10 50 50
+    50 10 10 50 50 10 50 50
+    50 10 10 10 10 10 50 50
     50 50 50 50 50 50 50 50
 """
 MAP.spawn_data = [
@@ -57,6 +57,9 @@ class Campaign(CampaignBase):
     MAP = MAP
 
     def battle_0(self):
+        if self.fleet_2_push_forward():
+            return True
+
         return self.battle_default()
 
     def battle_6(self):

campaign/war_archives_20190329_cn/d1.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -15,11 +15,11 @@ MAP.map_data = """
     -- -- -- ME -- ME ME ME ME --
 """
 MAP.weight_data = """
-    50 50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50 50
+    50 50 10 50 30 20 10 10 10 50
+    50 50 50 50 30 50 20 50 50 10
+    50 50 50 50 50 50 50 50 30 50
+    50 50 50 50 50 50 20 50 50 10
+    50 50 50 10 30 20 10 10 10 50
 """
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 4},

campaign/war_archives_20190329_cn/d2.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -18,12 +18,12 @@ MAP.map_data = """
     SP SP ++ -- -- -- ++ -- MM
 """
 MAP.weight_data = """
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50 50
+    50 10 20 20 10 20 50 50 50
+    10 10 30 30 50 50 50 50 50
+    50 10 50 50 50 50 50 10 50
+    50 50 50 50 50 50 20 20 50
+    50 50 50 50 50 30 30 50 50
+    50 50 50 10 50 50 50 50 50
     50 50 50 50 50 50 50 50 50
 """
 MAP.spawn_data = [

campaign/war_archives_20190329_cn/d3.py

@@ -1,4 +1,4 @@
-from ..campaign_base import CampaignBase
+from ..campaign_war_archives.campaign_base import CampaignBase
 from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
@@ -22,13 +22,13 @@ MAP.map_data = """
 """
 MAP.weight_data = """
     50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
-    50 50 50 50 50 50
+    50 10 50 50 10 50
+    50 10 50 50 10 50
+    50 10 40 40 10 50
+    50 20 40 40 20 50
+    50 30 20 20 30 50
+    20 50 50 50 50 20
+    20 20 50 50 20 20
     50 50 50 50 50 50
     50 50 50 50 50 50
 """