From 1431be31d0cec86a25aa47dab68f76de5eb2991c Mon Sep 17 00:00:00 2001 From: Brooty Johnson Date: Sun, 8 Sep 2024 12:13:20 -0400 Subject: [PATCH] first update removed tokay market, fixed middle man, seperated tuni nuts --- images/items/bothtuni_a.png | Bin 0 -> 6639 bytes images/items/bothtuni_b.png | Bin 0 -> 6694 bytes images/items/bothtuni_c.png | Bin 0 -> 6691 bytes images/items/bothtuni_d.png | Bin 0 -> 6648 bytes manifest.json | 5 +- scripts/autotracking/item_mapping.lua | 4 +- scripts/autotracking/location_mapping.lua | 9 ++- var_archipelago/items/items.json | 57 +++++++++++++-- var_archipelago/layouts/items.json | 2 +- var_archipelago/locations/overworld.json | 81 +++++++++------------- versions.json | 10 +++ 11 files changed, 103 insertions(+), 65 deletions(-) create mode 100644 images/items/bothtuni_a.png create mode 100644 images/items/bothtuni_b.png create mode 100644 images/items/bothtuni_c.png create mode 100644 images/items/bothtuni_d.png diff --git a/images/items/bothtuni_a.png b/images/items/bothtuni_a.png new file mode 100644 index 0000000000000000000000000000000000000000..48479b8a564fac9720be5081f23c0ae80dabce44 GIT binary patch literal 6639 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 literal 0 HcmV?d00001 diff --git a/images/items/bothtuni_b.png b/images/items/bothtuni_b.png new file mode 100644 index 0000000000000000000000000000000000000000..c22e91a202e47fa4bca69c4ef3fc29b889ea4e87 GIT binary patch literal 6694 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 aQPf)O+&$C7ZVy2+AvP8}Nrh%!k^cj)QP&gz literal 0 HcmV?d00001 diff --git a/images/items/bothtuni_c.png b/images/items/bothtuni_c.png new file mode 100644 index 0000000000000000000000000000000000000000..96ec4e25e7248ece323ede34fb4a25d3c5ec9610 GIT binary patch literal 6691 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 literal 0 HcmV?d00001 diff --git a/manifest.json b/manifest.json index 28d8885..1b34501 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Oracle of Ages Randomizer", "game_name": "Oracle of Ages", - "package_version": "0.7", + "package_version": "0.7.1", "package_uid": "ooa_brooty", "author": "Brooty", "variants": { @@ -42,5 +42,6 @@ //] } }, - "versions_url": "https://raw.githubusercontent.com/Br00ty/ooa_brooty/master/versions.json" + "versions_url": "https://raw.githubusercontent.com/Br00ty/ooa_brooty/master/versions.json", + "min_poptracker_version": "0.27.0" } diff --git a/scripts/autotracking/item_mapping.lua b/scripts/autotracking/item_mapping.lua index e06e7bb..9e591a0 100644 --- a/scripts/autotracking/item_mapping.lua +++ b/scripts/autotracking/item_mapping.lua @@ -93,8 +93,8 @@ ITEM_MAPPING = { [BASE + 108] = {"seedling", "toggle"}, [BASE + 109] = {"d8slate", "consumable"}, [BASE + 110] = {"eyeball", "toggle"}, - [BASE + 111] = {"tuniupgrade", "progressive"}, - [BASE + 112] = {"tuniupgrade", "progressive"}, + [BASE + 111] = {"tuninut", "toggle"}, + [BASE + 112] = {"repairednut", "toggle"}, [BASE + 113] = {"scale", "toggle"}, -- RINGS [BASE + 125] = {"ring_expert", "toggle"}, -- FISXED diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua index 6e3f1b8..347939c 100644 --- a/scripts/autotracking/location_mapping.lua +++ b/scripts/autotracking/location_mapping.lua @@ -25,7 +25,6 @@ LOCATION_MAPPING = { [BASE + 17] = {"@Overworld/Lynna|South Shore|Palace/Ambi's Palace/Rescue Nayru"}, [BASE + 18] = {"@Overworld/Lynna|South Shore|Palace/Maku Tree Gift/"}, [BASE + 19] = {"@Overworld/Lynna|South Shore|Palace/South Shore Dirt/"}, - -- move all of these [BASE + 20] = {"@Overworld/Lynna|South Shore|Palace/Tingle Present/"}, [BASE + 21] = {"@Overworld/Lynna|South Shore|Palace/Tingle Upgrade/"}, [BASE + 22] = {"@Overworld/Yoll Graveyard/Cheval's Test/"}, @@ -42,14 +41,14 @@ LOCATION_MAPPING = { [BASE + 33] = {"@Overworld/Crescent Island/Tokay Crystal Cave/"}, [BASE + 34] = {"@Overworld/Crescent Island/Tokay Bomb Cave/"}, [BASE + 35] = {"@Overworld/Crescent Island/Wild Tokay Game/"}, - [BASE + 36] = {"@Overworld/Crescent Island/Tokay Market/First Item"}, - [BASE + 37] = {"@Overworld/Crescent Island/Tokay Market/Second Item"}, + --[BASE + 36] = {"@Overworld/Crescent Island/Tokay Market/First Item"}, + --[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 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 Brothers/first talk to sister, then the two brothers to the NE|NW"}, + [BASE + 41] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Symmetry City Main House/Symmetry City Brothers"}, [BASE + 42] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Tokkey's Composition/"}, [BASE + 43] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Bomb Fairy/"}, [BASE + 44] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Talus Peaks Chest/"}, @@ -98,7 +97,7 @@ LOCATION_MAPPING = { [BASE + 86] = {"@Overworld/Crescent Island/Tokay Chef Trade/"}, [BASE + 87] = {"@Overworld/Fairies' Woods/Happy Mask Salesman Trade/"}, [BASE + 88] = {"@Overworld/Lynna|South Shore|Palace/Mamamu Yan Trade/"}, - [BASE + 89] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Middle Man Trade/"}, + [BASE + 89] = {"@Overworld/Nuun Highlands|Symmetry City|Talus Peaks/Symmetry City Main House/Middle Man Trade"}, [BASE + 90] = {"@Overworld/Lynna|South Shore|Palace/Comedian Trade/"}, [BASE + 91] = {"@Overworld/Lynna|South Shore|Palace/Sad Boi Trade/"}, [BASE + 92] = {"@Overworld/Yoll Graveyard/Maple Trade/"}, diff --git a/var_archipelago/items/items.json b/var_archipelago/items/items.json index 8d7621c..17ccfc5 100644 --- a/var_archipelago/items/items.json +++ b/var_archipelago/items/items.json @@ -307,17 +307,60 @@ "codes": "d1key, gravekey" }, // D4 Access + //{ + // "name": "Tuni Nut", + // "type": "progressive", + // "stages": [ + // { + // "img": "images/items/tuninut.png", + // "codes": "tuninut, tuniupgrade" + // }, + // { + // "img": "images/items/tuninut_repaired.png", + // "codes": "repairednut, tuniupgrade" + // } + // ] + //}, { - "name": "Tuni Nut", - "type": "progressive", - "stages": [ + "name": "Tuni Nut Broken", + "type": "toggle", + //"loop": true, + "img": "images/items/tuninut.png", + "codes": "tuninut" + }, + { + "name": "Tuni Nut Repaired", + "type": "toggle", + //"loop": true, + "img": "images/items/tuninut_repaired.png", + "codes": "repairednut" + }, + { + "name": "Both Tuni Nuts", + "type": "composite_toggle", + "item_left": "repairednut", + "item_right": "tuninut", + "codes": "bothtuninuts", + "images": [ { - "img": "images/items/tuninut.png", - "codes": "tuninut, tuniupgrade" + "left": false, + "right": false, + "img": "images/items/bothtuni_a.png" + }, + { + "left": true, + "right": false, + "img": "images/items/bothtuni_b.png" }, { - "img": "images/items/tuninut_repaired.png", - "codes": "repairednut, tuniupgrade" + "left": false, + "right": true, + "img": "images/items/bothtuni_c.png" + }, + { + "left": true, + "right": true, + "img": "images/items/bothtuni_d.png" } ] }, diff --git a/var_archipelago/layouts/items.json b/var_archipelago/layouts/items.json index 980364f..54bebc2 100644 --- a/var_archipelago/layouts/items.json +++ b/var_archipelago/layouts/items.json @@ -77,7 +77,7 @@ ], [ "gravekey", - "tuninut", + "bothtuninuts", "crownkey", "d6keypast", "d6keypresent", diff --git a/var_archipelago/locations/overworld.json b/var_archipelago/locations/overworld.json index 2a913bc..a38dc95 100644 --- a/var_archipelago/locations/overworld.json +++ b/var_archipelago/locations/overworld.json @@ -1133,31 +1133,31 @@ { "name": "Crescent Island", "children": [ - { - "name": "Tokay Market", - "access_rules": [ - "$crescentpast" - ], - "sections": [ - { - "name": "First Item", - "item_count": 1, - "access_rules": ["mysteryseeds"] - }, - { - "name": "Second Item", - "item_count": 1, - "access_rules": ["scentseeds"] - } - ], - "map_locations": [ - { - "map": "map", - "x": 4507, - "y": 1300 - } - ] - }, + //{ + // "name": "Tokay Market", + // "access_rules": [ + // "$crescentpast" + // ], + // "sections": [ + // { + // "name": "First Item", + // "item_count": 1, + // "access_rules": ["mysteryseeds"] + // }, + // { + // "name": "Second Item", + // "item_count": 1, + // "access_rules": ["scentseeds"] + // } + // ], + // "map_locations": [ + // { + // "map": "map", + // "x": 4507, + // "y": 1300 + // } + // ] + //}, { "name": "Tokay Crystal Cave", "access_rules": [ @@ -1714,42 +1714,27 @@ ] }, { - "name": "Symmetry City Brothers", + "name": "Symmetry City Main House", "access_rules": [ "$symmetrypast" ], "sections": [ { - "name": "first talk to sister, then the two brothers to the NE|NW", + "name": "Symmetry City Brothers", "item_count": 1, "access_rules": [] - } - ], - "map_locations": [ - { - "map": "map", - "x": 2900, - "y": 192 - } - ] - }, - { - "name": "Middle Man Trade", - "access_rules": [ - "$symmetrypast,dumbbell" - ], - "sections": [ + }, { - "name": "", + "name": "Middle Man Trade", "item_count": 1, - "access_rules": [] + "access_rules": ["dumbbell"] } ], "map_locations": [ { "map": "map", - "x": 3050, - "y": 180 + "x": 2900, + "y": 192 } ] }, @@ -1783,7 +1768,7 @@ { "name": "", //"name": "Climb the wall to restore the tuninut", - "hosted_item": "repairednut", + "item_count": 1, "access_rules": [] } ], diff --git a/versions.json b/versions.json index b07ca37..81437a9 100644 --- a/versions.json +++ b/versions.json @@ -1,5 +1,15 @@ { "versions": [ + { + "package_version": "0.7.1", + "download_url": "https://github.com/Br00ty/ooa_brooty/releases/download/0.7.1/ooa_brooty.zip", + "sha256": "e609308f1f23f1f1ec2bfb7053c12cb9a7ec9c3484203fba24b2e4ba7fd3ba53", + "changelog": [ + "removed tokay market for now since it isnt implemented", + "seperate the tuni nuts", + "fix middle man location", + ] + }, { "package_version": "0.7", "download_url": "https://github.com/Br00ty/ooa_brooty/releases/download/0.7/ooa_brooty.zip",