1 files changed, 19 insertions, 2 deletions

@@ -192,6 +192,7 @@ class AccessRequirements:
 class PlayerLocation(NamedTuple):
     code: int | None
     reqs: AccessRequirements
+    is_letter: bool = False
 
 
 class LetterBehavior(IntEnum):
@@ -222,6 +223,7 @@ class Lingo2PlayerLogic:
     double_letter_amount: dict[str, int]
     goal_room_id: int
     rte_mapping: list[int]
+    custom_mint_ending: str | None
 
     def __init__(self, world: "Lingo2World"):
         self.world = world
@@ -236,6 +238,7 @@ class Lingo2PlayerLogic:
         self.real_items = list()
         self.starting_items = list()
         self.double_letter_amount = dict()
+        self.custom_mint_ending = None
 
         def should_shuffle_map(game_map) -> bool | set[int]:
             if world.options.daedalus_only:
@@ -295,6 +298,18 @@ class Lingo2PlayerLogic:
                     self.shuffled_doors.update(set(door.id for door in world.static_logic.objects.doors
                                                    if door.map_id == game_map.id and door.daedalus_only_allow))
 
+        if (world.options.restrict_letter_placements
+                and world.options.shuffle_letters == ShuffleLetters.option_progressive
+                and (world.options.shuffle_doors or world.options.shuffle_symbols)):
+            raise OptionError(f"When Restrict Letter Placements is enabled and Shuffle Letters is set to Progressive, "
+                              f"both Shuffle Doors and Shuffle Symbols must be disabled (Player {world.player}).")
+
+        if world.options.custom_mint_ending.value != "":
+            self.custom_mint_ending = ''.join(filter(str.isalpha, world.options.custom_mint_ending.value)).lower()
+
+            if len(self.custom_mint_ending) > 52:
+                raise OptionError(f"Custom Mint Ending should not be greater than 52 letters (Player {world.player}).")
+
         maximum_masteries = 13 + len(world.options.enable_gift_maps.value)
         if world.options.enable_icarus:
             maximum_masteries += 1
@@ -406,9 +421,11 @@ class Lingo2PlayerLogic:
             if not self.should_shuffle_room(letter.room_id):
                 continue
 
-            self.locations_by_room.setdefault(letter.room_id, []).append(PlayerLocation(letter.ap_id,
-                                                                                        AccessRequirements()))
             behavior = self.get_letter_behavior(letter.key, letter.level2)
+
+            self.locations_by_room.setdefault(letter.room_id, []).append(
+                PlayerLocation(letter.ap_id, AccessRequirements(), behavior == LetterBehavior.ITEM))
+
             if behavior == LetterBehavior.VANILLA:
                 if not world.for_tracker:
                     letter_name = f"{letter.key.upper()}{'2' if letter.level2 else '1'}"