Update patcher to work with 0.11.0 asm

pull-assembly-patches.py

@@ -6,7 +6,7 @@
 
 import requests
 
-VERSION = "0.10.0"
+VERSION = "0.11.0"
 ASSET_NAME = "Randomizer.Patches.zip"
 DESTINATION_ASSEMBLY_PATH = (
     Path(__file__)

src/mars_patcher/mf/auto_generated_types.py

@@ -127,7 +127,14 @@
     'Anonymous',
     'ShinyMissileTank',
     'ShinyPowerBombTank',
-    'InfantMetroid'
+    'InfantMetroid',
+    'ShinyPowerBombTank',
+    'InfantMetroid',
+    'SamusHead',
+    'WalljumpBoots',
+    'Randovania',
+    'ArchipelagoColor',
+    'ArchipelagoMonochrome'
 ]
 Validabilities = typ.Literal[
     'Missiles',
@@ -632,9 +639,6 @@ class Marsschemamf(typ.TypedDict, total=False):
     UnexploredMap: bool = False
     """When enabled, starts you with a map where all unexplored items and non-visited tiles have a gray background. This is different from the downloaded map stations where there, the full tile is gray."""
 
-    PowerBombsWithoutBombs: bool = False
-    """When enabled, lets you use Power Bombs without needing to collect Bomb Data."""
-
     AccessibilityPatches: bool = False
     """Whether to apply patches for better accessibility."""
 

src/mars_patcher/mf/constants/items.py

@@ -100,6 +100,11 @@ class ItemSprite(Enum):
     SHINY_MISSILE_TANK = 28
     SHINY_POWER_BOMB_TANK = 29
     INFANT_METROID = 30
+    SAMUS_HEAD = 31
+    WALLJUMP_BOOTS = 32
+    RANDOVANIA = 33
+    ARCHIPELAGO_COLOR = 34
+    ARCHIPELAGO_MONOCHROME = 35
 
 
 KEY_MAJOR_LOCS: Final = "MajorLocations"
@@ -216,6 +221,11 @@ class ItemJingle(Enum):
     "ShinyMissileTank": ItemSprite.SHINY_MISSILE_TANK,
     "ShinyPowerBombTank": ItemSprite.SHINY_POWER_BOMB_TANK,
     "InfantMetroid": ItemSprite.INFANT_METROID,
+    "SamusHead": ItemSprite.SAMUS_HEAD,
+    "WalljumpBoots": ItemSprite.WALLJUMP_BOOTS,
+    "Randovania": ItemSprite.RANDOVANIA,
+    "ArchipelagoColor": ItemSprite.ARCHIPELAGO_COLOR,
+    "ArchipelagoMonochrome": ItemSprite.ARCHIPELAGO_MONOCHROME,
 }
 
 

src/mars_patcher/mf/data/schema.json

@@ -596,11 +596,6 @@
             "description": "When enabled, starts you with a map where all unexplored items and non-visited tiles have a gray background. This is different from the downloaded map stations where there, the full tile is gray.",
             "default": false
         },
-        "PowerBombsWithoutBombs": {
-            "type": "boolean",
-            "description": "When enabled, lets you use Power Bombs without needing to collect Bomb Data.",
-            "default": false
-        },
         "AccessibilityPatches": {
             "type": "boolean",
             "description": "Whether to apply patches for better accessibility.",
@@ -896,7 +891,15 @@
                 "Anonymous",
                 "ShinyMissileTank",
                 "ShinyPowerBombTank",
-                "InfantMetroid"
+                "InfantMetroid",
+                "ShinyPowerBombTank",
+                "InfantMetroid",
+                "SamusHead",
+                "WalljumpBoots",
+                "Randovania",
+                "ArchipelagoColor",
+                "ArchipelagoMonochrome"
+
             ]
         },
         "ValidAbilities": {

src/mars_patcher/mf/misc_patches.py

@@ -77,10 +77,6 @@ def apply_unexplored_map(rom: Rom) -> None:
     apply_patch_in_asm_path(rom, "unhidden_map.ips")
 
 
-def apply_pbs_without_bombs(rom: Rom) -> None:
-    apply_patch_in_asm_path(rom, "bombless_pbs.ips")
-
-
 def apply_nerf_gerons(rom: Rom) -> None:
     apply_patch_in_asm_path(rom, "nerf_geron_weakness.ips")
 

src/mars_patcher/mf/patcher.py

@@ -20,7 +20,6 @@
     apply_base_patch,
     apply_instant_unmorph_patch,
     apply_nerf_gerons,
-    apply_pbs_without_bombs,
     apply_reveal_hidden_tiles,
     apply_reveal_unexplored_doors,
     apply_unexplored_map,
@@ -155,9 +154,6 @@ def patch_mf(
     if "MissileLimit" in patch_data:
         change_missile_limit(rom, patch_data["MissileLimit"])
 
-    if patch_data.get("PowerBombsWithoutBombs"):
-        apply_pbs_without_bombs(rom)
-
     if patch_data.get("NerfGerons"):
         apply_nerf_gerons(rom)