From 9c26eb24d0193f3eea7700612bb494dbd1890522 Mon Sep 17 00:00:00 2001
From: Rob Kelly <contact@robkel.ly>
Date: Sun, 7 Sep 2025 00:31:15 -0600
Subject: [PATCH] Shambler spawn tweaks

---
 src/world/grunk_beast/shambler/shambler.gd   | 17 +++++++++++++++--
 src/world/grunk_beast/shambler/shambler.tscn |  5 +++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/world/grunk_beast/shambler/shambler.gd b/src/world/grunk_beast/shambler/shambler.gd
index a1f3830..52dd1c9 100644
--- a/src/world/grunk_beast/shambler/shambler.gd
+++ b/src/world/grunk_beast/shambler/shambler.gd
@@ -3,7 +3,7 @@ class_name Shambler extends BeastModel
 
 const LOOK_TARGET_ACCELERATION := 12.0
 const BLEND_ACCELERATION := 6.0
-const SPAWN_RUMBLE := 0.05
+#const SPAWN_RUMBLE := 0.05
 
 @export var time_scale_factor := 4.0
 @export var idle_blend_curve: Curve
@@ -36,7 +36,20 @@ func _ready() -> void:
 func _start_player_rumble() -> void:
 	# TODO this is awful. Integrate PhantomCamera or similar
 	if Player.instance:
-		create_tween().tween_property(Player.instance, "camera_rumble", SPAWN_RUMBLE, 1.2)
+		var tween := create_tween()
+		Player.instance.camera_rumble = 0.08
+		(
+			tween
+			. tween_property(Player.instance, "camera_rumble", 0.004, 0.8)
+			. set_trans(Tween.TRANS_EXPO)
+			. set_ease(Tween.EASE_OUT)
+		)
+		(
+			tween
+			. tween_property(Player.instance, "camera_rumble", 0.05, 2.0)
+			. set_trans(Tween.TRANS_QUART)
+			. set_ease(Tween.EASE_IN)
+		)
 
 
 func _end_player_rumble() -> void:
diff --git a/src/world/grunk_beast/shambler/shambler.tscn b/src/world/grunk_beast/shambler/shambler.tscn
index c35bbc8..f7ee662 100644
--- a/src/world/grunk_beast/shambler/shambler.tscn
+++ b/src/world/grunk_beast/shambler/shambler.tscn
@@ -143,7 +143,7 @@ _data = [Vector2(0, 0), 0.0, 2.58321, 0, 0, Vector2(1, 1), -0.403345, 0.0, 0, 0]
 point_count = 2
 
 [sub_resource type="Curve" id="Curve_xlxrx"]
-_data = [Vector2(0, 0), 0.0, 1.63477, 0, 0, Vector2(0.837947, 1), -1.37504, -1.37504, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
+_data = [Vector2(0, 0), 0.0, 1.63477, 0, 0, Vector2(0.837947, 1), -0.720372, -0.720372, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
 point_count = 3
 
 [sub_resource type="Curve" id="Curve_6bdpa"]
@@ -203,6 +203,7 @@ size = Vector2(0.05, 0.05)
 
 [sub_resource type="PlaneMesh" id="PlaneMesh_xlxrx"]
 material = ExtResource("8_6bdpa")
+size = Vector2(4, 4)
 
 [sub_resource type="Curve" id="Curve_c7m4v"]
 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
@@ -434,7 +435,7 @@ process_material = SubResource("ParticleProcessMaterial_vru5p")
 draw_pass_1 = SubResource("QuadMesh_10hsf")
 
 [node name="SpawnRift" type="MeshInstance3D" parent="SpawnEffects" index="3"]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0.01, 0)
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0.01, -0.385)
 visible = false
 mesh = SubResource("PlaneMesh_xlxrx")
 skeleton = NodePath("../..")