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

FFMQ: Fix collect_item (#4433)

Browse Source 
* Fix FFMQ collect_item
This commit is contained in:
Exempt-Medic
2025-01-19 23:06:09 -05:00
committed by GitHub
parent 992841a951
commit 4fa8c43266
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
worlds/ffmq/__init__.py
View File

@@ -152,14 +152,23 @@ class FFMQWorld(World):
return FFMQItem(name, self.player) return FFMQItem(name, self.player)
def collect_item(self, state, item, remove=False): def collect_item(self, state, item, remove=False):
if not item.advancement:
return None
if "Progressive" in item.name: if "Progressive" in item.name:
i = item.code - 256 i = item.code - 256
if remove:
if state.has(self.item_id_to_name[i+1], self.player):
if state.has(self.item_id_to_name[i+2], self.player):
return self.item_id_to_name[i+2]
return self.item_id_to_name[i+1]
return self.item_id_to_name[i]
if state.has(self.item_id_to_name[i], self.player): if state.has(self.item_id_to_name[i], self.player):
if state.has(self.item_id_to_name[i+1], self.player): if state.has(self.item_id_to_name[i+1], self.player):
return self.item_id_to_name[i+2] return self.item_id_to_name[i+2]
return self.item_id_to_name[i+1] return self.item_id_to_name[i+1]
return self.item_id_to_name[i] return self.item_id_to_name[i]
return item.name if item.advancement else None return item.name
def modify_multidata(self, multidata): def modify_multidata(self, multidata):
# wait for self.rom_name to be available. # wait for self.rom_name to be available.