diff --git a/src/base-environments/transition/audio/450918__kyles__metro-subway-montreal-verdun-station-arrive-and-leave-semidistant-from-bridge-over-tracks-overpass.aup3 b/src/base-environments/transition/audio/450918__kyles__metro-subway-montreal-verdun-station-arrive-and-leave-semidistant-from-bridge-over-tracks-overpass.aup3 new file mode 100644 index 0000000..dc5d7d8 Binary files /dev/null and b/src/base-environments/transition/audio/450918__kyles__metro-subway-montreal-verdun-station-arrive-and-leave-semidistant-from-bridge-over-tracks-overpass.aup3 differ diff --git a/src/base-environments/transition/audio/450918__kyles__metro-subway-montreal-verdun-station-arrive-and-leave-semidistant-from-bridge-over-tracks-overpass.ogg b/src/base-environments/transition/audio/450918__kyles__metro-subway-montreal-verdun-station-arrive-and-leave-semidistant-from-bridge-over-tracks-overpass.ogg index 00eceba..6661ba0 100644 --- a/src/base-environments/transition/audio/450918__kyles__metro-subway-montreal-verdun-station-arrive-and-leave-semidistant-from-bridge-over-tracks-overpass.ogg +++ b/src/base-environments/transition/audio/450918__kyles__metro-subway-montreal-verdun-station-arrive-and-leave-semidistant-from-bridge-over-tracks-overpass.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19f16c544030b5f390908aad476e1c0fb9beba4fb7e547674a472216746e68f9 -size 1382317 +oid sha256:58432469a98871f8d207242851f726f5c32eba9c0f707267f75a93f5979c28ba +size 1659986 diff --git a/src/base-environments/transition/code/dolly.gd b/src/base-environments/transition/code/dolly.gd index 72bfc58..20e8d8a 100644 --- a/src/base-environments/transition/code/dolly.gd +++ b/src/base-environments/transition/code/dolly.gd @@ -5,7 +5,7 @@ extends Node3D @export var start_arrived : bool = false @export var pre_arrival_time : float = 10.0 @export var arrival_time : float = 15.0 -@export var pre_leave_time : float = 5.0 +@export var pre_leave_time : float = 20.0 @export var leave_time : float = 16.0 @export var post_leave_time : float = 5.0 @@ -24,6 +24,12 @@ func _ready() -> void: child.global_position = origination.global_position +## One arrival and departure +func cycle() -> void: + await arrive() + await leave() + + func arrive() -> void: %SubwayTrainAudio.play(0) await get_tree().create_timer(16).timeout @@ -34,14 +40,13 @@ func arrive() -> void: tween.parallel().tween_property(child, "global_position", self.global_position, arrival_time) await tween.finished subway.door_open = true - leave() func leave() -> void: - subway.door_open = false await get_tree().create_timer(pre_leave_time).timeout - if tween: tween.kill() + subway.door_open = false await get_tree().create_timer(1).timeout + 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 diff --git a/src/base-environments/transition/code/subway_sequence.gd b/src/base-environments/transition/code/subway_sequence.gd index 103431e..989b2d1 100644 --- a/src/base-environments/transition/code/subway_sequence.gd +++ b/src/base-environments/transition/code/subway_sequence.gd @@ -27,12 +27,13 @@ func start_room(): await Main.curtain.open() - $Track2Dolly.arrive() - #$Track1Dolly.arrive() + $Track2Dolly.cycle() await get_tree().create_timer(20).timeout _set_signage_texts("signage2", "Verkehr z. Zt.\nunregelmäßig") + $Track1Dolly.cycle() + await get_tree().create_timer(10).timeout _set_signage_texts("signage1", "Bitte Ansage\nbeachten") diff --git a/src/base-environments/transition/code/subway_train.gd b/src/base-environments/transition/code/subway_train.gd index d116342..cb04ad9 100644 --- a/src/base-environments/transition/code/subway_train.gd +++ b/src/base-environments/transition/code/subway_train.gd @@ -3,9 +3,9 @@ class_name SubwayTrain @export var door_open: bool: set(open): - if door_open != open: - door_open=open - if door_open: - $AnimationPlayer.play("door_open") - else: - $AnimationPlayer.play("door_close") \ No newline at end of file + if door_open == open: return + door_open=open + if open: + $AnimationPlayer.play("door_open") + else: + $AnimationPlayer.play("door_close") \ No newline at end of file diff --git a/src/base-environments/transition/subway_sequence.tscn b/src/base-environments/transition/subway_sequence.tscn index 036dece..0818600 100644 --- a/src/base-environments/transition/subway_sequence.tscn +++ b/src/base-environments/transition/subway_sequence.tscn @@ -169,9 +169,6 @@ initial_pitch = -30.0 unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.2, -0.2, -32.5) -[node name="Train" parent="Track1Dolly" index="2"] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0, 0, 0) - [node name="Track2Dolly" parent="." instance=ExtResource("17_yfan7")] unique_name_in_owner = true transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -6.2, -0.2, -32.5) @@ -465,5 +462,3 @@ root_node = NodePath("AnimationTree") root_node = NodePath(".") tree_root = SubResource("AnimationNodeStateMachine_naikh") anim_player = NodePath("..") - -[editable path="Track1Dolly"] diff --git a/src/base-environments/transition/subway_track.tscn b/src/base-environments/transition/subway_track.tscn index 1635114..bb41d0e 100644 --- a/src/base-environments/transition/subway_track.tscn +++ b/src/base-environments/transition/subway_track.tscn @@ -171,4 +171,18 @@ disabled = true [node name="SubwayTrainAudio" type="AudioStreamPlayer3D" parent="Train"] unique_name_in_owner = true stream = ExtResource("3_4h0n7") -unit_size = 50.0 +unit_size = 100.0 +panning_strength = 0.7 +bus = &"sfx" +playback_type = 1 + +[node name="SpotLight3D" type="SpotLight3D" parent="Train"] +transform = Transform3D(-0.2730023, 0.12723242, 0.9535627, -2.0788793e-10, 0.9912155, -0.13225639, -0.9620134, -0.036106296, -0.27060413, -14.344355, 0.40866053, -1.7471657) +light_energy = 5.0 +light_specular = 0.0 +light_bake_mode = 0 +distance_fade_begin = 150.0 +distance_fade_length = 50.0 +spot_range = 200.0 +spot_attenuation = 0.2 +spot_angle = 15.0 diff --git a/src/base-environments/transition/subway_train.tscn b/src/base-environments/transition/subway_train.tscn index 5ad7ebf..5d7d7c1 100644 --- a/src/base-environments/transition/subway_train.tscn +++ b/src/base-environments/transition/subway_train.tscn @@ -111,6 +111,7 @@ _data = { script = ExtResource("2_skiem") [node name="traun_hull" parent="." index="0"] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 0) layers = 4 gi_mode = 2 surface_material_override/0 = SubResource("StandardMaterial3D_8e51f")