mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
id Tech 1 games: Logic updates (Feb '25) (#4677)
- Across Doom 1993 and Doom 2, any items that are accessible in Ultra-Violence from the start of the level without putting the player in any danger are now considered in logic when that level is first received, without needing any weapons available. This is intended to give generation more possible outs for bad placements. - This affects the following maps in Doom 1993: - Toxin Refinery (E1M3): 1 location. - Command Control (E1M4): 1 location. - Computer Station (E1M7): 1 location. - Deimos Lab (E2M4): 1 location. - Tower of Babel (E2M8): 1 location. - Unholy Cathedral (E3M5): 1 location. - This affects the following maps in Doom 2: - The Waste Tunnels (MAP05): 2 locations. - Dead Simple (MAP07): 2 locations. - The Pit (MAP09): 1 location. - Refueling Base (MAP10): 1 location. - Nirvana (MAP21): 1 location, except see below. - Icon of Sin (MAP30): 9 locations. - Grosse (MAP32): 2 locations. - Doom 2 has had some more significant logical adjustments made. - The following Pro tricks have been added to Pro logic: - Circle of Death (MAP11): Lowering the exit wall without the Red key by hitting the switch to do so from the nukage. This makes three items previously locked behind the Red key available early, as well as the exit. - Suburbs (MAP16): Reaching the exit without any keys, as the gap between the pillar and the wall is large enough to let you through if you position yourself well. While multiple other squeeze glides exist (for example, you can skip the Yellow key in MAP21 by using one), this one is significantly easier than the rest; it does not require much precision, nor does it require vertical mouse movement. - Nirvana (MAP21): Skipping the Blue key, as there is a gigantic gap between the bars that attempt to block you. - The Chasm (MAP24): Skipping the Blue key by going extremely far through the nukage and finding one of a couple specific teleporters is now considered a Pro trick, and standard logic now expects the key to be obtained. - The following levels have had other logic adjustments: - The Waste Tunnels (MAP05): Requirements lowered to Shotgun + Super Shotgun + (Chaingun | Plasma gun). - The Crusher (MAP06): Requirements lowered to Shotgun + (Chaingun | Plasma gun) for areas immediately accessible. Going beyond the Blue key door also requires Super Shotgun. - The Factory (MAP12): The outdoors area, and the little room to the right of where you start, are accessible in sphere 1. These three items are all easily obtainable with only the pistol. The remaining items that are not in the central area are accessible with (Super Shotgun | Plasma gun), while the items in that area are accessible with Super Shotgun + Chaingun + (Plasma gun | BFG9000). This fixes Episode 2 not having an available sphere 1, and allows solo Episode 2 games. - Nirvana (MAP21): As above, the item in the starting room is accessible in sphere 1. Every other item that doesn't require a key is accessible with (Super Shotgun | Plasma gun). The room in which you use the Yellow key is accessible with Super Shotgun + Chaingun + (Plasma gun | BFG9000). This fixes Episode 3 not having an available sphere 1, and allows solo Episode 3 games. - The Catacombs (MAP22): The four items in the opening room only require (Shotgun | Super Shotgun | Plasma gun). The rest of the level is as before. - Bloodfalls (MAP25): Requirements lowered to Shotgun + Super Shotgun + Chaingun, as this level is unusually easy for its placement in the game. Progressing past the Blue key door additionally requires (Rocket launcher | Plasma gun | BFG9000) solely to deal with the Arch-vile at the end of the level. - Wolfenstein (MAP31): Requirements lowered to Chaingun + (Shotgun | Super Shotgun). This is closer to what the game expects from a non-secret hunting player from a pistol start. - The following logic bugs in Heretic have been fixed: - Quay (E5M3): An item in a Blue key locked hallway was previously marked as being in the "Main" region, thus considered to be accessible without that key. It has been moved to the appropriate "Blue" region. - Courtyard (E5M4): Logic previously assumed you could reach the Wings of Wrath from the opening room, when that isn't actually possible. Changing this moved some items previously in the "Main" region into a new "Green" region, and items previously in the "Kakis" (Yellow OR Green) are now in a "Yellow" region instead. Fixes #4662. - For known problematic solo episodes, some additional special cases have been added. - Doom 1993, Episode 3: One of either the Shotgun or Chaingun is placed early. Slough of Despair (E3M2) is given as an additional starting level. - Doom 2, Episode 3: One of either the Super Shotgun or Plasma gun is placed early. - Heretic, Episode 1: The Docks (E1M1) - Yellow key is placed early. - The following levels (and thus, their items and locations) were renamed, due to typos or other oddities: - `Barrels o Fun (MAP23)` -> `Barrels o' Fun (MAP23)` - `Wolfenstein2 (MAP31)` -> `Wolfenstein (MAP31)` - `Grosse2 (MAP32)` -> `Grosse (MAP32)` - `D'Sparil'S Keep (E3M8)` -> `D'Sparil's Keep (E3M8)` - `The Aquifier (E3M9)` -> `The Aquifer (E3M9)`
This commit is contained in:
@@ -126,7 +126,7 @@ location_table: Dict[int, LocationDict] = {
|
||||
'map': 3,
|
||||
'index': 64,
|
||||
'doom_type': 2001,
|
||||
'region': "Toxin Refinery (E1M3) Main"},
|
||||
'region': "Toxin Refinery (E1M3) Start"},
|
||||
351019: {'name': 'Toxin Refinery (E1M3) - Shotgun 2',
|
||||
'episode': 1,
|
||||
'map': 3,
|
||||
@@ -234,7 +234,7 @@ location_table: Dict[int, LocationDict] = {
|
||||
'map': 4,
|
||||
'index': 107,
|
||||
'doom_type': 8,
|
||||
'region': "Command Control (E1M4) Main"},
|
||||
'region': "Command Control (E1M4) Start"},
|
||||
351037: {'name': 'Command Control (E1M4) - Shotgun',
|
||||
'episode': 1,
|
||||
'map': 4,
|
||||
@@ -504,7 +504,7 @@ location_table: Dict[int, LocationDict] = {
|
||||
'map': 7,
|
||||
'index': 122,
|
||||
'doom_type': 2001,
|
||||
'region': "Computer Station (E1M7) Main"},
|
||||
'region': "Computer Station (E1M7) Start"},
|
||||
351082: {'name': 'Computer Station (E1M7) - Rocket launcher',
|
||||
'episode': 1,
|
||||
'map': 7,
|
||||
@@ -912,7 +912,7 @@ location_table: Dict[int, LocationDict] = {
|
||||
'map': 4,
|
||||
'index': 109,
|
||||
'doom_type': 2001,
|
||||
'region': "Deimos Lab (E2M4) Main"},
|
||||
'region': "Deimos Lab (E2M4) Start"},
|
||||
351150: {'name': 'Deimos Lab (E2M4) - Mega Armor',
|
||||
'episode': 2,
|
||||
'map': 4,
|
||||
@@ -1242,7 +1242,7 @@ location_table: Dict[int, LocationDict] = {
|
||||
'map': 8,
|
||||
'index': 36,
|
||||
'doom_type': 2019,
|
||||
'region': "Tower of Babel (E2M8) Main"},
|
||||
'region': "Tower of Babel (E2M8) Start"},
|
||||
351205: {'name': 'Fortress of Mystery (E2M9) - Supercharge',
|
||||
'episode': 2,
|
||||
'map': 9,
|
||||
@@ -1638,7 +1638,7 @@ location_table: Dict[int, LocationDict] = {
|
||||
'map': 5,
|
||||
'index': 187,
|
||||
'doom_type': 2001,
|
||||
'region': "Unholy Cathedral (E3M5) Main"},
|
||||
'region': "Unholy Cathedral (E3M5) Start"},
|
||||
351271: {'name': 'Unholy Cathedral (E3M5) - Shotgun 2',
|
||||
'episode': 3,
|
||||
'map': 5,
|
||||
|
@@ -33,9 +33,11 @@ regions:List[RegionDict] = [
|
||||
|
||||
# Toxin Refinery (E1M3)
|
||||
{"name":"Toxin Refinery (E1M3) Main",
|
||||
"connects_to_hub":True,
|
||||
"connects_to_hub":False,
|
||||
"episode":1,
|
||||
"connections":[{"target":"Toxin Refinery (E1M3) Blue","pro":False}]},
|
||||
"connections":[
|
||||
{"target":"Toxin Refinery (E1M3) Blue","pro":False},
|
||||
{"target":"Toxin Refinery (E1M3) Start","pro":False}]},
|
||||
{"name":"Toxin Refinery (E1M3) Blue",
|
||||
"connects_to_hub":False,
|
||||
"episode":1,
|
||||
@@ -46,15 +48,20 @@ regions:List[RegionDict] = [
|
||||
"connects_to_hub":False,
|
||||
"episode":1,
|
||||
"connections":[{"target":"Toxin Refinery (E1M3) Blue","pro":False}]},
|
||||
{"name":"Toxin Refinery (E1M3) Start",
|
||||
"connects_to_hub":True,
|
||||
"episode":1,
|
||||
"connections":[{"target":"Toxin Refinery (E1M3) Main","pro":False}]},
|
||||
|
||||
# Command Control (E1M4)
|
||||
{"name":"Command Control (E1M4) Main",
|
||||
"connects_to_hub":True,
|
||||
"connects_to_hub":False,
|
||||
"episode":1,
|
||||
"connections":[
|
||||
{"target":"Command Control (E1M4) Blue","pro":False},
|
||||
{"target":"Command Control (E1M4) Yellow","pro":False},
|
||||
{"target":"Command Control (E1M4) Ledge","pro":True}]},
|
||||
{"target":"Command Control (E1M4) Ledge","pro":True},
|
||||
{"target":"Command Control (E1M4) Start","pro":False}]},
|
||||
{"name":"Command Control (E1M4) Blue",
|
||||
"connects_to_hub":False,
|
||||
"episode":1,
|
||||
@@ -72,6 +79,10 @@ regions:List[RegionDict] = [
|
||||
{"target":"Command Control (E1M4) Main","pro":False},
|
||||
{"target":"Command Control (E1M4) Blue","pro":False},
|
||||
{"target":"Command Control (E1M4) Yellow","pro":False}]},
|
||||
{"name":"Command Control (E1M4) Start",
|
||||
"connects_to_hub":True,
|
||||
"episode":1,
|
||||
"connections":[{"target":"Command Control (E1M4) Main","pro":False}]},
|
||||
|
||||
# Phobos Lab (E1M5)
|
||||
{"name":"Phobos Lab (E1M5) Main",
|
||||
@@ -126,11 +137,12 @@ regions:List[RegionDict] = [
|
||||
|
||||
# Computer Station (E1M7)
|
||||
{"name":"Computer Station (E1M7) Main",
|
||||
"connects_to_hub":True,
|
||||
"connects_to_hub":False,
|
||||
"episode":1,
|
||||
"connections":[
|
||||
{"target":"Computer Station (E1M7) Red","pro":False},
|
||||
{"target":"Computer Station (E1M7) Yellow","pro":False}]},
|
||||
{"target":"Computer Station (E1M7) Yellow","pro":False},
|
||||
{"target":"Computer Station (E1M7) Start","pro":False}]},
|
||||
{"name":"Computer Station (E1M7) Blue",
|
||||
"connects_to_hub":False,
|
||||
"episode":1,
|
||||
@@ -150,6 +162,10 @@ regions:List[RegionDict] = [
|
||||
"connects_to_hub":False,
|
||||
"episode":1,
|
||||
"connections":[{"target":"Computer Station (E1M7) Yellow","pro":False}]},
|
||||
{"name":"Computer Station (E1M7) Start",
|
||||
"connects_to_hub":True,
|
||||
"episode":1,
|
||||
"connections":[{"target":"Computer Station (E1M7) Main","pro":False}]},
|
||||
|
||||
# Phobos Anomaly (E1M8)
|
||||
{"name":"Phobos Anomaly (E1M8) Main",
|
||||
@@ -238,9 +254,11 @@ regions:List[RegionDict] = [
|
||||
|
||||
# Deimos Lab (E2M4)
|
||||
{"name":"Deimos Lab (E2M4) Main",
|
||||
"connects_to_hub":True,
|
||||
"connects_to_hub":False,
|
||||
"episode":2,
|
||||
"connections":[{"target":"Deimos Lab (E2M4) Blue","pro":False}]},
|
||||
"connections":[
|
||||
{"target":"Deimos Lab (E2M4) Blue","pro":False},
|
||||
{"target":"Deimos Lab (E2M4) Start","pro":False}]},
|
||||
{"name":"Deimos Lab (E2M4) Blue",
|
||||
"connects_to_hub":False,
|
||||
"episode":2,
|
||||
@@ -251,6 +269,10 @@ regions:List[RegionDict] = [
|
||||
"connects_to_hub":False,
|
||||
"episode":2,
|
||||
"connections":[{"target":"Deimos Lab (E2M4) Blue","pro":False}]},
|
||||
{"name":"Deimos Lab (E2M4) Start",
|
||||
"connects_to_hub":True,
|
||||
"episode":2,
|
||||
"connections":[{"target":"Deimos Lab (E2M4) Main","pro":False}]},
|
||||
|
||||
# Command Center (E2M5)
|
||||
{"name":"Command Center (E2M5) Main",
|
||||
@@ -314,9 +336,13 @@ regions:List[RegionDict] = [
|
||||
|
||||
# Tower of Babel (E2M8)
|
||||
{"name":"Tower of Babel (E2M8) Main",
|
||||
"connects_to_hub":False,
|
||||
"episode":2,
|
||||
"connections":[{"target":"Tower of Babel (E2M8) Start","pro":False}]},
|
||||
{"name":"Tower of Babel (E2M8) Start",
|
||||
"connects_to_hub":True,
|
||||
"episode":2,
|
||||
"connections":[]},
|
||||
"connections":[{"target":"Tower of Babel (E2M8) Main","pro":False}]},
|
||||
|
||||
# Fortress of Mystery (E2M9)
|
||||
{"name":"Fortress of Mystery (E2M9) Main",
|
||||
@@ -392,11 +418,12 @@ regions:List[RegionDict] = [
|
||||
|
||||
# Unholy Cathedral (E3M5)
|
||||
{"name":"Unholy Cathedral (E3M5) Main",
|
||||
"connects_to_hub":True,
|
||||
"connects_to_hub":False,
|
||||
"episode":3,
|
||||
"connections":[
|
||||
{"target":"Unholy Cathedral (E3M5) Yellow","pro":False},
|
||||
{"target":"Unholy Cathedral (E3M5) Blue","pro":False}]},
|
||||
{"target":"Unholy Cathedral (E3M5) Blue","pro":False},
|
||||
{"target":"Unholy Cathedral (E3M5) Start","pro":False}]},
|
||||
{"name":"Unholy Cathedral (E3M5) Blue",
|
||||
"connects_to_hub":False,
|
||||
"episode":3,
|
||||
@@ -405,6 +432,10 @@ regions:List[RegionDict] = [
|
||||
"connects_to_hub":False,
|
||||
"episode":3,
|
||||
"connections":[{"target":"Unholy Cathedral (E3M5) Main","pro":False}]},
|
||||
{"name":"Unholy Cathedral (E3M5) Start",
|
||||
"connects_to_hub":True,
|
||||
"episode":3,
|
||||
"connections":[{"target":"Unholy Cathedral (E3M5) Main","pro":False}]},
|
||||
|
||||
# Mt. Erebus (E3M6)
|
||||
{"name":"Mt. Erebus (E3M6) Main",
|
||||
|
@@ -23,10 +23,6 @@ def set_episode1_rules(player, multiworld, pro):
|
||||
state.has("Nuclear Plant (E1M2) - Red keycard", player, 1))
|
||||
|
||||
# Toxin Refinery (E1M3)
|
||||
set_rule(multiworld.get_entrance("Hub -> Toxin Refinery (E1M3) Main", player), lambda state:
|
||||
(state.has("Toxin Refinery (E1M3)", player, 1)) and
|
||||
(state.has("Shotgun", player, 1) or
|
||||
state.has("Chaingun", player, 1)))
|
||||
set_rule(multiworld.get_entrance("Toxin Refinery (E1M3) Main -> Toxin Refinery (E1M3) Blue", player), lambda state:
|
||||
state.has("Toxin Refinery (E1M3) - Blue keycard", player, 1))
|
||||
set_rule(multiworld.get_entrance("Toxin Refinery (E1M3) Blue -> Toxin Refinery (E1M3) Yellow", player), lambda state:
|
||||
@@ -35,12 +31,13 @@ def set_episode1_rules(player, multiworld, pro):
|
||||
state.has("Toxin Refinery (E1M3) - Blue keycard", player, 1))
|
||||
set_rule(multiworld.get_entrance("Toxin Refinery (E1M3) Yellow -> Toxin Refinery (E1M3) Blue", player), lambda state:
|
||||
state.has("Toxin Refinery (E1M3) - Yellow keycard", player, 1))
|
||||
set_rule(multiworld.get_entrance("Hub -> Toxin Refinery (E1M3) Start", player), lambda state:
|
||||
state.has("Toxin Refinery (E1M3)", player, 1))
|
||||
set_rule(multiworld.get_entrance("Toxin Refinery (E1M3) Start -> Toxin Refinery (E1M3) Main", player), lambda state:
|
||||
state.has("Shotgun", player, 1) or
|
||||
state.has("Chaingun", player, 1))
|
||||
|
||||
# Command Control (E1M4)
|
||||
set_rule(multiworld.get_entrance("Hub -> Command Control (E1M4) Main", player), lambda state:
|
||||
state.has("Command Control (E1M4)", player, 1) and
|
||||
state.has("Shotgun", player, 1) and
|
||||
state.has("Chaingun", player, 1))
|
||||
set_rule(multiworld.get_entrance("Command Control (E1M4) Main -> Command Control (E1M4) Blue", player), lambda state:
|
||||
state.has("Command Control (E1M4) - Blue keycard", player, 1) or
|
||||
state.has("Command Control (E1M4) - Yellow keycard", player, 1))
|
||||
@@ -50,6 +47,11 @@ def set_episode1_rules(player, multiworld, pro):
|
||||
set_rule(multiworld.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(multiworld.get_entrance("Hub -> Command Control (E1M4) Start", player), lambda state:
|
||||
state.has("Command Control (E1M4)", player, 1))
|
||||
set_rule(multiworld.get_entrance("Command Control (E1M4) Start -> Command Control (E1M4) Main", player), lambda state:
|
||||
state.has("Shotgun", player, 1) and
|
||||
state.has("Chaingun", player, 1))
|
||||
|
||||
# Phobos Lab (E1M5)
|
||||
set_rule(multiworld.get_entrance("Hub -> Phobos Lab (E1M5) Main", player), lambda state:
|
||||
@@ -83,11 +85,6 @@ def set_episode1_rules(player, multiworld, pro):
|
||||
state.has("Central Processing (E1M6) - Yellow keycard", player, 1))
|
||||
|
||||
# Computer Station (E1M7)
|
||||
set_rule(multiworld.get_entrance("Hub -> Computer Station (E1M7) Main", player), lambda state:
|
||||
state.has("Computer Station (E1M7)", player, 1) and
|
||||
state.has("Shotgun", player, 1) and
|
||||
state.has("Chaingun", player, 1) and
|
||||
state.has("Rocket launcher", player, 1))
|
||||
set_rule(multiworld.get_entrance("Computer Station (E1M7) Main -> Computer Station (E1M7) Red", player), lambda state:
|
||||
state.has("Computer Station (E1M7) - Red keycard", player, 1))
|
||||
set_rule(multiworld.get_entrance("Computer Station (E1M7) Main -> Computer Station (E1M7) Yellow", player), lambda state:
|
||||
@@ -103,6 +100,12 @@ def set_episode1_rules(player, multiworld, pro):
|
||||
state.has("Computer Station (E1M7) - Red keycard", player, 1))
|
||||
set_rule(multiworld.get_entrance("Computer Station (E1M7) Courtyard -> Computer Station (E1M7) Yellow", player), lambda state:
|
||||
state.has("Computer Station (E1M7) - Yellow keycard", player, 1))
|
||||
set_rule(multiworld.get_entrance("Hub -> Computer Station (E1M7) Start", player), lambda state:
|
||||
state.has("Computer Station (E1M7)", player, 1))
|
||||
set_rule(multiworld.get_entrance("Computer Station (E1M7) Start -> Computer Station (E1M7) Main", player), lambda state:
|
||||
state.has("Shotgun", player, 1) and
|
||||
state.has("Rocket launcher", player, 1) and
|
||||
state.has("Chaingun", player, 1))
|
||||
|
||||
# Phobos Anomaly (E1M8)
|
||||
set_rule(multiworld.get_entrance("Hub -> Phobos Anomaly (E1M8) Start", player), lambda state:
|
||||
@@ -172,15 +175,16 @@ def set_episode2_rules(player, multiworld, pro):
|
||||
state.has("Refinery (E2M3) - Blue keycard", player, 1))
|
||||
|
||||
# Deimos Lab (E2M4)
|
||||
set_rule(multiworld.get_entrance("Hub -> Deimos Lab (E2M4) Main", player), lambda state:
|
||||
state.has("Deimos Lab (E2M4)", player, 1) and
|
||||
state.has("Shotgun", player, 1) and
|
||||
state.has("Chaingun", player, 1) and
|
||||
state.has("Plasma gun", player, 1))
|
||||
set_rule(multiworld.get_entrance("Deimos Lab (E2M4) Main -> Deimos Lab (E2M4) Blue", player), lambda state:
|
||||
state.has("Deimos Lab (E2M4) - Blue keycard", player, 1))
|
||||
set_rule(multiworld.get_entrance("Deimos Lab (E2M4) Blue -> Deimos Lab (E2M4) Yellow", player), lambda state:
|
||||
state.has("Deimos Lab (E2M4) - Yellow keycard", player, 1))
|
||||
set_rule(multiworld.get_entrance("Hub -> Deimos Lab (E2M4) Start", player), lambda state:
|
||||
state.has("Deimos Lab (E2M4)", player, 1))
|
||||
set_rule(multiworld.get_entrance("Deimos Lab (E2M4) Start -> Deimos Lab (E2M4) Main", player), lambda state:
|
||||
state.has("Shotgun", player, 1) and
|
||||
state.has("Plasma gun", player, 1) and
|
||||
state.has("Chaingun", player, 1))
|
||||
|
||||
# Command Center (E2M5)
|
||||
set_rule(multiworld.get_entrance("Hub -> Command Center (E2M5) Main", player), lambda state:
|
||||
@@ -238,11 +242,11 @@ def set_episode2_rules(player, multiworld, pro):
|
||||
state.has("Spawning Vats (E2M7) - Red keycard", player, 1))
|
||||
|
||||
# Tower of Babel (E2M8)
|
||||
set_rule(multiworld.get_entrance("Hub -> Tower of Babel (E2M8) Main", player), lambda state:
|
||||
(state.has("Tower of Babel (E2M8)", player, 1) and
|
||||
state.has("Shotgun", player, 1) and
|
||||
state.has("Chaingun", player, 1)) and
|
||||
(state.has("Rocket launcher", player, 1) or
|
||||
set_rule(multiworld.get_entrance("Hub -> Tower of Babel (E2M8) Start", player), lambda state:
|
||||
state.has("Tower of Babel (E2M8)", player, 1))
|
||||
set_rule(multiworld.get_entrance("Tower of Babel (E2M8) Start -> Tower of Babel (E2M8) Main", player), lambda state:
|
||||
(state.has("Chaingun", player, 1) and
|
||||
state.has("Shotgun", player, 1)) and (state.has("Rocket launcher", player, 1) or
|
||||
state.has("Plasma gun", player, 1) or
|
||||
state.has("BFG9000", player, 1)))
|
||||
|
||||
@@ -321,13 +325,6 @@ def set_episode3_rules(player, multiworld, pro):
|
||||
state.has("House of Pain (E3M4) - Yellow skull key", player, 1))
|
||||
|
||||
# Unholy Cathedral (E3M5)
|
||||
set_rule(multiworld.get_entrance("Hub -> Unholy Cathedral (E3M5) Main", player), lambda state:
|
||||
(state.has("Unholy Cathedral (E3M5)", player, 1) and
|
||||
state.has("Chaingun", player, 1) and
|
||||
state.has("Shotgun", player, 1)) and
|
||||
(state.has("Rocket launcher", player, 1) or
|
||||
state.has("Plasma gun", player, 1) or
|
||||
state.has("BFG9000", player, 1)))
|
||||
set_rule(multiworld.get_entrance("Unholy Cathedral (E3M5) Main -> Unholy Cathedral (E3M5) Yellow", player), lambda state:
|
||||
state.has("Unholy Cathedral (E3M5) - Yellow skull key", player, 1))
|
||||
set_rule(multiworld.get_entrance("Unholy Cathedral (E3M5) Main -> Unholy Cathedral (E3M5) Blue", player), lambda state:
|
||||
@@ -336,6 +333,13 @@ def set_episode3_rules(player, multiworld, pro):
|
||||
state.has("Unholy Cathedral (E3M5) - Blue skull key", player, 1))
|
||||
set_rule(multiworld.get_entrance("Unholy Cathedral (E3M5) Yellow -> Unholy Cathedral (E3M5) Main", player), lambda state:
|
||||
state.has("Unholy Cathedral (E3M5) - Yellow skull key", player, 1))
|
||||
set_rule(multiworld.get_entrance("Hub -> Unholy Cathedral (E3M5) Start", player), lambda state:
|
||||
state.has("Unholy Cathedral (E3M5)", player, 1))
|
||||
set_rule(multiworld.get_entrance("Unholy Cathedral (E3M5) Start -> Unholy Cathedral (E3M5) Main", player), lambda state:
|
||||
(state.has("Chaingun", player, 1) and
|
||||
state.has("Shotgun", player, 1)) and (state.has("Plasma gun", player, 1) or
|
||||
state.has("Rocket launcher", player, 1) or
|
||||
state.has("BFG9000", player, 1)))
|
||||
|
||||
# Mt. Erebus (E3M6)
|
||||
set_rule(multiworld.get_entrance("Hub -> Mt. Erebus (E3M6) Main", player), lambda state:
|
||||
|
@@ -50,14 +50,14 @@ class DOOM1993World(World):
|
||||
location_name_to_id = {data["name"]: loc_id for loc_id, data in Locations.location_table.items()}
|
||||
location_name_groups = Locations.location_name_groups
|
||||
|
||||
starting_level_for_episode: List[str] = [
|
||||
"Hangar (E1M1)",
|
||||
"Deimos Anomaly (E2M1)",
|
||||
"Hell Keep (E3M1)",
|
||||
"Hell Beneath (E4M1)"
|
||||
]
|
||||
starting_level_for_episode: Dict[int, str] = {
|
||||
1: "Hangar (E1M1)",
|
||||
2: "Deimos Anomaly (E2M1)",
|
||||
3: "Hell Keep (E3M1)",
|
||||
4: "Hell Beneath (E4M1)"
|
||||
}
|
||||
|
||||
boss_level_for_espidoes: List[str] = [
|
||||
all_boss_levels: List[str] = [
|
||||
"Phobos Anomaly (E1M8)",
|
||||
"Tower of Babel (E2M8)",
|
||||
"Dis (E3M8)",
|
||||
@@ -82,6 +82,7 @@ class DOOM1993World(World):
|
||||
def __init__(self, multiworld: MultiWorld, player: int):
|
||||
self.included_episodes = [1, 1, 1, 0]
|
||||
self.location_count = 0
|
||||
self.starting_levels = []
|
||||
|
||||
super().__init__(multiworld, player)
|
||||
|
||||
@@ -99,6 +100,16 @@ class DOOM1993World(World):
|
||||
if self.get_episode_count() == 0:
|
||||
self.included_episodes[0] = 1
|
||||
|
||||
self.starting_levels = [level_name for (episode, level_name) in self.starting_level_for_episode.items()
|
||||
if self.included_episodes[episode - 1]]
|
||||
|
||||
# Solo Episode 3 presents a problem, because Hell Keep has only two locations.
|
||||
# We have to give the player Slough of Despair (E3M2), and also mark a weapon early.
|
||||
if self.get_episode_count() == 1 and self.included_episodes[2]:
|
||||
early_weapon = self.random.choice(["Shotgun", "Chaingun"])
|
||||
self.multiworld.early_items[self.player][early_weapon] = 1
|
||||
self.starting_levels.append("Slough of Despair (E3M2)")
|
||||
|
||||
def create_regions(self):
|
||||
pro = self.options.pro.value
|
||||
|
||||
@@ -152,7 +163,7 @@ class DOOM1993World(World):
|
||||
def completion_rule(self, state: CollectionState):
|
||||
goal_levels = Maps.map_names
|
||||
if self.options.goal.value:
|
||||
goal_levels = self.boss_level_for_espidoes
|
||||
goal_levels = self.all_boss_levels
|
||||
|
||||
for map_name in goal_levels:
|
||||
if map_name + " - Exit" not in self.location_name_to_id:
|
||||
@@ -201,7 +212,7 @@ class DOOM1993World(World):
|
||||
if item["episode"] != -1 and not self.included_episodes[item["episode"] - 1]:
|
||||
continue
|
||||
|
||||
count = item["count"] if item["name"] not in self.starting_level_for_episode else item["count"] - 1
|
||||
count = item["count"] if item["name"] not in self.starting_levels else item["count"] - 1
|
||||
itempool += [self.create_item(item["name"]) for _ in range(count)]
|
||||
|
||||
# Backpack(s) based on options
|
||||
@@ -232,9 +243,8 @@ class DOOM1993World(World):
|
||||
self.location_count -= 1
|
||||
|
||||
# Give starting levels right away
|
||||
for i in range(len(self.included_episodes)):
|
||||
if self.included_episodes[i]:
|
||||
self.multiworld.push_precollected(self.create_item(self.starting_level_for_episode[i]))
|
||||
for map_name in self.starting_levels:
|
||||
self.multiworld.push_precollected(self.create_item(map_name))
|
||||
|
||||
# Give Computer area maps if option selected
|
||||
if self.options.start_with_computer_area_maps.value:
|
||||
|
Reference in New Issue
Block a user