diff --git a/DoorShuffle.py b/DoorShuffle.py index 0c2a9992..6e80d19d 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -91,8 +91,9 @@ def link_doors_main(world, player): world.get_portal('Desert East', player).destination = True if (world.mode[player] == 'inverted') != (0x30 in world.owswaps[player][0] and world.owMixed[player]): world.get_portal('Desert West', player).destination = True - else: + if (world.mode[player] == 'inverted') == (0x00 in world.owswaps[player][0] and world.owMixed[player]): world.get_portal('Skull 2 West', player).destination = True + if (world.mode[player] == 'inverted') == (0x05 in world.owswaps[player][0] and world.owMixed[player]): world.get_portal('Turtle Rock Lazy Eyes', player).destination = True world.get_portal('Turtle Rock Eye Bridge', player).destination = True else: diff --git a/mystery_example.yml b/mystery_example.yml index 3ac5950b..d6fa1eb5 100644 --- a/mystery_example.yml +++ b/mystery_example.yml @@ -50,6 +50,7 @@ restricted: 2 full: 2 lite: 2 + lean: 2 crossed: 3 insanity: 1 shufflelinks: diff --git a/resources/app/cli/lang/en.json b/resources/app/cli/lang/en.json index b38fea4c..59d9a9f3 100644 --- a/resources/app/cli/lang/en.json +++ b/resources/app/cli/lang/en.json @@ -181,10 +181,10 @@ " connect remaining entrances.", "Full: Mix cave and dungeon entrances freely while limiting", " multi-entrance caves to one world.", - "Lite: Entrances are put into separate pools based on their", - " vanilla location. Dungeons, dropdowns, connector caves,", - " and locations that have an item are shuffled from", - " individual pools. Non-item locations remain vanilla.", + "Lite: Beginner-friendly. Dungeons/connectors, dropdowns, and", + " item locations are shuffled in separate pools. Non-item", + " locations remain vanilla. Connectors are same-world.", + "Lean: Same as Lite, except connectors can travel cross worlds.", "Crossed: Mix cave and dungeon entrances freely while allowing", " caves to cross between worlds.", "Insanity: Decouple entrances and exits from each other and",