8 files changed, 48 insertions, 0 deletions

@@ -100,6 +100,8 @@ class Lingo2World(World):
             "shuffle_gallery_paintings",
             "shuffle_letters",
             "shuffle_symbols",
+            "strict_cyan_ending",
+            "strict_purple_ending",
             "victory_condition",
         ]
 
@@ -92,6 +92,22 @@ class DaedalusRoofAccess(Toggle):
     display_name = "Allow Daedalus Roof Access"
 
 
+class StrictPurpleEnding(DefaultOnToggle):
+    """
+    If enabled, the player will be required to have all purple (level 1) letters in order to get Purple Ending.
+    Otherwise, some of the letters may be skippable depending on the other options.
+    """
+    display_name = "Strict Purple Ending"
+
+
+class StrictCyanEnding(DefaultOnToggle):
+    """
+    If enabled, the player will be required to have all cyan (level 2) letters in order to get Cyan Ending. Otherwise,
+    at least J2, Q2, and V2 are skippable. Others may also be skippable depending on the options chosen.
+    """
+    display_name = "Strict Cyan Ending"
+
+
 class VictoryCondition(Choice):
     """
     This option determines what your goal is.
@@ -144,5 +160,7 @@ class Lingo2Options(PerGameCommonOptions):
     keyholder_sanity: KeyholderSanity
     cyan_door_behavior: CyanDoorBehavior
     daedalus_roof_access: DaedalusRoofAccess
+    strict_purple_ending: StrictPurpleEnding
+    strict_cyan_ending: StrictCyanEnding
     victory_condition: VictoryCondition
     trap_percentage: TrapPercentage
@@ -97,6 +97,12 @@ def create_regions(world: "Lingo2World"):
             else:
                 connection_name = f"{connection_name} (via panel {panel.name})"
 
+        if connection.HasField("purple_ending") and connection.purple_ending and world.options.strict_purple_ending:
+            world.player_logic.add_solution_reqs(reqs, "abcdefghijklmnopqrstuvwxyz")
+
+        if connection.HasField("cyan_ending") and connection.cyan_ending and world.options.strict_cyan_ending:
+            world.player_logic.add_solution_reqs(reqs, "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz")
+
         reqs.simplify()
         reqs.remove_room(from_region)
 
@@ -7,6 +7,7 @@ connections {
   from_room: "Main Area"
   to_room: "Ending"
   door { name: "Ending Door" }
+  cyan_ending: true
 }
 connections {
   from_room: "Main Area"
@@ -7,6 +7,7 @@ connections {
   from_room: "Temple"
   to_room: "Ending"
   door { name: "Ending" }
+  purple_ending: true
 }
 connections {
   from_room: "Temple"
@@ -109,6 +109,8 @@ message Connection {
   }
 
   optional bool roof_access = 7;
+  optional bool purple_ending = 8;
+  optional bool cyan_ending = 9;
 }
 
 message Door {
@@ -70,6 +70,14 @@ message HumanConnection {
   // This means that the connection intentionally skips the target object's
   // required door.
   optional bool bypass_target_door = 8;
+
+  // This means that the connection should additionally require all purple
+  // letters when the Strict Purple Ending option is on.
+  optional bool purple_ending = 9;
+
+  // This means that the connection should additionally require all cyan letters
+  // when the Strict Cyan Ending option is on.
+  optional bool cyan_ending = 10;
 }
 
 message HumanConnections {
@@ -473,6 +473,16 @@ class DataPacker {
       r_connection.set_roof_access(human_connection.roof_access());
     }
 
+    if (human_connection.has_purple_ending()) {
+      f_connection.set_purple_ending(human_connection.purple_ending());
+      r_connection.set_purple_ending(human_connection.purple_ending());
+    }
+
+    if (human_connection.has_cyan_ending()) {
+      f_connection.set_cyan_ending(human_connection.cyan_ending());
+      r_connection.set_cyan_ending(human_connection.cyan_ending());
+    }
+
     container_.AddConnection(f_connection);
     if (!human_connection.oneway()) {
       container_.AddConnection(r_connection);