From fc6f1de18b3f346bb866f2d232d2af8fcf89857c Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 17 Apr 2019 02:04:57 +0200 Subject: [PATCH 1/2] changed capture layout - added an extra line for a bit more space - added ice traps and stone of agony - changed bottles to automatically fill the first available bottle slot --- changelog.md | 7 ++++ ootrando_overworldmap_hamsda/items/items.json | 12 +++++++ .../layouts/capture.json | 19 +++++++--- .../scripts/update.lua | 35 +++++++++++++++++-- 4 files changed, 67 insertions(+), 6 deletions(-) diff --git a/changelog.md b/changelog.md index 0d4bb5ab..45bd662a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## x + +- changed capture layout + - added an extra line for a bit more space + - added ice traps and stone of agony + - changed bottles to automatically fill the first available bottle slot + ## 2.3.3.5 - fixed Forest Temple outdoor west GS with hookshot from floormaster chest diff --git a/ootrando_overworldmap_hamsda/items/items.json b/ootrando_overworldmap_hamsda/items/items.json index 3b853a7e..e1ef8763 100644 --- a/ootrando_overworldmap_hamsda/items/items.json +++ b/ootrando_overworldmap_hamsda/items/items.json @@ -678,5 +678,17 @@ "codes": "ruto,rutosletter", } ], + }, + { + "name": "Bottle", + "type": "toggle", + "img": "images/bottle.png", + "codes": "bottlecapture" + }, + { + "name": "Rutos Letter", + "type": "toggle", + "img": "images/bottle_letter.png", + "codes": "rutocapture" } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/layouts/capture.json b/ootrando_overworldmap_hamsda/layouts/capture.json index c29bd8bb..806f5d6e 100644 --- a/ootrando_overworldmap_hamsda/layouts/capture.json +++ b/ootrando_overworldmap_hamsda/layouts/capture.json @@ -40,10 +40,10 @@ "bluetunic" ], [ - "HP", - "HC", - "rupee", - "bottle4", + "bottlecapture", + "rutocapture", + "", + "", "adulttrade", "kidtrade", "scale1", @@ -69,6 +69,17 @@ "nocturne", "prelude", "card", + "agony", + "icetrap" + ], + [ + "", + "", + "", + "", + "HP", + "HC", + "rupee", "generic_small_key", "generic_boss_key" ] diff --git a/ootrando_overworldmap_hamsda/scripts/update.lua b/ootrando_overworldmap_hamsda/scripts/update.lua index ed524f82..0bea1225 100644 --- a/ootrando_overworldmap_hamsda/scripts/update.lua +++ b/ootrando_overworldmap_hamsda/scripts/update.lua @@ -53,6 +53,8 @@ function update_smallkeys() end end + + vanilla_captures = { ["setting_shuffle_sword1_yes"] = { ["@Kokiri Sword Chest/Dodge Boulder"] = "sword1" @@ -71,11 +73,9 @@ vanilla_captures = { settings_cache = {} function update_captures() for setting,captures in pairs(vanilla_captures) do - local has_setting = has(setting) if not settings_cache[setting] or settings_cache[setting] ~= has_setting then settings_cache[setting] = has_setting - for location,item in pairs(captures) do local location_object = Tracker:FindObjectForCode(location) local item_object = Tracker:FindObjectForCode(item) @@ -91,7 +91,38 @@ function update_captures() end end + + +capture_bottle_mapping = { + ["bottlecapture"] = 1, + ["rutocapture"] = 2 +} +function find_first_free_bottle() + for i=1,4 do + local bottle = Tracker:FindObjectForCode("bottle"..i) + if bottle and bottle.CurrentStage == 0 then + return bottle + end + end + return nil +end +function check_capture_bottles() + for code,stage in pairs(capture_bottle_mapping) do + local capture = Tracker:FindObjectForCode(code) + if capture and capture.Active then + capture.Active = false + local bottle = find_first_free_bottle() + if bottle then + bottle.CurrentStage = stage + end + end + end +end + + + function tracker_on_accessibility_updated() update_smallkeys() update_captures() + check_capture_bottles() end \ No newline at end of file From 5e605d7f6847b3745e349aa11e97be8b7a0507bf Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 17 Apr 2019 02:07:39 +0200 Subject: [PATCH 2/2] update to version 2.3.3.6 --- changelog.md | 2 +- ootrando_overworldmap_hamsda.zip | Bin 10112738 -> 10112959 bytes ootrando_overworldmap_hamsda/manifest.json | 2 +- repository.json | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index 45bd662a..c902e8dc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## x +## 2.3.3.6 - changed capture layout - added an extra line for a bit more space diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index 0d52def525cc950301fe4b406169b88372685a3f..047e9e390ec6c2caaca80d1ef74a44a4fc4ced62 100644 GIT binary patch delta 4453 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 delta 4293 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 e#i83|CM`bb0~wA%4bDM-8_T&rv3+3Z@Sh1 diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index 29af96d8..749f6e9b 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.3.3.5", + "package_version": "2.3.3.6", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/repository.json b/repository.json index e7f219e1..c391943a 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.3.3.5", + "version": "2.3.3.6", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [