9 files changed, 67 insertions, 24 deletions

@@ -4,6 +4,7 @@ Archipelago init file for Lingo 2
 from typing import ClassVar
 
 from BaseClasses import ItemClassification, Item, Tutorial
+from Options import OptionError
 from settings import Group, UserFilePath
 from worlds.AutoWorld import WebWorld, World
 from .items import Lingo2Item, ANTI_COLLECTABLE_TRAPS
@@ -33,6 +34,7 @@ class Lingo2Settings(Group):
         is_exe = True
 
     exe_file: ExecutableFile = ExecutableFile()
+    start_game: bool = True
 
 
 class Lingo2World(World):
@@ -108,6 +110,11 @@ class Lingo2World(World):
         for i in range(0, item_difference):
             pool.append(self.create_item(self.get_filler_item_name()))
 
+        if not any(ItemClassification.progression in item.classification for item in pool):
+            raise OptionError(f"Lingo 2 player {self.player} has no progression items. Please enable at least one "
+                              f"option that would add progression gating to your world, such as Shuffle Doors or "
+                              f"Shuffle Letters.")
+
         self.multiworld.itempool += pool
 
     def create_item(self, name: str) -> Item:
@@ -108,7 +108,7 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
 
                         _checked_locations = []
                         for location in message["checked_locations"]:
-                                _checked_locations.append(int(message["checked_locations"]))
+                                _checked_locations.append(int(location))
 
                         client_connected.emit(_slot_data)
 
@@ -158,11 +158,7 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                 elif cmd == "LocationInfo":
                         for loc in message["locations"]:
                                 location_scout_received.emit(
-                                        int(loc["id"]),
-                                        loc["item"],
-                                        loc["player"],
-                                        int(loc["flags"]),
-                                        int(loc["for_self"])
+                                        int(loc["id"]), loc["item"], loc["player"], int(loc["flags"]), int(loc["self"])
                                 )
 
                 elif cmd == "AccessibleLocations":
@@ -72,7 +72,13 @@ func load(data_bytes):
 
                 if door.has_ap_id():
                         door_id_by_ap_id[door.get_ap_id()] = door.get_id()
-                        location_name_by_id[door.get_ap_id()] = _get_door_location_name(door)
+
+                        if (
+                                door.get_type() == SCRIPT_proto.DoorType.STANDARD
+                                or door.get_type() == SCRIPT_proto.DoorType.LOCATION_ONLY
+                                or door.get_type() == SCRIPT_proto.DoorType.GRAVESTONE
+                        ):
+                                location_name_by_id[door.get_ap_id()] = _get_door_location_name(door)
 
         for painting in objects.get_paintings():
                 var room = objects.get_rooms()[painting.get_room_id()]
@@ -166,8 +172,7 @@ func get_door_ap_id(door_id):
 
 func get_door_map_name(door_id):
         var door = objects.get_doors()[door_id]
-        var room = objects.get_rooms()[door.get_room_id()]
-        var map = objects.get_maps()[room.get_map_id()]
+        var map = objects.get_maps()[door.get_map_id()]
         return map.get_name()
 
 
@@ -227,8 +232,11 @@ func _get_generated_door_location_name(door):
                 var panel = objects.get_panels()[panel_id.get_panel()]
                 var panel_room = objects.get_rooms()[panel.get_room_id()]
                 # It's okay if panel_display_name is not present because then it's coalesced with other unnamed areas.
-                if not map_areas.has(panel_room.get_panel_display_name()):
-                        map_areas.append(panel_room.get_panel_display_name())
+                var panel_display_name = ""
+                if panel_room.has_panel_display_name():
+                        panel_display_name = panel_room.get_panel_display_name()
+                if not map_areas.has(panel_display_name):
+                        map_areas.append(panel_display_name)
 
         if map_areas.size() > 1:
                 return null
@@ -264,7 +272,7 @@ func _get_generated_door_location_name(door):
 
 
 func _get_letter_location_name(letter):
-        var letter_level = 2 if letter.get_level2() else 1
+        var letter_level = 2 if (letter.has_level2() and letter.get_level2()) else 1
         var letter_name = "%s%d" % [letter.get_key().to_upper(), letter_level]
         return "%s - %s" % [_get_room_object_map_name(letter), letter_name]
 
@@ -237,6 +237,9 @@ func _process_item(item, amount):
                 if player != null:
                         player.evaluate_solvability.emit()
 
+        if item_id == gamedata.objects.get_special_ids()["A Job Well Done"]:
+                update_job_well_done_sign()
+
         # Show a message about the item if it's new.
         if int(item["index"]) > _last_new_item:
                 _last_new_item = int(item["index"])
@@ -503,6 +506,9 @@ func start_batching_locations():
 
 
 func send_location(loc_id):
+        if client._checked_locations.has(loc_id):
+                return
+
         if _batch_locations:
                 _held_locations.append(loc_id)
         else:
@@ -601,3 +607,29 @@ func _process_key_item(key, level):
                 level += 1
 
         keyboard.collect_remote_letter(key, level)
+
+
+func update_job_well_done_sign():
+        if global.map != "daedalus":
+                return
+
+        var gamedata = global.get_node("Gamedata")
+        var job_item = gamedata.objects.get_special_ids()["A Job Well Done"]
+        var jobs_done = client.getItemAmount(job_item)
+
+        var sign2 = get_tree().get_root().get_node_or_null("scene/Meshes/Miscellaneous/sign2")
+        var sign3 = get_tree().get_root().get_node_or_null("scene/Meshes/Miscellaneous/sign3")
+
+        if sign2 != null and sign3 != null:
+                if jobs_done == 0:
+                        sign2.text = "what are you doing"
+                        sign3.text = "?"
+                elif jobs_done == 1:
+                        sign2.text = "a job well done"
+                        sign3.text = "is its own reward"
+                else:
+                        sign2.text = "%d jobs well done" % jobs_done
+                        sign3.text = "are their own reward"
+
+                sign2.get_node("MeshInstance3D").mesh.text = sign2.text
+                sign3.get_node("MeshInstance3D").mesh.text = sign3.text
@@ -31,6 +31,7 @@ func _ready():
                 if (
                         door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
                         or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
+                        or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR
                 ):
                         continue
 
@@ -312,6 +313,8 @@ func _ready():
                 entry1.get_parent().add_child.call_deferred(entry12)
                 entry1.queue_free()
 
+        ap.update_job_well_done_sign()
+
         var minimap = ap.SCRIPT_minimap.new()
         minimap.name = "Minimap"
         minimap.visible = ap.show_minimap
@@ -100,7 +100,7 @@ func _ready():
         server_box.offset_top = 295.0
         server_box.offset_right = 1144.0
         server_box.offset_bottom = 445.0
-        server_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        server_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         server_box.caret_blink = true
         panel.add_child(server_box)
 
@@ -110,7 +110,7 @@ func _ready():
         player_box.offset_top = 477.0
         player_box.offset_right = 1144.0
         player_box.offset_bottom = 627.0
-        player_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        player_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         player_box.caret_blink = true
         panel.add_child(player_box)
 
@@ -120,20 +120,16 @@ func _ready():
         password_box.offset_top = 659.0
         password_box.offset_right = 1144.0
         password_box.offset_bottom = 809.0
-        password_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        password_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         password_box.caret_blink = true
         panel.add_child(password_box)
 
         var accept_dialog = AcceptDialog.new()
         accept_dialog.name = "AcceptDialog"
-        accept_dialog.offset_right = 83.0
-        accept_dialog.offset_bottom = 58.0
         panel.add_child(accept_dialog)
 
         var version_mismatch = ConfirmationDialog.new()
         version_mismatch.name = "VersionMismatch"
-        version_mismatch.offset_right = 83.0
-        version_mismatch.offset_bottom = 58.0
         panel.add_child(version_mismatch)
 
         var connection_history = MenuButton.new()
@@ -2,7 +2,7 @@ extends "res://scripts/nodes/listeners/worldportListener.gd"
 
 
 func handleTriggered():
-        if exit == "menus/credits":
+        if exit.begins_with("menus/credits"):
                 return
 
         super.handleTriggered()
@@ -615,7 +615,8 @@ async def run_game():
 
 def client_main(*launch_args: str) -> None:
     async def main(args):
-        async_start(run_game())
+        if settings.get_settings().lingo2_options.start_game:
+            async_start(run_game())
 
         client_ctx = Lingo2ClientContext(args.connect, args.password)
         game_ctx = Lingo2GameContext()
@@ -97,7 +97,7 @@ def create_regions(world: "Lingo2World"):
 
         if connection.HasField("port"):
             port = world.static_logic.objects.ports[connection.port]
-            connection_name = f"{connection_name} (via port {port.name})"
+            connection_name = f"{connection_name} (via {port.display_name})"
 
             if world.options.shuffle_worldports and not port.no_shuffle:
                 continue
@@ -157,7 +157,7 @@ def shuffle_entrances(world: "Lingo2World"):
         port_region_name = world.static_logic.get_room_region_name(port.room_id)
         port_region = world.multiworld.get_region(port_region_name, world.player)
 
-        connection_name = f"{port_region_name} - {port.name}"
+        connection_name = f"{port_region_name} - {port.display_name}"
         port_id_by_name[connection_name] = port.id
 
         entrance = port_region.create_er_target(connection_name)
@@ -195,7 +195,7 @@ def connect_ports_from_ut(port_pairings: dict[int, int], world: "Lingo2World"):
         from_region = world.multiworld.get_region(from_region_name, world.player)
         to_region = world.multiworld.get_region(to_region_name, world.player)
 
-        connection = Entrance(world.player, f"{from_region_name} - {from_port.name}", from_region)
+        connection = Entrance(world.player, f"{from_region_name} - {from_port.display_name}", from_region)
 
         reqs = AccessRequirements()
         if from_port.HasField("required_door"):