Compare commits

..

No commits in common. "c3e1831a366fdf9d1567f97c7a9bdab91c304d24" and "4de6a40ec08af10a02b09f5f2ddcce438d1a1251" have entirely different histories.

11 changed files with 13 additions and 58 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -6068,7 +6068,6 @@ shape = SubResource("ConcavePolygonShape3D_d1yty")
[node name="SimpleWalls" type="StaticBody3D" parent="Airlock/Bounds"] [node name="SimpleWalls" type="StaticBody3D" parent="Airlock/Bounds"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
collision_layer = 5
[node name="MeshInstance3D" type="MeshInstance3D" parent="Airlock/Bounds/SimpleWalls"] [node name="MeshInstance3D" type="MeshInstance3D" parent="Airlock/Bounds/SimpleWalls"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -4.5, 0, 0) transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -4.5, 0, 0)

View File

@ -101,20 +101,16 @@ stream_1/stream = ExtResource("4_2iem1")
[node name="GrunkSplatter" type="GPUParticles3D"] [node name="GrunkSplatter" type="GPUParticles3D"]
sorting_offset = 9.0 sorting_offset = 9.0
emitting = false
amount = 64 amount = 64
lifetime = 0.3 lifetime = 0.3
one_shot = true
explosiveness = 0.45 explosiveness = 0.45
process_material = SubResource("ParticleProcessMaterial_5xu2x") process_material = SubResource("ParticleProcessMaterial_5xu2x")
draw_pass_1 = SubResource("QuadMesh_y6klh") draw_pass_1 = SubResource("QuadMesh_y6klh")
[node name="SubSplatter" type="GPUParticles3D" parent="."] [node name="SubSplatter" type="GPUParticles3D" parent="."]
sorting_offset = 9.0 sorting_offset = 9.0
emitting = false
amount = 4 amount = 4
lifetime = 0.3 lifetime = 0.3
one_shot = true
explosiveness = 0.63 explosiveness = 0.63
interpolate = false interpolate = false
fract_delta = false fract_delta = false
@ -122,18 +118,15 @@ process_material = SubResource("ParticleProcessMaterial_2iem1")
draw_pass_1 = SubResource("QuadMesh_6adkd") draw_pass_1 = SubResource("QuadMesh_6adkd")
[node name="FreeTimer" type="Timer" parent="."] [node name="FreeTimer" type="Timer" parent="."]
wait_time = 3.0 wait_time = 0.3
one_shot = true one_shot = true
autostart = true autostart = true
[node name="SplatterSFX" type="AudioStreamPlayer3D" parent="."] [node name="SplatterSFX" type="AudioStreamPlayer3D" parent="."]
stream = SubResource("AudioStreamRandomizer_6adkd") stream = SubResource("AudioStreamRandomizer_6adkd")
volume_db = -10.0 volume_db = -20.0
unit_size = 6.0 unit_size = 6.0
autoplay = true autoplay = true
bus = &"SFX" bus = &"SFX"
[connection signal="ready" from="." to="SplatterSFX" method="play"]
[connection signal="ready" from="." to="." method="set_emitting" binds= [true]]
[connection signal="ready" from="." to="SubSplatter" method="set_emitting" binds= [true]]
[connection signal="timeout" from="FreeTimer" to="." method="queue_free"] [connection signal="timeout" from="FreeTimer" to="." method="queue_free"]

View File

@ -1,9 +1,6 @@
class_name SpraySFX extends AudioStreamPlayer3D class_name SpraySFX extends AudioStreamPlayer3D
## Plays only as long as `activate` is called every frame. ## Plays only as long as `activate` is called every frame.
@export var base_pitch := 1.0
@export var pitch_shape_scale := 0.5
var _active_this_frame := false var _active_this_frame := false
@ -11,14 +8,6 @@ func activate() -> void:
_active_this_frame = true _active_this_frame = true
func set_angle_from_normal(normal: Vector3) -> void:
var to_player := Player.instance.global_position - global_position
var angle_to_player := normal.angle_to(to_player)
# linear pitch shape
pitch_scale = base_pitch - (2 * angle_to_player / PI) * pitch_shape_scale
func _process(_delta: float) -> void: func _process(_delta: float) -> void:
if _active_this_frame: if _active_this_frame:
if not playing: if not playing:

View File

@ -6,6 +6,7 @@
[node name="SpraySFX" type="AudioStreamPlayer3D"] [node name="SpraySFX" type="AudioStreamPlayer3D"]
stream = ExtResource("1_575yt") stream = ExtResource("1_575yt")
attenuation_model = 1 attenuation_model = 1
unit_size = 2.0 volume_db = -2.0
unit_size = 1.0
bus = &"SFX" bus = &"SFX"
script = ExtResource("2_yajv7") script = ExtResource("2_yajv7")

View File

@ -11,7 +11,6 @@ class_name PointSpray extends Spray
func _spray() -> void: func _spray() -> void:
if laser.is_colliding(): if laser.is_colliding():
spray_sfx.activate() spray_sfx.activate()
spray_sfx.set_angle_from_normal(laser.get_collision_normal())
var collider := laser.get_collider() var collider := laser.get_collider()
if collider is GunkBody: if collider is GunkBody:

View File

@ -43,7 +43,6 @@ func _spray() -> void:
for laser: LaserCast in spray_casts.get_children(): for laser: LaserCast in spray_casts.get_children():
if laser.is_colliding(): if laser.is_colliding():
spray_sfx.activate() spray_sfx.activate()
spray_sfx.set_angle_from_normal(laser.get_collision_normal())
var collider := laser.get_collider() var collider := laser.get_collider()
if collider is GunkBody: if collider is GunkBody:

View File

@ -47,11 +47,7 @@
- [ ] [[manual]] - [ ] [[manual]]
- [ ] SFX: - [ ] SFX:
- [ ] ui bonk - [ ] ui bonk
- [ ] ui confirm - [ ] prop clear glitter
- [ ] item collection
- [ ] retinal scanner bonk
- [ ] retinal scanner activation
- [ ] #maybe prop clear glitter
- [x] computer bleep on reload - [x] computer bleep on reload
- [x] grunk tank deposit schlorp - [x] grunk tank deposit schlorp
- [x] player ship door - [x] player ship door
@ -60,46 +56,31 @@
- [x] grunk footsteps - [x] grunk footsteps
- [x] beam noises - [x] beam noises
- [x] spray noises - [x] spray noises
- [ ] inactive switch pulse - [ ] switch klaxon
- [x] switch OK - [x] switch OK
- [x] switch activation - [x] switch activation
- [x] bulkhead opening - [x] bulkhead opening
- [x] grunk nodule splatter - [x] grunk nodule splatter
- [ ] REDO grunk nodule splatter
- [x] grunk alarm shriek - [x] grunk alarm shriek
- [ ] grunk trigger splatter/pulse - [ ] grunk trigger splatter/pulse
- [ ] grunk relay trigger - [ ] grunk relay pulse
- [ ] #maybe grunk relay heartbeat
- [ ] grunk alarm heartbeat
- [ ] #maybe grunk alarm pulse-starvation swell
- [ ] #maybe hurt effects for grunk nodes/nodules
- [ ] #maybe fluorescent light hum
- [ ] grunk listener trigger
- [ ] #maybe looker node initial detection
- [ ] #maybe looker node trigger
- [ ] #maybe tripwire activation
- [x] grunk heartbeat - [x] grunk heartbeat
- [x] grunk chittering - [x] grunk chittering
- [ ] grunkbeast??? - [ ] grunkbeast???
- [x] grunk ambiance - [x] grunk ambiance
- [x] spaceship ambiance - [x] spaceship ambiance
- [ ] #maybe crew quarters ambiance
- [ ] #maybe medbay ambiance
- [ ] #maybe ops ambiance
- [ ] #maybe cargo bay ambiance
- [ ] #maybe grunk node ambiance
- [ ] models: - [ ] models:
- [ ] [[grunk]] nodes: - [ ] [[grunk]] nodes:
- [x] [[alarm]] - [ ] [[alarm]]
- [x] [[trigger]] - [ ] [[trigger]]
- [ ] [[heart]] - [ ] [[heart]]
- [ ] [[relay]] - [ ] [[relay]]
- [ ] #maybe [[tripwire]] - [ ] [[tripwire]]
- [ ] #maybe [[looker]] - [ ] [[looker]]
- [ ] [[listener]] - [ ] [[listener]]
- [ ] common props: - [ ] common props:
- [x] wall switch - [x] wall switch
- [ ] retinal scanner - [ ] secure switch
- [x] bulkhead - [x] bulkhead
- [ ] datapad - [ ] datapad
- [x] overhead light fixture - [x] overhead light fixture

View File

@ -97,10 +97,4 @@
- author: zolopher - author: zolopher
- CC0 - CC0
- retrieved from https://freesound.org/people/zolopher/sounds/44203/ - retrieved from https://freesound.org/people/zolopher/sounds/44203/
- assets/sfx/grunk/splat*.wav - assets/sfx/grunk/splat*.wav
- "shower.mp3"
- author: geodylabs
- CC BY 4.0
- retrieved from https://freesound.org/people/geodylabs/sounds/122810/
- assets/sfx/tools/spray.wav
- modified