diff --git a/CHANGELOG.md b/CHANGELOG.md index 93d27b9..85aef6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased - 2025-XX-XX +### Visual +- Changed: Base Minimap Edits has been updated to reflect new events, boss tiles, and security rooms. + ## 0.4.0 - 2025-05-15 - Changelog Created - Added: 6 new Item Locations. 3 Major/Events: Boiler, Animals, Auxiliary Power. 3 Minor/Tanks: Subzero Containment, Quarantine Bay, Northeast Stabilizer diff --git a/src/mars_patcher/constants/minimap_tiles.py b/src/mars_patcher/constants/minimap_tiles.py index a8302b4..056f9f4 100644 --- a/src/mars_patcher/constants/minimap_tiles.py +++ b/src/mars_patcher/constants/minimap_tiles.py @@ -155,6 +155,10 @@ class Content(Enum): BOSS = "B" GUNSHIP = "G" GUNSHIP_EDGE = "P" + SECURITY = "K" + AUXILLARY_POWER = "X" + ANIMALS = "A" + BOILER_PAD = "b" @property def can_h_flip(self) -> bool: @@ -418,6 +422,14 @@ def v_flip(self) -> MapTile: 0x19F: MapTile.from_str("WGWW_xxxx_O"), 0x1AC: MapTile.from_str("WYYW_xxxx_I"), 0x1AD: MapTile.from_str("WYYW_xxxx_O"), + # New Tiles + 0x10B: MapTile.from_str("xxGW_Cxxx_B"), + 0x16C: MapTile.from_str("xWBW_xxxx_K"), + 0x16D: MapTile.from_str("WWGW_xxxx_K"), + 0x16E: MapTile.from_str("WWRW_xxxx_K"), + 0x16F: MapTile.from_str("WYDW_xxxx_K"), + 0x1AE: MapTile.from_str("WYWW_xxxx_I"), + 0x1AF: MapTile.from_str("WYWW_xxxx_O"), } @@ -532,6 +544,14 @@ def v_flip(self) -> MapTile: 0x1A9: MapTile.from_str("xWWx_xxxx_O"), 0x1AA: MapTile.from_str("DDWW_xxxx_I"), 0x1AB: MapTile.from_str("DDWW_xxxx_O"), + 0x0B5: MapTile.from_str("WSDW_xxxx_O"), + # New Tiles + 0x0D4: MapTile.from_str("WSDW_xxxx_I"), + 0x0D5: MapTile.from_str("WSDW_xxxx_O"), + 0x10A: MapTile.from_str("WxDx_xxxx_B"), + 0x10C: MapTile.from_str("xDxW_xCxx_B"), + 0x170: MapTile.from_str("WWDx_xxxx_x"), + 0x172: MapTile.from_str("WDDW_xxxx_X"), } COLORED_DOOR_TILE_IDS = {tile: id for id, tile in COLORED_DOOR_TILES.items()} diff --git a/src/mars_patcher/data/base_minimap_edits.json b/src/mars_patcher/data/base_minimap_edits.json index 97d6e48..aadc8f2 100644 --- a/src/mars_patcher/data/base_minimap_edits.json +++ b/src/mars_patcher/data/base_minimap_edits.json @@ -31,11 +31,53 @@ "Tile": 117, "Palette": 0, "VFlip": "True" + }, + { + "Description": "Change Hidden Concourse Recharge Into Normal", + "X": 17, + "Y": 7, + "Tile": 344, + "Palette": 0 + }, + { + "Description": "Add Animals Event Marker", + "X": 9, + "Y": 2, + "Tile": 369, + "Palette": 0 + }, + { + "Description": "Remove Left Of Main Elevator Vents To Cold Storage", + "X": 7, + "Y": 10, + "Tile": 160, + "Palette": 1 + }, + { + "Description": "Remove Right Of Main Elevator Vents To Cold Storage", + "X": 8, + "Y": 10, + "Tile": 160, + "Palette": 1 + }, + { + "Description": "Add Auxillary Power Event Marker", + "X": 20, + "Y": 19, + "Tile": 370, + "Palette": 2 + }, + { + "Description": "Fix Yakuza Boss Tile", + "X": 21, + "Y": 21, + "Tile": 270, + "Palette": 2 } ] }, { - "MAP_ID": 9, + "MAP_ID": 9, "CHANGES": [ { "Description": "Add Item to Quarantine Bay", @@ -66,6 +108,48 @@ "Tile": 117, "Palette": 0, "VFlip": "True" + }, + { + "Description": "Change Hidden Concourse Recharge Into Normal Recharge", + "X": 17, + "Y": 7, + "Tile": 344, + "Palette": 0 + }, + { + "Description": "Add Animals Event Marker", + "X": 9, + "Y": 2, + "Tile": 369, + "Palette": 0 + }, + { + "Description": "Remove Left Section Of Main Elevator Vents To Cold Storage", + "X": 7, + "Y": 10, + "Tile": 160, + "Palette": 1 + }, + { + "Description": "Remove Right Section Of Main Elevator Vents To Cold Storage", + "X": 8, + "Y": 10, + "Tile": 160, + "Palette": 1 + }, + { + "Description": "Add Auxillary Power Event Marker", + "X": 20, + "Y": 19, + "Tile": 370, + "Palette": 2 + }, + { + "Description": "Fix Yakuza Boss Tile", + "X": 21, + "Y": 21, + "Tile": 270, + "Palette": 2 } ] }, @@ -79,6 +163,192 @@ "Tile": 390, "Palette": 0, "HFlip": "True" + }, + { + "Description": "Fix Lower Charge Core Access Hall", + "X": 12, + "Y": 6, + "Tile": 299, + "Palette": 0 + }, + { + "Description": "Add Charge Core Boss Tile", + "X": 9, + "Y": 6, + "Tile": 267, + "Palette": 0, + "HFlip": "True" + } + ] + }, + { + "MAP_ID": 2, + "CHANGES": [ + { + "Description": "Add Upper Level One Security Section", + "X": 9, + "Y": 0, + "Tile": 368, + "Palette": 0 + }, + { + "Description": "Add Lower Level One Security Section", + "X": 9, + "Y": 1, + "Tile": 364, + "Palette": 0 + }, + { + "Description": "Add Nettori Boss Tile", + "X": 13, + "Y": 6, + "Tile": 267, + "Palette": 2, + "HFlip": "True" + }, + { + "Description": "Fix Zazabi Boss Tile", + "X": 14, + "Y": 13, + "Tile": 267, + "Palette": 2 + } + ] + }, + { + "MAP_ID": 3, + "CHANGES": [ + { + "Description": "Fix Entrance Recharge Room", + "X": 7, + "Y": 2, + "Tile": 346, + "Palette": 0 + }, + { + "Description": "Add Box Boss Tile Functions Similar To Serris Hallway", + "X": 17, + "Y": 3, + "Tile": 264, + "Palette": 0 + }, + { + "Description": "Add Level Two Security Tile", + "X": 3, + "Y": 5, + "Tile": 365, + "Palette": 0 + }, + { + "Description": "Add Boiler Pad Event Tile", + "X": 3, + "Y": 8, + "Tile": 262, + "Palette": 0 + }, + { + "Description": "Add Boss Marker To Boiler Control", + "X": 4, + "Y": 8, + "Tile": 267, + "Palette": 0 + } + ] + }, + { + "MAP_ID": 4, + "CHANGES": [ + { + "Description": "Fix Top Left Serris Arena Corner", + "X": 10, + "Y": 0, + "Tile": 0, + "Palette": 0 + }, + { + "Description": "Add New Serris Arena Boss Tile", + "X": 11, + "Y": 0, + "Tile": 266, + "Palette": 0 + }, + { + "Description": "Add Level Four Hatch To Owtch Atrium To Powamp Playhouse", + "X": 19, + "Y": 5, + "Tile": 240, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Fix Shortcut To Ruined 5", + "X": 4, + "Y": 8, + "Tile": 163, + "Palette": 2, + "HFlip": "True" + }, + { + "Description": "Add Level Four Hatch To Security Access To Cheddar Bay", + "X": 4, + "Y": 11, + "Tile": 114, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Add Level Four Hatch To Cheddar Bay To Security Access", + "X": 5, + "Y": 11, + "Tile": 79, + "Palette": 0 + }, + { + "Description": "Add Level Four Hatch To Security Access to Level Four Security", + "X": 4, + "Y": 14, + "Tile": 114, + "Palette": 0, + "VFlip": "True" + }, + { + "Description": "Add Level Four Security Tile", + "X": 3, + "Y": 14, + "Tile": 366, + "Palette": 0 + } + ] + }, + { + "MAP_ID": 5, + "CHANGES": [ + { + "Description": "Add Level Three Hatch To Magic Box", + "X": 3, + "Y": 4, + "Tile": 430, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Add Level Three Security Tile", + "X": 6, + "Y": 10, + "Tile": 367, + "Palette": 2 + } + ] + }, + { + "MAP_ID": 6, + "CHANGES": [ + { + "Description": "Add Xbox Boss Tile", + "X": 7, + "Y": 6, + "Tile": 268, + "Palette": 2 } ] }