morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

id Tech 1 games: Logic updates (Feb '25) (#4677)

Browse Source 
- 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:
Kaito Sinclaire
2025-03-29 09:32:33 -07:00
committed by GitHub
parent dd5481930a
commit c3e000e574
16 changed files with 739 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
worlds/doom_ii/Items.py
View File

@@ -412,7 +412,7 @@ item_table: Dict[int, ItemDict] = {
'map': 2},
360246: {'classification': ItemClassification.progression,
'count': 1,
'name': 'Barrels o Fun (MAP23) - Yellow skull key',
'name': "Barrels o' Fun (MAP23) - Yellow skull key",
'doom_type': 39,
'episode': 3,
'map': 3},
@@ -880,19 +880,19 @@ item_table: Dict[int, ItemDict] = {
'map': 2},
360466: {'classification': ItemClassification.progression,
'count': 1,
'name': 'Barrels o Fun (MAP23)',
'name': "Barrels o' Fun (MAP23)",
'doom_type': -1,
'episode': 3,
'map': 3},
360467: {'classification': ItemClassification.progression,
'count': 1,
'name': 'Barrels o Fun (MAP23) - Complete',
'name': "Barrels o' Fun (MAP23) - Complete",
'doom_type': -2,
'episode': 3,
'map': 3},
360468: {'classification': ItemClassification.filler,
'count': 1,
'name': 'Barrels o Fun (MAP23) - Computer area map',
'name': "Barrels o' Fun (MAP23) - Computer area map",
'doom_type': 2026,
'episode': 3,
'map': 3},
@@ -1024,37 +1024,37 @@ item_table: Dict[int, ItemDict] = {
'map': 10},
360490: {'classification': ItemClassification.progression,
'count': 1,
'name': 'Wolfenstein2 (MAP31)',
'name': 'Wolfenstein (MAP31)',
'doom_type': -1,
'episode': 4,
'map': 1},
360491: {'classification': ItemClassification.progression,
'count': 1,
'name': 'Wolfenstein2 (MAP31) - Complete',
'name': 'Wolfenstein (MAP31) - Complete',
'doom_type': -2,
'episode': 4,
'map': 1},
360492: {'classification': ItemClassification.filler,
'count': 1,
'name': 'Wolfenstein2 (MAP31) - Computer area map',
'name': 'Wolfenstein (MAP31) - Computer area map',
'doom_type': 2026,
'episode': 4,
'map': 1},
360493: {'classification': ItemClassification.progression,
'count': 1,
'name': 'Grosse2 (MAP32)',
'name': 'Grosse (MAP32)',
'doom_type': -1,
'episode': 4,
'map': 2},
360494: {'classification': ItemClassification.progression,
'count': 1,
'name': 'Grosse2 (MAP32) - Complete',
'name': 'Grosse (MAP32) - Complete',
'doom_type': -2,
'episode': 4,
'map': 2},
360495: {'classification': ItemClassification.filler,
'count': 1,
'name': 'Grosse2 (MAP32) - Computer area map',
'name': 'Grosse (MAP32) - Computer area map',
'doom_type': 2026,
'episode': 4,
'map': 2},
@@ -1087,9 +1087,9 @@ item_table: Dict[int, ItemDict] = {
item_name_groups: Dict[str, Set[str]] = {
'Ammos': {'Box of bullets', 'Box of rockets', 'Box of shotgun shells', 'Energy cell pack', },
'Computer area maps': {'Barrels o Fun (MAP23) - Computer area map', 'Bloodfalls (MAP25) - Computer area map', 'Circle of Death (MAP11) - Computer area map', 'Dead Simple (MAP07) - Computer area map', 'Downtown (MAP13) - Computer area map', 'Entryway (MAP01) - Computer area map', 'Gotcha! (MAP20) - Computer area map', 'Grosse2 (MAP32) - Computer area map', 'Icon of Sin (MAP30) - Computer area map', 'Industrial Zone (MAP15) - Computer area map', 'Monster Condo (MAP27) - Computer area map', 'Nirvana (MAP21) - Computer area map', 'Refueling Base (MAP10) - Computer area map', 'Suburbs (MAP16) - Computer area map', 'Tenements (MAP17) - Computer area map', 'The Abandoned Mines (MAP26) - Computer area map', 'The Catacombs (MAP22) - Computer area map', 'The Chasm (MAP24) - Computer area map', 'The Citadel (MAP19) - Computer area map', 'The Courtyard (MAP18) - Computer area map', 'The Crusher (MAP06) - Computer area map', 'The Factory (MAP12) - Computer area map', 'The Focus (MAP04) - Computer area map', 'The Gantlet (MAP03) - Computer area map', 'The Inmost Dens (MAP14) - Computer area map', 'The Living End (MAP29) - Computer area map', 'The Pit (MAP09) - Computer area map', 'The Spirit World (MAP28) - Computer area map', 'The Waste Tunnels (MAP05) - Computer area map', 'Tricks and Traps (MAP08) - Computer area map', 'Underhalls (MAP02) - Computer area map', 'Wolfenstein2 (MAP31) - Computer area map', },
'Keys': {'Barrels o Fun (MAP23) - Yellow skull key', 'Bloodfalls (MAP25) - Blue skull key', 'Circle of Death (MAP11) - Blue keycard', 'Circle of Death (MAP11) - Red keycard', 'Downtown (MAP13) - Blue keycard', 'Downtown (MAP13) - Red keycard', 'Downtown (MAP13) - Yellow keycard', 'Industrial Zone (MAP15) - Blue keycard', 'Industrial Zone (MAP15) - Red keycard', 'Industrial Zone (MAP15) - Yellow keycard', 'Monster Condo (MAP27) - Blue skull key', 'Monster Condo (MAP27) - Red skull key', 'Monster Condo (MAP27) - Yellow skull key', 'Nirvana (MAP21) - Blue skull key', 'Nirvana (MAP21) - Red skull key', 'Nirvana (MAP21) - Yellow skull key', 'Refueling Base (MAP10) - Blue keycard', 'Refueling Base (MAP10) - Yellow keycard', 'Suburbs (MAP16) - Blue skull key', 'Suburbs (MAP16) - Red skull key', 'Tenements (MAP17) - Blue keycard', 'Tenements (MAP17) - Red keycard', 'Tenements (MAP17) - Yellow skull key', 'The Abandoned Mines (MAP26) - Blue keycard', 'The Abandoned Mines (MAP26) - Red keycard', 'The Abandoned Mines (MAP26) - Yellow keycard', 'The Catacombs (MAP22) - Blue skull key', 'The Catacombs (MAP22) - Red skull key', 'The Chasm (MAP24) - Blue keycard', 'The Chasm (MAP24) - Red keycard', 'The Citadel (MAP19) - Blue skull key', 'The Citadel (MAP19) - Red skull key', 'The Citadel (MAP19) - Yellow skull key', 'The Courtyard (MAP18) - Blue skull key', 'The Courtyard (MAP18) - Yellow skull key', 'The Crusher (MAP06) - Blue keycard', 'The Crusher (MAP06) - Red keycard', 'The Crusher (MAP06) - Yellow keycard', 'The Factory (MAP12) - Blue keycard', 'The Factory (MAP12) - Yellow keycard', 'The Focus (MAP04) - Blue keycard', 'The Focus (MAP04) - Red keycard', 'The Focus (MAP04) - Yellow keycard', 'The Gantlet (MAP03) - Blue keycard', 'The Gantlet (MAP03) - Red keycard', 'The Inmost Dens (MAP14) - Blue skull key', 'The Inmost Dens (MAP14) - Red skull key', 'The Pit (MAP09) - Blue keycard', 'The Pit (MAP09) - Yellow keycard', 'The Spirit World (MAP28) - Red skull key', 'The Spirit World (MAP28) - Yellow skull key', 'The Waste Tunnels (MAP05) - Blue keycard', 'The Waste Tunnels (MAP05) - Red keycard', 'The Waste Tunnels (MAP05) - Yellow keycard', 'Tricks and Traps (MAP08) - Red skull key', 'Tricks and Traps (MAP08) - Yellow skull key', 'Underhalls (MAP02) - Blue keycard', 'Underhalls (MAP02) - Red keycard', },
'Levels': {'Barrels o Fun (MAP23)', 'Bloodfalls (MAP25)', 'Circle of Death (MAP11)', 'Dead Simple (MAP07)', 'Downtown (MAP13)', 'Entryway (MAP01)', 'Gotcha! (MAP20)', 'Grosse2 (MAP32)', 'Icon of Sin (MAP30)', 'Industrial Zone (MAP15)', 'Monster Condo (MAP27)', 'Nirvana (MAP21)', 'Refueling Base (MAP10)', 'Suburbs (MAP16)', 'Tenements (MAP17)', 'The Abandoned Mines (MAP26)', 'The Catacombs (MAP22)', 'The Chasm (MAP24)', 'The Citadel (MAP19)', 'The Courtyard (MAP18)', 'The Crusher (MAP06)', 'The Factory (MAP12)', 'The Focus (MAP04)', 'The Gantlet (MAP03)', 'The Inmost Dens (MAP14)', 'The Living End (MAP29)', 'The Pit (MAP09)', 'The Spirit World (MAP28)', 'The Waste Tunnels (MAP05)', 'Tricks and Traps (MAP08)', 'Underhalls (MAP02)', 'Wolfenstein2 (MAP31)', },
'Computer area maps': {"Barrels o' Fun (MAP23) - Computer area map", 'Bloodfalls (MAP25) - Computer area map', 'Circle of Death (MAP11) - Computer area map', 'Dead Simple (MAP07) - Computer area map', 'Downtown (MAP13) - Computer area map', 'Entryway (MAP01) - Computer area map', 'Gotcha! (MAP20) - Computer area map', 'Grosse (MAP32) - Computer area map', 'Icon of Sin (MAP30) - Computer area map', 'Industrial Zone (MAP15) - Computer area map', 'Monster Condo (MAP27) - Computer area map', 'Nirvana (MAP21) - Computer area map', 'Refueling Base (MAP10) - Computer area map', 'Suburbs (MAP16) - Computer area map', 'Tenements (MAP17) - Computer area map', 'The Abandoned Mines (MAP26) - Computer area map', 'The Catacombs (MAP22) - Computer area map', 'The Chasm (MAP24) - Computer area map', 'The Citadel (MAP19) - Computer area map', 'The Courtyard (MAP18) - Computer area map', 'The Crusher (MAP06) - Computer area map', 'The Factory (MAP12) - Computer area map', 'The Focus (MAP04) - Computer area map', 'The Gantlet (MAP03) - Computer area map', 'The Inmost Dens (MAP14) - Computer area map', 'The Living End (MAP29) - Computer area map', 'The Pit (MAP09) - Computer area map', 'The Spirit World (MAP28) - Computer area map', 'The Waste Tunnels (MAP05) - Computer area map', 'Tricks and Traps (MAP08) - Computer area map', 'Underhalls (MAP02) - Computer area map', 'Wolfenstein (MAP31) - Computer area map', },
'Keys': {"Barrels o' Fun (MAP23) - Yellow skull key", 'Bloodfalls (MAP25) - Blue skull key', 'Circle of Death (MAP11) - Blue keycard', 'Circle of Death (MAP11) - Red keycard', 'Downtown (MAP13) - Blue keycard', 'Downtown (MAP13) - Red keycard', 'Downtown (MAP13) - Yellow keycard', 'Industrial Zone (MAP15) - Blue keycard', 'Industrial Zone (MAP15) - Red keycard', 'Industrial Zone (MAP15) - Yellow keycard', 'Monster Condo (MAP27) - Blue skull key', 'Monster Condo (MAP27) - Red skull key', 'Monster Condo (MAP27) - Yellow skull key', 'Nirvana (MAP21) - Blue skull key', 'Nirvana (MAP21) - Red skull key', 'Nirvana (MAP21) - Yellow skull key', 'Refueling Base (MAP10) - Blue keycard', 'Refueling Base (MAP10) - Yellow keycard', 'Suburbs (MAP16) - Blue skull key', 'Suburbs (MAP16) - Red skull key', 'Tenements (MAP17) - Blue keycard', 'Tenements (MAP17) - Red keycard', 'Tenements (MAP17) - Yellow skull key', 'The Abandoned Mines (MAP26) - Blue keycard', 'The Abandoned Mines (MAP26) - Red keycard', 'The Abandoned Mines (MAP26) - Yellow keycard', 'The Catacombs (MAP22) - Blue skull key', 'The Catacombs (MAP22) - Red skull key', 'The Chasm (MAP24) - Blue keycard', 'The Chasm (MAP24) - Red keycard', 'The Citadel (MAP19) - Blue skull key', 'The Citadel (MAP19) - Red skull key', 'The Citadel (MAP19) - Yellow skull key', 'The Courtyard (MAP18) - Blue skull key', 'The Courtyard (MAP18) - Yellow skull key', 'The Crusher (MAP06) - Blue keycard', 'The Crusher (MAP06) - Red keycard', 'The Crusher (MAP06) - Yellow keycard', 'The Factory (MAP12) - Blue keycard', 'The Factory (MAP12) - Yellow keycard', 'The Focus (MAP04) - Blue keycard', 'The Focus (MAP04) - Red keycard', 'The Focus (MAP04) - Yellow keycard', 'The Gantlet (MAP03) - Blue keycard', 'The Gantlet (MAP03) - Red keycard', 'The Inmost Dens (MAP14) - Blue skull key', 'The Inmost Dens (MAP14) - Red skull key', 'The Pit (MAP09) - Blue keycard', 'The Pit (MAP09) - Yellow keycard', 'The Spirit World (MAP28) - Red skull key', 'The Spirit World (MAP28) - Yellow skull key', 'The Waste Tunnels (MAP05) - Blue keycard', 'The Waste Tunnels (MAP05) - Red keycard', 'The Waste Tunnels (MAP05) - Yellow keycard', 'Tricks and Traps (MAP08) - Red skull key', 'Tricks and Traps (MAP08) - Yellow skull key', 'Underhalls (MAP02) - Blue keycard', 'Underhalls (MAP02) - Red keycard', },
'Levels': {"Barrels o' Fun (MAP23)", 'Bloodfalls (MAP25)', 'Circle of Death (MAP11)', 'Dead Simple (MAP07)', 'Downtown (MAP13)', 'Entryway (MAP01)', 'Gotcha! (MAP20)', 'Grosse (MAP32)', 'Icon of Sin (MAP30)', 'Industrial Zone (MAP15)', 'Monster Condo (MAP27)', 'Nirvana (MAP21)', 'Refueling Base (MAP10)', 'Suburbs (MAP16)', 'Tenements (MAP17)', 'The Abandoned Mines (MAP26)', 'The Catacombs (MAP22)', 'The Chasm (MAP24)', 'The Citadel (MAP19)', 'The Courtyard (MAP18)', 'The Crusher (MAP06)', 'The Factory (MAP12)', 'The Focus (MAP04)', 'The Gantlet (MAP03)', 'The Inmost Dens (MAP14)', 'The Living End (MAP29)', 'The Pit (MAP09)', 'The Spirit World (MAP28)', 'The Waste Tunnels (MAP05)', 'Tricks and Traps (MAP08)', 'Underhalls (MAP02)', 'Wolfenstein (MAP31)', },
'Powerups': {'Armor', 'Berserk', 'Invulnerability', 'Mega Armor', 'Megasphere', 'Partial invisibility', 'Supercharge', },
'Weapons': {'BFG9000', 'Chaingun', 'Chainsaw', 'Plasma gun', 'Rocket launcher', 'Shotgun', 'Super Shotgun', },
}

316
worlds/doom_ii/Locations.py
View File

@@ -180,7 +180,7 @@ location_table: Dict[int, LocationDict] = {
'map': 5,
'index': 46,
'doom_type': 82,
'region': "The Waste Tunnels (MAP05) Main"},
'region': "The Waste Tunnels (MAP05) Start"},
361028: {'name': 'The Waste Tunnels (MAP05) - Blue keycard',
'episode': 1,
'map': 5,
@@ -234,7 +234,7 @@ location_table: Dict[int, LocationDict] = {
'map': 5,
'index': 202,
'doom_type': 2001,
'region': "The Waste Tunnels (MAP05) Main"},
'region': "The Waste Tunnels (MAP05) Start"},
361037: {'name': 'The Waste Tunnels (MAP05) - Berserk',
'episode': 1,
'map': 5,
@@ -360,7 +360,7 @@ location_table: Dict[int, LocationDict] = {
'map': 7,
'index': 8,
'doom_type': 82,
'region': "Dead Simple (MAP07) Main"},
'region': "Dead Simple (MAP07) Start"},
361058: {'name': 'Dead Simple (MAP07) - Chaingun',
'episode': 1,
'map': 7,
@@ -378,7 +378,7 @@ location_table: Dict[int, LocationDict] = {
'map': 7,
'index': 43,
'doom_type': 8,
'region': "Dead Simple (MAP07) Main"},
'region': "Dead Simple (MAP07) Start"},
361061: {'name': 'Dead Simple (MAP07) - Berserk',
'episode': 1,
'map': 7,
@@ -570,7 +570,7 @@ location_table: Dict[int, LocationDict] = {
'map': 9,
'index': 26,
'doom_type': 2019,
'region': "The Pit (MAP09) Main"},
'region': "The Pit (MAP09) Start"},
361093: {'name': 'The Pit (MAP09) - Supercharge',
'episode': 1,
'map': 9,
@@ -678,7 +678,7 @@ location_table: Dict[int, LocationDict] = {
'map': 10,
'index': 99,
'doom_type': 2001,
'region': "Refueling Base (MAP10) Main"},
'region': "Refueling Base (MAP10) Start"},
361111: {'name': 'Refueling Base (MAP10) - Chaingun',
'episode': 1,
'map': 10,
@@ -846,31 +846,31 @@ location_table: Dict[int, LocationDict] = {
'map': 11,
'index': 88,
'doom_type': 8,
'region': "Circle of Death (MAP11) Red"},
'region': "Circle of Death (MAP11) Ending"},
361139: {'name': 'Circle of Death (MAP11) - Supercharge 2',
'episode': 1,
'map': 11,
'index': 108,
'doom_type': 2013,
'region': "Circle of Death (MAP11) Red"},
'region': "Circle of Death (MAP11) Ending"},
361140: {'name': 'Circle of Death (MAP11) - BFG9000',
'episode': 1,
'map': 11,
'index': 110,
'doom_type': 2006,
'region': "Circle of Death (MAP11) Red"},
'region': "Circle of Death (MAP11) Ending"},
361141: {'name': 'Circle of Death (MAP11) - Exit',
'episode': 1,
'map': 11,
'index': -1,
'doom_type': -1,
'region': "Circle of Death (MAP11) Red"},
'region': "Circle of Death (MAP11) Ending"},
361142: {'name': 'The Factory (MAP12) - Shotgun',
'episode': 2,
'map': 1,
'index': 14,
'doom_type': 2001,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Outdoors"},
361143: {'name': 'The Factory (MAP12) - Berserk',
'episode': 2,
'map': 1,
@@ -888,13 +888,13 @@ location_table: Dict[int, LocationDict] = {
'map': 1,
'index': 52,
'doom_type': 2013,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Indoors"},
361146: {'name': 'The Factory (MAP12) - Blue keycard',
'episode': 2,
'map': 1,
'index': 54,
'doom_type': 5,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Indoors"},
361147: {'name': 'The Factory (MAP12) - Armor',
'episode': 2,
'map': 1,
@@ -912,31 +912,31 @@ location_table: Dict[int, LocationDict] = {
'map': 1,
'index': 83,
'doom_type': 2013,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Indoors"},
361150: {'name': 'The Factory (MAP12) - Armor 2',
'episode': 2,
'map': 1,
'index': 92,
'doom_type': 2018,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Outdoors"},
361151: {'name': 'The Factory (MAP12) - Partial invisibility',
'episode': 2,
'map': 1,
'index': 93,
'doom_type': 2024,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Outdoors"},
361152: {'name': 'The Factory (MAP12) - Berserk 2',
'episode': 2,
'map': 1,
'index': 107,
'doom_type': 2023,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Indoors"},
361153: {'name': 'The Factory (MAP12) - Yellow keycard',
'episode': 2,
'map': 1,
'index': 123,
'doom_type': 6,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Indoors"},
361154: {'name': 'The Factory (MAP12) - BFG9000',
'episode': 2,
'map': 1,
@@ -954,7 +954,7 @@ location_table: Dict[int, LocationDict] = {
'map': 1,
'index': 192,
'doom_type': 82,
'region': "The Factory (MAP12) Main"},
'region': "The Factory (MAP12) Indoors"},
361157: {'name': 'The Factory (MAP12) - Exit',
'episode': 2,
'map': 1,
@@ -1812,7 +1812,7 @@ location_table: Dict[int, LocationDict] = {
'map': 1,
'index': 70,
'doom_type': 82,
'region': "Nirvana (MAP21) Main"},
'region': "Nirvana (MAP21) Start"},
361300: {'name': 'Nirvana (MAP21) - Rocket launcher',
'episode': 3,
'map': 1,
@@ -1884,7 +1884,7 @@ location_table: Dict[int, LocationDict] = {
'map': 2,
'index': 28,
'doom_type': 2001,
'region': "The Catacombs (MAP22) Main"},
'region': "The Catacombs (MAP22) Early"},
361312: {'name': 'The Catacombs (MAP22) - Berserk',
'episode': 3,
'map': 2,
@@ -1896,103 +1896,103 @@ location_table: Dict[int, LocationDict] = {
'map': 2,
'index': 83,
'doom_type': 2004,
'region': "The Catacombs (MAP22) Main"},
'region': "The Catacombs (MAP22) Early"},
361314: {'name': 'The Catacombs (MAP22) - Supercharge',
'episode': 3,
'map': 2,
'index': 118,
'doom_type': 2013,
'region': "The Catacombs (MAP22) Main"},
'region': "The Catacombs (MAP22) Early"},
361315: {'name': 'The Catacombs (MAP22) - Armor',
'episode': 3,
'map': 2,
'index': 119,
'doom_type': 2018,
'region': "The Catacombs (MAP22) Main"},
'region': "The Catacombs (MAP22) Early"},
361316: {'name': 'The Catacombs (MAP22) - Exit',
'episode': 3,
'map': 2,
'index': -1,
'doom_type': -1,
'region': "The Catacombs (MAP22) Red"},
361317: {'name': 'Barrels o Fun (MAP23) - Shotgun',
361317: {'name': "Barrels o' Fun (MAP23) - Shotgun",
'episode': 3,
'map': 3,
'index': 136,
'doom_type': 2001,
'region': "Barrels o Fun (MAP23) Main"},
361318: {'name': 'Barrels o Fun (MAP23) - Berserk',
'region': "Barrels o' Fun (MAP23) Main"},
361318: {'name': "Barrels o' Fun (MAP23) - Berserk",
'episode': 3,
'map': 3,
'index': 222,
'doom_type': 2023,
'region': "Barrels o Fun (MAP23) Main"},
361319: {'name': 'Barrels o Fun (MAP23) - Backpack',
'region': "Barrels o' Fun (MAP23) Main"},
361319: {'name': "Barrels o' Fun (MAP23) - Backpack",
'episode': 3,
'map': 3,
'index': 223,
'doom_type': 8,
'region': "Barrels o Fun (MAP23) Main"},
361320: {'name': 'Barrels o Fun (MAP23) - Computer area map',
'region': "Barrels o' Fun (MAP23) Main"},
361320: {'name': "Barrels o' Fun (MAP23) - Computer area map",
'episode': 3,
'map': 3,
'index': 224,
'doom_type': 2026,
'region': "Barrels o Fun (MAP23) Main"},
361321: {'name': 'Barrels o Fun (MAP23) - Armor',
'region': "Barrels o' Fun (MAP23) Main"},
361321: {'name': "Barrels o' Fun (MAP23) - Armor",
'episode': 3,
'map': 3,
'index': 249,
'doom_type': 2018,
'region': "Barrels o Fun (MAP23) Main"},
361322: {'name': 'Barrels o Fun (MAP23) - Rocket launcher',
'region': "Barrels o' Fun (MAP23) Main"},
361322: {'name': "Barrels o' Fun (MAP23) - Rocket launcher",
'episode': 3,
'map': 3,
'index': 264,
'doom_type': 2003,
'region': "Barrels o Fun (MAP23) Main"},
361323: {'name': 'Barrels o Fun (MAP23) - Megasphere',
'region': "Barrels o' Fun (MAP23) Main"},
361323: {'name': "Barrels o' Fun (MAP23) - Megasphere",
'episode': 3,
'map': 3,
'index': 266,
'doom_type': 83,
'region': "Barrels o Fun (MAP23) Main"},
361324: {'name': 'Barrels o Fun (MAP23) - Supercharge',
'region': "Barrels o' Fun (MAP23) Main"},
361324: {'name': "Barrels o' Fun (MAP23) - Supercharge",
'episode': 3,
'map': 3,
'index': 277,
'doom_type': 2013,
'region': "Barrels o Fun (MAP23) Main"},
361325: {'name': 'Barrels o Fun (MAP23) - Backpack 2',
'region': "Barrels o' Fun (MAP23) Main"},
361325: {'name': "Barrels o' Fun (MAP23) - Backpack 2",
'episode': 3,
'map': 3,
'index': 301,
'doom_type': 8,
'region': "Barrels o Fun (MAP23) Main"},
361326: {'name': 'Barrels o Fun (MAP23) - Yellow skull key',
'region': "Barrels o' Fun (MAP23) Main"},
361326: {'name': "Barrels o' Fun (MAP23) - Yellow skull key",
'episode': 3,
'map': 3,
'index': 307,
'doom_type': 39,
'region': "Barrels o Fun (MAP23) Main"},
361327: {'name': 'Barrels o Fun (MAP23) - BFG9000',
'region': "Barrels o' Fun (MAP23) Main"},
361327: {'name': "Barrels o' Fun (MAP23) - BFG9000",
'episode': 3,
'map': 3,
'index': 342,
'doom_type': 2006,
'region': "Barrels o Fun (MAP23) Main"},
361328: {'name': 'Barrels o Fun (MAP23) - Exit',
'region': "Barrels o' Fun (MAP23) Main"},
361328: {'name': "Barrels o' Fun (MAP23) - Exit",
'episode': 3,
'map': 3,
'index': -1,
'doom_type': -1,
'region': "Barrels o Fun (MAP23) Yellow"},
'region': "Barrels o' Fun (MAP23) Yellow"},
361329: {'name': 'The Chasm (MAP24) - Plasma gun',
'episode': 3,
'map': 4,
'index': 5,
'doom_type': 2004,
'region': "The Chasm (MAP24) Main"},
'region': "The Chasm (MAP24) Blue"},
361330: {'name': 'The Chasm (MAP24) - Shotgun',
'episode': 3,
'map': 4,
@@ -2004,7 +2004,7 @@ location_table: Dict[int, LocationDict] = {
'map': 4,
'index': 12,
'doom_type': 2022,
'region': "The Chasm (MAP24) Main"},
'region': "The Chasm (MAP24) Blue"},
361332: {'name': 'The Chasm (MAP24) - Rocket launcher',
'episode': 3,
'map': 4,
@@ -2022,7 +2022,7 @@ location_table: Dict[int, LocationDict] = {
'map': 4,
'index': 31,
'doom_type': 8,
'region': "The Chasm (MAP24) Main"},
'region': "The Chasm (MAP24) Blue"},
361335: {'name': 'The Chasm (MAP24) - Berserk',
'episode': 3,
'map': 4,
@@ -2034,19 +2034,19 @@ location_table: Dict[int, LocationDict] = {
'map': 4,
'index': 155,
'doom_type': 2023,
'region': "The Chasm (MAP24) Main"},
'region': "The Chasm (MAP24) Blue"},
361337: {'name': 'The Chasm (MAP24) - Armor',
'episode': 3,
'map': 4,
'index': 169,
'doom_type': 2018,
'region': "The Chasm (MAP24) Main"},
'region': "The Chasm (MAP24) Blue"},
361338: {'name': 'The Chasm (MAP24) - Red keycard',
'episode': 3,
'map': 4,
'index': 261,
'doom_type': 13,
'region': "The Chasm (MAP24) Main"},
'region': "The Chasm (MAP24) Blue"},
361339: {'name': 'The Chasm (MAP24) - BFG9000',
'episode': 3,
'map': 4,
@@ -2064,7 +2064,7 @@ location_table: Dict[int, LocationDict] = {
'map': 4,
'index': 355,
'doom_type': 83,
'region': "The Chasm (MAP24) Main"},
'region': "The Chasm (MAP24) Blue"},
361342: {'name': 'The Chasm (MAP24) - Megasphere 2',
'episode': 3,
'map': 4,
@@ -2082,7 +2082,7 @@ location_table: Dict[int, LocationDict] = {
'map': 5,
'index': 6,
'doom_type': 82,
'region': "Bloodfalls (MAP25) Main"},
'region': "Bloodfalls (MAP25) Start"},
361345: {'name': 'Bloodfalls (MAP25) - Partial invisibility',
'episode': 3,
'map': 5,
@@ -2664,55 +2664,55 @@ location_table: Dict[int, LocationDict] = {
'map': 10,
'index': 40,
'doom_type': 2006,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361442: {'name': 'Icon of Sin (MAP30) - Chaingun',
'episode': 3,
'map': 10,
'index': 41,
'doom_type': 2002,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361443: {'name': 'Icon of Sin (MAP30) - Chainsaw',
'episode': 3,
'map': 10,
'index': 42,
'doom_type': 2005,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361444: {'name': 'Icon of Sin (MAP30) - Plasma gun',
'episode': 3,
'map': 10,
'index': 43,
'doom_type': 2004,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361445: {'name': 'Icon of Sin (MAP30) - Rocket launcher',
'episode': 3,
'map': 10,
'index': 44,
'doom_type': 2003,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361446: {'name': 'Icon of Sin (MAP30) - Shotgun',
'episode': 3,
'map': 10,
'index': 45,
'doom_type': 2001,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361447: {'name': 'Icon of Sin (MAP30) - Super Shotgun',
'episode': 3,
'map': 10,
'index': 46,
'doom_type': 82,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361448: {'name': 'Icon of Sin (MAP30) - Backpack',
'episode': 3,
'map': 10,
'index': 47,
'doom_type': 8,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361449: {'name': 'Icon of Sin (MAP30) - Megasphere',
'episode': 3,
'map': 10,
'index': 64,
'doom_type': 83,
'region': "Icon of Sin (MAP30) Main"},
'region': "Icon of Sin (MAP30) Start"},
361450: {'name': 'Icon of Sin (MAP30) - Megasphere 2',
'episode': 3,
'map': 10,
@@ -2731,179 +2731,179 @@ location_table: Dict[int, LocationDict] = {
'index': -1,
'doom_type': -1,
'region': "Icon of Sin (MAP30) Main"},
361453: {'name': 'Wolfenstein2 (MAP31) - Rocket launcher',
361453: {'name': 'Wolfenstein (MAP31) - Rocket launcher',
'episode': 4,
'map': 1,
'index': 110,
'doom_type': 2003,
'region': "Wolfenstein2 (MAP31) Main"},
361454: {'name': 'Wolfenstein2 (MAP31) - Shotgun',
'region': "Wolfenstein (MAP31) Main"},
361454: {'name': 'Wolfenstein (MAP31) - Shotgun',
'episode': 4,
'map': 1,
'index': 139,
'doom_type': 2001,
'region': "Wolfenstein2 (MAP31) Main"},
361455: {'name': 'Wolfenstein2 (MAP31) - Berserk',
'region': "Wolfenstein (MAP31) Main"},
361455: {'name': 'Wolfenstein (MAP31) - Berserk',
'episode': 4,
'map': 1,
'index': 263,
'doom_type': 2023,
'region': "Wolfenstein2 (MAP31) Main"},
361456: {'name': 'Wolfenstein2 (MAP31) - Supercharge',
'region': "Wolfenstein (MAP31) Main"},
361456: {'name': 'Wolfenstein (MAP31) - Supercharge',
'episode': 4,
'map': 1,
'index': 278,
'doom_type': 2013,
'region': "Wolfenstein2 (MAP31) Main"},
361457: {'name': 'Wolfenstein2 (MAP31) - Chaingun',
'region': "Wolfenstein (MAP31) Main"},
361457: {'name': 'Wolfenstein (MAP31) - Chaingun',
'episode': 4,
'map': 1,
'index': 305,
'doom_type': 2002,
'region': "Wolfenstein2 (MAP31) Main"},
361458: {'name': 'Wolfenstein2 (MAP31) - Super Shotgun',
'region': "Wolfenstein (MAP31) Main"},
361458: {'name': 'Wolfenstein (MAP31) - Super Shotgun',
'episode': 4,
'map': 1,
'index': 308,
'doom_type': 82,
'region': "Wolfenstein2 (MAP31) Main"},
361459: {'name': 'Wolfenstein2 (MAP31) - Partial invisibility',
'region': "Wolfenstein (MAP31) Main"},
361459: {'name': 'Wolfenstein (MAP31) - Partial invisibility',
'episode': 4,
'map': 1,
'index': 309,
'doom_type': 2024,
'region': "Wolfenstein2 (MAP31) Main"},
361460: {'name': 'Wolfenstein2 (MAP31) - Megasphere',
'region': "Wolfenstein (MAP31) Main"},
361460: {'name': 'Wolfenstein (MAP31) - Megasphere',
'episode': 4,
'map': 1,
'index': 310,
'doom_type': 83,
'region': "Wolfenstein2 (MAP31) Main"},
361461: {'name': 'Wolfenstein2 (MAP31) - Backpack',
'region': "Wolfenstein (MAP31) Main"},
361461: {'name': 'Wolfenstein (MAP31) - Backpack',
'episode': 4,
'map': 1,
'index': 311,
'doom_type': 8,
'region': "Wolfenstein2 (MAP31) Main"},
361462: {'name': 'Wolfenstein2 (MAP31) - Backpack 2',
'region': "Wolfenstein (MAP31) Main"},
361462: {'name': 'Wolfenstein (MAP31) - Backpack 2',
'episode': 4,
'map': 1,
'index': 312,
'doom_type': 8,
'region': "Wolfenstein2 (MAP31) Main"},
361463: {'name': 'Wolfenstein2 (MAP31) - Backpack 3',
'region': "Wolfenstein (MAP31) Main"},
361463: {'name': 'Wolfenstein (MAP31) - Backpack 3',
'episode': 4,
'map': 1,
'index': 313,
'doom_type': 8,
'region': "Wolfenstein2 (MAP31) Main"},
361464: {'name': 'Wolfenstein2 (MAP31) - Backpack 4',
'region': "Wolfenstein (MAP31) Main"},
361464: {'name': 'Wolfenstein (MAP31) - Backpack 4',
'episode': 4,
'map': 1,
'index': 314,
'doom_type': 8,
'region': "Wolfenstein2 (MAP31) Main"},
361465: {'name': 'Wolfenstein2 (MAP31) - BFG9000',
'region': "Wolfenstein (MAP31) Main"},
361465: {'name': 'Wolfenstein (MAP31) - BFG9000',
'episode': 4,
'map': 1,
'index': 315,
'doom_type': 2006,
'region': "Wolfenstein2 (MAP31) Main"},
361466: {'name': 'Wolfenstein2 (MAP31) - Plasma gun',
'region': "Wolfenstein (MAP31) Main"},
361466: {'name': 'Wolfenstein (MAP31) - Plasma gun',
'episode': 4,
'map': 1,
'index': 316,
'doom_type': 2004,
'region': "Wolfenstein2 (MAP31) Main"},
361467: {'name': 'Wolfenstein2 (MAP31) - Exit',
'region': "Wolfenstein (MAP31) Main"},
361467: {'name': 'Wolfenstein (MAP31) - Exit',
'episode': 4,
'map': 1,
'index': -1,
'doom_type': -1,
'region': "Wolfenstein2 (MAP31) Main"},
361468: {'name': 'Grosse2 (MAP32) - Plasma gun',
'region': "Wolfenstein (MAP31) Main"},
361468: {'name': 'Grosse (MAP32) - Plasma gun',
'episode': 4,
'map': 2,
'index': 33,
'doom_type': 2004,
'region': "Grosse2 (MAP32) Main"},
361469: {'name': 'Grosse2 (MAP32) - Rocket launcher',
'region': "Grosse (MAP32) Main"},
361469: {'name': 'Grosse (MAP32) - Rocket launcher',
'episode': 4,
'map': 2,
'index': 57,
'doom_type': 2003,
'region': "Grosse2 (MAP32) Main"},
361470: {'name': 'Grosse2 (MAP32) - Invulnerability',
'region': "Grosse (MAP32) Start"},
361470: {'name': 'Grosse (MAP32) - Invulnerability',
'episode': 4,
'map': 2,
'index': 70,
'doom_type': 2022,
'region': "Grosse2 (MAP32) Main"},
361471: {'name': 'Grosse2 (MAP32) - Super Shotgun',
'region': "Grosse (MAP32) Main"},
361471: {'name': 'Grosse (MAP32) - Super Shotgun',
'episode': 4,
'map': 2,
'index': 74,
'doom_type': 82,
'region': "Grosse2 (MAP32) Main"},
361472: {'name': 'Grosse2 (MAP32) - BFG9000',
'region': "Grosse (MAP32) Main"},
361472: {'name': 'Grosse (MAP32) - BFG9000',
'episode': 4,
'map': 2,
'index': 75,
'doom_type': 2006,
'region': "Grosse2 (MAP32) Main"},
361473: {'name': 'Grosse2 (MAP32) - Megasphere',
'region': "Grosse (MAP32) Main"},
361473: {'name': 'Grosse (MAP32) - Megasphere',
'episode': 4,
'map': 2,
'index': 78,
'doom_type': 83,
'region': "Grosse2 (MAP32) Main"},
361474: {'name': 'Grosse2 (MAP32) - Chaingun',
'region': "Grosse (MAP32) Main"},
361474: {'name': 'Grosse (MAP32) - Chaingun',
'episode': 4,
'map': 2,
'index': 79,
'doom_type': 2002,
'region': "Grosse2 (MAP32) Main"},
361475: {'name': 'Grosse2 (MAP32) - Chaingun 2',
'region': "Grosse (MAP32) Main"},
361475: {'name': 'Grosse (MAP32) - Chaingun 2',
'episode': 4,
'map': 2,
'index': 80,
'doom_type': 2002,
'region': "Grosse2 (MAP32) Main"},
361476: {'name': 'Grosse2 (MAP32) - Chaingun 3',
'region': "Grosse (MAP32) Main"},
361476: {'name': 'Grosse (MAP32) - Chaingun 3',
'episode': 4,
'map': 2,
'index': 81,
'doom_type': 2002,
'region': "Grosse2 (MAP32) Main"},
361477: {'name': 'Grosse2 (MAP32) - Berserk',
'region': "Grosse (MAP32) Main"},
361477: {'name': 'Grosse (MAP32) - Berserk',
'episode': 4,
'map': 2,
'index': 82,
'doom_type': 2023,
'region': "Grosse2 (MAP32) Main"},
361478: {'name': 'Grosse2 (MAP32) - Exit',
'region': "Grosse (MAP32) Start"},
361478: {'name': 'Grosse (MAP32) - Exit',
'episode': 4,
'map': 2,
'index': -1,
'doom_type': -1,
'region': "Grosse2 (MAP32) Main"},
'region': "Grosse (MAP32) Main"},
}
location_name_groups: Dict[str, Set[str]] = {
'Barrels o Fun (MAP23)': {
'Barrels o Fun (MAP23) - Armor',
'Barrels o Fun (MAP23) - BFG9000',
'Barrels o Fun (MAP23) - Backpack',
'Barrels o Fun (MAP23) - Backpack 2',
'Barrels o Fun (MAP23) - Berserk',
'Barrels o Fun (MAP23) - Computer area map',
'Barrels o Fun (MAP23) - Exit',
'Barrels o Fun (MAP23) - Megasphere',
'Barrels o Fun (MAP23) - Rocket launcher',
'Barrels o Fun (MAP23) - Shotgun',
'Barrels o Fun (MAP23) - Supercharge',
'Barrels o Fun (MAP23) - Yellow skull key',
"Barrels o' Fun (MAP23)": {
"Barrels o' Fun (MAP23) - Armor",
"Barrels o' Fun (MAP23) - BFG9000",
"Barrels o' Fun (MAP23) - Backpack",
"Barrels o' Fun (MAP23) - Backpack 2",
"Barrels o' Fun (MAP23) - Berserk",
"Barrels o' Fun (MAP23) - Computer area map",
"Barrels o' Fun (MAP23) - Exit",
"Barrels o' Fun (MAP23) - Megasphere",
"Barrels o' Fun (MAP23) - Rocket launcher",
"Barrels o' Fun (MAP23) - Shotgun",
"Barrels o' Fun (MAP23) - Supercharge",
"Barrels o' Fun (MAP23) - Yellow skull key",
},
'Bloodfalls (MAP25)': {
'Bloodfalls (MAP25) - Armor',
@@ -2998,18 +2998,18 @@ location_name_groups: Dict[str, Set[str]] = {
'Gotcha! (MAP20) - Supercharge 3',
'Gotcha! (MAP20) - Supercharge 4',
},
'Grosse2 (MAP32)': {
'Grosse2 (MAP32) - BFG9000',
'Grosse2 (MAP32) - Berserk',
'Grosse2 (MAP32) - Chaingun',
'Grosse2 (MAP32) - Chaingun 2',
'Grosse2 (MAP32) - Chaingun 3',
'Grosse2 (MAP32) - Exit',
'Grosse2 (MAP32) - Invulnerability',
'Grosse2 (MAP32) - Megasphere',
'Grosse2 (MAP32) - Plasma gun',
'Grosse2 (MAP32) - Rocket launcher',
'Grosse2 (MAP32) - Super Shotgun',
'Grosse (MAP32)': {
'Grosse (MAP32) - BFG9000',
'Grosse (MAP32) - Berserk',
'Grosse (MAP32) - Chaingun',
'Grosse (MAP32) - Chaingun 2',
'Grosse (MAP32) - Chaingun 3',
'Grosse (MAP32) - Exit',
'Grosse (MAP32) - Invulnerability',
'Grosse (MAP32) - Megasphere',
'Grosse (MAP32) - Plasma gun',
'Grosse (MAP32) - Rocket launcher',
'Grosse (MAP32) - Super Shotgun',
},
'Icon of Sin (MAP30)': {
'Icon of Sin (MAP30) - BFG9000',
@@ -3417,22 +3417,22 @@ location_name_groups: Dict[str, Set[str]] = {
'Underhalls (MAP02) - Red keycard',
'Underhalls (MAP02) - Super Shotgun',
},
'Wolfenstein2 (MAP31)': {
'Wolfenstein2 (MAP31) - BFG9000',
'Wolfenstein2 (MAP31) - Backpack',
'Wolfenstein2 (MAP31) - Backpack 2',
'Wolfenstein2 (MAP31) - Backpack 3',
'Wolfenstein2 (MAP31) - Backpack 4',
'Wolfenstein2 (MAP31) - Berserk',
'Wolfenstein2 (MAP31) - Chaingun',
'Wolfenstein2 (MAP31) - Exit',
'Wolfenstein2 (MAP31) - Megasphere',
'Wolfenstein2 (MAP31) - Partial invisibility',
'Wolfenstein2 (MAP31) - Plasma gun',
'Wolfenstein2 (MAP31) - Rocket launcher',
'Wolfenstein2 (MAP31) - Shotgun',
'Wolfenstein2 (MAP31) - Super Shotgun',
'Wolfenstein2 (MAP31) - Supercharge',
'Wolfenstein (MAP31)': {
'Wolfenstein (MAP31) - BFG9000',
'Wolfenstein (MAP31) - Backpack',
'Wolfenstein (MAP31) - Backpack 2',
'Wolfenstein (MAP31) - Backpack 3',
'Wolfenstein (MAP31) - Backpack 4',
'Wolfenstein (MAP31) - Berserk',
'Wolfenstein (MAP31) - Chaingun',
'Wolfenstein (MAP31) - Exit',
'Wolfenstein (MAP31) - Megasphere',
'Wolfenstein (MAP31) - Partial invisibility',
'Wolfenstein (MAP31) - Plasma gun',
'Wolfenstein (MAP31) - Rocket launcher',
'Wolfenstein (MAP31) - Shotgun',
'Wolfenstein (MAP31) - Super Shotgun',
'Wolfenstein (MAP31) - Supercharge',
},
}

6
worlds/doom_ii/Maps.py
View File

@@ -26,7 +26,7 @@ map_names: List[str] = [
'Gotcha! (MAP20)',
'Nirvana (MAP21)',
'The Catacombs (MAP22)',
'Barrels o Fun (MAP23)',
"Barrels o' Fun (MAP23)",
'The Chasm (MAP24)',
'Bloodfalls (MAP25)',
'The Abandoned Mines (MAP26)',
@@ -34,6 +34,6 @@ map_names: List[str] = [
'The Spirit World (MAP28)',
'The Living End (MAP29)',
'Icon of Sin (MAP30)',
'Wolfenstein2 (MAP31)',
'Grosse2 (MAP32)',
'Wolfenstein (MAP31)',
'Grosse (MAP32)',
]

158
worlds/doom_ii/Regions.py
View File

@@ -84,11 +84,12 @@ regions:List[RegionDict] = [
# The Waste Tunnels (MAP05)
{"name":"The Waste Tunnels (MAP05) Main",
"connects_to_hub":True,
"connects_to_hub":False,
"episode":1,
"connections":[
{"target":"The Waste Tunnels (MAP05) Red","pro":False},
{"target":"The Waste Tunnels (MAP05) Blue","pro":False}]},
{"target":"The Waste Tunnels (MAP05) Blue","pro":False},
{"target":"The Waste Tunnels (MAP05) Start","pro":False}]},
{"name":"The Waste Tunnels (MAP05) Blue",
"connects_to_hub":False,
"episode":1,
@@ -103,6 +104,10 @@ regions:List[RegionDict] = [
"connects_to_hub":False,
"episode":1,
"connections":[{"target":"The Waste Tunnels (MAP05) Main","pro":False}]},
{"name":"The Waste Tunnels (MAP05) Start",
"connects_to_hub":True,
"episode":1,
"connections":[{"target":"The Waste Tunnels (MAP05) Main","pro":False}]},
# The Crusher (MAP06)
{"name":"The Crusher (MAP06) Main",
@@ -129,9 +134,13 @@ regions:List[RegionDict] = [
# Dead Simple (MAP07)
{"name":"Dead Simple (MAP07) Main",
"connects_to_hub":False,
"episode":1,
"connections":[{"target":"Dead Simple (MAP07) Start","pro":False}]},
{"name":"Dead Simple (MAP07) Start",
"connects_to_hub":True,
"episode":1,
"connections":[]},
"connections":[{"target":"Dead Simple (MAP07) Main","pro":False}]},
# Tricks and Traps (MAP08)
{"name":"Tricks and Traps (MAP08) Main",
@@ -151,11 +160,12 @@ regions:List[RegionDict] = [
# The Pit (MAP09)
{"name":"The Pit (MAP09) Main",
"connects_to_hub":True,
"connects_to_hub":False,
"episode":1,
"connections":[
{"target":"The Pit (MAP09) Yellow","pro":False},
{"target":"The Pit (MAP09) Blue","pro":False}]},
{"target":"The Pit (MAP09) Blue","pro":False},
{"target":"The Pit (MAP09) Start","pro":False}]},
{"name":"The Pit (MAP09) Blue",
"connects_to_hub":False,
"episode":1,
@@ -164,12 +174,18 @@ regions:List[RegionDict] = [
"connects_to_hub":False,
"episode":1,
"connections":[{"target":"The Pit (MAP09) Main","pro":False}]},
{"name":"The Pit (MAP09) Start",
"connects_to_hub":True,
"episode":1,
"connections":[{"target":"The Pit (MAP09) Main","pro":False}]},
# Refueling Base (MAP10)
{"name":"Refueling Base (MAP10) Main",
"connects_to_hub":True,
"connects_to_hub":False,
"episode":1,
"connections":[{"target":"Refueling Base (MAP10) Yellow","pro":False}]},
"connections":[
{"target":"Refueling Base (MAP10) Yellow","pro":False},
{"target":"Refueling Base (MAP10) Start","pro":False}]},
{"name":"Refueling Base (MAP10) Yellow",
"connects_to_hub":False,
"episode":1,
@@ -180,6 +196,10 @@ regions:List[RegionDict] = [
"connects_to_hub":False,
"episode":1,
"connections":[{"target":"Refueling Base (MAP10) Yellow","pro":False}]},
{"name":"Refueling Base (MAP10) Start",
"connects_to_hub":True,
"episode":1,
"connections":[{"target":"Refueling Base (MAP10) Main","pro":False}]},
# Circle of Death (MAP11)
{"name":"Circle of Death (MAP11) Main",
@@ -187,31 +207,49 @@ regions:List[RegionDict] = [
"episode":1,
"connections":[
{"target":"Circle of Death (MAP11) Blue","pro":False},
{"target":"Circle of Death (MAP11) Red","pro":False}]},
{"target":"Circle of Death (MAP11) Red","pro":False},
{"target":"Circle of Death (MAP11) Ending","pro":True}]},
{"name":"Circle of Death (MAP11) Blue",
"connects_to_hub":False,
"episode":1,
"connections":[{"target":"Circle of Death (MAP11) Main","pro":False}]},
{"name":"Circle of Death (MAP11) Red",
"connects_to_hub":False,
"episode":1,
"connections":[
{"target":"Circle of Death (MAP11) Main","pro":False},
{"target":"Circle of Death (MAP11) Ending","pro":False}]},
{"name":"Circle of Death (MAP11) Ending",
"connects_to_hub":False,
"episode":1,
"connections":[{"target":"Circle of Death (MAP11) Main","pro":False}]},
# The Factory (MAP12)
{"name":"The Factory (MAP12) Main",
"connects_to_hub":True,
{"name":"The Factory (MAP12) Indoors",
"connects_to_hub":False,
"episode":2,
"connections":[
{"target":"The Factory (MAP12) Yellow","pro":False},
{"target":"The Factory (MAP12) Blue","pro":False}]},
{"target":"The Factory (MAP12) Blue","pro":False},
{"target":"The Factory (MAP12) Main","pro":False}]},
{"name":"The Factory (MAP12) Blue",
"connects_to_hub":False,
"episode":2,
"connections":[{"target":"The Factory (MAP12) Main","pro":False}]},
"connections":[{"target":"The Factory (MAP12) Indoors","pro":False}]},
{"name":"The Factory (MAP12) Yellow",
"connects_to_hub":False,
"episode":2,
"connections":[]},
{"name":"The Factory (MAP12) Outdoors",
"connects_to_hub":True,
"episode":2,
"connections":[{"target":"The Factory (MAP12) Main","pro":False}]},
{"name":"The Factory (MAP12) Main",
"connects_to_hub":False,
"episode":2,
"connections":[
{"target":"The Factory (MAP12) Indoors","pro":False},
{"target":"The Factory (MAP12) Outdoors","pro":False}]},
# Downtown (MAP13)
{"name":"Downtown (MAP13) Main",
@@ -291,7 +329,8 @@ regions:List[RegionDict] = [
"episode":2,
"connections":[
{"target":"Suburbs (MAP16) Red","pro":False},
{"target":"Suburbs (MAP16) Blue","pro":False}]},
{"target":"Suburbs (MAP16) Blue","pro":False},
{"target":"Suburbs (MAP16) Pro Exit","pro":True}]},
{"name":"Suburbs (MAP16) Blue",
"connects_to_hub":False,
"episode":2,
@@ -299,7 +338,13 @@ regions:List[RegionDict] = [
{"name":"Suburbs (MAP16) Red",
"connects_to_hub":False,
"episode":2,
"connections":[{"target":"Suburbs (MAP16) Main","pro":False}]},
"connections":[
{"target":"Suburbs (MAP16) Main","pro":False},
{"target":"Suburbs (MAP16) Pro Exit","pro":False}]},
{"name":"Suburbs (MAP16) Pro Exit",
"connects_to_hub":False,
"episode":2,
"connections":[{"target":"Suburbs (MAP16) Red","pro":False}]},
# Tenements (MAP17)
{"name":"Tenements (MAP17) Main",
@@ -358,7 +403,7 @@ regions:List[RegionDict] = [
# Nirvana (MAP21)
{"name":"Nirvana (MAP21) Main",
"connects_to_hub":True,
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"Nirvana (MAP21) Yellow","pro":False}]},
{"name":"Nirvana (MAP21) Yellow",
@@ -366,19 +411,31 @@ regions:List[RegionDict] = [
"episode":3,
"connections":[
{"target":"Nirvana (MAP21) Main","pro":False},
{"target":"Nirvana (MAP21) Magenta","pro":False}]},
{"target":"Nirvana (MAP21) Magenta","pro":False},
{"target":"Nirvana (MAP21) Pro Magenta","pro":True}]},
{"name":"Nirvana (MAP21) Magenta",
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"Nirvana (MAP21) Yellow","pro":False}]},
"connections":[
{"target":"Nirvana (MAP21) Yellow","pro":False},
{"target":"Nirvana (MAP21) Pro Magenta","pro":False}]},
{"name":"Nirvana (MAP21) Start",
"connects_to_hub":True,
"episode":3,
"connections":[{"target":"Nirvana (MAP21) Main","pro":False}]},
{"name":"Nirvana (MAP21) Pro Magenta",
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"Nirvana (MAP21) Magenta","pro":False}]},
# The Catacombs (MAP22)
{"name":"The Catacombs (MAP22) Main",
"connects_to_hub":True,
"connects_to_hub":False,
"episode":3,
"connections":[
{"target":"The Catacombs (MAP22) Blue","pro":False},
{"target":"The Catacombs (MAP22) Red","pro":False}]},
{"target":"The Catacombs (MAP22) Red","pro":False},
{"target":"The Catacombs (MAP22) Early","pro":False}]},
{"name":"The Catacombs (MAP22) Blue",
"connects_to_hub":False,
"episode":3,
@@ -387,36 +444,59 @@ regions:List[RegionDict] = [
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"The Catacombs (MAP22) Main","pro":False}]},
# Barrels o Fun (MAP23)
{"name":"Barrels o Fun (MAP23) Main",
{"name":"The Catacombs (MAP22) Early",
"connects_to_hub":True,
"episode":3,
"connections":[{"target":"Barrels o Fun (MAP23) Yellow","pro":False}]},
{"name":"Barrels o Fun (MAP23) Yellow",
"connections":[{"target":"The Catacombs (MAP22) Main","pro":False}]},
# Barrels o' Fun (MAP23)
{"name":"Barrels o' Fun (MAP23) Main",
"connects_to_hub":True,
"episode":3,
"connections":[{"target":"Barrels o' Fun (MAP23) Yellow","pro":False}]},
{"name":"Barrels o' Fun (MAP23) Yellow",
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"Barrels o Fun (MAP23) Main","pro":False}]},
"connections":[{"target":"Barrels o' Fun (MAP23) Main","pro":False}]},
# The Chasm (MAP24)
{"name":"The Chasm (MAP24) Main",
"connects_to_hub":True,
"episode":3,
"connections":[{"target":"The Chasm (MAP24) Red","pro":False}]},
"connections":[
{"target":"The Chasm (MAP24) Blue","pro":False},
{"target":"The Chasm (MAP24) Blue Pro","pro":True}]},
{"name":"The Chasm (MAP24) Red",
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"The Chasm (MAP24) Main","pro":False}]},
"connections":[{"target":"The Chasm (MAP24) Blue","pro":False}]},
{"name":"The Chasm (MAP24) Blue",
"connects_to_hub":False,
"episode":3,
"connections":[
{"target":"The Chasm (MAP24) Red","pro":False},
{"target":"The Chasm (MAP24) Main","pro":False},
{"target":"The Chasm (MAP24) Blue Pro","pro":False}]},
{"name":"The Chasm (MAP24) Blue Pro",
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"The Chasm (MAP24) Blue","pro":False}]},
# Bloodfalls (MAP25)
{"name":"Bloodfalls (MAP25) Main",
"connects_to_hub":True,
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"Bloodfalls (MAP25) Blue","pro":False}]},
"connections":[
{"target":"Bloodfalls (MAP25) Blue","pro":False},
{"target":"Bloodfalls (MAP25) Start","pro":False}]},
{"name":"Bloodfalls (MAP25) Blue",
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"Bloodfalls (MAP25) Main","pro":False}]},
{"name":"Bloodfalls (MAP25) Start",
"connects_to_hub":True,
"episode":3,
"connections":[{"target":"Bloodfalls (MAP25) Main","pro":False}]},
# The Abandoned Mines (MAP26)
{"name":"The Abandoned Mines (MAP26) Main",
@@ -484,19 +564,27 @@ regions:List[RegionDict] = [
# Icon of Sin (MAP30)
{"name":"Icon of Sin (MAP30) Main",
"connects_to_hub":False,
"episode":3,
"connections":[{"target":"Icon of Sin (MAP30) Start","pro":False}]},
{"name":"Icon of Sin (MAP30) Start",
"connects_to_hub":True,
"episode":3,
"connections":[]},
"connections":[{"target":"Icon of Sin (MAP30) Main","pro":False}]},
# Wolfenstein2 (MAP31)
{"name":"Wolfenstein2 (MAP31) Main",
# Wolfenstein (MAP31)
{"name":"Wolfenstein (MAP31) Main",
"connects_to_hub":True,
"episode":4,
"connections":[]},
# Grosse2 (MAP32)
{"name":"Grosse2 (MAP32) Main",
# Grosse (MAP32)
{"name":"Grosse (MAP32) Main",
"connects_to_hub":False,
"episode":4,
"connections":[{"target":"Grosse (MAP32) Start","pro":False}]},
{"name":"Grosse (MAP32) Start",
"connects_to_hub":True,
"episode":4,
"connections":[]},
"connections":[{"target":"Grosse (MAP32) Main","pro":False}]},
]

209
worlds/doom_ii/Rules.py
View File

@@ -53,14 +53,6 @@ def set_episode1_rules(player, multiworld, pro):
state.has("The Focus (MAP04) - Red keycard", player, 1))
# The Waste Tunnels (MAP05)
set_rule(multiworld.get_entrance("Hub -> The Waste Tunnels (MAP05) Main", player), lambda state:
(state.has("The Waste Tunnels (MAP05)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super 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("The Waste Tunnels (MAP05) Main -> The Waste Tunnels (MAP05) Red", player), lambda state:
state.has("The Waste Tunnels (MAP05) - Red keycard", player, 1))
set_rule(multiworld.get_entrance("The Waste Tunnels (MAP05) Main -> The Waste Tunnels (MAP05) Blue", player), lambda state:
@@ -71,18 +63,22 @@ def set_episode1_rules(player, multiworld, pro):
state.has("The Waste Tunnels (MAP05) - Blue keycard", player, 1))
set_rule(multiworld.get_entrance("The Waste Tunnels (MAP05) Yellow -> The Waste Tunnels (MAP05) Blue", player), lambda state:
state.has("The Waste Tunnels (MAP05) - Yellow keycard", player, 1))
set_rule(multiworld.get_entrance("Hub -> The Waste Tunnels (MAP05) Start", player), lambda state:
state.has("The Waste Tunnels (MAP05)", player, 1))
set_rule(multiworld.get_entrance("The Waste Tunnels (MAP05) Start -> The Waste Tunnels (MAP05) Main", player), lambda state:
(state.has("Shotgun", player, 1) and
state.has("Super Shotgun", player, 1)) and (state.has("Chaingun", player, 1) or
state.has("Plasma gun", player, 1)))
# The Crusher (MAP06)
set_rule(multiworld.get_entrance("Hub -> The Crusher (MAP06) Main", player), lambda state:
(state.has("The Crusher (MAP06)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super Shotgun", player, 1)) and
(state.has("Rocket launcher", player, 1) or
state.has("Plasma gun", player, 1) or
state.has("BFG9000", player, 1)))
state.has("Shotgun", player, 1)) and
(state.has("Plasma gun", player, 1) or
state.has("Chaingun", player, 1)))
set_rule(multiworld.get_entrance("The Crusher (MAP06) Main -> The Crusher (MAP06) Blue", player), lambda state:
state.has("The Crusher (MAP06) - Blue keycard", player, 1))
state.has("The Crusher (MAP06) - Blue keycard", player, 1) and
state.has("Super Shotgun", player, 1))
set_rule(multiworld.get_entrance("The Crusher (MAP06) Blue -> The Crusher (MAP06) Red", player), lambda state:
state.has("The Crusher (MAP06) - Red keycard", player, 1))
set_rule(multiworld.get_entrance("The Crusher (MAP06) Blue -> The Crusher (MAP06) Main", player), lambda state:
@@ -95,14 +91,14 @@ def set_episode1_rules(player, multiworld, pro):
state.has("The Crusher (MAP06) - Red keycard", player, 1))
# Dead Simple (MAP07)
set_rule(multiworld.get_entrance("Hub -> Dead Simple (MAP07) Main", player), lambda state:
(state.has("Dead Simple (MAP07)", player, 1) and
state.has("Shotgun", player, 1) and
set_rule(multiworld.get_entrance("Hub -> Dead Simple (MAP07) Start", player), lambda state:
state.has("Dead Simple (MAP07)", player, 1))
set_rule(multiworld.get_entrance("Dead Simple (MAP07) Start -> Dead Simple (MAP07) Main", player), lambda state:
(state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super Shotgun", player, 1)) and
(state.has("Rocket launcher", player, 1) or
state.has("Super Shotgun", player, 1)) and (state.has("BFG9000", player, 1) or
state.has("Plasma gun", player, 1) or
state.has("BFG9000", player, 1)))
state.has("Rocket launcher", player, 1)))
# Tricks and Traps (MAP08)
set_rule(multiworld.get_entrance("Hub -> Tricks and Traps (MAP08) Main", player), lambda state:
@@ -119,34 +115,34 @@ def set_episode1_rules(player, multiworld, pro):
state.has("Tricks and Traps (MAP08) - Yellow skull key", player, 1))
# The Pit (MAP09)
set_rule(multiworld.get_entrance("Hub -> The Pit (MAP09) Main", player), lambda state:
(state.has("The Pit (MAP09)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super 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("The Pit (MAP09) Main -> The Pit (MAP09) Yellow", player), lambda state:
state.has("The Pit (MAP09) - Yellow keycard", player, 1))
set_rule(multiworld.get_entrance("The Pit (MAP09) Main -> The Pit (MAP09) Blue", player), lambda state:
state.has("The Pit (MAP09) - Blue keycard", player, 1))
set_rule(multiworld.get_entrance("The Pit (MAP09) Yellow -> The Pit (MAP09) Main", player), lambda state:
state.has("The Pit (MAP09) - Yellow keycard", player, 1))
set_rule(multiworld.get_entrance("Hub -> The Pit (MAP09) Start", player), lambda state:
state.has("The Pit (MAP09)", player, 1))
set_rule(multiworld.get_entrance("The Pit (MAP09) Start -> The Pit (MAP09) Main", player), lambda state:
(state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super Shotgun", player, 1)) and (state.has("BFG9000", player, 1) or
state.has("Plasma gun", player, 1) or
state.has("Rocket launcher", player, 1)))
# Refueling Base (MAP10)
set_rule(multiworld.get_entrance("Hub -> Refueling Base (MAP10) Main", player), lambda state:
(state.has("Refueling Base (MAP10)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super 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("Refueling Base (MAP10) Main -> Refueling Base (MAP10) Yellow", player), lambda state:
state.has("Refueling Base (MAP10) - Yellow keycard", player, 1))
set_rule(multiworld.get_entrance("Refueling Base (MAP10) Yellow -> Refueling Base (MAP10) Yellow Blue", player), lambda state:
state.has("Refueling Base (MAP10) - Blue keycard", player, 1))
set_rule(multiworld.get_entrance("Hub -> Refueling Base (MAP10) Start", player), lambda state:
state.has("Refueling Base (MAP10)", player, 1))
set_rule(multiworld.get_entrance("Refueling Base (MAP10) Start -> Refueling Base (MAP10) Main", player), lambda state:
(state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super Shotgun", player, 1)) and (state.has("BFG9000", player, 1) or
state.has("Plasma gun", player, 1) or
state.has("Rocket launcher", player, 1)))
# Circle of Death (MAP11)
set_rule(multiworld.get_entrance("Hub -> Circle of Death (MAP11) Main", player), lambda state:
@@ -165,18 +161,19 @@ def set_episode1_rules(player, multiworld, pro):
def set_episode2_rules(player, multiworld, pro):
# The Factory (MAP12)
set_rule(multiworld.get_entrance("Hub -> The Factory (MAP12) Main", player), lambda state:
(state.has("The Factory (MAP12)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super 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("The Factory (MAP12) Main -> The Factory (MAP12) Yellow", player), lambda state:
set_rule(multiworld.get_entrance("The Factory (MAP12) Indoors -> The Factory (MAP12) Yellow", player), lambda state:
state.has("The Factory (MAP12) - Yellow keycard", player, 1))
set_rule(multiworld.get_entrance("The Factory (MAP12) Main -> The Factory (MAP12) Blue", player), lambda state:
set_rule(multiworld.get_entrance("The Factory (MAP12) Indoors -> The Factory (MAP12) Blue", player), lambda state:
state.has("The Factory (MAP12) - Blue keycard", player, 1))
set_rule(multiworld.get_entrance("Hub -> The Factory (MAP12) Outdoors", player), lambda state:
state.has("The Factory (MAP12)", player, 1))
set_rule(multiworld.get_entrance("The Factory (MAP12) Outdoors -> The Factory (MAP12) Main", player), lambda state:
state.has("Super Shotgun", player, 1) or
state.has("Plasma gun", player, 1))
set_rule(multiworld.get_entrance("The Factory (MAP12) Main -> The Factory (MAP12) Indoors", player), lambda state:
(state.has("Super Shotgun", player, 1) and
state.has("Chaingun", player, 1)) and (state.has("BFG9000", player, 1) or
state.has("Plasma gun", player, 1)))
# Downtown (MAP13)
set_rule(multiworld.get_entrance("Hub -> Downtown (MAP13) Main", player), lambda state:
@@ -307,54 +304,56 @@ def set_episode2_rules(player, multiworld, pro):
def set_episode3_rules(player, multiworld, pro):
# Nirvana (MAP21)
set_rule(multiworld.get_entrance("Hub -> Nirvana (MAP21) Main", player), lambda state:
(state.has("Nirvana (MAP21)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super 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("Nirvana (MAP21) Main -> Nirvana (MAP21) Yellow", player), lambda state:
state.has("Nirvana (MAP21) - Yellow skull key", player, 1))
(state.has("Super Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Nirvana (MAP21) - Yellow skull key", player, 1)) and (state.has("Plasma gun", player, 1) or
state.has("BFG9000", player, 1)))
set_rule(multiworld.get_entrance("Nirvana (MAP21) Yellow -> Nirvana (MAP21) Main", player), lambda state:
state.has("Nirvana (MAP21) - Yellow skull key", player, 1))
set_rule(multiworld.get_entrance("Nirvana (MAP21) Yellow -> Nirvana (MAP21) Magenta", player), lambda state:
state.has("Nirvana (MAP21) - Red skull key", player, 1) and
state.has("Nirvana (MAP21) - Blue skull key", player, 1))
set_rule(multiworld.get_entrance("Nirvana (MAP21) Magenta -> Nirvana (MAP21) Yellow", player), lambda state:
state.has("Nirvana (MAP21) - Red skull key", player, 1) and
state.has("Nirvana (MAP21) - Blue skull key", player, 1))
set_rule(multiworld.get_entrance("Hub -> Nirvana (MAP21) Start", player), lambda state:
state.has("Nirvana (MAP21)", player, 1))
set_rule(multiworld.get_entrance("Nirvana (MAP21) Start -> Nirvana (MAP21) Main", player), lambda state:
state.has("Super Shotgun", player, 1) or
state.has("Plasma gun", player, 1))
set_rule(multiworld.get_entrance("Nirvana (MAP21) Pro Magenta -> Nirvana (MAP21) Magenta", player), lambda state:
state.has("Nirvana (MAP21) - Red skull key", player, 1))
# The Catacombs (MAP22)
set_rule(multiworld.get_entrance("Hub -> The Catacombs (MAP22) Main", player), lambda state:
(state.has("The Catacombs (MAP22)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super Shotgun", player, 1)) and
(state.has("BFG9000", player, 1) or
state.has("Rocket launcher", player, 1) or
state.has("Plasma gun", player, 1)))
set_rule(multiworld.get_entrance("The Catacombs (MAP22) Main -> The Catacombs (MAP22) Blue", player), lambda state:
state.has("The Catacombs (MAP22) - Blue skull key", player, 1))
set_rule(multiworld.get_entrance("The Catacombs (MAP22) Main -> The Catacombs (MAP22) Red", player), lambda state:
state.has("The Catacombs (MAP22) - Red skull key", player, 1))
set_rule(multiworld.get_entrance("The Catacombs (MAP22) Red -> The Catacombs (MAP22) Main", player), lambda state:
state.has("The Catacombs (MAP22) - Red skull key", player, 1))
set_rule(multiworld.get_entrance("Hub -> The Catacombs (MAP22) Early", player), lambda state:
(state.has("The Catacombs (MAP22)", player, 1)) and
(state.has("Shotgun", player, 1) or
state.has("Super Shotgun", player, 1) or
state.has("Plasma gun", player, 1)))
set_rule(multiworld.get_entrance("The Catacombs (MAP22) Early -> The Catacombs (MAP22) Main", player), lambda state:
(state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super Shotgun", player, 1)) and (state.has("BFG9000", player, 1) or
state.has("Plasma gun", player, 1) or
state.has("Rocket launcher", player, 1)))
# Barrels o Fun (MAP23)
set_rule(multiworld.get_entrance("Hub -> Barrels o Fun (MAP23) Main", player), lambda state:
(state.has("Barrels o Fun (MAP23)", player, 1) and
# Barrels o' Fun (MAP23)
set_rule(multiworld.get_entrance("Hub -> Barrels o' Fun (MAP23) Main", player), lambda state:
(state.has("Barrels o' Fun (MAP23)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super 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("Barrels o Fun (MAP23) Main -> Barrels o Fun (MAP23) Yellow", player), lambda state:
state.has("Barrels o Fun (MAP23) - Yellow skull key", player, 1))
set_rule(multiworld.get_entrance("Barrels o Fun (MAP23) Yellow -> Barrels o Fun (MAP23) Main", player), lambda state:
state.has("Barrels o Fun (MAP23) - Yellow skull key", player, 1))
set_rule(multiworld.get_entrance("Barrels o' Fun (MAP23) Main -> Barrels o' Fun (MAP23) Yellow", player), lambda state:
state.has("Barrels o' Fun (MAP23) - Yellow skull key", player, 1))
set_rule(multiworld.get_entrance("Barrels o' Fun (MAP23) Yellow -> Barrels o' Fun (MAP23) Main", player), lambda state:
state.has("Barrels o' Fun (MAP23) - Yellow skull key", player, 1))
# The Chasm (MAP24)
set_rule(multiworld.get_entrance("Hub -> The Chasm (MAP24) Main", player), lambda state:
@@ -365,24 +364,26 @@ def set_episode3_rules(player, multiworld, pro):
state.has("Plasma gun", player, 1) and
state.has("BFG9000", player, 1) and
state.has("Super Shotgun", player, 1))
set_rule(multiworld.get_entrance("The Chasm (MAP24) Main -> The Chasm (MAP24) Red", player), lambda state:
set_rule(multiworld.get_entrance("The Chasm (MAP24) Main -> The Chasm (MAP24) Blue", player), lambda state:
state.has("The Chasm (MAP24) - Blue keycard", player, 1))
set_rule(multiworld.get_entrance("The Chasm (MAP24) Red -> The Chasm (MAP24) Blue", player), lambda state:
state.has("The Chasm (MAP24) - Red keycard", player, 1))
set_rule(multiworld.get_entrance("The Chasm (MAP24) Red -> The Chasm (MAP24) Main", player), lambda state:
set_rule(multiworld.get_entrance("The Chasm (MAP24) Blue -> The Chasm (MAP24) Red", player), lambda state:
state.has("The Chasm (MAP24) - Red keycard", player, 1))
# Bloodfalls (MAP25)
set_rule(multiworld.get_entrance("Hub -> Bloodfalls (MAP25) Main", player), lambda state:
state.has("Bloodfalls (MAP25)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Rocket launcher", player, 1) and
state.has("Plasma gun", player, 1) and
state.has("BFG9000", player, 1) and
state.has("Super Shotgun", player, 1))
set_rule(multiworld.get_entrance("Bloodfalls (MAP25) Main -> Bloodfalls (MAP25) Blue", player), lambda state:
state.has("Bloodfalls (MAP25) - Blue skull key", player, 1))
(state.has("Bloodfalls (MAP25) - Blue skull key", 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("Bloodfalls (MAP25) Blue -> Bloodfalls (MAP25) Main", player), lambda state:
state.has("Bloodfalls (MAP25) - Blue skull key", player, 1))
set_rule(multiworld.get_entrance("Hub -> Bloodfalls (MAP25) Start", player), lambda state:
state.has("Bloodfalls (MAP25)", player, 1))
set_rule(multiworld.get_entrance("Bloodfalls (MAP25) Start -> Bloodfalls (MAP25) Main", player), lambda state:
state.has("Super Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Shotgun", player, 1))
# The Abandoned Mines (MAP26)
set_rule(multiworld.get_entrance("Hub -> The Abandoned Mines (MAP26) Main", player), lambda state:
@@ -451,36 +452,34 @@ def set_episode3_rules(player, multiworld, pro):
state.has("Super Shotgun", player, 1))
# Icon of Sin (MAP30)
set_rule(multiworld.get_entrance("Hub -> Icon of Sin (MAP30) Main", player), lambda state:
state.has("Icon of Sin (MAP30)", player, 1) and
state.has("Rocket launcher", player, 1) and
set_rule(multiworld.get_entrance("Hub -> Icon of Sin (MAP30) Start", player), lambda state:
state.has("Icon of Sin (MAP30)", player, 1))
set_rule(multiworld.get_entrance("Icon of Sin (MAP30) Start -> Icon of Sin (MAP30) Main", player), lambda state:
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Rocket launcher", player, 1) and
state.has("Plasma gun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("BFG9000", player, 1) and
state.has("Super Shotgun", player, 1))
def set_episode4_rules(player, multiworld, pro):
# Wolfenstein2 (MAP31)
set_rule(multiworld.get_entrance("Hub -> Wolfenstein2 (MAP31) Main", player), lambda state:
(state.has("Wolfenstein2 (MAP31)", player, 1) and
state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super Shotgun", player, 1)) and
(state.has("Rocket launcher", player, 1) or
state.has("Plasma gun", player, 1) or
state.has("BFG9000", player, 1)))
# Wolfenstein (MAP31)
set_rule(multiworld.get_entrance("Hub -> Wolfenstein (MAP31) Main", player), lambda state:
(state.has("Wolfenstein (MAP31)", player, 1) and
state.has("Chaingun", player, 1)) and
(state.has("Shotgun", player, 1) or
state.has("Super Shotgun", player, 1)))
# Grosse2 (MAP32)
set_rule(multiworld.get_entrance("Hub -> Grosse2 (MAP32) Main", player), lambda state:
(state.has("Grosse2 (MAP32)", player, 1) and
state.has("Shotgun", player, 1) and
# Grosse (MAP32)
set_rule(multiworld.get_entrance("Hub -> Grosse (MAP32) Start", player), lambda state:
state.has("Grosse (MAP32)", player, 1))
set_rule(multiworld.get_entrance("Grosse (MAP32) Start -> Grosse (MAP32) Main", player), lambda state:
(state.has("Shotgun", player, 1) and
state.has("Chaingun", player, 1) and
state.has("Super Shotgun", player, 1)) and
(state.has("Rocket launcher", player, 1) or
state.has("Super Shotgun", player, 1)) and (state.has("BFG9000", player, 1) or
state.has("Plasma gun", player, 1) or
state.has("BFG9000", player, 1)))
state.has("Rocket launcher", player, 1)))
def set_rules(doom_ii_world: "DOOM2World", included_episodes, pro):

26
worlds/doom_ii/__init__.py
View File

@@ -51,11 +51,11 @@ class DOOM2World(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] = [
"Entryway (MAP01)",
"The Factory (MAP12)",
"Nirvana (MAP21)"
]
starting_level_for_episode: Dict[int, str] = {
1: "Entryway (MAP01)",
2: "The Factory (MAP12)",
3: "Nirvana (MAP21)"
}
# Item ratio that scales depending on episode count. These are the ratio for 3 episode. In DOOM1.
# The ratio have been tweaked seem, and feel good.
@@ -77,6 +77,7 @@ class DOOM2World(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)
@@ -95,6 +96,14 @@ class DOOM2World(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]]
# If soloing MAP21-MAP30, we need to mark a weapon as early to help generation succeed
if self.get_episode_count() == 1 and self.included_episodes[2]:
early_weapon = self.random.choice(["Super Shotgun", "Plasma gun"])
self.multiworld.early_items[self.player][early_weapon] = 1
def create_regions(self):
pro = self.options.pro.value
@@ -193,7 +202,7 @@ class DOOM2World(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
@@ -224,9 +233,8 @@ class DOOM2World(World):
self.location_count -= 1
# Give starting levels right away
for i in range(len(self.starting_level_for_episode)):
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 start_with_computer_area_maps: