From 45464e94088ac81c93eab643ab829931a96b4d89 Mon Sep 17 00:00:00 2001 From: clue cat Date: Thu, 29 May 2025 22:52:35 -0400 Subject: [PATCH 1/2] Move minimap changes from asm to patcher. Add sector connection indicators on minimap. Fixes #151 --- src/mars_patcher/data/base_minimap_edits.json | 270 +++++++++++++++--- 1 file changed, 235 insertions(+), 35 deletions(-) diff --git a/src/mars_patcher/data/base_minimap_edits.json b/src/mars_patcher/data/base_minimap_edits.json index aadc8f2..d90b2d0 100644 --- a/src/mars_patcher/data/base_minimap_edits.json +++ b/src/mars_patcher/data/base_minimap_edits.json @@ -2,6 +2,13 @@ { "MAP_ID": 0, "CHANGES": [ + { + "Description": "Sector 1 Marker from Restricted Lab", + "X": 7, + "Y": 19, + "Tile": 172, + "Palette": 0 + }, { "Description": "Add Item to Quarantine Bay", "X": 8, @@ -32,6 +39,28 @@ "Palette": 0, "VFlip": "True" }, + { + "Description": "Sector 2 Marker from Central Reactor Core", + "X": 14, + "Y": 16, + "Tile": 173, + "Palette": 0 + }, + { + "Description": "Change Operations Deck Door from L4 to L0", + "X": 16, + "Y": 0, + "Tile": 299, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Change Operations Deck Door from L4 to L0", + "X": 17, + "Y": 0, + "Tile": 293, + "Palette": 0 + }, { "Description": "Change Hidden Concourse Recharge Into Normal", "X": 17, @@ -79,6 +108,13 @@ { "MAP_ID": 9, "CHANGES": [ + { + "Description": "Sector 1 Marker from Restricted Lab", + "X": 7, + "Y": 19, + "Tile": 172, + "Palette": 0 + }, { "Description": "Add Item to Quarantine Bay", "X": 8, @@ -109,6 +145,28 @@ "Palette": 0, "VFlip": "True" }, + { + "Description": "Sector 2 Marker from Central Reactor Core", + "X": 14, + "Y": 16, + "Tile": 173, + "Palette": 0 + }, + { + "Description": "Change Operations Deck Door from L4 to L0", + "X": 16, + "Y": 0, + "Tile": 299, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Change Operations Deck Door from L4 to L0", + "X": 17, + "Y": 0, + "Tile": 293, + "Palette": 0 + }, { "Description": "Change Hidden Concourse Recharge Into Normal Recharge", "X": 17, @@ -156,6 +214,27 @@ { "MAP_ID": 1, "CHANGES": [ + { + "Description": "Sector 3 Marker", + "X": 1, + "Y": 2, + "Tile": 174, + "Palette": 0 + }, + { + "Description": "Main Deck Marker to Restricted Lab", + "X": 2, + "Y": 13, + "Tile": 171, + "Palette": 0 + }, + { + "Description": "Sector 2 Marker", + "X": 10, + "Y": 0, + "Tile": 173, + "Palette": 0 + }, { "Description": "Add Item to Northeast Stabilizer", "X": 16, @@ -184,6 +263,13 @@ { "MAP_ID": 2, "CHANGES": [ + { + "Description": "Sector 1 Marker", + "X": 1, + "Y": 3, + "Tile": 172, + "Palette": 0 + }, { "Description": "Add Upper Level One Security Section", "X": 9, @@ -198,6 +284,13 @@ "Tile": 364, "Palette": 0 }, + { + "Description": "Sector 4 Marker", + "X": 13, + "Y": 2, + "Tile": 175, + "Palette": 0 + }, { "Description": "Add Nettori Boss Tile", "X": 13, @@ -212,6 +305,13 @@ "Y": 13, "Tile": 267, "Palette": 2 + }, + { + "Description": "Main Deck Marker to Reactor Core", + "X": 18, + "Y": 8, + "Tile": 171, + "Palette": 0 } ] }, @@ -219,17 +319,17 @@ "MAP_ID": 3, "CHANGES": [ { - "Description": "Fix Entrance Recharge Room", - "X": 7, - "Y": 2, - "Tile": 346, + "Description": "Sector 5 Marker", + "X": 0, + "Y": 4, + "Tile": 176, "Palette": 0 }, { - "Description": "Add Box Boss Tile Functions Similar To Serris Hallway", - "X": 17, - "Y": 3, - "Tile": 264, + "Description": "Remove Extra tile left of Level Two Security", + "X": 2, + "Y": 5, + "Tile": 160, "Palette": 0 }, { @@ -245,13 +345,34 @@ "Y": 8, "Tile": 262, "Palette": 0 - }, + }, { "Description": "Add Boss Marker To Boiler Control", "X": 4, "Y": 8, "Tile": 267, "Palette": 0 + }, + { + "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": "Sector 1 Marker", + "X": 19, + "Y": 0, + "Tile": 172, + "Palette": 0 } ] }, @@ -259,27 +380,19 @@ "MAP_ID": 4, "CHANGES": [ { - "Description": "Fix Top Left Serris Arena Corner", - "X": 10, - "Y": 0, - "Tile": 0, + "Description": "Sector 5 Marker", + "X": 3, + "Y": 8, + "Tile": 176, "Palette": 0 }, { - "Description": "Add New Serris Arena Boss Tile", - "X": 11, - "Y": 0, - "Tile": 266, + "Description": "Add Level Four Security Tile", + "X": 3, + "Y": 14, + "Tile": 366, "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, @@ -296,6 +409,14 @@ "Palette": 0, "HFlip": "True" }, + { + "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 Hatch To Cheddar Bay To Security Access", "X": 5, @@ -304,18 +425,39 @@ "Palette": 0 }, { - "Description": "Add Level Four Hatch To Security Access to Level Four Security", - "X": 4, - "Y": 14, - "Tile": 114, + "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": "Sector 2 Marker", + "X": 18, + "Y": 11, + "Tile": 173, + "Palette": 0 + }, + { + "Description": "Add Level Four Hatch To Owtch Atrium To Powamp Playhouse", + "X": 19, + "Y": 5, + "Tile": 240, "Palette": 0, - "VFlip": "True" + "HFlip": "True" }, { - "Description": "Add Level Four Security Tile", - "X": 3, - "Y": 14, - "Tile": 366, + "Description": "Sector 5 Marker", + "X": 23, + "Y": 5, + "Tile": 177, "Palette": 0 } ] @@ -323,6 +465,13 @@ { "MAP_ID": 5, "CHANGES": [ + { + "Description": "Sector 6 Marker", + "X": 0, + "Y": 4, + "Tile": 177, + "Palette": 0 + }, { "Description": "Add Level Three Hatch To Magic Box", "X": 3, @@ -337,19 +486,70 @@ "Y": 10, "Tile": 367, "Palette": 2 + }, + { + "Description": "Change Level 4 Door to Level 3 Door in Arctic Containment", + "X": 10, + "Y": 4, + "Tile": 20, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Change Level 4 Door to Level 3 Door in Crows Nest", + "X": 11, + "Y": 4, + "Tile": 245, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Sector 3 Marker", + "X": 13, + "Y": 3, + "Tile": 174, + "Palette": 0 + }, + { + "Description": "Sector 4 Marker", + "X": 23, + "Y": 8, + "Tile": 175, + "Palette": 0 } ] }, { "MAP_ID": 6, "CHANGES": [ + { + "Description": "Main Deck Marker to Restricted Lab", + "X": 0, + "Y": 9, + "Tile": 171, + "Palette": 0 + }, + { + "Description": "Sector 4 Marker", + "X": 1, + "Y": 3, + "Tile": 175, + "Palette": 0 + }, { "Description": "Add Xbox Boss Tile", "X": 7, "Y": 6, "Tile": 268, "Palette": 2 + }, + { + "Description": "Sector 5 Marker", + "X": 13, + "Y": 2, + "Tile": 176, + "Palette": 0 } ] } -] \ No newline at end of file +] From 1a5a4bcb79ec07eb9f26e2fb43c0e5d5061f24f7 Mon Sep 17 00:00:00 2001 From: clue cat Date: Fri, 30 May 2025 00:02:41 -0400 Subject: [PATCH 2/2] Adjust some minimap tiles to Raddley's suggestions --- src/mars_patcher/data/base_minimap_edits.json | 175 +++++++++++++++++- 1 file changed, 169 insertions(+), 6 deletions(-) diff --git a/src/mars_patcher/data/base_minimap_edits.json b/src/mars_patcher/data/base_minimap_edits.json index d90b2d0..33122bc 100644 --- a/src/mars_patcher/data/base_minimap_edits.json +++ b/src/mars_patcher/data/base_minimap_edits.json @@ -5,10 +5,17 @@ { "Description": "Sector 1 Marker from Restricted Lab", "X": 7, - "Y": 19, + "Y": 18, "Tile": 172, "Palette": 0 }, + { + "Description": "Sector 1 Elevator Lines from Restricted Lab", + "X": 7, + "Y": 19, + "Tile": 169, + "Palette": 2 + }, { "Description": "Add Item to Quarantine Bay", "X": 8, @@ -31,6 +38,21 @@ "Palette": 0, "HFlip": "True" }, + { + "Description": "Sector 6 Arrow from Restricted Lab", + "X": 10, + "Y": 23, + "Tile": 170, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Sector 6 Marker from Restricted Lab", + "X": 11, + "Y": 23, + "Tile": 177, + "Palette": 0 + }, { "Description": "Add L3 Locks to Dark Stairwell", "X": 11, @@ -46,6 +68,14 @@ "Tile": 173, "Palette": 0 }, + { + "Description": "Connector Arrow to Sector 2 from Central Reactor Core", + "X": 15, + "Y": 16, + "Tile": 164, + "Palette": 0, + "HFlip": "True" + }, { "Description": "Change Operations Deck Door from L4 to L0", "X": 16, @@ -111,10 +141,17 @@ { "Description": "Sector 1 Marker from Restricted Lab", "X": 7, - "Y": 19, + "Y": 18, "Tile": 172, "Palette": 0 }, + { + "Description": "Sector 1 Elevator Lines from Restricted Lab", + "X": 7, + "Y": 19, + "Tile": 169, + "Palette": 2 + }, { "Description": "Add Item to Quarantine Bay", "X": 8, @@ -137,6 +174,21 @@ "Palette": 0, "HFlip": "True" }, + { + "Description": "Sector 6 Arrow from Restricted Lab", + "X": 10, + "Y": 23, + "Tile": 170, + "Palette": 0, + "HFlip": "True" + }, + { + "Description": "Sector 6 Marker from Restricted Lab", + "X": 11, + "Y": 23, + "Tile": 177, + "Palette": 0 + }, { "Description": "Add L3 Locks to Dark Stairwell", "X": 11, @@ -152,6 +204,14 @@ "Tile": 173, "Palette": 0 }, + { + "Description": "Connector Arrow to Sector 2 from Central Reactor Core", + "X": 15, + "Y": 16, + "Tile": 164, + "Palette": 0, + "HFlip": "True" + }, { "Description": "Change Operations Deck Door from L4 to L0", "X": 16, @@ -222,12 +282,34 @@ "Palette": 0 }, { - "Description": "Main Deck Marker to Restricted Lab", + "Description": "Sector 3 Arrow", + "X": 2, + "Y": 2, + "Tile": 164, + "Palette": 2, + "HFlip": "True" + }, + { + "Description": "Main Deck Elevator Lines to Restricted Lab", "X": 2, "Y": 13, + "Tile": 168, + "Palette": 2 + }, + { + "Description": "Main Deck Marker to Restricted Lab", + "X": 2, + "Y": 14, "Tile": 171, "Palette": 0 }, + { + "Description": "Sector 2 Arrow", + "X": 9, + "Y": 0, + "Tile": 164, + "Palette": 2 + }, { "Description": "Sector 2 Marker", "X": 10, @@ -270,6 +352,14 @@ "Tile": 172, "Palette": 0 }, + { + "Description": "Sector 1 Arrow", + "X": 2, + "Y": 3, + "Tile": 164, + "Palette": 2, + "HFlip": "True" + }, { "Description": "Add Upper Level One Security Section", "X": 9, @@ -284,6 +374,13 @@ "Tile": 364, "Palette": 0 }, + { + "Description": "Sector 4 Arrow", + "X": 12, + "Y": 2, + "Tile": 164, + "Palette": 2 + }, { "Description": "Sector 4 Marker", "X": 13, @@ -306,6 +403,13 @@ "Tile": 267, "Palette": 2 }, + { + "Description": "Main Deck Arrow to Reactor Core", + "X": 17, + "Y": 8, + "Tile": 164, + "Palette": 2 + }, { "Description": "Main Deck Marker to Reactor Core", "X": 18, @@ -367,6 +471,13 @@ "Tile": 264, "Palette": 0 }, + { + "Description": "Sector 1 Arrow", + "X": 18, + "Y": 0, + "Tile": 164, + "Palette": 2 + }, { "Description": "Sector 1 Marker", "X": 19, @@ -394,10 +505,10 @@ "Palette": 0 }, { - "Description": "Fix Shortcut To Ruined 5", + "Description": "Sector 5 Arrow", "X": 4, "Y": 8, - "Tile": 163, + "Tile": 164, "Palette": 2, "HFlip": "True" }, @@ -445,6 +556,14 @@ "Tile": 173, "Palette": 0 }, + { + "Description": "Sector 2 Arrow", + "X": 19, + "Y": 11, + "Tile": 164, + "Palette": 2, + "HFlip": "True" + }, { "Description": "Add Level Four Hatch To Owtch Atrium To Powamp Playhouse", "X": 19, @@ -454,7 +573,14 @@ "HFlip": "True" }, { - "Description": "Sector 5 Marker", + "Description": "Sector 6 Arrow", + "X": 22, + "Y": 5, + "Tile": 164, + "Palette": 2 + }, + { + "Description": "Sector 6 Marker", "X": 23, "Y": 5, "Tile": 177, @@ -472,6 +598,14 @@ "Tile": 177, "Palette": 0 }, + { + "Description": "Sector 6 Arrow", + "X": 1, + "Y": 4, + "Tile": 164, + "Palette": 2, + "HFlip": "True" + }, { "Description": "Add Level Three Hatch To Magic Box", "X": 3, @@ -503,6 +637,13 @@ "Palette": 0, "HFlip": "True" }, + { + "Description": "Sector 3 Arrow", + "X": 12, + "Y": 3, + "Tile": 164, + "Palette": 2 + }, { "Description": "Sector 3 Marker", "X": 13, @@ -510,6 +651,13 @@ "Tile": 174, "Palette": 0 }, + { + "Description": "Sector 4 Arrow", + "X": 22, + "Y": 8, + "Tile": 164, + "Palette": 2 + }, { "Description": "Sector 4 Marker", "X": 23, @@ -536,6 +684,14 @@ "Tile": 175, "Palette": 0 }, + { + "Description": "Sector 4 Arrow", + "X": 2, + "Y": 3, + "Tile": 164, + "Palette": 2, + "HFlip": "True" + }, { "Description": "Add Xbox Boss Tile", "X": 7, @@ -543,6 +699,13 @@ "Tile": 268, "Palette": 2 }, + { + "Description": "Sector 5 Arrow", + "X": 12, + "Y": 2, + "Tile": 164, + "Palette": 2 + }, { "Description": "Sector 5 Marker", "X": 13,