about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Archipelago/load.gd62
1 files changed, 33 insertions, 29 deletions
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():
183 183
184 if apclient.confusify_world: 184 if apclient.confusify_world:
185 # Remove welcome back / color hallway / sunwarp indicators. 185 # Remove welcome back / color hallway / sunwarp indicators.
186 $Decorations/Signs/"Welcome Back Signs".queue_free() 186 get_node("Decorations/Signs/Welcome Back Signs").queue_free()
187 187
188 if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE: 188 if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE:
189 # Make The Wondrous's FIRE solely midred. 189 # Make The Wondrous's FIRE solely midred.
@@ -378,35 +378,39 @@ func _load():
378 var chosen_painting = remaining[rng.randi_range(0, remaining.size() - 1)] 378 var chosen_painting = remaining[rng.randi_range(0, remaining.size() - 1)]
379 instantiate_painting(painting, chosen_painting) 379 instantiate_painting(painting, chosen_painting)
380 380
381 # If door shuffle is on, we need to make some changes to the Art Gallery. 381 # We need to make some changes to the Art Gallery. The player should always
382 # The player should always have access to the backroom, but they shouldn't 382 # have access to the backroom, but they shouldn't have access to ORDER until
383 # have access to ORDER until getting the fifth floor, so will move the 383 # getting the fifth floor, so will move the backroom door. Also, the
384 # backroom door. Also, the paintings in the backroom should only show up as 384 # paintings in the backroom should only show up as the player gets the
385 # the player gets the progressive art gallery items. 385 # progressive art gallery items.
386 # 386 var backroom_door = get_node("Doors/Tower Room Area Doors/Door_painting_backroom")
387 # We also need to add an extra door to The Fearless. 387 backroom_door.translation.x = 97
388 backroom_door.translation.y = 0
389 backroom_door.translation.z = 39
390 backroom_door.scale.x = 2
391 backroom_door.scale.y = 2.5
392 backroom_door.scale.z = 1
393
394 for i in range(2, 6):
395 var painting_path = "Decorations/Paintings/scenery_painting_%db" % i
396 var painting_node = get_node(painting_path)
397 var rotate = painting_node.rotate
398 var target_path = painting_node.target_path
399 painting_node.set_script(load("res://scripts/painting_eye.gd"))
400 painting_node.rotate = rotate
401 painting_node.target_path = target_path
402 painting_node.move_to_x = painting_node.translation.x
403 painting_node.move_to_z = painting_node.translation.z
404 painting_node.translation.x = 88
405 painting_node.translation.z = 39
406
407 var ref_painting_path = "Decorations/Paintings/scenery_painting_%dc" % i
408 var ref_painting_node = get_node(ref_painting_path)
409 painting_node.key_path = ref_painting_node.key_path
410 painting_node._ready() # shows an error about looked_at being double connected
411
412 # If door shuffle is on, we need to add an extra door to The Fearless.
388 if apclient._door_shuffle: 413 if apclient._door_shuffle:
389 var backroom_door = get_node("Doors/Tower Room Area Doors/Door_painting_backroom")
390 backroom_door.translation.x = 97
391 backroom_door.translation.y = 0
392 backroom_door.translation.z = 39
393 backroom_door.scale.x = 2
394 backroom_door.scale.y = 2.5
395 backroom_door.scale.z = 1
396
397 for i in range(2, 6):
398 var painting_path = "Decorations/Paintings/scenery_painting_%db" % i
399 var painting_node = get_node(painting_path)
400 var rotate = painting_node.rotate
401 var target = painting_node.target
402 painting_node.set_script(load("res://scripts/painting_eye.gd"))
403 painting_node.rotate = rotate
404 painting_node.target = target
405 painting_node.move_to_x = painting_node.translation.x
406 painting_node.move_to_z = painting_node.translation.z
407 painting_node.translation.x = 88
408 painting_node.translation.z = 39
409
410 var fearless_door = get_node("Doors/Naps Room Doors/Door_hider_5").duplicate() 414 var fearless_door = get_node("Doors/Naps Room Doors/Door_hider_5").duplicate()
411 fearless_door.name = "Door_hider_new1" 415 fearless_door.name = "Door_hider_new1"
412 fearless_door.translation.y = 5 416 fearless_door.translation.y = 5