Merge branch 'main' into sunwarps

1 files changed, 55 insertions, 3 deletions

@@ -15,8 +15,10 @@ var ap_user = ""
 var ap_pass = ""
 var confusify_world = false
 var enable_multiplayer = false
+var track_player = false
+var connection_history = []
 
-const my_version = "sunwarps-beta2"
+const my_version = "2.2.0"
 const ap_version = {"major": 0, "minor": 4, "build": 5, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
@@ -110,6 +112,7 @@ var _item_name_to_id = {}  # LINGO only
 var _location_name_to_id = {}  # LINGO only
 
 var _remote_version = {"major": 0, "minor": 0, "build": 0}
+var _gen_version = {"major": 0, "minor": 0, "build": 0}
 
 # TODO: caching per MW/slot, reset between connections
 var _authenticated = false
@@ -151,6 +154,7 @@ var _puzzle_skips = 0
 var _cached_slowness = 0
 var _cached_iceland = 0
 var _cached_atbash = 0
+var _geronimo_skip = false
 
 signal could_not_connect
 signal connect_status
@@ -180,6 +184,10 @@ func _init():
                         confusify_world = data[4]
                 if data.size() > 5:
                         enable_multiplayer = data[5]
+                if data.size() > 6:
+                        track_player = data[6]
+                if data.size() > 7:
+                        connection_history = data[7]
 
                 processDatapackages()
 
@@ -249,6 +257,7 @@ func _on_data():
                 if cmd == "RoomInfo":
                         _seed = message["seed_name"]
                         _remote_version = message["version"]
+                        _gen_version = message["generator_version"]
 
                         var needed_games = []
                         for game in message["datapackage_checksums"].keys():
@@ -332,6 +341,11 @@ func _on_data():
                         if _slot_data.has("sunwarp_permutation"):
                                 _sunwarp_mapping = _slot_data["sunwarp_permutation"]
 
+                        if track_player:
+                                setValue("PlayerPos", {"x": 0, "z": 0})
+                        else:
+                                setValue("PlayerPos", null)
+
                         _puzzle_skips = 0
 
                         _localdata_file = "user://archipelago_data/%s_%d" % [_seed, _slot]
@@ -364,6 +378,11 @@ func _on_data():
                                 else:
                                         _cached_atbash = 0
 
+                                if localdata.size() > 5:
+                                        _geronimo_skip = localdata[5]
+                                else:
+                                        _geronimo_skip = false
+
                         requestSync()
 
                         emit_signal("client_connected")
@@ -499,7 +518,16 @@ func saveSettings():
         var file = File.new()
         file.open("user://settings/archipelago", File.WRITE)
 
-        var data = [ap_server, ap_user, ap_pass, _datapackages, confusify_world, enable_multiplayer]
+        var data = [
+                ap_server,
+                ap_user,
+                ap_pass,
+                _datapackages,
+                confusify_world,
+                enable_multiplayer,
+                track_player,
+                connection_history
+        ]
         file.store_var(data, true)
         file.close()
 
@@ -523,7 +551,8 @@ func saveLocaldata():
                 _puzzle_skips,
                 effects_node.slowness_remaining,
                 effects_node.iceland_remaining,
-                effects_node.atbash_remaining
+                effects_node.atbash_remaining,
+                _geronimo_skip
         ]
         file.store_var(data, true)
         file.close()
@@ -777,6 +806,15 @@ func usePuzzleSkip():
         saveLocaldata()
 
 
+func geronimo():
+        if !_geronimo_skip:
+                messages.showMessage("Geronimo! You found a puzzle skip.")
+
+                _puzzle_skips += 1
+                _geronimo_skip = true
+                saveLocaldata()
+
+
 func colorForItemType(flags):
         var int_flags = int(flags)
         if int_flags & 1:  # progression
@@ -787,3 +825,17 @@ func colorForItemType(flags):
                 return "#d63a22"
         else:  # filler
                 return "#14de9e"
+
+
+func compareVersion(lhs, rhs):
+        if lhs["major"] == rhs["major"]:
+                if lhs["minor"] == rhs["minor"]:
+                        return lhs["build"] < rhs["build"]
+                else:
+                        return lhs["minor"] < rhs["minor"]
+        else:
+                return lhs["major"] < rhs["major"]
+
+
+func wasGeneratedBeforeVersion(major, minor, build):
+        return compareVersion(_gen_version, {"major": major, "minor": minor, "build": build})