alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Revert "Potential stair key door fix"

Browse Source 
This reverts commit 106e25f120.
This commit is contained in:
aerinon
2019-12-19 16:24:46 -07:00
parent 106e25f120
commit 263b155110
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DoorShuffle.py
View File

@@ -1033,10 +1033,7 @@ def reassign_key_doors(builder, proposal, world, player):
if room.doorList[d.doorListPos][1] == DoorKind.StairKeyLow: if room.doorList[d.doorListPos][1] == DoorKind.StairKeyLow:
room.delete(d.doorListPos) room.delete(d.doorListPos)
else: else:
if len(room.doorList) > 1: room.change(d.doorListPos, DoorKind.Waterfall)
room.mirror(d.doorListPos)
else:
room.delete(d.doorListPos)
d.smallKey = False d.smallKey = False
elif d.type is DoorType.Interior and d not in flat_proposal and d.dest not in flat_proposal: 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) world.get_room(d.roomIndex, player).change(d.doorListPos, DoorKind.Normal)

10
RoomData.py
View File

@@ -257,16 +257,6 @@ class Room(object):
self.doorList[list_idx] = (prev[0], kind) self.doorList[list_idx] = (prev[0], kind)
self.modified = True 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): def swap(self, idx1, idx2):
item1 = self.doorList[idx1] item1 = self.doorList[idx1]
item2 = self.doorList[idx2] item2 = self.doorList[idx2]