Added Sword and Shield skip Achievement

2026-05-31 00:45:24 -04:00 · 2026-05-29 15:26:26 +01:00
parent e5c032f6e6
commit 5269eadfaf
1 changed files with 23 additions and 0 deletions
@@ -931,6 +931,29 @@ std::vector<AchievementSystem::Entry> AchievementSystem::makeEntries() {
            },
            {}
        },
+        {
+            {
+                 "sword_and_shield_skip", "Sword and Shield Skip",
+                 "Pass through the Twilight Wall in Ordon Spring before obtaining both the Ordon Sword "
+                 "and Shield.",
+                 AchievementCategory::Glitched, false, 0, 0, false
+            },
+            [](Achievement& a, json&) {
+                bool hasOrdonSword = false;
+                bool hasOrdonShield = false;
+                if (dComIfGs_isCollectSword(COLLECT_ORDON_SWORD)) {
+                    hasOrdonSword = true;
+                }
+                if (dComIfGs_isCollectShield(COLLECT_ORDON_SHIELD)) {
+                    hasOrdonShield = true;
+                }
+                if ((!hasOrdonSword || !hasOrdonShield) &&
+                    dComIfGs_isEventBit(dSv_event_flag_c::M_013)) {
+                    a.progress = 1;
+                }
+            },
+            {}
+        },
        {
            {
                "early_master_sword",