diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index f3d3e3c3..6c332171 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 1b15be57..ca84923a 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/ootrando_overworldmap_hamsda/changelog.md @@ -1,5 +1,10 @@ # Changelog +## 3.7.3.0 + +- updated `user_presets` +- added back left click behavior to free reward when `ALTAR_QUICK_MARK` user setting is off + ## 3.7.2.0 - added ability to load boolean settings for `user_presets` diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index 434f976f..3c90d446 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": "3.7.2.0", + "package_version": "3.7.3.0", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/scripts/custom_dungeon_reward.lua b/ootrando_overworldmap_hamsda/scripts/custom_dungeon_reward.lua index 3e2639c7..eafd4058 100644 --- a/ootrando_overworldmap_hamsda/scripts/custom_dungeon_reward.lua +++ b/ootrando_overworldmap_hamsda/scripts/custom_dungeon_reward.lua @@ -42,8 +42,8 @@ local images = { "images/lightmedallion.png" } -local quickOrder = {6, 3, 4, 4, 5, 5} -local quickMode = nil +local quickModeOrder = {6, 3, 4, 4, 5, 5} +local quickModeActive = nil function DungeonReward:init(number) self:createItem(names[number]) @@ -75,7 +75,13 @@ end function DungeonReward:onLeftClick() if self.number == 1 then if ALTAR_QUICK_MARK then - quickMode = 1 + quickModeActive = 1 + else + if self:getProperty("stage") <= 1 then + self:setProperty("stage", #rewards) + else + self:setProperty("stage", self:getProperty("stage") - 1) + end end else self:setProperty("active", not self:getProperty("active")) @@ -84,12 +90,12 @@ end function DungeonReward:onRightClick() if self:getProperty("stage") then - if quickMode then - self:setProperty("stage", quickOrder[quickMode]) - if quickMode >= #quickOrder then - quickMode = nil + if quickModeActive then + self:setProperty("stage", quickModeOrder[quickModeActive]) + if quickModeActive >= #quickModeOrder then + quickModeActive = nil else - quickMode = quickMode + 1 + quickModeActive = quickModeActive + 1 end else if self:getProperty("stage") >= #rewards then diff --git a/ootrando_overworldmap_hamsda/scripts/custom_presets.lua b/ootrando_overworldmap_hamsda/scripts/custom_presets.lua index 5f6c8dd4..1475b5ae 100644 --- a/ootrando_overworldmap_hamsda/scripts/custom_presets.lua +++ b/ootrando_overworldmap_hamsda/scripts/custom_presets.lua @@ -47,6 +47,8 @@ function PresetLoader:onRightClick() setting_object.AcquiredCount = value elseif type(setting_object.Active) == "boolean" then setting_object.Active = value + elseif type(setting_object.ItemState) == "table" then + setting_object.ItemState:setProperty("active", value) end end end diff --git a/ootrando_overworldmap_hamsda/scripts/globals.lua b/ootrando_overworldmap_hamsda/scripts/globals.lua index c8671a9c..02585b63 100644 --- a/ootrando_overworldmap_hamsda/scripts/globals.lua +++ b/ootrando_overworldmap_hamsda/scripts/globals.lua @@ -2,6 +2,7 @@ VARIANT = Tracker.ActiveVariantUID HAS_MAP = VARIANT ~= "var_minimalist" and (not VARIANT:find("itemsonly")) HAS_KEYS = VARIANT:find("keysanity") HAS_ER = VARIANT:find("entrance") +PACK_READY = false ACCESS_LEVEL = { [0] = AccessibilityLevel.None, diff --git a/ootrando_overworldmap_hamsda/scripts/load_updaters.lua b/ootrando_overworldmap_hamsda/scripts/load_updaters.lua index c73e836a..959da94f 100644 --- a/ootrando_overworldmap_hamsda/scripts/load_updaters.lua +++ b/ootrando_overworldmap_hamsda/scripts/load_updaters.lua @@ -8,17 +8,18 @@ if HAS_MAP then end end -loading_save_file = false function tracker_on_begin_loading_save_file() - loading_save_file = true + PACK_READY = false end function tracker_on_finish_loading_save_file() - loading_save_file = false +end + +function tracker_on_accessibility_updating() end function tracker_on_accessibility_updated() - if not loading_save_file then + if PACK_READY then clear_amount_cache() if update_items then @@ -37,4 +38,6 @@ function tracker_on_accessibility_updated() end end ---tracker_on_accessibility_updated() +function tracker_on_pack_ready() + PACK_READY = true +end diff --git a/ootrando_overworldmap_hamsda/scripts/user_presets.lua b/ootrando_overworldmap_hamsda/scripts/user_presets.lua index 85421ec9..766645d1 100644 --- a/ootrando_overworldmap_hamsda/scripts/user_presets.lua +++ b/ootrando_overworldmap_hamsda/scripts/user_presets.lua @@ -1,6 +1,6 @@ setting_presets = { { - ["name"] = "S5", + ["name"] = "S6", ["color"] = "#00ffff", ["icon"] = "images/sword1.png", ["settings"] = { @@ -41,6 +41,7 @@ setting_presets = { ["setting_hints"] = 3, ["setting_damage"] = 1, ["setting_skulltulas_sun"] = 0, + --tricks ["logic_fewer_tunic_requirements"] = true, ["logic_grottos_without_agony"] = true, ["logic_child_deadhand"] = true, @@ -55,21 +56,93 @@ setting_presets = { ["logic_lens_gtg"] = true, ["logic_lens_shadow"] = true, ["logic_lens_shadow_back"] = true, - ["logic_lens_spirit"] = true + ["logic_lens_spirit"] = true, + --items + ["shield1"] = true, + ["sticks"] = 1, + ["nuts"] = 1 + } + }, + { + ["name"] = "RSL", + ["color"] = "#ffbb00", + ["icon"] = "images/icetrap.png", + ["settings"] = { + ["setting_forest"] = 2, + ["setting_kak"] = 0, + ["setting_door"] = 1, + ["setting_fountain"] = 2, + ["setting_gerudo"] = 2, + ["setting_bridge"] = 0, + ["setting_bridge_amount"] = 0, + ["setting_trials"] = 0, + ["setting_age"] = 0, + ["setting_entrance_interiors"] = 2, + ["setting_entrance_grottos"] = 1, + ["setting_entrance_dungeons"] = 1, + ["setting_entrance_overworld"] = 1, + ["setting_entrance_mixed"] = 2, + ["setting_entrance_owl"] = 1, + ["setting_entrance_warpsong"] = 1, + ["setting_entrance_spawn"] = 1, + ["setting_logic_chus"] = 1, + ["setting_shopsanity"] = 1, + ["setting_tokens_off"] = 3, + ["setting_scrub_shuffle"] = 1, + ["setting_cowsanity"] = 1, + ["setting_shuffle_sword1"] = 1, + ["setting_shuffle_ocarinas"] = 1, + ["setting_shuffle_egg"] = 1, + ["setting_shuffle_card"] = 1, + ["setting_shuffle_beans"] = 1, + ["setting_shuffle_merchants"] = 1, + ["setting_shuffle_smallkeys"] = 1, + ["setting_shuffle_hideoutkeys"] = 1, + ["setting_shuffle_bosskeys"] = 1, + ["setting_shuffle_ganon_bosskey"] = 1, + ["setting_zelda"] = 0, + ["setting_masks"] = 0, + ["setting_hints"] = 3, + ["setting_damage"] = 1, + ["setting_skulltulas_sun"] = 0, + --tricks + ["logic_fewer_tunic_requirements"] = true, + ["logic_grottos_without_agony"] = true, + ["logic_child_deadhand"] = true, + ["logic_man_on_roof"] = true, + ["logic_dc_jump"] = true, + ["logic_rusted_switches"] = true, + ["logic_windmill_poh"] = true, + ["logic_crater_bean_poh_with_hovers"] = true, + ["logic_forest_vines"] = true, + ["logic_goron_city_pot_with_strength"] = true, + ["logic_lens_botw"] = true, + ["logic_lens_castle"] = true, + ["logic_lens_gtg"] = true, + ["logic_lens_shadow"] = true, + ["logic_lens_shadow_back"] = true, + ["logic_lens_spirit"] = true, + ["logic_visible_collisions"] = true, + ["logic_deku_b1_webs_with_bow"] = true, + ["logic_lens_gtg_mq"] = true, + ["logic_lens_jabu_mq"] = true, + ["logic_lens_shadow_mq"] = true, + ["logic_lens_shadow_mq_back"] = true, + ["logic_lens_spirit_mq"] = true } }, { - ["name"] = "Leag", - ["color"] = "#ffaaff", - ["icon"] = "images/lens.png", + ["name"] = "Scrb", + ["color"] = "#97f05b", + ["icon"] = "images/deku_scrub.png", ["settings"] = { ["setting_forest"] = 2, ["setting_kak"] = 0, ["setting_door"] = 1, ["setting_fountain"] = 0, ["setting_gerudo"] = 1, - ["setting_bridge"] = 3, - ["setting_bridge_amount"] = 6, + ["setting_bridge"] = 2, + ["setting_bridge_amount"] = 3, ["setting_trials"] = 0, ["setting_age"] = 0, ["setting_entrance_interiors"] = 0, @@ -79,7 +152,7 @@ setting_presets = { ["setting_entrance_mixed"] = 0, ["setting_entrance_owl"] = 0, ["setting_entrance_warpsong"] = 0, - ["setting_entrance_spawn"] = 0, + ["setting_entrance_spawn"] = 1, ["setting_logic_chus"] = 0, ["setting_shopsanity"] = 0, ["setting_tokens_off"] = 0, @@ -100,60 +173,73 @@ setting_presets = { ["setting_hints"] = 3, ["setting_damage"] = 1, ["setting_skulltulas_sun"] = 0, + --tricks ["logic_fewer_tunic_requirements"] = true, ["logic_grottos_without_agony"] = true, + ["logic_child_deadhand"] = true, + ["logic_man_on_roof"] = true, + ["logic_dc_jump"] = true, ["logic_rusted_switches"] = true, + ["logic_windmill_poh"] = true, + ["logic_crater_bean_poh_with_hovers"] = true, ["logic_forest_vines"] = true, ["logic_lens_botw"] = true, ["logic_lens_castle"] = true, ["logic_lens_gtg"] = true, ["logic_lens_shadow"] = true, ["logic_lens_shadow_back"] = true, - ["logic_lens_spirit"] = true + ["logic_lens_spirit"] = true, + --items + ["lens"] = true, + ["shield1"] = true, + ["prelude"] = true, + ["sticks"] = 1, + ["nuts"] = 1 } }, { - ["name"] = "RSL", - ["color"] = "#ffbb00", - ["icon"] = "images/icetrap.png", + ["name"] = "MW", + ["color"] = "#fc035a", + ["icon"] = "images/farore.png", ["settings"] = { ["setting_forest"] = 2, ["setting_kak"] = 0, ["setting_door"] = 1, - ["setting_fountain"] = 2, - ["setting_gerudo"] = 2, - ["setting_bridge"] = 0, - ["setting_bridge_amount"] = 0, + ["setting_fountain"] = 0, + ["setting_gerudo"] = 1, + ["setting_bridge"] = 3, + ["setting_bridge_amount"] = 6, ["setting_trials"] = 0, - ["setting_age"] = 0, - ["setting_entrance_interiors"] = 2, - ["setting_entrance_grottos"] = 1, - ["setting_entrance_dungeons"] = 1, - ["setting_entrance_overworld"] = 1, - ["setting_entrance_mixed"] = 2, - ["setting_entrance_owl"] = 1, - ["setting_entrance_warpsong"] = 1, - ["setting_entrance_spawn"] = 1, - ["setting_logic_chus"] = 1, + ["setting_age"] = 1, + ["setting_entrance_interiors"] = 0, + ["setting_entrance_grottos"] = 0, + ["setting_entrance_dungeons"] = 0, + ["setting_entrance_overworld"] = 0, + ["setting_entrance_mixed"] = 0, + ["setting_entrance_owl"] = 0, + ["setting_entrance_warpsong"] = 0, + ["setting_entrance_spawn"] = 0, + ["setting_logic_chus"] = 0, ["setting_shopsanity"] = 1, - ["setting_tokens_off"] = 3, + ["setting_tokens_off"] = 0, ["setting_scrub_shuffle"] = 1, - ["setting_cowsanity"] = 1, + ["setting_cowsanity"] = 0, ["setting_shuffle_sword1"] = 1, - ["setting_shuffle_ocarinas"] = 1, - ["setting_shuffle_egg"] = 1, - ["setting_shuffle_card"] = 1, - ["setting_shuffle_beans"] = 1, - ["setting_shuffle_merchants"] = 1, - ["setting_shuffle_smallkeys"] = 1, - ["setting_shuffle_hideoutkeys"] = 1, - ["setting_shuffle_bosskeys"] = 1, - ["setting_shuffle_ganon_bosskey"] = 1, - ["setting_zelda"] = 0, + ["setting_shuffle_ocarinas"] = 0, + ["setting_shuffle_egg"] = 0, + ["setting_shuffle_card"] = 0, + ["setting_shuffle_beans"] = 0, + ["setting_shuffle_merchants"] = 0, + ["setting_shuffle_smallkeys"] = 0, + ["setting_shuffle_hideoutkeys"] = 0, + ["setting_shuffle_bosskeys"] = 0, + ["setting_shuffle_ganon_bosskey"] = 0, + ["setting_zelda"] = 1, ["setting_masks"] = 0, ["setting_hints"] = 3, ["setting_damage"] = 1, ["setting_skulltulas_sun"] = 0, + --tricks ["logic_fewer_tunic_requirements"] = true, ["logic_grottos_without_agony"] = true, ["logic_child_deadhand"] = true, @@ -163,20 +249,18 @@ setting_presets = { ["logic_windmill_poh"] = true, ["logic_crater_bean_poh_with_hovers"] = true, ["logic_forest_vines"] = true, - ["logic_goron_city_pot_with_strength"] = true, + ["logic_dc_scarecrow_gs"] = true, ["logic_lens_botw"] = true, ["logic_lens_castle"] = true, ["logic_lens_gtg"] = true, ["logic_lens_shadow"] = true, ["logic_lens_shadow_back"] = true, ["logic_lens_spirit"] = true, - ["logic_visible_collisions"] = true, - ["logic_deku_b1_webs_with_bow"] = true, - ["logic_lens_gtg_mq"] = true, - ["logic_lens_jabu_mq"] = true, - ["logic_lens_shadow_mq"] = true, - ["logic_lens_shadow_mq_back"] = true, - ["logic_lens_spirit_mq"] = true + --items + ["lens"] = true, + ["faroreswind"] = true, + ["sticks"] = 1, + ["nuts"] = 1 } } } \ No newline at end of file diff --git a/repository.json b/repository.json index b749cc72..b7ea4c6a 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "3.7.2.0", + "version": "3.7.3.0", "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",