1 files changed, 32 insertions, 3 deletions

@@ -4,6 +4,7 @@ const kALL_LETTERS = "abcdefghjiklmnopqrstuvwxyz"
 
 var letters_saved = {}
 var letters_in_keyholders = []
+var letters_blocked = []
 var letters_dynamic = {}
 var keyholder_state = {}
 
@@ -17,6 +18,7 @@ func _init():
 func reset():
         letters_saved.clear()
         letters_in_keyholders.clear()
+        letters_blocked.clear()
         letters_dynamic.clear()
         keyholder_state.clear()
 
@@ -79,17 +81,28 @@ func save():
 func update_unlocks():
         unlocks.resetKeys()
 
+        var has_doubles = false
+
         for k in kALL_LETTERS:
                 var level = 0
 
                 if not letters_in_keyholders.has(k):
                         level = letters_saved.get(k, 0) + letters_dynamic.get(k, 0)
 
-                if level > 2:
+                if level >= 2:
                         level = 2
+                        has_doubles = true
+
+                if letters_blocked.has(k):
+                        level = 0
 
                 unlocks.unlockKey(k, level)
 
+        if has_doubles and unlocks.data["double_letters"] != "unlocked":
+                var ap = global.get_node("Archipelago")
+                if ap.cyan_door_behavior == ap.kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER:
+                        unlocks.setData("double_letters", "unlocked")
+
 
 func collect_local_letter(key, level):
         if level < 0 or level > 2 or level < letters_saved.get(key, 0):
@@ -97,6 +110,9 @@ func collect_local_letter(key, level):
 
         letters_saved[key] = level
 
+        if letters_blocked.has(key):
+                letters_blocked.erase(key)
+
         update_unlocks()
         save()
 
@@ -107,6 +123,9 @@ func collect_remote_letter(key, level):
 
         letters_dynamic[key] = level
 
+        if letters_blocked.has(key):
+                letters_blocked.erase(key)
+
         update_unlocks()
         save()
 
@@ -140,6 +159,13 @@ func remove_from_keyholder(key, map, kh_path):
         save()
 
 
+func block_letter(key):
+        if not letters_blocked.has(key):
+                letters_blocked.append(key)
+
+        update_unlocks()
+
+
 func load_keyholders(map):
         if keyholder_state.has(map):
                 var khs = keyholder_state[map]
@@ -152,9 +178,11 @@ func load_keyholders(map):
 
 
 func reset_keyholders():
-        if letters_in_keyholders.is_empty():
+        if letters_in_keyholders.is_empty() and letters_blocked.is_empty():
                 return false
 
+        var cleared_anything = not letters_in_keyholders.is_empty() or not letters_blocked.is_empty()
+
         if keyholder_state.has(global.map):
                 for path in keyholder_state[global.map]:
                         get_tree().get_root().get_node("scene").get_node(path).setFromAp(
@@ -163,8 +191,9 @@ func reset_keyholders():
 
         keyholder_state.clear()
         letters_in_keyholders.clear()
+        letters_blocked.clear()
 
         update_unlocks()
         save()
 
-        return true
+        return cleared_anything