diff options
Diffstat (limited to '__init__.py')
| -rw-r--r-- | __init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
| diff --git a/__init__.py b/__init__.py index 3d98ae9..da8a246 100644 --- a/__init__.py +++ b/__init__.py | |||
| @@ -55,14 +55,14 @@ class LingoWorld(World): | |||
| 55 | create_regions(self, self.player_logic) | 55 | create_regions(self, self.player_logic) |
| 56 | 56 | ||
| 57 | def create_items(self): | 57 | def create_items(self): |
| 58 | pool = [self.create_item(name) for name in self.player_logic.REAL_ITEMS] | 58 | pool = [self.create_item(name) for name in self.player_logic.real_items] |
| 59 | 59 | ||
| 60 | if self.player_logic.FORCED_GOOD_ITEM != "": | 60 | if self.player_logic.forced_good_item != "": |
| 61 | new_item = self.create_item(self.player_logic.FORCED_GOOD_ITEM) | 61 | new_item = self.create_item(self.player_logic.forced_good_item) |
| 62 | location_obj = self.multiworld.get_location("Second Room - Good Luck", self.player) | 62 | location_obj = self.multiworld.get_location("Second Room - Good Luck", self.player) |
| 63 | location_obj.place_locked_item(new_item) | 63 | location_obj.place_locked_item(new_item) |
| 64 | 64 | ||
| 65 | item_difference = len(self.player_logic.REAL_LOCATIONS) - len(pool) | 65 | item_difference = len(self.player_logic.real_locations) - len(pool) |
| 66 | if item_difference: | 66 | if item_difference: |
| 67 | trap_percentage = self.options.trap_percentage | 67 | trap_percentage = self.options.trap_percentage |
| 68 | traps = int(item_difference * trap_percentage / 100.0) | 68 | traps = int(item_difference * trap_percentage / 100.0) |
| @@ -93,7 +93,7 @@ class LingoWorld(World): | |||
| 93 | 93 | ||
| 94 | classification = item.classification | 94 | classification = item.classification |
| 95 | if hasattr(self, "options") and self.options.shuffle_paintings and len(item.painting_ids) > 0\ | 95 | if hasattr(self, "options") and self.options.shuffle_paintings and len(item.painting_ids) > 0\ |
| 96 | and len(item.door_ids) == 0 and all(painting_id not in self.player_logic.PAINTING_MAPPING | 96 | and len(item.door_ids) == 0 and all(painting_id not in self.player_logic.painting_mapping |
| 97 | for painting_id in item.painting_ids): | 97 | for painting_id in item.painting_ids): |
| 98 | # If this is a "door" that just moves one or more paintings, and painting shuffle is on and those paintings | 98 | # If this is a "door" that just moves one or more paintings, and painting shuffle is on and those paintings |
| 99 | # go nowhere, then this item should not be progression. | 99 | # go nowhere, then this item should not be progression. |
| @@ -116,6 +116,6 @@ class LingoWorld(World): | |||
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | if self.options.shuffle_paintings: | 118 | if self.options.shuffle_paintings: |
| 119 | slot_data["painting_entrance_to_exit"] = self.player_logic.PAINTING_MAPPING | 119 | slot_data["painting_entrance_to_exit"] = self.player_logic.painting_mapping |
| 120 | 120 | ||
| 121 | return slot_data | 121 | return slot_data |
