Lingo: Fix edge case painting shuffle accessibility issues (#2441)

* Lingo: Fix painting shuffle logic issue in The Wise

* Lingo: More generic painting cycle prevention

* Lingo: okay how about now

* Lingo: Consider Owl Hallway blocked painting areas in vanilla doors

* Lingo: so honestly I should've seen this one coming

* Lingo: Refined req_blocked for vanilla doors

* Lingo: Orange Tower Basement is also owl-blocked

* Lingo: Rewrite randomize_paintings to eliminate rerolls

Now, mapping is done in two phases, rather than assigning everything at once and then rerolling if the mapping is non-viable.

1 files changed, 11 insertions, 0 deletions

@@ -97,6 +97,11 @@
   #                   Use "required_when_no_doors" instead if it would be
   #                   possible to enter the room without the painting in door
   #                   shuffle mode.
+  # - req_blocked:    Marks that a painting cannot be an entrance leading to a
+  #                   required painting. Paintings within a room that has a
+  #                   required painting are automatically req blocked.
+  #                   Use "req_blocked_when_no_doors" instead if it would be
+  #                   fine in door shuffle mode.
   # - move:           Denotes that the painting is able to move.
   Starting Room:
     entrances:
@@ -2210,6 +2215,7 @@
       - id: map_painting2
         orientation: north
         enter_only: True # otherwise you might just skip the whole game!
+        req_blocked_when_no_doors: True # owl hallway in vanilla doors
   Roof:
     entrances:
       Orange Tower Seventh Floor: True
@@ -2276,6 +2282,7 @@
     paintings:
       - id: arrows_painting_11
         orientation: east
+        req_blocked_when_no_doors: True # owl hallway in vanilla doors
   Courtyard:
     entrances:
       Roof: True
@@ -5755,11 +5762,13 @@
         move: True
         required_door:
           door: Exit
+        req_blocked_when_no_doors: True # the wondrous (table) in vanilla doors
       - id: symmetry_painting_a_6
         orientation: west
         exit_only: True
       - id: symmetry_painting_b_6
         orientation: north
+        req_blocked_when_no_doors: True # the wondrous (table) in vanilla doors
   Arrow Garden:
     entrances:
       The Wondrous:
@@ -6914,6 +6923,7 @@
     paintings:
       - id: clock_painting_3
         orientation: east
+        req_blocked: True # outside the wise (with or without door shuffle)
   The Red:
     entrances:
       Roof: True
@@ -7362,6 +7372,7 @@
     paintings:
       - id: hi_solved_painting4
         orientation: south
+        req_blocked_when_no_doors: True # owl hallway in vanilla doors
   Challenge Room:
     entrances:
       Welcome Back Area: