add back SD only twilit insects

src/dusk/randomizer/data/locations.yaml

@@ -101,28 +101,49 @@
   - Faron Woods
   - Twilit Insect
 
-- Name: Faron Woods Coros House Twilit Insect 1
+- Name: Faron Woods Coros House Interior Twilit Insect 1
   Original Item: Faron Twilight Tear
   Categories:
   - Overworld
   - Faron Woods
   - Twilit Insect
 
-- Name: Faron Woods Coros House Twilit Insect 2
+- Name: Faron Woods Coros House Interior Twilit Insect 2
   Original Item: Faron Twilight Tear
   Categories:
   - Overworld
   - Faron Woods
   - Twilit Insect
 
-- Name: South Faron Woods Twilit Insect Behind Gate
+- Name: South Faron Woods Coros House Exterior Twilit Insect
   Original Item: Faron Twilight Tear
   Categories:
   - Overworld
   - Faron Woods
   - Twilit Insect
 
-- Name: Faron Mist Twilit Insect on Wall
+- Name: South Faron Woods Twilit Insect Behind Gate 1
+  Original Item: Faron Twilight Tear
+  Categories:
+  - Overworld
+  - Faron Woods
+  - Twilit Insect
+
+- Name: South Faron Woods Twilit Insect Behind Gate 2
+  Original Item: Faron Twilight Tear
+  Categories:
+  - Overworld
+  - Faron Woods
+  - Twilit Insect
+
+- Name: Faron Mist Twilit Insect on Wall 1
+  Original Item: Faron Twilight Tear
+  Categories:
+  - Overworld
+  - Faron Woods
+  - Twilit Insect
+
+- Name: Faron Mist Twilit Insect on Wall 2
   Original Item: Faron Twilight Tear
   Categories:
   - Overworld
@@ -143,6 +164,13 @@
   - Faron Woods
   - Twilit Insect
 
+- Name: Faron Mist Twilit Insect on Center Stump 3
+  Original Item: Faron Twilight Tear
+  Categories:
+  - Overworld
+  - Faron Woods
+  - Twilit Insect
+
 - Name: Faron Mist Burrowing Twilit Insect 1
   Original Item: Faron Twilight Tear
   Categories:
@@ -450,7 +478,28 @@
   - Eldin Province
   - Twilit Insect
 
-- Name: Kakariko Inn Twilit Insect
+- Name: Kakariko Graveyard Twilit Insect
+  Original Item: Eldin Twilight Tear
+  Categories:
+  - Overworld
+  - Eldin Province
+  - Twilit Insect
+
+- Name: Kakariko Malo Mart Twilit Insect
+  Original Item: Eldin Twilight Tear
+  Categories:
+  - Overworld
+  - Eldin Province
+  - Twilit Insect
+
+- Name: Kakariko Inn Pipe Twilit Insect
+  Original Item: Eldin Twilight Tear
+  Categories:
+  - Overworld
+  - Eldin Province
+  - Twilit Insect
+
+- Name: Kakariko Inn Bedroom Twilit Insect
   Original Item: Eldin Twilight Tear
   Categories:
   - Overworld
@@ -492,6 +541,13 @@
   - Eldin Province
   - Twilit Insect
 
+- Name: Kakariko Watchtower Twilit Insect
+  Original Item: Eldin Twilight Tear
+  Categories:
+  - Overworld
+  - Eldin Province
+  - Twilit Insect
+
 - Name: Death Mountain Trail Twilit Insect Near Howling Stone
   Original Item: Eldin Twilight Tear
   Categories:
@@ -985,6 +1041,13 @@
   - Lanayru Province
   - Twilit Insect
 
+- Name: Lake Hylia Twilit Insect Behind Canon
+  Original Item: Lanayru Twilight Tear
+  Categories:
+  - Overworld
+  - Lanayru Province
+  - Twilit Insect
+
 - Name: Lake Hylia Twilit Insect on Docks
   Original Item: Lanayru Twilight Tear
   Categories:
@@ -999,21 +1062,28 @@
   - Lanayru Province
   - Twilit Insect
 
-- Name: Zora's River Twilit Insect 1
+- Name: Zoras River Twilit Insect 1
   Original Item: Lanayru Twilight Tear
   Categories:
   - Overworld
   - Lanayru Province
   - Twilit Insect
 
-- Name: Zora's River Twilit Insect 2
+- Name: Zoras River Twilit Insect 2
   Original Item: Lanayru Twilight Tear
   Categories:
   - Overworld
   - Lanayru Province
   - Twilit Insect
 
-- Name: Zora's River Twilit Insect 3
+- Name: Zoras River Twilit Insect 3
+  Original Item: Lanayru Twilight Tear
+  Categories:
+  - Overworld
+  - Lanayru Province
+  - Twilit Insect
+
+- Name: Zoras River Twilit Insect 4
   Original Item: Lanayru Twilight Tear
   Categories:
   - Overworld
@@ -1027,7 +1097,14 @@
   - Lanayru Province
   - Twilit Insect
 
-- Name: Zoras Domain Twilit Insect near Lilypads
+- Name: Zoras Domain Twilit Insect near Lilypads 1
+  Original Item: Lanayru Twilight Tear
+  Categories:
+  - Overworld
+  - Lanayru Province
+  - Twilit Insect
+
+- Name: Zoras Domain Twilit Insect near Lilypads 2
   Original Item: Lanayru Twilight Tear
   Categories:
   - Overworld
@@ -1041,6 +1118,13 @@
   - Lanayru Province
   - Twilit Insect
 
+- Name: Zoras Domain Twilit Insect on West Ledge
+  Original Item: Lanayru Twilight Tear
+  Categories:
+  - Overworld
+  - Lanayru Province
+  - Twilit Insect
+
 - Name: Zoras Domain Throne Room Twilit Insect
   Original Item: Lanayru Twilight Tear
   Categories:

src/dusk/randomizer/data/macros.yaml

@@ -220,9 +220,9 @@ Has Sword For Temple of Time: Temple_of_Time_Sword_Requirement == None or
                               (Temple_of_Time_Sword_Requirement == Master_Sword and Master_Sword) or
                               (Temple_of_Time_Sword_Requirement == Light_Sword and Light_Sword)
 
-Can Complete Faron Twilight: Faron_Twilight_Cleared == On or count(Faron_Twilight_Tear, 12)
-Can Complete Eldin Twilight: Eldin_Twilight_Cleared == On or count(Eldin_Twilight_Tear, 12)
-Can Complete Lanayru Twilight: Lanayru_Twilight_Cleared == On or count(Lanayru_Twilight_Tear, 12)
+Can Complete Faron Twilight: Faron_Twilight_Cleared == On or count(Faron_Twilight_Tear, 16)
+Can Complete Eldin Twilight: Eldin_Twilight_Cleared == On or count(Eldin_Twilight_Tear, 16)
+Can Complete Lanayru Twilight: Lanayru_Twilight_Cleared == On or count(Lanayru_Twilight_Tear, 16)
 Can Complete All Twilight: Can_Complete_Faron_Twilight and Can_Complete_Eldin_Twilight and Can_Complete_Lanayru_Twilight
 
 Can Defeat Faron Twilit Insect: Twilight
@@ -259,4 +259,4 @@ Snowpeak Warp Portal: Snowpeak_Does_Not_Require_Reekfish_Scent == On or (Can_Def
 Gerudo Desert Warp Portal: Can_Defeat_Shadow_Beast and 'Can_Access_Gerudo_Desert_Cave_of_Ordeals_Plateau'
 Mirror Chamber Warp Portal: Can_Defeat_Shadow_Beast and 'Can_Access_Mirror_Chamber_Upper'
 
-Can Talk to Springwater Goron: Nothing # Change later
+Can Talk to Springwater Goron: Nothing # Change later

src/dusk/randomizer/data/world/overworld/Eldin Province.yaml

@@ -177,6 +177,7 @@
     Kakariko Graveyard Grave Poe: Can_Use_Senses and Night
     Kakariko Graveyard Open Poe: Can_Use_Senses and Night
     Kakariko Graveyard Golden Wolf: "'Howl_at_Snowpeak_Mountain_Howling_Stone'"
+    Kakariko Graveyard Twilit Insect: Can_Defeat_Eldin_Twilit_Insect
   Exits:
     Kakariko Graveyard Pond: "'Can_Follow_Rutella'"
     Lower Kakariko Village: Nothing
@@ -205,6 +206,7 @@
     Kakariko Village Malo Mart Hawkeye: "'Can_Farm_Lots_of_Rupees'"
     Kakariko Village Malo Mart Red Potion: "'Can_Farm_Lots_of_Rupees'"
     Kakariko Village Malo Mart Wooden Shield: "'Can_Farm_Lots_of_Rupees'"
+    Kakariko Malo Mart Twilit Insect: Can_Defeat_Eldin_Twilit_Insect
   Exits:
     Lower Kakariko Village: Nothing
 
@@ -240,7 +242,8 @@
   Twilight: Eldin
   Locations:
     Kakariko Inn Chest: Nothing
-    Kakariko Inn Twilit Insect: Can_Defeat_Eldin_Twilit_Insect
+    Kakariko Inn Pipe Twilit Insect: Can_Defeat_Eldin_Twilit_Insect
+    Kakariko Inn Bedroom Twilit Insect: Can_Defeat_Eldin_Twilit_Insect
   Exits:
     Elde Inn North Door Interior: Nothing
     Elde Inn South Door Interior: Nothing
@@ -322,6 +325,8 @@
 
 - Name: Kakariko Watchtower Lower Interior
   Twilight: Eldin
+  Locations:
+    Kakariko Watchtower Twilit Insect: Can_Defeat_Eldin_Twilit_Insect
   Exits:
     Kakariko Watchtower Upper Interior: Can_Climb_Ladders
     Kakariko Watchtower Lower Door: Can_Open_Doors
@@ -591,4 +596,4 @@
   Locations:
     Skybook From Impaz: Bow and Dominion_Rod and 'Can_Access_Hidden_Village'
   Exits:
-    Hidden Village: Nothing
+    Hidden Village: Nothing

src/dusk/randomizer/data/world/overworld/Faron Province.yaml

@@ -13,6 +13,7 @@
     Coro Bottle: Can_Complete_Prologue
     South Faron Woods Twilit Insect in Tunnel 1: Can_Defeat_Faron_Twilit_Insect
     South Faron Woods Twilit Insect in Tunnel 2: Can_Defeat_Faron_Twilit_Insect
+    South Faron Woods Coros House Exterior Twilit Insect: Can_Defeat_Faron_Twilit_Insect
     South Faron Woods Hint Sign: Nothing
   Exits:
     South Faron Woods Coros Ledge: Can_Midna_Jump or Twilight
@@ -41,8 +42,8 @@
 - Name: Faron Woods Coros House Lower
   Twilight: Faron
   Locations:
-    Faron Woods Coros House Twilit Insect 1: Can_Defeat_Faron_Twilit_Insect
-    Faron Woods Coros House Twilit Insect 2: Can_Defeat_Faron_Twilit_Insect
+    Faron Woods Coros House Interior Twilit Insect 1: Can_Defeat_Faron_Twilit_Insect
+    Faron Woods Coros House Interior Twilit Insect 2: Can_Defeat_Faron_Twilit_Insect
   Exits:
     Faron Woods Coros House Upper: Wolf_Link # Only wolf link can climb the ledge
     South Faron Woods: Can_Open_Doors
@@ -78,7 +79,8 @@
   Can Warp: True
   Can Change Time: True
   Locations:
-    South Faron Woods Twilit Insect Behind Gate: Can_Defeat_Faron_Twilit_Insect
+    South Faron Woods Twilit Insect Behind Gate 1: Can_Defeat_Faron_Twilit_Insect
+    South Faron Woods Twilit Insect Behind Gate 2: Can_Defeat_Faron_Twilit_Insect
   Exits:
     Faron Woods Cave South: Nothing
     South Faron Woods: Can_Dig or Can_Clear_Forest or 'Can_Access_South_Faron_Woods'
@@ -114,7 +116,8 @@
   Can Warp: True
   Can Change Time: True
   Locations:
-    Faron Mist Twilit Insect on Wall: Can_Defeat_Faron_Twilit_Insect
+    Faron Mist Twilit Insect on Wall 1: Can_Defeat_Faron_Twilit_Insect
+    Faron Mist Twilit Insect on Wall 2: Can_Defeat_Faron_Twilit_Insect
   Exits:
     Mist Area Inside Mist: Lantern
     Mist Area Under Owl Statue Chest: Can_Midna_Jump or Twilight
@@ -168,6 +171,7 @@
     Faron Mist Poe: Can_Use_Senses and Can_Complete_Prologue
     Faron Mist Twilit Insect on Center Stump 1: Can_Defeat_Faron_Twilit_Insect
     Faron Mist Twilit Insect on Center Stump 2: Can_Defeat_Faron_Twilit_Insect
+    Faron Mist Twilit Insect on Center Stump 3: Can_Defeat_Faron_Twilit_Insect
   Exits:
     Mist Area Inside Mist: Lantern
     Mist Area Near North Faron Woods: Can_Midna_Jump or Twilight

src/dusk/randomizer/data/world/overworld/Lanayru Province.yaml

@@ -486,17 +486,19 @@
   Events:
     Can Farm Lots of Rupees: Nothing
   Locations:
-    Lake Hylia Twilit Insect Between Bridges: Can_Defeat_Lanayru_Twilit_Insect
-    Lake Hylia Burrowing Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect
-    Lake Hylia Twilit Insect on Docks: Can_Defeat_Lanayru_Twilit_Insect
-    Lake Hylia Twilit Bloat: count(Lanayru_Twilight_Tear, 11) and Can_Defeat_Lanayru_Twilit_Insect
-    Zora's River Twilit Insect 1: Can_Defeat_Lanayru_Twilit_Insect
-    Zora's River Twilit Insect 2: Can_Defeat_Lanayru_Twilit_Insect
-    Zora's River Twilit Insect 3: Can_Defeat_Lanayru_Twilit_Insect
     Lake Hylia Underwater Chest: Iron_Boots
     Lake Hylia Alcove Poe: Night and Can_Use_Senses
     Lake Hylia Dock Poe: Night and Can_Use_Senses
     Plumm Fruit Balloon Minigame: Can_Howl
+    Lake Hylia Twilit Insect Between Bridges: Can_Defeat_Lanayru_Twilit_Insect
+    Lake Hylia Burrowing Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect
+    Lake Hylia Twilit Insect Behind Canon: Can_Defeat_Lanayru_Twilit_Insect
+    Lake Hylia Twilit Insect on Docks: Can_Defeat_Lanayru_Twilit_Insect
+    Lake Hylia Twilit Bloat: count(Lanayru_Twilight_Tear, 15) and Can_Defeat_Lanayru_Twilit_Insect
+    Zoras River Twilit Insect 1: Can_Defeat_Lanayru_Twilit_Insect
+    Zoras River Twilit Insect 2: Can_Defeat_Lanayru_Twilit_Insect
+    Zoras River Twilit Insect 3: Can_Defeat_Lanayru_Twilit_Insect
+    Zoras River Twilit Insect 4: Can_Defeat_Lanayru_Twilit_Insect
   Exits:
     Lake Hylia Upper Area: Can_Climb_Ladders
     Flight by Fowl: Can_Talk_to_Humans
@@ -679,13 +681,14 @@
   Events:
     Reekfish Scent: Coral_Earring
   Locations:
-    Zoras Domain Twilit Insect near Lilypads: Can_Defeat_Lanayru_Twilit_Insect
-    Zoras Domain Burrowing Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect  
     Zoras Domain Chest By Mother and Child Isles: Nothing
     Zoras Domain Chest Behind Waterfall: Can_Midna_Jump
     Zoras Domain Male Dragonfly: Nothing
     Zoras Domain Mother and Child Isle Poe: Can_Use_Senses
     Zoras Domain Waterfall Poe: Can_Midna_Jump and Can_Use_Senses
+    Zoras Domain Twilit Insect near Lilypads 1: Can_Defeat_Lanayru_Twilit_Insect
+    Zoras Domain Twilit Insect near Lilypads 2: Can_Defeat_Lanayru_Twilit_Insect
+    Zoras Domain Burrowing Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect  
   Exits:
     Zoras Domain West Ledge: Clawshot or Can_Midna_Jump or Twilight
     Zoras Domain Top of Waterfall: Clawshot or Can_Midna_Jump or Twilight
@@ -698,6 +701,7 @@
   Twilight: Lanayru
   Can Warp: True
   Locations:
+    Zoras Domain Twilit Insect on West Ledge: Can_Defeat_Lanayru_Twilit_Insect
     Zoras Domain Hint Sign: Nothing
   Exits:
     Zoras Domain Top of Waterfall: Can_Smash