Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOOM 1993: Logic fixes #2223

Merged
merged 1 commit into from
Sep 25, 2023
Merged

DOOM 1993: Logic fixes #2223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions worlds/doom_1993/Locations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1794,13 +1794,13 @@ class LocationDict(TypedDict, total=False):
'map': 7,
'index': 65,
'doom_type': 2004,
'region': "Limbo (E3M7) Red"},
'region': "Limbo (E3M7) Green"},
351297: {'name': 'Limbo (E3M7) - Armor',
'episode': 3,
'map': 7,
'index': 67,
'doom_type': 2018,
'region': "Limbo (E3M7) Red"},
'region': "Limbo (E3M7) Green"},
351298: {'name': 'Limbo (E3M7) - Yellow skull key',
'episode': 3,
'map': 7,
Expand Down Expand Up @@ -2496,19 +2496,19 @@ class LocationDict(TypedDict, total=False):
'map': 6,
'index': 77,
'doom_type': 38,
'region': "Against Thee Wickedly (E4M6) Yellow"},
'region': "Against Thee Wickedly (E4M6) Magenta"},
351414: {'name': 'Against Thee Wickedly (E4M6) - Invulnerability',
'episode': 4,
'map': 6,
'index': 78,
'doom_type': 2022,
'region': "Against Thee Wickedly (E4M6) Red"},
'region': "Against Thee Wickedly (E4M6) Pink"},
351415: {'name': 'Against Thee Wickedly (E4M6) - Invulnerability 2',
'episode': 4,
'map': 6,
'index': 89,
'doom_type': 2022,
'region': "Against Thee Wickedly (E4M6) Red"},
'region': "Against Thee Wickedly (E4M6) Magenta"},
351416: {'name': 'Against Thee Wickedly (E4M6) - BFG9000',
'episode': 4,
'map': 6,
Expand All @@ -2520,7 +2520,7 @@ class LocationDict(TypedDict, total=False):
'map': 6,
'index': 102,
'doom_type': 8,
'region': "Against Thee Wickedly (E4M6) Red"},
'region': "Against Thee Wickedly (E4M6) Pink"},
351418: {'name': 'Against Thee Wickedly (E4M6) - Berserk',
'episode': 4,
'map': 6,
Expand Down Expand Up @@ -2550,7 +2550,7 @@ class LocationDict(TypedDict, total=False):
'map': 6,
'index': -1,
'doom_type': -1,
'region': "Against Thee Wickedly (E4M6) Red"},
'region': "Against Thee Wickedly (E4M6) Magenta"},
351423: {'name': 'And Hell Followed (E4M7) - Shotgun',
'episode': 4,
'map': 7,
Expand Down Expand Up @@ -2628,7 +2628,7 @@ class LocationDict(TypedDict, total=False):
'map': 7,
'index': 182,
'doom_type': 39,
'region': "And Hell Followed (E4M7) Main"},
'region': "And Hell Followed (E4M7) Blue"},
351436: {'name': 'And Hell Followed (E4M7) - Red skull key',
'episode': 4,
'map': 7,
Expand Down Expand Up @@ -3414,6 +3414,7 @@ class LocationDict(TypedDict, total=False):
"Command Control (E1M4) - Supercharge",
"Command Control (E1M4) - Mega Armor",
"Containment Area (E2M2) - Supercharge",
"Containment Area (E2M2) - Plasma gun",
"Pandemonium (E3M3) - Mega Armor",
"House of Pain (E3M4) - Chaingun",
"House of Pain (E3M4) - Invulnerability",
Expand Down
39 changes: 33 additions & 6 deletions worlds/doom_1993/Regions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@ class RegionDict(TypedDict, total=False):
"episode":3,
"connections":[
"Limbo (E3M7) Red",
"Limbo (E3M7) Blue"]},
"Limbo (E3M7) Blue",
"Limbo (E3M7) Pink"]},
{"name":"Limbo (E3M7) Blue",
"connects_to_hub":False,
"episode":3,
Expand All @@ -404,11 +405,24 @@ class RegionDict(TypedDict, total=False):
"episode":3,
"connections":[
"Limbo (E3M7) Main",
"Limbo (E3M7) Yellow"]},
"Limbo (E3M7) Yellow",
"Limbo (E3M7) Green"]},
{"name":"Limbo (E3M7) Yellow",
"connects_to_hub":False,
"episode":3,
"connections":["Limbo (E3M7) Red"]},
{"name":"Limbo (E3M7) Pink",
"connects_to_hub":False,
"episode":3,
"connections":[
"Limbo (E3M7) Green",
"Limbo (E3M7) Main"]},
{"name":"Limbo (E3M7) Green",
"connects_to_hub":False,
"episode":3,
"connections":[
"Limbo (E3M7) Pink",
"Limbo (E3M7) Red"]},

# Dis (E3M8)
{"name":"Dis (E3M8) Main",
Expand Down Expand Up @@ -529,19 +543,32 @@ 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":[
"Against Thee Wickedly (E4M6) Blue",
"Against Thee Wickedly (E4M6) Pink",
"Against Thee Wickedly (E4M6) Main"]},
{"name":"Against Thee Wickedly (E4M6) Blue",
"connects_to_hub":False,
"episode":4,
"connections":[
"Against Thee Wickedly (E4M6) Main",
"Against Thee Wickedly (E4M6) Yellow",
"Against Thee Wickedly (E4M6) Red"]},
{"name":"Against Thee Wickedly (E4M6) Red",
{"name":"Against Thee Wickedly (E4M6) Magenta",
"connects_to_hub":False,
"episode":4,
"connections":["Against Thee Wickedly (E4M6) Main"]},
{"name":"Against Thee Wickedly (E4M6) Blue",
{"name":"Against Thee Wickedly (E4M6) Yellow",
"connects_to_hub":False,
"episode":4,
"connections":["Against Thee Wickedly (E4M6) Main"]},
{"name":"Against Thee Wickedly (E4M6) Yellow",
"connections":[
"Against Thee Wickedly (E4M6) Blue",
"Against Thee Wickedly (E4M6) Magenta"]},
{"name":"Against Thee Wickedly (E4M6) Pink",
"connects_to_hub":False,
"episode":4,
"connections":["Against Thee Wickedly (E4M6) Main"]},
Expand Down
13 changes: 6 additions & 7 deletions worlds/doom_1993/Rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ def set_episode1_rules(player, world):
set_rule(world.get_entrance("Command Control (E1M4) Blue -> Command Control (E1M4) Main", player), lambda state:
state.has("Command Control (E1M4) - Yellow keycard", player, 1) or
state.has("Command Control (E1M4) - Blue keycard", player, 1))
set_rule(world.get_entrance("Command Control (E1M4) Yellow -> Command Control (E1M4) Main", player), lambda state:
state.has("Command Control (E1M4) - Yellow keycard", player, 1) or
state.has("Command Control (E1M4) - Blue keycard", player, 1))

# Phobos Lab (E1M5)
set_rule(world.get_entrance("Hub -> Phobos Lab (E1M5) Main", player), lambda state:
Expand Down Expand Up @@ -354,8 +351,12 @@ def set_episode3_rules(player, world):
state.has("Limbo (E3M7) - Red skull key", player, 1))
set_rule(world.get_entrance("Limbo (E3M7) Main -> Limbo (E3M7) Blue", player), lambda state:
state.has("Limbo (E3M7) - Blue skull key", player, 1))
set_rule(world.get_entrance("Limbo (E3M7) Main -> Limbo (E3M7) Pink", player), lambda state:
state.has("Limbo (E3M7) - Blue skull key", player, 1))
set_rule(world.get_entrance("Limbo (E3M7) Red -> Limbo (E3M7) Yellow", player), lambda state:
state.has("Limbo (E3M7) - Yellow skull key", player, 1))
set_rule(world.get_entrance("Limbo (E3M7) Pink -> Limbo (E3M7) Green", player), lambda state:
state.has("Limbo (E3M7) - Red skull key", player, 1))

# Dis (E3M8)
set_rule(world.get_entrance("Hub -> Dis (E3M8) Main", player), lambda state:
Expand Down Expand Up @@ -466,12 +467,10 @@ def set_episode4_rules(player, world):
state.has("BFG9000", player, 1)))
set_rule(world.get_entrance("Against Thee Wickedly (E4M6) Main -> Against Thee Wickedly (E4M6) Blue", player), lambda state:
state.has("Against Thee Wickedly (E4M6) - Blue skull key", player, 1))
set_rule(world.get_entrance("Against Thee Wickedly (E4M6) Main -> Against Thee Wickedly (E4M6) Yellow", player), lambda state:
set_rule(world.get_entrance("Against Thee Wickedly (E4M6) Blue -> Against Thee Wickedly (E4M6) Yellow", player), lambda state:
state.has("Against Thee Wickedly (E4M6) - Yellow skull key", player, 1))
set_rule(world.get_entrance("Against Thee Wickedly (E4M6) Main -> Against Thee Wickedly (E4M6) Red", player), lambda state:
set_rule(world.get_entrance("Against Thee Wickedly (E4M6) Blue -> Against Thee Wickedly (E4M6) Red", player), lambda state:
state.has("Against Thee Wickedly (E4M6) - Red skull key", player, 1))
set_rule(world.get_entrance("Against Thee Wickedly (E4M6) Blue -> Against Thee Wickedly (E4M6) Main", player), lambda state:
state.has("Against Thee Wickedly (E4M6) - Blue skull key", player, 1))

# And Hell Followed (E4M7)
set_rule(world.get_entrance("Hub -> And Hell Followed (E4M7) Main", player), lambda state:
Expand Down
Loading