Merge branch 'main' into panels

1 files changed, 17 insertions, 24 deletions

@@ -6,7 +6,7 @@ const EXCLUDED_PAINTINGS = [
         "ascension_nw.tscn",
         "ascension_se.tscn",
         "ascension_sw.tscn",
-        "dan_L1_gate.tscn",
+        "color_hallways.tscn",
         "frame.tscn",
         "scenery_0.tscn",
         "scenery_1.tscn",
@@ -263,6 +263,9 @@ func _load():
                 hidden_parent.get_node("hidden_door_58").translation.x = 48
                 hidden_parent.get_node("hidden_door_58")._setReference("whiteBlock")
 
+                # Remove Fearless entrance indicator.
+                get_node("Decorations/Signs/Miscellaneous/Sign14").queue_free()
+
         if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE:
                 # Make The Wondrous's FIRE solely midred.
                 clear_gridmap_tile(-76.5, 1.5, -73.5)
@@ -375,33 +378,23 @@ func _load():
         ]
 
         if apclient._early_color_hallways:
-                var painting_scene = load("res://nodes/paintings/dan_L1_gate.tscn")
-                var mypainting_script = apclient.SCRIPT_mypainting
-
-                var exit_painting = painting_scene.instance()
-                exit_painting.set_name("color_exit_painting")
-                exit_painting.translation.x = -98.75
-                exit_painting.translation.y = 1
-                exit_painting.translation.z = 3.5
-                exit_painting.rotation_degrees.y = -90
-
-                var exit_mps = mypainting_script.new()
-                exit_mps.set_name("Script")
-                exit_mps.orientation = "west"
-                exit_painting.add_child(exit_mps)
+                var exit_painting = get_node("Decorations/Paintings/crown_painting_exit").duplicate()
+                exit_painting.name = "color_hallways_exit"
+                exit_painting.translation.x = 48
+                exit_painting.translation.y = 0.25
+                exit_painting.translation.z = -18
                 $Decorations/Paintings.add_child(exit_painting)
 
+                var painting_scene = load("res://nodes/paintings/color_hallways.tscn")
                 var enter_painting = painting_scene.instance()
-                enter_painting.set_name("color_enter_painting")
+                enter_painting.set_name("color_hallways")
                 enter_painting.translation.x = 4.5
-                enter_painting.translation.y = 1
-                enter_painting.translation.z = 6.75
-
-                var enter_mps = mypainting_script.new()
-                enter_mps.set_name("Script")
-                enter_mps.orientation = "south"
-                enter_mps.target = exit_mps
-                enter_painting.add_child(enter_mps)
+                enter_painting.translation.y = 0.25
+                enter_painting.translation.z = 7
+                enter_painting.rotation_degrees.y = 180
+                enter_painting.set_script(load("res://scripts/painting.gd"))
+                enter_painting.rotate = "90"
+                enter_painting.target_path = "../color_hallways_exit"
                 $Decorations/Paintings.add_child(enter_painting)
 
         # Randomize the paintings, if necessary.