From 36d849d38730c04a89efc94e9f75ccaa8c7c0dd8 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Mon, 27 Nov 2023 18:56:55 -0500 Subject: Art gallery should be changed in vanilla doors too --- Archipelago/load.gd | 62 ++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 29 deletions(-) (limited to 'Archipelago') diff --git a/Archipelago/load.gd b/Archipelago/load.gd index 3a6efec..550ae1f 100644 --- a/Archipelago/load.gd +++ b/Archipelago/load.gd @@ -183,7 +183,7 @@ func _load(): if apclient.confusify_world: # Remove welcome back / color hallway / sunwarp indicators. - $Decorations/Signs/"Welcome Back Signs".queue_free() + get_node("Decorations/Signs/Welcome Back Signs").queue_free() if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE: # Make The Wondrous's FIRE solely midred. @@ -378,35 +378,39 @@ func _load(): var chosen_painting = remaining[rng.randi_range(0, remaining.size() - 1)] instantiate_painting(painting, chosen_painting) - # If door shuffle is on, we need to make some changes to the Art Gallery. - # The player should always have access to the backroom, but they shouldn't - # have access to ORDER until getting the fifth floor, so will move the - # backroom door. Also, the paintings in the backroom should only show up as - # the player gets the progressive art gallery items. - # - # We also need to add an extra door to The Fearless. + # We need to make some changes to the Art Gallery. The player should always + # have access to the backroom, but they shouldn't have access to ORDER until + # getting the fifth floor, so will move the backroom door. Also, the + # paintings in the backroom should only show up as the player gets the + # progressive art gallery items. + var backroom_door = get_node("Doors/Tower Room Area Doors/Door_painting_backroom") + backroom_door.translation.x = 97 + backroom_door.translation.y = 0 + backroom_door.translation.z = 39 + backroom_door.scale.x = 2 + backroom_door.scale.y = 2.5 + backroom_door.scale.z = 1 + + for i in range(2, 6): + var painting_path = "Decorations/Paintings/scenery_painting_%db" % i + var painting_node = get_node(painting_path) + var rotate = painting_node.rotate + var target_path = painting_node.target_path + painting_node.set_script(load("res://scripts/painting_eye.gd")) + painting_node.rotate = rotate + painting_node.target_path = target_path + painting_node.move_to_x = painting_node.translation.x + painting_node.move_to_z = painting_node.translation.z + painting_node.translation.x = 88 + painting_node.translation.z = 39 + + var ref_painting_path = "Decorations/Paintings/scenery_painting_%dc" % i + var ref_painting_node = get_node(ref_painting_path) + painting_node.key_path = ref_painting_node.key_path + painting_node._ready() # shows an error about looked_at being double connected + + # If door shuffle is on, we need to add an extra door to The Fearless. if apclient._door_shuffle: - var backroom_door = get_node("Doors/Tower Room Area Doors/Door_painting_backroom") - backroom_door.translation.x = 97 - backroom_door.translation.y = 0 - backroom_door.translation.z = 39 - backroom_door.scale.x = 2 - backroom_door.scale.y = 2.5 - backroom_door.scale.z = 1 - - for i in range(2, 6): - var painting_path = "Decorations/Paintings/scenery_painting_%db" % i - var painting_node = get_node(painting_path) - var rotate = painting_node.rotate - var target = painting_node.target - painting_node.set_script(load("res://scripts/painting_eye.gd")) - painting_node.rotate = rotate - painting_node.target = target - painting_node.move_to_x = painting_node.translation.x - painting_node.move_to_z = painting_node.translation.z - painting_node.translation.x = 88 - painting_node.translation.z = 39 - var fearless_door = get_node("Doors/Naps Room Doors/Door_hider_5").duplicate() fearless_door.name = "Door_hider_new1" fearless_door.translation.y = 5 -- cgit 1.4.1