Merge pull request #3 from neomatamune/main

Updated pack for starting wings and anemos door updates
Karanum · Sep 24, 2024 · 5ff7fff · 5ff7fff
2 parents 5aabd4b + 7ecc2e5
commit 5ff7fff
Show file tree

Hide file tree

Showing 12 changed files with 102 additions and 45 deletions.
diff --git a/images/hosts/open_anemos.png b/images/hosts/open_anemos.png
diff --git a/images/hosts/wings.png b/images/hosts/wings.png
diff --git 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"
   }
 ]
diff --git 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
@@ -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
@@ -126,7 +126,7 @@
             {
                 "type": "itemgrid",
                 "h_alignment": "center",
-                "item_margin": "1,3",
+                "item_margin": "2,3",
                 "item_size": 40,
                 "rows": [
                     [
@@ -135,14 +135,16 @@
                         "gabomba_statue",
                         "lemurian_ship",
                         "susa",
-                        "briggs_jailbreak"
+                        "briggs_jailbreak",
+                        "wings_of_anemos"
                     ],
                     [
                         "trial_road",
                         "jupiter_lit",
                         "reunion",
                         "cannon",
                         "mars_lit",
+                        "anemos_door",
                         "doom_dragon"
                     ]
                 ]

diff --git 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
@@ -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
@@ -72,14 +72,16 @@
 								"gabomba_statue",
 								"lemurian_ship",
 								"susa",
-								"briggs_jailbreak"
+								"briggs_jailbreak",
+								"wings_of_anemos"
 							],
 							[
 								"trial_road",
 								"jupiter_lit",
 								"reunion",
 								"cannon",
 								"mars_lit",
+								"anemos_door",
 								"doom_dragon"
 							]
 						]

diff --git 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"],
@@ -400,43 +400,45 @@
 						"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"]
 						},
 						{
 							"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
 						}
 					],
@@ -675,7 +677,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 +1073,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",
@@ -1197,11 +1199,11 @@
 								{
 									"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"]
-								},
+								}
 							],
 							"children": [
 								{ "name": "0xF4E" },
@@ -1251,7 +1253,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 +1339,7 @@
 		},
 		{
 			"name": "Eastern Sea",
-			"access_rules": ["lemurian_ship"],
+			"access_rules": ["$canSailShip"],
 			"children": [
 				{
 					"name": "Ankohl Ruins",
@@ -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
 						}
 					],
@@ -2402,7 +2405,7 @@
 				"x": 5965,
 				"y": 2435			
 			}],
-			"access_rules": ["lemurian_ship,grind", "$hasDjinn|24,lemurian_ship,trident"],
+			"access_rules": ["$canAccessLemuria"],
 			"sections": [
 				{
 					"name": "Grindstone",
@@ -2478,7 +2481,7 @@
 		},
 		{
 			"name": "Western Sea",
-			"access_rules": ["lemurian_ship,grind", "lemurian_ship,reunion,hover"],
+			"access_rules": ["$canAccessWesternSeas"],
 			"children": [
 				{
 					"name": "Angara Cavern",
@@ -2507,7 +2510,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 +2534,7 @@
 							"name": "Iris Tablet",
 							"short_name": "Iris",
 							"item_count": 1,
-							"access_rules": ["lift,sand"]
+							"access_rules": ["lift,sand,$hasDjinn|72"]
 						}
 					],
 					"children": [
@@ -2552,7 +2555,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
 						}
@@ -2865,9 +2868,10 @@
 						{
 							"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_2"]
+							"visibility_rules": ["sett_mode_1"]
 						},
 						{
 							"name": "Dwarven Cannon",
@@ -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"
 						}
 					],
@@ -3239,7 +3245,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
@@ -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