Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maku path key check #2

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Maku path key check #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad8a9ff
changed d0sk -> spacer so Maku path small key doesn't show up randoml…
MadagacarDave May 22, 2021
4ca76d8
added Maku path small key to items
MadagacarDave May 22, 2021
4f1b744
logic for what is possible with or with out maku path key
MadagacarDave May 22, 2021
8fb2cdf
used dxsk to fix D6 Present Auto tracking
MadagacarDave May 24, 2021
eb8ae19
few more logic fixes for Maku path normal and hard logic
MadagacarDave Jul 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dungeon_shuffle/tracker_layout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
"content": [
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "-10,0,0,0",
"width": 24,
"height": 24
Expand Down Expand Up @@ -456,7 +456,7 @@
},
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "0,0,0,0",
"width": 24,
"height": 24
Expand Down Expand Up @@ -491,7 +491,7 @@
"content": [
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "0,0,12,0",
"width": 24,
"height": 24
Expand All @@ -505,7 +505,7 @@
},
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "0,0,25,0",
"width": 24,
"height": 24
Expand Down
8 changes: 4 additions & 4 deletions dungeon_shuffle_hard/tracker_layout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
"content": [
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "-10,0,0,0",
"width": 24,
"height": 24
Expand Down Expand Up @@ -456,7 +456,7 @@
},
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "0,0,0,0",
"width": 24,
"height": 24
Expand Down Expand Up @@ -491,7 +491,7 @@
"content": [
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "0,0,12,0",
"width": 24,
"height": 24
Expand All @@ -505,7 +505,7 @@
},
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "0,0,25,0",
"width": 24,
"height": 24
Expand Down
9 changes: 9 additions & 0 deletions items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,15 @@
},

/// DUNGEONS ///

// Maku Path
{
"name": "D0 Small Key",
"type": "consumable",
"img": "images/key.png",
"codes": "d0sk",
"max_quantity": 1
},

// D1
{
Expand Down
59 changes: 51 additions & 8 deletions locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[
[
{
"name": "Lynna City",
"chest_unopened_img": "images/chest.png",
Expand Down Expand Up @@ -60,7 +60,7 @@
{
"name": "Shop",
"access_rules": [
"$lynna",
"$lynna"
],
"sections": [
{
Expand All @@ -70,7 +70,7 @@
"access_rules": [
"{}",
"rupees:150"
],
]
}
],
"map_locations": [
Expand Down Expand Up @@ -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": [
{
Expand All @@ -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",
Expand Down
25 changes: 23 additions & 2 deletions maps/hard/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down
33 changes: 29 additions & 4 deletions maps/normal/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down Expand Up @@ -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": [
Expand Down
8 changes: 4 additions & 4 deletions tracker_layout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
"content": [
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"width": 24,
"height": 24
},
Expand All @@ -397,7 +397,7 @@
},
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "2,0,0,0",
"width": 24,
"height": 24
Expand Down Expand Up @@ -457,7 +457,7 @@
"content": [
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "0,0,12,0",
"width": 24,
"height": 24
Expand All @@ -471,7 +471,7 @@
},
{
"type": "item",
"item": "d0sk",
"item": "dXsk",
"margin": "0,0,25,0",
"width": 24,
"height": 24
Expand Down