Merge pull request #2938 from Sir-Chili/random-Krusha-in-options

UmedMuzl · web-flow · commit 4a79f27dfeb1 · 2025-12-05T18:01:31.000-06:00
Added Krusha to random settings
diff --git a/randomizer/Enums/Settings.jsonc b/randomizer/Enums/Settings.jsonc
@@ -617,10 +617,11 @@
     - Model attribution mode for the Kongs.
   */
   "KongModelMode": {
-    "manual": 0,
-    "random_one": 1,
-    "sometimes_one": 2,
-    "random_all": 3
+    "none": 0,
+    "manual": 1,
+    "random_one": 2,
+    "sometimes_one": 3,
+    "random_all": 4
   },
 
   /*
diff --git a/randomizer/Settings.py b/randomizer/Settings.py
@@ -2386,6 +2386,13 @@ def resolve_settings(self):
             self.excluded_bp_locations = self.excluded_bp_locations[-count_to_exclude:]
 
         # Kong Model Mode Randomization
+        if self.kong_model_mode == KongModelMode.none:
+            self.kong_model_dk = KongModels.default
+            self.kong_model_diddy = KongModels.default
+            self.kong_model_lanky = KongModels.default
+            self.kong_model_tiny = KongModels.default
+            self.kong_model_chunky = KongModels.default
+
         if self.kong_model_mode == KongModelMode.random_one:
             random_krusha = self.random.randint(0, 4)
             kong_model_array = [KongModels.default, KongModels.default, KongModels.default, KongModels.default, KongModels.default]
@@ -2400,7 +2407,6 @@ def resolve_settings(self):
         elif self.kong_model_mode == KongModelMode.sometimes_one:
             random_krusha = self.random.randint(0, 4)
             kong_model_array = [KongModels.default, KongModels.default, KongModels.default, KongModels.default, KongModels.default]
-            krusha_model = [KongModels.default, KongModels.krusha]
             kong_model_array[random_krusha] = self.random.choice([KongModels.default, KongModels.krusha])
 
             self.kong_model_dk = kong_model_array[0]
diff --git a/static/presets/weights/weight_files_raw.json b/static/presets/weights/weight_files_raw.json
@@ -891,6 +891,26 @@
             },
             "qol_uses_hard": true
         },
+        "kong_model_mode": {
+            "setting_type": "choice_single",
+            "options": {
+                "easy": {
+                    "none": 50.0,
+                    "random_one": 50.0
+                },
+                "standard": {
+                    "none": 45.0,
+                    "random_one": 45.0,
+                    "random_all": 10.0
+                },
+                "difficult": {
+                    "none": 40.0,
+                    "random_one": 40.0,
+                    "random_all": 20.0
+                }
+            },
+            "qol_uses_hard": true
+        },
         "krool_access": {
             "setting_type": "bool",
             "options": {
diff --git a/static/presets/weights/weights_files.json b/static/presets/weights/weights_files.json
@@ -261,6 +261,10 @@
     "kong_model_lanky": {
       "default": 1
     },
+    "kong_model_mode": {
+      "none": 0.5,
+      "random_one": 0.5
+    },
     "kong_model_tiny": {
       "default": 1
     },
@@ -688,6 +692,11 @@
     "kong_model_lanky": {
       "default": 1
     },
+    "kong_model_mode": {
+      "none": 0.45,
+      "random_one": 0.45,
+      "random_all": 0.1
+    },
     "kong_model_tiny": {
       "default": 1
     },
@@ -1138,6 +1147,11 @@
     "kong_model_lanky": {
       "default": 1
     },
+    "kong_model_mode": {
+      "none": 0.4,
+      "random_one": 0.4,
+      "random_all": 0.2
+    },
     "kong_model_tiny": {
       "default": 1
     },
@@ -1619,6 +1633,11 @@
     "kong_model_lanky": {
       "default": 1
     },
+    "kong_model_mode": {
+      "none": 0.4,
+      "random_one": 0.4,
+      "random_all": 0.2
+    },
     "kong_model_tiny": {
       "default": 1
     },
diff --git a/templates/complex-options/kong-models.html b/templates/complex-options/kong-models.html
@@ -73,6 +73,10 @@ <h1 class="modal-title title" id="kongModelModalLabel">KONG MODELS</h1>
                                         display_name="Model Replacement Mode"
                                         class="form-select"
                                         aria-label="mode">
+                                    <option selected value="none"
+                                            title="Use the default model for each Kong">
+                                        None
+                                    </option>
                                     <option selected value="manual"
                                             title="Manually select the model for each Kong">
                                         Manual
@@ -82,11 +86,11 @@ <h1 class="modal-title title" id="kongModelModalLabel">KONG MODELS</h1>
                                         Random One
                                     </option>
                                     <option value="sometimes_one"
-                                            title="Gives a chance to replace one of the Kong with Krusha">
+                                            title="Give a 50% chance to replace one of the Kong with Krusha">
                                         Sometimes One
                                     </option>
                                     <option value="random_all"
-                                            title="Randomly give a chance to replace each Kong">
+                                            title="Randomly give a 50% chance to replace each Kong with Krusha">
                                         Random All
                                     </option>
                                 </select>
diff --git a/typings/randomizer/Enums/Settings.d.ts b/typings/randomizer/Enums/Settings.d.ts
@@ -362,10 +362,11 @@ export enum KongModels {
 }
 
 export enum KongModelMode {
-    manual = 0,
-    random_one = 1,
-    sometimes_one = 2,
-    random_all = 3,
+    none = 0,
+    manual = 1,
+    random_one = 2,
+    sometimes_one = 3,
+    random_all = 4,
 }
 
 export enum LevelRandomization {
diff --git a/typings/randomizer/Enums/Settings.pyi b/typings/randomizer/Enums/Settings.pyi
@@ -326,10 +326,11 @@ class KongModels(IntEnum):
     disco_donkey = 8
 
 class KongModelMode(IntEnum):
-    manual = 0
-    random_one = 1
-    sometimes_one = 2
-    random_all = 3
+    none = 0
+    manual = 1
+    random_one = 2
+    sometimes_one = 3
+    random_all = 4
 
 class LevelRandomization(IntEnum):
     vanilla = 0
diff --git a/wiki/article_markdown/custom_locations/RandomSettingsDifficult.MD b/wiki/article_markdown/custom_locations/RandomSettingsDifficult.MD
@@ -207,6 +207,10 @@ The generated settings will be of greater difficulty. Requirements for B. Locker
 	- Default: 100%
 - Kong Model Lanky: 
 	- Default: 100%
+- Kong Model Mode: 
+	- None: 40%
+	- Random One: 40%
+	- Random All: 20%
 - Kong Model Tiny: 
 	- Default: 100%
 - Don't Start with Key 8: 70%
diff --git a/wiki/article_markdown/custom_locations/RandomSettingsDifficultWithQolShuffle.MD b/wiki/article_markdown/custom_locations/RandomSettingsDifficultWithQolShuffle.MD
@@ -204,6 +204,10 @@ The generated settings will be of greater difficulty. Requirements for B. Locker
 	- Default: 100%
 - Kong Model Lanky: 
 	- Default: 100%
+- Kong Model Mode: 
+	- None: 40%
+	- Random One: 40%
+	- Random All: 20%
 - Kong Model Tiny: 
 	- Default: 100%
 - Don't Start with Key 8: 70%
diff --git a/wiki/article_markdown/custom_locations/RandomSettingsEasy.MD b/wiki/article_markdown/custom_locations/RandomSettingsEasy.MD
@@ -188,6 +188,9 @@ The generated settings will be of lesser difficulty. Requirements for B. Locker,
 	- Default: 100%
 - Kong Model Lanky: 
 	- Default: 100%
+- Kong Model Mode: 
+	- None: 50%
+	- Random One: 50%
 - Kong Model Tiny: 
 	- Default: 100%
 - Don't Start with Key 8: 70%
diff --git a/wiki/article_markdown/custom_locations/RandomSettingsStandard.MD b/wiki/article_markdown/custom_locations/RandomSettingsStandard.MD
@@ -191,6 +191,10 @@ The generated settings will be of average difficulty. Requirements for B. Locker
 	- Default: 100%
 - Kong Model Lanky: 
 	- Default: 100%
+- Kong Model Mode: 
+	- None: 45%
+	- Random One: 45%
+	- Random All: 10%
 - Kong Model Tiny: 
 	- Default: 100%
 - Don't Start with Key 8: 70%

Original file line number	Diff line number	Diff line change
`@@ -362,10 +362,11 @@ export enum KongModels {`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`export enum KongModelMode {`
`365`		`- manual = 0,`
`366`		`- random_one = 1,`
`367`		`- sometimes_one = 2,`
`368`		`- random_all = 3,`
	`365`	`+ none = 0,`
	`366`	`+ manual = 1,`
	`367`	`+ random_one = 2,`
	`368`	`+ sometimes_one = 3,`
	`369`	`+ random_all = 4,`
`369`	`370`	`}`
`370`	`371`
`371`	`372`	`export enum LevelRandomization {`