From 925cca336658aa7d0ae30f92295706b7dd0075d5 Mon Sep 17 00:00:00 2001
From: Ben Frankel <ben.frankel7@gmail.com>
Date: Sun, 28 Jul 2024 22:19:34 -0700
Subject: [PATCH] Fix player contact knockback

---
 src/game/actor/enemy.rs       |  2 +-
 src/game/actor/player.rs      |  2 +-
 src/game/combat/damage.rs     |  2 +-
 src/game/combat/hit.rs        |  2 +-
 src/game/combat/knockback.rs  | 18 ++++++++++++++----
 src/game/combat/projectile.rs |  2 +-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/game/actor/enemy.rs b/src/game/actor/enemy.rs
index d6fbb44..70e6699 100644
--- a/src/game/actor/enemy.rs
+++ b/src/game/actor/enemy.rs
@@ -39,7 +39,7 @@ pub fn enemy(key: impl Into<String>) -> impl EntityCommand {
             let config = r!(config.get());
             let actor = r!(config.enemies.get(&key)).clone();
 
-            (actor, game_root.players, assets.sfx_kick.clone())
+            (actor, game_root.enemies, assets.sfx_kick.clone())
         };
 
         world
diff --git a/src/game/actor/player.rs b/src/game/actor/player.rs
index cf1e352..649f414 100644
--- a/src/game/actor/player.rs
+++ b/src/game/actor/player.rs
@@ -76,7 +76,7 @@ pub fn player(key: impl Into<String>) -> impl EntityCommand {
                 // Contact hitbox was for testing, but it's funny, so I'm leaving it in.
                 Hitbox,
                 HitboxDamage(0.0),
-                HitboxKnockback(0.0),
+                HitboxKnockback(150.0, false),
                 HurtSfx(sfx_hurt, 1.8),
                 DeathSfx(sfx_death, 1.0),
             ))
diff --git a/src/game/combat/damage.rs b/src/game/combat/damage.rs
index dd701d2..330d49d 100644
--- a/src/game/combat/damage.rs
+++ b/src/game/combat/damage.rs
@@ -29,6 +29,6 @@ fn apply_hitbox_damage(
     hitbox_query: Query<&HitboxDamage>,
 ) {
     let &OnHit(hitbox, hurtbox) = trigger.event();
-    let damage = r!(hitbox_query.get(hitbox));
+    let damage = rq!(hitbox_query.get(hitbox));
     commands.entity(hurtbox).trigger(OnDamage(damage.0));
 }
diff --git a/src/game/combat/hit.rs b/src/game/combat/hit.rs
index 3c321d0..fbdfe66 100644
--- a/src/game/combat/hit.rs
+++ b/src/game/combat/hit.rs
@@ -79,7 +79,7 @@ impl Configure for HurtSfx {
 }
 
 fn play_hurt_sfx(trigger: Trigger<OnHit>, sfx_query: Query<&HurtSfx>, audio: Res<Audio>) {
-    let sfx = r!(sfx_query.get(trigger.event().1));
+    let sfx = rq!(sfx_query.get(trigger.event().1));
     audio
         .play(sfx.0.clone())
         .with_volume(sfx.1)
diff --git a/src/game/combat/knockback.rs b/src/game/combat/knockback.rs
index 90b2b8e..7de2afd 100644
--- a/src/game/combat/knockback.rs
+++ b/src/game/combat/knockback.rs
@@ -11,7 +11,7 @@ pub(super) fn plugin(app: &mut App) {
 /// Scales with projectile speed.
 #[derive(Component, Reflect)]
 #[reflect(Component)]
-pub struct HitboxKnockback(pub f32);
+pub struct HitboxKnockback(pub f32, pub bool);
 
 impl Configure for HitboxKnockback {
     fn configure(app: &mut App) {
@@ -24,11 +24,21 @@ fn apply_hitbox_knockback(
     trigger: Trigger<OnHit>,
     knockback_query: Query<&HitboxKnockback>,
     mut velocity_query: Query<&mut LinearVelocity>,
+    gt_query: Query<&GlobalTransform>,
 ) {
     let &OnHit(hitbox, hurtbox) = trigger.event();
-    let hitbox_velocity = r!(velocity_query.get(hitbox)).0;
-    let knockback = hitbox_velocity * r!(knockback_query.get(hitbox)).0;
-    let mut velocity = r!(velocity_query.get_mut(hurtbox));
+    let knockback = r!(knockback_query.get(hitbox));
+
+    let knockback = if knockback.1 {
+        let hitbox_velocity = r!(velocity_query.get(hitbox)).0;
+        hitbox_velocity * knockback.0
+    } else {
+        let hitbox_pos = r!(gt_query.get(hitbox)).translation().xy();
+        let hurtbox_pos = r!(gt_query.get(hurtbox)).translation().xy();
+        let direction = r!(Dir2::new(hurtbox_pos - hitbox_pos));
+        direction * knockback.0
+    };
 
+    let mut velocity = r!(velocity_query.get_mut(hurtbox));
     velocity.0 += knockback;
 }
diff --git a/src/game/combat/projectile.rs b/src/game/combat/projectile.rs
index d863dac..6f6a1e9 100644
--- a/src/game/combat/projectile.rs
+++ b/src/game/combat/projectile.rs
@@ -170,7 +170,7 @@ pub fn projectile(
                 (
                     Hitbox,
                     HitboxDamage(power * projectile.damage),
-                    HitboxKnockback(power * projectile.knockback),
+                    HitboxKnockback(power * projectile.knockback, true),
                 ),
                 // TODO: Additional cleanup conditions that could be added: entity cap.
                 // Cleanup: