fix you and what army? stardust expectation for goals under zenith + …

…add out of logic rules
SerpentAI · Nov 6, 2023 · 25ee06f · 25ee06f
1 parent 1d7b81d
commit 25ee06f
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.1.4
+
+* Fix You and What Army? achievement considering Stardust Armor as a possibility when goal is not Zenith
+* Add a set of out of logic rules (AKA yellow checks). List provided by Luna & on the AP Terraria Discord channel
+
+## 0.1.3
+
+* Add Hardmode requirement to Old One's Army Tier 2 and 3
+
+## 0.1.2
+
+* Fix goal and achievement settings not resetting after establishing an Archipelago connection
+* Add achievement setting automatic tracking
+* Add deathlink setting to tracker + automatic tracking
+
 ## 0.1.1
 
 Add PopTracker auto-update support

diff --git a/locations/locations.json b/locations/locations.json
@@ -285,7 +285,10 @@
                     {
                         "name": "Skeletron Prime",
                         "visibility_rules": ["$hasGoalOfAtLeastMechanicalBosses"],
-                        "access_rules": ["hardmode,post_skeletron"]
+                        "access_rules": [
+                            "hardmode,post_skeletron",
+                            "hardmode,$has_not|post_skeletron_prime,[post_skeletron]"
+                        ]
                     }
                 ]
             },
@@ -348,9 +351,9 @@
                         "name": "Golem",
                         "visibility_rules": ["$hasGoalOfAtLeastGolem"],
                         "access_rules": [
-                            "hardmode,post_plantera,post_the_twins,post_the_destroyer,post_skeletron_prime",
-                            "hardmode,post_plantera,post_skeletron",
-                            "hardmode,post_plantera,post_golem"
+                            "hardmode,post_plantera,[post_the_twins],[post_the_destroyer],[post_skeletron_prime]",
+                            "hardmode,post_plantera,[post_skeletron]",
+                            "hardmode,post_plantera,[post_golem]"
                         ]
                     }
                 ]
@@ -1776,7 +1779,7 @@
                     {
                         "name": "Equip a pair of wings.",
                         "visibility_rules": ["$hasGoalOfAtLeastMechanicalBosses,$hasAchievements"],
-                        "access_rules": ["hardmode"]
+                        "access_rules": ["[hardmode]"]
                     }
                 ]
             },
@@ -1898,7 +1901,10 @@
                     {
                         "name": "Defeat the three nocturnal mechanical menaces: the Twins, the Destroyer, and Skeletron Prime.",
                         "visibility_rules": ["$hasGoalOfAtLeastPlantera,$hasAchievements"],
-                        "access_rules": ["hardmode,post_skeletron"]
+                        "access_rules": [
+                            "hardmode,post_skeletron",
+                            "hardmode,$has_not|post_skeletron_prime,[post_skeletron]"
+                        ]
                     }
                 ]
             },
@@ -1917,7 +1923,10 @@
                     {
                         "name": "Do battle against the Twins, the Destroyer, and Skeletron Prime simultaneously and emerge victorious.",
                         "visibility_rules": ["$hasGoalOfAtLeastPlantera,$hasAchievements"],
-                        "access_rules": ["hardmode,post_skeletron"]
+                        "access_rules": [
+                            "hardmode,post_skeletron",
+                            "hardmode,$has_not|post_skeletron_prime,[post_skeletron]"
+                        ]
                     }
                 ]
             },
@@ -1936,7 +1945,10 @@
                     {
                         "name": "Craft a drax or pickaxe axe using hallowed bars, and the souls of the three mechanical bosses.",
                         "visibility_rules": ["$hasGoalOfAtLeastPlantera,$hasAchievements"],
-                        "access_rules": ["hardmode,post_skeletron"]
+                        "access_rules": [
+                            "hardmode,post_skeletron",
+                            "hardmode,$has_not|post_skeletron_prime,[post_skeletron]"
+                        ]
                     }
                 ]
             },
@@ -1957,6 +1969,7 @@
                         "visibility_rules": ["$hasGoalOfAtLeastPlantera,$hasAchievements"],
                         "access_rules": [
                             "hardmode,post_skeletron",
+                            "hardmode,$has_not|post_skeletron_prime,[post_skeletron]",
                             "hardmode,post_plantera,post_the_twins,post_the_destroyer,post_skeletron_prime",
                             "hardmode,post_plantera,post_golem"
                         ]
@@ -1981,7 +1994,7 @@
                         "access_rules": [
                             "hardmode,post_queen_bee,post_plantera",
                             "hardmode,post_skeletron,post_plantera",
-                            "hardmode,post_skeletron,post_golem"
+                            "hardmode,post_skeletron,post_golem,goal_zenith"
                         ]
                     }
                 ]
@@ -2120,7 +2133,9 @@
                         "name": "Survive a solar eclipse, a day darker than night filled with creatures of horror.",
                         "visibility_rules": ["$hasGoalOfAtLeastGolem,$hasAchievements"],
                         "access_rules": [
-                            "hardmode,post_the_twins,post_the_destroyer,post_skeletron_prime",
+                            "hardmode,post_the_twins,[post_the_destroyer],[post_skeletron_prime]",
+                            "hardmode,[post_the_twins],post_the_destroyer,[post_skeletron_prime]",
+                            "hardmode,[post_the_twins],[post_the_destroyer],post_skeletron_prime",
                             "hardmode,post_plantera,post_skeletron",
                             "hardmode,post_plantera,post_golem"
                         ]

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "Terraria",
     "game_name": "Terraria",
-    "package_version": "0.1.3",
+    "package_version": "0.1.4",
     "package_uid": "ap_terraria",
     "author": "Serpent.AI",
     "variants": {

diff --git a/scripts/logic/logic.lua b/scripts/logic/logic.lua
@@ -2,6 +2,10 @@ function has(item)
     return Tracker:ProviderCountForCode(item) > 0
 end
 
+function has_not(item)
+    return Tracker:ProviderCountForCode(item) == 0
+end
+
 
 -- Visibility Rules
 function hasGoalOfAtLeastMechanicalBosses()