Skip to content

Commit

Permalink
Fix boss treasure location names being reversed
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilDavid
lilDavid committed Aug 11, 2024
1 parent 24d82fe commit afb0147
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions locations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions rules.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down

0 comments on commit afb0147

Please sign in to comment.