From 7cc50ca1df2a90676b96c3c579b9c346ab21b5fd Mon Sep 17 00:00:00 2001
From: Daivuk <daivuk@gmail.com>
Date: Sun, 1 Oct 2023 08:40:26 -0400
Subject: [PATCH] DOOM 1993: Added Music Rando option + Merged conflicts

---
 worlds/doom_1993/Options.py | 15 +++++++++++++++
 worlds/doom_1993/Regions.py |  4 ----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/worlds/doom_1993/Options.py b/worlds/doom_1993/Options.py
index 3c82f5656c0a..c8e9319eb3a1 100644
--- a/worlds/doom_1993/Options.py
+++ b/worlds/doom_1993/Options.py
@@ -51,6 +51,20 @@ class RandomPickups(Choice):
     default = 1
 
 
+class RandomMusic(Choice):
+    """
+    Level musics will be randomized.
+    vanilla: No randomization
+    shuffle_selected: Selected episodes' levels will be shuffled
+    shuffle_game: All the music will be shuffled
+    """
+    display_name = "Random Music"
+    option_vanilla = 0
+    option_shuffle_selected = 1
+    option_shuffle_game = 2
+    default = 0
+
+
 class FlipLevels(Choice):
     """
     Flip levels on one axis.
@@ -119,6 +133,7 @@ class Episode4(Toggle):
     "difficulty": Difficulty,
     "random_monsters": RandomMonsters,
     "random_pickups": RandomPickups,
+    "random_music": RandomMusic,
     "flip_levels": FlipLevels,
     "allow_death_logic": AllowDeathLogic,
     "pro": Pro,
diff --git a/worlds/doom_1993/Regions.py b/worlds/doom_1993/Regions.py
index bf0d483d1def..f013bdceaf07 100644
--- a/worlds/doom_1993/Regions.py
+++ b/worlds/doom_1993/Regions.py
@@ -571,10 +571,6 @@ class RegionDict(TypedDict, total=False):
     {"name":"Against Thee Wickedly (E4M6) Main",
      "connects_to_hub":True,
      "episode":4,
-     "connections":["Against Thee Wickedly (E4M6) Blue"]},
-    {"name":"Against Thee Wickedly (E4M6) Red",
-     "connects_to_hub":False,
-     "episode":4,
      "connections":[
         {"target":"Against Thee Wickedly (E4M6) Blue","pro":False},
         {"target":"Against Thee Wickedly (E4M6) Pink","pro":True}]},