From 8946289ac22ed708efd397fe2ef4c513bfc7bea4 Mon Sep 17 00:00:00 2001
From: extrawurst <mail@rusticorn.com>
Date: Wed, 12 Mar 2025 23:25:13 +0100
Subject: [PATCH] simple hitpoint mechanic

---
 assets/sfx/abilities/gun.ogg | Bin 0 -> 4199 bytes
 src/aim.rs                   |  13 ++++++++---
 src/gates.rs                 |  44 +++++++++++++++++------------------
 src/main.rs                  |   4 ++++
 src/npc.rs                   |  41 ++++++++++++++++++++++++++++++++
 src/player.rs                |  32 +++++++++++++++++++++++--
 src/shooting.rs              |  31 ++++++++++++++++++++++++
 src/tb_entities.rs           |   4 +++-
 8 files changed, 140 insertions(+), 29 deletions(-)
 create mode 100644 assets/sfx/abilities/gun.ogg
 create mode 100644 src/shooting.rs

diff --git a/assets/sfx/abilities/gun.ogg b/assets/sfx/abilities/gun.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..b9ed1e1d04de092f58f39857f9d945a55ce78087
GIT binary patch
literal 4199
zcmcgvdsI_b);}OfK&62%V8Cb-n?NoK5+2o{Od-6IOF_6GVgN@I5W-7HpxVJ{u?d|@
zVkU-wh=Jje08!J5H42^OsG~`E2?_!h6}44BomOoXb!O3i=Z3NKSl^oU{WWKuoa}q|
zIlr@CXYX@2=jNsWd+_&mZFOZPPNq(=oa|QFeXv_B5J~VCcB|9yKLFOBT=+NGZN^vr
z((sjb@TrUMOm!9h{7=oiXaOb!a??d6c>$Znxzs|DAk79&<xztIg8~EB2Zm6YSWb4i
zP*j{tjVb;>B;H+Ilv7-W;HWF$FD5Z+b94+A4wvpM&lc?tqb}g)6btPf7s%C|s5Cne
z0RWjp^m8-{m0`UeG=*1dGp8T1uH;;$wb7$K3$uh;$-=mv>}pQm{;R4j0AHY^Y)umL
z{AaY1HuBcN(pf5`9#C@!OPv{zQnF{%VkK*V>ncX@dHYFm)ukO|Na-k$>cpuc)>*Z9
zhz+S}>hCb|=b<>4oa-uHf}>b)yvI1QBJ}L_g?YBgwn2fz+o)pJjHl#t90fj77T!@q
zvORzbfaVrv^*2mcqW38m&<g-DqLdVOh!o#N8MsDYMp(AZ5xNQx;5_c9I&QT-UAart
z<nx<WW<#sr@l&GyQ)>rKJ^m`dwwwz<QZmV0LUOXL%Lah3gIV3SL3ux2t>4z<B>VJ)
zJ*Wi00nS?**F{QrMj!rR)9{b~-WRr|0suZ?W|J4aaRGtm?G@FCxo5g~awu+5D>*|^
z2EFtyQpFICq@0K((DpqEe>qk0WWfbQ0Cti#e74_8C(vX9l5ccrI~7t7=;{3*&e93D
zr9@7*wql?MuCSQ`>Ue=FBXZyzI3PL=#zore1=Wa^A{k^^snVrEv&}V$VSPGvVpu=D
zO^FpCCQ{1#T@O5kM$@=f@<k*fRIn`Me+=)~%m5W8F80b+K>=kX8>krKQ5MvKO#G-&
zVlaA~m>#F5_o>(NYBmjgiT8x-(Fq<~#<mnq%oY85uISEK&YiiOn`1dybvd_9MOoun
zSrg^|+HI;=I)F;$eQ0&qxk??^#pWE99Uy|rwhh(aa-lzzjBRQkQC;qbbsZlzbRJk`
zn*tpJtp;0VtIcinZFTLUrViZM$BtFE8;%{zZ)g|&=WgFZI}U&|04uGfl(<rgwG`LN
zW?||gKm{NwnGz#jYgLEDLmfw>ho5IAzgwQNwdjo#;1s-BC7WRHgQkE)%_iPxNW%ZK
z<A${dF!+cyDm1ZcYb;`+pWg1LBh_55=&TpKANHMrvlwye`5j8rH;+yQ=~dX$ijI0t
zFZof6RK=<~IWZ|2KKF7Jbe<cChPlE*wGf59EFXr{on@tGW2<Mhnnct`uS??(>SXn(
z{E#FO^<~sx{3V7QHCn)Ehc30Jz~5RKl*Iug1MnG(i|9xg%Ic_(LJ_M*$VDD##ffZd
zeHqbjhFs=~>NH{{yF)8+4|1xNxN>|Np&Nh`{4Hs@s`9Xl(86bxq?$!=6B0SjNL3Pc
zOj|P&$umgR7|&o<V~Sb{7UqnUyJLQcIUTF^*QE+Y{u3kEL4S)jLvij?jlkb9#^)dJ
zF{ex9p)Y&cXrpF43^D4*^An6?lRS~XZd@Spw~Py}AQo*fVyvnYtTC8x2nIq;^%4k0
z5)LDlrh*eaR;@J9IHu(fu+8-qgIzQAlDE_n4TLJk`0>WE2LAETni0OpXi@Ry_~vp}
zF2-MLFsJjYS>}3)+<)RK|8uxUikxlbOVwR-+xf?FsA?mG3Vhevv=Qy88~;s!@x^vY
z0B8J`JkNjTdj4B}mL|#2#T&PzMB@W({$Ik)H!8kolW$6%8prQuT#4z`O0V|3YOe^4
z9h;O6ng~ZE#IV`bWl#I|YVre&4>I|W!^ge%U11Zh@xMnbQz`Ou6HP}?o^zt{2OyNR
zn)Rwd5*RikNHt!B3aU(=Efwp~8LH-($>~TzQqTm1GS4>4*8#BOf*qh<kOd{>^;QFF
zBB+e)W$Vc@6d|<8G#n<fMZxQ>m#SI5dJV=WFig;EM}%0ARVQ=j`!P<tqauT5gwNEQ
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

literal 0
HcmV?d00001

diff --git a/src/aim.rs b/src/aim.rs
index 071eb5d..03d3554 100644
--- a/src/aim.rs
+++ b/src/aim.rs
@@ -5,11 +5,12 @@ use crate::{
 };
 use bevy::prelude::*;
 use bevy_sprite3d::{Sprite3dBuilder, Sprite3dParams};
+use ops::sin;
 use std::f32::consts::PI;
 
 #[derive(Resource, Reflect)]
 #[reflect(Resource)]
-struct AimState {
+pub struct AimState {
     pub target: Option<Entity>,
     pub range: f32,
     pub angle: f32,
@@ -37,7 +38,7 @@ enum MarkerEvent {
 
 pub fn plugin(app: &mut App) {
     app.init_resource::<AimState>();
-    app.add_systems(Update, update);
+    app.add_systems(Update, (update, move_marker));
     app.add_observer(marker_event);
 }
 
@@ -63,7 +64,7 @@ fn marker_event(
             Name::new("aim-marker"),
             Billboard,
             Marker,
-            Transform::from_translation(Vec3::new(0., 3., 0.)),
+            Transform::default(),
             Sprite3dBuilder {
                 image: selector,
                 pixels_per_metre: 30.,
@@ -129,3 +130,9 @@ fn update(
         state.target = new_target;
     }
 }
+
+fn move_marker(mut query: Query<&mut Transform, With<Marker>>, time: Res<Time>) {
+    for mut transform in query.iter_mut() {
+        transform.translation = Vec3::new(0., 3. + (sin(time.elapsed_secs() * 6.) * 0.2), 0.);
+    }
+}
diff --git a/src/gates.rs b/src/gates.rs
index 436da4c..76953ae 100644
--- a/src/gates.rs
+++ b/src/gates.rs
@@ -1,4 +1,4 @@
-use crate::movables::TriggerMovableEvent;
+use crate::{movables::TriggerMovableEvent, npc::KeyCollected};
 use bevy::{prelude::*, utils::hashbrown::HashSet};
 
 #[derive(Resource)]
@@ -9,36 +9,34 @@ enum GatesState {
 
 pub fn plugin(app: &mut App) {
     app.insert_resource(GatesState::Init);
-    app.add_systems(Update, update);
+    app.add_observer(on_key);
 }
 
-fn update(
+fn on_key(
+    _trigger: Trigger<KeyCollected>,
     mut commands: Commands,
-    keyboard: Res<ButtonInput<KeyCode>>,
     mut state: ResMut<GatesState>,
     asset_server: Res<AssetServer>,
 ) {
-    if keyboard.just_pressed(KeyCode::Digit1) {
-        if matches!(*state, GatesState::Init) {
-            *state = GatesState::GateOpen1;
+    if matches!(*state, GatesState::Init) {
+        *state = GatesState::GateOpen1;
 
-            //TODO: put into a sound effects system
-            commands.spawn((
-                AudioPlayer::new(asset_server.load("sfx/effects/gate.ogg")),
-                PlaybackSettings::DESPAWN,
-            ));
-            //TODO: put into actual key collect once we have that
-            commands.spawn((
-                AudioPlayer::new(asset_server.load("sfx/effects/key_collect.ogg")),
-                PlaybackSettings::DESPAWN,
-            ));
+        //TODO: put into a sound effects system
+        commands.spawn((
+            AudioPlayer::new(asset_server.load("sfx/effects/gate.ogg")),
+            PlaybackSettings::DESPAWN,
+        ));
+        //TODO: put into actual key collect once we have that
+        commands.spawn((
+            AudioPlayer::new(asset_server.load("sfx/effects/key_collect.ogg")),
+            PlaybackSettings::DESPAWN,
+        ));
 
-            let entities: HashSet<_> = vec!["fence_01", "fence_02"]
-                .into_iter()
-                .map(|s| String::from(s))
-                .collect();
+        let entities: HashSet<_> = vec!["fence_01", "fence_02"]
+            .into_iter()
+            .map(|s| String::from(s))
+            .collect();
 
-            commands.trigger(TriggerMovableEvent(entities));
-        }
+        commands.trigger(TriggerMovableEvent(entities));
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 79c4c79..d30d527 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,8 +6,10 @@ mod cash;
 mod gates;
 mod heads_ui;
 mod movables;
+mod npc;
 mod platforms;
 mod player;
+mod shooting;
 mod tb_entities;
 
 use avian3d::PhysicsPlugins;
@@ -76,6 +78,8 @@ fn main() {
     app.add_plugins(movables::plugin);
     app.add_plugins(billboards::plugin);
     app.add_plugins(aim::plugin);
+    app.add_plugins(shooting::plugin);
+    app.add_plugins(npc::plugin);
 
     app.insert_resource(AmbientLight {
         color: Color::WHITE,
diff --git a/src/npc.rs b/src/npc.rs
index e69de29..3df77e7 100644
--- a/src/npc.rs
+++ b/src/npc.rs
@@ -0,0 +1,41 @@
+use crate::tb_entities::EnemySpawn;
+use bevy::prelude::*;
+
+#[derive(Event, Reflect)]
+pub struct Hit {
+    pub damage: u32,
+}
+
+// TODO: add actual keys
+#[derive(Event, Reflect)]
+pub struct KeyCollected;
+
+#[derive(Component, Reflect)]
+struct Hp(i32);
+
+pub fn plugin(app: &mut App) {
+    app.add_systems(Update, init);
+}
+
+fn init(mut commands: Commands, query: Query<Entity, (With<EnemySpawn>, Without<Hp>)>) {
+    for e in query.iter() {
+        commands.entity(e).insert(Hp(100)).observe(on_hit);
+    }
+}
+
+fn on_hit(trigger: Trigger<Hit>, mut commands: Commands, mut query: Query<&mut Hp>) {
+    let Hit { damage } = trigger.event();
+
+    let Ok(mut hp) = query.get_mut(trigger.entity()) else {
+        return;
+    };
+
+    hp.0 = hp.0.saturating_sub(*damage as i32);
+
+    info!("npc hp changed: {} [{}]", hp.0, trigger.entity());
+
+    if hp.0 <= 0 {
+        commands.entity(trigger.entity()).despawn_recursive();
+        commands.trigger(KeyCollected);
+    }
+}
diff --git a/src/player.rs b/src/player.rs
index 95c4d2b..f707b03 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -6,11 +6,15 @@ use crate::{
     camera::GameCameraRig,
     cash::{Cash, CashCollectEvent},
     heads_ui::HeadChanged,
+    shooting::TriggerState,
     tb_entities::SpawnPoint,
 };
 use avian3d::prelude::*;
 use bevy::{
-    input::mouse::MouseMotion,
+    input::{
+        ButtonState,
+        mouse::{MouseButtonInput, MouseMotion},
+    },
     prelude::*,
     window::{CursorGrabMode, PrimaryWindow},
 };
@@ -49,7 +53,6 @@ pub fn plugin(app: &mut App) {
         (
             spawn,
             update_camera,
-            mouse_rotate,
             collect_cash,
             toggle_animation,
             setup_animations_marker_for_player,
@@ -60,6 +63,9 @@ pub fn plugin(app: &mut App) {
         apply_controls.in_set(TnuaUserControlsSystemSet),
     );
 
+    app.add_systems(Update, mouse_rotate.run_if(on_event::<MouseMotion>));
+    app.add_systems(Update, mouse_click.run_if(on_event::<MouseButtonInput>));
+
     app.add_observer(updaate_head);
 }
 
@@ -131,6 +137,28 @@ fn mouse_rotate(
     }
 }
 
+fn mouse_click(mut events: EventReader<MouseButtonInput>, mut commands: Commands) {
+    for ev in events.read() {
+        match ev {
+            MouseButtonInput {
+                button: MouseButton::Left,
+                state: ButtonState::Pressed,
+                ..
+            } => {
+                commands.trigger(TriggerState::Active);
+            }
+            MouseButtonInput {
+                button: MouseButton::Left,
+                state: ButtonState::Released,
+                ..
+            } => {
+                commands.trigger(TriggerState::Inactive);
+            }
+            _ => {}
+        }
+    }
+}
+
 fn toggle_grab_cursor(window: &mut Window) {
     match window.cursor_options.grab_mode {
         CursorGrabMode::None => {
diff --git a/src/shooting.rs b/src/shooting.rs
new file mode 100644
index 0000000..d92f404
--- /dev/null
+++ b/src/shooting.rs
@@ -0,0 +1,31 @@
+use bevy::prelude::*;
+
+use crate::{aim::AimState, npc::Hit};
+
+#[derive(Event, Reflect)]
+pub enum TriggerState {
+    Active,
+    Inactive,
+}
+
+pub fn plugin(app: &mut App) {
+    app.add_observer(on_trigger_state);
+}
+
+fn on_trigger_state(
+    trigger: Trigger<TriggerState>,
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    aim: Res<AimState>,
+) {
+    if matches!(trigger.event(), TriggerState::Active) {
+        commands.spawn((
+            AudioPlayer::new(asset_server.load("sfx/abilities/gun.ogg")),
+            PlaybackSettings::DESPAWN,
+        ));
+
+        if let Some(target) = aim.target {
+            commands.entity(target).trigger(Hit { damage: 20 });
+        }
+    }
+}
diff --git a/src/tb_entities.rs b/src/tb_entities.rs
index fa39514..20a1957 100644
--- a/src/tb_entities.rs
+++ b/src/tb_entities.rs
@@ -108,12 +108,14 @@ impl EnemySpawn {
         let head_mesh = asset_server
             .load(GltfAssetLabel::Scene(0).from_asset(format!("models/heads/{}.glb", this.head)));
 
+        let head = this.head.clone();
+
         world
             .commands()
             .entity(entity)
             .insert((
                 this_transform,
-                Name::from("Enemy"),
+                Name::from(format!("enemy [{}]", head)),
                 Visibility::default(),
                 RigidBody::Dynamic,
                 Collider::capsule(0.4, 2.),