Merged in DR v1.0.0.2

2022-03-27 14:56:16 -05:00
parent 6914562cdc 1ebb49fa59
commit fd7d9f7121
35 changed files with 2376 additions and 693 deletions
--- a/source/classes/SFX.py
+++ b/source/classes/SFX.py
@@ -126,7 +126,7 @@ def shuffle_sfx_data():
    random.shuffle(candidates)

    # place chained sfx first
-    random.shuffle(chained_sfx) # todo: sort largest to smallest
+    random.shuffle(chained_sfx)
    chained_sfx = sorted(chained_sfx, key=lambda x: len(x.chain), reverse=True)
    for chained in chained_sfx:
        chosen_slot = next(x for x in candidates if len(accompaniment_map[x[0]]) - len(chained.chain) >= 0)