Skip to content

Commit

Permalink
Merge pull request #49 from Hamsda/dev
Browse files Browse the repository at this point in the history 
update to version 2.3.3.0
  • Loading branch information
@Hamsda
Hamsda authored Mar 10, 2019
2 parents f0269fb + 6b60c29 commit 847aadb
Show file tree
Hide file tree
Showing 15 changed files with 595 additions and 211 deletions.
7 changes: 7 additions & 0 deletions changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 2.3.3.0

- changed skulltula house to always be visible on adult map
- swapped spirit and shadow medallion for the lacs medallion
- changed various locations to be hidden if respective settings are off (scrubs, shops, cows, skulls, mq)
- changed more locations to be hintable

## 2.3.2.2

- fixed Jabu Jabu access
Expand Down
Binary file modified ootrando_overworldmap_hamsda.zip
View file
Binary file not shown.
Binary file modified ootrando_overworldmap_hamsda/images/lacs_medallions.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 32 additions & 10 deletions ootrando_overworldmap_hamsda/locations/dung_mq.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"deku_mq"
],
"x": 2426,
"y": 860
}
Expand Down Expand Up @@ -117,7 +120,8 @@
"short_name": "Ceiling",
"access_rules": [
"@Deku Tree MQ/Compass Chest,boomerang,ocarina,time",
"{@Deku Tree MQ/Compass Chest,sling}"
"{@Deku Tree MQ/Compass Chest,sling}",
"{$hintable}"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
Expand All @@ -140,6 +144,9 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"deku_mq,setting_skulltulas_dungeons"
],
"x": 2460,
"y": 860
}
Expand All @@ -165,6 +172,9 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"deku_mq,setting_scrub_shuffle_yes"
],
"x": 2426,
"y": 890
}
Expand Down Expand Up @@ -263,16 +273,15 @@
{
"map": "child",
"visibility_rules": [
"$has_explosives",
"lift1"
"dodongo_mq"
],
"x": 1684,
"y": 250
},
{
"map": "adult",
"visibility_rules": [
"sword2"
"dodongo_mq"
],
"x": 1684,
"y": 250
Expand Down Expand Up @@ -350,16 +359,15 @@
{
"map": "child",
"visibility_rules": [
"$has_explosives",
"lift1"
"dodongo_mq,setting_skulltulas_dungeons"
],
"x": 1654,
"y": 250
},
{
"map": "adult",
"visibility_rules": [
"sword2"
"dodongo_mq,setting_skulltulas_dungeons"
],
"x": 1654,
"y": 250
Expand Down Expand Up @@ -411,16 +419,15 @@
{
"map": "child",
"visibility_rules": [
"$has_explosives",
"lift1"
"dodongo_mq,setting_scrub_shuffle_yes"
],
"x": 1624,
"y": 250
},
{
"map": "adult",
"visibility_rules": [
"sword2"
"dodongo_mq,setting_scrub_shuffle_yes"
],
"x": 1624,
"y": 250
Expand Down Expand Up @@ -539,6 +546,9 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"jabu_mq"
],
"x": 2458,
"y": 328
}
Expand Down Expand Up @@ -598,6 +608,9 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"jabu_mq,setting_skulltulas_dungeons"
],
"x": 2458,
"y": 298
}
Expand All @@ -619,6 +632,9 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"jabu_mq,setting_cowsanity_yes"
],
"x": 2458,
"y": 358
}
Expand Down Expand Up @@ -676,6 +692,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"ice_mq"
],
"x": 2471,
"y": 276
}
Expand Down Expand Up @@ -719,6 +738,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"ice_mq,setting_skulltulas_dungeons"
],
"x": 2471,
"y": 246
}
Expand Down
55 changes: 50 additions & 5 deletions ootrando_overworldmap_hamsda/locations/dung_mq_keys.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"forest_mq"
],
"x": 2178,
"y": 596
}
Expand Down Expand Up @@ -196,6 +199,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"forest_mq,setting_skulltulas_dungeons"
],
"x": 2178,
"y": 566
}
Expand Down Expand Up @@ -323,6 +329,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"fire_mq"
],
"x": 1912,
"y": 115
}
Expand Down Expand Up @@ -370,8 +379,10 @@
"name": "GS68 - Above Fire Wall Maze",
"short_name": "Above Fire Maze",
"access_rules": [
"@Fire Temple MQ/Freestanding Key"
"@Fire Temple MQ/Freestanding Key",
"{$hintable}"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand All @@ -390,6 +401,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"fire_mq,setting_skulltulas_dungeons"
],
"x": 1942,
"y": 115
}
Expand Down Expand Up @@ -478,6 +492,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"water_mq"
],
"x": 985,
"y": 1380
}
Expand All @@ -504,7 +521,8 @@
"name": "GS74 - North Basement",
"short_name": "North Basement",
"access_rules": [
"@Water Temple MQ/Freestanding Key"
"@Water Temple MQ/Freestanding Key",
"{$hintable}"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
Expand Down Expand Up @@ -545,6 +563,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"water_mq,setting_skulltulas_dungeons"
],
"x": 985,
"y": 1350
}
Expand Down Expand Up @@ -720,6 +741,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"shadow_mq"
],
"x": 2144,
"y": 296
}
Expand Down Expand Up @@ -787,6 +811,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"shadow_mq,setting_skulltulas_dungeons"
],
"x": 2174,
"y": 296
}
Expand Down Expand Up @@ -1010,15 +1037,15 @@
{
"map": "child",
"visibility_rules": [
"ocarina,requiem"
"spirit_mq"
],
"x": 55,
"y": 301
},
{
"map": "adult",
"visibility_rules": [
"sword2"
"spirit_mq"
],
"x": 55,
"y": 301
Expand Down Expand Up @@ -1087,13 +1114,16 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"spirit_mq,setting_skulltulas_dungeons"
],
"x": 55,
"y": 271
},
{
"map": "adult",
"visibility_rules": [
"sword2"
"spirit_mq,setting_skulltulas_dungeons"
],
"x": 55,
"y": 271
Expand Down Expand Up @@ -1163,6 +1193,9 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"botw_mq"
],
"x": 1920,
"y": 383
}
Expand Down Expand Up @@ -1209,6 +1242,9 @@
"map_locations": [
{
"map": "child",
"visibility_rules": [
"botw_mq,setting_skulltulas_dungeons"
],
"x": 1920,
"y": 414
}
Expand Down Expand Up @@ -1331,6 +1367,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"gc_mq"
],
"x": 1409,
"y": 206
}
Expand All @@ -1356,6 +1395,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"gc_mq,setting_scrub_shuffle_yes"
],
"x": 1409,
"y": 176
}
Expand Down Expand Up @@ -1490,6 +1532,9 @@
"map_locations": [
{
"map": "adult",
"visibility_rules": [
"gtg_mq"
],
"x": 481,
"y": 474
}
Expand Down
Loading

0 comments on commit 847aadb

Please sign in to comment.