diff --git a/dungeon_shuffle/tracker_layout.json b/dungeon_shuffle/tracker_layout.json index 3dd24c9..231f96d 100644 --- a/dungeon_shuffle/tracker_layout.json +++ b/dungeon_shuffle/tracker_layout.json @@ -428,7 +428,7 @@ "content": [ { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "-10,0,0,0", "width": 24, "height": 24 @@ -456,7 +456,7 @@ }, { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "0,0,0,0", "width": 24, "height": 24 @@ -491,7 +491,7 @@ "content": [ { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "0,0,12,0", "width": 24, "height": 24 @@ -505,7 +505,7 @@ }, { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "0,0,25,0", "width": 24, "height": 24 diff --git a/dungeon_shuffle_hard/tracker_layout.json b/dungeon_shuffle_hard/tracker_layout.json index 3dd24c9..231f96d 100644 --- a/dungeon_shuffle_hard/tracker_layout.json +++ b/dungeon_shuffle_hard/tracker_layout.json @@ -428,7 +428,7 @@ "content": [ { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "-10,0,0,0", "width": 24, "height": 24 @@ -456,7 +456,7 @@ }, { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "0,0,0,0", "width": 24, "height": 24 @@ -491,7 +491,7 @@ "content": [ { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "0,0,12,0", "width": 24, "height": 24 @@ -505,7 +505,7 @@ }, { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "0,0,25,0", "width": 24, "height": 24 diff --git a/items.json b/items.json index 03eec50..f2825e3 100644 --- a/items.json +++ b/items.json @@ -494,6 +494,15 @@ }, /// DUNGEONS /// + + // Maku Path + { + "name": "D0 Small Key", + "type": "consumable", + "img": "images/key.png", + "codes": "d0sk", + "max_quantity": 1 + }, // D1 { diff --git a/locations.json b/locations.json index d6188fd..8b34de0 100644 --- a/locations.json +++ b/locations.json @@ -1,4 +1,4 @@ -[ +[ { "name": "Lynna City", "chest_unopened_img": "images/chest.png", @@ -60,7 +60,7 @@ { "name": "Shop", "access_rules": [ - "$lynna", + "$lynna" ], "sections": [ { @@ -70,7 +70,7 @@ "access_rules": [ "{}", "rupees:150" - ], + ] } ], "map_locations": [ @@ -103,12 +103,12 @@ { "name": "Maku Tree", "access_rules": [ - "$destroy_bush, shovel, $kill_normal", - "$destroy_bush, shovel, [$kill_normal], $kill_hard", - "echoes, shovel, $kill_normal", - "echoes, shovel, [$kill_normal], $kill_hard", + "$destroy_bush, shovel, $kill_normal, d0sk:1", + "$destroy_bush, shovel, [$kill_normal], $kill_hard, d0sk:1", + "echoes, shovel, $kill_normal, d0sk:1", + "echoes, shovel, [$kill_normal], $kill_hard, d0sk:1", "$ambi_palace, $rescue_nayru", - "satchel, pegasusseeds, scentseeds, [$ambi_palace], $rescue_nayru", + "satchel, pegasusseeds, scentseeds, [$ambi_palace], $rescue_nayru" ], "sections": [ { @@ -129,6 +129,49 @@ } ] }, + { + "name": "Maku Path", + "sections": [ + { + "name": "Small Key Chest", + "access_rules": [ + "$destroy_bush, shovel, $kill_gel", + "$destroy_bush, shovel, [$kill_gel], $kill_gel_hard", + "echoes, shovel, $kill_gel", + "echoes, shovel, [$kill_gel], $kill_gel_hard", + "$ambi_palace, $rescue_nayru, d0sk:1", + "satchel, pegasusseeds, scentseeds, [$ambi_palace], $rescue_nayru, d0sk:1" + ], + "item_count": 1 + }, + { + "name": "Blocks room\nsecret stairs", + "access_rules": [ + "$destroy_bush, shovel, $kill_gel, d0sk:1", + "$destroy_bush, shovel, [$kill_gel], $kill_hard, d0sk:1", + "echoes, shovel, $kill_gel, d0sk:1", + "echoes, shovel, [$kill_gel], $kill_hard, d0sk:1", + "$ambi_palace, $rescue_nayru", + "satchel, pegasusseeds, scentseeds, [$ambi_palace], $rescue_nayru", + ], + "item_count": 1 + }, + { + "name": "Maku Path\nsmall key", + "hosted_item": "d0sk", + "item_count": 0 + } + + ], + "map_locations": [ + { + "map": "past", + "x": 274, + "y": 146 + } + ] + }, + { "name": "South Shore", diff --git a/maps/hard/locations.json b/maps/hard/locations.json index ff8aedd..87dbcb8 100644 --- a/maps/hard/locations.json +++ b/maps/hard/locations.json @@ -103,8 +103,8 @@ { "name": "Maku Tree", "access_rules": [ - "$destroy_bush_flute, shovel, $kill_hard", - "echoes, shovel, $kill_hard", + "$destroy_bush_flute, shovel, $kill_hard, d0sk:1", + "echoes, shovel, $kill_hard, d0sk:1", "$ambi_palace_hard, $rescue_nayru_hard" ], "sections": [ @@ -215,9 +215,30 @@ "$ambi_palace_hard, $rescue_nayru_hard" ], "sections": [ + { + "name": "Small Key Chest", + "access_rules": [ + "$destroy_bush, shovel, $kill_gel_hard", + "echoes, shovel, $kill_gel_hard", + "$ambi_palace_hard, $rescue_nayru_hard, d0sk:1", + "satchel, pegasusseeds, scentseeds, $ambi_palace_hard, $rescue_nayru_hard, d0sk:1" + ], + "item_count": 1 + }, { "name": "Blocks room\nsecret stairs", + "access_rules": [ + "$destroy_bush, shovel, $kill_gel_hard, d0sk:1", + "echoes, shovel, $kill_gel_hard, d0sk:1", + "$ambi_palace_hard, $rescue_nayru_hard", + "satchel, pegasusseeds, scentseeds, $ambi_palace_hard, $rescue_nayru_hard" + ], "item_count": 1 + }, + { + "name": "Maku Path\nsmall key", + "hosted_item": "d0sk", + "item_count": 0 } ], "map_locations": [ diff --git a/maps/normal/locations.json b/maps/normal/locations.json index 1e142c0..a0fec25 100644 --- a/maps/normal/locations.json +++ b/maps/normal/locations.json @@ -103,10 +103,10 @@ { "name": "Maku Tree", "access_rules": [ - "$destroy_bush_flute, shovel, $kill_normal", - "$destroy_bush_flute, shovel, [$kill_normal], $kill_hard", - "echoes, shovel, $kill_normal", - "echoes, shovel, [$kill_normal], $kill_hard", + "$destroy_bush_flute, shovel, $kill_normal, d0sk:1", + "$destroy_bush_flute, shovel, [$kill_normal], $kill_hard, d0sk:1", + "echoes, shovel, $kill_normal, d0sk:1", + "echoes, shovel, [$kill_normal], $kill_hard, d0sk:1", "$ambi_palace, $rescue_nayru", "satchel, pegasusseeds, scentseeds, [$ambi_palace], $rescue_nayru", ], @@ -219,9 +219,34 @@ "satchel, pegasusseeds, scentseeds, [$ambi_palace], $rescue_nayru", ], "sections": [ + { + "name": "Small Key Chest", + "access_rules": [ + "$destroy_bush, shovel, $kill_gel", + "$destroy_bush, shovel, [$kill_gel], $kill_gel_hard", + "echoes, shovel, $kill_gel", + "echoes, shovel, [$kill_gel], $kill_gel_hard", + "$ambi_palace, $rescue_nayru, d0sk:1", + "satchel, pegasusseeds, scentseeds, [$ambi_palace], $rescue_nayru, d0sk:1" + ], + "item_count": 1 + }, { "name": "Blocks room\nsecret stairs", + "access_rules": [ + "$destroy_bush, shovel, $kill_gel, d0sk:1", + "$destroy_bush, shovel, [$kill_gel], $kill_gel_hard, d0sk:1", + "echoes, shovel, $kill_gel, d0sk:1", + "echoes, shovel, [$kill_gel], $kill_gel_hard, d0sk:1", + "$ambi_palace, $rescue_nayru", + "satchel, pegasusseeds, scentseeds, [$ambi_palace], $rescue_nayru", + ], "item_count": 1 + }, + { + "name": "Maku Path\nsmall key", + "hosted_item": "d0sk", + "item_count": 0 } ], "map_locations": [ diff --git a/tracker_layout.json b/tracker_layout.json index b255029..4315e0e 100644 --- a/tracker_layout.json +++ b/tracker_layout.json @@ -370,7 +370,7 @@ "content": [ { "type": "item", - "item": "d0sk", + "item": "dXsk", "width": 24, "height": 24 }, @@ -397,7 +397,7 @@ }, { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "2,0,0,0", "width": 24, "height": 24 @@ -457,7 +457,7 @@ "content": [ { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "0,0,12,0", "width": 24, "height": 24 @@ -471,7 +471,7 @@ }, { "type": "item", - "item": "d0sk", + "item": "dXsk", "margin": "0,0,25,0", "width": 24, "height": 24