Mule Kick: fix stowed weapon reload not starting when enemy team grabs Max Ammo powerup

Jbleezy · Jbleezy · commit 9a9fcdff5778 · 2026-02-27T02:28:33.000-08:00
diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
@@ -3338,7 +3338,7 @@ additionalprimaryweapon_stowed_weapon_refill()
 
 	while (1)
 	{
-		result = self waittill_any_return("weapon_change", "perk_additionalprimaryweapon_activated", "specialty_additionalprimaryweapon_stop", "spawned_player");
+		result = self waittill_any_return("weapon_change", "specialty_additionalprimaryweapon_start", "specialty_additionalprimaryweapon_stop", "zmb_empty_clip", "spawned_player");
 
 		if (self hasPerk("specialty_additionalprimaryweapon"))
 		{
diff --git a/scripts/zm/replaced/_zm_perks.gsc b/scripts/zm/replaced/_zm_perks.gsc
@@ -1687,7 +1687,6 @@ give_perk(perk, bought)
 	{
 		switch_to_additional_primary_weapon = is_true(bought);
 		self scripts\zm\replaced\_zm::restore_additionalprimaryweapon(switch_to_additional_primary_weapon);
-		self notify("perk_additionalprimaryweapon_activated");
 	}
 
 	if (isDefined(level._custom_perks[perk]) && isDefined(level._custom_perks[perk].player_thread_give))
@@ -1724,6 +1723,7 @@ give_perk(perk, bought)
 
 	self.perks_active[self.perks_active.size] = perk;
 	self notify("perk_acquired");
+	self notify(perk + "_start");
 	self thread perk_think(perk);
 }
 
diff --git a/scripts/zm/replaced/_zm_powerups.gsc b/scripts/zm/replaced/_zm_powerups.gsc
@@ -724,6 +724,8 @@ empty_clip_powerup(drop_item, player)
 			continue;
 		}
 
+		players[i] notify("zmb_empty_clip");
+
 		primaries = players[i] getweaponslist();
 
 		foreach (weapon in primaries)

Original file line number	Diff line number	Diff line change
`@@ -3338,7 +3338,7 @@ additionalprimaryweapon_stowed_weapon_refill()`
`3338`	`3338`
`3339`	`3339`	`while (1)`
`3340`	`3340`	`{`
`3341`		`- result = self waittill_any_return("weapon_change", "perk_additionalprimaryweapon_activated", "specialty_additionalprimaryweapon_stop", "spawned_player");`
	`3341`	`+ result = self waittill_any_return("weapon_change", "specialty_additionalprimaryweapon_start", "specialty_additionalprimaryweapon_stop", "zmb_empty_clip", "spawned_player");`
`3342`	`3342`
`3343`	`3343`	`if (self hasPerk("specialty_additionalprimaryweapon"))`
`3344`	`3344`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1687,7 +1687,6 @@ give_perk(perk, bought)`
`1687`	`1687`	`{`
`1688`	`1688`	`switch_to_additional_primary_weapon = is_true(bought);`
`1689`	`1689`	`self scripts\zm\replaced\_zm::restore_additionalprimaryweapon(switch_to_additional_primary_weapon);`
`1690`		`- self notify("perk_additionalprimaryweapon_activated");`
`1691`	`1690`	`}`
`1692`	`1691`
`1693`	`1692`	`if (isDefined(level._custom_perks[perk]) && isDefined(level._custom_perks[perk].player_thread_give))`
`@@ -1724,6 +1723,7 @@ give_perk(perk, bought)`
`1724`	`1723`
`1725`	`1724`	`self.perks_active[self.perks_active.size] = perk;`
`1726`	`1725`	`self notify("perk_acquired");`
	`1726`	`+ self notify(perk + "_start");`
`1727`	`1727`	`self thread perk_think(perk);`
`1728`	`1728`	`}`
`1729`	`1729`
Original file line number	Diff line number	Diff line change
`@@ -724,6 +724,8 @@ empty_clip_powerup(drop_item, player)`
`724`	`724`	`continue;`
`725`	`725`	`}`
`726`	`726`
	`727`	`+ players[i] notify("zmb_empty_clip");`
	`728`	`+`
`727`	`729`	`primaries = players[i] getweaponslist();`
`728`	`730`
`729`	`731`	`foreach (weapon in primaries)`