From ca06a4b836ed1acc39ec1bd09e380bf07a9e811f Mon Sep 17 00:00:00 2001 From: David St-Louis Date: Fri, 11 Aug 2023 05:03:23 -0400 Subject: [PATCH] DOOM 1993: Fixed rule for red region in E3M9 (#2079) --- worlds/doom_1993/Regions.py | 7 ++++--- worlds/doom_1993/Rules.py | 6 ++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/worlds/doom_1993/Regions.py b/worlds/doom_1993/Regions.py index cce777fe..58626e62 100644 --- a/worlds/doom_1993/Regions.py +++ b/worlds/doom_1993/Regions.py @@ -421,17 +421,18 @@ regions:List[RegionDict] = [ "connects_to_hub":True, "episode":3, "connections":[ - "Warrens (E3M9) Red", "Warrens (E3M9) Blue", "Warrens (E3M9) Blue trigger"]}, {"name":"Warrens (E3M9) Red", "connects_to_hub":False, "episode":3, - "connections":["Warrens (E3M9) Main"]}, + "connections":[]}, {"name":"Warrens (E3M9) Blue", "connects_to_hub":False, "episode":3, - "connections":["Warrens (E3M9) Main"]}, + "connections":[ + "Warrens (E3M9) Main", + "Warrens (E3M9) Red"]}, {"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 index 57a26682..6f24112c 100644 --- a/worlds/doom_1993/Rules.py +++ b/worlds/doom_1993/Rules.py @@ -374,16 +374,14 @@ def set_episode3_rules(player, world): 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):