From 06820d19ee988a212e211984a6074c4e9ea6fc08 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sat, 12 Jul 2025 13:39:45 -0600 Subject: [PATCH] Tweaks to grunk dust emission --- src/effects/grunk_dust/grunk_dust.tscn | 4 +--- src/equipment/laser_cast/laser_cast.gd | 6 ++---- src/equipment/laser_cast/laser_cast.tscn | 1 + src/equipment/wide_spray/wide_spray.tscn | 7 +++++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/effects/grunk_dust/grunk_dust.tscn b/src/effects/grunk_dust/grunk_dust.tscn index 2135985..7bd7c0b 100644 --- a/src/effects/grunk_dust/grunk_dust.tscn +++ b/src/effects/grunk_dust/grunk_dust.tscn @@ -24,12 +24,10 @@ point_count = 2 curve = SubResource("Curve_smx5b") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ykxlg"] -emission_shape = 4 -emission_point_count = 5 angle_min = -184.7 angle_max = 239.3 direction = Vector3(0, 0, -1) -spread = 90.0 +spread = 80.0 initial_velocity_min = 2.0 initial_velocity_max = 2.0 angular_velocity_min = -360.0 diff --git a/src/equipment/laser_cast/laser_cast.gd b/src/equipment/laser_cast/laser_cast.gd index c15e2af..01c02bd 100644 --- a/src/equipment/laser_cast/laser_cast.gd +++ b/src/equipment/laser_cast/laser_cast.gd @@ -4,7 +4,7 @@ class_name LaserCast extends RayCast3D const NORMAL_OFFSET = 0.05 @export var parent_tool: Spray -@export var dust_emission_scale: float +@export var dust_emission_scale: float = 0.1 # Currently gunking var gunk_id: int @@ -26,10 +26,8 @@ func _process(_delta: float) -> void: if c is Node3D: (c as Node3D).global_position = child_pos - var new_gunk_id: int = 0 var collider: Object = get_collider() - if collider: - new_gunk_id = collider.get_instance_id() + var new_gunk_id: int = collider.get_instance_id() if new_gunk_id != gunk_id: gunk_id = new_gunk_id if gunkable: diff --git a/src/equipment/laser_cast/laser_cast.tscn b/src/equipment/laser_cast/laser_cast.tscn index de69c0b..b2f455f 100644 --- a/src/equipment/laser_cast/laser_cast.tscn +++ b/src/equipment/laser_cast/laser_cast.tscn @@ -31,4 +31,5 @@ script = ExtResource("3_bkg64") [node name="GrunkDust" parent="." instance=ExtResource("4_ekmqg")] unique_name_in_owner = true emitting = false +amount = 64 script = ExtResource("5_r1geq") diff --git a/src/equipment/wide_spray/wide_spray.tscn b/src/equipment/wide_spray/wide_spray.tscn index a128e8d..0f43d31 100644 --- a/src/equipment/wide_spray/wide_spray.tscn +++ b/src/equipment/wide_spray/wide_spray.tscn @@ -182,17 +182,21 @@ unique_name_in_owner = true [node name="LaserCast" parent="Muzzle/Pivot/SprayCasts" node_paths=PackedStringArray("parent_tool") instance=ExtResource("3_xahet")] target_position = Vector3(-0.5, 0, -2) parent_tool = NodePath("../../../..") +dust_emission_scale = 0.01 [node name="LaserCast2" parent="Muzzle/Pivot/SprayCasts" node_paths=PackedStringArray("parent_tool") instance=ExtResource("3_xahet")] target_position = Vector3(-0.333, 0, -2) parent_tool = NodePath("../../../..") +dust_emission_scale = 0.01 [node name="LaserCast3" parent="Muzzle/Pivot/SprayCasts" node_paths=PackedStringArray("parent_tool") instance=ExtResource("3_xahet")] target_position = Vector3(-0.167, 0, -2) parent_tool = NodePath("../../../..") +dust_emission_scale = 0.01 [node name="LaserCast4" parent="Muzzle/Pivot/SprayCasts" node_paths=PackedStringArray("parent_tool") instance=ExtResource("3_xahet")] parent_tool = NodePath("../../../..") +dust_emission_scale = 0.01 [node name="SpraySFX" parent="Muzzle/Pivot/SprayCasts/LaserCast4" instance=ExtResource("3_v0jnx")] unique_name_in_owner = true @@ -201,14 +205,17 @@ attenuation_model = 0 [node name="LaserCast5" parent="Muzzle/Pivot/SprayCasts" node_paths=PackedStringArray("parent_tool") instance=ExtResource("3_xahet")] target_position = Vector3(0.167, 0, -2) parent_tool = NodePath("../../../..") +dust_emission_scale = 0.01 [node name="LaserCast6" parent="Muzzle/Pivot/SprayCasts" node_paths=PackedStringArray("parent_tool") instance=ExtResource("3_xahet")] target_position = Vector3(0.333, 0, -2) parent_tool = NodePath("../../../..") +dust_emission_scale = 0.01 [node name="LaserCast7" parent="Muzzle/Pivot/SprayCasts" node_paths=PackedStringArray("parent_tool") instance=ExtResource("3_xahet")] target_position = Vector3(0.5, 0, -2) parent_tool = NodePath("../../../..") +dust_emission_scale = 0.01 [node name="SprayEffect" type="MeshInstance3D" parent="Muzzle/Pivot"] unique_name_in_owner = true