diff options
-rw-r--r-- | README.md | 1 | ||||
-rw-r--r-- | client/Archipelago/client.gd | 6 | ||||
-rw-r--r-- | client/Archipelago/manager.gd | 6 | ||||
-rw-r--r-- | client/Archipelago/player.gd | 3 | ||||
-rw-r--r-- | client/Archipelago/settings_screen.gd | 3 | ||||
-rw-r--r-- | client/CHANGELOG.md | 10 | ||||
-rw-r--r-- | client/archipelago.tscn | 1 | ||||
-rw-r--r-- | data/maps/the_great/doors.txtpb | 2 |
8 files changed, 26 insertions, 6 deletions
diff --git a/README.md b/README.md index b8e3824..fa81210 100644 --- a/README.md +++ b/README.md | |||
@@ -80,6 +80,7 @@ individual items and are not impacted by your choice of Cyan Door Behavior: | |||
80 | Entrance) | 80 | Entrance) |
81 | - The eye painting near the yellow color hallway in Daedalus (Daedalus - Eye | 81 | - The eye painting near the yellow color hallway in Daedalus (Daedalus - Eye |
82 | Painting) | 82 | Painting) |
83 | - The Red I room in The Repetitive (The Repetitive - Anti Collectable Room) | ||
83 | 84 | ||
84 | Additionally, when control center color shuffle is enabled, the orange door in | 85 | Additionally, when control center color shuffle is enabled, the orange door in |
85 | The Unkempt (which ordinarily doubles as a cyan door) opens upon receiving the | 86 | The Unkempt (which ordinarily doubles as a cyan door) opens upon receiving the |
diff --git a/client/Archipelago/client.gd b/client/Archipelago/client.gd index 2e080fd..843647d 100644 --- a/client/Archipelago/client.gd +++ b/client/Archipelago/client.gd | |||
@@ -47,6 +47,8 @@ signal location_scout_received(item_id, location_id, player, flags) | |||
47 | func _init(): | 47 | func _init(): |
48 | set_process_mode(Node.PROCESS_MODE_ALWAYS) | 48 | set_process_mode(Node.PROCESS_MODE_ALWAYS) |
49 | 49 | ||
50 | _ws.inbound_buffer_size = 8388608 | ||
51 | |||
50 | global._print("Instantiated APClient") | 52 | global._print("Instantiated APClient") |
51 | 53 | ||
52 | # Read AP datapackages from file, if there are any | 54 | # Read AP datapackages from file, if there are any |
@@ -225,7 +227,7 @@ func _process(_delta): | |||
225 | error_message = "Unknown error." | 227 | error_message = "Unknown error." |
226 | 228 | ||
227 | _initiated_disconnect = true | 229 | _initiated_disconnect = true |
228 | _ws.disconnect_from_host() | 230 | _ws.close() |
229 | 231 | ||
230 | emit_signal("could_not_connect", error_message) | 232 | emit_signal("could_not_connect", error_message) |
231 | global._print("Connection to AP refused") | 233 | global._print("Connection to AP refused") |
@@ -309,7 +311,7 @@ func connectToServer(server, un, pw): | |||
309 | % err | 311 | % err |
310 | ) | 312 | ) |
311 | ) | 313 | ) |
312 | global._print("Could not connect to AP: " + err) | 314 | global._print("Could not connect to AP: %d" % err) |
313 | return | 315 | return |
314 | _should_process = true | 316 | _should_process = true |
315 | 317 | ||
diff --git a/client/Archipelago/manager.gd b/client/Archipelago/manager.gd index 8a15728..34f5e27 100644 --- a/client/Archipelago/manager.gd +++ b/client/Archipelago/manager.gd | |||
@@ -1,6 +1,6 @@ | |||
1 | extends Node | 1 | extends Node |
2 | 2 | ||
3 | const MOD_VERSION = 2 | 3 | const MOD_VERSION = 3 |
4 | 4 | ||
5 | var SCRIPT_client | 5 | var SCRIPT_client |
6 | var SCRIPT_keyboard | 6 | var SCRIPT_keyboard |
@@ -329,8 +329,8 @@ func _process_location_scout(item_id, location_id, player, flags): | |||
329 | collectable.setScoutedText(item_name) | 329 | collectable.setScoutedText(item_name) |
330 | 330 | ||
331 | 331 | ||
332 | func _client_could_not_connect(): | 332 | func _client_could_not_connect(message): |
333 | emit_signal("could_not_connect") | 333 | emit_signal("could_not_connect", message) |
334 | 334 | ||
335 | 335 | ||
336 | func _client_connect_status(message): | 336 | func _client_connect_status(message): |
diff --git a/client/Archipelago/player.gd b/client/Archipelago/player.gd index 9de3e07..c8ef320 100644 --- a/client/Archipelago/player.gd +++ b/client/Archipelago/player.gd | |||
@@ -68,6 +68,9 @@ func _ready(): | |||
68 | 68 | ||
69 | locationListener.senders.append(NodePath("../" + khl.name)) | 69 | locationListener.senders.append(NodePath("../" + khl.name)) |
70 | 70 | ||
71 | if door.has_complete_at(): | ||
72 | locationListener.complete_at = door.get_complete_at() | ||
73 | |||
71 | get_parent().add_child.call_deferred(locationListener) | 74 | get_parent().add_child.call_deferred(locationListener) |
72 | 75 | ||
73 | # Set up letter locations. | 76 | # Set up letter locations. |
diff --git a/client/Archipelago/settings_screen.gd b/client/Archipelago/settings_screen.gd index 14975e5..2236672 100644 --- a/client/Archipelago/settings_screen.gd +++ b/client/Archipelago/settings_screen.gd | |||
@@ -223,9 +223,12 @@ func connectionUnsuccessful(error_message): | |||
223 | popup.get_ok_button().visible = true | 223 | popup.get_ok_button().visible = true |
224 | popup.popup_centered() | 224 | popup.popup_centered() |
225 | 225 | ||
226 | $Panel/connect_button.disabled = false | ||
227 | |||
226 | 228 | ||
227 | func versionMismatchDeclined(): | 229 | func versionMismatchDeclined(): |
228 | $Panel/AcceptDialog.hide() | 230 | $Panel/AcceptDialog.hide() |
231 | $Panel/connect_button.disabled = false | ||
229 | 232 | ||
230 | 233 | ||
231 | func historySelected(index): | 234 | func historySelected(index): |
diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md index 5818f2d..89d9873 100644 --- a/client/CHANGELOG.md +++ b/client/CHANGELOG.md | |||
@@ -1,5 +1,15 @@ | |||
1 | # lingo2-archipelago Client Releases | 1 | # lingo2-archipelago Client Releases |
2 | 2 | ||
3 | ## v3.3 - 2025-09-12 | ||
4 | |||
5 | - Fixed issue downloading large datapackages (such as TUNIC's). | ||
6 | - Connection failures now show error messages. | ||
7 | |||
8 | Download: | ||
9 | [lingo2-archipelago-client-v3.3.zip](https://files.fourisland.com/releases/lingo2-archipelago/client/lingo2-archipelago-client-v3.3.zip)<br/> | ||
10 | Source: | ||
11 | [v3.3](https://code.fourisland.com/lingo2-archipelago/tag/?h=client-v3.3) | ||
12 | |||
3 | ## v3.2 - 2025-09-12 | 13 | ## v3.2 - 2025-09-12 |
4 | 14 | ||
5 | - Initial release for testing. Features include door shuffle, letter shuffle, | 15 | - Initial release for testing. Features include door shuffle, letter shuffle, |
diff --git a/client/archipelago.tscn b/client/archipelago.tscn index a74c69e..da83b23 100644 --- a/client/archipelago.tscn +++ b/client/archipelago.tscn | |||
@@ -40,6 +40,7 @@ offset_right = 1920.0 | |||
40 | offset_bottom = 225.0 | 40 | offset_bottom = 225.0 |
41 | text = "ARCHIPELAGO" | 41 | text = "ARCHIPELAGO" |
42 | valign = 1 | 42 | valign = 1 |
43 | horizontal_alignment = 1 | ||
43 | theme = ExtResource("2_g4bvn") | 44 | theme = ExtResource("2_g4bvn") |
44 | 45 | ||
45 | [node name="credit" parent="Panel" type="Label"] | 46 | [node name="credit" parent="Panel" type="Label"] |
diff --git a/data/maps/the_great/doors.txtpb b/data/maps/the_great/doors.txtpb index 5d0e90d..abbbc11 100644 --- a/data/maps/the_great/doors.txtpb +++ b/data/maps/the_great/doors.txtpb | |||
@@ -66,7 +66,7 @@ doors { | |||
66 | doors { | 66 | doors { |
67 | name: "Control Center Red Door" | 67 | name: "Control Center Red Door" |
68 | type: CONTROL_CENTER_COLOR | 68 | type: CONTROL_CENTER_COLOR |
69 | receivers: "Components/Doors/Gates/Gate" | 69 | receivers: "Components/Doors/entry_18" |
70 | control_center_color: "red" | 70 | control_center_color: "red" |
71 | } | 71 | } |
72 | doors { | 72 | doors { |