diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-05-29 13:34:53 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-05-29 13:34:53 -0400 |
commit | eff3dff1142876b70e0336f03b4efb12db4e2bba (patch) | |
tree | d0f19c16094706e9c3a6d4b59d9f4ee44e535ad4 /Archipelago | |
parent | 8b97ed0755c8d950f5cc8f9a957636982f33f012 (diff) | |
parent | 2b0fcdde3144213676324163d721150a8641d610 (diff) | |
download | lingo-archipelago-eff3dff1142876b70e0336f03b4efb12db4e2bba.tar.gz lingo-archipelago-eff3dff1142876b70e0336f03b4efb12db4e2bba.tar.bz2 lingo-archipelago-eff3dff1142876b70e0336f03b4efb12db4e2bba.zip |
Merge branch 'main' into color-hallways
Diffstat (limited to 'Archipelago')
-rw-r--r-- | Archipelago/client.gd | 182 | ||||
-rw-r--r-- | Archipelago/load.gd | 113 | ||||
-rw-r--r-- | Archipelago/mypainting.gd | 5 | ||||
-rw-r--r-- | Archipelago/painting.gd | 10 | ||||
-rw-r--r-- | Archipelago/painting_eye.gd | 16 | ||||
-rw-r--r-- | Archipelago/painting_scenery.gd | 10 | ||||
-rw-r--r-- | Archipelago/panel.gd | 2 | ||||
-rw-r--r-- | Archipelago/pilgrimage_terminator.gd | 11 | ||||
-rw-r--r-- | Archipelago/settings_screen.gd | 35 | ||||
-rw-r--r-- | Archipelago/teleport.gd | 27 |
10 files changed, 333 insertions, 78 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd index a3b503a..bc952b9 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd | |||
@@ -7,6 +7,7 @@ var SCRIPT_multiplayer | |||
7 | var SCRIPT_mypainting | 7 | var SCRIPT_mypainting |
8 | var SCRIPT_notifier | 8 | var SCRIPT_notifier |
9 | var SCRIPT_panel | 9 | var SCRIPT_panel |
10 | var SCRIPT_pilgrimage_terminator | ||
10 | var SCRIPT_uuid | 11 | var SCRIPT_uuid |
11 | 12 | ||
12 | var ap_server = "" | 13 | var ap_server = "" |
@@ -15,60 +16,30 @@ var ap_pass = "" | |||
15 | var confusify_world = false | 16 | var confusify_world = false |
16 | var enable_multiplayer = false | 17 | var enable_multiplayer = false |
17 | var track_player = false | 18 | var track_player = false |
19 | var connection_history = [] | ||
18 | 20 | ||
19 | const my_version = "2.1.0" | 21 | const my_version = "3.0.1" |
20 | const ap_version = {"major": 0, "minor": 4, "build": 5, "class": "Version"} | 22 | const ap_version = {"major": 0, "minor": 4, "build": 6, "class": "Version"} |
21 | const color_items = [ | 23 | const color_items = [ |
22 | "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow" | 24 | "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow" |
23 | ] | 25 | ] |
24 | const progressive_items = { | 26 | const progressive_items = { |
25 | "Progressive Orange Tower": | 27 | "Progressive Orange Tower": |
26 | [ | 28 | ["Second Floor", "Third Floor", "Fourth Floor", "Fifth Floor", "Sixth Floor", "Seventh Floor"], |
27 | {"item": "Orange Tower - Second Floor", "display": "Second Floor"}, | ||
28 | {"item": "Orange Tower - Third Floor", "display": "Third Floor"}, | ||
29 | {"item": "Orange Tower - Fourth Floor", "display": "Fourth Floor"}, | ||
30 | {"item": "Orange Tower - Fifth Floor", "display": "Fifth Floor"}, | ||
31 | {"item": "Orange Tower - Sixth Floor", "display": "Sixth Floor"}, | ||
32 | {"item": "Orange Tower - Seventh Floor", "display": "Seventh Floor"}, | ||
33 | ], | ||
34 | "Progressive Art Gallery": | 29 | "Progressive Art Gallery": |
35 | [ | 30 | ["Second Floor", "Third Floor", "Fourth Floor", "Fifth Floor", "Exit"], |
36 | {"item": "Art Gallery - Second Floor", "display": "Second Floor"}, | 31 | "Progressive Hallway Room": ["First Door", "Second Door", "Third Door", "Fourth Door"], |
37 | {"item": "Art Gallery - Third Floor", "display": "Third Floor"}, | 32 | "Progressive Fearless": ["Second Floor", "Third Floor"], |
38 | {"item": "Art Gallery - Fourth Floor", "display": "Fourth Floor"}, | ||
39 | {"item": "Art Gallery - Fifth Floor", "display": "Fifth Floor"}, | ||
40 | {"item": "Art Gallery - Exit", "display": "Exit"}, | ||
41 | ], | ||
42 | "Progressive Hallway Room": | ||
43 | [ | ||
44 | {"item": "Outside The Agreeable - Hallway Door", "display": "First Door"}, | ||
45 | {"item": "Hallway Room (2) - Exit", "display": "Second Door"}, | ||
46 | {"item": "Hallway Room (3) - Exit", "display": "Third Door"}, | ||
47 | {"item": "Hallway Room (4) - Exit", "display": "Fourth Door"}, | ||
48 | ], | ||
49 | "Progressive Fearless": | ||
50 | [ | ||
51 | {"item": "The Fearless (First Floor) - Second Floor", "display": "Second Floor"}, | ||
52 | {"item": "The Fearless (Second Floor) - Third Floor", "display": "Third Floor"}, | ||
53 | ], | ||
54 | "Progressive Colorful": | 33 | "Progressive Colorful": |
55 | [ | 34 | ["White", "Black", "Red", "Yellow", "Blue", "Purple", "Orange", "Green", "Brown", "Gray"], |
56 | {"item": "The Colorful - White Door", "display": "White"}, | 35 | "Progressive Pilgrimage": |
57 | {"item": "The Colorful - Black Door", "display": "Black"}, | 36 | ["1 Sunwarp", "2 Sunwarp", "3 Sunwarp", "4 Sunwarp", "5 Sunwarp", "6 Sunwarp"] |
58 | {"item": "The Colorful - Red Door", "display": "Red"}, | ||
59 | {"item": "The Colorful - Yellow Door", "display": "Yellow"}, | ||
60 | {"item": "The Colorful - Blue Door", "display": "Blue"}, | ||
61 | {"item": "The Colorful - Purple Door", "display": "Purple"}, | ||
62 | {"item": "The Colorful - Orange Door", "display": "Orange"}, | ||
63 | {"item": "The Colorful - Green Door", "display": "Green"}, | ||
64 | {"item": "The Colorful - Brown Door", "display": "Brown"}, | ||
65 | {"item": "The Colorful - Gray Door", "display": "Gray"}, | ||
66 | ] | ||
67 | } | 37 | } |
68 | 38 | ||
69 | const kTHE_END = 0 | 39 | const kTHE_END = 0 |
70 | const kTHE_MASTER = 1 | 40 | const kTHE_MASTER = 1 |
71 | const kLEVEL_2 = 2 | 41 | const kLEVEL_2 = 2 |
42 | const kPILGRIMAGE = 3 | ||
72 | 43 | ||
73 | const kNO_PANEL_SHUFFLE = 0 | 44 | const kNO_PANEL_SHUFFLE = 0 |
74 | const kREARRANGE_PANELS = 1 | 45 | const kREARRANGE_PANELS = 1 |
@@ -81,6 +52,12 @@ const kCLASSIFICATION_REMOTE_NORMAL = 0 | |||
81 | const kCLASSIFICATION_REMOTE_REDUCED = 1 | 52 | const kCLASSIFICATION_REMOTE_REDUCED = 1 |
82 | const kCLASSIFICATION_REMOTE_INSANITY = 2 | 53 | const kCLASSIFICATION_REMOTE_INSANITY = 2 |
83 | 54 | ||
55 | const kSUNWARP_ACCESS_NORMAL = 0 | ||
56 | const kSUNWARP_ACCESS_DISABLED = 1 | ||
57 | const kSUNWARP_ACCESS_UNLOCK = 2 | ||
58 | const kSUNWARP_ACCESS_INDIVIDUAL = 3 | ||
59 | const kSUNWARP_ACCESS_PROGRESSIVE = 4 | ||
60 | |||
84 | var _client = WebSocketClient.new() | 61 | var _client = WebSocketClient.new() |
85 | var _should_process = false | 62 | var _should_process = false |
86 | var _initiated_disconnect = false | 63 | var _initiated_disconnect = false |
@@ -94,6 +71,7 @@ var _item_name_to_id = {} # LINGO only | |||
94 | var _location_name_to_id = {} # LINGO only | 71 | var _location_name_to_id = {} # LINGO only |
95 | 72 | ||
96 | var _remote_version = {"major": 0, "minor": 0, "build": 0} | 73 | var _remote_version = {"major": 0, "minor": 0, "build": 0} |
74 | var _gen_version = {"major": 0, "minor": 0, "build": 0} | ||
97 | 75 | ||
98 | # TODO: caching per MW/slot, reset between connections | 76 | # TODO: caching per MW/slot, reset between connections |
99 | var _authenticated = false | 77 | var _authenticated = false |
@@ -102,6 +80,7 @@ var _team = 0 | |||
102 | var _slot = 0 | 80 | var _slot = 0 |
103 | var _players = [] | 81 | var _players = [] |
104 | var _player_name_by_slot = {} | 82 | var _player_name_by_slot = {} |
83 | var _game_by_player = {} | ||
105 | var _checked_locations = [] | 84 | var _checked_locations = [] |
106 | var _slot_data = {} | 85 | var _slot_data = {} |
107 | var _paintings_mapping = {} | 86 | var _paintings_mapping = {} |
@@ -112,10 +91,17 @@ var _door_shuffle = false | |||
112 | var _color_shuffle = false | 91 | var _color_shuffle = false |
113 | var _panel_shuffle = 0 # none, rearrange | 92 | var _panel_shuffle = 0 # none, rearrange |
114 | var _painting_shuffle = false | 93 | var _painting_shuffle = false |
94 | var _sunwarp_access = 0 # normal, disabled, unlock, progressive | ||
115 | var _mastery_achievements = 21 | 95 | var _mastery_achievements = 21 |
116 | var _level_2_requirement = 223 | 96 | var _level_2_requirement = 223 |
117 | var _location_classification_bit = 0 | 97 | var _location_classification_bit = 0 |
118 | var _early_color_hallways = false | 98 | var _early_color_hallways = false |
99 | var _pilgrimage_compatibility = false # set to true for pre-0.4.6 | ||
100 | var _pilgrimage_enabled = false | ||
101 | var _pilgrimage_allows_roof_access = false | ||
102 | var _pilgrimage_allows_paintings = false | ||
103 | var _sunwarp_shuffle = false | ||
104 | var _sunwarp_mapping = [] | ||
119 | var _slot_seed = 0 | 105 | var _slot_seed = 0 |
120 | 106 | ||
121 | var _map_loaded = false | 107 | var _map_loaded = false |
@@ -147,6 +133,10 @@ func _init(): | |||
147 | var data = file.get_var(true) | 133 | var data = file.get_var(true) |
148 | file.close() | 134 | file.close() |
149 | 135 | ||
136 | if typeof(data) != TYPE_ARRAY: | ||
137 | global._print("AP settings file is corrupted") | ||
138 | data = [] | ||
139 | |||
150 | if data.size() > 0: | 140 | if data.size() > 0: |
151 | ap_server = data[0] | 141 | ap_server = data[0] |
152 | if data.size() > 1: | 142 | if data.size() > 1: |
@@ -161,6 +151,8 @@ func _init(): | |||
161 | enable_multiplayer = data[5] | 151 | enable_multiplayer = data[5] |
162 | if data.size() > 6: | 152 | if data.size() > 6: |
163 | track_player = data[6] | 153 | track_player = data[6] |
154 | if data.size() > 7: | ||
155 | connection_history = data[7] | ||
164 | 156 | ||
165 | processDatapackages() | 157 | processDatapackages() |
166 | 158 | ||
@@ -230,6 +222,7 @@ func _on_data(): | |||
230 | if cmd == "RoomInfo": | 222 | if cmd == "RoomInfo": |
231 | _seed = message["seed_name"] | 223 | _seed = message["seed_name"] |
232 | _remote_version = message["version"] | 224 | _remote_version = message["version"] |
225 | _gen_version = message["generator_version"] | ||
233 | 226 | ||
234 | var needed_games = [] | 227 | var needed_games = [] |
235 | for game in message["datapackage_checksums"].keys(): | 228 | for game in message["datapackage_checksums"].keys(): |
@@ -268,6 +261,7 @@ func _on_data(): | |||
268 | 261 | ||
269 | for player in _players: | 262 | for player in _players: |
270 | _player_name_by_slot[player["slot"]] = player["alias"] | 263 | _player_name_by_slot[player["slot"]] = player["alias"] |
264 | _game_by_player[player["slot"]] = message["slot_info"][str(player["slot"])]["game"] | ||
271 | 265 | ||
272 | _death_link = _slot_data.has("death_link") and _slot_data["death_link"] | 266 | _death_link = _slot_data.has("death_link") and _slot_data["death_link"] |
273 | if _death_link: | 267 | if _death_link: |
@@ -283,6 +277,10 @@ func _on_data(): | |||
283 | _painting_shuffle = _slot_data["shuffle_paintings"] | 277 | _painting_shuffle = _slot_data["shuffle_paintings"] |
284 | if _slot_data.has("shuffle_panels"): | 278 | if _slot_data.has("shuffle_panels"): |
285 | _panel_shuffle = _slot_data["shuffle_panels"] | 279 | _panel_shuffle = _slot_data["shuffle_panels"] |
280 | if _slot_data.has("sunwarp_access"): | ||
281 | _sunwarp_access = _slot_data["sunwarp_access"] | ||
282 | else: | ||
283 | _sunwarp_access = kSUNWARP_ACCESS_NORMAL | ||
286 | if _slot_data.has("seed"): | 284 | if _slot_data.has("seed"): |
287 | _slot_seed = _slot_data["seed"] | 285 | _slot_seed = _slot_data["seed"] |
288 | if _slot_data.has("painting_entrance_to_exit"): | 286 | if _slot_data.has("painting_entrance_to_exit"): |
@@ -300,6 +298,25 @@ func _on_data(): | |||
300 | _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY | 298 | _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY |
301 | if _slot_data.has("early_color_hallways"): | 299 | if _slot_data.has("early_color_hallways"): |
302 | _early_color_hallways = _slot_data["early_color_hallways"] | 300 | _early_color_hallways = _slot_data["early_color_hallways"] |
301 | if _slot_data.has("enable_pilgrimage"): | ||
302 | _pilgrimage_enabled = _slot_data["enable_pilgrimage"] | ||
303 | else: | ||
304 | _pilgrimage_compatibility = true | ||
305 | _pilgrimage_enabled = true | ||
306 | if _slot_data.has("pilgrimage_allows_roof_access"): | ||
307 | _pilgrimage_allows_roof_access = _slot_data["pilgrimage_allows_roof_access"] | ||
308 | else: | ||
309 | _pilgrimage_allows_roof_access = true | ||
310 | if _slot_data.has("pilgrimage_allows_paintings"): | ||
311 | _pilgrimage_allows_paintings = _slot_data["pilgrimage_allows_paintings"] | ||
312 | else: | ||
313 | _pilgrimage_allows_paintings = true | ||
314 | if _slot_data.has("shuffle_sunwarps"): | ||
315 | _sunwarp_shuffle = _slot_data["shuffle_sunwarps"] | ||
316 | else: | ||
317 | _sunwarp_shuffle = false | ||
318 | if _slot_data.has("sunwarp_permutation"): | ||
319 | _sunwarp_mapping = _slot_data["sunwarp_permutation"] | ||
303 | 320 | ||
304 | if track_player: | 321 | if track_player: |
305 | setValue("PlayerPos", {"x": 0, "z": 0}) | 322 | setValue("PlayerPos", {"x": 0, "z": 0}) |
@@ -315,6 +332,10 @@ func _on_data(): | |||
315 | var localdata = ap_file.get_var(true) | 332 | var localdata = ap_file.get_var(true) |
316 | ap_file.close() | 333 | ap_file.close() |
317 | 334 | ||
335 | if typeof(localdata) != TYPE_ARRAY: | ||
336 | global._print("AP localdata file is corrupted") | ||
337 | localdata = [] | ||
338 | |||
318 | if localdata.size() > 0: | 339 | if localdata.size() > 0: |
319 | _last_new_item = localdata[0] | 340 | _last_new_item = localdata[0] |
320 | else: | 341 | else: |
@@ -412,12 +433,14 @@ func _on_data(): | |||
412 | continue | 433 | continue |
413 | 434 | ||
414 | var item_name = "Unknown" | 435 | var item_name = "Unknown" |
415 | if _item_id_to_name.has(message["item"]["item"]): | 436 | var item_player_game = _game_by_player[message["receiving"]] |
416 | item_name = _item_id_to_name[message["item"]["item"]] | 437 | if _item_id_to_name[item_player_game].has(message["item"]["item"]): |
438 | item_name = _item_id_to_name[item_player_game][message["item"]["item"]] | ||
417 | 439 | ||
418 | var location_name = "Unknown" | 440 | var location_name = "Unknown" |
419 | if _location_id_to_name.has(message["item"]["location"]): | 441 | var location_player_game = _game_by_player[message["item"]["player"]] |
420 | location_name = _location_id_to_name[message["item"]["location"]] | 442 | if _location_id_to_name[location_player_game].has(message["item"]["location"]): |
443 | location_name = _location_id_to_name[location_player_game][message["item"]["location"]] | ||
421 | 444 | ||
422 | var player_name = "Unknown" | 445 | var player_name = "Unknown" |
423 | if _player_name_by_slot.has(message["receiving"]): | 446 | if _player_name_by_slot.has(message["receiving"]): |
@@ -485,7 +508,8 @@ func saveSettings(): | |||
485 | _datapackages, | 508 | _datapackages, |
486 | confusify_world, | 509 | confusify_world, |
487 | enable_multiplayer, | 510 | enable_multiplayer, |
488 | track_player | 511 | track_player, |
512 | connection_history | ||
489 | ] | 513 | ] |
490 | file.store_var(data, true) | 514 | file.store_var(data, true) |
491 | file.close() | 515 | file.close() |
@@ -566,12 +590,16 @@ func requestDatapackages(games): | |||
566 | func processDatapackages(): | 590 | func processDatapackages(): |
567 | _item_id_to_name = {} | 591 | _item_id_to_name = {} |
568 | _location_id_to_name = {} | 592 | _location_id_to_name = {} |
569 | for package in _datapackages.values(): | 593 | for game in _datapackages.keys(): |
594 | var package = _datapackages[game] | ||
595 | |||
596 | _item_id_to_name[game] = {} | ||
570 | for name in package["item_name_to_id"].keys(): | 597 | for name in package["item_name_to_id"].keys(): |
571 | _item_id_to_name[package["item_name_to_id"][name]] = name | 598 | _item_id_to_name[game][package["item_name_to_id"][name]] = name |
572 | 599 | ||
600 | _location_id_to_name[game] = {} | ||
573 | for name in package["location_name_to_id"].keys(): | 601 | for name in package["location_name_to_id"].keys(): |
574 | _location_id_to_name[package["location_name_to_id"][name]] = name | 602 | _location_id_to_name[game][package["location_name_to_id"][name]] = name |
575 | 603 | ||
576 | if _datapackages.has("Lingo"): | 604 | if _datapackages.has("Lingo"): |
577 | _item_name_to_id = _datapackages["Lingo"]["item_name_to_id"] | 605 | _item_name_to_id = _datapackages["Lingo"]["item_name_to_id"] |
@@ -660,8 +688,8 @@ func processItem(item, index, from, flags): | |||
660 | 688 | ||
661 | var gamedata = $Gamedata | 689 | var gamedata = $Gamedata |
662 | var item_name = "Unknown" | 690 | var item_name = "Unknown" |
663 | if _item_id_to_name.has(item): | 691 | if _item_id_to_name["Lingo"].has(item): |
664 | item_name = _item_id_to_name[item] | 692 | item_name = _item_id_to_name["Lingo"][item] |
665 | 693 | ||
666 | if gamedata.door_ids_by_item_id.has(int(item)): | 694 | if gamedata.door_ids_by_item_id.has(int(item)): |
667 | var doorsNode = get_tree().get_root().get_node("Spatial/Doors") | 695 | var doorsNode = get_tree().get_root().get_node("Spatial/Doors") |
@@ -682,19 +710,25 @@ func processItem(item, index, from, flags): | |||
682 | if painting_node != null: | 710 | if painting_node != null: |
683 | painting_node.get_node("Script").movePainting() | 711 | painting_node.get_node("Script").movePainting() |
684 | 712 | ||
713 | if gamedata.warp_ids_by_item_id.has(int(item)): | ||
714 | var warpsNode = get_tree().get_root().get_node("Spatial/Warps") | ||
715 | for warp_id in gamedata.warp_ids_by_item_id[int(item)]: | ||
716 | warpsNode.get_node(warp_id).unlock_warp() | ||
717 | |||
685 | # Handle progressive items. | 718 | # Handle progressive items. |
686 | if item_name in progressive_items.keys(): | 719 | if int(item) in gamedata.items_by_progressive_id.keys(): |
687 | if not item_name in _progressive_progress: | 720 | if not int(item) in _progressive_progress: |
688 | _progressive_progress[item_name] = 0 | 721 | _progressive_progress[int(item)] = 0 |
689 | 722 | ||
690 | if _progressive_progress[item_name] < progressive_items[item_name].size(): | 723 | if _progressive_progress[int(item)] < gamedata.items_by_progressive_id[int(item)].size(): |
691 | var subitem_name = progressive_items[item_name][_progressive_progress[item_name]]["item"] | 724 | var subitems = gamedata.items_by_progressive_id[int(item)] |
692 | global._print(subitem_name) | 725 | var subitem_id = subitems[_progressive_progress[int(item)]] |
693 | processItem(_item_name_to_id[subitem_name], null, null, null) | 726 | global._print("Subitem: %d" % subitem_id) |
694 | _progressive_progress[item_name] += 1 | 727 | processItem(subitem_id, null, null, null) |
695 | 728 | _progressive_progress[int(item)] += 1 | |
696 | if _color_shuffle and color_items.has(_item_id_to_name[item]): | 729 | |
697 | var lcol = _item_id_to_name[item].to_lower() | 730 | if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][item]): |
731 | var lcol = _item_id_to_name["Lingo"][item].to_lower() | ||
698 | if not _has_colors.has(lcol): | 732 | if not _has_colors.has(lcol): |
699 | _has_colors.append(lcol) | 733 | _has_colors.append(lcol) |
700 | emit_signal("evaluate_solvability") | 734 | emit_signal("evaluate_solvability") |
@@ -705,8 +739,8 @@ func processItem(item, index, from, flags): | |||
705 | saveLocaldata() | 739 | saveLocaldata() |
706 | 740 | ||
707 | if item_name in progressive_items: | 741 | if item_name in progressive_items: |
708 | var subitem = progressive_items[item_name][_progressive_progress[item_name] - 1] | 742 | var subitem = progressive_items[item_name][_progressive_progress[int(item)] - 1] |
709 | item_name += " (%s)" % subitem["display"] | 743 | item_name += " (%s)" % subitem |
710 | 744 | ||
711 | var player_name = "Unknown" | 745 | var player_name = "Unknown" |
712 | if _player_name_by_slot.has(from): | 746 | if _player_name_by_slot.has(from): |
@@ -742,6 +776,10 @@ func paintingIsVanilla(painting): | |||
742 | return !$Gamedata.mentioned_paintings.has(painting) | 776 | return !$Gamedata.mentioned_paintings.has(painting) |
743 | 777 | ||
744 | 778 | ||
779 | func warpIsVanilla(warp): | ||
780 | return !$Gamedata.mentioned_warps.has(warp) | ||
781 | |||
782 | |||
745 | func evaluateSolvability(): | 783 | func evaluateSolvability(): |
746 | emit_signal("evaluate_solvability") | 784 | emit_signal("evaluate_solvability") |
747 | 785 | ||
@@ -775,3 +813,17 @@ func colorForItemType(flags): | |||
775 | return "#d63a22" | 813 | return "#d63a22" |
776 | else: # filler | 814 | else: # filler |
777 | return "#14de9e" | 815 | return "#14de9e" |
816 | |||
817 | |||
818 | func compareVersion(lhs, rhs): | ||
819 | if lhs["major"] == rhs["major"]: | ||
820 | if lhs["minor"] == rhs["minor"]: | ||
821 | return lhs["build"] < rhs["build"] | ||
822 | else: | ||
823 | return lhs["minor"] < rhs["minor"] | ||
824 | else: | ||
825 | return lhs["major"] < rhs["major"] | ||
826 | |||
827 | |||
828 | func wasGeneratedBeforeVersion(major, minor, build): | ||
829 | return compareVersion(_gen_version, {"major": major, "minor": minor, "build": build}) | ||
diff --git a/Archipelago/load.gd b/Archipelago/load.gd index 1b77c9e..931dfde 100644 --- a/Archipelago/load.gd +++ b/Archipelago/load.gd | |||
@@ -96,18 +96,19 @@ func _load(): | |||
96 | 96 | ||
97 | wanderer_achieve.translation = Vector3(-51, -33, 35) # way under the map | 97 | wanderer_achieve.translation = Vector3(-51, -33, 35) # way under the map |
98 | 98 | ||
99 | # Turn THE COLORFUL into a cdp. | ||
100 | var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful") | ||
101 | var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn") | 99 | var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn") |
102 | var colorful_cdp = cdp_auto_scene.instance() | 100 | if !apclient.wasGeneratedBeforeVersion(0, 4, 5): |
103 | colorful_cdp.name = "CountdownPanel_colorful" | 101 | # Turn THE COLORFUL into a cdp. |
104 | colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful" | 102 | var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful") |
105 | colorful_cdp.panels = "../../Panels/Doorways Room" | 103 | var colorful_cdp = cdp_auto_scene.instance() |
106 | colorful_cdp.translation = real_colorful.translation | 104 | colorful_cdp.name = "CountdownPanel_colorful" |
107 | colorful_cdp.rotation = real_colorful.rotation | 105 | colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful" |
108 | get_node("CountdownPanels").add_child(colorful_cdp) | 106 | colorful_cdp.panels = "../../Panels/Doorways Room" |
109 | real_colorful.translation = Vector3(-51, -35, 35) # way under the map | 107 | colorful_cdp.translation = real_colorful.translation |
110 | get_node("Doors/Doorway Room Doors/Door_gray2").queue_free() | 108 | colorful_cdp.rotation = real_colorful.rotation |
109 | get_node("CountdownPanels").add_child(colorful_cdp) | ||
110 | real_colorful.translation = Vector3(-51, -35, 35) # way under the map | ||
111 | get_node("Doors/Doorway Room Doors/Door_gray2").queue_free() | ||
111 | 112 | ||
112 | # Set up The Master to be variable. | 113 | # Set up The Master to be variable. |
113 | var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16") | 114 | var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16") |
@@ -262,6 +263,9 @@ func _load(): | |||
262 | hidden_parent.get_node("hidden_door_58").translation.x = 48 | 263 | hidden_parent.get_node("hidden_door_58").translation.x = 48 |
263 | hidden_parent.get_node("hidden_door_58")._setReference("whiteBlock") | 264 | hidden_parent.get_node("hidden_door_58")._setReference("whiteBlock") |
264 | 265 | ||
266 | # Remove Fearless entrance indicator. | ||
267 | get_node("Decorations/Signs/Miscellaneous/Sign14").queue_free() | ||
268 | |||
265 | if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE: | 269 | if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE: |
266 | # Make The Wondrous's FIRE solely midred. | 270 | # Make The Wondrous's FIRE solely midred. |
267 | clear_gridmap_tile(-76.5, 1.5, -73.5) | 271 | clear_gridmap_tile(-76.5, 1.5, -73.5) |
@@ -353,6 +357,8 @@ func _load(): | |||
353 | victory_condition = "the master" | 357 | victory_condition = "the master" |
354 | elif apclient._victory_condition == apclient.kLEVEL_2: | 358 | elif apclient._victory_condition == apclient.kLEVEL_2: |
355 | victory_condition = "level 2" | 359 | victory_condition = "level 2" |
360 | elif apclient._victory_condition == apclient.kPILGRIMAGE: | ||
361 | victory_condition = "pilgrimage" | ||
356 | 362 | ||
357 | set_static_panel("Entry Room/Panel_this_this", victory_condition) | 363 | set_static_panel("Entry Room/Panel_this_this", victory_condition) |
358 | set_static_panel("Entry Room/Panel_hidden_hidden", "hewwo") | 364 | set_static_panel("Entry Room/Panel_hidden_hidden", "hewwo") |
@@ -572,11 +578,84 @@ func _load(): | |||
572 | level_2.get_node("Viewport/GUI/Panel/TextEdit").connect( | 578 | level_2.get_node("Viewport/GUI/Panel/TextEdit").connect( |
573 | "answer_correct", apclient, "completedGoal" | 579 | "answer_correct", apclient, "completedGoal" |
574 | ) | 580 | ) |
581 | elif apclient._victory_condition == apclient.kPILGRIMAGE: | ||
582 | var pilgrim_panel = self.get_node("Panels/Lingo Room/Panel_pilgrim") | ||
583 | pilgrim_panel.get_node("Viewport/GUI/Panel/TextEdit").connect( | ||
584 | "answer_correct", apclient, "completedGoal" | ||
585 | ) | ||
575 | else: | 586 | else: |
576 | var the_end = self.get_node("Decorations/EndPanel/Panel_end_end") | 587 | var the_end = self.get_node("Decorations/EndPanel/Panel_end_end") |
577 | the_end.get_node("Viewport/GUI/Panel/TextEdit").connect( | 588 | the_end.get_node("Viewport/GUI/Panel/TextEdit").connect( |
578 | "answer_correct", apclient, "completedGoal" | 589 | "answer_correct", apclient, "completedGoal" |
579 | ) | 590 | ) |
591 | |||
592 | # If pilgrimage does not allow roof access, add a node on the Crossroads | ||
593 | # Roof Access stairs that disables it. | ||
594 | if !apclient._pilgrimage_allows_roof_access: | ||
595 | var terminator = apclient.SCRIPT_pilgrimage_terminator.new() | ||
596 | terminator.name = "RoofAccessPilgrimageTerminator" | ||
597 | terminator.translation.x = -36 | ||
598 | terminator.translation.y = 3 | ||
599 | terminator.translation.z = -35 | ||
600 | |||
601 | var terminator_shape = CollisionShape.new() | ||
602 | terminator_shape.shape = BoxShape.new() | ||
603 | terminator_shape.shape.extents.x = 0.1 | ||
604 | |||
605 | terminator.add_child(terminator_shape) | ||
606 | get_node("Decorations").add_child(terminator) | ||
607 | |||
608 | if apclient._sunwarp_shuffle: | ||
609 | # Sunwarps 1 and 6 are rotated differently from the rest, so we have to fix that. | ||
610 | get_node("Decorations/Teleporter Windows/localmap").rotation_degrees.y = 0 | ||
611 | get_node("Decorations/Teleporter Windows/localmap2").rotation_degrees.y = 0 | ||
612 | get_node("Decorations/Teleporter Windows/localmap11").rotation_degrees.y = 0 | ||
613 | get_node("Decorations/Teleporter Windows/localmap12").rotation_degrees.y = 0 | ||
614 | get_node("Decorations/Teleporter Windows/localmap13").rotation_degrees.y = -90 | ||
615 | |||
616 | get_node("Warps/Teleporter Warps/Sunwarp_enter_1").translation.x = 19.5 | ||
617 | get_node("Warps/Teleporter Warps/Sunwarp_exit_1").translation.x = -15.5 | ||
618 | get_node("Warps/Teleporter Warps/Sunwarp_enter_6").translation.x = 4.5 | ||
619 | get_node("Warps/Teleporter Warps/Sunwarp_exit_6").translation.x = -37.5 | ||
620 | get_node("Warps/Teleporter Warps/Sunwarp_exit_7").translation.z = 23.5 | ||
621 | |||
622 | # Change the sunwarps in accordance with the mapping. | ||
623 | var sw_orig_translations = [] | ||
624 | var sw_text_translations = [] | ||
625 | var sw_text_rotations = [] | ||
626 | for i in range(1,7): | ||
627 | sw_orig_translations.append(get_node("Warps/Teleporter Warps/Sunwarp_enter_%d" % i).translation) | ||
628 | sw_text_translations.append(get_node("Decorations/Signs/Sunwarp Numbers/enter_%d" % i).translation) | ||
629 | sw_text_rotations.append(get_node("Decorations/Signs/Sunwarp Numbers/enter_%d" % i).rotation_degrees) | ||
630 | for i in range(1,7): | ||
631 | sw_orig_translations.append(get_node("Warps/Teleporter Warps/Sunwarp_exit_%d" % i).translation) | ||
632 | sw_text_translations.append(get_node("Decorations/Signs/Sunwarp Numbers/exit_%d" % i).translation) | ||
633 | sw_text_rotations.append(get_node("Decorations/Signs/Sunwarp Numbers/exit_%d" % i).rotation_degrees) | ||
634 | |||
635 | var sw_enter_indicators = [4, 5, 6, 12, 7, 10] | ||
636 | for i in range(1,7): | ||
637 | get_node("Warps/Teleporter Warps/Sunwarp_enter_%d" % i).translation = sw_orig_translations[apclient._sunwarp_mapping[i-1]] | ||
638 | get_node("Warps/Teleporter Warps/Sunwarp_exit_%d" % i).translation = sw_orig_translations[apclient._sunwarp_mapping[i+5]] | ||
639 | |||
640 | get_node("Decorations/Signs/Sunwarp Numbers/enter_%d" % i).translation = sw_text_translations[apclient._sunwarp_mapping[i-1]] | ||
641 | get_node("Decorations/Signs/Sunwarp Numbers/enter_%d" % i).rotation_degrees = sw_text_rotations[apclient._sunwarp_mapping[i-1]] | ||
642 | |||
643 | get_node("Decorations/Signs/Sunwarp Numbers/exit_%d" % i).translation = sw_text_translations[apclient._sunwarp_mapping[i+5]] | ||
644 | get_node("Decorations/Signs/Sunwarp Numbers/exit_%d" % i).rotation_degrees = sw_text_rotations[apclient._sunwarp_mapping[i+5]] | ||
645 | |||
646 | var enter_rot = _dir_to_int(gamedata.sunwarps[apclient._sunwarp_mapping[i-1]]["orientation"]) * 90 | ||
647 | var exit_rot = _dir_to_int(gamedata.sunwarps[apclient._sunwarp_mapping[i+5]]["orientation"]) * 90 | ||
648 | var final_rot = enter_rot - exit_rot | ||
649 | if final_rot < 0: | ||
650 | final_rot += 360 | ||
651 | get_node("Warps/Teleporter Warps/Sunwarp_enter_%d" % i).rotate = str(final_rot) | ||
652 | |||
653 | var sw_enter_indicator_pos = gamedata.sunwarps[apclient._sunwarp_mapping[i-1]]["entrance_indicator_pos"] | ||
654 | var sw_enter_indicator = get_node("Decorations/Signs/Welcome Back Signs/Sign%d" % sw_enter_indicators[i-1]) | ||
655 | sw_enter_indicator.translation.x = sw_enter_indicator_pos[0] | ||
656 | sw_enter_indicator.translation.y = sw_enter_indicator_pos[1] | ||
657 | sw_enter_indicator.translation.z = sw_enter_indicator_pos[2] | ||
658 | sw_enter_indicator.rotation_degrees.y = (enter_rot * -1) + 180 | ||
580 | 659 | ||
581 | # Create the effects node. | 660 | # Create the effects node. |
582 | var effects_script = apclient.SCRIPT_effects | 661 | var effects_script = apclient.SCRIPT_effects |
@@ -707,3 +786,15 @@ func set_small_gridmap_tile(x, y, z, tile): | |||
707 | 786 | ||
708 | func archipelago_disconnected(reason): | 787 | func archipelago_disconnected(reason): |
709 | messages.showMessage(reason) | 788 | messages.showMessage(reason) |
789 | |||
790 | |||
791 | func _dir_to_int(dir): | ||
792 | if dir == "north": | ||
793 | return 0 | ||
794 | elif dir == "west": | ||
795 | return 1 | ||
796 | elif dir == "south": | ||
797 | return 2 | ||
798 | elif dir == "east": | ||
799 | return 3 | ||
800 | return 4 | ||
diff --git a/Archipelago/mypainting.gd b/Archipelago/mypainting.gd index 5e9c703..999b122 100644 --- a/Archipelago/mypainting.gd +++ b/Archipelago/mypainting.gd | |||
@@ -86,6 +86,11 @@ func _looked_at(body, painting): | |||
86 | body.rotate_y(3 * PI / 2) | 86 | body.rotate_y(3 * PI / 2) |
87 | body.velocity = body.velocity.rotated(Vector3(0, 1, 0), 3 * PI / 2) | 87 | body.velocity = body.velocity.rotated(Vector3(0, 1, 0), 3 * PI / 2) |
88 | 88 | ||
89 | var apclient = global.get_node("Archipelago") | ||
90 | if !apclient._pilgrimage_allows_paintings: | ||
91 | global.sunwarp = 1 | ||
92 | body.get_node("pivot/camera/sunwarp_background").visible = false | ||
93 | |||
89 | 94 | ||
90 | func _dir_to_int(dir): | 95 | func _dir_to_int(dir): |
91 | if dir == "north": | 96 | if dir == "north": |
diff --git a/Archipelago/painting.gd b/Archipelago/painting.gd new file mode 100644 index 0000000..adc8337 --- /dev/null +++ b/Archipelago/painting.gd | |||
@@ -0,0 +1,10 @@ | |||
1 | extends "res://scripts/painting.gd" | ||
2 | |||
3 | func _looked_at(var body, var painting): | ||
4 | ._looked_at(body, painting) | ||
5 | |||
6 | if body.is_in_group("player") && (painting.get_name() == self.get_name()): | ||
7 | var apclient = global.get_node("Archipelago") | ||
8 | if !apclient._pilgrimage_allows_paintings: | ||
9 | global.sunwarp = 1 | ||
10 | body.get_node("pivot/camera/sunwarp_background").visible = false | ||
diff --git a/Archipelago/painting_eye.gd b/Archipelago/painting_eye.gd index 53d42b5..b2e6973 100644 --- a/Archipelago/painting_eye.gd +++ b/Archipelago/painting_eye.gd | |||
@@ -3,9 +3,23 @@ extends "res://scripts/painting_eye.gd" | |||
3 | 3 | ||
4 | func _answer_correct(): | 4 | func _answer_correct(): |
5 | var apclient = global.get_node("Archipelago") | 5 | var apclient = global.get_node("Archipelago") |
6 | if not apclient._door_shuffle or apclient.paintingIsVanilla(self.name): | 6 | if !apclient._pilgrimage_compatibility and get_name() == "pilgrim_painting2": |
7 | # When pilgrimage is enabled, the HOT CRUST panel should actually move the sun painting. | ||
8 | if apclient._pilgrimage_enabled: | ||
9 | movePainting() | ||
10 | elif not apclient._door_shuffle or apclient.paintingIsVanilla(self.name): | ||
7 | ._answer_correct() | 11 | ._answer_correct() |
8 | 12 | ||
9 | 13 | ||
10 | func movePainting(): | 14 | func movePainting(): |
11 | ._answer_correct() | 15 | ._answer_correct() |
16 | |||
17 | |||
18 | func _looked_at(var body, var painting): | ||
19 | ._looked_at(body, painting) | ||
20 | |||
21 | if body.is_in_group("player") && (painting.get_name() == self.get_name()): | ||
22 | var apclient = global.get_node("Archipelago") | ||
23 | if !apclient._pilgrimage_allows_paintings: | ||
24 | global.sunwarp = 1 | ||
25 | body.get_node("pivot/camera/sunwarp_background").visible = false | ||
diff --git a/Archipelago/painting_scenery.gd b/Archipelago/painting_scenery.gd index f49d602..1186e2f 100644 --- a/Archipelago/painting_scenery.gd +++ b/Archipelago/painting_scenery.gd | |||
@@ -9,3 +9,13 @@ func _answer_correct(): | |||
9 | 9 | ||
10 | func movePainting(): | 10 | func movePainting(): |
11 | ._answer_correct() | 11 | ._answer_correct() |
12 | |||
13 | |||
14 | func _looked_at(var body, var painting): | ||
15 | ._looked_at(body, painting) | ||
16 | |||
17 | if body.is_in_group("player") && (painting.get_name() == self.get_name()): | ||
18 | var apclient = global.get_node("Archipelago") | ||
19 | if !apclient._pilgrimage_allows_paintings: | ||
20 | global.sunwarp = 1 | ||
21 | body.get_node("pivot/camera/sunwarp_background").visible = false | ||
diff --git a/Archipelago/panel.gd b/Archipelago/panel.gd index aec18e8..fc5963a 100644 --- a/Archipelago/panel.gd +++ b/Archipelago/panel.gd | |||
@@ -22,7 +22,7 @@ func _ready(): | |||
22 | else: | 22 | else: |
23 | atbash_text += old_char | 23 | atbash_text += old_char |
24 | 24 | ||
25 | self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").connect( | 25 | var _ignore = self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").connect( |
26 | "answer_correct", self, "answer_correct" | 26 | "answer_correct", self, "answer_correct" |
27 | ) | 27 | ) |
28 | 28 | ||
diff --git a/Archipelago/pilgrimage_terminator.gd b/Archipelago/pilgrimage_terminator.gd new file mode 100644 index 0000000..29db2ee --- /dev/null +++ b/Archipelago/pilgrimage_terminator.gd | |||
@@ -0,0 +1,11 @@ | |||
1 | extends Area | ||
2 | |||
3 | |||
4 | func _ready(): | ||
5 | var _connected = self.connect("body_entered", self, "_body_entered") | ||
6 | |||
7 | |||
8 | func _body_entered(body): | ||
9 | if body.is_in_group("player"): | ||
10 | global.sunwarp = 1 | ||
11 | body.get_node("pivot/camera/sunwarp_background").visible = false | ||
diff --git a/Archipelago/settings_screen.gd b/Archipelago/settings_screen.gd index de64214..79fdcc3 100644 --- a/Archipelago/settings_screen.gd +++ b/Archipelago/settings_screen.gd | |||
@@ -30,6 +30,8 @@ func _ready(): | |||
30 | apclient_instance.SCRIPT_mypainting = load("user://maps/Archipelago/mypainting.gd") | 30 | apclient_instance.SCRIPT_mypainting = load("user://maps/Archipelago/mypainting.gd") |
31 | apclient_instance.SCRIPT_notifier = load("user://maps/Archipelago/notifier.gd") | 31 | apclient_instance.SCRIPT_notifier = load("user://maps/Archipelago/notifier.gd") |
32 | apclient_instance.SCRIPT_panel = load("user://maps/Archipelago/panel.gd") | 32 | apclient_instance.SCRIPT_panel = load("user://maps/Archipelago/panel.gd") |
33 | var pilg_term = load("user://maps/Archipelago/pilgrimage_terminator.gd") | ||
34 | apclient_instance.SCRIPT_pilgrimage_terminator = pilg_term | ||
33 | apclient_instance.SCRIPT_uuid = load("user://maps/Archipelago/vendor/uuid.gd") | 35 | apclient_instance.SCRIPT_uuid = load("user://maps/Archipelago/vendor/uuid.gd") |
34 | 36 | ||
35 | var apdata = ResourceLoader.load("user://maps/Archipelago/gamedata.gd") | 37 | var apdata = ResourceLoader.load("user://maps/Archipelago/gamedata.gd") |
@@ -45,6 +47,7 @@ func _ready(): | |||
45 | # Let's also inject any scripts we need to inject now. | 47 | # Let's also inject any scripts we need to inject now. |
46 | installScriptExtension(apclient_instance.SCRIPT_doorControl) | 48 | installScriptExtension(apclient_instance.SCRIPT_doorControl) |
47 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/load.gd")) | 49 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/load.gd")) |
50 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting.gd")) | ||
48 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_eye.gd")) | 51 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_eye.gd")) |
49 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_scenery.gd")) | 52 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_scenery.gd")) |
50 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelLevelSwitch.gd")) | 53 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelLevelSwitch.gd")) |
@@ -52,6 +55,7 @@ func _ready(): | |||
52 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelInput.gd")) | 55 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelInput.gd")) |
53 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pause_menu.gd")) | 56 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pause_menu.gd")) |
54 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd")) | 57 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd")) |
58 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd")) | ||
55 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldTransporter.gd")) | 59 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldTransporter.gd")) |
56 | 60 | ||
57 | var apclient = global.get_node("Archipelago") | 61 | var apclient = global.get_node("Archipelago") |
@@ -67,6 +71,19 @@ func _ready(): | |||
67 | self.get_node("Panel/multiplayer_box").pressed = apclient.enable_multiplayer | 71 | self.get_node("Panel/multiplayer_box").pressed = apclient.enable_multiplayer |
68 | self.get_node("Panel/position_box").pressed = apclient.track_player | 72 | self.get_node("Panel/position_box").pressed = apclient.track_player |
69 | 73 | ||
74 | var history_box = get_node("Panel/connection_history") | ||
75 | if apclient.connection_history.empty(): | ||
76 | history_box.disabled = true | ||
77 | else: | ||
78 | history_box.disabled = false | ||
79 | |||
80 | var i = 0 | ||
81 | for details in apclient.connection_history: | ||
82 | history_box.get_popup().add_item("%s (%s)" % [details[1], details[0]], i) | ||
83 | i += 1 | ||
84 | |||
85 | history_box.get_popup().connect("id_pressed", self, "historySelected") | ||
86 | |||
70 | # Show client version. | 87 | # Show client version. |
71 | self.get_node("Panel/title").text = "ARCHIPELAGO (%s)" % apclient.my_version | 88 | self.get_node("Panel/title").text = "ARCHIPELAGO (%s)" % apclient.my_version |
72 | 89 | ||
@@ -109,6 +126,15 @@ func connectionStatus(message): | |||
109 | func connectionSuccessful(): | 126 | func connectionSuccessful(): |
110 | var apclient = global.get_node("Archipelago") | 127 | var apclient = global.get_node("Archipelago") |
111 | 128 | ||
129 | # Save connection details | ||
130 | var connection_details = [apclient.ap_server, apclient.ap_user, apclient.ap_pass] | ||
131 | if apclient.connection_history.has(connection_details): | ||
132 | apclient.connection_history.erase(connection_details) | ||
133 | apclient.connection_history.push_front(connection_details) | ||
134 | if apclient.connection_history.size() > 10: | ||
135 | apclient.connection_history.resize(10) | ||
136 | apclient.saveSettings() | ||
137 | |||
112 | # Switch to LL1 | 138 | # Switch to LL1 |
113 | Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) | 139 | Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) |
114 | global.save_file = apclient.getSaveFileName() | 140 | global.save_file = apclient.getSaveFileName() |
@@ -130,3 +156,12 @@ func connectionUnsuccessful(error_message): | |||
130 | popup.popup_exclusive = true | 156 | popup.popup_exclusive = true |
131 | popup.get_ok().visible = true | 157 | popup.get_ok().visible = true |
132 | popup.popup_centered() | 158 | popup.popup_centered() |
159 | |||
160 | |||
161 | func historySelected(index): | ||
162 | var apclient = global.get_node("Archipelago") | ||
163 | var details = apclient.connection_history[index] | ||
164 | |||
165 | self.get_node("Panel/server_box").text = details[0] | ||
166 | self.get_node("Panel/player_box").text = details[1] | ||
167 | self.get_node("Panel/password_box").text = details[2] | ||
diff --git a/Archipelago/teleport.gd b/Archipelago/teleport.gd new file mode 100644 index 0000000..532f081 --- /dev/null +++ b/Archipelago/teleport.gd | |||
@@ -0,0 +1,27 @@ | |||
1 | extends "res://scripts/teleport.gd" | ||
2 | |||
3 | var _unlocked = true | ||
4 | |||
5 | |||
6 | func _ready(): | ||
7 | var apclient = global.get_node("Archipelago") | ||
8 | if self.get_parent().name == "Teleporter Warps": | ||
9 | if apclient._sunwarp_access != apclient.kSUNWARP_ACCESS_NORMAL: | ||
10 | _unlocked = false | ||
11 | elif apclient._door_shuffle and !apclient.warpIsVanilla(self.get_parent().name + "/" + self.name): | ||
12 | _unlocked = false | ||
13 | |||
14 | |||
15 | func _body_entered(body): | ||
16 | if _unlocked: | ||
17 | ._body_entered(body) | ||
18 | |||
19 | if body.is_in_group("player"): | ||
20 | var apclient = global.get_node("Archipelago") | ||
21 | if !apclient._pilgrimage_enabled: | ||
22 | global.sunwarp = 1 | ||
23 | body.get_node("pivot/camera/sunwarp_background").visible = false | ||
24 | |||
25 | |||
26 | func unlock_warp(): | ||
27 | _unlocked = true | ||