Ocarina of Time 7.0 (#1277)

## What is this fixing or adding?
- Adds the majority of OoTR 7.0 features:
  - Pot shuffle, Freestanding item shuffle, Crate shuffle, Beehive shuffle
  - Key rings mode
  - Dungeon shortcuts to speed up dungeons
  - "Regional" shuffle for dungeon items
  - New options for shop pricing in shopsanity
  - Expanded Ganon's Boss Key shuffle options
  - Pre-planted beans
  - Improved Chest Appearance Matches Contents mode
  - Blue Fire Arrows
  - Bonk self-damage
  - Finer control over MQ dungeons and spawn position randomization
- Several bugfixes as a result of the update:
  - Items recognized by the server and valid starting items are now in a 1-to-1 correspondence. In particular, starting with keys is now supported.
  - Entrance randomization success rate improved. Hopefully it is now at 100%. 

Co-authored-by: Zach Parks <zach@alliware.com>
This commit is contained in:
espeon65536
2022-12-10 21:11:40 -06:00
committed by GitHub
parent 2cdd03f786
commit aee0df5359
110 changed files with 37691 additions and 18648 deletions

View File

@@ -5,50 +5,82 @@
"exits": {
"Death Mountain": "True",
"Dodongos Cavern Lobby": "
here(can_blast_or_smash or Progressive_Strength_Upgrade)"
here(can_blast_or_smash or Progressive_Strength_Upgrade) or
dodongos_cavern_shortcuts"
}
},
{
"region_name": "Dodongos Cavern Lobby",
"dungeon": "Dodongos Cavern",
"locations": {
"Dodongos Cavern Map Chest": "True",
"Dodongos Cavern GS Side Room Near Lower Lizalfos": "
has_explosives or is_adult or Slingshot or
Boomerang or Sticks or Kokiri_Sword",
"Dodongos Cavern GS Scarecrow": "
can_use(Scarecrow) or can_use(Longshot) or
(logic_dc_scarecrow_gs and (is_adult or can_child_attack))",
"Dodongos Cavern Deku Scrub Side Room Near Dodongos": "
is_adult or Slingshot or Sticks or
has_explosives or Kokiri_Sword",
"Dodongos Cavern Deku Scrub Lobby": "True",
"Dodongos Cavern Gossip Stone": "True",
"Gossip Stone Fairy": "can_summon_gossip_fairy and has_bottle"
"Dodongos Cavern Map Chest": "can_blast_or_smash or Progressive_Strength_Upgrade",
"Dodongos Cavern Deku Scrub Lobby": "can_stun_deku or Progressive_Strength_Upgrade",
"Dodongos Cavern Gossip Stone": "here(can_blast_or_smash or Progressive_Strength_Upgrade)",
"Gossip Stone Fairy": "
(can_blast_or_smash or Progressive_Strength_Upgrade) and
can_summon_gossip_fairy and has_bottle"
},
"exits": {
"Dodongos Cavern Beginning": "True",
"Dodongos Cavern Lower Right Side": "has_explosives or Progressive_Strength_Upgrade",
"Dodongos Cavern Torch Room": "is_adult",
"Dodongos Cavern Staircase Room": "
here(is_adult or Sticks or
(can_use(Dins_Fire) and (Slingshot or has_explosives or Kokiri_Sword)))",
"Dodongos Cavern Far Bridge": "at('Dodongos Cavern Far Bridge', True)"
at('Dodongos Cavern Torch Room', is_adult or Sticks or can_use(Dins_Fire))",
"Dodongos Cavern Far Bridge": "at('Dodongos Cavern Far Bridge', True)",
"Dodongos Cavern Before Boss": "dodongos_cavern_shortcuts"
}
},
{
"region_name": "Dodongos Cavern Lower Right Side",
"dungeon": "Dodongos Cavern",
"locations": {
"Dodongos Cavern Lower Lizalfos Hidden Recovery Heart": "True",
"Dodongos Cavern Right Side Pot 1": "True",
"Dodongos Cavern Right Side Pot 2": "True",
"Dodongos Cavern Right Side Pot 3": "True",
"Dodongos Cavern Right Side Pot 4": "True",
"Dodongos Cavern Right Side Pot 5": "True",
"Dodongos Cavern Right Side Pot 6": "True",
"Dodongos Cavern Lower Lizalfos Pot 1": "True",
"Dodongos Cavern Lower Lizalfos Pot 2": "True",
"Dodongos Cavern Lower Lizalfos Pot 3": "True",
"Dodongos Cavern Lower Lizalfos Pot 4": "True",
"Dodongos Cavern GS Side Room Near Lower Lizalfos": "
is_adult or has_explosives or Sticks or Slingshot or Boomerang or Kokiri_Sword",
"Dodongos Cavern GS Scarecrow": "
can_use(Scarecrow) or can_use(Longshot) or
(logic_dc_scarecrow_gs and (is_adult or can_child_attack))"
},
"exits": {
"Dodongos Cavern Torch Room": "Sticks or Slingshot or Bombs or Kokiri_Sword"
}
},
{
"region_name": "Dodongos Cavern Torch Room",
"dungeon": "Dodongos Cavern",
"locations": {
"Dodongos Cavern Deku Scrub Side Room Near Dodongos": "
can_blast_or_smash or Progressive_Strength_Upgrade",
"Dodongos Cavern Torch Room Pot 1": "True",
"Dodongos Cavern Torch Room Pot 2": "True",
"Dodongos Cavern Torch Room Pot 3": "True",
"Dodongos Cavern Torch Room Pot 4": "True"
},
"exits": {
"Dodongos Cavern Lower Right Side": "True"
}
},
{
"region_name": "Dodongos Cavern Staircase Room",
"dungeon": "Dodongos Cavern",
"locations": {
"Dodongos Cavern Compass Chest": "True",
"Dodongos Cavern Compass Chest": "can_blast_or_smash or Progressive_Strength_Upgrade",
"Dodongos Cavern GS Vines Above Stairs": "
has_explosives or Progressive_Strength_Upgrade or can_use(Dins_Fire) or
(logic_dc_staircase and can_use(Bow)) or
(logic_dc_vines_gs and can_use(Longshot))"
at('Dodongos Cavern Climb', True) or (logic_dc_vines_gs and can_use(Longshot))"
},
"exits": {
"Dodongos Cavern Lobby": "True",
"Dodongos Cavern Climb": "
has_explosives or Progressive_Strength_Upgrade or
can_use(Dins_Fire) or (logic_dc_staircase and can_use(Bow))"
has_explosives or Progressive_Strength_Upgrade or
can_use(Dins_Fire) or (logic_dc_staircase and can_use(Bow))"
}
},
{
@@ -61,14 +93,46 @@
(logic_dc_scrub_room and is_adult and Progressive_Strength_Upgrade)",
"Dodongos Cavern Deku Scrub Near Bomb Bag Left": "
can_blast_or_smash or
(logic_dc_scrub_room and is_adult and Progressive_Strength_Upgrade)"
(logic_dc_scrub_room and is_adult and Progressive_Strength_Upgrade)",
"Dodongos Cavern Blade Room Behind Block Recovery Heart": "True",
"Dodongos Cavern Staircase Pot 1": "True",
"Dodongos Cavern Staircase Pot 2": "True",
"Dodongos Cavern Staircase Pot 3": "True",
"Dodongos Cavern Staircase Pot 4": "True",
"Dodongos Cavern Blade Room Pot 1": "
can_use(Boomerang) or at('Dodongos Cavern Far Bridge', True)",
"Dodongos Cavern Blade Room Pot 2": "
can_use(Boomerang) or at('Dodongos Cavern Far Bridge', True)"
},
"exits": {
"Dodongos Cavern Lobby": "True",
"Dodongos Cavern Before Upper Lizalfos": "
here(can_blast_or_smash or Progressive_Strength_Upgrade)",
"Dodongos Cavern Far Bridge": "
(is_child and (Slingshot or
(logic_dc_slingshot_skip and (Sticks or has_explosives or Kokiri_Sword)))) or
(is_adult and (Bow or Hover_Boots or can_use(Longshot) or logic_dc_jump))"
is_adult and (logic_dc_jump or Hover_Boots or Longshot)"
}
},
{
"region_name": "Dodongos Cavern Before Upper Lizalfos",
"dungeon": "Dodongos Cavern",
"locations": {
"Dodongos Cavern Single Eye Switch Room Pot 1": "True",
"Dodongos Cavern Single Eye Switch Room Pot 2": "True"
},
"exits": {
"Dodongos Cavern Upper Lizalfos": "
(is_child and (Slingshot or logic_dc_slingshot_skip)) or can_use(Bow)"
}
},
{
"region_name": "Dodongos Cavern Upper Lizalfos",
"dungeon": "Dodongos Cavern",
"locations": {
"Dodongos Cavern Lizalfos Upper Recovery Heart 1": "True",
"Dodongos Cavern Lizalfos Upper Recovery Heart 2": "True"
},
"exits": {
"Dodongos Cavern Before Upper Lizalfos": "True",
"Dodongos Cavern Far Bridge": "is_adult or Sticks or Slingshot or Bombs or Kokiri_Sword"
}
},
{
@@ -77,29 +141,27 @@
"locations": {
"Dodongos Cavern Bomb Bag Chest": "True",
"Dodongos Cavern End of Bridge Chest": "can_blast_or_smash",
"Dodongos Cavern Double Eye Switch Room Pot 1": "True",
"Dodongos Cavern Double Eye Switch Room Pot 2": "True",
"Dodongos Cavern GS Alcove Above Stairs": "can_use(Hookshot) or can_use(Boomerang)"
},
"exits": {
"Dodongos Cavern Boss Area": "has_explosives",
"Dodongos Cavern Lobby": "True"
"Dodongos Cavern Before Boss": "has_explosives",
"Dodongos Cavern Upper Lizalfos": "True"
}
},
{
"region_name": "Dodongos Cavern Boss Area",
"region_name": "Dodongos Cavern Before Boss",
"dungeon": "Dodongos Cavern",
"locations": {
"Dodongos Cavern Boss Room Chest": "True",
"Dodongos Cavern King Dodongo Heart": "
(Bombs or Progressive_Strength_Upgrade) and
(is_adult or Sticks or Kokiri_Sword)",
"King Dodongo": "
(Bombs or Progressive_Strength_Upgrade) and
(is_adult or Sticks or Kokiri_Sword)",
"Dodongos Cavern GS Back Room": "True",
"Dodongos Cavern Last Block Pot 1": "True",
"Dodongos Cavern Last Block Pot 2": "True",
"Dodongos Cavern Last Block Pot 3": "True",
"Dodongos Cavern GS Back Room": "can_blast_or_smash",
"Fairy Pot": "has_bottle"
},
"exits": {
"Dodongos Cavern Lobby": "True"
"Dodongos Cavern Boss Door": "True"
}
}
]