Skip to content

Commit

Permalink
big update
Browse files Browse the repository at this point in the history
made maku path a dungeon, fixed some logic, early early start to medium logic, added some pictures and cute shit n shit
  • Loading branch information
Br00ty committed Sep 14, 2024
1 parent b346eac commit a020ebd
Show file tree
Hide file tree
Showing 16 changed files with 260 additions and 111 deletions.
Binary file added images/dungeons/d0_entrance.png
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/l_med.png
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/maps/maku_path.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion manifest.json
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.2",
"package_version": "0.7.3",
"package_uid": "ooa_brooty",
"author": "Brooty",
"variants": {
Expand Down
24 changes: 15 additions & 9 deletions maps/maps.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,55 +13,55 @@
},
{
"name": "d1",
"location_size": 28,
"location_size": 32,
"location_border_thickness": 6,
"img": "images/maps/d1.png"
},
{
"name": "d2",
"location_size": 28,
"location_size": 32,
"location_border_thickness": 6,
"img": "images/maps/d2.png"
},
{
"name": "d3",
"location_size": 22,
"location_size": 26,
"location_border_thickness": 5,
"img": "images/maps/d3.png"
},
{
"name": "d4",
"location_size": 28,
"location_size": 32,
"location_border_thickness": 6,
"img": "images/maps/d4.png"
},
{
"name": "d5",
"location_size": 28,
"location_size": 32,
"location_border_thickness": 6,
"img": "images/maps/d5.png"
},
{
"name": "d6_1",
"location_size": 28,
"location_size": 32,
"location_border_thickness": 6,
"img": "images/maps/d6_1.png"
},
{
"name": "d6_2",
"location_size": 28,
"location_size": 32,
"location_border_thickness": 6,
"img": "images/maps/d6_2.png"
},
{
"name": "d7",
"location_size": 28,
"location_size": 32,
"location_border_thickness": 6,
"img": "images/maps/d7.png"
},
{
"name": "d8",
"location_size": 28,
"location_size": 32,
"location_border_thickness": 6,
"img": "images/maps/d8.png"
},
Expand All @@ -70,5 +70,11 @@
"location_size": 28,
"location_border_thickness": 6,
"img": "images/maps/gridmaps.png"
},
{
"name": "d0",
"location_size": 28,
"location_border_thickness": 6,
"img": "images/maps/maku_path.png"
}
]
8 changes: 4 additions & 4 deletions scripts/autotracking/archipelago.lua
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ function onClear(slot_data)
end

if slot_data["logic_difficulty"] then
if slot_data["logic_difficulty"] == "0" then
if slot_data["logic_difficulty"] == 0 then
Tracker:FindObjectForCode("logic").CurrentStage = 0
elseif slot_data["logic_difficulty"] == 1 then
Tracker:FindObjectForCode("logic").CurrentStage = 1
--elseif slot_data["logic_difficulty"] == "1" then
--Tracker:FindObjectForCode("logic").CurrentStage = 2
elseif slot_data["logic_difficulty"] == "2" then
elseif slot_data["logic_difficulty"] == 2 then
Tracker:FindObjectForCode("logic").CurrentStage = 2
end
end
Expand Down
6 changes: 3 additions & 3 deletions scripts/autotracking/location_mapping.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {"@Overworld/Lynna|South Shore|Palace/Maku Path/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] = {"@Overworld/Lynna|South Shore|Palace/Maku Path/Key Chest"},
[BASE + 104] = {"@Overworld/Lynna|South Shore|Palace/Maku Path/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/"},
Expand Down
Loading

0 comments on commit a020ebd

Please sign in to comment.