From 10241268356e263c458edf9893bd1805ab5fc7f2 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 10 Sep 2023 14:51:43 -0500
Subject: [PATCH] Moving Display Collection Rate option away from post-gen
 options

---
 resources/app/cli/lang/en.json                       | 2 +-
 resources/app/gui/lang/en.json                       | 2 +-
 resources/app/gui/randomize/gameoptions/widgets.json | 1 -
 resources/app/gui/randomize/item/widgets.json        | 1 +
 source/classes/constants.py                          | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/app/cli/lang/en.json b/resources/app/cli/lang/en.json
index ca4543d0..6d41b23d 100644
--- a/resources/app/cli/lang/en.json
+++ b/resources/app/cli/lang/en.json
@@ -375,6 +375,7 @@
       "Random:         Take any caves can replace a random set of un-interesting caves. See documentation for full list",
       "Fixed:          Take any caves will replace certain location. See documentation for full list"
     ],
+    "collection_rate": [ "Display collection rate (default: %(default)s)" ],
     "pseudoboots": [ " Start with pseudo boots that allow dashing but no item checks (default: %(default)s)"],
     "bombbag": ["Start with 0 bomb capacity. Two capacity upgrades (+10) are added to the pool (default: %(default)s)" ],
     "startinventory": [ "Specifies a list of items that will be in your starting inventory (separated by commas). (default: %(default)s)" ],
@@ -425,7 +426,6 @@
     "reduce_flashing": [ "Reduce some in-game flashing (default: %(default)s)" ],
     "shuffle_sfx": [ "Shuffle sounds effects (default: %(default)s)" ],
     "msu_resume": [ "Enable MSU Resume (default: %(default)s)" ],
-    "collection_rate": [ "Display collection rate (default: %(default)s)" ],
     "create_rom": [ "Create an output rom file. (default: %(default)s)" ],
     "gui": [ "Launch the GUI. (default: %(default)s)" ],
     "jsonout": [
diff --git a/resources/app/gui/lang/en.json b/resources/app/gui/lang/en.json
index 95336905..66aefd98 100644
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -191,7 +191,6 @@
     "randomizer.gameoptions.reduce_flashing": "Reduce Flashing",
     "randomizer.gameoptions.shuffle_sfx": "Shuffle Sound Effects",
     "randomizer.gameoptions.msu_resume": "MSU Resume",
-    "randomizer.gameoptions.collection_rate": "Display Collection Rate",
 
     "randomizer.gameoptions.heartcolor": "Heart Color",
     "randomizer.gameoptions.heartcolor.red": "Red",
@@ -249,6 +248,7 @@
     "randomizer.item.race": "Generate \"Race\" ROM",
     "randomizer.item.retro": "Retro mode",
     "randomizer.item.pseudoboots": "Pseudoboots",
+    "randomizer.item.collection_rate": "Display Collection Rate",
 
     "randomizer.item.worldstate": "World State",
     "randomizer.item.worldstate.standard": "Standard",
diff --git a/resources/app/gui/randomize/gameoptions/widgets.json b/resources/app/gui/randomize/gameoptions/widgets.json
index 7b84b8a9..5d8faeba 100644
--- a/resources/app/gui/randomize/gameoptions/widgets.json
+++ b/resources/app/gui/randomize/gameoptions/widgets.json
@@ -2,7 +2,6 @@
   "checkboxes":   {
     "nobgm":      { "type": "checkbox" },
     "msu_resume": { "type": "checkbox" },
-    "collection_rate": {"type":  "checkbox"},
     "quickswap":  { "type": "checkbox" },
     "reduce_flashing": { "type": "checkbox" },
     "shuffle_sfx": { "type": "checkbox" }
diff --git a/resources/app/gui/randomize/item/widgets.json b/resources/app/gui/randomize/item/widgets.json
index 21d95b94..652554ab 100644
--- a/resources/app/gui/randomize/item/widgets.json
+++ b/resources/app/gui/randomize/item/widgets.json
@@ -2,6 +2,7 @@
   "checkboxes": {
     "hints": { "type": "checkbox" },
     "pseudoboots": { "type": "checkbox" },
+    "collection_rate": {"type":  "checkbox"},
     "race": { "type": "checkbox" }
   },
   "leftItemFrame": {
diff --git a/source/classes/constants.py b/source/classes/constants.py
index 69831169..b41d03a6 100644
--- a/source/classes/constants.py
+++ b/source/classes/constants.py
@@ -57,6 +57,7 @@ SETTINGSTOPROCESS = {
     "item": {
       "hints": "hints",
       "pseudoboots": "pseudoboots",
+      'collection_rate': 'collection_rate',
       "race": "race",
 
       "worldstate": "mode",
@@ -139,7 +140,6 @@ SETTINGSTOPROCESS = {
       "reduce_flashing": "reduce_flashing",
       "shuffle_sfx": "shuffle_sfx",
       'msu_resume': 'msu_resume',
-      'collection_rate': 'collection_rate',
     },
     "generation": {
       "bps": "bps",