about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2024-07-16 13:40:29 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2024-07-16 13:40:29 -0400
commit59e2b90ef45adb2c76d139e5995cedb331322176 (patch)
treec63266a399fea67c379333dfee8803c87d6827e5
parent0e10801d335a52d3e88ad02a5f3ff9784a53a119 (diff)
parent6b5b85f96fc855810ac21e96e1aeb9cbde0fe88e (diff)
downloadlingo-archipelago-59e2b90ef45adb2c76d139e5995cedb331322176.tar.gz
lingo-archipelago-59e2b90ef45adb2c76d139e5995cedb331322176.tar.bz2
lingo-archipelago-59e2b90ef45adb2c76d139e5995cedb331322176.zip
Merge branch 'main' into panels
-rw-r--r--Archipelago/client.gd107
-rw-r--r--Archipelago/load.gd41
-rw-r--r--Archipelago/multiplayer.gd2
-rw-r--r--Archipelago/mypainting.gd113
-rw-r--r--Archipelago/player.gd2
-rw-r--r--Archipelago/settings_menu.gd25
-rw-r--r--Archipelago/settings_screen.gd9
-rw-r--r--CHANGELOG.md77
-rw-r--r--util/generate_gamedata.rb5
9 files changed, 272 insertions, 109 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd index 0f1c651..325418f 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd
@@ -18,8 +18,8 @@ var enable_multiplayer = false
18var track_player = false 18var track_player = false
19var connection_history = [] 19var connection_history = []
20 20
21const my_version = "3.0.1" 21const my_version = "4.0.2"
22const ap_version = {"major": 0, "minor": 4, "build": 6, "class": "Version"} 22const ap_version = {"major": 0, "minor": 5, "build": 0, "class": "Version"}
23const color_items = [ 23const color_items = [
24 "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow" 24 "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
25] 25]
@@ -56,6 +56,7 @@ const kREARRANGE_PANELS = 1
56const kCLASSIFICATION_LOCAL_NORMAL = 1 56const kCLASSIFICATION_LOCAL_NORMAL = 1
57const kCLASSIFICATION_LOCAL_REDUCED = 2 57const kCLASSIFICATION_LOCAL_REDUCED = 2
58const kCLASSIFICATION_LOCAL_INSANITY = 4 58const kCLASSIFICATION_LOCAL_INSANITY = 4
59const kCLASSIFICATION_LOCAL_SMALL_SPHERE_ONE = 8
59 60
60const kCLASSIFICATION_REMOTE_NORMAL = 0 61const kCLASSIFICATION_REMOTE_NORMAL = 0
61const kCLASSIFICATION_REMOTE_REDUCED = 1 62const kCLASSIFICATION_REMOTE_REDUCED = 1
@@ -89,6 +90,7 @@ var _team = 0
89var _slot = 0 90var _slot = 0
90var _players = [] 91var _players = []
91var _player_name_by_slot = {} 92var _player_name_by_slot = {}
93var _game_by_player = {}
92var _checked_locations = [] 94var _checked_locations = []
93var _slot_data = {} 95var _slot_data = {}
94var _paintings_mapping = {} 96var _paintings_mapping = {}
@@ -125,6 +127,7 @@ var _cached_slowness = 0
125var _cached_iceland = 0 127var _cached_iceland = 0
126var _cached_atbash = 0 128var _cached_atbash = 0
127var _geronimo_skip = false 129var _geronimo_skip = false
130var _checked_paintings = []
128 131
129signal could_not_connect 132signal could_not_connect
130signal connect_status 133signal connect_status
@@ -142,6 +145,10 @@ func _init():
142 var data = file.get_var(true) 145 var data = file.get_var(true)
143 file.close() 146 file.close()
144 147
148 if typeof(data) != TYPE_ARRAY:
149 global._print("AP settings file is corrupted")
150 data = []
151
145 if data.size() > 0: 152 if data.size() > 0:
146 ap_server = data[0] 153 ap_server = data[0]
147 if data.size() > 1: 154 if data.size() > 1:
@@ -266,6 +273,7 @@ func _on_data():
266 273
267 for player in _players: 274 for player in _players:
268 _player_name_by_slot[player["slot"]] = player["alias"] 275 _player_name_by_slot[player["slot"]] = player["alias"]
276 _game_by_player[player["slot"]] = message["slot_info"][str(player["slot"])]["game"]
269 277
270 _death_link = _slot_data.has("death_link") and _slot_data["death_link"] 278 _death_link = _slot_data.has("death_link") and _slot_data["death_link"]
271 if _death_link: 279 if _death_link:
@@ -275,6 +283,7 @@ func _on_data():
275 _victory_condition = _slot_data["victory_condition"] 283 _victory_condition = _slot_data["victory_condition"]
276 if _slot_data.has("shuffle_colors"): 284 if _slot_data.has("shuffle_colors"):
277 _color_shuffle = _slot_data["shuffle_colors"] 285 _color_shuffle = _slot_data["shuffle_colors"]
286
278 if _slot_data.has("shuffle_doors"): 287 if _slot_data.has("shuffle_doors"):
279 if _slot_data.has("group_doors"): 288 if _slot_data.has("group_doors"):
280 _door_shuffle = (_slot_data["shuffle_doors"] == 2) 289 _door_shuffle = (_slot_data["shuffle_doors"] == 2)
@@ -282,6 +291,10 @@ func _on_data():
282 else: 291 else:
283 _door_shuffle = (_slot_data["shuffle_doors"] > 0) 292 _door_shuffle = (_slot_data["shuffle_doors"] > 0)
284 _panel_door_shuffle = false 293 _panel_door_shuffle = false
294 else:
295 _door_shuffle = false
296 _panel_door_shuffle = false
297
285 if _slot_data.has("shuffle_paintings"): 298 if _slot_data.has("shuffle_paintings"):
286 _painting_shuffle = _slot_data["shuffle_paintings"] 299 _painting_shuffle = _slot_data["shuffle_paintings"]
287 if _slot_data.has("shuffle_panels"): 300 if _slot_data.has("shuffle_panels"):
@@ -298,6 +311,7 @@ func _on_data():
298 _mastery_achievements = _slot_data["mastery_achievements"] 311 _mastery_achievements = _slot_data["mastery_achievements"]
299 if _slot_data.has("level_2_requirement"): 312 if _slot_data.has("level_2_requirement"):
300 _level_2_requirement = _slot_data["level_2_requirement"] 313 _level_2_requirement = _slot_data["level_2_requirement"]
314
301 if _slot_data.has("location_checks"): 315 if _slot_data.has("location_checks"):
302 if _slot_data["location_checks"] == kCLASSIFICATION_REMOTE_NORMAL: 316 if _slot_data["location_checks"] == kCLASSIFICATION_REMOTE_NORMAL:
303 _location_classification_bit = kCLASSIFICATION_LOCAL_NORMAL 317 _location_classification_bit = kCLASSIFICATION_LOCAL_NORMAL
@@ -305,8 +319,13 @@ func _on_data():
305 _location_classification_bit = kCLASSIFICATION_LOCAL_REDUCED 319 _location_classification_bit = kCLASSIFICATION_LOCAL_REDUCED
306 elif _slot_data["location_checks"] == kCLASSIFICATION_REMOTE_INSANITY: 320 elif _slot_data["location_checks"] == kCLASSIFICATION_REMOTE_INSANITY:
307 _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY 321 _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY
322 else:
323 _location_classification_bit = kCLASSIFICATION_LOCAL_NORMAL
324
308 if _slot_data.has("early_color_hallways"): 325 if _slot_data.has("early_color_hallways"):
309 _early_color_hallways = _slot_data["early_color_hallways"] 326 _early_color_hallways = _slot_data["early_color_hallways"]
327 else:
328 _early_color_hallways = false
310 if _slot_data.has("enable_pilgrimage"): 329 if _slot_data.has("enable_pilgrimage"):
311 _pilgrimage_enabled = _slot_data["enable_pilgrimage"] 330 _pilgrimage_enabled = _slot_data["enable_pilgrimage"]
312 else: 331 else:
@@ -327,12 +346,24 @@ func _on_data():
327 if _slot_data.has("sunwarp_permutation"): 346 if _slot_data.has("sunwarp_permutation"):
328 _sunwarp_mapping = _slot_data["sunwarp_permutation"] 347 _sunwarp_mapping = _slot_data["sunwarp_permutation"]
329 348
349 if (
350 _location_classification_bit != kCLASSIFICATION_LOCAL_INSANITY
351 and _door_shuffle
352 and not _early_color_hallways
353 ):
354 _location_classification_bit += kCLASSIFICATION_LOCAL_SMALL_SPHERE_ONE
355
330 if track_player: 356 if track_player:
331 setValue("PlayerPos", {"x": 0, "z": 0}) 357 setValue("PlayerPos", {"x": 0, "z": 0})
332 else: 358 else:
333 setValue("PlayerPos", null) 359 setValue("PlayerPos", null)
334 360
335 _puzzle_skips = 0 361 _puzzle_skips = 0
362 _last_new_item = -1
363 _cached_slowness = 0
364 _cached_iceland = 0
365 _cached_atbash = 0
366 _geronimo_skip = false
336 367
337 _localdata_file = "user://archipelago_data/%s_%d" % [_seed, _slot] 368 _localdata_file = "user://archipelago_data/%s_%d" % [_seed, _slot]
338 var ap_file = File.new() 369 var ap_file = File.new()
@@ -341,36 +372,42 @@ func _on_data():
341 var localdata = ap_file.get_var(true) 372 var localdata = ap_file.get_var(true)
342 ap_file.close() 373 ap_file.close()
343 374
375 if typeof(localdata) != TYPE_ARRAY:
376 global._print("AP localdata file is corrupted")
377 localdata = []
378
344 if localdata.size() > 0: 379 if localdata.size() > 0:
345 _last_new_item = localdata[0] 380 _last_new_item = localdata[0]
346 else:
347 _last_new_item = -1
348 381
349 if localdata.size() > 1: 382 if localdata.size() > 1:
350 _puzzle_skips = localdata[1] 383 _puzzle_skips = localdata[1]
351 384
352 if localdata.size() > 2: 385 if localdata.size() > 2:
353 _cached_slowness = localdata[2] 386 _cached_slowness = localdata[2]
354 else:
355 _cached_slowness = 0
356 387
357 if localdata.size() > 3: 388 if localdata.size() > 3:
358 _cached_iceland = localdata[3] 389 _cached_iceland = localdata[3]
359 else:
360 _cached_iceland = 0
361 390
362 if localdata.size() > 4: 391 if localdata.size() > 4:
363 _cached_atbash = localdata[4] 392 _cached_atbash = localdata[4]
364 else:
365 _cached_atbash = 0
366 393
367 if localdata.size() > 5: 394 if localdata.size() > 5:
368 _geronimo_skip = localdata[5] 395 _geronimo_skip = localdata[5]
369 else:
370 _geronimo_skip = false
371 396
372 requestSync() 397 requestSync()
373 398
399 sendMessage(
400 [
401 {
402 "cmd": "Set",
403 "key": "Lingo_%d_Paintings" % [_slot],
404 "default": [],
405 "want_reply": true,
406 "operations": [{"operation": "default", "value": []}]
407 }
408 ]
409 )
410
374 emit_signal("client_connected") 411 emit_signal("client_connected")
375 412
376 elif cmd == "ConnectionRefused": 413 elif cmd == "ConnectionRefused":
@@ -438,12 +475,14 @@ func _on_data():
438 continue 475 continue
439 476
440 var item_name = "Unknown" 477 var item_name = "Unknown"
441 if _item_id_to_name.has(message["item"]["item"]): 478 var item_player_game = _game_by_player[message["receiving"]]
442 item_name = _item_id_to_name[message["item"]["item"]] 479 if _item_id_to_name[item_player_game].has(message["item"]["item"]):
480 item_name = _item_id_to_name[item_player_game][message["item"]["item"]]
443 481
444 var location_name = "Unknown" 482 var location_name = "Unknown"
445 if _location_id_to_name.has(message["item"]["location"]): 483 var location_player_game = _game_by_player[message["item"]["player"]]
446 location_name = _location_id_to_name[message["item"]["location"]] 484 if _location_id_to_name[location_player_game].has(message["item"]["location"]):
485 location_name = _location_id_to_name[location_player_game][message["item"]["location"]]
447 486
448 var player_name = "Unknown" 487 var player_name = "Unknown"
449 if _player_name_by_slot.has(message["receiving"]): 488 if _player_name_by_slot.has(message["receiving"]):
@@ -486,6 +525,10 @@ func _on_data():
486 # Return the player home. 525 # Return the player home.
487 get_tree().get_root().get_node("Spatial/player/pause_menu")._reload() 526 get_tree().get_root().get_node("Spatial/player/pause_menu")._reload()
488 527
528 elif cmd == "SetReply":
529 if message.has("key") and message["key"] == ("Lingo_%d_Paintings" % _slot):
530 _checked_paintings = message["value"]
531
489 532
490func _process(_delta): 533func _process(_delta):
491 if _should_process: 534 if _should_process:
@@ -593,12 +636,16 @@ func requestDatapackages(games):
593func processDatapackages(): 636func processDatapackages():
594 _item_id_to_name = {} 637 _item_id_to_name = {}
595 _location_id_to_name = {} 638 _location_id_to_name = {}
596 for package in _datapackages.values(): 639 for game in _datapackages.keys():
640 var package = _datapackages[game]
641
642 _item_id_to_name[game] = {}
597 for name in package["item_name_to_id"].keys(): 643 for name in package["item_name_to_id"].keys():
598 _item_id_to_name[package["item_name_to_id"][name]] = name 644 _item_id_to_name[game][package["item_name_to_id"][name]] = name
599 645
646 _location_id_to_name[game] = {}
600 for name in package["location_name_to_id"].keys(): 647 for name in package["location_name_to_id"].keys():
601 _location_id_to_name[package["location_name_to_id"][name]] = name 648 _location_id_to_name[game][package["location_name_to_id"][name]] = name
602 649
603 if _datapackages.has("Lingo"): 650 if _datapackages.has("Lingo"):
604 _item_name_to_id = _datapackages["Lingo"]["item_name_to_id"] 651 _item_name_to_id = _datapackages["Lingo"]["item_name_to_id"]
@@ -640,13 +687,14 @@ func sendLocation(loc_id):
640 _held_locations.append(loc_id) 687 _held_locations.append(loc_id)
641 688
642 689
643func setValue(key, value): 690func setValue(key, value, operation = "replace"):
644 sendMessage( 691 sendMessage(
645 [ 692 [
646 { 693 {
647 "cmd": "Set", 694 "cmd": "Set",
648 "key": "Lingo_%d_%s" % [_slot, key], 695 "key": "Lingo_%d_%s" % [_slot, key],
649 "operations": [{"operation": "replace", "value": value}] 696 "want_reply": false,
697 "operations": [{"operation": operation, "value": value}]
650 } 698 }
651 ] 699 ]
652 ) 700 )
@@ -687,8 +735,8 @@ func processItem(item, index, from, flags):
687 735
688 var gamedata = $Gamedata 736 var gamedata = $Gamedata
689 var item_name = "Unknown" 737 var item_name = "Unknown"
690 if _item_id_to_name.has(item): 738 if _item_id_to_name["Lingo"].has(item):
691 item_name = _item_id_to_name[item] 739 item_name = _item_id_to_name["Lingo"][item]
692 740
693 if gamedata.door_ids_by_item_id.has(int(item)): 741 if gamedata.door_ids_by_item_id.has(int(item)):
694 var doorsNode = get_tree().get_root().get_node("Spatial/Doors") 742 var doorsNode = get_tree().get_root().get_node("Spatial/Doors")
@@ -751,8 +799,8 @@ func processItem(item, index, from, flags):
751 item_name += " (%s)" % prognames[item_name][_progressive_progress[int(item)]] 799 item_name += " (%s)" % prognames[item_name][_progressive_progress[int(item)]]
752 _progressive_progress[int(item)] += 1 800 _progressive_progress[int(item)] += 1
753 801
754 if _color_shuffle and color_items.has(_item_id_to_name[item]): 802 if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][item]):
755 var lcol = _item_id_to_name[item].to_lower() 803 var lcol = _item_id_to_name["Lingo"][item].to_lower()
756 if not _has_colors.has(lcol): 804 if not _has_colors.has(lcol):
757 _has_colors.append(lcol) 805 _has_colors.append(lcol)
758 emit_signal("evaluate_solvability") 806 emit_signal("evaluate_solvability")
@@ -823,6 +871,15 @@ func geronimo():
823 saveLocaldata() 871 saveLocaldata()
824 872
825 873
874func checkPainting(painting_id):
875 if _checked_paintings.has(painting_id):
876 return
877
878 _checked_paintings.append(painting_id)
879
880 setValue("Paintings", [painting_id], "add")
881
882
826func colorForItemType(flags): 883func colorForItemType(flags):
827 var int_flags = int(flags) 884 var int_flags = int(flags)
828 if int_flags & 1: # progression 885 if int_flags & 1: # progression
diff --git a/Archipelago/load.gd b/Archipelago/load.gd index 6ce4749..9b20e6d 100644 --- a/Archipelago/load.gd +++ b/Archipelago/load.gd
@@ -6,7 +6,7 @@ const EXCLUDED_PAINTINGS = [
6 "ascension_nw.tscn", 6 "ascension_nw.tscn",
7 "ascension_se.tscn", 7 "ascension_se.tscn",
8 "ascension_sw.tscn", 8 "ascension_sw.tscn",
9 "dan_L1_gate.tscn", 9 "color_hallways.tscn",
10 "frame.tscn", 10 "frame.tscn",
11 "scenery_0.tscn", 11 "scenery_0.tscn",
12 "scenery_1.tscn", 12 "scenery_1.tscn",
@@ -263,6 +263,9 @@ func _load():
263 hidden_parent.get_node("hidden_door_58").translation.x = 48 263 hidden_parent.get_node("hidden_door_58").translation.x = 48
264 hidden_parent.get_node("hidden_door_58")._setReference("whiteBlock") 264 hidden_parent.get_node("hidden_door_58")._setReference("whiteBlock")
265 265
266 # Remove Fearless entrance indicator.
267 get_node("Decorations/Signs/Miscellaneous/Sign14").queue_free()
268
266 if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE: 269 if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE:
267 # Make The Wondrous's FIRE solely midred. 270 # Make The Wondrous's FIRE solely midred.
268 clear_gridmap_tile(-76.5, 1.5, -73.5) 271 clear_gridmap_tile(-76.5, 1.5, -73.5)
@@ -375,33 +378,23 @@ func _load():
375 ] 378 ]
376 379
377 if apclient._early_color_hallways: 380 if apclient._early_color_hallways:
378 var painting_scene = load("res://nodes/paintings/dan_L1_gate.tscn") 381 var exit_painting = get_node("Decorations/Paintings/crown_painting_exit").duplicate()
379 var mypainting_script = apclient.SCRIPT_mypainting 382 exit_painting.name = "color_hallways_exit"
380 383 exit_painting.translation.x = 48
381 var exit_painting = painting_scene.instance() 384 exit_painting.translation.y = 0.25
382 exit_painting.set_name("color_exit_painting") 385 exit_painting.translation.z = -18
383 exit_painting.translation.x = -98.75
384 exit_painting.translation.y = 1
385 exit_painting.translation.z = 3.5
386 exit_painting.rotation_degrees.y = -90
387
388 var exit_mps = mypainting_script.new()
389 exit_mps.set_name("Script")
390 exit_mps.orientation = "west"
391 exit_painting.add_child(exit_mps)
392 $Decorations/Paintings.add_child(exit_painting) 386 $Decorations/Paintings.add_child(exit_painting)
393 387
388 var painting_scene = load("res://nodes/paintings/color_hallways.tscn")
394 var enter_painting = painting_scene.instance() 389 var enter_painting = painting_scene.instance()
395 enter_painting.set_name("color_enter_painting") 390 enter_painting.set_name("color_hallways")
396 enter_painting.translation.x = 4.5 391 enter_painting.translation.x = 4.5
397 enter_painting.translation.y = 1 392 enter_painting.translation.y = 0.25
398 enter_painting.translation.z = 6.75 393 enter_painting.translation.z = 7
399 394 enter_painting.rotation_degrees.y = 180
400 var enter_mps = mypainting_script.new() 395 enter_painting.set_script(load("res://scripts/painting.gd"))
401 enter_mps.set_name("Script") 396 enter_painting.rotate = "90"
402 enter_mps.orientation = "south" 397 enter_painting.target_path = "../color_hallways_exit"
403 enter_mps.target = exit_mps
404 enter_painting.add_child(enter_mps)
405 $Decorations/Paintings.add_child(enter_painting) 398 $Decorations/Paintings.add_child(enter_painting)
406 399
407 # Randomize the paintings, if necessary. 400 # Randomize the paintings, if necessary.
diff --git a/Archipelago/multiplayer.gd b/Archipelago/multiplayer.gd index 2704af7..0bc2241 100644 --- a/Archipelago/multiplayer.gd +++ b/Archipelago/multiplayer.gd
@@ -25,7 +25,7 @@ func _on_lobby_joined(lobby_id: int, permissions: int, locked: bool, result: int
25 return 25 return
26 26
27 var apclient = global.get_node("Archipelago") 27 var apclient = global.get_node("Archipelago")
28 Steam.setLobbyMemberData(lobby_id, "slot_name", apclient.ap_user) 28 Steam.setLobbyMemberData(lobby_id, "slot_name", apclient._player_name_by_slot[apclient._slot])
29 29
30 ._on_lobby_joined(lobby_id, permissions, locked, result) 30 ._on_lobby_joined(lobby_id, permissions, locked, result)
31 31
diff --git a/Archipelago/mypainting.gd b/Archipelago/mypainting.gd index 999b122..7aee434 100644 --- a/Archipelago/mypainting.gd +++ b/Archipelago/mypainting.gd
@@ -30,66 +30,65 @@ func movePainting():
30 30
31 31
32func _looked_at(body, painting): 32func _looked_at(body, painting):
33 if ( 33 if body.is_in_group("player") and (painting.get_name() == self.get_parent().get_name()):
34 target != null 34 var apclient = global.get_node("Archipelago")
35 and body.is_in_group("player") 35 apclient.checkPainting(painting.get_name())
36 and (painting.get_name() == self.get_parent().get_name())
37 ):
38 var target_dir = _dir_to_int(target.orientation)
39 var source_dir = _dir_to_int(orientation)
40 var rotate = target_dir - source_dir
41 if rotate < 0:
42 rotate += 4
43 rotate *= 90
44 36
45 var target_painting = target.get_parent() 37 if target != null:
38 var target_dir = _dir_to_int(target.orientation)
39 var source_dir = _dir_to_int(orientation)
40 var rotate = target_dir - source_dir
41 if rotate < 0:
42 rotate += 4
43 rotate *= 90
46 44
47 # this is ACW 45 var target_painting = target.get_parent()
48 if rotate == 0:
49 body.translation.x = (
50 target_painting.translation.x + (body.translation.x - painting.translation.x)
51 )
52 body.translation.y = (
53 target_painting.translation.y + (body.translation.y - painting.translation.y)
54 )
55 body.translation.z = (
56 target_painting.translation.z + (body.translation.z - painting.translation.z)
57 )
58 elif rotate == 180:
59 body.translation.x = (
60 target_painting.translation.x - (body.translation.x - painting.translation.x)
61 )
62 body.translation.y = (
63 target_painting.translation.y + (body.translation.y - painting.translation.y)
64 )
65 body.translation.z = (
66 target_painting.translation.z - (body.translation.z - painting.translation.z)
67 )
68 body.rotate_y(PI)
69 body.velocity = body.velocity.rotated(Vector3(0, 1, 0), PI)
70 elif rotate == 90:
71 var diff_x = body.translation.x - painting.translation.x
72 var diff_y = body.translation.y - painting.translation.y
73 var diff_z = body.translation.z - painting.translation.z
74 body.translation.x = target_painting.translation.x + diff_z
75 body.translation.y = target_painting.translation.y + diff_y
76 body.translation.z = target_painting.translation.z - diff_x
77 body.rotate_y(PI / 2)
78 body.velocity = body.velocity.rotated(Vector3(0, 1, 0), PI / 2)
79 elif rotate == 270:
80 var diff_x = body.translation.x - painting.translation.x
81 var diff_y = body.translation.y - painting.translation.y
82 var diff_z = body.translation.z - painting.translation.z
83 body.translation.x = target_painting.translation.x - diff_z
84 body.translation.y = target_painting.translation.y + diff_y
85 body.translation.z = target_painting.translation.z + diff_x
86 body.rotate_y(3 * PI / 2)
87 body.velocity = body.velocity.rotated(Vector3(0, 1, 0), 3 * PI / 2)
88 46
89 var apclient = global.get_node("Archipelago") 47 # this is ACW
90 if !apclient._pilgrimage_allows_paintings: 48 if rotate == 0:
91 global.sunwarp = 1 49 body.translation.x = (
92 body.get_node("pivot/camera/sunwarp_background").visible = false 50 target_painting.translation.x + (body.translation.x - painting.translation.x)
51 )
52 body.translation.y = (
53 target_painting.translation.y + (body.translation.y - painting.translation.y)
54 )
55 body.translation.z = (
56 target_painting.translation.z + (body.translation.z - painting.translation.z)
57 )
58 elif rotate == 180:
59 body.translation.x = (
60 target_painting.translation.x - (body.translation.x - painting.translation.x)
61 )
62 body.translation.y = (
63 target_painting.translation.y + (body.translation.y - painting.translation.y)
64 )
65 body.translation.z = (
66 target_painting.translation.z - (body.translation.z - painting.translation.z)
67 )
68 body.rotate_y(PI)
69 body.velocity = body.velocity.rotated(Vector3(0, 1, 0), PI)
70 elif rotate == 90:
71 var diff_x = body.translation.x - painting.translation.x
72 var diff_y = body.translation.y - painting.translation.y
73 var diff_z = body.translation.z - painting.translation.z
74 body.translation.x = target_painting.translation.x + diff_z
75 body.translation.y = target_painting.translation.y + diff_y
76 body.translation.z = target_painting.translation.z - diff_x
77 body.rotate_y(PI / 2)
78 body.velocity = body.velocity.rotated(Vector3(0, 1, 0), PI / 2)
79 elif rotate == 270:
80 var diff_x = body.translation.x - painting.translation.x
81 var diff_y = body.translation.y - painting.translation.y
82 var diff_z = body.translation.z - painting.translation.z
83 body.translation.x = target_painting.translation.x - diff_z
84 body.translation.y = target_painting.translation.y + diff_y
85 body.translation.z = target_painting.translation.z + diff_x
86 body.rotate_y(3 * PI / 2)
87 body.velocity = body.velocity.rotated(Vector3(0, 1, 0), 3 * PI / 2)
88
89 if !apclient._pilgrimage_allows_paintings:
90 global.sunwarp = 1
91 body.get_node("pivot/camera/sunwarp_background").visible = false
93 92
94 93
95func _dir_to_int(dir): 94func _dir_to_int(dir):
diff --git a/Archipelago/player.gd b/Archipelago/player.gd index 49d907d..52d743a 100644 --- a/Archipelago/player.gd +++ b/Archipelago/player.gd
@@ -44,8 +44,6 @@ func _solvingEnd():
44 44
45 45
46func _unhandled_input(event): 46func _unhandled_input(event):
47 ._unhandled_input(event)
48
49 if event is InputEventKey: 47 if event is InputEventKey:
50 if event.pressed and event.scancode == KEY_P: 48 if event.pressed and event.scancode == KEY_P:
51 var effects_node = get_tree().get_root().get_node("Spatial/AP_Effects") 49 var effects_node = get_tree().get_root().get_node("Spatial/AP_Effects")
diff --git a/Archipelago/settings_menu.gd b/Archipelago/settings_menu.gd new file mode 100644 index 0000000..0efce40 --- /dev/null +++ b/Archipelago/settings_menu.gd
@@ -0,0 +1,25 @@
1extends "res://scripts/settings_menu.gd"
2
3
4func _ready():
5 var level_tab = get_node("Panel/Tabs/Level")
6 level_tab.get_node("ScrollContainer").queue_free()
7 level_tab.get_node("upload_button").queue_free()
8
9 var new_label = Label.new()
10 new_label.text = "You must restart Lingo before playing a non-Archipelago game."
11 new_label.align = Label.ALIGN_CENTER
12 new_label.valign = Label.VALIGN_CENTER
13 new_label.autowrap = true
14 new_label.margin_left = 25
15 new_label.margin_top = 25
16 new_label.margin_right = 1250
17 new_label.margin_bottom = 492
18
19 var field_font = DynamicFont.new()
20 field_font.font_data = load("res://fonts/Lingo2.ttf")
21 field_font.size = 48
22
23 new_label.add_font_override("font", field_font)
24
25 level_tab.add_child(new_label)
diff --git a/Archipelago/settings_screen.gd b/Archipelago/settings_screen.gd index 79fdcc3..6c64b15 100644 --- a/Archipelago/settings_screen.gd +++ b/Archipelago/settings_screen.gd
@@ -55,6 +55,7 @@ func _ready():
55 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelInput.gd")) 55 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelInput.gd"))
56 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pause_menu.gd")) 56 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pause_menu.gd"))
57 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd")) 57 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd"))
58 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/settings_menu.gd"))
58 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd")) 59 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd"))
59 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldTransporter.gd")) 60 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldTransporter.gd"))
60 61
@@ -96,6 +97,14 @@ func _ready():
96 self.get_node("Panel/player_box").add_font_override("font", field_font) 97 self.get_node("Panel/player_box").add_font_override("font", field_font)
97 self.get_node("Panel/password_box").add_font_override("font", field_font) 98 self.get_node("Panel/password_box").add_font_override("font", field_font)
98 99
100 # Clear out messages (kind of a hack).
101 messages._message_queue.clear()
102
103 for message_label in messages._ordered_labels:
104 message_label.queue_free()
105
106 messages._ordered_labels.clear()
107
99 108
100# Adapted from https://gitlab.com/Delta-V-Modding/Mods/-/blob/main/game/ModLoader.gd 109# Adapted from https://gitlab.com/Delta-V-Modding/Mods/-/blob/main/game/ModLoader.gd
101func installScriptExtension(childScript: Resource): 110func installScriptExtension(childScript: Resource):
diff --git a/CHANGELOG.md b/CHANGELOG.md index de47cb0..1174ce7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md
@@ -1,5 +1,82 @@
1# lingo-archipelago Releases 1# lingo-archipelago Releases
2 2
3## v4.0.2 - 2024-07-14
4
5- Multiplayer mode now shows a player's alias in addition to their slot name.
6- Messages are now cleared out between connections.
7- Fixed issue where traps and Geronimo state could persist when switching from
8 an active slot to a new slot.
9
10Download:
11[lingo-archipelago-v4.0.2.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v4.0.2.zip)<br/>
12Source: [v4.0.2](https://code.fourisland.com/lingo-archipelago/tag/?h=v4.0.2)
13
14## v4.0.1 - 2024-07-02
15
16- Fixed issue where paired panels would become proxied on panelsanity under
17 certain conditions.
18
19Download:
20[lingo-archipelago-v4.0.1.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v4.0.1.zip)<br/>
21Source: [v4.0.1](https://code.fourisland.com/lingo-archipelago/tag/?h=v4.0.1)
22
23## v4.0.0 - 2024-07-01
24
25- [Archipelago 0.5.0](https://github.com/ArchipelagoMW/Archipelago/releases/tag/0.5.0)
26 has been released! This release only includes minor bug fixes and tweaks for
27 Lingo, which you can read about in the changelog.
28
29Download:
30[lingo-archipelago-v4.0.0.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v4.0.0.zip)<br/>
31Source: [v4.0.0](https://code.fourisland.com/lingo-archipelago/tag/?h=v4.0.0)
32
33## v3.2.1 - 2024-06-21
34
35- The player can no longer select another level after Archipelago has been
36 loaded without restarting the game.
37
38Download:
39[lingo-archipelago-v3.2.1.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v3.2.1.zip)<br/>
40Source: [v3.2.1](https://code.fourisland.com/lingo-archipelago/tag/?h=v3.2.1)
41
42## v3.2.0 - 2024-06-10
43
44- Replaced the early color hallways painting with a new one contributed by
45 [KF2015](https://www.youtube.com/channel/UCOf5qCfZLZ1UbDXpOf1eBig).
46
47Download:
48[lingo-archipelago-v3.2.0.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v3.2.0.zip)<br/>
49Source: [v3.2.0](https://code.fourisland.com/lingo-archipelago/tag/?h=v3.2.0)
50
51## v3.1.0 - 2024-06-06
52
53- The client now sends information on what paintings you've checked if you're
54 playing painting shuffle, which can be used to populate the subway map in
55 v0.10.0 and later of the tracker.
56
57Download:
58[lingo-archipelago-v3.1.0.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v3.1.0.zip)<br/>
59Source: [v3.1.0](https://code.fourisland.com/lingo-archipelago/tag/?h=v3.1.0)
60
61## v3.0.3 - 2024-06-02
62
63- Fixed issue with mouse sensitivity being doubled.
64
65Download:
66[lingo-archipelago-v3.0.3.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v3.0.3.zip)<br/>
67Source: [v3.0.3](https://code.fourisland.com/lingo-archipelago/tag/?h=v3.0.3)
68
69## v3.0.2 - 2024-05-30
70
71- Fixed a crash that could happen if the local data got corrupted.
72- Added compatibility for
73 [non universally unique datapackage IDs](https://github.com/ArchipelagoMW/Archipelago/issues/3394).
74- Removed the arrows pointing at The Fearless when confusify world is enabled.
75
76Download:
77[lingo-archipelago-v3.0.2.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v3.0.2.zip)<br/>
78Source: [v3.0.2](https://code.fourisland.com/lingo-archipelago/tag/?h=v3.0.2)
79
3## v3.0.1 - 2024-04-22 80## v3.0.1 - 2024-04-22
4 81
5- Fixed issue where Progressive Hallway Room did not work properly on worlds 82- Fixed issue where Progressive Hallway Room did not work properly on worlds
diff --git a/util/generate_gamedata.rb b/util/generate_gamedata.rb index 4f9dfd7..83099ad 100644 --- a/util/generate_gamedata.rb +++ b/util/generate_gamedata.rb
@@ -8,6 +8,7 @@ outputpath = ARGV[2]
8CLASSIFICATION_NORMAL = 1 8CLASSIFICATION_NORMAL = 1
9CLASSIFICATION_REDUCED = 2 9CLASSIFICATION_REDUCED = 2
10CLASSIFICATION_INSANITY = 4 10CLASSIFICATION_INSANITY = 4
11CLASSIFICATION_SMALL_SPHERE_ONE = 8
11 12
12panel_to_id = {} 13panel_to_id = {}
13door_groups = {} 14door_groups = {}
@@ -89,6 +90,10 @@ config.each do |room_name, room_data|
89 classification_by_location_id[location_id] += CLASSIFICATION_REDUCED 90 classification_by_location_id[location_id] += CLASSIFICATION_REDUCED
90 end 91 end
91 end 92 end
93
94 if room_name == "Starting Room"
95 classification_by_location_id[location_id] += CLASSIFICATION_SMALL_SPHERE_ONE
96 end
92 end 97 end
93 end 98 end
94 99