Merge pull request #30 from Hamsda/dev

update to version 2.2.0.0

changelog.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.2.0.0
+
+- moved logic to lua
+- changed images for freestanding keys
+- changed GS counter to go up to 100
+- added capture for relevant freestanding models
+- fixed Fire Temple GS67 and GS68 capture
+- improved bottle logic to take Rutos letter and big poes into account
+- added Forest Temple scarecrow sequence break ([example](https://i.imgur.com/acQ97kk.gif))
+- added big poes sequence break for epona (chance to spawn while on foot)
+- added/fixed a bunch of hint locations, mainly MQ related
+- fixed Water Temple cracked wall sequence break
+- moved a bunch of locations around to make dungeons not overlap
+- added adult/child overlay to the first trade items
+
 ## 2.1.4.1
 
 - fixed DMC wall HP display error

ootrando_overworldmap_hamsda/items/dungeons.json

@@ -224,14 +224,14 @@
   {
     "name": "Forest Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "forest_small_keys,forestsmall,forestsk",
     "max_quantity": 6
   },
   {
     "name": "Forest Boss Key",
     "type": "toggle",
-    "img": "images/oot_boss_key.png",
+    "img": "images/boss_key.png",
     "codes": "forest_boss_key,forestboss,forestbk"
   },
   {
@@ -291,14 +291,14 @@
   {
     "name": "Fire Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "fire_small_keys,firesmall,firesk",
     "max_quantity": 8
   },
   {
     "name": "Fire Boss Key",
     "type": "toggle",
-    "img": "images/oot_boss_key.png",
+    "img": "images/boss_key.png",
     "codes": "fire_boss_key,fireboss,firebk"
   },
   {
@@ -358,14 +358,14 @@
   {
     "name": "Water Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "water_small_keys,watersmall,watersk",
     "max_quantity": 6
   },
   {
     "name": "Water Boss Key",
     "type": "toggle",
-    "img": "images/oot_boss_key.png",
+    "img": "images/boss_key.png",
     "codes": "water_boss_key,waterboss,waterbk"
   },
   {
@@ -425,14 +425,14 @@
   {
     "name": "Spirit Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "spirit_small_keys,spiritsmall,spiritsk",
     "max_quantity": 7
   },
   {
     "name": "Spirit Boss Key",
     "type": "toggle",
-    "img": "images/oot_boss_key.png",
+    "img": "images/boss_key.png",
     "codes": "spirit_boss_key,spiritboss,spiritbk"
   },
   {
@@ -492,14 +492,14 @@
   {
     "name": "Shadow Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "shadow_small_keys,shadowsmall,shadowsk",
     "max_quantity": 6
   },
   {
     "name": "Shadow Boss Key",
     "type": "toggle",
-    "img": "images/oot_boss_key.png",
+    "img": "images/boss_key.png",
     "codes": "shadow_boss_key,shadowboss,shadowbk"
   },
   {
@@ -559,7 +559,7 @@
   {
     "name": "BotW Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "botw_small_keys,botwsmall,botwsk",
     "max_quantity": 3
   },
@@ -589,7 +589,7 @@
   {
     "name": "GF Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "gf_small_keys,gfsmall,gfsk",
     "max_quantity": 4
   },
@@ -613,7 +613,7 @@
   {
     "name": "GTG Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "gtg_small_keys,gtgsmall,gtgsk",
     "max_quantity": 9
   },
@@ -637,26 +637,26 @@
   {
     "name": "GC Small Keys",
     "type": "consumable",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "gc_small_keys,gcsmall,gcsk",
     "max_quantity": 3
   },
   {
     "name": "GC Boss Key",
     "type": "toggle",
-    "img": "images/oot_boss_key.png",
+    "img": "images/boss_key.png",
     "codes": "gc_boss_key,gcboss,gcbk"
   },
   {
     "name": "Generic Small Keys",
     "type": "toggle",
-    "img": "images/oot_small_key.png",
+    "img": "images/small_key.png",
     "codes": "generic_small_key"
   },
   {
     "name": "Generic Boss Key",
     "type": "toggle",
-    "img": "images/oot_boss_key.png",
+    "img": "images/boss_key.png",
     "codes": "generic_boss_key"
   }
 ]

ootrando_overworldmap_hamsda/items/items.json

@@ -206,16 +206,18 @@
     "stages": [
       {
         "img": "images/egg.png",
-        "img_mods": "@disabled",
+        "img_mods": "@disabled,overlay|images/overlay_child.png",
         "codes": "nokidtrade"
       },
       {
         "img": "images/egg.png",
+        "img_mods": "overlay|images/overlay_child.png",
         "codes": "kidtrade,childegg,weirdegg",
         "inherit_codes": false
       },
       {
         "img": "images/cucco.png",
+        "img_mods": "overlay|images/overlay_child.png",
         "codes": "kidtrade,childcucco",
         "inherit_codes": false
       },
@@ -284,16 +286,18 @@
     "stages": [
       {
         "img": "images/egg.png",
-        "img_mods": "@disabled",
+        "img_mods": "@disabled,overlay|images/overlay_adult.png",
         "codes": "noadulttrade"
       },
       {
         "img": "images/egg.png",
+        "img_mods": "overlay|images/overlay_adult.png",
         "codes": "adulttrade,adultegg,pocketegg",
         "inherit_codes": false
       },
       {
         "img": "images/cucco.png",
+        "img_mods": "overlay|images/overlay_adult.png",
         "codes": "adulttrade,adultcucco,pocketcucco",
         "inherit_codes": false
       },
@@ -434,7 +438,7 @@
       },
       {
         "img": "images/bottle_bigpoe.png",
-        "codes": "bottle,bottle1,bigpoe1",
+        "codes": "bottle,bottle1,bigpoe,bigpoe1",
         "inherit_codes": false
       },
       {
@@ -506,7 +510,7 @@
       },
       {
         "img": "images/bottle_bigpoe.png",
-        "codes": "bottle,bottle2,bigpoe2",
+        "codes": "bottle,bottle2,bigpoe,bigpoe2",
         "inherit_codes": false
       },
       {
@@ -578,7 +582,7 @@
       },
       {
         "img": "images/bottle_bigpoe.png",
-        "codes": "bottle,bottle3,bigpoe3",
+        "codes": "bottle,bottle3,bigpoe,bigpoe3",
         "inherit_codes": false
       },
       {
@@ -650,7 +654,7 @@
       },
       {
         "img": "images/bottle_bigpoe.png",
-        "codes": "bottle,bottle4,bigpoe4",
+        "codes": "bottle,bottle4,bigpoe,bigpoe4",
         "inherit_codes": false
       },
       {

ootrando_overworldmap_hamsda/items/quest.json

@@ -16,7 +16,7 @@
     "type": "consumable",
     "img": "images/skulltula_token.png",
     "codes": "skulltula,goldskulltula,token",
-    "max_quantity": 50
+    "max_quantity": 100
   },
   {
     "name": "Wallet Upgrades",