Skip to content

Commit

Permalink
Merge pull request #119 from Hamsda:ootr
Browse files Browse the repository at this point in the history 
update to version 3.5.0.0
  • Loading branch information
@Hamsda
Hamsda authored Jun 22, 2021
2 parents 7f62f7a + c47aa10 commit cbf82fa
Show file tree
Hide file tree
Showing 27 changed files with 1,428 additions and 915 deletions.
Binary file modified ootrando_overworldmap_hamsda.zip
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions ootrando_overworldmap_hamsda/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 3.5.0.0

- added peeks to ER
- added trials clear logic to ER

## 3.4.4.0

- added KZ skip to ER
Expand Down
0 ..._overworldmap_hamsda/layouts/capture.json → ...orldmap_hamsda/layouts/capture_items.json
View file
File renamed without changes.
25 changes: 20 additions & 5 deletions ootrando_overworldmap_hamsda/locations/dungeons.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,11 +764,19 @@
"@Dodongos Cavern MQ/Bomb Bag Area,$has_age|adult,hookshot,bow",
"@Dodongos Cavern MQ/Bomb Bag Area,$has_age|adult,hookshot,lift1",
"@Dodongos Cavern MQ/Bomb Bag Area,$has_age|adult,hookshot,dinsfire,magic",
"@Dodongos Cavern MQ/Bomb Bag Area,$has_age|adult,hookshot,$has_explosives"
"@Dodongos Cavern MQ/Bomb Bag Area,$has_age|adult,hookshot,$has_explosives",
"{@Dodongos Cavern MQ/Bomb Bag Area,$has_age|child,sling,lift1}",
"{@Dodongos Cavern MQ/Bomb Bag Area,$has_age|child,sling,dinsfire,magic}",
"{@Dodongos Cavern MQ/Bomb Bag Area,$has_age|child,sling,$has_bombchus}",
"{@Dodongos Cavern MQ/Bomb Bag Area,$has_age|child,sticks,$has_bombchus}",
"{@Dodongos Cavern MQ/Bomb Bag Area,$has_age|child,sword1,$has_bombchus}",
"{@Dodongos Cavern MQ/Bomb Bag Area,$has_age|adult,bow}",
"{@Dodongos Cavern MQ/Bomb Bag Area,$has_age|adult,$has_bombchus}"
],
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -1056,7 +1064,7 @@
"access_rules": [
"@Jabu Jabus Belly/Main,boomerang",
"{@Jabu Jabus Belly/Main,sling}",
"{@Jabu Jabus Belly/Main,$has_explosives}"
"{@Jabu Jabus Belly/Main,$has_bombchus}"
],
"visibility_rules": [
"setting_tokens_dungeons"
Expand All @@ -1072,7 +1080,7 @@
"access_rules": [
"@Jabu Jabus Belly/Main,boomerang",
"{@Jabu Jabus Belly/Main,sling}",
"{@Jabu Jabus Belly/Main,$has_explosives}"
"{@Jabu Jabus Belly/Main,$has_bombchus}"
],
"visibility_rules": [
"setting_tokens_dungeons"
Expand Down Expand Up @@ -1337,6 +1345,7 @@
"access_rules": [
"hookshot",
"{bow}",
"{dinsfire,magic}",
"{$has_explosives}"
],
"visibility_rules": [
Expand Down Expand Up @@ -1372,6 +1381,7 @@
"access_rules": [
"hookshot",
"{bow}",
"{dinsfire,magic}",
"{$has_explosives}"
],
"visibility_rules": [
Expand All @@ -1389,6 +1399,7 @@
"hookshot",
"[logic_ice_block_gs],hoverboots",
"{bow}",
"{dinsfire,magic}",
"{$has_explosives}"
],
"visibility_rules": [
Expand Down Expand Up @@ -1728,6 +1739,7 @@
"access_rules": [
"@Forest Temple/NW Outdoors,longshot",
"{@Forest Temple/NW Outdoors,bow}",
"{@Forest Temple/NW Outdoors,$has_bombchus}",
"@Forest Temple/Outside Upper Ledge,hookshot"
],
"visibility_rules": [
Expand Down Expand Up @@ -2983,11 +2995,14 @@
"access_rules": [
"@Water Temple/Dark Link Region,ocarina,time,ironboots,$FTR_or_zora",
"@Water Temple/Dark Link Region,ocarina,time,[logic_water_river_gs],longshot,bow",
"@Water Temple/Dark Link Region,ocarina,time,[logic_water_river_gs],longshot,$has_bombchus"
"@Water Temple/Dark Link Region,ocarina,time,[logic_water_river_gs],longshot,$has_bombchus",
"{@Water Temple/Dark Link Region,ocarina,time,bow}",
"{@Water Temple/Dark Link Region,ocarina,time,$has_bombchus}"
],
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -4124,10 +4139,10 @@
"{@Spirit Temple/Central Chamber,$child_colossus,sling,$has_explosives}",
"{@Spirit Temple/Central Chamber,bow,$has_age|adult,lift2}"
],
"capture_item": true,
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down
49 changes: 48 additions & 1 deletion ootrando_overworldmap_hamsda/locations/dungeons_entrance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -1460,6 +1461,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -1490,6 +1492,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -1605,6 +1608,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -1663,6 +1667,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand All @@ -1685,6 +1690,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -1863,6 +1869,9 @@
{
"name": "Forest Trial Clear",
"short_name": "Forest Trial",
"access_rules": [
"$access_location|Forest Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand All @@ -1879,6 +1888,9 @@
{
"name": "Water Trial Clear",
"short_name": "Water Trial",
"access_rules": [
"$access_location|Water Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand All @@ -1903,6 +1915,9 @@
{
"name": "Shadow Trial Clear",
"short_name": "Shadow Trial",
"access_rules": [
"$access_location|Shadow Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand All @@ -1911,6 +1926,9 @@
{
"name": "Fire Trial Clear",
"short_name": "Fire Trial",
"access_rules": [
"$access_location|Fire Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand Down Expand Up @@ -1945,6 +1963,9 @@
{
"name": "Light Trial Clear",
"short_name": "Light Trial",
"access_rules": [
"$access_location|Light Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand All @@ -1969,6 +1990,9 @@
{
"name": "Spirit Trial Clear",
"short_name": "Spirit Trial",
"access_rules": [
"$access_location|Spirit Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand Down Expand Up @@ -2053,6 +2077,9 @@
{
"name": "Forest Trial Clear",
"short_name": "Forest Trial",
"access_rules": [
"$access_location|MQ Forest Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand All @@ -2069,6 +2096,9 @@
{
"name": "Water Trial Clear",
"short_name": "Water Trial",
"access_rules": [
"$access_location|MQ Water Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand All @@ -2094,6 +2124,9 @@
{
"name": "Shadow Trial Clear",
"short_name": "Shadow Trial",
"access_rules": [
"$access_location|MQ Shadow Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand All @@ -2102,6 +2135,9 @@
{
"name": "Fire Trial Clear",
"short_name": "Fire Trial",
"access_rules": [
"$access_location|MQ Fire Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand All @@ -2118,6 +2154,9 @@
{
"name": "Light Trial Clear",
"short_name": "Light Trial",
"access_rules": [
"$access_location|MQ Light Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand Down Expand Up @@ -2151,6 +2190,9 @@
{
"name": "Spirit Trial Clear",
"short_name": "Spirit Trial",
"access_rules": [
"$access_location|MQ Spirit Trial Clear"
],
"visibility_rules": [
"setting_trials:1"
],
Expand Down Expand Up @@ -2702,6 +2744,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -2954,6 +2997,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -3577,6 +3621,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -3617,10 +3662,10 @@
"access_rules": [
"$access_location|Spirit Temple GS Hall After Sun Block Room"
],
"capture_item": true,
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -3885,6 +3930,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down Expand Up @@ -4204,6 +4250,7 @@
"visibility_rules": [
"setting_tokens_dungeons"
],
"capture_item": true,
"chest_unopened_img": "images/skulltula.png",
"chest_opened_img": "images/skulltula_token.png",
"item_count": 1
Expand Down
Loading

0 comments on commit cbf82fa

Please sign in to comment.