Skip to content

Commit

Permalink
DOOM 1993: Added Music Rando option
Browse files Browse the repository at this point in the history
+ Merged conflicts
  • Loading branch information
Daivuk committed Nov 25, 2023
1 parent 88faf02 commit 7cc50ca
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
15 changes: 15 additions & 0 deletions worlds/doom_1993/Options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions worlds/doom_1993/Regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}]},
Expand Down

0 comments on commit 7cc50ca

Please sign in to comment.