diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index de128f98..251e7d28 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md index 30e028a7..b29a03fb 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/ootrando_overworldmap_hamsda/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 2.9.5.1 + +- fixed error in bombchu function + ## 2.9.5.0 - added more logic tricks diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index 93bc24c5..939c4769 100644 --- a/ootrando_overworldmap_hamsda/manifest.json +++ b/ootrando_overworldmap_hamsda/manifest.json @@ -1,7 +1,7 @@ { "name": "OoT Randomizer - Map and Item Tracker", "game_name": "Ocarina of Time Randomizer", - "package_version": "2.9.5.0", + "package_version": "2.9.5.1", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/scripts/logic.lua b/ootrando_overworldmap_hamsda/scripts/logic.lua index f0cd2eac..84c002ad 100644 --- a/ootrando_overworldmap_hamsda/scripts/logic.lua +++ b/ootrando_overworldmap_hamsda/scripts/logic.lua @@ -75,6 +75,7 @@ function has_bombchus() return chus, AccessibilityLevel.SequenceBreak end end + return 0, AccessibilityLevel.None end function has_explosives() @@ -708,14 +709,30 @@ function has_projectile(age) local bow = has("bow") local hook = has("hookshot") + local result = false + if age == "child" then - return explo or sling or rang + if explo or sling or rang then + result = true + end elseif age == "adult" then - return explo or bow or hook + if explo or bow or hook then + result = true + end elseif age == "both" then - return explo or (bow or hook) and (sling or rang) + if explo or (bow or hook) and (sling or rang) then + result = true + end else - return explo or (bow or hook) or (sling or rang) + if explo or (bow or hook) or (sling or rang) then + result = true + end + end + + if result then + return 1, AccessibilityLevel.Normal + else + return 0, AccessibilityLevel.None end end diff --git a/repository.json b/repository.json index d6c578e7..da7c5ab6 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.9.5.0", + "version": "2.9.5.1", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/EmoTrackerPacks/ootrando_overworldmap_hamsda.zip", "documentation_url": "https://github.com/Hamsda/EmoTrackerPacks/blob/master/ootrando_overworldmap_hamsda/README.md",