From b5ec1229b8e97b64e1e3bf72c70c8316e0f68f31 Mon Sep 17 00:00:00 2001
From: extrawurst <mail@rusticorn.com>
Date: Wed, 7 May 2025 17:10:31 +0200
Subject: [PATCH] healing particle effect

---
 assets/models/medic_particle.glb | Bin 0 -> 7172 bytes
 src/abilities/healing.rs         |   2 +-
 src/abilities/mod.rs             |   2 +
 src/heal_effect.rs               |  99 +++++++++++++++++++++++++++++++
 src/loading_assets.rs            |   3 +
 src/main.rs                      |   2 +
 6 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 assets/models/medic_particle.glb
 create mode 100644 src/heal_effect.rs

diff --git a/assets/models/medic_particle.glb b/assets/models/medic_particle.glb
new file mode 100644
index 0000000000000000000000000000000000000000..7c19c09aeb2829a813ea7d62bdecf40e6cb0fc61
GIT binary patch
literal 7172
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
Q5t4JW3$i|#v2^u+0W%I~cmMzZ

literal 0
HcmV?d00001

diff --git a/src/abilities/healing.rs b/src/abilities/healing.rs
index a2563a2..a147602 100644
--- a/src/abilities/healing.rs
+++ b/src/abilities/healing.rs
@@ -6,7 +6,7 @@ use crate::{
 };
 
 #[derive(Component)]
-struct Healing(Entity);
+pub struct Healing(pub Entity);
 
 #[derive(Event, Debug)]
 pub enum HealingStateChanged {
diff --git a/src/abilities/mod.rs b/src/abilities/mod.rs
index b83f9d8..019eb32 100644
--- a/src/abilities/mod.rs
+++ b/src/abilities/mod.rs
@@ -4,6 +4,8 @@ mod healing;
 mod missile;
 mod thrown;
 
+pub use healing::Healing;
+
 use crate::{
     GameState,
     aim::AimTarget,
diff --git a/src/heal_effect.rs b/src/heal_effect.rs
new file mode 100644
index 0000000..0e585ba
--- /dev/null
+++ b/src/heal_effect.rs
@@ -0,0 +1,99 @@
+use crate::{
+    GameState, abilities::Healing, loading_assets::GameAssets, utils::billboards::Billboard,
+};
+use bevy::prelude::*;
+use rand::{Rng, thread_rng};
+
+#[derive(Component, Default)]
+#[require(Transform, InheritedVisibility)]
+struct HealParticleEffect {
+    next_spawn: f32,
+}
+
+#[derive(Component)]
+struct HealParticle {
+    start_scale: f32,
+    end_scale: f32,
+    start_pos: Vec3,
+    end_pos: Vec3,
+    start_time: f32,
+    life_time: f32,
+}
+
+pub fn plugin(app: &mut App) {
+    app.add_systems(
+        Update,
+        (on_added, update_effects, update_particles).run_if(in_state(GameState::Playing)),
+    );
+}
+
+fn on_added(mut cmds: Commands, query: Query<&Healing, Added<Healing>>) {
+    for healing in query.iter() {
+        cmds.entity(healing.0).insert((
+            Name::new("heal-particle-effect"),
+            HealParticleEffect::default(),
+        ));
+    }
+}
+
+fn update_effects(
+    mut cmds: Commands,
+    mut query: Query<(&mut HealParticleEffect, Entity)>,
+    time: Res<Time>,
+    assets: Res<GameAssets>,
+) {
+    const DISTANCE: f32 = 4.;
+    let mut rng = thread_rng();
+
+    let now = time.elapsed_secs();
+    for (mut effect, e) in query.iter_mut() {
+        if effect.next_spawn < now {
+            let start_pos = Vec3::new(
+                rng.gen_range(-DISTANCE..DISTANCE),
+                2.,
+                rng.gen_range(-DISTANCE..DISTANCE),
+            );
+            let max_distance = start_pos.length().max(0.8);
+            let end_pos =
+                start_pos + (start_pos.normalize() * -1.) * rng.gen_range(0.5..max_distance);
+            let start_scale = rng.gen_range(0.7..1.0);
+            let end_scale = rng.gen_range(0.1..start_scale);
+
+            cmds.entity(e).with_child((
+                Name::new("heal-particle"),
+                SceneRoot(assets.mesh_heal_particle.clone()),
+                Billboard,
+                Transform::from_translation(start_pos),
+                HealParticle {
+                    start_scale,
+                    end_scale,
+                    start_pos,
+                    end_pos,
+                    start_time: now,
+                    life_time: rng.gen_range(0.3..1.0),
+                },
+            ));
+
+            effect.next_spawn = now + rng.gen_range(0.1..0.5);
+        }
+    }
+}
+
+fn update_particles(
+    mut cmds: Commands,
+    mut query: Query<(&mut Transform, &HealParticle, Entity)>,
+    time: Res<Time>,
+) {
+    for (mut transform, particle, e) in query.iter_mut() {
+        if particle.start_time + particle.life_time < time.elapsed_secs() {
+            cmds.entity(e).despawn();
+            continue;
+        }
+
+        let t = (time.elapsed_secs() - particle.start_time) / particle.life_time;
+
+        // info!("particle[{e:?}] t: {t}");
+        transform.translation = particle.start_pos.lerp(particle.end_pos, t);
+        transform.scale = Vec3::splat(particle.start_scale.lerp(particle.end_scale, t));
+    }
+}
diff --git a/src/loading_assets.rs b/src/loading_assets.rs
index 3c980d0..80bb46f 100644
--- a/src/loading_assets.rs
+++ b/src/loading_assets.rs
@@ -100,6 +100,9 @@ pub struct GameAssets {
     #[asset(path = "models/cash.glb#Scene0")]
     pub mesh_cash: Handle<Scene>,
 
+    #[asset(path = "models/medic_particle.glb#Scene0")]
+    pub mesh_heal_particle: Handle<Scene>,
+
     #[asset(path = "models/projectiles", collection(mapped, typed))]
     pub projectiles: HashMap<AssetFileName, Handle<Gltf>>,
 
diff --git a/src/main.rs b/src/main.rs
index 1ee065c..a0190da 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,6 +14,7 @@ mod head;
 mod head_drop;
 mod heads;
 mod heads_database;
+mod heal_effect;
 mod hitpoints;
 mod keys;
 mod loading_assets;
@@ -165,6 +166,7 @@ fn main() {
     app.add_plugins(water::plugin);
     app.add_plugins(head_drop::plugin);
     app.add_plugins(trail::plugin);
+    app.add_plugins(heal_effect::plugin);
 
     app.init_state::<GameState>();