From 033c12365dec616bdd517ac8624ac6c3e0353fb2 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Mon, 21 Apr 2025 15:25:12 -0600 Subject: [PATCH] Alarm effect animations use quarter frame skip --- assets/grunk/alarm/alarm_core.material | Bin 1172 -> 1171 bytes src/world/mechanics/alarm/gunk_alarm.tscn | 54 ++++++++++++---------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/assets/grunk/alarm/alarm_core.material b/assets/grunk/alarm/alarm_core.material index 9215dcdbdd28745fce49c57db86e0872a1dcda7d..99f25ca7307753dee2c75fa0fc922c5f07609570 100644 GIT binary patch delta 227 zcmV<90383636lvoQd2`i0ssI201yBG;0pi%djtRgD77#BVBiXkBLJ51l{+9;(g6_I z0xTm#0SQO}AQ7xX7H}GoH;M;^4-ZX@{2;N&9|3;=as>4OJE1YjcNMUNm(Zj4y5vY~Ea^dX$zvrw0O6^3~-W{MS0s#tr4fIrkr)^En^9(&abqb ecJ~w7YFqoB51zN3*4U?*au(vLr3|xp0viJA6I*5g diff --git a/src/world/mechanics/alarm/gunk_alarm.tscn b/src/world/mechanics/alarm/gunk_alarm.tscn index 9d5d0f9..068ccb6 100644 --- a/src/world/mechanics/alarm/gunk_alarm.tscn +++ b/src/world/mechanics/alarm/gunk_alarm.tscn @@ -8,6 +8,15 @@ [ext_resource type="Material" uid="uid://cdpvcruywnp4x" path="res://assets/grunk/alarm/alarm_core.material" id="5_6vdvf"] [ext_resource type="AudioStream" uid="uid://ypk1d4adrcs" path="res://assets/sfx/grunk/alarm_screech.wav" id="6_6vdvf"] +[sub_resource type="SphereMesh" id="SphereMesh_b6er8"] +radius = 0.285 +height = 0.44 +radial_segments = 7 +rings = 5 + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_bxx3m"] +data = PackedVector3Array(0, 0.22, 0, 0, 0.22, 0, 0, 0.1905, 0.1425, 0, 0.22, 0, 0.1114, 0.1905, 0.0888, 0, 0.1905, 0.1425, 0, 0.22, 0, 0, 0.22, 0, 0.1114, 0.1905, 0.0888, 0, 0.22, 0, 0.1389, 0.1905, -0.0317, 0.1114, 0.1905, 0.0888, 0, 0.22, 0, 0, 0.22, 0, 0.1389, 0.1905, -0.0317, 0, 0.22, 0, 0.0618, 0.1905, -0.1284, 0.1389, 0.1905, -0.0317, 0, 0.22, 0, 0, 0.22, 0, 0.0618, 0.1905, -0.1284, 0, 0.22, 0, -0.0618, 0.1905, -0.1284, 0.0618, 0.1905, -0.1284, 0, 0.22, 0, 0, 0.22, 0, -0.0618, 0.1905, -0.1284, 0, 0.22, 0, -0.1389, 0.1905, -0.0317, -0.0618, 0.1905, -0.1284, 0, 0.22, 0, 0, 0.22, 0, -0.1389, 0.1905, -0.0317, 0, 0.22, 0, -0.1114, 0.1905, 0.0888, -0.1389, 0.1905, -0.0317, 0, 0.22, 0, 0, 0.22, 0, -0.1114, 0.1905, 0.0888, 0, 0.22, 0, 0, 0.1905, 0.1425, -0.1114, 0.1905, 0.0888, 0, 0.1905, 0.1425, 0.1114, 0.1905, 0.0888, 0, 0.11, 0.2468, 0.1114, 0.1905, 0.0888, 0.193, 0.11, 0.1539, 0, 0.11, 0.2468, 0.1114, 0.1905, 0.0888, 0.1389, 0.1905, -0.0317, 0.193, 0.11, 0.1539, 0.1389, 0.1905, -0.0317, 0.2406, 0.11, -0.0549, 0.193, 0.11, 0.1539, 0.1389, 0.1905, -0.0317, 0.0618, 0.1905, -0.1284, 0.2406, 0.11, -0.0549, 0.0618, 0.1905, -0.1284, 0.1071, 0.11, -0.2224, 0.2406, 0.11, -0.0549, 0.0618, 0.1905, -0.1284, -0.0618, 0.1905, -0.1284, 0.1071, 0.11, -0.2224, -0.0618, 0.1905, -0.1284, -0.1071, 0.11, -0.2224, 0.1071, 0.11, -0.2224, -0.0618, 0.1905, -0.1284, -0.1389, 0.1905, -0.0317, -0.1071, 0.11, -0.2224, -0.1389, 0.1905, -0.0317, -0.2406, 0.11, -0.0549, -0.1071, 0.11, -0.2224, -0.1389, 0.1905, -0.0317, -0.1114, 0.1905, 0.0888, -0.2406, 0.11, -0.0549, -0.1114, 0.1905, 0.0888, -0.193, 0.11, 0.1539, -0.2406, 0.11, -0.0549, -0.1114, 0.1905, 0.0888, 0, 0.1905, 0.1425, -0.193, 0.11, 0.1539, 0, 0.1905, 0.1425, 0, 0.11, 0.2468, -0.193, 0.11, 0.1539, 0, 0.11, 0.2468, 0.193, 0.11, 0.1539, 0, 0, 0.285, 0.193, 0.11, 0.1539, 0.2228, 0, 0.1777, 0, 0, 0.285, 0.193, 0.11, 0.1539, 0.2406, 0.11, -0.0549, 0.2228, 0, 0.1777, 0.2406, 0.11, -0.0549, 0.2779, 0, -0.0634, 0.2228, 0, 0.1777, 0.2406, 0.11, -0.0549, 0.1071, 0.11, -0.2224, 0.2779, 0, -0.0634, 0.1071, 0.11, -0.2224, 0.1237, 0, -0.2568, 0.2779, 0, -0.0634, 0.1071, 0.11, -0.2224, -0.1071, 0.11, -0.2224, 0.1237, 0, -0.2568, -0.1071, 0.11, -0.2224, -0.1237, 0, -0.2568, 0.1237, 0, -0.2568, -0.1071, 0.11, -0.2224, -0.2406, 0.11, -0.0549, -0.1237, 0, -0.2568, -0.2406, 0.11, -0.0549, -0.2779, 0, -0.0634, -0.1237, 0, -0.2568, -0.2406, 0.11, -0.0549, -0.193, 0.11, 0.1539, -0.2779, 0, -0.0634, -0.193, 0.11, 0.1539, -0.2228, 0, 0.1777, -0.2779, 0, -0.0634, -0.193, 0.11, 0.1539, 0, 0.11, 0.2468, -0.2228, 0, 0.1777, 0, 0.11, 0.2468, 0, 0, 0.285, -0.2228, 0, 0.1777, 0, 0, 0.285, 0.2228, 0, 0.1777, 0, -0.11, 0.2468, 0.2228, 0, 0.1777, 0.193, -0.11, 0.1539, 0, -0.11, 0.2468, 0.2228, 0, 0.1777, 0.2779, 0, -0.0634, 0.193, -0.11, 0.1539, 0.2779, 0, -0.0634, 0.2406, -0.11, -0.0549, 0.193, -0.11, 0.1539, 0.2779, 0, -0.0634, 0.1237, 0, -0.2568, 0.2406, -0.11, -0.0549, 0.1237, 0, -0.2568, 0.1071, -0.11, -0.2224, 0.2406, -0.11, -0.0549, 0.1237, 0, -0.2568, -0.1237, 0, -0.2568, 0.1071, -0.11, -0.2224, -0.1237, 0, -0.2568, -0.1071, -0.11, -0.2224, 0.1071, -0.11, -0.2224, -0.1237, 0, -0.2568, -0.2779, 0, -0.0634, -0.1071, -0.11, -0.2224, -0.2779, 0, -0.0634, -0.2406, -0.11, -0.0549, -0.1071, -0.11, -0.2224, -0.2779, 0, -0.0634, -0.2228, 0, 0.1777, -0.2406, -0.11, -0.0549, -0.2228, 0, 0.1777, -0.193, -0.11, 0.1539, -0.2406, -0.11, -0.0549, -0.2228, 0, 0.1777, 0, 0, 0.285, -0.193, -0.11, 0.1539, 0, 0, 0.285, 0, -0.11, 0.2468, -0.193, -0.11, 0.1539, 0, -0.11, 0.2468, 0.193, -0.11, 0.1539, 0, -0.1905, 0.1425, 0.193, -0.11, 0.1539, 0.1114, -0.1905, 0.0888, 0, -0.1905, 0.1425, 0.193, -0.11, 0.1539, 0.2406, -0.11, -0.0549, 0.1114, -0.1905, 0.0888, 0.2406, -0.11, -0.0549, 0.1389, -0.1905, -0.0317, 0.1114, -0.1905, 0.0888, 0.2406, -0.11, -0.0549, 0.1071, -0.11, -0.2224, 0.1389, -0.1905, -0.0317, 0.1071, -0.11, -0.2224, 0.0618, -0.1905, -0.1284, 0.1389, -0.1905, -0.0317, 0.1071, -0.11, -0.2224, -0.1071, -0.11, -0.2224, 0.0618, -0.1905, -0.1284, -0.1071, -0.11, -0.2224, -0.0618, -0.1905, -0.1284, 0.0618, -0.1905, -0.1284, -0.1071, -0.11, -0.2224, -0.2406, -0.11, -0.0549, -0.0618, -0.1905, -0.1284, -0.2406, -0.11, -0.0549, -0.1389, -0.1905, -0.0317, -0.0618, -0.1905, -0.1284, -0.2406, -0.11, -0.0549, -0.193, -0.11, 0.1539, -0.1389, -0.1905, -0.0317, -0.193, -0.11, 0.1539, -0.1114, -0.1905, 0.0888, -0.1389, -0.1905, -0.0317, -0.193, -0.11, 0.1539, 0, -0.11, 0.2468, -0.1114, -0.1905, 0.0888, 0, -0.11, 0.2468, 0, -0.1905, 0.1425, -0.1114, -0.1905, 0.0888, 0, -0.1905, 0.1425, 0.1114, -0.1905, 0.0888, 0, -0.22, 0, 0.1114, -0.1905, 0.0888, 0, -0.22, 0, 0, -0.22, 0, 0.1114, -0.1905, 0.0888, 0.1389, -0.1905, -0.0317, 0, -0.22, 0, 0.1389, -0.1905, -0.0317, 0, -0.22, 0, 0, -0.22, 0, 0.1389, -0.1905, -0.0317, 0.0618, -0.1905, -0.1284, 0, -0.22, 0, 0.0618, -0.1905, -0.1284, 0, -0.22, 0, 0, -0.22, 0, 0.0618, -0.1905, -0.1284, -0.0618, -0.1905, -0.1284, 0, -0.22, 0, -0.0618, -0.1905, -0.1284, 0, -0.22, 0, 0, -0.22, 0, -0.0618, -0.1905, -0.1284, -0.1389, -0.1905, -0.0317, 0, -0.22, 0, -0.1389, -0.1905, -0.0317, 0, -0.22, 0, 0, -0.22, 0, -0.1389, -0.1905, -0.0317, -0.1114, -0.1905, 0.0888, 0, -0.22, 0, -0.1114, -0.1905, 0.0888, 0, -0.22, 0, 0, -0.22, 0, -0.1114, -0.1905, 0.0888, 0, -0.1905, 0.1425, 0, -0.22, 0, 0, -0.1905, 0.1425, 0, -0.22, 0, 0, -0.22, 0) + [sub_resource type="Animation" id="Animation_g4yos"] length = 0.001 tracks/0/type = "value" @@ -234,15 +243,6 @@ _data = { &"pulse": SubResource("Animation_vokcn") } -[sub_resource type="SphereMesh" id="SphereMesh_b6er8"] -radius = 0.285 -height = 0.44 -radial_segments = 7 -rings = 5 - -[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_bxx3m"] -data = PackedVector3Array(0, 0.22, 0, 0, 0.22, 0, 0, 0.1905, 0.1425, 0, 0.22, 0, 0.1114, 0.1905, 0.0888, 0, 0.1905, 0.1425, 0, 0.22, 0, 0, 0.22, 0, 0.1114, 0.1905, 0.0888, 0, 0.22, 0, 0.1389, 0.1905, -0.0317, 0.1114, 0.1905, 0.0888, 0, 0.22, 0, 0, 0.22, 0, 0.1389, 0.1905, -0.0317, 0, 0.22, 0, 0.0618, 0.1905, -0.1284, 0.1389, 0.1905, -0.0317, 0, 0.22, 0, 0, 0.22, 0, 0.0618, 0.1905, -0.1284, 0, 0.22, 0, -0.0618, 0.1905, -0.1284, 0.0618, 0.1905, -0.1284, 0, 0.22, 0, 0, 0.22, 0, -0.0618, 0.1905, -0.1284, 0, 0.22, 0, -0.1389, 0.1905, -0.0317, -0.0618, 0.1905, -0.1284, 0, 0.22, 0, 0, 0.22, 0, -0.1389, 0.1905, -0.0317, 0, 0.22, 0, -0.1114, 0.1905, 0.0888, -0.1389, 0.1905, -0.0317, 0, 0.22, 0, 0, 0.22, 0, -0.1114, 0.1905, 0.0888, 0, 0.22, 0, 0, 0.1905, 0.1425, -0.1114, 0.1905, 0.0888, 0, 0.1905, 0.1425, 0.1114, 0.1905, 0.0888, 0, 0.11, 0.2468, 0.1114, 0.1905, 0.0888, 0.193, 0.11, 0.1539, 0, 0.11, 0.2468, 0.1114, 0.1905, 0.0888, 0.1389, 0.1905, -0.0317, 0.193, 0.11, 0.1539, 0.1389, 0.1905, -0.0317, 0.2406, 0.11, -0.0549, 0.193, 0.11, 0.1539, 0.1389, 0.1905, -0.0317, 0.0618, 0.1905, -0.1284, 0.2406, 0.11, -0.0549, 0.0618, 0.1905, -0.1284, 0.1071, 0.11, -0.2224, 0.2406, 0.11, -0.0549, 0.0618, 0.1905, -0.1284, -0.0618, 0.1905, -0.1284, 0.1071, 0.11, -0.2224, -0.0618, 0.1905, -0.1284, -0.1071, 0.11, -0.2224, 0.1071, 0.11, -0.2224, -0.0618, 0.1905, -0.1284, -0.1389, 0.1905, -0.0317, -0.1071, 0.11, -0.2224, -0.1389, 0.1905, -0.0317, -0.2406, 0.11, -0.0549, -0.1071, 0.11, -0.2224, -0.1389, 0.1905, -0.0317, -0.1114, 0.1905, 0.0888, -0.2406, 0.11, -0.0549, -0.1114, 0.1905, 0.0888, -0.193, 0.11, 0.1539, -0.2406, 0.11, -0.0549, -0.1114, 0.1905, 0.0888, 0, 0.1905, 0.1425, -0.193, 0.11, 0.1539, 0, 0.1905, 0.1425, 0, 0.11, 0.2468, -0.193, 0.11, 0.1539, 0, 0.11, 0.2468, 0.193, 0.11, 0.1539, 0, 0, 0.285, 0.193, 0.11, 0.1539, 0.2228, 0, 0.1777, 0, 0, 0.285, 0.193, 0.11, 0.1539, 0.2406, 0.11, -0.0549, 0.2228, 0, 0.1777, 0.2406, 0.11, -0.0549, 0.2779, 0, -0.0634, 0.2228, 0, 0.1777, 0.2406, 0.11, -0.0549, 0.1071, 0.11, -0.2224, 0.2779, 0, -0.0634, 0.1071, 0.11, -0.2224, 0.1237, 0, -0.2568, 0.2779, 0, -0.0634, 0.1071, 0.11, -0.2224, -0.1071, 0.11, -0.2224, 0.1237, 0, -0.2568, -0.1071, 0.11, -0.2224, -0.1237, 0, -0.2568, 0.1237, 0, -0.2568, -0.1071, 0.11, -0.2224, -0.2406, 0.11, -0.0549, -0.1237, 0, -0.2568, -0.2406, 0.11, -0.0549, -0.2779, 0, -0.0634, -0.1237, 0, -0.2568, -0.2406, 0.11, -0.0549, -0.193, 0.11, 0.1539, -0.2779, 0, -0.0634, -0.193, 0.11, 0.1539, -0.2228, 0, 0.1777, -0.2779, 0, -0.0634, -0.193, 0.11, 0.1539, 0, 0.11, 0.2468, -0.2228, 0, 0.1777, 0, 0.11, 0.2468, 0, 0, 0.285, -0.2228, 0, 0.1777, 0, 0, 0.285, 0.2228, 0, 0.1777, 0, -0.11, 0.2468, 0.2228, 0, 0.1777, 0.193, -0.11, 0.1539, 0, -0.11, 0.2468, 0.2228, 0, 0.1777, 0.2779, 0, -0.0634, 0.193, -0.11, 0.1539, 0.2779, 0, -0.0634, 0.2406, -0.11, -0.0549, 0.193, -0.11, 0.1539, 0.2779, 0, -0.0634, 0.1237, 0, -0.2568, 0.2406, -0.11, -0.0549, 0.1237, 0, -0.2568, 0.1071, -0.11, -0.2224, 0.2406, -0.11, -0.0549, 0.1237, 0, -0.2568, -0.1237, 0, -0.2568, 0.1071, -0.11, -0.2224, -0.1237, 0, -0.2568, -0.1071, -0.11, -0.2224, 0.1071, -0.11, -0.2224, -0.1237, 0, -0.2568, -0.2779, 0, -0.0634, -0.1071, -0.11, -0.2224, -0.2779, 0, -0.0634, -0.2406, -0.11, -0.0549, -0.1071, -0.11, -0.2224, -0.2779, 0, -0.0634, -0.2228, 0, 0.1777, -0.2406, -0.11, -0.0549, -0.2228, 0, 0.1777, -0.193, -0.11, 0.1539, -0.2406, -0.11, -0.0549, -0.2228, 0, 0.1777, 0, 0, 0.285, -0.193, -0.11, 0.1539, 0, 0, 0.285, 0, -0.11, 0.2468, -0.193, -0.11, 0.1539, 0, -0.11, 0.2468, 0.193, -0.11, 0.1539, 0, -0.1905, 0.1425, 0.193, -0.11, 0.1539, 0.1114, -0.1905, 0.0888, 0, -0.1905, 0.1425, 0.193, -0.11, 0.1539, 0.2406, -0.11, -0.0549, 0.1114, -0.1905, 0.0888, 0.2406, -0.11, -0.0549, 0.1389, -0.1905, -0.0317, 0.1114, -0.1905, 0.0888, 0.2406, -0.11, -0.0549, 0.1071, -0.11, -0.2224, 0.1389, -0.1905, -0.0317, 0.1071, -0.11, -0.2224, 0.0618, -0.1905, -0.1284, 0.1389, -0.1905, -0.0317, 0.1071, -0.11, -0.2224, -0.1071, -0.11, -0.2224, 0.0618, -0.1905, -0.1284, -0.1071, -0.11, -0.2224, -0.0618, -0.1905, -0.1284, 0.0618, -0.1905, -0.1284, -0.1071, -0.11, -0.2224, -0.2406, -0.11, -0.0549, -0.0618, -0.1905, -0.1284, -0.2406, -0.11, -0.0549, -0.1389, -0.1905, -0.0317, -0.0618, -0.1905, -0.1284, -0.2406, -0.11, -0.0549, -0.193, -0.11, 0.1539, -0.1389, -0.1905, -0.0317, -0.193, -0.11, 0.1539, -0.1114, -0.1905, 0.0888, -0.1389, -0.1905, -0.0317, -0.193, -0.11, 0.1539, 0, -0.11, 0.2468, -0.1114, -0.1905, 0.0888, 0, -0.11, 0.2468, 0, -0.1905, 0.1425, -0.1114, -0.1905, 0.0888, 0, -0.1905, 0.1425, 0.1114, -0.1905, 0.0888, 0, -0.22, 0, 0.1114, -0.1905, 0.0888, 0, -0.22, 0, 0, -0.22, 0, 0.1114, -0.1905, 0.0888, 0.1389, -0.1905, -0.0317, 0, -0.22, 0, 0.1389, -0.1905, -0.0317, 0, -0.22, 0, 0, -0.22, 0, 0.1389, -0.1905, -0.0317, 0.0618, -0.1905, -0.1284, 0, -0.22, 0, 0.0618, -0.1905, -0.1284, 0, -0.22, 0, 0, -0.22, 0, 0.0618, -0.1905, -0.1284, -0.0618, -0.1905, -0.1284, 0, -0.22, 0, -0.0618, -0.1905, -0.1284, 0, -0.22, 0, 0, -0.22, 0, -0.0618, -0.1905, -0.1284, -0.1389, -0.1905, -0.0317, 0, -0.22, 0, -0.1389, -0.1905, -0.0317, 0, -0.22, 0, 0, -0.22, 0, -0.1389, -0.1905, -0.0317, -0.1114, -0.1905, 0.0888, 0, -0.22, 0, -0.1114, -0.1905, 0.0888, 0, -0.22, 0, 0, -0.22, 0, -0.1114, -0.1905, 0.0888, 0, -0.1905, 0.1425, 0, -0.22, 0, 0, -0.1905, 0.1425, 0, -0.22, 0, 0, -0.22, 0) - [node name="GunkAlarm" type="StaticBody3D"] collision_layer = 36 collision_mask = 0 @@ -299,21 +299,6 @@ surface_material_override/1 = ExtResource("5_6vdvf") [node name="AnimationPlayer" parent="FrameSkipper/Rumbler3D/AlarmMesh" index="1"] speed_scale = 7.4 -[node name="TriggerAnimation" type="AnimationPlayer" parent="FrameSkipper"] -unique_name_in_owner = true -root_node = NodePath("../..") -libraries = { -&"": SubResource("AnimationLibrary_vokcn") -} -speed_scale = 7.4 - -[node name="PulseAnimation" type="AnimationPlayer" parent="FrameSkipper"] -unique_name_in_owner = true -libraries = { -&"": SubResource("AnimationLibrary_bknln") -} -speed_scale = 2.0 - [node name="CollisionMesh" type="MeshInstance3D" parent="."] transform = Transform3D(0.906308, 0, -0.422618, 0, 1, 0, 0.422618, 0, 0.906308, 0, 0.2, 0) visible = false @@ -332,6 +317,27 @@ unique_name_in_owner = true stream = ExtResource("6_6vdvf") pitch_scale = 1.1 +[node name="AnimationFrameSkipper" type="Node" parent="."] +script = ExtResource("2_gujky") +frame_skip = 3 +metadata/_custom_type_script = "uid://bukihqt1lybnx" + +[node name="TriggerAnimation" type="AnimationPlayer" parent="AnimationFrameSkipper"] +unique_name_in_owner = true +root_node = NodePath("../..") +libraries = { +&"": SubResource("AnimationLibrary_vokcn") +} +speed_scale = 14.8 + +[node name="PulseAnimation" type="AnimationPlayer" parent="AnimationFrameSkipper"] +unique_name_in_owner = true +root_node = NodePath("../../FrameSkipper") +libraries = { +&"": SubResource("AnimationLibrary_bknln") +} +speed_scale = 4.0 + [connection signal="animation_finished" from="FrameSkipper/Rumbler3D/AlarmMesh/AnimationPlayer" to="." method="_on_animation_finished"] [connection signal="timeout" from="PulseListenerTimer" to="." method="trigger"]