Merge branch 'main' into sunwarps

5 files changed, 185 insertions, 17 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})
@@ -25,6 +25,11 @@ func _load():
         var apclient = global.get_node("Archipelago")
         var panels_parent = self.get_node("Panels")
 
+        var date = Time.get_date_dict_from_system()
+        var april_fools = false
+        if date["month"] == 4 && date["day"] == 1:
+                april_fools = true
+
         # Add a wall-blocked raycast to the player.
         var wallcast = RayCast.new()
         wallcast.name = "wallcast"
@@ -64,7 +69,7 @@ func _load():
         wanderer_entrance.rotation = Vector3(0, -PI / 2, 0)
         wanderer_entrance.scale = Vector3(1, 1.5, 1)
         wanderer_entrance.set_script(door_script)
-        wanderer_entrance.panels.append("../../../Panels/Tower Room/Panel_wanderlust_1234567890")
+        wanderer_entrance.panels = ["../../../Panels/Tower Room/Panel_wanderlust_1234567890"]
         get_node("Doors/Tower Room Area Doors").add_child(wanderer_entrance)
 
         var wanderer_achieve = get_node("Panels/Tower Room/Panel_1234567890_wanderlust")
@@ -91,18 +96,19 @@ func _load():
 
         wanderer_achieve.translation = Vector3(-51, -33, 35)  # way under the map
 
-        # Turn THE COLORFUL into a cdp.
-        var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful")
         var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn")
-        var colorful_cdp = cdp_auto_scene.instance()
-        colorful_cdp.name = "CountdownPanel_colorful"
-        colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful"
-        colorful_cdp.panels = "../../Panels/Doorways Room"
-        colorful_cdp.translation = real_colorful.translation
-        colorful_cdp.rotation = real_colorful.rotation
-        get_node("CountdownPanels").add_child(colorful_cdp)
-        real_colorful.translation = Vector3(-51, -35, 35)  # way under the map
-        get_node("Doors/Doorway Room Doors/Door_gray2").queue_free()
+        if !apclient.wasGeneratedBeforeVersion(0, 4, 5):
+                # Turn THE COLORFUL into a cdp.
+                var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful")
+                var colorful_cdp = cdp_auto_scene.instance()
+                colorful_cdp.name = "CountdownPanel_colorful"
+                colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful"
+                colorful_cdp.panels = "../../Panels/Doorways Room"
+                colorful_cdp.translation = real_colorful.translation
+                colorful_cdp.rotation = real_colorful.rotation
+                get_node("CountdownPanels").add_child(colorful_cdp)
+                real_colorful.translation = Vector3(-51, -35, 35)  # way under the map
+                get_node("Doors/Doorway Room Doors/Door_gray2").queue_free()
 
         # Set up The Master to be variable.
         var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16")
@@ -420,6 +426,8 @@ func _load():
                         if not classes.has(painting):
                                 var i = rng.randi_range(0, all_paintings.size() - 1)
                                 var chosen = all_paintings[i]
+                                if april_fools:
+                                        chosen = "bg_notnerb"
                                 classes[painting] = chosen
                                 all_paintings.remove(i)
 
@@ -444,6 +452,9 @@ func _load():
                         var j = rng.randi_range(0, all_paintings.size() - 1)
                         remaining.append(all_paintings[j])
                         all_paintings.remove(j)
+                
+                if april_fools:
+                        remaining = ["bg_notnerb"]
 
                 for painting in gamedata.paintings.keys():
                         if randomized.has(painting):
@@ -451,6 +462,26 @@ func _load():
 
                         var chosen_painting = remaining[rng.randi_range(0, remaining.size() - 1)]
                         instantiate_painting(painting, chosen_painting)
+                
+                # Replace the roof of The Artistic.
+                var artistic_paintings = [
+                        ["smile_painting_9", -49.5, 44.5],
+                        ["cherry_painting3", -38.5, 44.5],
+                        ["boxes_painting2", -38.5, 55.5],
+                        ["panda_painting_3", -49.5, 55.5]
+                ]
+                for painting in artistic_paintings:
+                        var painting_node = get_node("AP_Paintings").get_node(painting[0]).get_node("GridMap")
+                        var small_mesh_library = painting_node.mesh_library
+
+                        for x in range(0,10):
+                                for y in range(0,10):
+                                        var cellitem = painting_node.get_cell_item(-5 + x, 1+y, 0)
+                                        var meshitem = small_mesh_library.get_item_name(cellitem)
+                                        if meshitem.begins_with("Tiny"):
+                                                meshitem = meshitem.substr(4)
+                                        set_gridmap_tile(painting[1]+9-y, 8.5, painting[2]+x, meshitem)
+
 
         # We need to make some changes to the Art Gallery. The player should always
         # have access to the backroom, but they shouldn't have access to ORDER until
@@ -644,6 +675,17 @@ func _load():
                 var multiplayer_node = apclient.SCRIPT_multiplayer.new()
                 multiplayer_node.ghost_mode = true
                 add_child(multiplayer_node)
+        
+        # Hook up Geronimo handler.
+        $player.connect("player_jumped", apclient, "geronimo")
+
+        if april_fools:
+                # Change the appearance of every painting.
+                var notnerb_painting = load("res://nodes/paintings/bg_notnerb.tscn").instance()
+                for child in $Decorations/Paintings.get_children():
+                        if child.get_node_or_null("GridMap") != null:
+                                child.get_node("GridMap").queue_free()
+                                child.add_child(notnerb_painting.get_node("GridMap").duplicate(true))
 
         # Hook up the scene to be able to handle connection failures.
         apclient.connect("could_not_connect", self, "archipelago_disconnected")
@@ -727,8 +769,10 @@ func set_gridmap_tile(x, y, z, tile):
         var gridmap = self.get_node("GridMap")
         var mesh_library = gridmap.mesh_library
         var mapvec = gridmap.world_to_map(gridmap.to_local(Vector3(x, y, z)))
+        var cellitem = mesh_library.find_item_by_name(tile)
 
-        gridmap.set_cell_item(mapvec.x, mapvec.y, mapvec.z, mesh_library.find_item_by_name(tile))
+        if cellitem != GridMap.INVALID_CELL_ITEM:
+                gridmap.set_cell_item(mapvec.x, mapvec.y, mapvec.z, cellitem)
 
 
 func clear_gridmap_tile(x, y, z):
@@ -1,6 +1,34 @@
 extends "res://scripts/player.gd"
 
 
+var _oldpos = Vector3(0, -200, 0)
+
+
+func _ready():
+        _oldpos = translation
+        _oldpos.y = 0
+
+        var apclient = global.get_node("Archipelago")
+        if apclient.track_player:
+                var tracking_timer = Timer.new()
+                tracking_timer.name = "TrackingTimer"
+                tracking_timer.wait_time = 5.0
+                add_child(tracking_timer)
+                tracking_timer.connect("timeout", self, "_tick_tracking")
+                tracking_timer.start()
+
+
+func _tick_tracking():
+        var newpos = translation
+        newpos.y = 0
+        
+        if newpos != _oldpos && newpos.distance_to(_oldpos) > 10:
+                _oldpos = newpos
+
+                var apclient = global.get_node("Archipelago")
+                apclient.setValue("PlayerPos", {"x": int(_oldpos.x), "z": int(_oldpos.z)})
+
+
 func _solving():
         ._solving()
 
@@ -14,6 +14,7 @@ func _connect_pressed():
         apclient.ap_pass = self.get_parent().get_node("password_box").text
         apclient.confusify_world = self.get_parent().get_node("confusing_box").pressed
         apclient.enable_multiplayer = self.get_parent().get_node("multiplayer_box").pressed
+        apclient.track_player = self.get_parent().get_node("position_box").pressed
         apclient.saveSettings()
 
         apclient.connectToServer()
@@ -2,6 +2,12 @@ extends Spatial
 
 
 func _ready():
+        # Some helpful logging.
+        if Steam.isSubscribed():
+                global._print("Provisioning successful! Build ID: %d" % Steam.getAppBuildId())
+        else:
+                global._print("Provisioning failed.")
+
         # Undo the load screen removing our cursor
         get_tree().get_root().set_disable_input(false)
         Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
@@ -62,6 +68,20 @@ func _ready():
         self.get_node("Panel/password_box").text = apclient.ap_pass
         self.get_node("Panel/confusing_box").pressed = apclient.confusify_world
         self.get_node("Panel/multiplayer_box").pressed = apclient.enable_multiplayer
+        self.get_node("Panel/position_box").pressed = apclient.track_player
+
+        var history_box = get_node("Panel/connection_history")
+        if apclient.connection_history.empty():
+                history_box.disabled = true
+        else:
+                history_box.disabled = false
+
+                var i = 0
+                for details in apclient.connection_history:
+                        history_box.get_popup().add_item("%s (%s)" % [details[1], details[0]], i)
+                        i += 1
+
+        history_box.get_popup().connect("id_pressed", self, "historySelected")
 
         # Show client version.
         self.get_node("Panel/title").text = "ARCHIPELAGO (%s)" % apclient.my_version
@@ -105,10 +125,24 @@ func connectionStatus(message):
 func connectionSuccessful():
         var apclient = global.get_node("Archipelago")
 
+        # Save connection details
+        var connection_details = [apclient.ap_server, apclient.ap_user, apclient.ap_pass]
+        if apclient.connection_history.has(connection_details):
+                apclient.connection_history.erase(connection_details)
+        apclient.connection_history.push_front(connection_details)
+        if apclient.connection_history.size() > 10:
+                apclient.connection_history.resize(10)
+        apclient.saveSettings()
+
         # Switch to LL1
         Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
-        global.map = "level1"
         global.save_file = apclient.getSaveFileName()
+
+        if Directory.new().file_exists("user://level1/%s.save" % global.save_file):
+                global.map = "level1"
+        else:
+                global.map = "level1_stable"
+
         var _discard = get_tree().change_scene("res://scenes/load_screen.tscn")
 
 
@@ -121,3 +155,12 @@ func connectionUnsuccessful(error_message):
         popup.popup_exclusive = true
         popup.get_ok().visible = true
         popup.popup_centered()
+
+
+func historySelected(index):
+        var apclient = global.get_node("Archipelago")
+        var details = apclient.connection_history[index]
+
+        self.get_node("Panel/server_box").text = details[0]
+        self.get_node("Panel/player_box").text = details[1]
+        self.get_node("Panel/password_box").text = details[2]