From e9790f156db14194a4e1aa028626775b21e3d81f Mon Sep 17 00:00:00 2001 From: Jim Date: Tue, 26 Aug 2025 08:26:59 -0400 Subject: [PATCH] fix contact damage and test with impaler --- Cargo.lock | 1 + assets/settings/input_map.ron | 6 +++--- crates/building_impaler/Cargo.toml | 1 + crates/building_impaler/src/lib.rs | 2 ++ crates/combat_damagers/src/lib.rs | 2 ++ crates/level/src/lib.rs | 17 +++++++---------- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c1b7445..ac6d7a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1644,6 +1644,7 @@ dependencies = [ "bevy", "building", "combat", + "combat_damagers", "state", ] diff --git a/assets/settings/input_map.ron b/assets/settings/input_map.ron index ceea066..1c55182 100644 --- a/assets/settings/input_map.ron +++ b/assets/settings/input_map.ron @@ -13,12 +13,12 @@ MouseMovementY: [ CameraPanY, ], - KeyCode(Escape): [ - TogglePause, - ], MouseButton(Middle): [ CameraOrbitEnable, ], + KeyCode(Escape): [ + TogglePause, + ], KeyCode(F1): [ ToggleDebugUI, ], diff --git a/crates/building_impaler/Cargo.toml b/crates/building_impaler/Cargo.toml index 83e6781..342a3d2 100644 --- a/crates/building_impaler/Cargo.toml +++ b/crates/building_impaler/Cargo.toml @@ -10,6 +10,7 @@ avian3d = { workspace = true } state = { path = "../state" } combat = { path = "../combat" } building = { path = "../building" } +combat_damagers = { path = "../combat_damagers" } [lints] workspace = true diff --git a/crates/building_impaler/src/lib.rs b/crates/building_impaler/src/lib.rs index a6afbe8..af8eb60 100644 --- a/crates/building_impaler/src/lib.rs +++ b/crates/building_impaler/src/lib.rs @@ -6,6 +6,7 @@ use avian3d::prelude::*; use bevy::prelude::*; use building::Building; use combat::{Defense, Health}; +use combat_damagers::ContactDamage; use state::GameSystemSet; pub struct BuildingImpalerPlugin; @@ -47,6 +48,7 @@ fn spawn( transform.clone(), Health::new(20.0), Defense::new(5.0), + ContactDamage { amount: 5.0 }, Name::from("Impaler"), )); } diff --git a/crates/combat_damagers/src/lib.rs b/crates/combat_damagers/src/lib.rs index 8136b99..b833bb2 100644 --- a/crates/combat_damagers/src/lib.rs +++ b/crates/combat_damagers/src/lib.rs @@ -19,6 +19,7 @@ impl Plugin for CombatDamagersPlugin { } #[derive(Component)] +#[require(CollisionEventsEnabled)] pub struct ContactDamage { pub amount: f32, } @@ -29,6 +30,7 @@ fn deal_contact_damage( mut commands: Commands, ) { for event in reader.read() { + info!("event recv!"); if let Ok(contact) = query.get(event.0) { commands.trigger_targets( Attacked { diff --git a/crates/level/src/lib.rs b/crates/level/src/lib.rs index 9b4a528..6dba5a0 100644 --- a/crates/level/src/lib.rs +++ b/crates/level/src/lib.rs @@ -10,9 +10,9 @@ use bevy::{ render::camera::Exposure, }; use building_core::SpawnCore; -use building_impaler::SpawnImpaler; +use building_impaler::{Impaler, SpawnImpaler}; use camera::ControlledCamera; -use combat::{Attacked, Defense, Health}; +use combat::{Defense, Health}; use state::AppState; pub struct LevelPlugin; @@ -64,16 +64,13 @@ fn setup( )) .observe( |trigger: Trigger>, - mut query: Query<&mut LinearVelocity>, - mut commands: Commands| { - if let Ok(mut v) = query.get_mut(trigger.target()) { + target: Single<&GlobalTransform, With>, + mut query: Query<(&GlobalTransform, &mut LinearVelocity)>| { + if let Ok((gtf, mut v)) = query.get_mut(trigger.target()) { + let delta = target.translation() - gtf.translation(); v.y += 5.0; + v.0 += delta; } - commands.entity(trigger.target()).trigger(Attacked { - attacker: None, - amount: 8., - ..default() - }); }, ); }