paging doctor beat, emergency emergency

fix logic for treasure goron, made bomb progressive, fix some autotracking shenanigans lmao
Br00ty · Sep 16, 2024 · d0f499b · d0f499b
1 parent a020ebd
commit d0f499b
Show file tree

Hide file tree

Showing 33 changed files with 42 additions and 11,495 deletions.
diff --git a/images/items/bombs_plus.png b/images/items/bombs_plus.png
diff --git a/manifest.json b/manifest.json
@@ -1,30 +1,24 @@
 {
   "name": "Oracle of Ages Randomizer",
   "game_name": "Oracle of Ages",
-  "package_version": "0.7.3",
+  "package_version": "0.7.3.1",
   "package_uid": "ooa_brooty",
   "author": "Brooty",
   "variants": {
     "standard": {
-      "display_name": "Map Tracker (Vertical)",
+      "display_name": "Map Tracker (Vertical)"
       //"flags": [
       //  "ap"
       //]
     },
     "var_horizontal": {
-      "display_name": "Map Tracker (Horizontal)",
+      "display_name": "Map Tracker (Horizontal)"
       //"flags": [
       //  "ap"
       //]
      },
      "var_x-items": {
-      "display_name": "Map Tracker (Cross-Items)",
-      //"flags": [
-      //  "ap"
-      //]
-     },
-     "var_x-items_testing": {
-      "display_name": "Cross-Items Testing Branch",
+      "display_name": "Map Tracker (Cross-Items)"
       //"flags": [
       //  "ap"
       //]
@@ -36,7 +30,7 @@
       ]
      },
     "var_itemsonly": {
-     "display_name": "Items Only",
+     "display_name": "Items Only"
      //"flags": [
      //  "ap"
      //]

diff --git a/ooa_brooty.zip b/ooa_brooty.zip
diff --git a/scripts/autotracking/item_mapping.lua b/scripts/autotracking/item_mapping.lua
@@ -4,7 +4,7 @@ BASE = 27022002000
 
 ITEM_MAPPING = {
     [BASE + 0] = {"shield", "progressive"},
-    [BASE + 1] = {"bomb", "toggle"},
+    [BASE + 1] = {"bomb", "progressive"},
     [BASE + 2] = {"swordupgrade", "progressive"},
     [BASE + 3] = {"boomerang", "progressive"},
     [BASE + 4] = {"harpupgrade", "progressive"},

diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua
@@ -105,16 +105,16 @@ LOCATION_MAPPING = {
     [BASE + 94] = {"@Overworld/Rolling Ridge West/Old Zora Trade/"},
     -- HEART PIECES
     [BASE + 95] = {"@Overworld/Lynna|South Shore|Palace/Black Tower Heart Piece/"},
-    [BASE + 96] = {"@Dungeons/Maku Path (D0)/Heart Piece"},
+    [BASE + 96] = {"@Dungeons/Maku Path (D0)/Heart Piece/"},
     [BASE + 97] = {"@Overworld/Yoll Graveyard/Yoll Graveyard Heart Piece/"},
     [BASE + 98] = {"@Overworld/Fairies' Woods/Deku Forest Heart Piece/"},
     [BASE + 99] = {"@Overworld/Fairies' Woods/Restoration Wall Heart Piece/"},
     [BASE + 100] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Symmetry City Heart Piece/"},
     [BASE + 101] = {"@Overworld/Rolling Ridge West/Rolling Ridge Entrance/Ridge West Heart Piece"},
     [BASE + 102] = {"@Overworld/Rolling Ridge East (Past)/Ridge Upper Heart Piece/"},
     -- MAKU PATH
-    [BASE + 103] = {"@Dungeons/Maku Path (D0)/Key Chest"},
-    [BASE + 104] = {"@Dungeons/Maku Path (D0)/Basement"},
+    [BASE + 103] = {"@Dungeons/Maku Path (D0)/Key Chest/"},
+    [BASE + 104] = {"@Dungeons/Maku Path (D0)/Basement/"},
     -- SPIRITS GRAVE
     [BASE + 105] = {"@Dungeons/Spirit's Grave (D1)/One-Button Chest/"},
     [BASE + 106] = {"@Dungeons/Spirit's Grave (D1)/Two-Buttons Chest/"},

diff --git a/var_archipelago/items/items.json b/var_archipelago/items/items.json
@@ -76,11 +76,25 @@
   },
   {
     "name": "Bombs",
-    "type": "toggle",
-    "loop": true,
-    "img": "images/items/bombs.png",
-    "codes": "bomb, bombs"
+    "type": "progressive",
+    "stages": [
+      {
+        "img": "images/items/bombs.png",
+        "codes": "bomb, bombs"
+      },
+      {
+        "img": "images/items/bombs_plus.png",
+        "codes": "bomb, bombs, bombplus, bombsplus"
+      }
+    ]
   },
+  //{
+  //  "name": "Bombs",
+  //  "type": "toggle",
+  //  "loop": true,
+  //  "img": "images/items/bombs.png",
+  //  "codes": "bomb, bombs"
+  //},
   {
     "name": "Flute",
     "type": "toggle",

diff --git a/var_archipelago/locations/dungeons.json b/var_archipelago/locations/dungeons.json
@@ -78,6 +78,7 @@
                         "name": "Have Maku Path Key?",
                         "sections": [
                             {
+                                "name": "",
                                 "access_rules": ["{}"],
                                 "hosted_item": "pathkey"
                             }

diff --git a/var_archipelago/locations/overworld.json b/var_archipelago/locations/overworld.json
@@ -2308,10 +2308,10 @@
                         "name": "Treasure Hunting Goron",
                         "access_rules": [
                             //from Lynna, swimming
-                            "$lynna_village, echoes, feather, mermaid, hook1, bombs, emberseeds, lift1",
-                            "$lynna_village, ages, mermaid, hook1, bombs, emberseeds, lift1",
+                            "$lynna_village, echoes, feather, mermaid, hook1, bombsplus, emberseeds, lift1",
+                            "$lynna_village, ages, mermaid, hook1, bombsplus, emberseeds, lift1",
                             //from the upper cave, requires emblem
-                            "$west_ridge_present, $jump3, bracelet, bombs, emberseeds"
+                            "$west_ridge_present, $jump3, bracelet, bombsplus, emberseeds"
                         ],
                         "sections": [
                             {