Merge branch 'ootr' into autotracker-pr

ootrando_overworldmap_hamsda/README.md

@@ -40,6 +40,9 @@ Some of this functionality might not be immediately obvious:
 
 There is a variety of toggles available to accomodate the different settings the randomizer offers. The settings are arranged to mimic the current GUI of the randomizer. The default for all of these should match the settings used for the weekly races (check out the OoTR discord for more info).
 
+The bottom right icon is a customizable preset loader. Cycle through the presets with left click and load with right click (some settings might require an extra right click since they depend on other settings).
+To customize the presets, please override `scripts/user_presets.lua` and edit to your liking. I hope the structure is fairly straightforward. Which setting number corresponds to which setting can be found in `items/options.json` and `items/options_entrance.json` (0 based indexing).
+
 ### Main Rules
 
 This tab contains most of the important settings that can have a major impact on the logic of a randomizer seed ([see wiki](https://wiki.ootrandomizer.com/index.php?title=Readme#Main_Rules)).
@@ -117,7 +120,7 @@ This setting determines which age you started as.
 - ![Child Start](images/setting_age_child.png "Child Start") Link started as child.
 - ![Adult Start](images/setting_age_adult.png "Adult Start") Link started as adult.
 
-If you have selected ![Open Door](images/setting_door_open.png "Open Door") or collected an ![Ocarina](images/fairyocarina.png "Ocarina") and ![Song of Time](images/time_colored.png "Song of Time") the checks for the other age will unlock.
+If you have selected ![Open Door](images/setting_door_open.png "Open Door") or collected an ![Ocarina](images/fairyocarina.png "Ocarina") and ![Song of Time](images/song_time.png "Song of Time") the checks for the other age will unlock.
 
 #### Bombchus Are Considered in Logic
 
@@ -198,21 +201,33 @@ This setting determines if Medigoron and Carpet Salesman items are shuffled.
 - ![Medigoron and Carpet Salesman not shuffled](images/setting_merchants_off.png "Medigoron and Carpet Salesman not shuffled") Medigoron and Carpet Salesman items are not shuffled.
 - ![Medigoron and Carpet Salesman shuffled](images/setting_merchants_shuffle.png "Medigoron and Carpet Salesman shuffled") Medigoron and Carpet Salesman items are shuffled and the merchants sell one randomized item for 200 rupees each.
 
-#### LACS Condition
+#### Shuffle Small Keys
+
+This setting determines if Small Keys are shuffled (non keys variants will force this off).
+
+- ![Small Keys not shuffled](images/setting_shuffle_smallkeys_no.png "Small Keys not shuffled") Small Keys are not shuffled and will always be considered at their maximum.
+- ![Small Keys shuffled](images/setting_shuffle_smallkeys_yes.png "Small Keys shuffled") Small Keys are shuffled and need to be tracked by the user.
+
+#### Shuffle Thieves' Hideout Keys
+
+This setting determines if Thieves' Hideout Keys are shuffled (non keys variants will force this off).
+
+- ![Thieves' Hideout Keys not shuffled](images/setting_shuffle_hideoutkeys_no.png "Thieves' Hideout Keys not shuffled") Thieves' Hideout Keys are not shuffled and will always be considered at their maximum.
+- ![Thieves' Hideout Keys shuffled](images/setting_shuffle_hideoutkeys_yes.png "Thieves' Hideout Keys shuffled") Thieves' Hideout Keys are shuffled and need to be tracked by the user.
+
+#### Shuffle Boss Keys
 
-This setting determines what is needed to trigger the Light Arrow cutscene in the Temple of Time.
+This setting determines if Boss Keys are shuffled (non keys variants will force this off).
 
-- ![Vanilla](images/setting_lacs_vanilla.png "Vanilla") Shadow medallion and spirit medallion required
-- ![Stones](images/setting_lacs_stones.png "Stones") Variable amount of stones required
-- ![Medallions](images/setting_lacs_medallions.png "Medallions") Variable amount of medallions required
-- ![Dungeons](images/setting_lacs_dungeons.png "Dungeons") Variable amount of medallions and stones required
-- ![GS tokens](images/setting_lacs_gs.png "GS tokens") Variable amount of Gold Skulltula tokens required
+- ![Boss Keys not shuffled](images/setting_shuffle_bosskeys_no.png "Boss Keys not shuffled") Boss Keys are not shuffled and will always be considered active.
+- ![Boss Keys shuffled](images/setting_shuffle_bosskeys_yes.png "Boss Keys shuffled") Boss Keys are shuffled and need to be tracked by the user.
 
-#### LACS Amount
+#### Shuffle Ganon's Boss Key
 
-This setting determines how many (if any) of the items specified in `LACS Condition` are needed.
+This setting determines if Ganon's Boss Key is shuffled (non keys variants will force this off).
 
-![LACS Condition](images/setting_lacs_amount.png "LACS Condition") Increment or decrement the number required.
+- ![Ganon's Boss Key not shuffled](images/setting_shuffle_ganon_bosskey_no.png "Ganon's Boss Key not shuffled") Ganon's Boss Key is not shuffled and will always be considered active.
+- ![Ganon's Boss Key shuffled](images/setting_shuffle_ganon_bosskey_yes.png "Ganon's Boss Key shuffled") Ganon's Boss Key is shuffled and needs to be tracked by the user.
 
 #### Skip Child Zelda
 

ootrando_overworldmap_hamsda/changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## x
+
+- 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)
+
 ## 3.6.0.0
 
 - fixed overlap between LH owl and grotto in ER
@@ -877,7 +888,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)

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",

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",

ootrando_overworldmap_hamsda/items/options.json

@@ -90,7 +90,7 @@
     "type": "progressive",
     "allow_disabled": false,
     "loop": true,
-    "initial_stage_idx": 1,
+    "initial_stage_idx": 0,
     "stages": [
       {
         "img": "images/setting_gerudo_fortress_normal.png",
@@ -390,54 +390,82 @@
     ]
   },
   {
-    "name": "LACS Condition",
+    "name": "Shuffle Small Keys",
     "type": "progressive",
     "allow_disabled": false,
     "loop": true,
-    "initial_stage_idx": 0,
+    "initial_stage_idx": 1,
     "stages": [
       {
-        "img": "images/setting_lacs_vanilla.png",
-        "codes": "setting_lacs,setting_lacs_vanilla",
-        "inherit_codes": false
+        "img": "images/setting_shuffle_smallkeys_no.png",
+        "codes": "setting_shuffle_smallkeys,setting_shuffle_smallkeys_no"
       },
       {
-        "img": "images/setting_lacs_stones.png",
-        "codes": "setting_lacs,setting_lacs_stones",
+        "img": "images/setting_shuffle_smallkeys_yes.png",
+        "codes": "setting_shuffle_smallkeys,setting_shuffle_smallkeys_yes",
         "inherit_codes": false
-      },
+      }
+    ]
+  },
+  {
+    "name": "Shuffle Thieves' Hideout Keys",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "initial_stage_idx": 1,
+    "stages": [
       {
-        "img": "images/setting_lacs_medallions.png",
-        "codes": "setting_lacs,setting_lacs_medallions",
-        "inherit_codes": false
+        "img": "images/setting_shuffle_hideoutkeys_no.png",
+        "codes": "setting_shuffle_hideoutkeys,setting_shuffle_hideoutkeys_no"
       },
       {
-        "img": "images/setting_lacs_dungeons.png",
-        "codes": "setting_lacs,setting_lacs_dungeons",
+        "img": "images/setting_shuffle_hideoutkeys_yes.png",
+        "codes": "setting_shuffle_hideoutkeys,setting_shuffle_hideoutkeys_yes",
         "inherit_codes": false
+      }
+    ]
+  },
+  {
+    "name": "Shuffle Boss Keys",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "initial_stage_idx": 1,
+    "stages": [
+      {
+        "img": "images/setting_shuffle_bosskeys_no.png",
+        "codes": "setting_shuffle_bosskeys,setting_shuffle_bosskeys_no"
       },
       {
-        "img": "images/setting_lacs_gs.png",
-        "codes": "setting_lacs,setting_lacs_gs",
+        "img": "images/setting_shuffle_bosskeys_yes.png",
+        "codes": "setting_shuffle_bosskeys,setting_shuffle_bosskeys_yes",
         "inherit_codes": false
       }
     ]
   },
   {
-    "name": "LACS Amount",
-    "type": "consumable",
-    "img": "images/setting_lacs_amount.png",
-    "codes": "setting_lacs_amount",
-    "disabled_img_mods": "@enabled",
-    "max_quantity": 6,
-    "initial_quantity": 6
+    "name": "Shuffle Ganon's Boss Key",
+    "type": "progressive",
+    "allow_disabled": false,
+    "loop": true,
+    "initial_stage_idx": 1,
+    "stages": [
+      {
+        "img": "images/setting_shuffle_ganon_bosskey_no.png",
+        "codes": "setting_shuffle_ganon_bosskey,setting_shuffle_ganon_bosskey_no"
+      },
+      {
+        "img": "images/setting_shuffle_ganon_bosskey_yes.png",
+        "codes": "setting_shuffle_ganon_bosskey,setting_shuffle_ganon_bosskey_yes",
+        "inherit_codes": false
+      }
+    ]
   },
   {
     "name": "Skip Child Zelda",
     "type": "progressive",
     "allow_disabled": false,
     "loop": true,
-    "initial_stage_idx": 1,
     "stages": [
       {
         "img": "images/setting_zelda_off.png",