Merge branch 'subway'

1 files changed, 29 insertions, 2 deletions

@@ -116,6 +116,7 @@ var _cached_slowness = 0
 var _cached_iceland = 0
 var _cached_atbash = 0
 var _geronimo_skip = false
+var _checked_paintings = []
 
 signal could_not_connect
 signal connect_status
@@ -366,6 +367,18 @@ func _on_data():
 
                         requestSync()
 
+                        sendMessage(
+                                [
+                                        {
+                                                "cmd": "Set",
+                                                "key": "Lingo_%d_Paintings" % [_slot],
+                                                "default": [],
+                                                "want_reply": true,
+                                                "operations": [{"operation": "default", "value": []}]
+                                        }
+                                ]
+                        )
+
                         emit_signal("client_connected")
 
                 elif cmd == "ConnectionRefused":
@@ -483,6 +496,10 @@ func _on_data():
                                 # Return the player home.
                                 get_tree().get_root().get_node("Spatial/player/pause_menu")._reload()
 
+                elif cmd == "SetReply":
+                        if message.has("key") and message["key"] == ("Lingo_%d_Paintings" % _slot):
+                                _checked_paintings = message["value"]
+
 
 func _process(_delta):
         if _should_process:
@@ -641,13 +658,14 @@ func sendLocation(loc_id):
                 _held_locations.append(loc_id)
 
 
-func setValue(key, value):
+func setValue(key, value, operation = "replace"):
         sendMessage(
                 [
                         {
                                 "cmd": "Set",
                                 "key": "Lingo_%d_%s" % [_slot, key],
-                                "operations": [{"operation": "replace", "value": value}]
+                                "want_reply": false,
+                                "operations": [{"operation": operation, "value": value}]
                         }
                 ]
         )
@@ -803,6 +821,15 @@ func geronimo():
                 saveLocaldata()
 
 
+func checkPainting(painting_id):
+        if _checked_paintings.has(painting_id):
+                return
+
+        _checked_paintings.append(painting_id)
+
+        setValue("Paintings", [painting_id], "add")
+
+
 func colorForItemType(flags):
         var int_flags = int(flags)
         if int_flags & 1:  # progression