diff --git a/src/base-environments/transition/code/dolly.gd b/src/base-environments/transition/code/dolly.gd index c054249..07c7c69 100644 --- a/src/base-environments/transition/code/dolly.gd +++ b/src/base-environments/transition/code/dolly.gd @@ -32,6 +32,7 @@ func cycle() -> void: func arrive() -> void: %SubwayTrainAudio.play(0) + %SubwayTrainAudioIntense.play(0) 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) diff --git a/src/base-environments/transition/subway_track.tscn b/src/base-environments/transition/subway_track.tscn index bb41d0e..ee8f07a 100644 --- a/src/base-environments/transition/subway_track.tscn +++ b/src/base-environments/transition/subway_track.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3 uid="uid://df3ur5wll8vx7"] +[gd_scene load_steps=22 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"] @@ -94,6 +94,9 @@ size = Vector3(5.908142, 4.7752075, 1) [sub_resource type="SphereShape3D" id="SphereShape3D_5jpg8"] radius = 2.0 +[sub_resource type="BoxShape3D" id="BoxShape3D_e1qmr"] +size = Vector3(30.492157, 4.4813232, 3.4832764) + [node name="TrainDolly" type="Node3D"] script = ExtResource("1_5jpg8") metadata/_custom_type_script = "uid://dgfje4druu3sw" @@ -138,24 +141,24 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00042915344, -1.042389, 3.5 [node name="ClosedCollider" type="AnimatableBody3D" parent="Train"] [node name="FrontWallClosed" type="CollisionShape3D" parent="Train/ClosedCollider"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.8395386, 1.4940796, 1.5325139) -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.8395386, 1.4940796, -1.533) shape = SubResource("BoxShape3D_aacjs") +disabled = true [node name="FrontWallOpen1" type="CollisionShape3D" parent="Train/ClosedCollider"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.8054885, 1.4940796, 1.5325139) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.8054885, 1.4940796, -1.533) shape = SubResource("BoxShape3D_4h0n7") [node name="FrontWallOpen2" type="CollisionShape3D" parent="Train/ClosedCollider"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.442047, 1.4940796, 1.5325139) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.442047, 1.4940796, -1.533) shape = SubResource("BoxShape3D_xhnml") [node name="FrontWallOpen3" type="CollisionShape3D" parent="Train/ClosedCollider"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.829376, 1.4940796, 1.532514) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.829376, 1.4940796, -1.533) shape = SubResource("BoxShape3D_5b47p") [node name="RearWall" type="CollisionShape3D" parent="Train/ClosedCollider"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.3440372, -1.4567666) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.344, 1.457) shape = SubResource("BoxShape3D_aacjs") [node name="DriverCabin1" type="CollisionShape3D" parent="Train/ClosedCollider"] @@ -176,6 +179,14 @@ panning_strength = 0.7 bus = &"sfx" playback_type = 1 +[node name="SubwayTrainAudioIntense" type="AudioStreamPlayer3D" parent="Train"] +unique_name_in_owner = true +stream = ExtResource("3_4h0n7") +attenuation_model = 1 +unit_size = 15.0 +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 @@ -186,3 +197,9 @@ distance_fade_length = 50.0 spot_range = 200.0 spot_attenuation = 0.2 spot_angle = 15.0 + +[node name="SubwaySoundAttenuationArea" type="Area3D" parent="Train"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Train/SubwaySoundAttenuationArea"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6517792, 1.7406616, 0.034606963) +shape = SubResource("BoxShape3D_e1qmr")