Merge pull request #87 from Hamsda:ootr

update to version 2.9.4.0

ootrando_overworldmap_hamsda/changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.9.4.0
+
+- changed closed forest behavior to include sequence breaking Gohma
+- improved trade sequences:
+  - added all adult trade items as captures (getting one sets the trade sequence to that item)
+  - fixed child trade to always advance stages properly
+
 ## 2.9.3.0
 
 - changed dungeon size on the maps

ootrando_overworldmap_hamsda/items/cap_items.json

@@ -0,0 +1,162 @@
+[
+  {
+    "name": "Bottle",
+    "type": "toggle",
+    "img": "images/bottle.png",
+    "codes": "capture_bottle"
+  },
+  {
+    "name": "Rutos Letter",
+    "type": "toggle",
+    "img": "images/bottle_letter.png",
+    "codes": "capture_ruto"
+  },
+  {
+    "name": "Child Trade Weird Egg",
+    "type": "toggle",
+    "img": "images/egg.png",
+    "img_mods": "overlay|images/overlay_child.png",
+    "codes": "capture_childegg"
+  },
+  {
+    "name": "Child Trade Cucco",
+    "type": "toggle",
+    "img": "images/cucco.png",
+    "img_mods": "overlay|images/overlay_child.png",
+    "codes": "capture_childcucco"
+  },
+  {
+    "name": "Child Trade Letter",
+    "type": "toggle",
+    "img": "images/letter.png",
+    "codes": "capture_letter"
+  },
+  {
+    "name": "Child Trade Letter shown",
+    "type": "toggle",
+    "img": "images/sold_out.png",
+    "codes": "capture_lettershown"
+  },
+  {
+    "name": "Child Trade Keaton",
+    "type": "toggle",
+    "img": "images/keaton.png",
+    "codes": "capture_keaton"
+  },
+  {
+    "name": "Child Trade Keaton sold",
+    "type": "toggle",
+    "img": "images/sold_out.png",
+    "codes": "capture_keatonsold"
+  },
+  {
+    "name": "Child Trade Skullmask",
+    "type": "toggle",
+    "img": "images/skull.png",
+    "codes": "capture_skullmask"
+  },
+  {
+    "name": "Child Trade Skull sold",
+    "type": "toggle",
+    "img": "images/sold_out.png",
+    "codes": "capture_skullsold"
+  },
+  {
+    "name": "Child Trade Spooky",
+    "type": "toggle",
+    "img": "images/spooky.png",
+    "codes": "capture_spooky"
+  },
+  {
+    "name": "Child Trade Spooky sold",
+    "type": "toggle",
+    "img": "images/sold_out.png",
+    "codes": "capture_spookysold"
+  },
+  {
+    "name": "Child Trade Bunny",
+    "type": "toggle",
+    "img": "images/bunny.png",
+    "codes": "capture_bunny"
+  },
+  {
+    "name": "Child Trade Bunny sold",
+    "type": "toggle",
+    "img": "images/sold_out.png",
+    "codes": "capture_bunnysold"
+  },
+  {
+    "name": "Child Trade Truth",
+    "type": "toggle",
+    "img": "images/truth.png",
+    "codes": "capture_truth"
+  },
+  {
+    "name": "Adult Trade Pocket Egg",
+    "type": "toggle",
+    "img": "images/egg.png",
+    "img_mods": "overlay|images/overlay_adult.png",
+    "codes": "capture_adultegg"
+  },
+  {
+    "name": "Adult Trade Cucco",
+    "type": "toggle",
+    "img": "images/cucco.png",
+    "img_mods": "overlay|images/overlay_adult.png",
+    "codes": "capture_adultcucco"
+  },
+  {
+    "name": "Adult Trade Cojiro",
+    "type": "toggle",
+    "img": "images/cojiro.png",
+    "codes": "capture_cojiro"
+  },
+  {
+    "name": "Adult Trade Mushroom",
+    "type": "toggle",
+    "img": "images/mushroom.png",
+    "codes": "capture_mushroom"
+  },
+  {
+    "name": "Adult Trade Odd Potion",
+    "type": "toggle",
+    "img": "images/medicine.png",
+    "codes": "capture_oddpotion"
+  },
+  {
+    "name": "Adult Trade Saw",
+    "type": "toggle",
+    "img": "images/saw.png",
+    "codes": "capture_saw"
+  },
+  {
+    "name": "Adult Trade Broken Sword",
+    "type": "toggle",
+    "img": "images/broken_sword.png",
+    "codes": "capture_brokensword"
+  },
+  {
+    "name": "Adult Trade Prescription",
+    "type": "toggle",
+    "img": "images/perscription.png",
+    "codes": "capture_prescription"
+  },
+  {
+    "name": "Adult Trade Frog",
+    "type": "toggle",
+    "img": "images/frog.png",
+    "codes": "capture_frog"
+  },
+  {
+    "name": "Adult Trade Eyedrops",
+    "type": "toggle",
+    "img": "images/eyedrops.png",
+    "codes": "capture_eyedrops"
+  },
+  {
+    "name": "Adult Trade Claim Check",
+    "type": "toggle",
+    "img": "images/claim.png",
+    "codes": "capture_claim"
+  }
+]

ootrando_overworldmap_hamsda/items/items.json

@@ -678,17 +678,5 @@
         "codes": "ruto,rutosletter"
       }
     ]
-  },
-  {
-    "name": "Bottle",
-    "type": "toggle",
-    "img": "images/bottle.png",
-    "codes": "bottlecapture"
-  },
-  {
-    "name": "Rutos Letter",
-    "type": "toggle",
-    "img": "images/bottle_letter.png",
-    "codes": "rutocapture"
   }
 ]

ootrando_overworldmap_hamsda/items/options.json

@@ -8,16 +8,16 @@
     "stages": [
       {
         "img": "images/setting_forest_closed.png",
-        "codes": "setting_forest,closed_forest"
+        "codes": "setting_forest,setting_forest_closed"
       },
       {
         "img": "images/setting_forest_deku.png",
-        "codes": "setting_forest,closed_deku",
+        "codes": "setting_forest,setting_forest_deku",
         "inherits_codes": false
       },
       {
         "img": "images/setting_forest_open.png",
-        "codes": "setting_forest,open_forest",
+        "codes": "setting_forest,setting_forest_open",
         "inherits_codes": false
       }
     ]
@@ -31,11 +31,11 @@
     "stages": [
       {
         "img": "images/setting_door_closed.png",
-        "codes": "setting_door,closed_door"
+        "codes": "setting_door,setting_door_closed"
       },
       {
         "img": "images/setting_door_open.png",
-        "codes": "setting_door,open_door",
+        "codes": "setting_door,setting_door_open",
         "inherit_codes": false
       }
     ]

ootrando_overworldmap_hamsda/items/sequences.json

@@ -223,11 +223,5 @@
         "codes": "trial_cleared"
       }
     ]
-  },
-  {
-    "name": "Time Travel",
-    "type": "toggle",
-    "img": "images/sword2.png",
-    "codes": "time_travel"
   }
 ]

ootrando_overworldmap_hamsda/layouts/capture.json

@@ -40,12 +40,12 @@
           "bluetunic"
         ],
         [
-          "bottlecapture",
-          "rutocapture",
-          "",
-          "",
-          "adulttrade",
-          "kidtrade",
+          "capture_bottle",
+          "capture_ruto",
+          "generic_map",
+          "generic_compass",
+          "generic_small_key",
+          "generic_boss_key",
           "scale1",
           "ironboots",
           "hoverboots"
@@ -73,15 +73,26 @@
           "triforce"
         ],
         [
-          "",
-          "",
-          "generic_map",
-          "generic_compass",
-          "generic_small_key",
-          "generic_boss_key",
+          "capture_adultegg",
+          "capture_adultcucco",
+          "capture_cojiro",
+          "capture_mushroom",
+          "capture_oddpotion",
+          "capture_saw",
           "rupee",
           "HP",
           "HC"
+        ],
+        [
+          "capture_brokensword",
+          "capture_prescription",
+          "capture_frog",
+          "capture_eyedrops",
+          "capture_claim",
+          "capture_childegg",
+          "",
+          "",
+          ""
         ]
       ]
     }

ootrando_overworldmap_hamsda/locations/dung_mq.json

@@ -3,7 +3,7 @@
     "name": "Deku Tree MQ",
     "parent": "Kokiri Forest",
     "access_rules": [
-      "deku_mq,$has_age|child,open_forest",
+      "deku_mq,$has_age|child,setting_forest_open",
       "deku_mq,$has_age|child,sword1,shield1"
     ],
     "sections": [

ootrando_overworldmap_hamsda/locations/dung_reg.json

@@ -3,7 +3,7 @@
     "name": "Deku Tree",
     "parent": "Kokiri Forest",
     "access_rules": [
-      "deku_reg,$has_age|child,open_forest",
+      "deku_reg,$has_age|child,setting_forest_open",
       "deku_reg,$has_age|child,sword1,shield1"
     ],
     "sections": [
@@ -84,8 +84,8 @@
         "name": "GS11 - Basement Back Room",
         "short_name": "Back Room",
         "access_rules": [
-          "$has_explosives,[sling],boomerang,sticks",
-          "$has_explosives,[sling],boomerang,dinsfire,magic",
+          "$has_explosives,[sling],boomerang,sticks", //TODO: trick logic_deku_b1_skip
+          "$has_explosives,[sling],boomerang,dinsfire,magic", //TODO: trick logic_deku_b1_skip
           "{$has_explosives,sling,sticks}",
           "{$has_explosives,sling,dinsfire,magic}"
         ],
@@ -100,8 +100,8 @@
       {
         "name": "Queen Gohma",
         "access_rules": [
-          "shield1,[sling],sticks",
-          "shield1,[sling],sword1,dinsfire,magic"
+          "shield1,[sling],sticks", //TODO: trick logic_deku_b1_skip
+          "shield1,[sling],sword1,dinsfire,magic" //TODO: trick logic_deku_b1_skip
         ],
         "hosted_item": "deku",
         "chest_unopened_img": "images/HC.png",