nzp-team/nzportable#1196 / nzp-team/nzportable#1196 - Ballistic Knife reliability and stability fixes (#141)

* SERVER: Improve Ballistic Knife reliability/stability, secondary model update rate

Author: MotoLegacy

.github/workflows/unit-tests.yml

@@ -5,7 +5,7 @@ jobs:
     name: Run Unit Tests
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:24.10
+      image: ubuntu:24.04
       options: --shm-size=8192m
     steps:
       - name: Checkout

source/server/ai/zombie_core.qc

@@ -2008,6 +2008,8 @@ void(entity where) spawn_a_zombieB =
 	if (map_compatibility_mode == MAP_COMPAT_BETA)
 		szombie.head.scale = szombie.larm.scale = szombie.rarm.scale = szombie.scale = 0.73;
 
+	szombie.head.flags = szombie.larm.flags = szombie.rarm.flags = FL_MONSTER;
+
 	// set up timer for next spawn
 	zombie_spawn_timer = zombie_spawn_delay + time;
 

source/server/weapons/ballistic_knife.qc

@@ -32,15 +32,19 @@ void(entity victim) Blade_Damage =
     float damage_type = 0;
     float damage_region = 0;
 
+	entity damage_target = victim;
+
     switch(victim.classname) {
 		case "ai_zombie_head":
             damage_region = HEAD_X;
             damage_type = DMG_TYPE_HEADSHOT;
+			damage_target = victim.owner;
 			break;
 		case "ai_zombie_larm":
 		case "ai_zombie_rarm":
             damage_region = LIMBS_X;
             damage_type = DMG_TYPE_OTHER;
+			damage_target = victim.owner;
 			break;
 		case "ai_zombie":
 			if (trace_endpos_z < victim.origin_z) {
@@ -58,7 +62,7 @@ void(entity victim) Blade_Damage =
 			break;
 	}
 
-    DamageHandler(victim, self.owner, getWeaponDamage(self.weapon) * getWeaponMultiplier(self.weapon, damage_region), damage_type);
+    DamageHandler(damage_target, self.owner, getWeaponDamage(self.weapon) * getWeaponMultiplier(self.weapon, damage_region), damage_type);
     self.angles_y = 180;
 };
 
@@ -146,6 +150,8 @@ void() Blade_Impact =
     self.effects = EF_FULLBRIGHT;
     self.think = Blade_Die;
     self.nextthink = time + 60;
+
+	setorigin(self, self.origin);
 };
 
 //

source/server/weapons/frames_core.qc

@@ -56,14 +56,12 @@ void () W2_Frame_Update =
 	if (self.anim_weapon2_time > time)
 		return; //don't call every frame, if it is the animations will play too fast
 
-#ifndef FTE
-
-	if (self.weapon == W_KAR_SCOPE || self.weapon == W_HEADCRACKER) {
+	// Weapons where their secondary model is an attachment (e.g. scoped kar, ballistic knife, etc.)
+	// should update the second frame in time with the first, always.
+	if (WepDef_WeaponSecondaryModelIsAttachment(self.weapon)) {
 		self.weapon2frame = self.weaponframe;
 		return;
 	}
-
-#endif // FTE
 
 	self.anim_weapon2_time = time + self.weapon2_animduration;
 

source/shared/weapon_stats.qc

@@ -5095,3 +5095,24 @@ vector(float weapon) WepDef_GetLeftFlashOffset =
     }
     return [0, 0, 0];
 }
+
+//
+// WepDef_WeaponSecondaryModelIsAttachment(weapon)
+// Returns TRUE if a weapon's secondary model is
+// an attachment as opposed to something else
+// (akimbo).
+//
+float(float weapon) WepDef_WeaponSecondaryModelIsAttachment =
+{
+	switch(weapon) {
+		case W_KAR_SCOPE:
+		case W_HEADCRACKER:
+		case W_BK:
+		case W_KRAUS:
+			return true;
+		default:
+			return false;
+	}
+
+	return false;
+}

testing/run_unit_tests.sh

@@ -4,7 +4,7 @@
 # QuakeC Unit test runner.
 # ----
 # This is intended to be used via a Docker 
-# container running ubuntu:24.10.
+# container running ubuntu:24.04.
 #
 set -o errexit