diff --git a/worlds/ffmq/__init__.py b/worlds/ffmq/__init__.py index c749909a1d..f45b3bd961 100644 --- a/worlds/ffmq/__init__.py +++ b/worlds/ffmq/__init__.py @@ -157,15 +157,17 @@ class FFMQWorld(World): if "Progressive" in item.name: i = item.code - 256 if remove: + if state.has(self.item_id_to_name[i+2], self.player): + return self.item_id_to_name[i+2] 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+2], self.player): + return self.item_id_to_name[i+2] + if state.has(self.item_id_to_name[i+1], self.player): + return self.item_id_to_name[i+2] if state.has(self.item_id_to_name[i], 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+1] return self.item_id_to_name[i] return item.name