morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

LttP & Factorio: fix item state removal for progressive items.

Browse Source
This commit is contained in:
Fabian Dill
2021-08-21 06:55:08 +02:00
parent 4aeb3cd3dc
commit 6a3d1fcaf4
4 changed files with 92 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/AutoWorld.py
View File

@@ -150,9 +150,10 @@ class World(metaclass=AutoWorldRegister):
# end of Main.py calls
def collect_item(self, state: CollectionState, item: Item) -> Optional[str]:
def collect_item(self, state: CollectionState, item: Item, remove=False) -> Optional[str]:
"""Collect an item name into state. For speed reasons items that aren't logically useful get skipped.
Collect None to skip item."""
Collect None to skip item.
:param remove: indicate if this is meant to remove from state instead of adding."""
if item.advancement:
return item.name
@@ -170,7 +171,7 @@ class World(metaclass=AutoWorldRegister):
return False
def remove(self, state: CollectionState, item: Item) -> bool:
name = self.collect_item(state, item)
name = self.collect_item(state, item, True)
if name:
state.prog_items[name, item.player] -= 1
if state.prog_items[name, item.player] < 1:
@@ -178,6 +179,7 @@ class World(metaclass=AutoWorldRegister):
return True
return False
# any methods attached to this can be used as part of CollectionState,
# please use a prefix as all of them get clobbered together
class LogicMixin(metaclass=AutoLogicRegister):