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 index dc5d7d8..b67df75 100644 Binary files a/src/base-environments/transition/audio/450918__kyles__metro-subway-montreal-verdun-station-arrive-and-leave-semidistant-from-bridge-over-tracks-overpass.aup3 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 6661ba0..c0c589a 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:58432469a98871f8d207242851f726f5c32eba9c0f707267f75a93f5979c28ba -size 1659986 +oid sha256:f5f6117d0378ff8fffdad54ba4a4d44dd582b5d2a99eb9d5914c6690bec15373 +size 1641693 diff --git a/src/base-environments/transition/code/dolly.gd b/src/base-environments/transition/code/dolly.gd index 20e8d8a..c054249 100644 --- a/src/base-environments/transition/code/dolly.gd +++ b/src/base-environments/transition/code/dolly.gd @@ -2,10 +2,11 @@ class_name Dolly extends Node3D -@export var start_arrived : bool = false -@export var pre_arrival_time : float = 10.0 + +@export var pre_arrival_time : float = 17.0 @export var arrival_time : float = 15.0 @export var pre_leave_time : float = 20.0 +@export var door_close_time : float = 1.0 @export var leave_time : float = 16.0 @export var post_leave_time : float = 5.0 @@ -18,10 +19,9 @@ extends Node3D 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 + for child in get_children(true): + if not child.visible: continue + child.global_position = origination.global_position ## One arrival and departure @@ -32,7 +32,7 @@ func cycle() -> void: func arrive() -> void: %SubwayTrainAudio.play(0) - await get_tree().create_timer(16).timeout + await get_tree().create_timer(pre_arrival_time).timeout if tween: tween.kill() tween = create_tween().set_trans(Tween.TRANS_CIRC).set_ease(Tween.EASE_OUT) for child in get_children(true): @@ -45,7 +45,7 @@ func arrive() -> void: func leave() -> void: await get_tree().create_timer(pre_leave_time).timeout subway.door_open = false - await get_tree().create_timer(1).timeout + await get_tree().create_timer(door_close_time).timeout if tween: tween.kill() tween = create_tween().set_trans(Tween.TRANS_QUART).set_ease(Tween.EASE_IN) for child in get_children(true): @@ -57,4 +57,3 @@ func leave() -> void: if not child.visible: continue # Warp back child.global_position = origination.global_position - arrive()