about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2024-06-10 00:02:46 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2024-06-10 00:02:46 -0400
commit293223cb40d04b3ab30a9f6d7160944b391ba608 (patch)
tree822eb17ed831ea37cf488abc957bca6c6900cf64
parentca025c7620affd6ef994403c1e46e8060969b370 (diff)
parenteff3dff1142876b70e0336f03b4efb12db4e2bba (diff)
downloadlingo-archipelago-293223cb40d04b3ab30a9f6d7160944b391ba608.tar.gz
lingo-archipelago-293223cb40d04b3ab30a9f6d7160944b391ba608.tar.bz2
lingo-archipelago-293223cb40d04b3ab30a9f6d7160944b391ba608.zip
Merge branch 'color-hallways'
-rw-r--r--Archipelago/load.gd38
1 files changed, 14 insertions, 24 deletions
diff --git a/Archipelago/load.gd b/Archipelago/load.gd index abe2b03..931dfde 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",
@@ -378,33 +378,23 @@ func _load():
378 ] 378 ]
379 379
380 if apclient._early_color_hallways: 380 if apclient._early_color_hallways:
381 var painting_scene = load("res://nodes/paintings/dan_L1_gate.tscn") 381 var exit_painting = get_node("Decorations/Paintings/crown_painting_exit").duplicate()
382 var mypainting_script = apclient.SCRIPT_mypainting 382 exit_painting.name = "color_hallways_exit"
383 383 exit_painting.translation.x = 48
384 var exit_painting = painting_scene.instance() 384 exit_painting.translation.y = 0.25
385 exit_painting.set_name("color_exit_painting") 385 exit_painting.translation.z = -18
386 exit_painting.translation.x = -98.75
387 exit_painting.translation.y = 1
388 exit_painting.translation.z = 3.5
389 exit_painting.rotation_degrees.y = -90
390
391 var exit_mps = mypainting_script.new()
392 exit_mps.set_name("Script")
393 exit_mps.orientation = "west"
394 exit_painting.add_child(exit_mps)
395 $Decorations/Paintings.add_child(exit_painting) 386 $Decorations/Paintings.add_child(exit_painting)
396 387
388 var painting_scene = load("res://nodes/paintings/color_hallways.tscn")
397 var enter_painting = painting_scene.instance() 389 var enter_painting = painting_scene.instance()
398 enter_painting.set_name("color_enter_painting") 390 enter_painting.set_name("color_hallways")
399 enter_painting.translation.x = 4.5 391 enter_painting.translation.x = 4.5
400 enter_painting.translation.y = 1 392 enter_painting.translation.y = 0.25
401 enter_painting.translation.z = 6.75 393 enter_painting.translation.z = 7
402 394 enter_painting.rotation_degrees.y = 180
403 var enter_mps = mypainting_script.new() 395 enter_painting.set_script(load("res://scripts/painting.gd"))
404 enter_mps.set_name("Script") 396 enter_painting.rotate = "90"
405 enter_mps.orientation = "south" 397 enter_painting.target_path = "../color_hallways_exit"
406 enter_mps.target = exit_mps
407 enter_painting.add_child(enter_mps)
408 $Decorations/Paintings.add_child(enter_painting) 398 $Decorations/Paintings.add_child(enter_painting)
409 399
410 # Randomize the paintings, if necessary. 400 # Randomize the paintings, if necessary.