From 62efb724d2cddec514a07a2fe13832e10cfbf9de Mon Sep 17 00:00:00 2001 From: neomatamune Date: Tue, 24 Sep 2024 02:10:36 +0200 Subject: [PATCH 1/3] Updated pack for wings and anemos door updates - Autotrack anemos door using flag 0xA8B - Autotrack wings of anemos using flag 0x8DF - Moved lift + scoop check in Loho from all items to chest+tablets setting --- images/hosts/open_anemos.png | Bin 0 -> 1353 bytes images/hosts/wings.png | Bin 0 -> 1550 bytes items/progression.json | 14 +++++++++ items_only/layouts/tracker.json | 6 +++- layouts/horizontal_broadcast.json | 4 ++- layouts/items.json | 6 ++-- layouts/standard_broadcast.json | 8 +++-- layouts/vertical_broadcast.json | 4 ++- layouts/very_horizontal_broadcast.json | 4 ++- locations/locations.json | 34 ++++++++++----------- scripts/autotracking.lua | 4 +++ scripts/logic_common.lua | 39 ++++++++++++++++++------- 12 files changed, 87 insertions(+), 36 deletions(-) create mode 100644 images/hosts/open_anemos.png create mode 100644 images/hosts/wings.png diff --git a/images/hosts/open_anemos.png b/images/hosts/open_anemos.png new file mode 100644 index 0000000000000000000000000000000000000000..8c25b3f679a2d706df4d7a6ccfc3d046db70116a GIT binary patch literal 1353 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 A)&Kwi literal 0 HcmV?d00001 diff --git a/items/progression.json b/items/progression.json index 0b3c7ad..15c7b65 100644 --- a/items/progression.json +++ b/items/progression.json @@ -82,5 +82,19 @@ "img": "images/hosts/doomy.png", "codes": "doom_dragon", "disabled_img_mods": "brightness|0.5,saturation|0" + }, + { + "name": "Open Anemos Door", + "type": "toggle", + "img": "images/hosts/open_anemos.png", + "codes": "anemos_door", + "disabled_img_mods": "brightness|0.5,saturation|0" + }, + { + "name": "Wings of Anemos", + "type": "toggle", + "img": "images/hosts/wings.png", + "codes": "wings_of_anemos", + "disabled_img_mods": "brightness|0.5,saturation|0" } ] \ No newline at end of file diff --git a/items_only/layouts/tracker.json b/items_only/layouts/tracker.json index 194778e..1cb9eb1 100644 --- a/items_only/layouts/tracker.json +++ b/items_only/layouts/tracker.json @@ -25,8 +25,12 @@ "reunion" ], [ + "wings_of_anemos", "cannon", - "mars_lit", + "mars_lit" + ], + [ + "anemos_door", "doom_dragon" ] ] diff --git a/layouts/horizontal_broadcast.json b/layouts/horizontal_broadcast.json index ac61425..701029c 100644 --- a/layouts/horizontal_broadcast.json +++ b/layouts/horizontal_broadcast.json @@ -87,12 +87,14 @@ "susa", "briggs_jailbreak", "trial_road", - "jupiter_lit" + "jupiter_lit", + "wings_of_anemos" ], [ "reunion", "cannon", "mars_lit", + "anemos_door", "doom_dragon" ] ] diff --git a/layouts/items.json b/layouts/items.json index b063e7f..8bb01cd 100644 --- a/layouts/items.json +++ b/layouts/items.json @@ -126,7 +126,7 @@ { "type": "itemgrid", "h_alignment": "center", - "item_margin": "1,3", + "item_margin": "2,3", "item_size": 40, "rows": [ [ @@ -135,7 +135,8 @@ "gabomba_statue", "lemurian_ship", "susa", - "briggs_jailbreak" + "briggs_jailbreak", + "wings_of_anemos" ], [ "trial_road", @@ -143,6 +144,7 @@ "reunion", "cannon", "mars_lit", + "anemos_door", "doom_dragon" ] ] diff --git a/layouts/standard_broadcast.json b/layouts/standard_broadcast.json index 350aae7..fdddf9b 100644 --- a/layouts/standard_broadcast.json +++ b/layouts/standard_broadcast.json @@ -86,10 +86,14 @@ ], [ "reunion", - "cannon" + "wings_of_anemos" ], [ - "mars_lit", + "cannon", + "mars_lit" + ], + [ + "anemos_door", "doom_dragon" ] ] diff --git a/layouts/vertical_broadcast.json b/layouts/vertical_broadcast.json index 58d3295..7405e4d 100644 --- a/layouts/vertical_broadcast.json +++ b/layouts/vertical_broadcast.json @@ -76,12 +76,14 @@ "susa", "briggs_jailbreak", "trial_road", - "jupiter_lit" + "jupiter_lit", + "wings_of_anemos" ], [ "reunion", "cannon", "mars_lit", + "anemos_door", "doom_dragon" ] ] diff --git a/layouts/very_horizontal_broadcast.json b/layouts/very_horizontal_broadcast.json index 43637ed..26ebc20 100644 --- a/layouts/very_horizontal_broadcast.json +++ b/layouts/very_horizontal_broadcast.json @@ -72,7 +72,8 @@ "gabomba_statue", "lemurian_ship", "susa", - "briggs_jailbreak" + "briggs_jailbreak", + "wings_of_anemos" ], [ "trial_road", @@ -80,6 +81,7 @@ "reunion", "cannon", "mars_lit", + "anemos_door", "doom_dragon" ] ] diff --git a/locations/locations.json b/locations/locations.json index a8b2963..39ceb6b 100644 --- a/locations/locations.json +++ b/locations/locations.json @@ -145,7 +145,7 @@ "x": 3345, "y": 3900 }], - "access_rules": ["frost", "scoop", "lemurian_ship,briggs_battle", "whirlwind,sett_skips_oobhard,briggs_battle"], + "access_rules": ["frost", "scoop", "$canSailShip,briggs_battle", "whirlwind,sett_skips_oobhard,briggs_battle"], "sections": [ { "name": "Left Ledge", @@ -243,19 +243,19 @@ "map": "weyard", "x": 4450, "y": 3625, - "force_invisibility_rules": ["lemurian_ship"] + "force_invisibility_rules": ["$canSailShip"] }, { "map": "weyard", "x": 1660, "y": 3165, - "restrict_visibility_rules": ["lemurian_ship,grind"] + "restrict_visibility_rules": ["$canAccessWesternSeas"] }, { "map": "weyard", "x": 5965, "y": 2515, - "restrict_visibility_rules": ["lemurian_ship"] + "restrict_visibility_rules": ["$canAccessLemuria"] } ], "access_rules": ["$canAccessShip"], @@ -675,7 +675,7 @@ "x": 5295, "y": 3795 }], - "access_rules": ["$neg|sett_hide_yellows,[sand]", "sand", "sett_skips_oobeasy", "scoop_gem", "lemurian_ship"], + "access_rules": ["$neg|sett_hide_yellows,[sand]", "sand", "sett_skips_oobeasy", "scoop_gem", "$canSailShip"], "sections": [ { "name": "Reveal Circle", @@ -1071,11 +1071,11 @@ }, { "name": "Gondowan", - "access_rules": ["lemurian_ship", "briggs_battle,frost", "briggs_battle,scoop", "sett_skips_oobhard,whirlwind"], + "access_rules": ["$canSailShip", "briggs_battle,frost", "briggs_battle,scoop", "sett_skips_oobhard,whirlwind"], "children": [ { "name": "Kibombo Area", - "access_rules": ["lemurian_ship", "lash,whirlwind", "frost"], + "access_rules": ["$canSailShip", "lash,whirlwind", "frost"], "children": [ { "name": "Gabomba Catacombs", @@ -1201,7 +1201,7 @@ "capture_item": true, "hosted_item": "gabomba_statue", "visibility_rules": ["sett_show_captures"] - }, + } ], "children": [ { "name": "0xF4E" }, @@ -1251,7 +1251,7 @@ }, { "name": "Waft", - "access_rules": ["frost,growth", "{sett_show_captures,lemurian_ship}", "{sett_show_captures,lash,whirlwind}", "{sett_show_captures,frost}"], + "access_rules": ["frost,growth", "{sett_show_captures,$canSailShip}", "{sett_show_captures,lash,whirlwind}", "{sett_show_captures,frost}"], "capture_item": true, "capture_item_layout": "tracker_capture_djinni", "hosted_item": "jupiter_4" @@ -1337,7 +1337,7 @@ }, { "name": "Eastern Sea", - "access_rules": ["lemurian_ship"], + "access_rules": ["$canSailShip"], "children": [ { "name": "Ankohl Ruins", @@ -2402,7 +2402,7 @@ "x": 5965, "y": 2435 }], - "access_rules": ["lemurian_ship,grind", "$hasDjinn|24,lemurian_ship,trident"], + "access_rules": ["$canAccessLemuria"], "sections": [ { "name": "Grindstone", @@ -2478,7 +2478,7 @@ }, { "name": "Western Sea", - "access_rules": ["lemurian_ship,grind", "lemurian_ship,reunion,hover"], + "access_rules": ["$canAccessWesternSeas"], "children": [ { "name": "Angara Cavern", @@ -2507,7 +2507,7 @@ "x": 2025, "y": 2690 }], - "access_rules": ["reunion,venus:18,mars:18,jupiter:18,mercury:18,teleport"], + "access_rules": ["$canAccessInnerAnemos"], "sections": [ { "name": "Charon Tablet", @@ -2531,7 +2531,7 @@ "name": "Iris Tablet", "short_name": "Iris", "item_count": 1, - "access_rules": ["lift,sand"] + "access_rules": ["lift,sand,$hasDjinn|72"] } ], "children": [ @@ -2552,7 +2552,7 @@ { "name": "Coatlicue Tablet", "short_name": "Coatlicue", - "access_rules": ["reunion,hover,parch", "{sett_show_captures,reunion,hover}"], + "access_rules": ["$canFlyShip,parch", "{sett_show_captures,$canFlyShip}"], "capture_item": true, "item_count": 1 } @@ -2867,7 +2867,7 @@ "short_name": "Req. Lift", "access_rules": ["cannon,lift,scoop"], "item_count": 1, - "visibility_rules": ["sett_mode_2"] + "visibility_rules": ["sett_mode_1"] }, { "name": "Dwarven Cannon", @@ -3239,7 +3239,7 @@ }, { "name": "Northern Reaches", - "access_rules": ["lemurian_ship,grind,cannon"], + "access_rules": ["$canAccessWesternSeas,cannon"], "children": [ { "name": "Mars Lighthouse (Lower)", diff --git a/scripts/autotracking.lua b/scripts/autotracking.lua index 24acb44..aa1461a 100644 --- a/scripts/autotracking.lua +++ b/scripts/autotracking.lua @@ -175,6 +175,8 @@ local function updateProgressionReunion(seg) updateProgression(seg, 0x9D0, "reun local function updateProgressionCannon(seg) updateProgression(seg, 0xA5F, "cannon") end local function updateProgressionMars(seg) updateProgression(seg, 0xA4B, "mars_lit") end local function updateProgressionDoomDragon(seg) updateProgression(seg, 0x778, "doom_dragon") end +local function updateProgressionAnemosDoor(seg) updateProgression(seg, 0xA8B, "anemos_door") end +local function updateProgressionAnemosWings(seg) updateProgression(seg, 0x8DF, "wings_of_anemos") end -- ===================== -- Location data loading @@ -363,6 +365,8 @@ local function registerProgressionWatches() ScriptHost:AddMemoryWatch("Prog - Cannon", getFlagAddr(0xA5F), 1, updateProgressionCannon, 2000) ScriptHost:AddMemoryWatch("Prog - Mars LH", getFlagAddr(0xA4B), 1, updateProgressionMars, 2000) ScriptHost:AddMemoryWatch("Prog - Doom Dragon", getFlagAddr(0x778), 1, updateProgressionDoomDragon, 2000) + ScriptHost:AddMemoryWatch("Prog - Anemos Door", getFlagAddr(0xA8B), 1, updateProgressionAnemosDoor, 2000) + ScriptHost:AddMemoryWatch("Prog - Anemos Wings", getFlagAddr(0x8DF), 1, updateProgressionAnemosWings, 2000) end if AUTOTRACKER_TRACK_ITEMS then diff --git a/scripts/logic_common.lua b/scripts/logic_common.lua index 7f9890e..ebe60e1 100644 --- a/scripts/logic_common.lua +++ b/scripts/logic_common.lua @@ -22,20 +22,24 @@ function canAccessKibombo() end end -function canAccessYampiBackside() - return Tracker:ProviderCountForCode("scoop") + Tracker:ProviderCountForCode("sand") + Tracker:ProviderCountForCode("lemurian_ship") +function canSailShip() + return Tracker:ProviderCountForCode("lemurian_ship") +end + +function canAccessLemuria() + return canSailShip() * (Tracker:ProviderCountForCode("grind") + (Tracker:ProviderCountForCode("trident") * hasDjinn("24"))) +end + +function canFlyShip() + return canSailShip() * Tracker:ProviderCountForCode("hover") * (Tracker:ProviderCountForCode("wings_of_anemos") + Tracker:ProviderCountForCode("reunion")) +end + +function canAccessWesternSeas() + return canSailShip() * (Tracker:ProviderCountForCode("grind") + canFlyShip()) end function canAccessShip() - if Tracker:ProviderCountForCode("lemurian_ship") > 0 then - return Tracker:ProviderCountForCode("grind") + (Tracker:ProviderCountForCode("trident") * hasDjinn("24")) - else - if Tracker:ProviderCountForCode("gabomba_statue") > 0 then - return Tracker:ProviderCountForCode("black_crystal") - else - return 0 - end - end + return (canSailShip() * (canAccessLemuria() + canAccessWesternSeas())) + (Tracker:ProviderCountForCode("gabomba_statue") * Tracker:ProviderCountForCode("black_crystal")) end function canAccessUpperMars() @@ -45,6 +49,10 @@ function canAccessUpperMars() return 0 end +function canAccessYampiBackside() + return Tracker:ProviderCountForCode("scoop") + Tracker:ProviderCountForCode("sand") + canSailShip() +end + function neg(code) if Tracker:ProviderCountForCode(code) > 0 then return 0 @@ -62,4 +70,13 @@ function hasDjinn(num) return 1 end return 0 +end + +function canAccessInnerAnemos() + local djinn = Tracker:ProviderCountForCode("venus") + Tracker:ProviderCountForCode("mars") + Tracker:ProviderCountForCode("jupiter") + Tracker:ProviderCountForCode("mercury") + if djinn == 72 then + return Tracker:ProviderCountForCode("teleport") + else + return Tracker:ProviderCountForCode("teleport") * ( ((djinn >= 72) and 1 or 0) + Tracker:ProviderCountForCode("anemos_door")) + end end \ No newline at end of file From c55389caa243d82013dbf5f77059d9e0c7e2ec4e Mon Sep 17 00:00:00 2001 From: neomatamune Date: Tue, 24 Sep 2024 05:15:50 +0200 Subject: [PATCH 2/3] Added captures for items / djinns visible but non capture-able --- locations/locations.json | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/locations/locations.json b/locations/locations.json index 39ceb6b..ee19aa1 100644 --- a/locations/locations.json +++ b/locations/locations.json @@ -400,18 +400,18 @@ "x": 4070, "y": 3850 }], - "access_rules": ["reveal"], "sections": [ { "name": "Main Cave East", "short_name": "Main East", "item_count": 1, - "visibility_rules": ["sett_mode_1,$neg|sett_major"] + "capture_item": true, + "access_rules": ["{sett_show_captures}","reveal"] }, { "name": "Main Cave South", "short_name": "Main South", - "access_rules": ["lash,frost", "{sett_show_captures}"], + "access_rules": ["reveal,lash,frost", "{sett_show_captures,reveal}"], "capture_item": true, "item_count": 1, "visibility_rules": ["sett_mode_1,$neg|sett_major"] @@ -419,24 +419,26 @@ { "name": "Tremor Bit", "short_name": "Tremor", + "access_rules": ["reveal"], "item_count": 1 }, { "name": "Ruins West Room", "short_name": "Ruins West", "item_count": 1, + "access_rules": ["reveal"], "visibility_rules": ["sett_mode_1,$neg|sett_major"] }, { "name": "Ruin Key", - "access_rules": ["lash,frost,tremor", "{sett_show_captures,lash,frost}"], + "access_rules": ["reveal,lash,frost,tremor", "{sett_show_captures,reveal,lash,frost}"], "capture_item": true, "item_count": 1 }, { "name": "Moloch Tablet", "short_name": "Moloch", - "access_rules": ["ruin_key"], + "access_rules": ["reveal,ruin_key"], "item_count": 1 } ], @@ -1197,7 +1199,7 @@ { "name": "Gabomba Reward", "short_name": "Orb", - "access_rules": ["gabomba_statue", "$neg|sett_hide_yellows,[lash],{sett_show_captures}", "lash,{sett_show_captures}", "sett_skips_oobeasy,{sett_show_captures}"], + "access_rules": ["gabomba_statue", "{sett_show_captures,$neg|sett_hide_yellows,[lash]}", "{sett_show_captures,lash}", "{sett_show_captures,sett_skips_oobeasy}"], "capture_item": true, "hosted_item": "gabomba_statue", "visibility_rules": ["sett_show_captures"] @@ -1682,7 +1684,8 @@ }, { "name": "Trident", - "access_rules": ["$hasDjinn|20,briggs_jailbreak,left_prong,center_prong,right_prong,reveal"], + "access_rules": ["{sett_show_captures,$hasDjinn|20,briggs_jailbreak,left_prong,center_prong,right_prong}","$hasDjinn|20,briggs_jailbreak,left_prong,center_prong,right_prong,reveal"], + "capture_item": true, "item_count": 1 } ], @@ -2865,7 +2868,8 @@ { "name": "Item Under Boulder", "short_name": "Req. Lift", - "access_rules": ["cannon,lift,scoop"], + "access_rules": ["cannon,lift,scoop", "cannon,lift,{sett_show_captures}"], + "capture_item": true, "item_count": 1, "visibility_rules": ["sett_mode_1"] }, @@ -3025,7 +3029,9 @@ { "name": "Reserve Djinni (Jupiter)", "short_name": "GS1 Jupiter", - "access_rules": ["lift"], + "access_rules": ["lift", "{sett_show_captures}"], + "capture_item": true, + "capture_item_layout": "tracker_capture_djinni", "hosted_item": "jupiter_7" } ], From 8126daff41f9fe0b0bef84603b647b1d043498d1 Mon Sep 17 00:00:00 2001 From: neomatamune Date: Tue, 24 Sep 2024 05:15:50 +0200 Subject: [PATCH 3/3] Added captures for items / djinns visible but non capture-able --- locations/locations.json | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/locations/locations.json b/locations/locations.json index 39ceb6b..732b8e2 100644 --- a/locations/locations.json +++ b/locations/locations.json @@ -400,18 +400,18 @@ "x": 4070, "y": 3850 }], - "access_rules": ["reveal"], "sections": [ { "name": "Main Cave East", "short_name": "Main East", "item_count": 1, - "visibility_rules": ["sett_mode_1,$neg|sett_major"] + "capture_item": true, + "access_rules": ["{sett_show_captures}","reveal"] }, { "name": "Main Cave South", "short_name": "Main South", - "access_rules": ["lash,frost", "{sett_show_captures}"], + "access_rules": ["reveal,lash,frost", "{sett_show_captures,reveal}"], "capture_item": true, "item_count": 1, "visibility_rules": ["sett_mode_1,$neg|sett_major"] @@ -419,24 +419,26 @@ { "name": "Tremor Bit", "short_name": "Tremor", + "access_rules": ["reveal"], "item_count": 1 }, { "name": "Ruins West Room", "short_name": "Ruins West", "item_count": 1, + "access_rules": ["reveal"], "visibility_rules": ["sett_mode_1,$neg|sett_major"] }, { "name": "Ruin Key", - "access_rules": ["lash,frost,tremor", "{sett_show_captures,lash,frost}"], + "access_rules": ["reveal,lash,frost,tremor", "{sett_show_captures,reveal,lash,frost}"], "capture_item": true, "item_count": 1 }, { "name": "Moloch Tablet", "short_name": "Moloch", - "access_rules": ["ruin_key"], + "access_rules": ["reveal,ruin_key"], "item_count": 1 } ], @@ -1197,7 +1199,7 @@ { "name": "Gabomba Reward", "short_name": "Orb", - "access_rules": ["gabomba_statue", "$neg|sett_hide_yellows,[lash],{sett_show_captures}", "lash,{sett_show_captures}", "sett_skips_oobeasy,{sett_show_captures}"], + "access_rules": ["gabomba_statue", "{sett_show_captures,$neg|sett_hide_yellows,[lash]}", "{sett_show_captures,lash}", "{sett_show_captures,sett_skips_oobeasy}"], "capture_item": true, "hosted_item": "gabomba_statue", "visibility_rules": ["sett_show_captures"] @@ -1682,7 +1684,8 @@ }, { "name": "Trident", - "access_rules": ["$hasDjinn|20,briggs_jailbreak,left_prong,center_prong,right_prong,reveal"], + "access_rules": ["{sett_show_captures,$hasDjinn|20,briggs_jailbreak,left_prong,center_prong,right_prong}","$hasDjinn|20,briggs_jailbreak,left_prong,center_prong,right_prong,reveal"], + "capture_item": true, "item_count": 1 } ], @@ -2865,7 +2868,8 @@ { "name": "Item Under Boulder", "short_name": "Req. Lift", - "access_rules": ["cannon,lift,scoop"], + "access_rules": ["cannon,lift,scoop", "{sett_show_captures,cannon,lift}"], + "capture_item": true, "item_count": 1, "visibility_rules": ["sett_mode_1"] }, @@ -3025,7 +3029,9 @@ { "name": "Reserve Djinni (Jupiter)", "short_name": "GS1 Jupiter", - "access_rules": ["lift"], + "access_rules": ["lift", "{sett_show_captures}"], + "capture_item": true, + "capture_item_layout": "tracker_capture_djinni", "hosted_item": "jupiter_7" } ],