Wargroove 2: 4 new maps. Random terrain generation in mod.

worlds/wargroove2/Levels.py

@@ -114,8 +114,6 @@ def define_region(self, name: str, multiworld: MultiWorld, player: int, exits=No
                 ["Barge", "Landing Event", "Golem"], player)
         }
     ),
-]
-low_victory_checks_levels = [
     Wargroove2Level(
         name="Spire Fire",
         file_name="Spire_Fire.json",
@@ -269,18 +267,6 @@ def define_region(self, name: str, multiworld: MultiWorld, player: int, exits=No
         },
         has_ocean=False
     ),
-    Wargroove2Level(
-        name="Wagon Freeway",
-        file_name="Wagon_Freeway.json",
-        location_rules={
-            "Wagon Freeway: Victory": lambda state, player: lambda state=state: state.has_all(
-                ["Wagon", "Spearman"], player),
-            "Wagon Freeway: All Mine Now": lambda state, player: lambda state=state: True,
-            "Wagon Freeway: Pigeon Carrier": lambda state, player: lambda state=state:
-            state.has("Air Trooper", player),
-        },
-        has_ocean=False
-    ),
     Wargroove2Level(
         name="Kraken Strait",
         file_name="Kraken_Strait.json",
@@ -419,6 +405,19 @@ def define_region(self, name: str, multiworld: MultiWorld, player: int, exits=No
                                            player),
         }
     ),
+    Wargroove2Level(
+        name="Bridge Brigade",
+        file_name="Bridge_Brigade.json",
+        location_rules={
+            "Bridge Brigade: Victory": lambda state, player: lambda state=state: state.has_all(
+                ["Warship", "Spearman"], player),
+            "Bridge Brigade: From the Depths": lambda state, player: lambda
+                state=state: state.has("Kraken", player),
+            "Bridge Brigade: Back to the Depths": lambda state, player: lambda state=state:
+            state.has_all(["Warship", "Spearman", "Kraken"], player),
+        },
+        has_ocean=False
+    ),
     Wargroove2Level(
         name="Grand Theft Village",
         file_name="Grand_Theft_Village.json",
@@ -432,15 +431,14 @@ def define_region(self, name: str, multiworld: MultiWorld, player: int, exits=No
         has_ocean=False
     ),
     Wargroove2Level(
-        name="Bridge Brigade",
-        file_name="Bridge_Brigade.json",
+        name="Wagon Freeway",
+        file_name="Wagon_Freeway.json",
         location_rules={
-            "Bridge Brigade: Victory": lambda state, player: lambda state=state: state.has_all(
-                ["Warship", "Spearman"], player),
-            "Bridge Brigade: From the Depths": lambda state, player: lambda
-                state=state: state.has("Kraken", player),
-            "Bridge Brigade: Back to the Depths": lambda state, player: lambda state=state:
-            state.has_all(["Warship", "Spearman", "Kraken"], player),
+            "Wagon Freeway: Victory": lambda state, player: lambda state=state: state.has_all(
+                ["Wagon", "Spearman"], player),
+            "Wagon Freeway: All Mine Now": lambda state, player: lambda state=state: True,
+            "Wagon Freeway: Pigeon Carrier": lambda state, player: lambda state=state:
+            state.has("Air Trooper", player),
         },
         has_ocean=False
     ),
@@ -483,6 +481,54 @@ def define_region(self, name: str, multiworld: MultiWorld, player: int, exits=No
     ),
 ]
 
+low_victory_checks_levels = [
+
+    Wargroove2Level(
+        name="Swimming at the Docks",
+        file_name="Swimming_at_the_Docks.json",
+        location_rules={
+            "Swimming at the Docks: Victory": lambda state, player: lambda state=state: True,
+            "Swimming at the Docks: Dogs Counter Knights": lambda state, player: lambda
+                state=state: True,
+            "Swimming at the Docks: Kayaking": lambda state, player: lambda
+                state=state: state.has("River Boat", player),
+        }
+    ),
+    Wargroove2Level(
+        name="Ancient Discoveries",
+        file_name="Ancient_Discoveries.json",
+        location_rules={
+            "Ancient Discoveries: Victory": lambda state, player: lambda state=state: True,
+            "Ancient Discoveries: So many Choices": lambda state, player: lambda
+                state=state: True,
+            "Ancient Discoveries: Height Advantage": lambda state, player: lambda
+                state=state: state.has("Golem", player),
+        }
+    ),
+    Wargroove2Level(
+        name="Observation Isle",
+        file_name="Observation_Isle.json",
+        location_rules={
+            "Observation Isle: Victory": lambda state, player: lambda state=state: True,
+            "Observation Isle: Become the Watcher": lambda state, player: lambda
+                state=state: True,
+            "Observation Isle: Execute the Watcher": lambda state, player: lambda
+                state=state: state.has("Walls Event", player),
+        }
+    ),
+    Wargroove2Level(
+        name="Majestic Mountain",
+        file_name="Majestic_Mountain.json",
+        location_rules={
+            "Majestic Mountain: Victory": lambda state, player: lambda state=state: True,
+            "Majestic Mountain: Mountain Climbing": lambda state, player: lambda
+                state=state: True,
+            "Majestic Mountain: Legend of the Mountains": lambda state, player: lambda
+                state=state: state.has("Air Trooper", player),
+        }
+    ),
+]
+
 first_level = Wargroove2Level(
     name="Humble Beginnings Rebirth",
     file_name="",

worlds/wargroove2/Locations.py

@@ -43,6 +43,18 @@
     "Bridge Brigade: Victory": 253039,
     "Bridge Brigade: From the Depths": 253040,
     "Bridge Brigade: Back to the Depths": 253041,
+    "Swimming at the Docks: Victory": 253042,
+    "Swimming at the Docks: Dogs Counter Knights": 253043,
+    "Swimming at the Docks: Kayaking": 253044,
+    "Ancient Discoveries: Victory": 253045,
+    "Ancient Discoveries: So many Choices": 253046,
+    "Ancient Discoveries: Height Advantage": 253047,
+    "Observation Isle: Victory": 253048,
+    "Observation Isle: Become the Watcher": 253049,
+    "Observation Isle: Execute the Watcher": 253050,
+    "Majestic Mountain: Victory": 253051,
+    "Majestic Mountain: Mountain Climbing": 253052,
+    "Majestic Mountain: Legend of the Mountains": 253053,
     #########################################################
     "Slippery Bridge: Victory": 253300,
     "Slippery Bridge: Control all Sea Villages": 253301,
@@ -439,6 +451,54 @@
     "Split Valley: Ranged Trinity Extra 2": 260333,
     "Split Valley: Ranged Trinity Extra 3": 260334,
     "Split Valley: Ranged Trinity Extra 4": 260335,
+    "Swimming at the Docks: Victory Extra 1": 260336,
+    "Swimming at the Docks: Victory Extra 2": 260337,
+    "Swimming at the Docks: Victory Extra 3": 260338,
+    "Swimming at the Docks: Victory Extra 4": 260339,
+    "Swimming at the Docks: Dogs Counter Knights Extra 1": 260340,
+    "Swimming at the Docks: Dogs Counter Knights Extra 2": 260341,
+    "Swimming at the Docks: Dogs Counter Knights Extra 3": 260342,
+    "Swimming at the Docks: Dogs Counter Knights Extra 4": 260343,
+    "Swimming at the Docks: Kayaking Extra 1": 260344,
+    "Swimming at the Docks: Kayaking Extra 2": 260345,
+    "Swimming at the Docks: Kayaking Extra 3": 260346,
+    "Swimming at the Docks: Kayaking Extra 4": 260347,
+    "Ancient Discoveries: Victory Extra 1": 260348,
+    "Ancient Discoveries: Victory Extra 2": 260349,
+    "Ancient Discoveries: Victory Extra 3": 260350,
+    "Ancient Discoveries: Victory Extra 4": 260351,
+    "Ancient Discoveries: So many Choices Extra 1": 260352,
+    "Ancient Discoveries: So many Choices Extra 2": 260353,
+    "Ancient Discoveries: So many Choices Extra 3": 260354,
+    "Ancient Discoveries: So many Choices Extra 4": 260355,
+    "Ancient Discoveries: Height Advantage Extra 1": 260356,
+    "Ancient Discoveries: Height Advantage Extra 2": 260357,
+    "Ancient Discoveries: Height Advantage Extra 3": 260358,
+    "Ancient Discoveries: Height Advantage Extra 4": 260359,
+    "Observation Isle: Victory Extra 1": 260360,
+    "Observation Isle: Victory Extra 2": 260361,
+    "Observation Isle: Victory Extra 3": 260362,
+    "Observation Isle: Victory Extra 4": 260363,
+    "Observation Isle: Become the Watcher Extra 1": 260364,
+    "Observation Isle: Become the Watcher Extra 2": 260365,
+    "Observation Isle: Become the Watcher Extra 3": 260366,
+    "Observation Isle: Become the Watcher Extra 4": 260367,
+    "Observation Isle: Execute the Watcher Extra 1": 260368,
+    "Observation Isle: Execute the Watcher Extra 2": 260369,
+    "Observation Isle: Execute the Watcher Extra 3": 260370,
+    "Observation Isle: Execute the Watcher Extra 4": 260371,
+    "Majestic Mountain: Victory Extra 1": 260372,
+    "Majestic Mountain: Victory Extra 2": 260373,
+    "Majestic Mountain: Victory Extra 3": 260374,
+    "Majestic Mountain: Victory Extra 4": 260375,
+    "Majestic Mountain: Mountain Climbing Extra 1": 260376,
+    "Majestic Mountain: Mountain Climbing Extra 2": 260377,
+    "Majestic Mountain: Mountain Climbing Extra 3": 260378,
+    "Majestic Mountain: Mountain Climbing Extra 4": 260379,
+    "Majestic Mountain: Legend of the Mountains Extra 1": 260380,
+    "Majestic Mountain: Legend of the Mountains Extra 2": 260381,
+    "Majestic Mountain: Legend of the Mountains Extra 3": 260382,
+    "Majestic Mountain: Legend of the Mountains Extra 4": 260383,
     #########################################################
     "Disastrous Crossing: Victory": None,
     "Dark Mirror: Victory": None,