Merge branch 'main' into NewSoupVi-patch-2

Update Generate.py
2026-08-02 13:38:14 -07:00 · 2024-06-20 07:22:52 +02:00 · 2024-05-24 00:05:01 +02:00 · 2024-05-24 00:04:46 +02:00 · 2024-05-24 00:03:25 +02:00
3 changed files with 10 additions and 2 deletions
@@ -446,6 +446,14 @@ def handle_option(ret: argparse.Namespace, game_weights: dict, option_key: str,


 def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.bosses):
+    """
+    Roll options from specified weights, usually originating from a .yaml options file.
+
+    Important note:
+    The same weights dict is shared between all slots using the same yaml (e.g. generic weights file for filler slots).
+    This means it should never be modified without making a deepcopy first.
+    """
+
    from worlds import AutoWorldRegister

    if "linked_options" in weights:
@@ -234,7 +234,7 @@ def generate_yaml(game: str):
        # Detect random-* keys and set their options accordingly
        for key, val in options.copy().items():
            if key.startswith("random-"):
-                options[key[len("random-"):]] = "random"
+                options[key.removeprefix("random-")] = "random"
                del options[key]

        # Error checking
@@ -553,7 +553,7 @@ NOVA|73-4|Happy Otaku Pack Vol.19|True|6|8|10|
 Heaven's Gradius|73-5|Happy Otaku Pack Vol.19|True|6|8|10|
 Ray Tuning|74-0|CHUNITHM COURSE MUSE|True|6|8|10|
 World Vanquisher|74-1|CHUNITHM COURSE MUSE|True|6|8|10|11
-Tsukuyomi Ni Naru|74-2|CHUNITHM COURSE MUSE|False|5|7|9|
+Territory Battles|74-2|CHUNITHM COURSE MUSE|True|5|7|9|
 The wheel to the right|74-3|CHUNITHM COURSE MUSE|True|5|7|9|11
 Climax|74-4|CHUNITHM COURSE MUSE|True|4|8|11|11
 Spider's Thread|74-5|CHUNITHM COURSE MUSE|True|5|8|10|12
Author	SHA1	Message	Date
NewSoupViandGitHub	3bf3ce2da4	Merge branch 'main' into NewSoupVi-patch-2	2024-06-20 07:22:52 +02:00
NewSoupViandGitHub	8fae75f577	Update Generate.py	2024-05-24 00:05:01 +02:00
NewSoupViandGitHub	8b8a95089c	Update Generate.py	2024-05-24 00:04:46 +02:00
NewSoupViandGitHub	1e99625f3b	Add an option docstring to roll_settings to hopefully prevent the weights fiasco from being repeated	2024-05-24 00:03:25 +02:00