diff options
Diffstat (limited to 'client')
-rw-r--r-- | client/Archipelago/manager.gd | 4 | ||||
-rw-r--r-- | client/Archipelago/settings_screen.gd | 35 | ||||
-rw-r--r-- | client/archipelago.tscn | 4 |
3 files changed, 43 insertions, 0 deletions
diff --git a/client/Archipelago/manager.gd b/client/Archipelago/manager.gd index 32882c2..ff1e980 100644 --- a/client/Archipelago/manager.gd +++ b/client/Archipelago/manager.gd | |||
@@ -41,6 +41,7 @@ const kCYAN_DOOR_BEHAVIOR_H2 = 0 | |||
41 | const kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER = 1 | 41 | const kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER = 1 |
42 | const kCYAN_DOOR_BEHAVIOR_ITEM = 2 | 42 | const kCYAN_DOOR_BEHAVIOR_ITEM = 2 |
43 | 43 | ||
44 | var apworld_version = [0, 0] | ||
44 | var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2 | 45 | var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2 |
45 | var daedalus_roof_access = false | 46 | var daedalus_roof_access = false |
46 | var keyholder_sanity = false | 47 | var keyholder_sanity = false |
@@ -367,6 +368,9 @@ func _client_connected(slot_data): | |||
367 | shuffle_symbols = bool(slot_data.get("shuffle_symbols", false)) | 368 | shuffle_symbols = bool(slot_data.get("shuffle_symbols", false)) |
368 | victory_condition = int(slot_data.get("victory_condition", 0)) | 369 | victory_condition = int(slot_data.get("victory_condition", 0)) |
369 | 370 | ||
371 | if slot_data.has("version"): | ||
372 | apworld_version = [int(slot_data["version"][0]), int(slot_data["version"][1])] | ||
373 | |||
370 | # Set up item locks. | 374 | # Set up item locks. |
371 | _item_locks = {} | 375 | _item_locks = {} |
372 | 376 | ||
diff --git a/client/Archipelago/settings_screen.gd b/client/Archipelago/settings_screen.gd index 81e7d3f..14975e5 100644 --- a/client/Archipelago/settings_screen.gd +++ b/client/Archipelago/settings_screen.gd | |||
@@ -100,6 +100,10 @@ func _ready(): | |||
100 | $Panel/player_box.add_theme_font_size_override("font_size", 36) | 100 | $Panel/player_box.add_theme_font_size_override("font_size", 36) |
101 | $Panel/password_box.add_theme_font_size_override("font_size", 36) | 101 | $Panel/password_box.add_theme_font_size_override("font_size", 36) |
102 | 102 | ||
103 | # Set up version mismatch dialog. | ||
104 | $Panel/VersionMismatch.connect("confirmed", startGame) | ||
105 | $Panel/VersionMismatch.get_cancel_button().pressed.connect(versionMismatchDeclined) | ||
106 | |||
103 | 107 | ||
104 | # Adapted from https://gitlab.com/Delta-V-Modding/Mods/-/blob/main/game/ModLoader.gd | 108 | # Adapted from https://gitlab.com/Delta-V-Modding/Mods/-/blob/main/game/ModLoader.gd |
105 | func installScriptExtension(childScript: Resource): | 109 | func installScriptExtension(childScript: Resource): |
@@ -129,6 +133,33 @@ func connectionStatus(message): | |||
129 | 133 | ||
130 | func connectionSuccessful(): | 134 | func connectionSuccessful(): |
131 | var ap = global.get_node("Archipelago") | 135 | var ap = global.get_node("Archipelago") |
136 | var gamedata = global.get_node("Gamedata") | ||
137 | |||
138 | # Check for major version mismatch. | ||
139 | if ap.apworld_version[0] != gamedata.objects.get_version(): | ||
140 | $Panel/AcceptDialog.exclusive = false | ||
141 | |||
142 | var popup = self.get_node("Panel/VersionMismatch") | ||
143 | popup.title = "Version Mismatch!" | ||
144 | popup.dialog_text = ( | ||
145 | "This slot was generated using v%d.%d of the Lingo 2 apworld,\nwhich has a different major version than this client (v%d.%d).\nIt is highly recommended to play using the correct version of the client.\nYou may experience bugs or logic issues if you continue." | ||
146 | % [ | ||
147 | ap.apworld_version[0], | ||
148 | ap.apworld_version[1], | ||
149 | gamedata.objects.get_version(), | ||
150 | ap.MOD_VERSION | ||
151 | ] | ||
152 | ) | ||
153 | popup.exclusive = true | ||
154 | popup.popup_centered() | ||
155 | |||
156 | return | ||
157 | |||
158 | startGame() | ||
159 | |||
160 | |||
161 | func startGame(): | ||
162 | var ap = global.get_node("Archipelago") | ||
132 | 163 | ||
133 | # Save connection details | 164 | # Save connection details |
134 | var connection_details = [ap.ap_server, ap.ap_user, ap.ap_pass] | 165 | var connection_details = [ap.ap_server, ap.ap_user, ap.ap_pass] |
@@ -193,6 +224,10 @@ func connectionUnsuccessful(error_message): | |||
193 | popup.popup_centered() | 224 | popup.popup_centered() |
194 | 225 | ||
195 | 226 | ||
227 | func versionMismatchDeclined(): | ||
228 | $Panel/AcceptDialog.hide() | ||
229 | |||
230 | |||
196 | func historySelected(index): | 231 | func historySelected(index): |
197 | var ap = global.get_node("Archipelago") | 232 | var ap = global.get_node("Archipelago") |
198 | var details = ap.connection_history[index] | 233 | var details = ap.connection_history[index] |
diff --git a/client/archipelago.tscn b/client/archipelago.tscn index 40dd46f..a74c69e 100644 --- a/client/archipelago.tscn +++ b/client/archipelago.tscn | |||
@@ -150,6 +150,10 @@ caret_blink = true | |||
150 | offset_right = 83.0 | 150 | offset_right = 83.0 |
151 | offset_bottom = 58.0 | 151 | offset_bottom = 58.0 |
152 | 152 | ||
153 | [node name="VersionMismatch" type="ConfirmationDialog" parent="Panel"] | ||
154 | offset_right = 83.0 | ||
155 | offset_bottom = 58.0 | ||
156 | |||
153 | [node name="connection_history" type="MenuButton" parent="Panel"] | 157 | [node name="connection_history" type="MenuButton" parent="Panel"] |
154 | offset_left = 1239.0 | 158 | offset_left = 1239.0 |
155 | offset_top = 276.0 | 159 | offset_top = 276.0 |