From afb0147e2ec1b91aa2a768ad56cb022ac649853e Mon Sep 17 00:00:00 2001 From: lil David <1337lilDavid@gmail.com> Date: Sun, 11 Aug 2024 12:07:10 -0500 Subject: [PATCH] Fix boss treasure location names being reversed --- locations.py | 16 ++++++++-------- rules.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/locations.py b/locations.py index f7d9d21..d0ebb65 100644 --- a/locations.py +++ b/locations.py @@ -93,9 +93,9 @@ def level_id(self): 'Monsoon Jungle - Full Health Item Box': LocationData(LocationType.BOX, (Passage.EMERALD, 3, ItemFlag.FULL_HEALTH), 'Upper', _ALL), 'Cractus': LocationData(LocationType.BOSS, (Passage.EMERALD, 4, ItemFlag.KEYZER), None, _ALL), - 'Cractus - 0:15': LocationData(LocationType.CHEST, (Passage.EMERALD, 4, ItemFlag.JEWEL_NE), None, _ALL), + 'Cractus - 0:55': LocationData(LocationType.CHEST, (Passage.EMERALD, 4, ItemFlag.JEWEL_NE), None, _ALL), 'Cractus - 0:35': LocationData(LocationType.CHEST, (Passage.EMERALD, 4, ItemFlag.JEWEL_SE), None, _ALL), - 'Cractus - 0:55': LocationData(LocationType.CHEST, (Passage.EMERALD, 4, ItemFlag.JEWEL_SW), None, _ALL), + 'Cractus - 0:15': LocationData(LocationType.CHEST, (Passage.EMERALD, 4, ItemFlag.JEWEL_SW), None, _ALL), # Ruby Passage # The Curious Factory @@ -139,9 +139,9 @@ def level_id(self): 'Pinball Zone - Rolling Room Full Health Item Box': LocationData(LocationType.BOX, (Passage.RUBY, 3, ItemFlag.FULL_HEALTH_2), 'Early Rooms', _S_HARD), 'Cuckoo Condor': LocationData(LocationType.BOSS, (Passage.RUBY, 4, ItemFlag.KEYZER), None, _ALL), - 'Cuckoo Condor - 0:15': LocationData(LocationType.CHEST, (Passage.RUBY, 4, ItemFlag.JEWEL_NE), None, _ALL), + 'Cuckoo Condor - 0:55': LocationData(LocationType.CHEST, (Passage.RUBY, 4, ItemFlag.JEWEL_NE), None, _ALL), 'Cuckoo Condor - 0:35': LocationData(LocationType.CHEST, (Passage.RUBY, 4, ItemFlag.JEWEL_SE), None, _ALL), - 'Cuckoo Condor - 0:55': LocationData(LocationType.CHEST, (Passage.RUBY, 4, ItemFlag.JEWEL_SW), None, _ALL), + 'Cuckoo Condor - 0:15': LocationData(LocationType.CHEST, (Passage.RUBY, 4, ItemFlag.JEWEL_SW), None, _ALL), # Topaz Passage # Toy Block Tower @@ -189,9 +189,9 @@ def level_id(self): 'Domino Row - CD Box': LocationData(LocationType.BOX, (Passage.TOPAZ, 3, ItemFlag.CD), 'After Lake', _ALL), 'Aerodent': LocationData(LocationType.BOSS, (Passage.TOPAZ, 4, ItemFlag.KEYZER), None, _ALL), - 'Aerodent - 0:15': LocationData(LocationType.CHEST, (Passage.TOPAZ, 4, ItemFlag.JEWEL_NE), None, _ALL), + 'Aerodent - 0:55': LocationData(LocationType.CHEST, (Passage.TOPAZ, 4, ItemFlag.JEWEL_NE), None, _ALL), 'Aerodent - 0:35': LocationData(LocationType.CHEST, (Passage.TOPAZ, 4, ItemFlag.JEWEL_SE), None, _ALL), - 'Aerodent - 0:55': LocationData(LocationType.CHEST, (Passage.TOPAZ, 4, ItemFlag.JEWEL_SW), None, _ALL), + 'Aerodent - 0:15': LocationData(LocationType.CHEST, (Passage.TOPAZ, 4, ItemFlag.JEWEL_SW), None, _ALL), # Sapphire Passage # Crescent Moon Village @@ -233,9 +233,9 @@ def level_id(self): 'Hotel Horror - CD Box': LocationData(LocationType.BOX, (Passage.SAPPHIRE, 3, ItemFlag.CD), 'Switch Room', _ALL), 'Catbat': LocationData(LocationType.BOSS, (Passage.SAPPHIRE, 4, ItemFlag.KEYZER), None, _ALL), - 'Catbat - 0:15': LocationData(LocationType.CHEST, (Passage.SAPPHIRE, 4, ItemFlag.JEWEL_NE), None, _ALL), + 'Catbat - 0:55': LocationData(LocationType.CHEST, (Passage.SAPPHIRE, 4, ItemFlag.JEWEL_NE), None, _ALL), 'Catbat - 0:35': LocationData(LocationType.CHEST, (Passage.SAPPHIRE, 4, ItemFlag.JEWEL_SE), None, _ALL), - 'Catbat - 0:55': LocationData(LocationType.CHEST, (Passage.SAPPHIRE, 4, ItemFlag.JEWEL_SW), None, _ALL), + 'Catbat - 0:15': LocationData(LocationType.CHEST, (Passage.SAPPHIRE, 4, ItemFlag.JEWEL_SW), None, _ALL), # Golden Pyramid # Golden Passage diff --git a/rules.py b/rules.py index 951da0e..aa5f9dd 100644 --- a/rules.py +++ b/rules.py @@ -203,21 +203,21 @@ def set_access_rules(world: WL4World): location_rules: Mapping[str, Requirement] = { 'Cractus': has('Ground Pound'), - 'Cractus - 0:15': has('Ground Pound') & (not_difficulty(s_hard) | has('Enemy Jump') | logic('advanced')), - 'Cractus - 0:35': has('Ground Pound') & (not_difficulty(s_hard) | has('Enemy Jump') | logic('advanced')), 'Cractus - 0:55': has('Ground Pound') & (not_difficulty(s_hard) | has('Enemy Jump') | logic('advanced')), + 'Cractus - 0:35': has('Ground Pound') & (not_difficulty(s_hard) | has('Enemy Jump') | logic('advanced')), + 'Cractus - 0:15': has('Ground Pound') & (not_difficulty(s_hard) | has('Enemy Jump') | logic('advanced')), 'Cuckoo Condor': has('Grab'), - 'Cuckoo Condor - 0:15': has('Grab'), - 'Cuckoo Condor - 0:35': has('Grab'), 'Cuckoo Condor - 0:55': has('Grab'), + 'Cuckoo Condor - 0:35': has('Grab'), + 'Cuckoo Condor - 0:15': has('Grab'), 'Aerodent': has('Grab'), - 'Aerodent - 0:15': has('Grab'), - 'Aerodent - 0:35': has('Grab'), 'Aerodent - 0:55': has('Grab'), + 'Aerodent - 0:35': has('Grab'), + 'Aerodent - 0:15': has('Grab'), 'Catbat': has('Ground Pound') & (has('Enemy Jump') | logic(advanced)), - 'Catbat - 0:15': has('Ground Pound') & (has('Enemy Jump') | logic(advanced) & not_difficulty(s_hard)), - 'Catbat - 0:35': has('Ground Pound') & (has('Enemy Jump') | logic(advanced) & not_difficulty(s_hard)), 'Catbat - 0:55': has('Ground Pound') & (has('Enemy Jump') | logic(advanced) & not_difficulty(s_hard)), + 'Catbat - 0:35': has('Ground Pound') & (has('Enemy Jump') | logic(advanced) & not_difficulty(s_hard)), + 'Catbat - 0:15': has('Ground Pound') & (has('Enemy Jump') | logic(advanced) & not_difficulty(s_hard)), 'Golden Diva': has('Heavy Grab') & (option('goal', Goal.option_golden_diva) | has_treasures()), 'Sound Room - Emergency Exit': has_treasures(),