Rework monster animation code #73: monster follows attacker

demoth · Sep 11, 2023 · 51508e0 · 51508e0
1 parent 516fe4a
commit 51508e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/game/src/main/java/jake2/game/GameCombat.java b/game/src/main/java/jake2/game/GameCombat.java
@@ -516,6 +516,7 @@ public static void T_Damage(SubgameEntity target, SubgameEntity inflictor, Subga
                 SpawnDamage(sparks, point, normal, received, gameExports);
 
             if (target.character != null) {
+                target.enemy = attacker; // todo
                 target.character.reactToDamage(damage);
                 return;
             }

diff --git a/game/src/main/kotlin/jake2/game/character/GameCharacter.kt b/game/src/main/kotlin/jake2/game/character/GameCharacter.kt
@@ -145,9 +145,9 @@ class GameCharacter(
         TODO()
     }
 
-    fun walk() {
+    fun walk(yaw: Float) {
         if (stateMachine.attemptStateChange("walk")) {
-            M.M_walkmove(self, self.s.angles[Defines.YAW], 5f, game)
+            M.M_walkmove(self, yaw, 5f, game)
         }
     }
 
@@ -209,9 +209,16 @@ fun spawnNewMonster(self: SubgameEntity, game: GameExportsImpl) {
 
     self.controller = selector(
         sequence(
-            node { self.character.health < 50 },
+            node { self.enemy != null },
+            node {
+                val distance = floatArrayOf(0f, 0f, 0f)
+                Math3D.VectorSubtract(self.enemy.s.origin, self.s.origin, distance)
+                val enemy_yaw = Math3D.vectoyaw(distance)
+                self.ideal_yaw = enemy_yaw
+                true
+            },
             finish {
-                self.character.walk()
+                self.character.walk(self.ideal_yaw)
             }
         ),
         sequence(