Smoke Grenade: kills zombies

Smoke Grenade: add reticle from MP
Smoke Grenade: remove cluster explosion

README.md

@@ -111,6 +111,7 @@
 * Fixed getting kill points twice
 
 ### Brutus
+* Smoke Grenade kills zombies
 * Decreased player damage from 99 to 90
 * No longer receives additional damage from Ray Gun Mark 2
 * Teleports away less frequently
@@ -132,9 +133,6 @@
 * Placeable mines: changed damage scalar to 150 multiplied by round number (normally random number between 100 and 200 multiplied by round number)
 * Placeable mines: capped damage scalar at 9000
 
-### Tac-45
-* Replaces M1911 on Tranzit, Nuketown, Die Rise, and Buried
-
 ### AN-94
 * Increased weapon cost from 1200 to 1500
 * Upgraded: decreased stock ammo from 600 to 450
@@ -212,9 +210,6 @@
 * Changed weapon cost from 900 or 1500 to 1200 on all maps
 * Increased penetration
 
-### RPD
-* Decreased recoil
-
 ### S12
 * Increased penetration
 
@@ -232,6 +227,9 @@
 * Ammo gets added to the clip at the same time that it gets added in the reload animation
 * Upgraded: decreased stock ammo from 330 to 300
 
+### Tac-45
+* Replaces M1911 on Tranzit, Nuketown, Die Rise, and Buried
+
 ### Type 25
 * Decreased recoil
 * Unupgraded: increased stock ammo from 150 to 300
@@ -260,6 +258,10 @@
 * Sprinting no longer wakes up EMP'd zombies
 * Zombies that are in the ground can no longer get EMP'd
 
+### Smoke Grenade
+* Added on Cell Block and Docks
+* Kills on any round
+
 ### Hell's Retriever
 * No longer ricochets to other zombies when not charged
 * Every charge increases total zombies attacked by 3
@@ -754,7 +756,6 @@
 * Quest: if Weasel is not in the game, the cycle continues immediately after everyone revives themselves on the Golden Gate Bridge
 * Quest: players no longer get moved to different positions when starting the showdown
 * Quest: showdown target waypoint shows offscreen
-* Grief: added Smoke Grenades to the Mystery Box
 * Fixed initial weapon raise animation happening after exiting afterlife
 * Fixed being able to hit a death barrier when jumping off the Docks Bridge zone
 * Fixed locked hint string not showing on Blundergat Upgrade buildable table

scripts/zm/_zm_reimagined.gsc

@@ -1785,11 +1785,6 @@ grenade_fire_watcher()
 		{
 			self thread temp_disable_offhand_weapons();
 		}
-
-		if (weapname == "willy_pete_zm" && !isDefined(self.smoke_grenade_cluster))
-		{
-			grenade thread smoke_grenade_cluster(self);
-		}
 	}
 }
 
@@ -1811,21 +1806,6 @@ temp_disable_offhand_weapons()
 	}
 }
 
-smoke_grenade_cluster(owner)
-{
-	self waittill("explode", pos);
-
-	playsoundatposition("zmb_land_meat", pos);
-
-	owner.smoke_grenade_cluster = true;
-	owner magicgrenadetype("willy_pete_zm", pos, (0, 0, 0), 0);
-	owner magicgrenadetype("willy_pete_zm", pos, (0, 0, 0), 0);
-
-	wait 0.05;
-
-	owner.smoke_grenade_cluster = undefined;
-}
-
 buildbuildables()
 {
 	// need a wait or else some buildables dont build

scripts/zm/replaced/_zm.gsc

@@ -1348,13 +1348,7 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
 
 	if (weapon == "zombie_bullet_crouch_zm" && meansofdeath == "MOD_RIFLE_BULLET")
 	{
-		damage_scalar = damage / 600;
-		min_damage = int(damage_scalar * level.zombie_health) + 1;
-
-		if (damage < min_damage)
-		{
-			damage = min_damage;
-		}
+		final_damage = scale_damage(final_damage, 600);
 	}
 
 	if (weapon == "quadrotorturret_zm" && meansofdeath == "MOD_PISTOL_BULLET")
@@ -1365,6 +1359,14 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
 		}
 	}
 
+	if (weapon == "willy_pete_zm")
+	{
+		if (!is_true(self.is_brutus))
+		{
+			damage = level.zombie_health;
+		}
+	}
+
 	if (weapon == "tower_trap_zm")
 	{
 		if (!is_true(self.is_brutus))
@@ -2115,6 +2117,11 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
 			return 0;
 		}
 
+		if (sweapon == "willy_pete_zm")
+		{
+			return 0;
+		}
+
 		if (self.health > 75 && !is_true(self.is_zombie))
 		{
 			return 75;

scripts/zm/replaced/_zm_afterlife.gsc

@@ -582,6 +582,11 @@ afterlife_player_damage_callback(einflictor, eattacker, idamage, idflags, smeans
 			if (self hasperk("specialty_flakjacket"))
 				return 0;
 
+			if (sweapon == "willy_pete_zm")
+			{
+				return 0;
+			}
+
 			if (self.health > 75 && !(isdefined(self.is_zombie) && self.is_zombie))
 				idamage = 75;
 		}

scripts/zm/replaced/_zm_ai_brutus.gsc

@@ -656,6 +656,11 @@ brutus_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
 		return 0;
 	}
 
+	if (weapon == "willy_pete_zm")
+	{
+		return 0;
+	}
+
 	if (is_explosive_damage(meansofdeath) && weapon != "raygun_mark2_zm" && weapon != "raygun_mark2_upgraded_zm")
 	{
 		self.explosive_dmg_taken += damage;

zone_source/mod.zone

@@ -5,6 +5,7 @@
 include,knife_ballistic_zm
 include,ray_gun_zm
 include,raygun_mark2_zm
+include,willy_pete_zm
 include,item_meat_zm
 
 include,held_knife_zm

zone_source/willy_pete_zm.zone

@@ -0,0 +1,2 @@
+material,tactical_gren_reticle
+image,tactical_gren_reticle