From 263b15511090ea1476aeca6ab9d31e5ea7b3ce93 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 19 Dec 2019 16:24:46 -0700 Subject: [PATCH] Revert "Potential stair key door fix" This reverts commit 106e25f120f0368ebcd6f5b961cef2066fc6a642. --- DoorShuffle.py | 5 +---- RoomData.py | 10 ---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 7ca3f849..68a418a1 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -1033,10 +1033,7 @@ def reassign_key_doors(builder, proposal, world, player): if room.doorList[d.doorListPos][1] == DoorKind.StairKeyLow: room.delete(d.doorListPos) else: - if len(room.doorList) > 1: - room.mirror(d.doorListPos) - else: - room.delete(d.doorListPos) + room.change(d.doorListPos, DoorKind.Waterfall) d.smallKey = False elif d.type is DoorType.Interior and d not in flat_proposal and d.dest not in flat_proposal: world.get_room(d.roomIndex, player).change(d.doorListPos, DoorKind.Normal) diff --git a/RoomData.py b/RoomData.py index f1f89fc4..31001ea5 100644 --- a/RoomData.py +++ b/RoomData.py @@ -257,16 +257,6 @@ class Room(object): self.doorList[list_idx] = (prev[0], kind) self.modified = True - def mirror(self, list_idx): - prev = self.doorList[list_idx] - mirror_door = None - for door in self.doorList: - if door != prev: - mirror_door = door - break - self.doorList[list_idx] = (mirror_door[0], mirror_door[1]) - self.modified = True - def swap(self, idx1, idx2): item1 = self.doorList[idx1] item2 = self.doorList[idx2]