Merge branch 'main' into panels

7 files changed, 190 insertions, 109 deletions

@@ -18,8 +18,8 @@ var enable_multiplayer = false
 var track_player = false
 var connection_history = []
 
-const my_version = "3.0.1"
-const ap_version = {"major": 0, "minor": 4, "build": 6, "class": "Version"}
+const my_version = "4.0.2"
+const ap_version = {"major": 0, "minor": 5, "build": 0, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
 ]
@@ -56,6 +56,7 @@ const kREARRANGE_PANELS = 1
 const kCLASSIFICATION_LOCAL_NORMAL = 1
 const kCLASSIFICATION_LOCAL_REDUCED = 2
 const kCLASSIFICATION_LOCAL_INSANITY = 4
+const kCLASSIFICATION_LOCAL_SMALL_SPHERE_ONE = 8
 
 const kCLASSIFICATION_REMOTE_NORMAL = 0
 const kCLASSIFICATION_REMOTE_REDUCED = 1
@@ -89,6 +90,7 @@ var _team = 0
 var _slot = 0
 var _players = []
 var _player_name_by_slot = {}
+var _game_by_player = {}
 var _checked_locations = []
 var _slot_data = {}
 var _paintings_mapping = {}
@@ -125,6 +127,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
@@ -142,6 +145,10 @@ func _init():
                 var data = file.get_var(true)
                 file.close()
 
+                if typeof(data) != TYPE_ARRAY:
+                        global._print("AP settings file is corrupted")
+                        data = []
+
                 if data.size() > 0:
                         ap_server = data[0]
                 if data.size() > 1:
@@ -266,6 +273,7 @@ func _on_data():
 
                         for player in _players:
                                 _player_name_by_slot[player["slot"]] = player["alias"]
+                                _game_by_player[player["slot"]] = message["slot_info"][str(player["slot"])]["game"]
 
                         _death_link = _slot_data.has("death_link") and _slot_data["death_link"]
                         if _death_link:
@@ -275,6 +283,7 @@ func _on_data():
                                 _victory_condition = _slot_data["victory_condition"]
                         if _slot_data.has("shuffle_colors"):
                                 _color_shuffle = _slot_data["shuffle_colors"]
+
                         if _slot_data.has("shuffle_doors"):
                                 if _slot_data.has("group_doors"):
                                         _door_shuffle = (_slot_data["shuffle_doors"] == 2)
@@ -282,6 +291,10 @@ func _on_data():
                                 else:
                                         _door_shuffle = (_slot_data["shuffle_doors"] > 0)
                                         _panel_door_shuffle = false
+                        else:
+                                _door_shuffle = false
+                                _panel_door_shuffle = false
+
                         if _slot_data.has("shuffle_paintings"):
                                 _painting_shuffle = _slot_data["shuffle_paintings"]
                         if _slot_data.has("shuffle_panels"):
@@ -298,6 +311,7 @@ func _on_data():
                                 _mastery_achievements = _slot_data["mastery_achievements"]
                         if _slot_data.has("level_2_requirement"):
                                 _level_2_requirement = _slot_data["level_2_requirement"]
+
                         if _slot_data.has("location_checks"):
                                 if _slot_data["location_checks"] == kCLASSIFICATION_REMOTE_NORMAL:
                                         _location_classification_bit = kCLASSIFICATION_LOCAL_NORMAL
@@ -305,8 +319,13 @@ func _on_data():
                                         _location_classification_bit = kCLASSIFICATION_LOCAL_REDUCED
                                 elif _slot_data["location_checks"] == kCLASSIFICATION_REMOTE_INSANITY:
                                         _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY
+                        else:
+                                _location_classification_bit = kCLASSIFICATION_LOCAL_NORMAL
+
                         if _slot_data.has("early_color_hallways"):
                                 _early_color_hallways = _slot_data["early_color_hallways"]
+                        else:
+                                _early_color_hallways = false
                         if _slot_data.has("enable_pilgrimage"):
                                 _pilgrimage_enabled = _slot_data["enable_pilgrimage"]
                         else:
@@ -327,12 +346,24 @@ func _on_data():
                         if _slot_data.has("sunwarp_permutation"):
                                 _sunwarp_mapping = _slot_data["sunwarp_permutation"]
 
+                        if (
+                                _location_classification_bit != kCLASSIFICATION_LOCAL_INSANITY
+                                and _door_shuffle
+                                and not _early_color_hallways
+                        ):
+                                _location_classification_bit += kCLASSIFICATION_LOCAL_SMALL_SPHERE_ONE
+
                         if track_player:
                                 setValue("PlayerPos", {"x": 0, "z": 0})
                         else:
                                 setValue("PlayerPos", null)
 
                         _puzzle_skips = 0
+                        _last_new_item = -1
+                        _cached_slowness = 0
+                        _cached_iceland = 0
+                        _cached_atbash = 0
+                        _geronimo_skip = false
 
                         _localdata_file = "user://archipelago_data/%s_%d" % [_seed, _slot]
                         var ap_file = File.new()
@@ -341,36 +372,42 @@ func _on_data():
                                 var localdata = ap_file.get_var(true)
                                 ap_file.close()
 
+                                if typeof(localdata) != TYPE_ARRAY:
+                                        global._print("AP localdata file is corrupted")
+                                        localdata = []
+
                                 if localdata.size() > 0:
                                         _last_new_item = localdata[0]
-                                else:
-                                        _last_new_item = -1
 
                                 if localdata.size() > 1:
                                         _puzzle_skips = localdata[1]
 
                                 if localdata.size() > 2:
                                         _cached_slowness = localdata[2]
-                                else:
-                                        _cached_slowness = 0
 
                                 if localdata.size() > 3:
                                         _cached_iceland = localdata[3]
-                                else:
-                                        _cached_iceland = 0
 
                                 if localdata.size() > 4:
                                         _cached_atbash = localdata[4]
-                                else:
-                                        _cached_atbash = 0
 
                                 if localdata.size() > 5:
                                         _geronimo_skip = localdata[5]
-                                else:
-                                        _geronimo_skip = false
 
                         requestSync()
 
+                        sendMessage(
+                                [
+                                        {
+                                                "cmd": "Set",
+                                                "key": "Lingo_%d_Paintings" % [_slot],
+                                                "default": [],
+                                                "want_reply": true,
+                                                "operations": [{"operation": "default", "value": []}]
+                                        }
+                                ]
+                        )
+
                         emit_signal("client_connected")
 
                 elif cmd == "ConnectionRefused":
@@ -438,12 +475,14 @@ func _on_data():
                                 continue
 
                         var item_name = "Unknown"
-                        if _item_id_to_name.has(message["item"]["item"]):
-                                item_name = _item_id_to_name[message["item"]["item"]]
+                        var item_player_game = _game_by_player[message["receiving"]]
+                        if _item_id_to_name[item_player_game].has(message["item"]["item"]):
+                                item_name = _item_id_to_name[item_player_game][message["item"]["item"]]
 
                         var location_name = "Unknown"
-                        if _location_id_to_name.has(message["item"]["location"]):
-                                location_name = _location_id_to_name[message["item"]["location"]]
+                        var location_player_game = _game_by_player[message["item"]["player"]]
+                        if _location_id_to_name[location_player_game].has(message["item"]["location"]):
+                                location_name = _location_id_to_name[location_player_game][message["item"]["location"]]
 
                         var player_name = "Unknown"
                         if _player_name_by_slot.has(message["receiving"]):
@@ -486,6 +525,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:
@@ -593,12 +636,16 @@ func requestDatapackages(games):
 func processDatapackages():
         _item_id_to_name = {}
         _location_id_to_name = {}
-        for package in _datapackages.values():
+        for game in _datapackages.keys():
+                var package = _datapackages[game]
+
+                _item_id_to_name[game] = {}
                 for name in package["item_name_to_id"].keys():
-                        _item_id_to_name[package["item_name_to_id"][name]] = name
+                        _item_id_to_name[game][package["item_name_to_id"][name]] = name
 
+                _location_id_to_name[game] = {}
                 for name in package["location_name_to_id"].keys():
-                        _location_id_to_name[package["location_name_to_id"][name]] = name
+                        _location_id_to_name[game][package["location_name_to_id"][name]] = name
 
         if _datapackages.has("Lingo"):
                 _item_name_to_id = _datapackages["Lingo"]["item_name_to_id"]
@@ -640,13 +687,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}]
                         }
                 ]
         )
@@ -687,8 +735,8 @@ func processItem(item, index, from, flags):
 
         var gamedata = $Gamedata
         var item_name = "Unknown"
-        if _item_id_to_name.has(item):
-                item_name = _item_id_to_name[item]
+        if _item_id_to_name["Lingo"].has(item):
+                item_name = _item_id_to_name["Lingo"][item]
 
         if gamedata.door_ids_by_item_id.has(int(item)):
                 var doorsNode = get_tree().get_root().get_node("Spatial/Doors")
@@ -751,8 +799,8 @@ func processItem(item, index, from, flags):
                         item_name += " (%s)" % prognames[item_name][_progressive_progress[int(item)]]
                         _progressive_progress[int(item)] += 1
 
-        if _color_shuffle and color_items.has(_item_id_to_name[item]):
-                var lcol = _item_id_to_name[item].to_lower()
+        if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][item]):
+                var lcol = _item_id_to_name["Lingo"][item].to_lower()
                 if not _has_colors.has(lcol):
                         _has_colors.append(lcol)
                         emit_signal("evaluate_solvability")
@@ -823,6 +871,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
@@ -6,7 +6,7 @@ const EXCLUDED_PAINTINGS = [
         "ascension_nw.tscn",
         "ascension_se.tscn",
         "ascension_sw.tscn",
-        "dan_L1_gate.tscn",
+        "color_hallways.tscn",
         "frame.tscn",
         "scenery_0.tscn",
         "scenery_1.tscn",
@@ -263,6 +263,9 @@ func _load():
                 hidden_parent.get_node("hidden_door_58").translation.x = 48
                 hidden_parent.get_node("hidden_door_58")._setReference("whiteBlock")
 
+                # Remove Fearless entrance indicator.
+                get_node("Decorations/Signs/Miscellaneous/Sign14").queue_free()
+
         if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE:
                 # Make The Wondrous's FIRE solely midred.
                 clear_gridmap_tile(-76.5, 1.5, -73.5)
@@ -375,33 +378,23 @@ func _load():
         ]
 
         if apclient._early_color_hallways:
-                var painting_scene = load("res://nodes/paintings/dan_L1_gate.tscn")
-                var mypainting_script = apclient.SCRIPT_mypainting
-
-                var exit_painting = painting_scene.instance()
-                exit_painting.set_name("color_exit_painting")
-                exit_painting.translation.x = -98.75
-                exit_painting.translation.y = 1
-                exit_painting.translation.z = 3.5
-                exit_painting.rotation_degrees.y = -90
-
-                var exit_mps = mypainting_script.new()
-                exit_mps.set_name("Script")
-                exit_mps.orientation = "west"
-                exit_painting.add_child(exit_mps)
+                var exit_painting = get_node("Decorations/Paintings/crown_painting_exit").duplicate()
+                exit_painting.name = "color_hallways_exit"
+                exit_painting.translation.x = 48
+                exit_painting.translation.y = 0.25
+                exit_painting.translation.z = -18
                 $Decorations/Paintings.add_child(exit_painting)
 
+                var painting_scene = load("res://nodes/paintings/color_hallways.tscn")
                 var enter_painting = painting_scene.instance()
-                enter_painting.set_name("color_enter_painting")
+                enter_painting.set_name("color_hallways")
                 enter_painting.translation.x = 4.5
-                enter_painting.translation.y = 1
-                enter_painting.translation.z = 6.75
-
-                var enter_mps = mypainting_script.new()
-                enter_mps.set_name("Script")
-                enter_mps.orientation = "south"
-                enter_mps.target = exit_mps
-                enter_painting.add_child(enter_mps)
+                enter_painting.translation.y = 0.25
+                enter_painting.translation.z = 7
+                enter_painting.rotation_degrees.y = 180
+                enter_painting.set_script(load("res://scripts/painting.gd"))
+                enter_painting.rotate = "90"
+                enter_painting.target_path = "../color_hallways_exit"
                 $Decorations/Paintings.add_child(enter_painting)
 
         # Randomize the paintings, if necessary.
@@ -25,7 +25,7 @@ func _on_lobby_joined(lobby_id: int, permissions: int, locked: bool, result: int
                 return
 
         var apclient = global.get_node("Archipelago")
-        Steam.setLobbyMemberData(lobby_id, "slot_name", apclient.ap_user)
+        Steam.setLobbyMemberData(lobby_id, "slot_name", apclient._player_name_by_slot[apclient._slot])
 
         ._on_lobby_joined(lobby_id, permissions, locked, result)
 
@@ -30,66 +30,65 @@ func movePainting():
 
 
 func _looked_at(body, painting):
-        if (
-                target != null
-                and body.is_in_group("player")
-                and (painting.get_name() == self.get_parent().get_name())
-        ):
-                var target_dir = _dir_to_int(target.orientation)
-                var source_dir = _dir_to_int(orientation)
-                var rotate = target_dir - source_dir
-                if rotate < 0:
-                        rotate += 4
-                rotate *= 90
+        if body.is_in_group("player") and (painting.get_name() == self.get_parent().get_name()):
+                var apclient = global.get_node("Archipelago")
+                apclient.checkPainting(painting.get_name())
 
-                var target_painting = target.get_parent()
+                if target != null:
+                        var target_dir = _dir_to_int(target.orientation)
+                        var source_dir = _dir_to_int(orientation)
+                        var rotate = target_dir - source_dir
+                        if rotate < 0:
+                                rotate += 4
+                        rotate *= 90
 
-                # this is ACW
-                if rotate == 0:
-                        body.translation.x = (
-                                target_painting.translation.x + (body.translation.x - painting.translation.x)
-                        )
-                        body.translation.y = (
-                                target_painting.translation.y + (body.translation.y - painting.translation.y)
-                        )
-                        body.translation.z = (
-                                target_painting.translation.z + (body.translation.z - painting.translation.z)
-                        )
-                elif rotate == 180:
-                        body.translation.x = (
-                                target_painting.translation.x - (body.translation.x - painting.translation.x)
-                        )
-                        body.translation.y = (
-                                target_painting.translation.y + (body.translation.y - painting.translation.y)
-                        )
-                        body.translation.z = (
-                                target_painting.translation.z - (body.translation.z - painting.translation.z)
-                        )
-                        body.rotate_y(PI)
-                        body.velocity = body.velocity.rotated(Vector3(0, 1, 0), PI)
-                elif rotate == 90:
-                        var diff_x = body.translation.x - painting.translation.x
-                        var diff_y = body.translation.y - painting.translation.y
-                        var diff_z = body.translation.z - painting.translation.z
-                        body.translation.x = target_painting.translation.x + diff_z
-                        body.translation.y = target_painting.translation.y + diff_y
-                        body.translation.z = target_painting.translation.z - diff_x
-                        body.rotate_y(PI / 2)
-                        body.velocity = body.velocity.rotated(Vector3(0, 1, 0), PI / 2)
-                elif rotate == 270:
-                        var diff_x = body.translation.x - painting.translation.x
-                        var diff_y = body.translation.y - painting.translation.y
-                        var diff_z = body.translation.z - painting.translation.z
-                        body.translation.x = target_painting.translation.x - diff_z
-                        body.translation.y = target_painting.translation.y + diff_y
-                        body.translation.z = target_painting.translation.z + diff_x
-                        body.rotate_y(3 * PI / 2)
-                        body.velocity = body.velocity.rotated(Vector3(0, 1, 0), 3 * PI / 2)
+                        var target_painting = target.get_parent()
 
-                var apclient = global.get_node("Archipelago")
-                if !apclient._pilgrimage_allows_paintings:
-                        global.sunwarp = 1
-                        body.get_node("pivot/camera/sunwarp_background").visible = false
+                        # this is ACW
+                        if rotate == 0:
+                                body.translation.x = (
+                                        target_painting.translation.x + (body.translation.x - painting.translation.x)
+                                )
+                                body.translation.y = (
+                                        target_painting.translation.y + (body.translation.y - painting.translation.y)
+                                )
+                                body.translation.z = (
+                                        target_painting.translation.z + (body.translation.z - painting.translation.z)
+                                )
+                        elif rotate == 180:
+                                body.translation.x = (
+                                        target_painting.translation.x - (body.translation.x - painting.translation.x)
+                                )
+                                body.translation.y = (
+                                        target_painting.translation.y + (body.translation.y - painting.translation.y)
+                                )
+                                body.translation.z = (
+                                        target_painting.translation.z - (body.translation.z - painting.translation.z)
+                                )
+                                body.rotate_y(PI)
+                                body.velocity = body.velocity.rotated(Vector3(0, 1, 0), PI)
+                        elif rotate == 90:
+                                var diff_x = body.translation.x - painting.translation.x
+                                var diff_y = body.translation.y - painting.translation.y
+                                var diff_z = body.translation.z - painting.translation.z
+                                body.translation.x = target_painting.translation.x + diff_z
+                                body.translation.y = target_painting.translation.y + diff_y
+                                body.translation.z = target_painting.translation.z - diff_x
+                                body.rotate_y(PI / 2)
+                                body.velocity = body.velocity.rotated(Vector3(0, 1, 0), PI / 2)
+                        elif rotate == 270:
+                                var diff_x = body.translation.x - painting.translation.x
+                                var diff_y = body.translation.y - painting.translation.y
+                                var diff_z = body.translation.z - painting.translation.z
+                                body.translation.x = target_painting.translation.x - diff_z
+                                body.translation.y = target_painting.translation.y + diff_y
+                                body.translation.z = target_painting.translation.z + diff_x
+                                body.rotate_y(3 * PI / 2)
+                                body.velocity = body.velocity.rotated(Vector3(0, 1, 0), 3 * PI / 2)
+
+                        if !apclient._pilgrimage_allows_paintings:
+                                global.sunwarp = 1
+                                body.get_node("pivot/camera/sunwarp_background").visible = false
 
 
 func _dir_to_int(dir):
@@ -44,8 +44,6 @@ func _solvingEnd():
 
 
 func _unhandled_input(event):
-        ._unhandled_input(event)
-
         if event is InputEventKey:
                 if event.pressed and event.scancode == KEY_P:
                         var effects_node = get_tree().get_root().get_node("Spatial/AP_Effects")
@@ -0,0 +1,25 @@
+extends "res://scripts/settings_menu.gd"
+
+
+func _ready():
+        var level_tab = get_node("Panel/Tabs/Level")
+        level_tab.get_node("ScrollContainer").queue_free()
+        level_tab.get_node("upload_button").queue_free()
+
+        var new_label = Label.new()
+        new_label.text = "You must restart Lingo before playing a non-Archipelago game."
+        new_label.align = Label.ALIGN_CENTER
+        new_label.valign = Label.VALIGN_CENTER
+        new_label.autowrap = true
+        new_label.margin_left = 25
+        new_label.margin_top = 25
+        new_label.margin_right = 1250
+        new_label.margin_bottom = 492
+
+        var field_font = DynamicFont.new()
+        field_font.font_data = load("res://fonts/Lingo2.ttf")
+        field_font.size = 48
+
+        new_label.add_font_override("font", field_font)
+
+        level_tab.add_child(new_label)
@@ -55,6 +55,7 @@ func _ready():
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelInput.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pause_menu.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/settings_menu.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldTransporter.gd"))
 
@@ -96,6 +97,14 @@ func _ready():
         self.get_node("Panel/player_box").add_font_override("font", field_font)
         self.get_node("Panel/password_box").add_font_override("font", field_font)
 
+        # Clear out messages (kind of a hack).
+        messages._message_queue.clear()
+
+        for message_label in messages._ordered_labels:
+                message_label.queue_free()
+
+        messages._ordered_labels.clear()
+
 
 # Adapted from https://gitlab.com/Delta-V-Modding/Mods/-/blob/main/game/ModLoader.gd
 func installScriptExtension(childScript: Resource):