Ballistic Knife: add held Bowie Knife and Galvaknuckles

README.md

@@ -470,7 +470,7 @@
 * Added model and anims from Black Ops 2 Multiplayer
 * Added sounds on all maps
 * Increased melee time from 0.5 seconds to 0.7 seconds
-* No longer held with Bowie Knife
+* Held with Galvaknuckles
 * Projectiles are no longer destroyed when other players walk over them
 * Projectiles are no longer destroyed when purchasing a melee wallbuy
 * Projectiles get destroyed by lava

scripts/zm/_zm_reimagined.gsc

@@ -3212,6 +3212,11 @@ should_respawn()
 	return 0;
 }
 
+is_tazer_weapon(weapon)
+{
+	return issubstr(weapon, "tazer_knuckles") || issubstr(weapon, "knife_ballistic_no_melee");
+}
+
 get_current_spectating_player()
 {
 	if (self.currentspectatingclient == -1)

scripts/zm/replaced/_zm.gsc

@@ -1426,7 +1426,7 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
 		return damage;
 	}
 
-	if (issubstr(weapon, "tazer_knuckles_zm") || weapon == "jetgun_zm" || weapon == "riotshield_zm")
+	if (scripts\zm\_zm_reimagined::is_tazer_weapon(weapon) || weapon == "jetgun_zm" || weapon == "riotshield_zm")
 	{
 		self.knuckles_extinguish_flames = 1;
 	}

scripts/zm/replaced/_zm_ai_avogadro.gsc

@@ -249,7 +249,7 @@ avogadro_damage_func(einflictor, eattacker, idamage, idflags, smeansofdeath, swe
 			self.shield = 1;
 			self notify("melee_pain");
 
-			if (issubstr(sweapon, "tazer_knuckles_zm"))
+			if (scripts\zm\_zm_reimagined::is_tazer_weapon(sweapon))
 			{
 				self.hit_by_melee += 2;
 			}

scripts/zm/replaced/_zm_spawner.gsc

@@ -532,7 +532,7 @@ zombie_death_animscript()
 	if ("rottweil72_upgraded_zm" == self.damageweapon && "MOD_RIFLE_BULLET" == self.damagemod)
 		self thread dragons_breath_flame_death_fx();
 
-	if (issubstr(self.damageweapon, "tazer_knuckles_zm") && "MOD_MELEE" == self.damagemod)
+	if (scripts\zm\_zm_reimagined::is_tazer_weapon(self.damageweapon) && "MOD_MELEE" == self.damagemod)
 	{
 		self.is_on_fire = 0;
 		self notify("stop_flame_damage");

scripts/zm/replaced/zm_buried_sq_ts.gsc

@@ -53,7 +53,7 @@ ts_is_bowie_knife(str_weapon)
 
 ts_is_galvaknuckles(str_weapon)
 {
-	if (issubstr(str_weapon, "tazer_knuckles_zm"))
+	if (scripts\zm\_zm_reimagined::is_tazer_weapon(str_weapon))
 		return true;
 
 	return false;

scripts/zm/replaced/zm_highrise_sq.gsc

@@ -136,7 +136,7 @@ tower_punch_watch_leg(a_leg_trigs)
 	{
 		self waittill("trigger", who);
 
-		if (!isinarray(level.legs_hit, self.script_noteworthy) && isplayer(who) && (issubstr(who.current_melee_weapon, "tazer_knuckles_zm") || issubstr(who.current_melee_weapon, "tazer_knuckles_upgraded_zm")))
+		if (!isinarray(level.legs_hit, self.script_noteworthy) && isplayer(who) && scripts\zm\_zm_reimagined::is_tazer_weapon(who.current_melee_weapon))
 		{
 			level.legs_hit[level.legs_hit.size] = self.script_noteworthy;
 			self playsound("zmb_sq_leg_powerup_" + level.legs_hit.size);

scripts/zm/replaced/zm_transit_lava.gsc

@@ -61,7 +61,7 @@ zombie_exploding_death(zombie_dmg, trap)
 	while (isdefined(self) && self.health >= zombie_dmg && (isdefined(self.is_on_fire) && self.is_on_fire))
 		wait 0.5;
 
-	if (!isdefined(self) || !(isdefined(self.is_on_fire) && self.is_on_fire) || isdefined(self.damageweapon) && (self.damageweapon == "tazer_knuckles_zm" || self.damageweapon == "jetgun_zm") || isdefined(self.knuckles_extinguish_flames) && self.knuckles_extinguish_flames)
+	if (!isdefined(self) || !(isdefined(self.is_on_fire) && self.is_on_fire) || isdefined(self.damageweapon) && (scripts\zm\_zm_reimagined::is_tazer_weapon(self.damageweapon) || self.damageweapon == "jetgun_zm") || isdefined(self.knuckles_extinguish_flames) && self.knuckles_extinguish_flames)
 		return;
 
 	tag = "J_SpineLower";

scripts/zm/zgrief/zgrief_reimagined.gsc

@@ -738,6 +738,16 @@ kill_feed()
 		if (self.last_griefed_by.meansofdeath == "MOD_MELEE")
 		{
 			self.last_griefed_by.meansofdeath = "MOD_UNKNOWN";
+
+			// show melee weapon icon on Ballistic Knife w/ Bowie melee or Ballistic Knife w/ Galvaknuckles melee
+			if (issubstr(self.last_griefed_by.weapon, "knife_ballistic_bowie"))
+			{
+				self.last_griefed_by.weapon = "held_bowie_knife_zm";
+			}
+			else if (issubstr(self.last_griefed_by.weapon, "knife_ballistic_no_melee"))
+			{
+				self.last_griefed_by.weapon = "held_tazer_knuckles_zm";
+			}
 		}
 
 		// show weapon icon for impact damage