src/base-environments/transition/code/dolly.gd

@@ -1,35 +0,0 @@
-## A dolly tweens all contents to and from two destination points, and to its origin. 
-class_name Dolly
-extends Node3D
-
-@export var start_arrived : bool = false
-@export var arrival_time : float = 10.0
-@export var leave_time : float  = 12.0
-
-@onready var origination : Node3D = $Origination
-@onready var destination : Node3D = $Destination 
-
-
-var tween : Tween = null
-
-func _ready() -> void:
-	if not start_arrived:
-		for child in get_children(true):
-			if not child.visible: continue
-			child.global_position = origination.global_position
-	
-	
-func arrive() -> void:
-	if tween: tween.kill()
-	tween = create_tween().set_trans(Tween.TRANS_CIRC).set_ease(Tween.EASE_OUT)
-	for child in get_children(true):
-		if not child.visible: continue
-		tween.parallel().tween_property(child, "global_position", self.global_position, arrival_time)
-
-
-func leave() -> void:
-	if tween: tween.kill()
-	tween = create_tween().set_trans(Tween.TRANS_QUART).set_ease(Tween.EASE_IN)
-	for child in get_children(true):
-		if not child.visible: continue
-		tween.parallel().tween_property(child, "global_position", destination.global_position, leave_time)

src/base-environments/transition/code/dolly.gd.uid

@@ -1 +0,0 @@
-uid://dgfje4druu3sw

src/base-environments/transition/code/station_dolly.gd

@@ -0,0 +1 @@
+extends Node3D

src/base-environments/transition/code/station_dolly.gd.uid

@@ -0,0 +1 @@
+uid://n76m10f1c4pa

src/base-environments/transition/import/textures/LuzTunelLarga.tres

@@ -14,7 +14,7 @@ metallic_texture_channel = 2
 roughness_texture = ExtResource("2_i1m4q")
 roughness_texture_channel = 1
 emission_enabled = true
-emission_energy_multiplier = 4.0
+emission_energy_multiplier = 2.0
 emission_on_uv2 = true
 emission_texture = ExtResource("3_fnaaw")
 normal_enabled = true

src/base-environments/transition/import/textures/meta_station_imported.tscn

@@ -63,6 +63,18 @@ gi_mode = 0
 [node name="water" parent="." index="1"]
 gi_mode = 0
 
+[node name="speakers_004" parent="." index="17"]
+cast_shadow = 0
+
+[node name="speakers_003" parent="." index="18"]
+cast_shadow = 0
+
+[node name="speakers_002" parent="." index="19"]
+cast_shadow = 0
+
+[node name="speakers_001" parent="." index="20"]
+cast_shadow = 0
+
 [node name="signal_lights_004" parent="." index="21"]
 gi_mode = 2
 
@@ -76,9 +88,14 @@ gi_mode = 2
 gi_mode = 2
 
 [node name="railway_lighting" parent="." index="35"]
-cast_shadow = 0
 gi_mode = 2
 
+[node name="MegafonoBase_LP_Megafono_0_007" parent="." index="38"]
+cast_shadow = 0
+
+[node name="MegafonoBase_LP_Megafono_0_008" parent="." index="39"]
+cast_shadow = 0
+
 [node name="FluorescentLuz" parent="." index="41"]
 cast_shadow = 0
 

src/base-environments/transition/station.gd

@@ -0,0 +1,18 @@
+class_name Station extends Resource
+
+enum id {
+	HIRSCHFELD,
+	PARITY,
+	EXUPERY,
+	ROSENTHAL,
+	UNI_1,
+	UNI_2,
+	MINISTRY
+}
+
+@export var station_name: StringName = ""
+@export var memory: Scenes.id = Scenes.id.YOUTH_DRAVEN
+@export_file("*.tscn") var station_path: String = ""
+@export var arriving_lines: Dictionary[TrainLine.id, float]
+@export var departing_lines: Dictionary[TrainLine.id, float]
+@export var announcement: AudioStream

src/base-environments/transition/station.gd.uid

@@ -0,0 +1 @@
+uid://cyeh7sa20bmcf

src/base-environments/transition/station_dolly.gd

@@ -0,0 +1 @@
+extends Node3D

src/base-environments/transition/station_dolly.gd.uid

@@ -0,0 +1 @@
+uid://vdp63n8e2ey7

src/base-environments/transition/subway_sequence.gd

@@ -27,19 +27,11 @@ func start_room():
 
 	await Main.curtain.open()
 
-	$Track2Dolly.arrive()
-	$Track1Dolly.arrive()
-	
 	await get_tree().create_timer(20).timeout
 	_set_signage_texts("signage2", "Verkehr z. Zt.\nunregelmäßig")
-
-	$Track2Dolly.leave()
-	
 	await get_tree().create_timer(10).timeout
 	_set_signage_texts("signage1", "Bitte Ansage\nbeachten")
 
-	$Track1Dolly.leave()
-	
 
 
 
@@ -51,7 +43,6 @@ func _set_signage_texts(group: StringName, message: String) -> void:
 
 var left_first_station: bool = false
 func on_first_station() -> void:
-	return
 	Scenes.enabled_sequences += 1 << Scenes.id.ADULT_DND
 	await get_tree().create_timer(5.0).timeout
 	%ShedulePlayer_R.play("train_arriving")

src/base-environments/transition/subway_sequence.tscn

@@ -1,22 +1,19 @@
-[gd_scene load_steps=59 format=3 uid="uid://fgp3tbah7msy"]
+[gd_scene load_steps=53 format=3 uid="uid://fgp3s99h7msy"]
 
-[ext_resource type="Script" uid="uid://snugj1gnggjj" path="res://base-environments/transition/subway_sequence.gd" id="1_yfan7"]
+[ext_resource type="Script" uid="uid://snugj1gnggjj" path="res://base-environments/transition/subway_sequence.gd" id="1_qkqxa"]
-[ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="2_il5go"]
+[ext_resource type="PackedScene" uid="uid://4j1tlhfm3p40" path="res://base-environments/transition/subway_train.tscn" id="2_qkqxa"]
-[ext_resource type="PackedScene" uid="uid://4j1tlhfm3p40" path="res://base-environments/transition/subway_train.tscn" id="3_iq74k"]
+[ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="3_1dsor"]
-[ext_resource type="PackedScene" uid="uid://d2j0d88axhfue" path="res://base-environments/transition/stations/dungeon_station.tscn" id="5_rum2v"]
+[ext_resource type="Script" uid="uid://br1w2nt4pj8lt" path="res://vfx/post_processing/post_process_shader_template.gd" id="3_asqp6"]
-[ext_resource type="Script" uid="uid://dgfje4druu3sw" path="res://base-environments/transition/code/dolly.gd" id="5_yfan7"]
+[ext_resource type="PackedScene" uid="uid://dmvn3x67nduqp" path="res://base-environments/transition/stations/uni_station.tscn" id="4_0vobo"]
-[ext_resource type="VoxelGIData" uid="uid://d0ywd1vewvryc" path="res://base-environments/transition/vfx/dungeon_VoxelGI.res" id="6_ii0j1"]
+[ext_resource type="Script" uid="uid://mgertkn5ub0g" path="res://dev-util/hdr_sdr_switch.gd" id="4_1dsor"]
-[ext_resource type="PackedScene" uid="uid://bk1l1a7eae838" path="res://base-environments/transition/misc/subway_map.tscn" id="8_rcbu2"]
+[ext_resource type="Material" uid="uid://bx6dygeknq3qd" path="res://base-environments/transition/vfx/mat_subwaymap.tres" id="4_wgcl8"]
-[ext_resource type="PackedScene" uid="uid://dmvn3x67nduqp" path="res://base-environments/transition/stations/uni_station.tscn" id="9_bdj4u"]
+[ext_resource type="PackedScene" uid="uid://d2j0d88axhfue" path="res://base-environments/transition/stations/dungeon_station.tscn" id="5_0gtr1"]
-[ext_resource type="VoxelGIData" uid="uid://dram781e770bj" path="res://base-environments/transition/vfx/uni_voxelGI.tres" id="10_j1yes"]
+[ext_resource type="PackedScene" uid="uid://uhayiqixlv0e" path="res://base-environments/transition/stations/volunteer_station.tscn" id="5_grftg"]
-[ext_resource type="PackedScene" uid="uid://inavuxjmq6hi" path="res://base-environments/transition/stations/burnout_station.tscn" id="11_vomua"]
+[ext_resource type="PackedScene" uid="uid://inavuxjmq6hi" path="res://base-environments/transition/stations/burnout_station.tscn" id="5_ppxbm"]
-[ext_resource type="VoxelGIData" uid="uid://bnys22lw8ll31" path="res://base-environments/transition/burnout_VoxelGI.tres" id="12_jwt33"]
+[ext_resource type="PackedScene" uid="uid://bk1l1a7eae838" path="res://base-environments/transition/misc/subway_map.tscn" id="6_asqp6"]
-[ext_resource type="PackedScene" uid="uid://uhayiqixlv0e" path="res://base-environments/transition/stations/volunteer_station.tscn" id="13_265nv"]
+[ext_resource type="Material" uid="uid://dchm78gv31r6a" path="res://base-environments/transition/shaders/timetravel.tres" id="6_l33v1"]
-[ext_resource type="VoxelGIData" uid="uid://cavxvoj11x3tw" path="res://base-environments/transition/volunteer_VoxelGI.tres" id="14_w5sv3"]
+[ext_resource type="FontFile" uid="uid://bdkb43smt08c0" path="res://import/fonts/Ubuntu-B.ttf" id="8_sofnd"]
-[ext_resource type="Material" uid="uid://dchm78gv31r6a" path="res://base-environments/transition/shaders/timetravel.tres" id="15_hdxw7"]
+[ext_resource type="VoxelGIData" uid="uid://braw7md6v8ni4" path="res://base-environments/transition/vfx/VoxelGI_data.res" id="9_ppxbm"]
-[ext_resource type="Script" uid="uid://br1w2nt4pj8lt" path="res://vfx/post_processing/post_process_shader_template.gd" id="16_a6spw"]
-[ext_resource type="Script" uid="uid://mgertkn5ub0g" path="res://dev-util/hdr_sdr_switch.gd" id="17_ov8kk"]
-[ext_resource type="PackedScene" uid="uid://df3ur5wll8vx7" path="res://base-environments/transition/subway_track.tscn" id="17_yfan7"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sofnd"]
 radius = 1.8393555
@@ -132,44 +129,10 @@ size = Vector3(0.5, 3, 5.547009)
 [sub_resource type="BoxShape3D" id="BoxShape3D_e75no"]
 size = Vector3(0.5661621, 3, 1.411961)
 
-[sub_resource type="ViewportTexture" id="ViewportTexture_rkl48"]
+[sub_resource type="QuadMesh" id="QuadMesh_c3uo7"]
-viewport_path = NodePath("Stations/StationDolly/SubwayMap3D/MapViewport")
+material = ExtResource("4_wgcl8")
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_il5go"]
-resource_local_to_scene = true
-albedo_color = Color(0.70380783, 0.70380783, 0.70380783, 1)
-albedo_texture = SubResource("ViewportTexture_rkl48")
-metallic = 0.3
-metallic_specular = 0.3
-roughness = 0.15
-emission_enabled = true
-emission = Color(1, 1, 1, 1)
-emission_energy_multiplier = 0.1
-emission_operator = 1
-emission_texture = SubResource("ViewportTexture_rkl48")
-
-[sub_resource type="QuadMesh" id="QuadMesh_rkl48"]
-resource_local_to_scene = true
-material = SubResource("StandardMaterial3D_il5go")
 size = Vector2(1.505, 1)
 
-[sub_resource type="QuadMesh" id="QuadMesh_iq74k"]
-material = SubResource("StandardMaterial3D_il5go")
-size = Vector2(1.505, 1)
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rkl48"]
-resource_name = "beam_metal.001"
-cull_mode = 2
-albedo_color = Color(0.27999386, 0.27999386, 0.27999386, 1)
-metallic = 0.8
-metallic_specular = 0.3
-roughness = 0.2
-uv1_scale = Vector3(0.1, 0.1, 0.1)
-
-[sub_resource type="BoxMesh" id="BoxMesh_rkl48"]
-material = SubResource("StandardMaterial3D_rkl48")
-size = Vector3(0.1, 0.7, 1.5)
-
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sofnd"]
 albedo_color = Color(0.5953387, 0.22751653, 9.62615e-08, 1)
 metallic = 0.7
@@ -237,7 +200,7 @@ enabled = false
 effect_callback_type = 4
 needs_motion_vectors = false
 needs_normal_roughness = false
-script = ExtResource("16_a6spw")
+script = ExtResource("3_asqp6")
 shader_code = "//color.rgb = pow(color.rgb, vec3(1.3));
 color.rgb = max(vec3(0.0), pow(color.rgb, vec3(1.6, 1.5, 1.4)) * vec3(5.0, 4.0, 4.0) + vec3(-0.01, 0.01, -0.0));
 //float gray = color.r * 0.2125 + color.g * 0.7154 + color.b * 0.0721;
@@ -247,14 +210,20 @@ metadata/_custom_type_script = "uid://br1w2nt4pj8lt"
 [sub_resource type="Compositor" id="Compositor_e75no"]
 compositor_effects = Array[CompositorEffect]([SubResource("CompositorEffect_820wi")])
 
+[sub_resource type="ViewportTexture" id="ViewportTexture_1dsor"]
+viewport_path = NodePath("Displays/Train_Display_R")
+
+[sub_resource type="ViewportTexture" id="ViewportTexture_csq32"]
+viewport_path = NodePath("Displays/Train_Display_L")
+
 [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_naikh"]
 
-[node name="SubwaySequence" type="Node3D"]
+[node name="Transition" type="Node3D"]
-script = ExtResource("1_yfan7")
+script = ExtResource("1_qkqxa")
 
 [node name="Logic" type="Node3D" parent="."]
 
-[node name="PlayerController" parent="Logic" instance=ExtResource("2_il5go")]
+[node name="PlayerController" parent="Logic" instance=ExtResource("3_1dsor")]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.0218763, 6.1035156e-05, -5.6086483)
 initial_pitch = -30.0
@@ -280,16 +249,40 @@ transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, -0.4
 shape = SubResource("CapsuleShape3D_sofnd")
 
 [node name="Train" type="Node3D" parent="."]
-visible = false
 
 [node name="Visuals" type="Node3D" parent="Train"]
 
+[node name="ShedulePlayer_L" type="AnimationPlayer" parent="Train/Visuals"]
+unique_name_in_owner = true
+root_node = NodePath("../Train2/subway_train")
+autoplay = "ini"
+
+[node name="ShedulePlayer_R" type="AnimationPlayer" parent="Train/Visuals"]
+unique_name_in_owner = true
+root_node = NodePath("../Train/subway_train")
+autoplay = "ini"
+
+[node name="Train" type="Node3D" parent="Train/Visuals"]
+unique_name_in_owner = true
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6.2404795, 0, -33.053352)
+visible = false
+
+[node name="subway_train" parent="Train/Visuals/Train" instance=ExtResource("2_qkqxa")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7804413, 0, 0)
+
+[node name="MeshInstance3D8" type="MeshInstance3D" parent="Train/Visuals/Train"]
+transform = Transform3D(-42.01, 4.0756225e-07, 4.3401164e-07, -6.330816e-06, -2.8743172, -0.1808367, -5.9450595e-06, 0.1808367, -2.8743172, -3.9468384, 1.286, 2.488358)
+visible = false
+material_override = SubResource("ShaderMaterial_0vobo")
+mesh = SubResource("QuadMesh_ppxbm")
+skeleton = NodePath("../../../GPUParticles3D4")
+
 [node name="Train2" type="Node3D" parent="Train/Visuals"]
 unique_name_in_owner = true
 transform = Transform3D(1.3113416e-07, 0, 1, 0, 1, 0, -1, 0, 1.3113416e-07, -6.24, 0, -31.131655)
 visible = false
 
-[node name="subway_train" parent="Train/Visuals/Train2" instance=ExtResource("3_iq74k")]
+[node name="subway_train" parent="Train/Visuals/Train2" instance=ExtResource("2_qkqxa")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7804413, 0, 0)
 
 [node name="MeshInstance3D8" type="MeshInstance3D" parent="Train/Visuals/Train2"]
@@ -543,126 +536,212 @@ shape = SubResource("BoxShape3D_e75no")
 transform = Transform3D(-2.1855693e-07, 0, -1, 0, 1, 0, 1, 0, -2.1855693e-07, -7.211279, 1.558737, -24.056223)
 shape = SubResource("BoxShape3D_e75no")
 
-[node name="Track1Dolly" parent="." instance=ExtResource("17_yfan7")]
+[node name="SubwayMap3D" type="Node3D" parent="Train"]
-unique_name_in_owner = true
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.409, -22.624)
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.2, -0.2, -32.5)
-visible = false
 
-[node name="Track2Dolly" parent="." instance=ExtResource("17_yfan7")]
+[node name="MapPanel1" type="MeshInstance3D" parent="Train/SubwayMap3D"]
-unique_name_in_owner = true
+transform = Transform3D(0, 0, 1.46175, 0, 1.46175, 0, -1.46175, 0, 0, 0.075, 0, 0)
-transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -6.2, -0.2, -32.5)
+mesh = SubResource("QuadMesh_c3uo7")
-visible = false
+skeleton = NodePath("")
+surface_material_override/0 = ExtResource("4_wgcl8")
 
-[node name="Stations" type="Node3D" parent="."]
+[node name="MapPanel2" type="MeshInstance3D" parent="Train/SubwayMap3D"]
-unique_name_in_owner = true
+transform = Transform3D(-6.389512e-08, 0, -1.46175, 0, 1.46175, 0, 1.46175, 0, -6.389512e-08, -0.075, 0, 0)
+mesh = SubResource("QuadMesh_c3uo7")
+skeleton = NodePath("")
+surface_material_override/0 = ExtResource("4_wgcl8")
 
-[node name="StationDolly" type="Node3D" parent="Stations"]
+[node name="CSGCombiner3D" type="CSGCombiner3D" parent="Train/SubwayMap3D"]
-unique_name_in_owner = true
-script = ExtResource("5_yfan7")
-start_arrived = true
-metadata/_custom_type_script = "uid://dgfje4druu3sw"
-
-[node name="Origination" type="Node3D" parent="Stations/StationDolly"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 130)
-visible = false
-
-[node name="Destination" type="Node3D" parent="Stations/StationDolly"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -130)
-visible = false
-
-[node name="SubwayMap3D" type="Node3D" parent="Stations/StationDolly"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, -22.624)
-
-[node name="MapPanel1" type="MeshInstance3D" parent="Stations/StationDolly/SubwayMap3D"]
-transform = Transform3D(-6.389512e-08, 0, 1.46175, 0, 1.46175, 0, -1.46175, 0, -6.389512e-08, 0, 0, 0)
-mesh = SubResource("QuadMesh_rkl48")
-
-[node name="MapPanel2" type="MeshInstance3D" parent="Stations/StationDolly/SubwayMap3D"]
-transform = Transform3D(-6.389512e-08, 0, -1.46175, 0, 1.46175, 0, 1.46175, 0, -6.389512e-08, 0, 0, 0)
-mesh = SubResource("QuadMesh_iq74k")
-
-[node name="Stand" type="MeshInstance3D" parent="Stations/StationDolly/SubwayMap3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.15, 0)
-mesh = SubResource("BoxMesh_rkl48")
-
-[node name="CSGCombiner3D" type="CSGCombiner3D" parent="Stations/StationDolly/SubwayMap3D"]
 transform = Transform3D(1.46175, 0, 0, 0, 1.46175, 0, 0, 0, 1.46175, 0, 0, 0)
 material_override = SubResource("StandardMaterial3D_sofnd")
 use_collision = true
 
-[node name="CSGMesh3D" type="CSGMesh3D" parent="Stations/StationDolly/SubwayMap3D/CSGCombiner3D"]
+[node name="CSGMesh3D" type="CSGMesh3D" parent="Train/SubwayMap3D/CSGCombiner3D"]
 transform = Transform3D(1, 0, -7.1054274e-15, 0, 1, 0, 7.1054274e-15, 0, 1, 0, 0, 0)
 mesh = SubResource("BoxMesh_8c5ii")
 
-[node name="CSGMesh3D2" type="CSGMesh3D" parent="Stations/StationDolly/SubwayMap3D/CSGCombiner3D"]
+[node name="CSGMesh3D2" type="CSGMesh3D" parent="Train/SubwayMap3D/CSGCombiner3D"]
 transform = Transform3D(1, 0, -7.1054274e-15, 0, 1, 0, 7.1054274e-15, 0, 1, 0, 0, 0)
 operation = 2
 mesh = SubResource("BoxMesh_symoa")
 
-[node name="MapViewport" type="SubViewport" parent="Stations/StationDolly/SubwayMap3D"]
+[node name="SubViewport" type="SubViewport" parent="Train/SubwayMap3D"]
 disable_3d = true
 size = Vector2i(2896, 2048)
 render_target_update_mode = 4
 
-[node name="SubwayMap" parent="Stations/StationDolly/SubwayMap3D/MapViewport" instance=ExtResource("8_rcbu2")]
+[node name="SubwayMap" parent="Train/SubwayMap3D/SubViewport" instance=ExtResource("6_asqp6")]
 unique_name_in_owner = true
 
-[node name="dungeon_station" parent="Stations/StationDolly" instance=ExtResource("5_rum2v")]
+[node name="Stations" type="Node3D" parent="."]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.021, 0, -0.018)
 
-[node name="VoxelGI" type="VoxelGI" parent="Stations/StationDolly/dungeon_station"]
+[node name="uni_station" parent="Stations" instance=ExtResource("4_0vobo")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.020572662, 1.5449562, -25.981638)
+unique_name_in_owner = true
-subdiv = 2
-size = Vector3(11, 3.75, 84)
-data = ExtResource("6_ii0j1")
-
-[node name="HiddenStations" type="Node3D" parent="Stations"]
 visible = false
 
-[node name="uni_station" parent="Stations/HiddenStations" instance=ExtResource("9_bdj4u")]
+[node name="burnout_station" parent="Stations" instance=ExtResource("5_ppxbm")]
 unique_name_in_owner = true
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.2, 0, 0, 80)
+visible = false
 
-[node name="VoxelGI" type="VoxelGI" parent="Stations/HiddenStations/uni_station"]
+[node name="dungeon_station" parent="Stations" instance=ExtResource("5_0gtr1")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.020572662, 1.5449562, -25.981638)
-subdiv = 2
-size = Vector3(11, 3.7785034, 84)
-data = ExtResource("10_j1yes")
-
-[node name="burnout_station" parent="Stations/HiddenStations" instance=ExtResource("11_vomua")]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.2, 0, 0, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.020572662, -0.05047989, -0.018362045)
 
-[node name="VoxelGI" type="VoxelGI" parent="Stations/HiddenStations/burnout_station"]
+[node name="volunteer_station" parent="Stations" instance=ExtResource("5_grftg")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.020572662, 1.5449562, -25.981638)
-subdiv = 2
-size = Vector3(11, 3.7785034, 84)
-data = ExtResource("12_jwt33")
-
-[node name="volunteer_station" parent="Stations/HiddenStations" instance=ExtResource("13_265nv")]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.3, 0, 0, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.3, 0, 0, 80)
-
+visible = false
-[node name="VoxelGI" type="VoxelGI" parent="Stations/HiddenStations/volunteer_station"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 0.7692308, 0.020572662, 1.5449562, -27.640734)
-subdiv = 2
-size = Vector3(11, 3.7785034, 104.75287)
-data = ExtResource("14_w5sv3")
 
 [node name="StationPlayer" type="AnimationPlayer" parent="Stations"]
 unique_name_in_owner = true
 autoplay = "RESET"
 
 [node name="material_helper" type="MeshInstance3D" parent="Stations"]
-material_override = ExtResource("15_hdxw7")
+material_override = ExtResource("6_l33v1")
 cast_shadow = 0
 skeleton = NodePath("../StationPlayer")
 
+[node name="VoxelGI" type="VoxelGI" parent="Stations"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4944763, -26)
+subdiv = 2
+size = Vector3(11, 3.7785034, 84)
+data = ExtResource("9_ppxbm")
+
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_8c5ii")
 camera_attributes = SubResource("CameraAttributesPractical_symoa")
 compositor = SubResource("Compositor_e75no")
-script = ExtResource("17_ov8kk")
+script = ExtResource("4_1dsor")
+
+[node name="Displays" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.003971815, 9.536743e-07, 0.0078623295)
+visible = false
+
+[node name="Train_Display_L" type="SubViewport" parent="Displays"]
+disable_3d = true
+transparent_bg = true
+size = Vector2i(256, 64)
+
+[node name="LeftLabel" type="Label" parent="Displays/Train_Display_L"]
+unique_name_in_owner = true
+offset_right = 21.0
+offset_bottom = 39.0
+theme_override_constants/line_spacing = -7
+theme_override_fonts/font = ExtResource("8_sofnd")
+text = "S1 University
+via Parity Sq."
+
+[node name="Train_Display_R" type="SubViewport" parent="Displays"]
+disable_3d = true
+transparent_bg = true
+size = Vector2i(256, 64)
+
+[node name="RightLabel" type="Label" parent="Displays/Train_Display_R"]
+unique_name_in_owner = true
+offset_right = 21.0
+offset_bottom = 39.0
+theme_override_constants/line_spacing = -7
+theme_override_fonts/font = ExtResource("8_sofnd")
+text = "S2 Ambitz
+via University"
+
+[node name="Sprite3D" type="Sprite3D" parent="Displays"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.0896316, 2.1654217, -7.717223)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_1dsor")
+
+[node name="Sprite3D2" type="Sprite3D" parent="Displays"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.97422194, 2.1654217, -7.717223)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_csq32")
+
+[node name="Sprite3D3" type="Sprite3D" parent="Displays"]
+transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.9749892, 2.1654217, -7.901966)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_1dsor")
+
+[node name="Sprite3D4" type="Sprite3D" parent="Displays"]
+transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.0785251, 2.1654217, -7.901966)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_csq32")
+
+[node name="Sprite3D5" type="Sprite3D" parent="Displays"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.0896316, 2.1654217, -27.717222)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_1dsor")
+
+[node name="Sprite3D6" type="Sprite3D" parent="Displays"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.97422194, 2.1654217, -27.717222)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_csq32")
+
+[node name="Sprite3D7" type="Sprite3D" parent="Displays"]
+transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.9749892, 2.1654217, -27.901966)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_1dsor")
+
+[node name="Sprite3D8" type="Sprite3D" parent="Displays"]
+transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.0785251, 2.1654217, -27.901966)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_csq32")
+
+[node name="Sprite3D13" type="Sprite3D" parent="Displays"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.0896316, 2.1654217, -17.717222)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_1dsor")
+
+[node name="Sprite3D14" type="Sprite3D" parent="Displays"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.97422194, 2.1654217, -17.717222)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_csq32")
+
+[node name="Sprite3D15" type="Sprite3D" parent="Displays"]
+transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.9749892, 2.1654217, -17.901966)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_1dsor")
+
+[node name="Sprite3D16" type="Sprite3D" parent="Displays"]
+transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.0785251, 2.1654217, -17.901966)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_csq32")
+
+[node name="Sprite3D9" type="Sprite3D" parent="Displays"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.0896316, 2.1654217, -47.71722)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_1dsor")
+
+[node name="Sprite3D10" type="Sprite3D" parent="Displays"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.97422194, 2.1654217, -47.71722)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_csq32")
+
+[node name="Sprite3D11" type="Sprite3D" parent="Displays"]
+transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.9749892, 2.1654217, -47.901966)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_1dsor")
+
+[node name="Sprite3D12" type="Sprite3D" parent="Displays"]
+transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -1.0785251, 2.1654217, -47.901966)
+modulate = Color(1.3519934, 0.8703787, 0.46019563, 1)
+pixel_size = 0.006
+texture = SubResource("ViewportTexture_csq32")
 
 [node name="ScenePlayer" type="AnimationPlayer" parent="."]
 unique_name_in_owner = true

src/base-environments/transition/subway_track.tscn

@@ -1,101 +0,0 @@
-[gd_scene load_steps=14 format=3 uid="uid://df3ur5wll8vx7"]
-
-[ext_resource type="PackedScene" uid="uid://4j1tlhfm3p40" path="res://base-environments/transition/subway_train.tscn" id="1_2h2xx"]
-[ext_resource type="Script" uid="uid://dgfje4druu3sw" path="res://base-environments/transition/code/dolly.gd" id="1_5jpg8"]
-
-[sub_resource type="Shader" id="Shader_tpaj8"]
-code = "shader_type spatial;
-render_mode depth_prepass_alpha;
-
-uniform float time;
-uniform sampler2D horizontal_gradient: repeat_disable;
-uniform sampler2D horizontal_emission: repeat_disable;
-uniform sampler2D vertical_gradient: repeat_disable;
-uniform sampler2D vertical_emission: repeat_disable;
-
-void vertex() {
-	// Called for every vertex the material is visible on.
-}
-
-void fragment() {
-	float anim_progress = time;
-	//float anim_progress = fract(TIME * 0.25);
-
-	ALBEDO = texture(horizontal_gradient, UV.yx).xyz * mix(vec3(1.0), texture(vertical_gradient, UV * vec2(anim_progress)).xyz, anim_progress);
-	ALPHA = min(clamp(3.0-anim_progress*2.0, 0.0, 1.0),  texture(horizontal_gradient, UV.yx).w * texture(vertical_gradient, UV).w * pow(anim_progress, 0.6));
-	EMISSION = texture(horizontal_emission, UV.yx).xyz * mix(vec3(1.0), texture(vertical_emission, UV * vec2(anim_progress)).xyz, min(1.0, anim_progress));
-	ROUGHNESS = 0.5;
-	SPECULAR = 0.4;
-	METALLIC = 0.3;
-}
-
-//void light() {
-//	// Called for every pixel for every light affecting the material.
-//	// Uncomment to replace the default light processing function with this one.
-//}
-"
-
-[sub_resource type="Gradient" id="Gradient_sofnd"]
-offsets = PackedFloat32Array(0.190283, 0.237517, 0.252362, 0.263158, 0.358974, 0.620783)
-colors = PackedColorArray(0, 0, 0, 1, 0.498876, 0.371803, 0.25703, 1, 0.999199, 0.798087, 0.641907, 1, 0.552793, 0.341064, 0.190397, 1, 0.428199, 0.393103, 0.309389, 1, 0, 0, 0, 1)
-
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_bjefl"]
-gradient = SubResource("Gradient_sofnd")
-
-[sub_resource type="Gradient" id="Gradient_csq32"]
-offsets = PackedFloat32Array(0, 0.0526316, 0.165992, 0.62753, 0.647773, 0.704453, 0.731444, 1)
-colors = PackedColorArray(0.0563103, 0.372397, 0.669528, 1, 0, 0, 0, 0.968627, 0.0844204, 0.319764, 0.485866, 0.796078, 0.0554195, 0.372493, 0.670199, 0.871024, 0, 0, 0, 0.933333, 0.0507, 0.237315, 0.39, 1, 0.0563103, 0.372397, 0.669528, 1, 0.0261, 0.092075, 0.29, 0.894118)
-
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_tpaj8"]
-gradient = SubResource("Gradient_csq32")
-width = 1024
-
-[sub_resource type="Gradient" id="Gradient_grftg"]
-offsets = PackedFloat32Array(0.147099, 0.159244, 0.195682, 0.213225, 0.267206, 0.287449, 0.31444, 0.34143, 0.364372, 0.398111, 0.430499, 0.442645, 0.480432, 0.511471, 1)
-colors = PackedColorArray(0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0.194349, 0.194349, 0.194349, 1, 0.194349, 0.194349, 0.194349, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1)
-
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_v43sq"]
-gradient = SubResource("Gradient_grftg")
-
-[sub_resource type="Gradient" id="Gradient_l33v1"]
-offsets = PackedFloat32Array(0.022942, 0.11471, 0.2045054, 0.21741071, 0.25024083, 0.26036772, 0.438596, 0.45614, 0.473684, 0.866397, 1)
-colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0.0820244, 0.0820244, 0.0820244, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0)
-
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_nnax0"]
-gradient = SubResource("Gradient_l33v1")
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_0vobo"]
-render_priority = 1
-shader = SubResource("Shader_tpaj8")
-shader_parameter/time = 0.0
-shader_parameter/horizontal_gradient = SubResource("GradientTexture1D_tpaj8")
-shader_parameter/horizontal_emission = SubResource("GradientTexture1D_bjefl")
-shader_parameter/vertical_gradient = SubResource("GradientTexture1D_nnax0")
-shader_parameter/vertical_emission = SubResource("GradientTexture1D_v43sq")
-
-[sub_resource type="QuadMesh" id="QuadMesh_ppxbm"]
-
-[node name="TrainDolly" type="Node3D"]
-script = ExtResource("1_5jpg8")
-metadata/_custom_type_script = "uid://dgfje4druu3sw"
-
-[node name="Destination" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 130)
-visible = false
-
-[node name="Origination" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -130)
-visible = false
-
-[node name="Train" type="Node3D" parent="."]
-transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0, 0, 0)
-
-[node name="subway_train" parent="Train" instance=ExtResource("1_2h2xx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7804413, 0, 0)
-
-[node name="MeshInstance3D8" type="MeshInstance3D" parent="Train"]
-transform = Transform3D(-42.01, 4.0756225e-07, 4.3401164e-07, -6.330816e-06, -2.8743172, -0.1808367, -5.9450595e-06, 0.1808367, -2.8743172, -3.9468384, 1.286, 2.488358)
-visible = false
-material_override = SubResource("ShaderMaterial_0vobo")
-mesh = SubResource("QuadMesh_ppxbm")
-skeleton = NodePath("../../../GPUParticles3D4")

src/base-environments/transition/subway_train.tscn

@@ -112,7 +112,6 @@ script = ExtResource("2_skiem")
 
 [node name="traun_hull" parent="." index="0"]
 layers = 4
-gi_mode = 2
 surface_material_override/0 = SubResource("StandardMaterial3D_8e51f")
 
 [node name="ApoyaCristalesLateralesPared3_LP_004_LateralesInteriores_0_001" parent="traun_hull" index="0"]
@@ -293,15 +292,14 @@ libraries = {
 }
 
 [node name="VoxelGI" type="VoxelGI" parent="." index="2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.406781, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.3, 0)
 layers = 4
-size = Vector3(35, 4.708557, 7)
+size = Vector3(31.904, 3.5, 4)
 data = ExtResource("5_q0ort")
 
 [node name="SpotLight3D" type="SpotLight3D" parent="." index="3"]
 transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -2.853415, 2.8072855, -1.2271035e-07)
 visible = false
-layers = 4
 spot_range = 4.0
 spot_angle = 89.23
 spot_angle_attenuation = 0.53588676
@@ -309,7 +307,6 @@ spot_angle_attenuation = 0.53588676
 [node name="SpotLight3D2" type="SpotLight3D" parent="." index="4"]
 transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -11.853415, 2.8072855, -1.2271035e-07)
 visible = false
-layers = 4
 spot_range = 4.0
 spot_angle = 89.23
 spot_angle_attenuation = 0.53588676
@@ -317,7 +314,6 @@ spot_angle_attenuation = 0.53588676
 [node name="SpotLight3D3" type="SpotLight3D" parent="." index="5"]
 transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -7.3087215, 2.8072855, -1.2271035e-07)
 visible = false
-layers = 4
 spot_range = 4.0
 spot_angle = 89.23
 spot_angle_attenuation = 0.53588676
@@ -325,7 +321,6 @@ spot_angle_attenuation = 0.53588676
 [node name="SpotLight3D4" type="SpotLight3D" parent="." index="6"]
 transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 12.146585, 2.8072855, -1.2271035e-07)
 visible = false
-layers = 4
 spot_range = 4.0
 spot_angle = 89.23
 spot_angle_attenuation = 0.53588676
@@ -333,7 +328,6 @@ spot_angle_attenuation = 0.53588676
 [node name="SpotLight3D5" type="SpotLight3D" parent="." index="7"]
 transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 3.1465855, 2.8072855, -1.2271035e-07)
 visible = false
-layers = 4
 spot_range = 4.0
 spot_angle = 89.23
 spot_angle_attenuation = 0.53588676
@@ -341,7 +335,6 @@ spot_angle_attenuation = 0.53588676
 [node name="SpotLight3D6" type="SpotLight3D" parent="." index="8"]
 transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 6.7337255, 2.8072855, -1.2271035e-07)
 visible = false
-layers = 4
 spot_range = 4.0
 spot_angle = 89.23
 spot_angle_attenuation = 0.53588676

src/base-environments/transition/vfx/mat_subwaymap.tres

@@ -1,7 +1,7 @@
 [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bx6dygeknq3qd"]
 
 [sub_resource type="ViewportTexture" id="ViewportTexture_820wi"]
-viewport_path = NodePath("Stations/StationDolly/SubwayMap3D/SubViewport")
+viewport_path = NodePath("Train/SubwayMap3D/SubViewport")
 
 [resource]
 resource_local_to_scene = true

src/logic-scenes/player_controller/player_controller.tscn

@@ -627,7 +627,7 @@ transform = Transform3D(1, 0, 0, 0, 0.642787, -0.766044, 0, 0.766044, 0.642787,
 [node name="Camera3D" type="Camera3D" parent="Yaw/Pitch/Mount"]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.202, 0.157)
-cull_mask = 7
+cull_mask = 3
 current = true
 
 [node name="RayCast3D" type="RayCast3D" parent="Yaw/Pitch/Mount/Camera3D"]

src/project.godot

@@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
 [application]
 
 config/name="Frame of Mind"
-run/main_scene="uid://fgp3tbah7msy"
+run/main_scene="uid://fgp3s28h7msy"
 config/use_custom_user_dir=true
 config/features=PackedStringArray("4.5", "Forward Plus")
 boot_splash/bg_color=Color(0.0313726, 0.0117647, 0.129412, 1)
@@ -211,7 +211,6 @@ locale/test="de"
 
 [layer_names]
 
-3d_render/layer_3="Trains"
 2d_physics/layer_1="World"
 3d_physics/layer_1="Scene Geometry"
 2d_physics/layer_2="Stickies"