Merge pull request #13 from Hamsda/dev

 update to version 2.1.0.0

ootrando_overworldmap_hamsda/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.1.0.0
+
+- switched to EmoTracker 2.1 variants
+- added Deku Scrub shuffle support
+- added Shopsanity support
+
 ## 2.0.3.3
 
 - fixed open forest (forgot the `item_count` again... oops)

ootrando_overworldmap_hamsda/items.json → ootrando_overworldmap_hamsda/items/common.json

@@ -1,4 +1,4 @@
-[
+[
   {
     "name": "Open Door",
     "type": "progressive",
@@ -114,6 +114,40 @@
       }
     ]
   },
+  {
+    "name": "Deku Scrub Shuffle",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "stages": [
+      {
+        "img": "images/scrub_shuffle_no.png",
+        "codes": "scrub_shuffle,scrub_shuffle_no"
+      },
+      {
+        "img": "images/scrub_shuffle_yes.png",
+        "codes": "scrub_shuffle,scrub_shuffle_yes",
+        "inherit_codes": false
+      }
+    ]
+  },
+  {
+    "name": "Shopsanity",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "stages": [
+      {
+        "img": "images/shopsanity_no.png",
+        "codes": "shopsanity,shopsanity_no"
+      },
+      {
+        "img": "images/shopsanity_yes.png",
+        "codes": "shopsanity,shopsanity_yes",
+        "inherit_codes": false
+      }
+    ]
+  },
   {
     "name": "Bow",
     "type": "progressive",
@@ -1337,13 +1371,6 @@
     "codes": "forest_treasures",
     "max_quantity": 8
   },
-  {
-    "name": "Forest Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "forest_small_keys",
-    "max_quantity": 5
-  },
   {
     "name": "Forest Prize",
     "type": "progressive_toggle",
@@ -1393,13 +1420,6 @@
     "codes": "fire_treasures",
     "max_quantity": 6
   },
-  {
-    "name": "Fire Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "fire_small_keys",
-    "max_quantity": 8
-  },
   {
     "name": "Fire Prize",
     "type": "progressive_toggle",
@@ -1449,13 +1469,6 @@
     "codes": "water_treasures",
     "max_quantity": 4
   },
-  {
-    "name": "Water Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "water_small_keys",
-    "max_quantity": 6
-  },
   {
     "name": "Water Prize",
     "type": "progressive_toggle",
@@ -1505,13 +1518,6 @@
     "codes": "spirit_treasures",
     "max_quantity": 14
   },
-  {
-    "name": "Spirit Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "spirit_small_keys",
-    "max_quantity": 5
-  },
   {
     "name": "Spirit Prize",
     "type": "progressive_toggle",
@@ -1561,13 +1567,6 @@
     "codes": "shadow_treasures",
     "max_quantity": 12
   },
-  {
-    "name": "Shadow Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "shadow_small_keys",
-    "max_quantity": 5
-  },
   {
     "name": "Shadow Prize",
     "type": "progressive_toggle",
@@ -1617,13 +1616,6 @@
     "codes": "botw_treasures",
     "max_quantity": 11
   },
-  {
-    "name": "BotW Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "botw_small_keys",
-    "max_quantity": 3
-  },
   {
     "name": "Ice Label",
     "type": "static",
@@ -1643,13 +1635,6 @@
     "img": "images/gf.png",
     "codes": "gf_label"
   },
-  {
-    "name": "GF Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "gf_small_keys",
-    "max_quantity": 4
-  },
   {
     "name": "GTG Label",
     "type": "static",
@@ -1663,13 +1648,6 @@
     "codes": "gtg_treasures",
     "max_quantity": 13
   },
-  {
-    "name": "GTG Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "gtg_small_keys",
-    "max_quantity": 9
-  },
   {
     "name": "GC Label",
     "type": "static",
@@ -1682,18 +1660,5 @@
     "img": "images/chest_brown_closed.png",
     "codes": "gc_treasures",
     "max_quantity": 13
-  },
-  {
-    "name": "GC Small Keys",
-    "type": "consumable",
-    "img": "images/oot_small_key.png",
-    "codes": "gc_small_keys",
-    "max_quantity": 2
-  },
-  {
-    "name": "GC Boss Key",
-    "type": "toggle",
-    "img": "images/oot_boss_key.png",
-    "codes": "gc_boss_key"
   }
 ]