DOOM 1993: Fixed rule for red region in E3M9

ArchipelagoMW · Aug 4, 2023 · 86abc43 · 86abc43
1 parent 77b1180
commit 86abc43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/worlds/doom_1993/Regions.py b/worlds/doom_1993/Regions.py
@@ -449,17 +449,18 @@ class RegionDict(TypedDict, total=False):
      "connects_to_hub":True,
      "episode":3,
      "connections":[
-        {"target":"Warrens (E3M9) Red","pro":False},
         {"target":"Warrens (E3M9) Blue","pro":False},
         {"target":"Warrens (E3M9) Blue trigger","pro":False}]},
     {"name":"Warrens (E3M9) Red",
      "connects_to_hub":False,
      "episode":3,
-     "connections":[{"target":"Warrens (E3M9) Main","pro":False}]},
+     "connections":[]},
     {"name":"Warrens (E3M9) Blue",
      "connects_to_hub":False,
      "episode":3,
-     "connections":[{"target":"Warrens (E3M9) Main","pro":False}]},
+     "connections":[
+        {"target":"Warrens (E3M9) Main","pro":False},
+        {"target":"Warrens (E3M9) Red","pro":False}]},
     {"name":"Warrens (E3M9) Blue trigger",
      "connects_to_hub":False,
      "episode":3,

diff --git a/worlds/doom_1993/Rules.py b/worlds/doom_1993/Rules.py
@@ -374,16 +374,14 @@ def set_episode3_rules(player, world, pro):
         state.has("Plasma gun", player, 1)) and
        (state.has("Rocket launcher", player, 1) or
         state.has("BFG9000", player, 1)))
-    set_rule(world.get_entrance("Warrens (E3M9) Main -> Warrens (E3M9) Red", player), lambda state:
-        state.has("Warrens (E3M9) - Red skull key", player, 1))
     set_rule(world.get_entrance("Warrens (E3M9) Main -> Warrens (E3M9) Blue", player), lambda state:
         state.has("Warrens (E3M9) - Blue skull key", player, 1))
     set_rule(world.get_entrance("Warrens (E3M9) Main -> Warrens (E3M9) Blue trigger", player), lambda state:
         state.has("Warrens (E3M9) - Blue skull key", player, 1))
-    set_rule(world.get_entrance("Warrens (E3M9) Red -> Warrens (E3M9) Main", player), lambda state:
-        state.has("Warrens (E3M9) - Red skull key", player, 1))
     set_rule(world.get_entrance("Warrens (E3M9) Blue -> Warrens (E3M9) Main", player), lambda state:
         state.has("Warrens (E3M9) - Blue skull key", player, 1))
+    set_rule(world.get_entrance("Warrens (E3M9) Blue -> Warrens (E3M9) Red", player), lambda state:
+        state.has("Warrens (E3M9) - Red skull key", player, 1))
 
 
 def set_episode4_rules(player, world, pro):