new ap release, new pop release

Br00ty · Sep 9, 2024 · b346eac · b346eac
1 parent 247e9b1
commit b346eac
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 136 deletions.
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.7.1.2",
+  "package_version": "0.7.2",
   "package_uid": "ooa_brooty",
   "author": "Brooty",
   "variants": {

diff --git a/scripts/autotracking/archipelago.lua b/scripts/autotracking/archipelago.lua
@@ -211,6 +211,18 @@ function onLocation(location_id, location_name)
     elseif AUTOTRACKER_ENABLE_DEBUG_LOGGING_AP then
         print(string.format("onLocation: could not find object for code %s", v[1]))
     end
+    --if location_name == "Nuun Highlands Cave" then
+    --    obj = Tracker:FindObjectForCode("@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Nuun Highlands Cave - Ricky/")
+    --    obj.AvailableChestCount = obj.AvailableChestCount - 1
+    --end
+    --if location_name == "Nuun Highlands Cave" then
+    --    obj = Tracker:FindObjectForCode("@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Nuun Highlands Cave - Dimitri/")
+    --    obj.AvailableChestCount = obj.AvailableChestCount - 1
+    --end
+    --if location_name == "Nuun Highlands Cave" then
+    --    obj = Tracker:FindObjectForCode("@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Nuun Highlands Cave - Moosh/")
+    --    obj.AvailableChestCount = obj.AvailableChestCount - 1
+    --end
 end
 
 -- called when a locations is scouted

diff --git a/scripts/autotracking/item_mapping.lua b/scripts/autotracking/item_mapping.lua
@@ -28,86 +28,86 @@ ITEM_MAPPING = {
     [BASE + 19] = {"galeseeds", "toggle"},
     [BASE + 20] = {"mysteryseeds", "toggle"},
     [BASE + 31] = {"swimupgrade", "progressive"},
-    [BASE + 32] = {"potion", "toggle"},
+    [BASE + 33] = {"potion", "toggle"},
     -- SMALL KEYS
-    [BASE + 33] = {"pathkey", "toggle"},
-    [BASE + 34] = {"d1sk", "consumable"},
-    [BASE + 35] = {"d2sk", "consumable"},
-    [BASE + 36] = {"d3sk", "consumable"},
-    [BASE + 37] = {"d4sk", "consumable"},
-    [BASE + 38] = {"d5sk", "consumable"},
-    [BASE + 39] = {"d6_1sk", "consumable"},
-    [BASE + 40] = {"d6_2sk", "consumable"},
-    [BASE + 41] = {"d7sk", "consumable"},
-    [BASE + 42] = {"d8sk", "consumable"},
+    [BASE + 34] = {"pathkey", "toggle"},
+    [BASE + 35] = {"d1sk", "consumable"},
+    [BASE + 36] = {"d2sk", "consumable"},
+    [BASE + 37] = {"d3sk", "consumable"},
+    [BASE + 38] = {"d4sk", "consumable"},
+    [BASE + 39] = {"d5sk", "consumable"},
+    [BASE + 40] = {"d6_1sk", "consumable"},
+    [BASE + 41] = {"d6_2sk", "consumable"},
+    [BASE + 42] = {"d7sk", "consumable"},
+    [BASE + 43] = {"d8sk", "consumable"},
     -- MASTER KEYS?
-    [BASE + 43] = {"d1mk", "toggle"},
-    [BASE + 44] = {"d2mk", "toggle"},
-    [BASE + 45] = {"d3mk", "toggle"},
-    [BASE + 46] = {"d4mk", "toggle"},
-    [BASE + 47] = {"d5mk", "toggle"},
-    [BASE + 48] = {"d6_1mk", "toggle"},
-    [BASE + 49] = {"d6_2mk", "toggle"},
-    [BASE + 50] = {"d7mk", "toggle"},
-    [BASE + 51] = {"d8mk", "toggle"},
+    [BASE + 44] = {"d1mk", "toggle"},
+    [BASE + 45] = {"d2mk", "toggle"},
+    [BASE + 46] = {"d3mk", "toggle"},
+    [BASE + 47] = {"d4mk", "toggle"},
+    [BASE + 48] = {"d5mk", "toggle"},
+    [BASE + 49] = {"d6_1mk", "toggle"},
+    [BASE + 50] = {"d6_2mk", "toggle"},
+    [BASE + 51] = {"d7mk", "toggle"},
+    [BASE + 52] = {"d8mk", "toggle"},
     -- BOSS KEYS
-    [BASE + 52] = {"d1bk", "toggle"},
-    [BASE + 53] = {"d2bk", "toggle"},
-    [BASE + 54] = {"d3bk", "toggle"},
-    [BASE + 55] = {"d4bk", "toggle"},
-    [BASE + 56] = {"d5bk", "toggle"},
-    [BASE + 57] = {"d6bk", "toggle"},
-    [BASE + 58] = {"d7bk", "toggle"},
-    [BASE + 59] = {"d8bk", "toggle"},
+    [BASE + 53] = {"d1bk", "toggle"},
+    [BASE + 54] = {"d2bk", "toggle"},
+    [BASE + 55] = {"d3bk", "toggle"},
+    [BASE + 56] = {"d4bk", "toggle"},
+    [BASE + 57] = {"d5bk", "toggle"},
+    [BASE + 58] = {"d6bk", "toggle"},
+    [BASE + 59] = {"d7bk", "toggle"},
+    [BASE + 60] = {"d8bk", "toggle"},
     -- TRADE still need to do
-    [BASE + 79] = {"poeclock", "toggle"},
-    [BASE + 80] = {"stationary", "toggle"},
-    [BASE + 81] = {"stinkbag", "toggle"},
-    [BASE + 82] = {"tastymeat", "toggle"},
-    [BASE + 83] = {"doggiemask", "toggle"},
-    [BASE + 84] = {"dumbbell", "toggle"},
-    [BASE + 85] = {"mustache", "toggle"},
-    [BASE + 86] = {"funnyjoke", "toggle"},
-    [BASE + 87] = {"touchingbook", "toggle"},
-    [BASE + 88] = {"magicoar", "toggle"},
-    [BASE + 89] = {"seaukulele", "toggle"},
-    [BASE + 90] = {"brokensword", "toggle"},
+    [BASE + 80] = {"poeclock", "toggle"},
+    [BASE + 81] = {"stationary", "toggle"},
+    [BASE + 82] = {"stinkbag", "toggle"},
+    [BASE + 83] = {"tastymeat", "toggle"},
+    [BASE + 84] = {"doggiemask", "toggle"},
+    [BASE + 85] = {"dumbbell", "toggle"},
+    [BASE + 86] = {"mustache", "toggle"},
+    [BASE + 87] = {"funnyjoke", "toggle"},
+    [BASE + 88] = {"touchingbook", "toggle"},
+    [BASE + 89] = {"magicoar", "toggle"},
+    [BASE + 90] = {"seaukulele", "toggle"},
+    [BASE + 91] = {"brokensword", "toggle"},
     -- RANDOM ITEMS
-    [BASE + 91] = {"bombflower", "toggle"},
-    [BASE + 92] = {"book", "toggle"},
-    [BASE + 93] = {"emblem", "toggle"},
-    [BASE + 94] = {"cheval", "toggle"},
-    [BASE + 95] = {"crownkey", "toggle"},
-    [BASE + 96] = {"powder", "toggle"},
-    [BASE + 97] = {"vase", "toggle"},
-    [BASE + 98] = {"goronade", "toggle"},
-    [BASE + 99] = {"gravekey", "toggle"},
-    [BASE + 100] = {"chart", "toggle"},
-    [BASE + 101] = {"lavajuice", "toggle"},
-    [BASE + 102] = {"introduction", "toggle"},
-    [BASE + 103] = {"librarykey", "toggle"},
-    [BASE + 104] = {"d6keypast", "toggle"},
-    [BASE + 105] = {"d6keypresent", "toggle"},
-    [BASE + 106] = {"gloves", "toggle"},
-    [BASE + 107] = {"brisket", "toggle"},
-    [BASE + 108] = {"seedling", "toggle"},
-    [BASE + 109] = {"d8slate", "consumable"},
-    [BASE + 110] = {"eyeball", "toggle"},
-    [BASE + 111] = {"tuninut", "toggle"},
-    [BASE + 112] = {"repairednut", "toggle"},
-    [BASE + 113] = {"scale", "toggle"},
+    [BASE + 92] = {"bombflower", "toggle"},
+    [BASE + 93] = {"book", "toggle"},
+    [BASE + 94] = {"emblem", "toggle"},
+    [BASE + 95] = {"cheval", "toggle"},
+    [BASE + 96] = {"crownkey", "toggle"},
+    [BASE + 97] = {"powder", "toggle"},
+    [BASE + 98] = {"vase", "toggle"},
+    [BASE + 99] = {"goronade", "toggle"},
+    [BASE + 100] = {"gravekey", "toggle"},
+    [BASE + 101] = {"chart", "toggle"},
+    [BASE + 102] = {"lavajuice", "toggle"},
+    [BASE + 103] = {"introduction", "toggle"},
+    [BASE + 104] = {"librarykey", "toggle"},
+    [BASE + 105] = {"d6keypast", "toggle"},
+    [BASE + 106] = {"d6keypresent", "toggle"},
+    [BASE + 107] = {"gloves", "toggle"},
+    [BASE + 108] = {"brisket", "toggle"},
+    [BASE + 109] = {"seedling", "toggle"},
+    [BASE + 110] = {"d8slate", "consumable"},
+    [BASE + 111] = {"eyeball", "toggle"},
+    [BASE + 112] = {"tuninut", "toggle"},
+    [BASE + 113] = {"repairednut", "toggle"},
+    [BASE + 114] = {"scale", "toggle"},
     -- RINGS
-    [BASE + 125] = {"ring_expert", "toggle"}, -- FISXED
-    [BASE + 132] = {"ring_toss", "toggle"},
-    [BASE + 163] = {"ring_energy", "toggle"},
-    [BASE + 176] = {"ring_fist", "toggle"},
+    [BASE + 126] = {"ring_expert", "toggle"}, -- FISXED
+    [BASE + 133] = {"ring_toss", "toggle"},
+    [BASE + 164] = {"ring_energy", "toggle"},
+    [BASE + 177] = {"ring_fist", "toggle"},
     -- ESSENCE
-    [BASE + 178] = {"d1", "toggle"},
-    [BASE + 179] = {"d2", "toggle"},
-    [BASE + 180] = {"d3", "toggle"},
-    [BASE + 181] = {"d4", "toggle"},
-    [BASE + 182] = {"d5", "toggle"},
-    [BASE + 183] = {"d6", "toggle"},
-    [BASE + 184] = {"d7", "toggle"},
-    [BASE + 185] = {"d8", "toggle"},
+    [BASE + 179] = {"d1", "toggle"},
+    [BASE + 180] = {"d2", "toggle"},
+    [BASE + 181] = {"d3", "toggle"},
+    [BASE + 182] = {"d4", "toggle"},
+    [BASE + 183] = {"d5", "toggle"},
+    [BASE + 184] = {"d6", "toggle"},
+    [BASE + 185] = {"d7", "toggle"},
+    [BASE + 186] = {"d8", "toggle"},
 }
diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua
@@ -45,7 +45,7 @@ LOCATION_MAPPING = {
     --[BASE + 37] = {"@Overworld/Crescent Island/Tokay Market/Second Item"},    
     [BASE + 38] = {"@Overworld/Crescent Island/Tokay Pot Cave/"},    
     [BASE + 39] = {"@Overworld/Crescent Island/Under Crescent Island/"},    
-    --[BASE + 40] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Nuun Cave - Ricky/"},
+    [BASE + 40] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Nuun Highlands Cave/"},
     --[BASE + 40] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Nuun Cave - Dimitri/"},
     --[BASE + 40] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Nuun Cave - Moosh/"},   
     [BASE + 41] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Symmetry City Main House/Symmetry City Brothers"},    

diff --git a/var_archipelago/items/items.json b/var_archipelago/items/items.json
@@ -6,15 +6,15 @@
     "stages": [
       {
         "img": "images/items/sword1.png",
-        "codes": "sword, sword1, swordupgrade"
+        "codes": "sword, sword1, swordupgrade, gallery"
       },
       {
         "img": "images/items/sword2.png",
-        "codes": "swordupgrade, sword2, royalsword"
+        "codes": "swordupgrade, sword2, royalsword, gallery"
       },
       {
         "img": "images/items/Master Sword.png",
-        "codes": "swordupgrade, sword3, mastersword"
+        "codes": "swordupgrade, sword3, mastersword, gallery"
       }
     ]
   },

diff --git a/var_archipelago/locations/overworld.json b/var_archipelago/locations/overworld.json
@@ -1606,17 +1606,14 @@
                         ]
                     },
                     {
-                        "name": "Nuun Cave - Ricky",
+                        "name": "Nuun Highlands Cave",
                         "access_rules": [
                             "$nuuncave"
                         ],
                         "sections": [
                             {
                                 "name": "",
                                 "item_count": 1,
-                                "visibility_rules": [
-                                    "nuun_ricky"
-                                ],
                                 "access_rules": []
                             }
                         ],
@@ -1630,57 +1627,11 @@
                                 "map": "animal_regions",
                                 "x": 407,
                                 "y": 214
-                            }
-                        ]
-                    },
-                    {
-                        "name": "Nuun Cave - Dimitri",
-                        "access_rules": [
-                            "$nuuncave"
-                        ],
-                        "sections": [
-                            {
-                                "name": "",
-                                "item_count": 1,
-                                "visibility_rules": [
-                                    "nuun_dimitri"
-                                ],
-                                "access_rules": []
-                            }
-                        ],
-                        "map_locations": [
-                            {
-                                "map": "map",
-                                "x": 1207,
-                                "y": 343
                             },
                             {
                                 "map": "animal_regions",
                                 "x": 831,
                                 "y": 278
-                            }
-                        ]
-                    },
-                    {
-                        "name": "Nuun Cave - Moosh",
-                        "access_rules": [
-                            "$nuuncave"
-                        ],
-                        "sections": [
-                            {
-                                "name": "",
-                                "item_count": 1,
-                                "visibility_rules": [
-                                    "nuun_moosh"
-                                ],
-                                "access_rules": []
-                            }
-                        ],
-                        "map_locations": [
-                            {
-                                "map": "map",
-                                "x": 1207,
-                                "y": 343
                             },
                             {
                                 "map": "animal_regions",
@@ -2407,10 +2358,10 @@
                         "name": "Goron Shooting Gallery",
                         "access_rules": [
                             //from Lynna, swimming
-                            "$lynna_village, feather, mermaid, currents, hook1, sword, bracelet",
-                            "$lynna_village, ages, mermaid, hook1, sword",
+                            "$lynna_village, feather, mermaid, currents, hook1, gallery, bracelet",
+                            "$lynna_village, ages, mermaid, hook1, gallery",
                             //from Moblin cave
-                            "$west_ridge_present, $jump3, bracelet, currents, hook1, sword"
+                            "$west_ridge_present, $jump3, bracelet, currents, hook1, gallery"
                         ],
                         "sections": [
                             {

diff --git a/var_archipelago/scripts/logic/dungeons.lua b/var_archipelago/scripts/logic/dungeons.lua
@@ -473,7 +473,7 @@ function d8_tileroom()
 end
 
 function d8_boss()
-    return has("d8bk") and d8_tileroom() and has("d8slate",4)
+    return has("d8bk") and d8_tileroom() and has("d8slate",4) and has("gallery")
 end
 
 -- dungeon full clear functions

diff --git a/var_archipelago/scripts/logic/dungeons_hard.lua b/var_archipelago/scripts/logic/dungeons_hard.lua
@@ -303,5 +303,5 @@ function d8_tileroom_h()
 end
 
 function d8_boss_h()
-    return has("d8bk") and d8_tileroom_h() and has("d8slate",4)
+    return has("d8bk") and d8_tileroom_h() and has("d8slate",4) and has("gallery")
 end
diff --git a/var_archipelago/scripts/logic/labrynna.lua b/var_archipelago/scripts/logic/labrynna.lua
@@ -114,7 +114,7 @@ end
 
 -- crescent island
 function crescentpast()
-    return has("raft") or (lynna_city() and mermaid()) or (crescentpresentwest() and echoes())
+    return has("raft") or (lynna_city() and mermaid()) or (crescentpresentwest() and currents())
 end
 
 function tokaycrystalcave()

diff --git a/versions.json b/versions.json
@@ -1,5 +1,16 @@
 {
     "versions": [
+        {
+            "package_version": "0.7.2",
+            "download_url": "https://github.com/Br00ty/ooa_brooty/releases/download/0.7.2/ooa_brooty.zip",
+            "sha256": "c6f80a1474b898ad90e84c1ed240e623bc0f89602a039f6d522037feff6cead4",
+            "changelog": [
+                "fixed crescent island logic (needed currents not echoes)",
+                "adjusted logic for goron sword, cant use it for shooting gallery or ramrock",
+                "shifted item ids to accomodate new zora potion",
+                "fixed autotracking for nuun highlands chest"
+            ]
+        },
         {
             "package_version": "0.7.1.2",
             "download_url": "https://github.com/Br00ty/ooa_brooty/releases/download/0.7.1.2/ooa_brooty.zip",