Move tcg key setting beneath TH to match OOTR

coavins · Dec 2, 2023 · f14e741 · f14e741
1 parent 2ef320c
commit f14e741
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/ootrando_overworldmap_hamsda/SETTINGS.md b/ootrando_overworldmap_hamsda/SETTINGS.md
@@ -224,13 +224,6 @@ This setting determines if the rewards for the five grey note songs (besides Son
 - ![Frog Song Rupees not shuffled](images/setting_shuffle_frogs_no.png "Frog Song Rupees not shuffled") Frog Song Rupees are not shuffled.
 - ![Frog Song Rupees shuffled](images/setting_shuffle_frogs_yes.png "Frog Song Rupees shuffled") Frog Song Rupees are shuffled and playing the songs rewards one randomized item each.
 
-### Shuffle Treasure Chest Game Keys
-
-This setting determines if the keys for the treasure chest game in the market are shuffled (non keys variants will force this off).
-
-* ![Treasure Chest Game Keys not shuffled](images/setting_shuffle_tcgkeys_no.png "Treasure Chest Game Keys not shuffled") Treasure Chest Game Keys are not shuffled and will always be available.
-* ![Treasure Chest Game Keys shuffled](images/setting_shuffle_tcgkeys_yes.png "Treasure Chest Game Keys shuffled") Treasure Chest Game Keys are shuffled and need to be tracked by the user.
-
 ## Main Rules: Shuffle Dungeon Items
 
 This tab contains settings about dungeon items being shuffled ([see wiki](https://wiki.ootrandomizer.com/index.php?title=Readme#Shuffle_Dungeon_Items)).
@@ -253,6 +246,13 @@ This setting determines if Thieves' Hideout Keys are shuffled (non keys variants
 - ![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 Treasure Chest Game Keys
+
+This setting determines if the keys for the treasure chest game in the market are shuffled (non keys variants will force this off).
+
+* ![Treasure Chest Game Keys not shuffled](images/setting_shuffle_tcgkeys_no.png "Treasure Chest Game Keys not shuffled") Treasure Chest Game Keys are not shuffled and will always be available.
+* ![Treasure Chest Game Keys shuffled](images/setting_shuffle_tcgkeys_yes.png "Treasure Chest Game Keys shuffled") Treasure Chest Game Keys are shuffled and need to be tracked by the user.
+
 ### Shuffle Boss Keys
 
 This setting determines if Boss Keys are shuffled (non keys variants will force this off).

diff --git a/ootrando_overworldmap_hamsda/items/capture_items.json b/ootrando_overworldmap_hamsda/items/capture_items.json
@@ -84,18 +84,18 @@
     "codes": "capture_th_small_keys"
   },
   {
-    "name": "Treasure Chest Game Keys",
+    "name": "Gerudo Training Ground Small Keys",
     "type": "toggle",
     "img": "images/small_key.png",
-    "img_mods": "overlay|images/overlay_keys_tcg.png",
-    "codes": "capture_tcg_small_keys"
+    "img_mods": "overlay|images/overlay_keys_gtg.png",
+    "codes": "capture_gtg_small_keys"
   },
   {
-    "name": "Gerudo Training Ground Small Keys",
+    "name": "Treasure Chest Game Keys",
     "type": "toggle",
     "img": "images/small_key.png",
-    "img_mods": "overlay|images/overlay_keys_gtg.png",
-    "codes": "capture_gtg_small_keys"
+    "img_mods": "overlay|images/overlay_keys_tcg.png",
+    "codes": "capture_tcg_small_keys"
   },
   {
     "name": "Ganons Castle Small Keys",

diff --git a/ootrando_overworldmap_hamsda/items/options.json b/ootrando_overworldmap_hamsda/items/options.json
@@ -597,57 +597,57 @@
     ]
   },
   {
-    "name": "Shuffle Treasure Chest Game Keys",
+    "name": "Shuffle Small Keys",
     "type": "progressive",
     "allow_disabled": false,
     "loop": true,
+    "initial_stage_idx": 1,
     "stages": [
       {
-        "img": "images/setting_shuffle_tcgkeys_no.png",
+        "img": "images/setting_shuffle_smallkeys_no.png",
         "img_mods": "@disabled",
-        "codes": "setting_shuffle_tcgkeys,setting_shuffle_tcgkeys_no"
+        "codes": "setting_shuffle_smallkeys,setting_shuffle_smallkeys_no"
       },
       {
-        "img": "images/setting_shuffle_tcgkeys_yes.png",
-        "codes": "setting_shuffle_tcgkeys,setting_shuffle_tcgkeys_yes",
+        "img": "images/setting_shuffle_smallkeys_yes.png",
+        "codes": "setting_shuffle_smallkeys,setting_shuffle_smallkeys_yes",
         "inherit_codes": false
       }
     ]
   },
   {
-    "name": "Shuffle Small Keys",
+    "name": "Shuffle Thieves' Hideout Keys",
     "type": "progressive",
     "allow_disabled": false,
     "loop": true,
     "initial_stage_idx": 1,
     "stages": [
       {
-        "img": "images/setting_shuffle_smallkeys_no.png",
+        "img": "images/setting_shuffle_hideoutkeys_no.png",
         "img_mods": "@disabled",
-        "codes": "setting_shuffle_smallkeys,setting_shuffle_smallkeys_no"
+        "codes": "setting_shuffle_hideoutkeys,setting_shuffle_hideoutkeys_no"
       },
       {
-        "img": "images/setting_shuffle_smallkeys_yes.png",
-        "codes": "setting_shuffle_smallkeys,setting_shuffle_smallkeys_yes",
+        "img": "images/setting_shuffle_hideoutkeys_yes.png",
+        "codes": "setting_shuffle_hideoutkeys,setting_shuffle_hideoutkeys_yes",
         "inherit_codes": false
       }
     ]
   },
   {
-    "name": "Shuffle Thieves' Hideout Keys",
+    "name": "Shuffle Treasure Chest Game Keys",
     "type": "progressive",
     "allow_disabled": false,
     "loop": true,
-    "initial_stage_idx": 1,
     "stages": [
       {
-        "img": "images/setting_shuffle_hideoutkeys_no.png",
+        "img": "images/setting_shuffle_tcgkeys_no.png",
         "img_mods": "@disabled",
-        "codes": "setting_shuffle_hideoutkeys,setting_shuffle_hideoutkeys_no"
+        "codes": "setting_shuffle_tcgkeys,setting_shuffle_tcgkeys_no"
       },
       {
-        "img": "images/setting_shuffle_hideoutkeys_yes.png",
-        "codes": "setting_shuffle_hideoutkeys,setting_shuffle_hideoutkeys_yes",
+        "img": "images/setting_shuffle_tcgkeys_yes.png",
+        "codes": "setting_shuffle_tcgkeys,setting_shuffle_tcgkeys_yes",
         "inherit_codes": false
       }
     ]

diff --git a/ootrando_overworldmap_hamsda/layouts/options.json b/ootrando_overworldmap_hamsda/layouts/options.json
@@ -197,12 +197,6 @@
         "item": "setting_shuffle_frogs",
         "width": 200,
         "height": 16
-      },
-      {
-        "type": "item",
-        "item": "setting_shuffle_tcgkeys",
-        "width": 200,
-        "height": 16
       }
     ]
   },
@@ -223,6 +217,12 @@
         "width": 200,
         "height": 16
       },
+      {
+        "type": "item",
+        "item": "setting_shuffle_tcgkeys",
+        "width": 200,
+        "height": 16
+      },
       {
         "type": "item",
         "item": "setting_shuffle_bosskeys",