Merge pull request #124 from Hamsda:ootr

update to version 3.7.0.0
Hamsda · Nov 28, 2021 · 643d07f · 643d07f
2 parents 9b3285e + 232ac1f
commit 643d07f
Show file tree

Hide file tree

Showing 139 changed files with 4,219 additions and 2,823 deletions.
diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/README.md b/ootrando_overworldmap_hamsda/README.md
diff --git a/ootrando_overworldmap_hamsda/SETTINGS.md b/ootrando_overworldmap_hamsda/SETTINGS.md
diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 3.7.0.0
+
+- changed startup to fix incorrect save loading
+- added missing `Market Back Alley` capture in ER
+- added customizable setting preset loader
+- added settings for shuffled keys
+- changed hintable locations based on [PR #1381](https://github.com/TestRunnerSRL/OoT-Randomizer/pull/1381)
+- renamed locations based on [PR #1280](https://github.com/TestRunnerSRL/OoT-Randomizer/pull/1280) and [PR #1282](https://github.com/TestRunnerSRL/OoT-Randomizer/pull/1282)
+- removed logic trick in MQ Forest based on [PR #1359](https://github.com/TestRunnerSRL/OoT-Randomizer/pull/1359)
+- added logic trick for KZ skip based on [PR #1317](https://github.com/TestRunnerSRL/OoT-Randomizer/pull/1317)
+- added setting for mixed pools in ER
+- changed style of settings to text instead of icons
+- changed bean planting from setting to `user_setting`
+
 ## 3.6.0.0
 
 - fixed overlap between LH owl and grotto in ER
@@ -877,7 +891,7 @@
   - tried to model the reqs
   - marked lens as optional (pretty easy to do the entire dungeon without)
   - added option to reach Bongo Bongo with longshot (there is a scarecrow you can reach)
-- improved Gerudo Training Grounds:
+- improved Gerudo Training Ground:
   - split up the items
   - added reqs to each of the outer chests
   - marked hammer as optional for the pillar room (can be easily skipped with a damage boost)

diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_comp.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_comp.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_grotto_royal_tomb.png b/ootrando_overworldmap_hamsda/images/entrance_grotto_royal_tomb.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_mkt_aly.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_mkt_aly.png
diff --git a/ootrando_overworldmap_hamsda/images/label_gf.png b/ootrando_overworldmap_hamsda/images/label_gf.png
diff --git a/ootrando_overworldmap_hamsda/images/label_th.png b/ootrando_overworldmap_hamsda/images/label_th.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_forest_mq_hallway_switch_hookshot.png b/ootrando_overworldmap_hamsda/images/logic_forest_mq_hallway_switch_hookshot.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_king_zora_skip.png b/ootrando_overworldmap_hamsda/images/logic_king_zora_skip.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_age_adult.png b/ootrando_overworldmap_hamsda/images/setting_age_adult.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_age_child.png b/ootrando_overworldmap_hamsda/images/setting_age_child.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_amount.png b/ootrando_overworldmap_hamsda/images/setting_bridge_amount.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_dungeons.png b/ootrando_overworldmap_hamsda/images/setting_bridge_dungeons.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_gs.png b/ootrando_overworldmap_hamsda/images/setting_bridge_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_medallions.png b/ootrando_overworldmap_hamsda/images/setting_bridge_medallions.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_open.png b/ootrando_overworldmap_hamsda/images/setting_bridge_open.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_stones.png b/ootrando_overworldmap_hamsda/images/setting_bridge_stones.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_vanilla.png b/ootrando_overworldmap_hamsda/images/setting_bridge_vanilla.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_cowsanity_no.png b/ootrando_overworldmap_hamsda/images/setting_cowsanity_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_cowsanity_yes.png b/ootrando_overworldmap_hamsda/images/setting_cowsanity_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_damage_double.png b/ootrando_overworldmap_hamsda/images/setting_damage_double.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_damage_half.png b/ootrando_overworldmap_hamsda/images/setting_damage_half.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_damage_normal.png b/ootrando_overworldmap_hamsda/images/setting_damage_normal.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_damage_ohko.png b/ootrando_overworldmap_hamsda/images/setting_damage_ohko.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_damage_quadruple.png b/ootrando_overworldmap_hamsda/images/setting_damage_quadruple.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_door_closed.png b/ootrando_overworldmap_hamsda/images/setting_door_closed.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_door_open.png b/ootrando_overworldmap_hamsda/images/setting_door_open.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_dungeons_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_grottos_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_all.png b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_all.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_simple.png b/ootrando_overworldmap_hamsda/images/setting_entrance_interiors_simple.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_mixed_all.png b/ootrando_overworldmap_hamsda/images/setting_entrance_mixed_all.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_mixed_indoor.png b/ootrando_overworldmap_hamsda/images/setting_entrance_mixed_indoor.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_mixed_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_mixed_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_overworld_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_overworld_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_overworld_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_overworld_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_owl_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_owl_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_owl_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_owl_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_warpsong_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_warpsong_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_warpsong_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_warpsong_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_forest_closed.png b/ootrando_overworldmap_hamsda/images/setting_forest_closed.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_forest_deku.png b/ootrando_overworldmap_hamsda/images/setting_forest_deku.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_forest_open.png b/ootrando_overworldmap_hamsda/images/setting_forest_open.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_fountain_adult.png b/ootrando_overworldmap_hamsda/images/setting_fountain_adult.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_fountain_closed.png b/ootrando_overworldmap_hamsda/images/setting_fountain_closed.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_fountain_open.png b/ootrando_overworldmap_hamsda/images/setting_fountain_open.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_gerudo_fortress_fast.png b/ootrando_overworldmap_hamsda/images/setting_gerudo_fortress_fast.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_gerudo_fortress_normal.png b/ootrando_overworldmap_hamsda/images/setting_gerudo_fortress_normal.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_gerudo_fortress_open.png b/ootrando_overworldmap_hamsda/images/setting_gerudo_fortress_open.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_hints_agony.png b/ootrando_overworldmap_hamsda/images/setting_hints_agony.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_hints_off.png b/ootrando_overworldmap_hamsda/images/setting_hints_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_hints_on.png b/ootrando_overworldmap_hamsda/images/setting_hints_on.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_hints_truth.png b/ootrando_overworldmap_hamsda/images/setting_hints_truth.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_kak_closed.png b/ootrando_overworldmap_hamsda/images/setting_kak_closed.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_kak_letter.png b/ootrando_overworldmap_hamsda/images/setting_kak_letter.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_kak_open.png b/ootrando_overworldmap_hamsda/images/setting_kak_open.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_logic_chus_no.png b/ootrando_overworldmap_hamsda/images/setting_logic_chus_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_logic_chus_yes.png b/ootrando_overworldmap_hamsda/images/setting_logic_chus_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_masks_complete.png b/ootrando_overworldmap_hamsda/images/setting_masks_complete.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_masks_off.png b/ootrando_overworldmap_hamsda/images/setting_masks_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_merchants_off.png b/ootrando_overworldmap_hamsda/images/setting_merchants_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_merchants_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_merchants_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_scrub_shuffle_no.png b/ootrando_overworldmap_hamsda/images/setting_scrub_shuffle_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_scrub_shuffle_yes.png b/ootrando_overworldmap_hamsda/images/setting_scrub_shuffle_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shopsanity_no.png b/ootrando_overworldmap_hamsda/images/setting_shopsanity_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shopsanity_yes.png b/ootrando_overworldmap_hamsda/images/setting_shopsanity_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_beans_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_beans_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_beans_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_beans_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_bosskeys_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_bosskeys_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_bosskeys_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_bosskeys_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_card_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_card_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_card_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_card_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_egg_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_egg_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_egg_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_egg_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_ganon_bosskey_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_ganon_bosskey_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_ganon_bosskey_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_ganon_bosskey_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_hideoutkeys_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_hideoutkeys_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_hideoutkeys_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_hideoutkeys_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_merchants_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_merchants_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_merchants_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_merchants_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_ocarinas_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_ocarinas_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_ocarinas_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_ocarinas_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_smallkeys_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_smallkeys_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_smallkeys_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_smallkeys_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_sword1_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_sword1_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_sword1_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_sword1_yes.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_skulltulas_sun_off.png b/ootrando_overworldmap_hamsda/images/setting_skulltulas_sun_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_skulltulas_sun_on.png b/ootrando_overworldmap_hamsda/images/setting_skulltulas_sun_on.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_tokens_all.png b/ootrando_overworldmap_hamsda/images/setting_tokens_all.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_tokens_dungeons.png b/ootrando_overworldmap_hamsda/images/setting_tokens_dungeons.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_tokens_off.png b/ootrando_overworldmap_hamsda/images/setting_tokens_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_tokens_overworld.png b/ootrando_overworldmap_hamsda/images/setting_tokens_overworld.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_trials.png b/ootrando_overworldmap_hamsda/images/setting_trials.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_zelda_free.png b/ootrando_overworldmap_hamsda/images/setting_zelda_free.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_zelda_off.png b/ootrando_overworldmap_hamsda/images/setting_zelda_off.png
diff --git a/ootrando_overworldmap_hamsda/items/capture_entrance.json b/ootrando_overworldmap_hamsda/items/capture_entrance.json
@@ -60,7 +60,7 @@
     "codes": "entrance_dungeon_ice"
   },
   {
-    "name": "Gerudo Training Grounds Split",
+    "name": "Gerudo Training Ground Split",
     "type": "toggle",
     "img": "images/entrance_dungeon_gtg.png",
     "codes": "entrance_dungeon_gtg"
@@ -240,10 +240,10 @@
     "codes": "entrance_grotto_field_valley"
   },
   {
-    "name": "Composer Grave",
+    "name": "Royal Familys Tomb",
     "type": "toggle",
-    "img": "images/entrance_grotto_comp.png",
-    "codes": "entrance_grotto_comp"
+    "img": "images/entrance_grotto_royal_tomb.png",
+    "codes": "entrance_grotto_royal_tomb"
   },
   {
     "name": "Graveyard Dampes Grave",
@@ -317,6 +317,12 @@
     "img": "images/entrance_overworld_mkt.png",
     "codes": "entrance_overworld_mkt"
   },
+  {
+    "name": "Market Back Alley",
+    "type": "toggle",
+    "img": "images/entrance_overworld_mkt_aly.png",
+    "codes": "entrance_overworld_mkt_aly"
+  },
   {
     "name": "Market Entrance",
     "type": "toggle",

diff --git a/ootrando_overworldmap_hamsda/items/dungeons.json b/ootrando_overworldmap_hamsda/items/dungeons.json
@@ -246,7 +246,7 @@
     "type": "consumable",
     "img": "images/small_key.png",
     "codes": "forest_small_keys,forestsmall,forestsk",
-    "max_quantity": 6
+    "max_quantity": 99
   },
   {
     "name": "Forest Temple Boss Key",
@@ -318,7 +318,7 @@
     "type": "consumable",
     "img": "images/small_key.png",
     "codes": "fire_small_keys,firesmall,firesk",
-    "max_quantity": 8
+    "max_quantity": 99
   },
   {
     "name": "Fire Temple Boss Key",
@@ -390,7 +390,7 @@
     "type": "consumable",
     "img": "images/small_key.png",
     "codes": "water_small_keys,watersmall,watersk",
-    "max_quantity": 6
+    "max_quantity": 99
   },
   {
     "name": "Water Temple Boss Key",
@@ -462,7 +462,7 @@
     "type": "consumable",
     "img": "images/small_key.png",
     "codes": "spirit_small_keys,spiritsmall,spiritsk",
-    "max_quantity": 7
+    "max_quantity": 99
   },
   {
     "name": "Spirit Temple Boss Key",
@@ -534,7 +534,7 @@
     "type": "consumable",
     "img": "images/small_key.png",
     "codes": "shadow_small_keys,shadowsmall,shadowsk",
-    "max_quantity": 6
+    "max_quantity": 99
   },
   {
     "name": "Shadow Temple Boss Key",
@@ -606,7 +606,7 @@
     "type": "consumable",
     "img": "images/small_key.png",
     "codes": "botw_small_keys,botwsmall,botwsk",
-    "max_quantity": 3
+    "max_quantity": 99
   },
   {
     "name": "Ice Cavern Label",
@@ -631,20 +631,20 @@
     ]
   },
   {
-    "name": "Gerudo Fortress Label",
+    "name": "Thieves Hideout Label",
     "type": "static",
-    "img": "images/label_gf.png",
-    "codes": "gf_label"
+    "img": "images/label_th.png",
+    "codes": "th_label"
   },
   {
-    "name": "Gerudo Fortress Small Keys",
+    "name": "Thieves Hideout Small Keys",
     "type": "consumable",
     "img": "images/small_key.png",
-    "codes": "gf_small_keys,gfsmall,gfsk",
-    "max_quantity": 4
+    "codes": "th_small_keys,thsmall,thsk",
+    "max_quantity": 99
   },
   {
-    "name": "Gerudo Training Grounds Label",
+    "name": "Gerudo Training Ground Label",
     "type": "progressive",
     "allow_disabled": false,
     "loop": true,
@@ -666,11 +666,11 @@
     ]
   },
   {
-    "name": "Gerudo Training Grounds Small Keys",
+    "name": "Gerudo Training Ground Small Keys",
     "type": "consumable",
     "img": "images/small_key.png",
     "codes": "gtg_small_keys,gtgsmall,gtgsk",
-    "max_quantity": 9
+    "max_quantity": 99
   },
   {
     "name": "Ganons Castle Label",
@@ -699,7 +699,7 @@
     "type": "consumable",
     "img": "images/small_key.png",
     "codes": "gc_small_keys,gcsmall,gcsk",
-    "max_quantity": 3
+    "max_quantity": 99
   },
   {
     "name": "Ganons Castle Boss Key",