mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-23 22:23:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
CookieCat
2023-09-11 16:24:15 -04:00
parent 6cedbe8b3d
commit 0d07ae0d72
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/ahit/DeathWishLocations.py
View File

@@ -215,7 +215,7 @@ def create_dw_regions(world: World):
bonus_stamps.place_locked_item(HatInTimeItem(f"2 Stamps - {name}",
ItemClassification.progression, None, world.player))
if name in world.get_excluded_bonuses():
if name in world.get_excluded_dws():
main_objective.progress_type = LocationProgressType.EXCLUDED
full_clear.progress_type = LocationProgressType.EXCLUDED
elif world.is_bonus_excluded(name):
@@ -253,7 +253,7 @@ def create_dw_regions(world: World):
bonus_stamps.place_locked_item(HatInTimeItem(f"2 Stamps - {key}",
ItemClassification.progression, None, world.player))
if key in world.get_excluded_bonuses():
if key in world.get_excluded_dws():
main_objective.progress_type = LocationProgressType.EXCLUDED
full_clear.progress_type = LocationProgressType.EXCLUDED
elif world.is_bonus_excluded(key):

21
worlds/ahit/Items.py
View File

@@ -37,22 +37,19 @@ def create_itempool(world: World) -> List[Item]:
continue
item_type: ItemClassification = item_table.get(name).classification
if get_difficulty(world) >= 1 or is_player_knowledgeable(world) \
and (name == "Scooter Badge" or name == "No Bonk Badge"):
item_type = ItemClassification.progression
# some death wish bonuses require one hit hero + hookshot
if world.is_dw() and name == "Badge Pin":
item_type = ItemClassification.progression
if world.is_dw_only():
if item_type is ItemClassification.progression \
or item_type is ItemClassification.progression_skip_balancing:
or item_type is ItemClassification.progression_skip_balancing:
continue
# progression balance anything useful, since we have basically no progression in this mode
if item_type is ItemClassification.useful:
item_type = ItemClassification.progression
if get_difficulty(world) >= 1 or is_player_knowledgeable(world) \
and (name == "Scooter Badge" or name == "No Bonk Badge") and not world.is_dw_only():
item_type = ItemClassification.progression
# some death wish bonuses require one hit hero + hookshot
if world.is_dw() and name == "Badge Pin" and not world.is_dw_only():
item_type = ItemClassification.progression
if item_type is ItemClassification.filler or item_type is ItemClassification.trap:
continue
@@ -64,7 +61,7 @@ def create_itempool(world: World) -> List[Item]:
continue
if name == "Progressive Painting Unlock" \
and world.multiworld.ShuffleSubconPaintings[world.player].value == 0:
and world.multiworld.ShuffleSubconPaintings[world.player].value == 0:
continue
if world.multiworld.StartWithCompassBadge[world.player].value > 0 and name == "Compass Badge":