Letter requirements in apworld

Also fixed or logic so everything actually works now.

1 files changed, 8 insertions, 3 deletions

@@ -15,10 +15,15 @@ def lingo2_can_satisfy_requirements(state: CollectionState, reqs: AccessRequirem
     if not all(state.can_reach_region(region_name, world.player) for region_name in reqs.rooms):
         return False
 
-    # TODO: symbols, letters
+    # TODO: symbols
 
-    for disjunction in reqs.or_logic:
-        if not any(lingo2_can_satisfy_requirements(state, sub_reqs, world) for sub_reqs in disjunction):
+    for letter_key, letter_level in reqs.letters.items():
+        if not state.has(letter_key, world.player, letter_level):
+            return False
+
+    if len(reqs.or_logic) > 0:
+        if not all(any(lingo2_can_satisfy_requirements(state, sub_reqs, world) for sub_reqs in subjunction)
+                   for subjunction in reqs.or_logic):
             return False
 
     return True