From 9c534538a1e26d557bd97024adda59a98f4ed88d Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 13 Apr 2021 09:30:48 +0200 Subject: [PATCH] fixed bottles when using minimal for broadcast --- ootrando_overworldmap_hamsda/changelog.md | 1 + ootrando_overworldmap_hamsda/items/items.json | 4 ++-- .../scripts/update_shared.lua | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md index c0aeb11a..47358ce8 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/ootrando_overworldmap_hamsda/changelog.md @@ -6,6 +6,7 @@ - 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 diff --git a/ootrando_overworldmap_hamsda/items/items.json b/ootrando_overworldmap_hamsda/items/items.json index bad7ca8f..69b4e102 100644 --- a/ootrando_overworldmap_hamsda/items/items.json +++ b/ootrando_overworldmap_hamsda/items/items.json @@ -671,11 +671,11 @@ "stages": [ { "img": "images/bottle.png", - "codes": "bottleminimal,bottle" + "codes": "bottleminimal" }, { "img": "images/bottle_letter.png", - "codes": "ruto,rutosletter" + "codes": "rutominimal" } ] }, diff --git a/ootrando_overworldmap_hamsda/scripts/update_shared.lua b/ootrando_overworldmap_hamsda/scripts/update_shared.lua index 30dcdc79..32b1fce4 100644 --- a/ootrando_overworldmap_hamsda/scripts/update_shared.lua +++ b/ootrando_overworldmap_hamsda/scripts/update_shared.lua @@ -245,6 +245,21 @@ function update_collected_capture() end end +function update_minimal_bottle() + if has_map then + local minimal_bottle = get_object("bottleminimal") + if minimal_bottle then + if has("ruto") then + minimal_bottle.CurrentStage = 2 + elseif has("bottle") then + minimal_bottle.CurrentStage = 1 + else + minimal_bottle.CurrentStage = 0 + end + end + end +end + function update_free_zelda() local kid_trade = get_kid_trade() local setting_zelda = has("setting_zelda_free") @@ -309,6 +324,7 @@ function tracker_on_accessibility_updated() update_lacs_amount_max() update_fortress() update_collected_capture() + update_minimal_bottle() update_free_zelda() update_vanilla_captures()