@@ -399,6 +399,16 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None:
399
399
mnt_lasers = world .options .mountain_lasers
400
400
chal_lasers = world .options .challenge_lasers
401
401
402
+ # Victory Condition
403
+ if victory == "elevator" :
404
+ self .VICTORY_LOCATION = "0x3D9A9"
405
+ elif victory == "challenge" :
406
+ self .VICTORY_LOCATION = "0x0356B"
407
+ elif victory == "mountain_box_short" :
408
+ self .VICTORY_LOCATION = "0x09F7F"
409
+ elif victory == "mountain_box_long" :
410
+ self .VICTORY_LOCATION = "0xFFF00"
411
+
402
412
# Exclude panels from the post-game if shuffle_postgame is false.
403
413
if not world .options .shuffle_postgame :
404
414
adjustment_linesets_in_order += self .handle_postgame (world )
@@ -418,17 +428,6 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None:
418
428
if not victory == "challenge" :
419
429
adjustment_linesets_in_order .append (["Disabled Locations:" , "0x0A332" ])
420
430
421
- # Victory Condition
422
-
423
- if victory == "elevator" :
424
- self .VICTORY_LOCATION = "0x3D9A9"
425
- elif victory == "challenge" :
426
- self .VICTORY_LOCATION = "0x0356B"
427
- elif victory == "mountain_box_short" :
428
- self .VICTORY_LOCATION = "0x09F7F"
429
- elif victory == "mountain_box_long" :
430
- self .VICTORY_LOCATION = "0xFFF00"
431
-
432
431
# Long box can usually only be solved by opening Mountain Entry. However, if it requires 7 lasers or less
433
432
# (challenge_lasers <= 7), you can now solve it without opening Mountain Entry first.
434
433
# Furthermore, if the user sets mountain_lasers > 7, the box is rotated to not require Mountain Entry either.
@@ -874,7 +873,7 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in
874
873
self .PRECOMPLETED_LOCATIONS = set ()
875
874
self .EXCLUDED_LOCATIONS = set ()
876
875
self .ADDED_CHECKS = set ()
877
- self .VICTORY_LOCATION = "0x0356B"
876
+ self .VICTORY_LOCATION : str
878
877
879
878
self .ALWAYS_EVENT_NAMES_BY_HEX = {
880
879
"0x00509" : "+1 Laser (Symmetry Laser)" ,
0 commit comments