monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow removing non-LttP Progressive items from CollectionState

This commit is contained in:
Fabian Dill 2021-04-29 08:25:06 +02:00
parent 6ea68dd290
commit 3a1d33f499
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BaseClasses.py
View File

@ -876,7 +876,7 @@ class CollectionState(object):
def remove(self, item): def remove(self, item):
if item.advancement: if item.advancement:
to_remove = item.name to_remove = item.name
if to_remove.startswith('Progressive '): if item.game == "A Link to the Past" and to_remove.startswith('Progressive '):
if 'Sword' in to_remove: if 'Sword' in to_remove:
if self.has('Golden Sword', item.player): if self.has('Golden Sword', item.player):
to_remove = 'Golden Sword' to_remove = 'Golden Sword'
@ -903,7 +903,7 @@ class CollectionState(object):
elif self.has('Blue Shield', item.player): elif self.has('Blue Shield', item.player):
to_remove = 'Blue Shield' to_remove = 'Blue Shield'
else: else:
to_remove = 'None' to_remove = None
elif 'Bow' in item.name: elif 'Bow' in item.name:
if self.has('Silver Bow', item.player): if self.has('Silver Bow', item.player):
to_remove = 'Silver Bow' to_remove = 'Silver Bow'
@ -912,7 +912,7 @@ class CollectionState(object):
else: else:
to_remove = None to_remove = None
if to_remove is not None: if to_remove:
self.prog_items[to_remove, item.player] -= 1 self.prog_items[to_remove, item.player] -= 1
if self.prog_items[to_remove, item.player] < 1: if self.prog_items[to_remove, item.player] < 1: