about summary refs log tree commit diff stats
path: root/apworld
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2026-02-07 07:49:30 -0500
committerStar Rauchenberger <fefferburbia@gmail.com>2026-02-07 07:49:30 -0500
commita2abd188f762659c5e7595079d2925bc2869b455 (patch)
treec675ec2e500277c75d3e0a0edaab6aa0534136b2 /apworld
parentc4bcb55b540a91388b6c87a9425a1b0731b3b3a0 (diff)
downloadlingo2-archipelago-a2abd188f762659c5e7595079d2925bc2869b455.tar.gz
lingo2-archipelago-a2abd188f762659c5e7595079d2925bc2869b455.tar.bz2
lingo2-archipelago-a2abd188f762659c5e7595079d2925bc2869b455.zip
Clientside RTE shuffle
Diffstat (limited to 'apworld')
-rw-r--r--apworld/client/gamedata.gd8
-rw-r--r--apworld/client/manager.gd18
-rw-r--r--apworld/client/player.gd29
-rw-r--r--apworld/client/rteMenu.gd54
4 files changed, 108 insertions, 1 deletions
diff --git a/apworld/client/gamedata.gd b/apworld/client/gamedata.gd index d7e3136..373f981 100644 --- a/apworld/client/gamedata.gd +++ b/apworld/client/gamedata.gd
@@ -16,6 +16,7 @@ var anti_trap_ids = {}
16var location_name_by_id = {} 16var location_name_by_id = {}
17var ending_display_name_by_name = {} 17var ending_display_name_by_name = {}
18var port_id_by_ap_id = {} 18var port_id_by_ap_id = {}
19var map_id_by_rte_ap_id = {}
19 20
20var kSYMBOL_ITEMS 21var kSYMBOL_ITEMS
21 22
@@ -57,6 +58,9 @@ func load(data_bytes):
57 for map in objects.get_maps(): 58 for map in objects.get_maps():
58 map_id_by_name[map.get_name()] = map.get_id() 59 map_id_by_name[map.get_name()] = map.get_id()
59 60
61 if map.has_rte_ap_id():
62 map_id_by_rte_ap_id[map.get_rte_ap_id()] = map.get_id()
63
60 for door in objects.get_doors(): 64 for door in objects.get_doors():
61 var map = objects.get_maps()[door.get_map_id()] 65 var map = objects.get_maps()[door.get_map_id()]
62 66
@@ -300,3 +304,7 @@ func _get_keyholder_location_name(keyholder):
300 "%s - %s Keyholder" 304 "%s - %s Keyholder"
301 % [_get_room_object_location_prefix(keyholder), keyholder.get_key().to_upper()] 305 % [_get_room_object_location_prefix(keyholder), keyholder.get_key().to_upper()]
302 ) 306 )
307
308
309func vec3d_to_vector3(input) -> Vector3:
310 return Vector3(input.get_x(), input.get_y(), input.get_z())
diff --git a/apworld/client/manager.gd b/apworld/client/manager.gd index 1e0b549..00f03ea 100644 --- a/apworld/client/manager.gd +++ b/apworld/client/manager.gd
@@ -46,6 +46,10 @@ const kCYAN_DOOR_BEHAVIOR_H2 = 0
46const kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER = 1 46const kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER = 1
47const kCYAN_DOOR_BEHAVIOR_ITEM = 2 47const kCYAN_DOOR_BEHAVIOR_ITEM = 2
48 48
49const kFAST_TRAVEL_ACCESS_VANILLA = 0
50const kFAST_TRAVEL_ACCESS_UNLOCKED = 1
51const kFAST_TRAVEL_ACCESS_ITEMS = 2
52
49const kEndingNameByVictoryValue = { 53const kEndingNameByVictoryValue = {
50 0: "GRAY", 54 0: "GRAY",
51 1: "PURPLE", 55 1: "PURPLE",
@@ -69,9 +73,11 @@ var daedalus_roof_access = false
69var enable_gift_maps = [] 73var enable_gift_maps = []
70var enable_icarus = false 74var enable_icarus = false
71var endings_requirement = 0 75var endings_requirement = 0
76var fast_travel_access = 0
72var keyholder_sanity = false 77var keyholder_sanity = false
73var masteries_requirement = 0 78var masteries_requirement = 0
74var port_pairings = {} 79var port_pairings = {}
80var rte_mapping = []
75var shuffle_control_center_colors = false 81var shuffle_control_center_colors = false
76var shuffle_doors = false 82var shuffle_doors = false
77var shuffle_gallery_paintings = false 83var shuffle_gallery_paintings = false
@@ -269,6 +275,13 @@ func _process_item(item, amount):
269 if item_id == gamedata.objects.get_special_ids()["Numbers"] and global.map == "the_fuzzy": 275 if item_id == gamedata.objects.get_special_ids()["Numbers"] and global.map == "the_fuzzy":
270 global.allow_numbers = true 276 global.allow_numbers = true
271 277
278 if gamedata.map_id_by_rte_ap_id.has(item_id):
279 var rteInner = get_tree().get_root().get_node_or_null(
280 "scene/player/pause_menu/menu/return/rteInner"
281 )
282 if rteInner != null:
283 rteInner.refreshButtons()
284
272 # Show a message about the item if it's new. 285 # Show a message about the item if it's new.
273 if int(item["index"]) > _last_new_item: 286 if int(item["index"]) > _last_new_item:
274 _last_new_item = int(item["index"]) 287 _last_new_item = int(item["index"])
@@ -469,6 +482,7 @@ func _client_connected(slot_data):
469 enable_gift_maps = slot_data.get("enable_gift_maps", []) 482 enable_gift_maps = slot_data.get("enable_gift_maps", [])
470 enable_icarus = bool(slot_data.get("enable_icarus", false)) 483 enable_icarus = bool(slot_data.get("enable_icarus", false))
471 endings_requirement = int(slot_data.get("endings_requirement", 0)) 484 endings_requirement = int(slot_data.get("endings_requirement", 0))
485 fast_travel_access = int(slot_data.get("fast_travel_access", 0))
472 keyholder_sanity = bool(slot_data.get("keyholder_sanity", false)) 486 keyholder_sanity = bool(slot_data.get("keyholder_sanity", false))
473 masteries_requirement = int(slot_data.get("masteries_requirement", 0)) 487 masteries_requirement = int(slot_data.get("masteries_requirement", 0))
474 shuffle_control_center_colors = bool(slot_data.get("shuffle_control_center_colors", false)) 488 shuffle_control_center_colors = bool(slot_data.get("shuffle_control_center_colors", false))
@@ -496,6 +510,10 @@ func _client_connected(slot_data):
496 raw_pp[p1] 510 raw_pp[p1]
497 )] 511 )]
498 512
513 rte_mapping.clear()
514 if slot_data.has("rte"):
515 rte_mapping = slot_data.get("rte")
516
499 # Set up item locks. 517 # Set up item locks.
500 _item_locks = {} 518 _item_locks = {}
501 519
diff --git a/apworld/client/player.gd b/apworld/client/player.gd index 5fac9fd..95c05d7 100644 --- a/apworld/client/player.gd +++ b/apworld/client/player.gd
@@ -13,6 +13,8 @@ func _ready():
13 13
14 var ap = global.get_node("Archipelago") 14 var ap = global.get_node("Archipelago")
15 var gamedata = global.get_node("Gamedata") 15 var gamedata = global.get_node("Gamedata")
16 var map_id = gamedata.map_id_by_name.get(global.map)
17 var map_data = gamedata.objects.get_maps()[map_id]
16 18
17 compass = global.get_node("Compass") 19 compass = global.get_node("Compass")
18 compass.visible = ap.show_compass 20 compass.visible = ap.show_compass
@@ -26,8 +28,33 @@ func _ready():
26 28
27 ap.update_job_well_done_sign() 29 ap.update_job_well_done_sign()
28 30
31 # Set up the RTE trigger, if there is one.
32 if map_data.has_rte_trigger_pos():
33 var oneShotListener_prefab = preload("res://objects/nodes/listeners/oneShotListener.tscn")
34 var triggerArea_prefab = preload("res://objects/nodes/triggerArea.tscn")
35 var unlockSetterListener_prefab = preload(
36 "res://objects/nodes/listeners/unlockSetterListener.tscn"
37 )
38
39 var triggerArea = triggerArea_prefab.instantiate()
40 triggerArea.name = "rte_triggerArea"
41 triggerArea.position = gamedata.vec3d_to_vector3(map_data.get_rte_trigger_pos())
42 triggerArea.scale = gamedata.vec3d_to_vector3(map_data.get_rte_trigger_scale())
43 get_parent().add_child.call_deferred(triggerArea)
44
45 var osl = oneShotListener_prefab.instantiate()
46 osl.name = "rte_osl"
47 osl.senders.append(NodePath("/root/scene/rte_triggerArea"))
48 get_parent().add_child.call_deferred(osl)
49
50 var usl = unlockSetterListener_prefab.instantiate()
51 usl.name = "rte_usl"
52 usl.key = "rte_%s" % global.map
53 usl.value = "unlocked"
54 usl.senders.append(NodePath("/root/scene/rte_osl"))
55 get_parent().add_child.call_deferred(usl)
56
29 # Set up door locations. 57 # Set up door locations.
30 var map_id = gamedata.map_id_by_name.get(global.map)
31 for door in gamedata.objects.get_doors(): 58 for door in gamedata.objects.get_doors():
32 if door.get_map_id() != map_id: 59 if door.get_map_id() != map_id:
33 continue 60 continue
diff --git a/apworld/client/rteMenu.gd b/apworld/client/rteMenu.gd index 5882d77..4b526cf 100644 --- a/apworld/client/rteMenu.gd +++ b/apworld/client/rteMenu.gd
@@ -1,5 +1,7 @@
1extends "res://scripts/ui/rteMenu.gd" 1extends "res://scripts/ui/rteMenu.gd"
2 2
3var buttons = []
4
3 5
4func _readier(): 6func _readier():
5 var ap = global.get_node("Archipelago") 7 var ap = global.get_node("Archipelago")
@@ -8,5 +10,57 @@ func _readier():
8 get_node("rte_daedalus").show() 10 get_node("rte_daedalus").show()
9 11
10 switcher.preload_map("res://objects/scenes/daedalus.tscn") 12 switcher.preload_map("res://objects/scenes/daedalus.tscn")
13 elif !ap.rte_mapping.is_empty():
14 buttons = [$rte_the_plaza, $rte_the_gallery, $rte_daedalus, $rte_control_center]
15 for i in range(4):
16 buttons[i].name = "button_%d" % i
17 for i in range(4):
18 _setupButton(buttons[i], ap.rte_mapping[i])
19
20 refreshButtons()
11 else: 21 else:
12 super()._readier() 22 super()._readier()
23
24
25func _setupButton(button, map_name):
26 switcher.preload_map("res://objects/scenes/%s.tscn" % map_name)
27
28 button.hide()
29 button.text = map_name.replace("_", " ")
30 button.name = "rte_%s" % map_name
31
32 var ap = global.get_node("Archipelago")
33 if (
34 ap.fast_travel_access == ap.kFAST_TRAVEL_ACCESS_VANILLA
35 and !unlocks.data.has("rte_%s" % map_name)
36 ):
37 unlocks.data["rte_%s" % map_name] = ""
38
39
40func refreshButtons():
41 var ap = global.get_node("Archipelago")
42 if ap.rte_mapping.is_empty():
43 return
44
45 for i in range(4):
46 if _shouldShowButton(ap.rte_mapping[i]):
47 buttons[i].show()
48 else:
49 buttons[i].hide()
50
51
52func _shouldShowButton(map_name):
53 var ap = global.get_node("Archipelago")
54
55 if ap.fast_travel_access == ap.kFAST_TRAVEL_ACCESS_VANILLA:
56 return unlocks.data["rte_%s" % map_name] == "unlocked"
57 elif ap.fast_travel_access == ap.kFAST_TRAVEL_ACCESS_UNLOCKED:
58 return true
59 elif ap.fast_travel_access == ap.kFAST_TRAVEL_ACCESS_ITEMS:
60 var gamedata = global.get_node("Gamedata")
61 var map_id = gamedata.map_id_by_name[map_name]
62 var rte_ap_id = gamedata.objects.get_maps()[map_id].get_rte_ap_id()
63
64 return ap.client.hasItem(rte_ap_id)
65
66 return false