final commit b4 update

omg its happening ap update rn omg its gonna break i know it lmaoo
Br00ty · Sep 8, 2024 · 1316d8f · 1316d8f
1 parent 44617eb
commit 1316d8f
Show file tree

Hide file tree

Showing 15 changed files with 280 additions and 165 deletions.
diff --git a/images/essences/essences.png b/images/essences/essences.png
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Oracle of Ages Randomizer",
   "game_name": "Oracle of Ages",
-  "package_version": "0.6.2",
+  "package_version": "0.7",
   "package_uid": "ooa_brooty",
   "author": "Brooty",
   "variants": {

diff --git a/ooa_brooty.zip b/ooa_brooty.zip
diff --git a/scripts/autotracking/archipelago.lua b/scripts/autotracking/archipelago.lua
@@ -89,6 +89,38 @@ function onClear(slot_data)
         end
     end
 
+    if slot_data["animal_companion"] then
+        if slot_data["animal_companion"] == "Ricky" then
+            Tracker:FindObjectForCode("companions").CurrentStage = 1
+        elseif slot_data["animal_companion"] == "Dimitri" then
+            Tracker:FindObjectForCode("companions").CurrentStage = 2
+        elseif slot_data["animal_companion"] == "Moosh" then
+            Tracker:FindObjectForCode("companions").CurrentStage = 3
+        end
+    end
+
+    if slot_data["required_essences"] then
+        if slot_data["required_essences"] == "0" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 0
+        elseif slot_data["required_essences"] == "1" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 1
+        elseif slot_data["required_essences"] == "2" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 2
+        elseif slot_data["required_essences"] == "3" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 3
+        elseif slot_data["required_essences"] == "4" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 4
+        elseif slot_data["required_essences"] == "5" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 5
+        elseif slot_data["required_essences"] == "6" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 6
+        elseif slot_data["required_essences"] == "7" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 7
+        elseif slot_data["required_essences"] == "8" then
+            Tracker:FindObjectForCode("allessence").CurrentStage = 8
+        end
+    end
+
     if SLOT_DATA == nil then
         return
     end

diff --git a/scripts/autotracking/item_mapping.lua b/scripts/autotracking/item_mapping.lua
@@ -11,9 +11,12 @@ ITEM_MAPPING = {
     [BASE + 5] = {"hookupgrade", "progressive"},
     [BASE + 6] = {"cane", "toggle"},
     [BASE + 7] = {"bigsword", "toggle"},
-    [BASE + 8] = {{"flute", "toggle"},{"nuun_ricky", "progressive"}},
-    [BASE + 9] = {{"flute", "toggle"},{"nuun_dimitri", "progressive"}},
-    [BASE + 10] = {{"flute", "toggle"},{"nuun_moosh", "progressive"}},
+    [BASE + 8] = {"flute", "toggle"},
+    --[BASE + 8] = {"nuun_ricky", "progressive"},
+    [BASE + 9] = {"flute", "toggle"},
+    --[BASE + 9] = {"nuun_dimitri", "progressive"},
+    [BASE + 10] = {"flute", "toggle"},
+    --[BASE + 10] = {"nuun_moosh", "progressive"},
     [BASE + 11] = {"shooter", "toggle"},
     [BASE + 12] = {"shovel", "toggle"},
     [BASE + 13] = {"liftupgrade", "progressive"},

diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua
diff --git a/var_archipelago/items/items.json b/var_archipelago/items/items.json
@@ -591,6 +591,17 @@
     "img": "images/items/bosskey.png"
   },
   // OPTIONS
+  {
+    "name": "Required Essence",
+    "type": "consumable",
+    "codes": "allessence",
+    "max_quantity": 8,
+    "initial_quantity": 0,
+    "allow_disabled": false,
+    "overlay_font_size": 28,
+    "overlay_align": "center",
+    "img": "images/essences/essences.png"
+  },
   {
     "name": "Animal Companion",
     "type": "progressive",
@@ -603,17 +614,17 @@
         "img": "images/items/companions.png"
       },
       {
-        "codes": "nuun_ricky",
+        "codes": "nuun_ricky,companions",
         "inherit_codes": false,
         "img": "images/items/ricky.png"
       },
       {
-        "codes": "nuun_dimitri",
+        "codes": "nuun_dimitri,companions",
         "inherit_codes": false,
         "img": "images/items/dimitri.png"
       },
       {
-        "codes": "nuun_moosh",
+        "codes": "nuun_moosh,companions",
         "inherit_codes": false,
         "img": "images/items/moosh.png"
       }

diff --git a/var_archipelago/layouts/items.json b/var_archipelago/layouts/items.json
@@ -351,12 +351,15 @@
     "orientation": "vertical",
     "h_alignment": "center",
     "margin": "0,5,3,0",
-    "item_margin": "5,15",
+    "item_margin": "5,5",
     "item_size": 55,
     "rows": [
       [
         "companions"
       ],
+      [
+        "allessence"
+      ],
       [
         "l_bas"
       ],

diff --git a/var_archipelago/locations/dungeons.json b/var_archipelago/locations/dungeons.json
@@ -3,14 +3,11 @@
         "name": "Dungeons",
         "chest_unopened_img": "images/items/chest.png",
         "chest_opened_img": "images/items/chest_gray.png",
-        "visibility_rules": [
-            "dungeon_er_off"
-        ],
         "children": [
             {
                 "name": "Spirit's Grave (D1)",
                 "access_rules": [
-                    "gravekey"
+                    "gravekey,dungeon_er_off","dungeon_er_on"
                 ],
                 "children": [
                     {
@@ -254,8 +251,9 @@
             {
                 "name": "Wing Dungeon (D2)",
                 "access_rules": [
-                    "$deku_forest,bombs",
-                    "$deku_forest,currents"
+                    "dungeon_er_off,$deku_forest,bombs",
+                    "dungeon_er_off,$deku_forest,currents",
+                    "dungeon_er_on"
                 ],
                 "children": [
                     {
@@ -532,7 +530,9 @@
             {
                 "name": "Moonlit Grotto (D3)",
                 "access_rules": [
-                    "$d3_entrance"
+                    "dungeon_er_off,$d3_entrance",
+                    "dungeon_er_on",
+                    "dungeon_er_on"
                 ],
                 "children": [
                     {
@@ -840,8 +840,9 @@
             {
                 "name": "Skull Dungeon (D4)",
                 "access_rules": [
-                    "$d4_entrance",
-                    "$d4_entrance_h"
+                    "dungeon_er_off,$d4_entrance",
+                    "dungeon_er_off,$d4_entrance_h",
+                    "dungeon_er_on"
                 ],
                 "children": [
                     {
@@ -1065,11 +1066,12 @@
                 "name": "Crown Dungeon (D5)",
                 "access_rules": [
                     // Vanilla way, by beating Moblin Keep
-                    "$west_ridge_present, $pegasus_satchel, bracelet, feather, crownkey",
+                    "dungeon_er_off,$west_ridge_present, $pegasus_satchel, bracelet, feather, crownkey",
                     // From East Ridge
-                    "$lynna_village, feather, mermaid, hook1, bracelet, currents, crownkey",
-                    "$lynna_village, ages, mermaid, hook1, crownkey",
-                    "$lynna_village, ages, mermaid, $jump3, crownkey"
+                    "dungeon_er_off,$lynna_village, feather, mermaid, hook1, bracelet, currents, crownkey",
+                    "dungeon_er_off,$lynna_village, ages, mermaid, hook1, crownkey",
+                    "dungeon_er_off,$lynna_village, ages, mermaid, $jump3, crownkey",
+                    "dungeon_er_on"
                 ],
                 "children": [
                     {
@@ -1318,10 +1320,11 @@
                 "name": "Mermaid's Cave [Past] (D6)",
                 "access_rules": [
                     //from Lynna, swimming
-                    "d6keypast, $lynna_village, feather, mermaid",
-                    "d6keypast, $lynna_village, ages, mermaid",
+                    "dungeon_er_off,d6keypast, $lynna_village, feather, mermaid",
+                    "dungeon_er_off,d6keypast, $lynna_village, ages, mermaid",
                     //from the upper cave, requires emblem?
-                    "d6keypast, $west_ridge_present, $pegasus_satchel, bracelet, feather, echoes, flippers"
+                    "dungeon_er_off,d6keypast, $west_ridge_present, $pegasus_satchel, bracelet, feather, echoes, flippers",
+                    "dungeon_er_on"
                 ],
                 "children": [
                     {
@@ -1505,10 +1508,11 @@
                 "name": "Mermaid's Cave [Present] (D6)",
                 "access_rules": [
                     //from Lynna, swimming
-                    "d6keypresent, $lynna_village, feather, mermaid, currents",
-                    "d6keypresent, $lynna_village, ages, mermaid",
+                    "dungeon_er_off,d6keypresent, $lynna_village, feather, mermaid, currents",
+                    "dungeon_er_off,d6keypresent, $lynna_village, ages, mermaid",
                     //from the upper cave
-                    "d6keypresent, $west_ridge_present, $pegasus_satchel, bracelet, feather"
+                    "dungeon_er_off,d6keypresent, $west_ridge_present, $pegasus_satchel, bracelet, feather",
+                    "dungeon_er_on"
                 ],
                 "children": [
                     {
@@ -1675,7 +1679,8 @@
             {
                 "name": "Jabu-Jabu's Belly (D7)",
                 "access_rules": [
-                    "enterjabu"
+                    "dungeon_er_off,enterjabu",
+                    "dungeon_er_on"
                 ],
                 "children": [
                     {
@@ -1987,8 +1992,9 @@
             {
                 "name": "Ancient Tomb (D8)",
                 "access_rules": [
-                    "$d8_entrance",
-                    "[l_hard], $d8_entrance_h"
+                    "dungeon_er_off,$d8_entrance",
+                    "dungeon_er_off,[l_hard], $d8_entrance_h",
+                    "dungeon_er_on"
                 ],
                 "children": [
                     {

diff --git a/var_archipelago/locations/dungeons_shuffle.json b/var_archipelago/locations/dungeons_shuffle.json
@@ -3,9 +3,6 @@
         "name": "Dungeons (Shuffled)",
         "chest_unopened_img": "images/items/chest.png",
         "chest_opened_img": "images/items/chest_gray.png",
-        "visibility_rules": [
-            "dungeon_er_on"
-        ],
         "children": [
             {
                 "name": "Spirit's Grave (D1)",
@@ -17,7 +14,7 @@
                             {
                                 "name": "",
                                 "access_rules": [
-                                    "$d1_east_terrace"
+                                    "dungeon_er_on,$d1_east_terrace"
                                 ],
                                 "item_count": 1
                             }

diff --git a/var_archipelago/locations/overworld.json b/var_archipelago/locations/overworld.json
@@ -142,15 +142,16 @@
                                 "name": "",
                                 "hosted_item": "makuseed",
                                 "access_rules": [
-                                    "$maku_seed"
+                                    "$goal"
                                 ]
                             }
                         ],
                         "map_locations": [
                             {
                                 "map": "map",
                                 "x": 1385,
-                                "y": 453
+                                "y": 453,
+                                "size": 60
                             }
                         ]
                     },
@@ -1204,7 +1205,7 @@
                         ],
                         "sections": [
                             {
-                                "name": "Hungry Hungry Tokays!",
+                                "name": "",
                                 "item_count": 1,
                                 "access_rules": []
                             }
@@ -2752,18 +2753,30 @@
                         ]
                     },
                     {
-                        "name": "Jabu-Jabu Area",
+                        "name": "Enter Jabu-Jabu's Belly (D7)",
                         "sections": [
                             {
-                                "name": "Enter Jabu-Jabu's Belly (D7)",
+                                "name": "",
                                 "access_rules": [
                                     "enterjabu"
                                 ],
                                 "chest_unopened_img": "images/bosses/d7.png",
                                 "chest_opened_img": "images/bosses/d7.png"
-                            },
+                            }
+                        ],
+                        "map_locations": [
+                            {
+                                "map": "map",
+                                "x": 56,
+                                "y": 1360
+                            }
+                        ]
+                    },
+                    {
+                        "name": "Zora's Reward",
+                        "sections": [
                             {
-                                "name": "Zora's Reward",
+                                "name": "",
                                 "access_rules": [
                                     "d7"
                                 ]
@@ -2773,7 +2786,7 @@
                             {
                                 "map": "map",
                                 "x": 56,
-                                "y": 1383
+                                "y": 1410
                             }
                         ]
                     }

diff --git a/var_archipelago/scripts/init.lua b/var_archipelago/scripts/init.lua
@@ -35,7 +35,7 @@ if not IS_ITEMS_ONLY then -- <--- use variant info to optimize loading
     -- Locations
     Tracker:AddLocations("locations/overworld.json")
     Tracker:AddLocations("locations/dungeons.json")
-    Tracker:AddLocations("locations/dungeons_shuffle.json")
+    --Tracker:AddLocations("locations/dungeons_shuffle.json")
 end
 
 -- Layout

diff --git a/var_archipelago/scripts/logic/labrynna.lua b/var_archipelago/scripts/logic/labrynna.lua
@@ -141,7 +141,7 @@ end
 
 function crescentpresentwest()
     return dimitri_flute() or (lynna_city() and mermaid()) or
-               (crescentpast() and (currents() or (shovel() and echoes())))
+               ((has("raft") or (lynna_city() and mermaid())) and (currents() or (shovel() and echoes())))
 end
 
 --function crescentpresentwest()