1 files changed, 33 insertions, 3 deletions

@@ -1,6 +1,6 @@
 extends Node
 
-const MOD_VERSION = 0
+const MOD_VERSION = 7
 
 var SCRIPT_client
 var SCRIPT_keyboard
@@ -12,6 +12,7 @@ var ap_server = ""
 var ap_user = ""
 var ap_pass = ""
 var connection_history = []
+var show_compass = false
 
 var client
 var keyboard
@@ -41,13 +42,17 @@ const kCYAN_DOOR_BEHAVIOR_H2 = 0
 const kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER = 1
 const kCYAN_DOOR_BEHAVIOR_ITEM = 2
 
+var apworld_version = [0, 0]
 var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var keyholder_sanity = false
 var shuffle_control_center_colors = false
 var shuffle_doors = false
+var shuffle_gallery_paintings = false
 var shuffle_letters = kSHUFFLE_LETTERS_VANILLA
 var shuffle_symbols = false
+var strict_cyan_ending = false
+var strict_purple_ending = false
 var victory_condition = -1
 
 signal could_not_connect
@@ -78,6 +83,9 @@ func _init():
                 if data.size() > 3:
                         connection_history = data[3]
 
+                if data.size() > 4:
+                        show_compass = data[4]
+
 
 func _ready():
         client = SCRIPT_client.new()
@@ -106,6 +114,7 @@ func saveSettings():
                 ap_user,
                 ap_pass,
                 connection_history,
+                show_compass,
         ]
         file.store_var(data, true)
         file.close()
@@ -213,6 +222,9 @@ func _process_item(item, index, from, flags, amount):
                                 "Received [color=%s]%s[/color] from %s" % [item_color, full_item_name, player_name]
                         )
 
+                if gamedata.anti_trap_ids.has(item):
+                        keyboard.block_letter(gamedata.anti_trap_ids[item])
+
                 global._print(message)
 
                 global.get_node("Messages").showMessage(message)
@@ -307,6 +319,10 @@ func parse_printjson_for_textclient(message):
 func _process_location_scout(item_id, location_id, player, flags):
         _location_scouts[location_id] = {"item": item_id, "player": player, "flags": flags}
 
+        if player == client._slot and flags & 4 != 0:
+                # This is a trap for us, so let's not display it.
+                return
+
         var gamedata = global.get_node("Gamedata")
         var map_id = gamedata.map_id_by_name.get(global.map)
 
@@ -327,8 +343,8 @@ func _process_location_scout(item_id, location_id, player, flags):
                                 collectable.setScoutedText(item_name)
 
 
-func _client_could_not_connect():
-        emit_signal("could_not_connect")
+func _client_could_not_connect(message):
+        emit_signal("could_not_connect", message)
 
 
 func _client_connect_status(message):
@@ -361,10 +377,16 @@ func _client_connected(slot_data):
         keyholder_sanity = bool(slot_data.get("keyholder_sanity", false))
         shuffle_control_center_colors = bool(slot_data.get("shuffle_control_center_colors", false))
         shuffle_doors = bool(slot_data.get("shuffle_doors", false))
+        shuffle_gallery_paintings = bool(slot_data.get("shuffle_gallery_paintings", false))
         shuffle_letters = int(slot_data.get("shuffle_letters", 0))
         shuffle_symbols = bool(slot_data.get("shuffle_symbols", false))
+        strict_cyan_ending = bool(slot_data.get("strict_cyan_ending", false))
+        strict_purple_ending = bool(slot_data.get("strict_purple_ending", false))
         victory_condition = int(slot_data.get("victory_condition", 0))
 
+        if slot_data.has("version"):
+                apworld_version = [int(slot_data["version"][0]), int(slot_data["version"][1])]
+
         # Set up item locks.
         _item_locks = {}
 
@@ -399,6 +421,11 @@ func _client_connected(slot_data):
                                 for door in door_group.get_doors():
                                         _item_locks[door] = [door_group.get_ap_id(), 1]
 
+        if shuffle_gallery_paintings:
+                for door in gamedata.objects.get_doors():
+                        if door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING:
+                                _item_locks[door.get_id()] = [door.get_ap_id(), 1]
+
         if cyan_door_behavior == kCYAN_DOOR_BEHAVIOR_ITEM:
                 for door_group in gamedata.objects.get_door_groups():
                         if door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.CYAN_DOORS:
@@ -511,4 +538,7 @@ func _process_key_item(key, level):
                 _held_letters[key] = max(_held_letters.get(key, 0), level)
                 return
 
+        if shuffle_letters == kSHUFFLE_LETTERS_ITEM_CYAN:
+                level += 1
+
         keyboard.collect_remote_letter(key, level)