Skip to content

Commit

Permalink
Merge pull request #114 from Hamsda:ootr
Browse files Browse the repository at this point in the history
update to version 3.4.1.0
  • Loading branch information
Hamsda authored Apr 13, 2021
2 parents ff1bc86 + a7e6d65 commit 9be8a25
Show file tree
Hide file tree
Showing 12 changed files with 123 additions and 186 deletions.
Binary file modified ootrando_overworldmap_hamsda.zip
Binary file not shown.
8 changes: 8 additions & 0 deletions ootrando_overworldmap_hamsda/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 3.4.1.0

- fixed missing LACS condition setting in ER
- fixed GS counter after moving some GS around
- fixed short names for LLR GS and Kak Child GS
- added KZ skip as sequence break
- fixed bottles when using minimal for broadcast

## 3.4.0.0

- updated minimal layout (can now use this one as broadcast layout for the regular map tracker)
Expand Down
4 changes: 2 additions & 2 deletions ootrando_overworldmap_hamsda/items/items.json
Original file line number Diff line number Diff line change
Expand Up @@ -671,11 +671,11 @@
"stages": [
{
"img": "images/bottle.png",
"codes": "bottleminimal,bottle"
"codes": "bottleminimal"
},
{
"img": "images/bottle_letter.png",
"codes": "ruto,rutosletter"
"codes": "rutominimal"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions ootrando_overworldmap_hamsda/layouts/options_entrance.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
"setting_bridge_amount",
"setting_entrance_warpsong",
"",
"",
"setting_lacs",
""
],
[
"setting_logic_chus",
"setting_entrance_spawn",
"",
"",
"setting_lacs_amount",
""
],
[
Expand Down
18 changes: 9 additions & 9 deletions ootrando_overworldmap_hamsda/locations/overworld.json
Original file line number Diff line number Diff line change
Expand Up @@ -1630,7 +1630,7 @@
"sections": [
{
"name": "LLR GS Tree",
"short_name": "GS",
"short_name": "Tree",
"access_rules": [
"$has_age|child"
],
Expand All @@ -1643,7 +1643,7 @@
},
{
"name": "LLR GS Rain Shed (N)",
"short_name": "GS",
"short_name": "Rain Shed",
"access_rules": [
"$has_age|child,$night_gs"
],
Expand All @@ -1656,7 +1656,7 @@
},
{
"name": "LLR GS House Window (N)",
"short_name": "GS",
"short_name": "House Window",
"access_rules": [
"$has_age|child,$night_gs,boomerang",
"{$has_age|child,sling}",
Expand All @@ -1672,7 +1672,7 @@
},
{
"name": "LLR GS Back Wall (N)",
"short_name": "GS",
"short_name": "Back Wall",
"access_rules": [
"$has_age|child,$night_gs,boomerang",
"{$has_age|child,sling}",
Expand Down Expand Up @@ -2179,7 +2179,7 @@
"sections": [
{
"name": "Kak GS Tree (N)",
"short_name": "GS",
"short_name": "Tree",
"access_rules": [
"$has_age|child,$night_gs"
],
Expand All @@ -2192,7 +2192,7 @@
},
{
"name": "Kak GS Skulltula House (N)",
"short_name": "GS",
"short_name": "Skulltula House",
"access_rules": [
"$has_age|child,$night_gs"
],
Expand All @@ -2205,7 +2205,7 @@
},
{
"name": "Kak GS House Under Construction (N)",
"short_name": "GS",
"short_name": "Construction",
"access_rules": [
"$has_age|child,$night_gs"
],
Expand All @@ -2218,7 +2218,7 @@
},
{
"name": "Kak GS Guards House (N)",
"short_name": "GS",
"short_name": "Guards House",
"access_rules": [
"$has_age|child,$night_gs"
],
Expand All @@ -2231,7 +2231,7 @@
},
{
"name": "Kak GS Watchtower (N)",
"short_name": "GS",
"short_name": "Watchtower",
"access_rules": [
"$has_age|child,$night_gs,sling",
"$has_age|child,$night_gs,$has_bombchus",
Expand Down
2 changes: 1 addition & 1 deletion ootrando_overworldmap_hamsda/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "OoT Randomizer - Map and Item Tracker",
"game_name": "Ocarina of Time Randomizer",
"package_version": "3.4.0.0",
"package_version": "3.4.1.0",
"package_uid": "ootrando_overworldmap_hamsda",
"author": "Hamsda",
"variants": {
Expand Down
13 changes: 7 additions & 6 deletions ootrando_overworldmap_hamsda/scripts/logic.lua
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ function _gerudo_bridge()
end
if
has("longshot") or has("ocarina") and has("epona") or has("gerudo_fortress_open") or
(has("setting_shuffle_card_no") and has("card")) or
spawn_access("Gerudo Fortress", "adult") > 0
then
return 1, AccessibilityLevel.Normal
Expand Down Expand Up @@ -703,14 +704,14 @@ function adult_fountain()
return 1, level
end

--handing in letter
local child_count, child_level = child_fountain()
if child_count == 0 then
return 0, AccessibilityLevel.None
end
if child_level == AccessibilityLevel.SequenceBreak then
level = AccessibilityLevel.SequenceBreak
if child_count > 0 and child_level == AccessibilityLevel.Normal then
return 1, level
end
return 1, level

--KZ skip
return 1, AccessibilityLevel.SequenceBreak
end

function has_bottle()
Expand Down
32 changes: 24 additions & 8 deletions ootrando_overworldmap_hamsda/scripts/logic_entrance.lua
Original file line number Diff line number Diff line change
@@ -1,25 +1,41 @@
access_level = {
[0] = AccessibilityLevel.None,
[1] = AccessibilityLevel.Partial,
[3] = AccessibilityLevel.Inspect,
[5] = AccessibilityLevel.SequenceBreak,
[6] = AccessibilityLevel.Normal,
[7] = AccessibilityLevel.Cleared,
[AccessibilityLevel.None] = 0,
[AccessibilityLevel.Partial] = 1,
[AccessibilityLevel.Inspect] = 3,
[AccessibilityLevel.SequenceBreak] = 5,
[AccessibilityLevel.Normal] = 6,
[AccessibilityLevel.Cleared] = 7
}
function or_accessibility(...)
local level = AccessibilityLevel.None
local max_level = 0
for _, data in ipairs({...}) do
if data == AccessibilityLevel.Normal then
return AccessibilityLevel.Normal
elseif level == AccessibilityLevel.None and data == AccessibilityLevel.SequenceBreak then
level = AccessibilityLevel.SequenceBreak
end
if access_level[data] > max_level then
max_level = access_level[data]
end
end
return level
return access_level[max_level]
end

function and_accessibility(...)
local level = AccessibilityLevel.Normal
local min_level = 6
for _, data in ipairs({...}) do
if data == AccessibilityLevel.None then
return AccessibilityLevel.None
elseif data == AccessibilityLevel.SequenceBreak then
level = AccessibilityLevel.SequenceBreak
end
if access_level[data] < min_level then
min_level = access_level[data]
end
end
return level
return access_level[min_level]
end

function can_leave_forest()
Expand Down
Loading

0 comments on commit 9be8a25

Please sign in to comment.