Skip to content

Commit

Permalink
first update
Browse files Browse the repository at this point in the history 
removed tokay market, fixed middle man, seperated tuni nuts
  • Loading branch information
@Br00ty
Br00ty committed Sep 8, 2024
1 parent 1316d8f commit 1431be3
Show file tree
Hide file tree
Showing 11 changed files with 103 additions and 65 deletions.
Binary file added images/items/bothtuni_a.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/items/bothtuni_b.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/items/bothtuni_c.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/items/bothtuni_d.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions manifest.json
View file
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions scripts/autotracking/item_mapping.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions scripts/autotracking/location_mapping.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/"},
Expand All @@ -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/"},
Expand Down Expand Up @@ -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/"},
Expand Down
57 changes: 50 additions & 7 deletions var_archipelago/items/items.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion var_archipelago/layouts/items.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
],
[
"gravekey",
"tuninut",
"bothtuninuts",
"crownkey",
"d6keypast",
"d6keypresent",
Expand Down
81 changes: 33 additions & 48 deletions var_archipelago/locations/overworld.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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
}
]
},
Expand Down Expand Up @@ -1783,7 +1768,7 @@
{
"name": "",
//"name": "Climb the wall to restore the tuninut",
"hosted_item": "repairednut",
"item_count": 1,
"access_rules": []
}
],
Expand Down
10 changes: 10 additions & 0 deletions versions.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 1431be3

Please sign in to comment.