Witness: Fix Python 3.11 crash and fix Desert Laser hint (#1970)
This commit is contained in:
parent
8c5688e5e2
commit
48746f6c62
|
@ -141,9 +141,8 @@ def get_priority_hint_items(multiworld: MultiWorld, player: int):
|
||||||
}
|
}
|
||||||
|
|
||||||
if is_option_enabled(multiworld, player, "shuffle_lasers"):
|
if is_option_enabled(multiworld, player, "shuffle_lasers"):
|
||||||
lasers = {
|
lasers = [
|
||||||
"Symmetry Laser",
|
"Symmetry Laser",
|
||||||
"Desert Laser",
|
|
||||||
"Town Laser",
|
"Town Laser",
|
||||||
"Keep Laser",
|
"Keep Laser",
|
||||||
"Swamp Laser",
|
"Swamp Laser",
|
||||||
|
@ -153,14 +152,14 @@ def get_priority_hint_items(multiworld: MultiWorld, player: int):
|
||||||
"Quarry Laser",
|
"Quarry Laser",
|
||||||
"Bunker Laser",
|
"Bunker Laser",
|
||||||
"Shadows Laser",
|
"Shadows Laser",
|
||||||
}
|
]
|
||||||
|
|
||||||
if get_option_value(multiworld, player, "doors") >= 2:
|
if get_option_value(multiworld, player, "shuffle_doors") >= 2:
|
||||||
priority.add("Desert Laser")
|
priority.add("Desert Laser")
|
||||||
lasers.remove("Desert Laser")
|
|
||||||
priority.update(multiworld.per_slot_randoms[player].sample(lasers, 5))
|
priority.update(multiworld.per_slot_randoms[player].sample(lasers, 5))
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
lasers.append("Desert Laser")
|
||||||
priority.update(multiworld.per_slot_randoms[player].sample(lasers, 6))
|
priority.update(multiworld.per_slot_randoms[player].sample(lasers, 6))
|
||||||
|
|
||||||
return priority
|
return priority
|
||||||
|
|
Loading…
Reference in New Issue