Encounter: add Meat and EMP Grenade obituary icons

english/localizedstrings/reimagined.str

@@ -199,10 +199,10 @@ REFERENCE           ZOMBIE_GRABBED_MEAT_ENEMY
 LANG_ENGLISH        "^9&&1 grabbed the meat"
 
 REFERENCE           ZOMBIE_HAS_MEAT
-LANG_ENGLISH        "^8&&1 has the meat"
+LANG_ENGLISH        "^8&&1 has the meat stink"
 
 REFERENCE           ZOMBIE_HAS_MEAT_ENEMY
-LANG_ENGLISH        "^9&&1 has the meat"
+LANG_ENGLISH        "^9&&1 has the meat stink"
 
 REFERENCE           ZOMBIE_PLAYER_HAS_MEAT
 LANG_ENGLISH        "You have the meat!"

scripts/zm/replaced/_zm_weap_emp_bomb.gsc

@@ -167,7 +167,7 @@ emp_players(origin, radius, owner)
 			{
 				time = level.zombie_vars["emp_stun_time"];
 				player shellshock("flashbang", 1);
-				player thread player_perk_pause_and_unpause_all_perks(time);
+				player thread player_perk_pause_and_unpause_all_perks(time, owner);
 				player thread player_emp_fx(time);
 			}
 		}
@@ -191,18 +191,30 @@ player_emp_fx(time)
 	}
 }
 
-player_perk_pause_and_unpause_all_perks(time)
+player_perk_pause_and_unpause_all_perks(time, owner)
 {
 	self notify("player_perk_pause_and_unpause_all_perks");
 	self endon("player_perk_pause_and_unpause_all_perks");
 	self endon("disconnect");
 
+	if (self.team != owner.team)
+	{
+		self.last_emped_by = spawnStruct();
+		self.last_emped_by.attacker = owner;
+	}
+	else
+	{
+		self.last_emped_by = undefined;
+	}
+
 	self player_perk_pause_all_perks();
 	self thread player_perk_pause_all_perks_acquired(time);
 
 	self waittill_any_or_timeout(time, "spawned_player", "bled_out", "player_suicide");
 
 	self player_perk_unpause_all_perks();
+
+	self.last_emped_by = undefined;
 }
 
 player_perk_pause_all_perks_acquired(time)

scripts/zm/replaced/zgrief.gsc

@@ -22,7 +22,7 @@ meat_bounce_override(pos, normal, ent, bounce)
 {
 	if (isdefined(ent) && isplayer(ent) && is_player_valid(ent) && !ent hasWeapon(level.item_meat_name) && !is_true(ent.dont_touch_the_meat))
 	{
-		level thread meat_stink_player(ent);
+		level thread meat_stink_player(ent, self.owner);
 
 		if (isdefined(self.owner))
 		{
@@ -62,7 +62,7 @@ meat_bounce_override(pos, normal, ent, bounce)
 
 		if (isdefined(closest_player))
 		{
-			level thread meat_stink_player(closest_player);
+			level thread meat_stink_player(closest_player, self.owner);
 
 			if (isdefined(self.owner))
 			{
@@ -404,7 +404,7 @@ meat_stink_on_ground(position_to_play)
 	level.meat_on_ground = undefined;
 }
 
-meat_stink_player(who)
+meat_stink_player(who, owner)
 {
 	level notify("new_meat_stink_player");
 	level endon("new_meat_stink_player");
@@ -415,6 +415,16 @@ meat_stink_player(who)
 		return;
 	}
 
+	if (who.team != owner.team)
+	{
+		who.last_meated_by = spawnStruct();
+		who.last_meated_by.attacker = owner;
+	}
+	else
+	{
+		who.last_meated_by = undefined;
+	}
+
 	who notify("meat_stink_player_start");
 	level.meat_player = who;
 	who.ignoreme = 0;
@@ -451,6 +461,17 @@ meat_stink_player(who)
 	}
 
 	level.meat_player = undefined;
+
+	who thread wait_and_reset_last_meated_by();
+}
+
+wait_and_reset_last_meated_by()
+{
+	self endon("disconnect");
+
+	wait 0.05;
+
+	self.last_meated_by = undefined;
 }
 
 meat_stink_player_create()

scripts/zm/replaced/zmeat.gsc

@@ -43,14 +43,6 @@ item_meat_on_spawn_retrieve_trigger(watcher, player, weaponname)
 
 	level.meat_player = undefined;
 
-	player setMoveSpeedScale(1);
-
-	if (is_true(player.meat_weapons_disabled))
-	{
-		player.meat_weapons_disabled = undefined;
-		player enableWeapons();
-	}
-
 	if (level.scr_zm_ui_gametype_obj == "zmeat")
 	{
 		player.head_icon.alpha = 1;

scripts/zm/zgrief/zgrief_reimagined.gsc

@@ -829,6 +829,14 @@ kill_feed()
 
 		obituary(self, self.last_griefed_by.attacker, self.last_griefed_by.weapon, self.last_griefed_by.meansofdeath);
 	}
+	else if (isDefined(self.last_meated_by))
+	{
+		obituary(self, self.last_meated_by.attacker, level.item_meat_name, "MOD_UNKNOWN");
+	}
+	else if (isDefined(self.last_emped_by))
+	{
+		obituary(self, self.last_emped_by.attacker, "emp_grenade_zm", "MOD_GRENADE_SPLASH");
+	}
 	else
 	{
 		obituary(self, self, "none", "MOD_SUICIDE");

zone_source/item_meat_zm.zone

@@ -0,0 +1,4 @@
+material,hud_obit_case
+material,hud_obit_dogs
+image,hud_obit_case
+image,hud_obit_dogs

zone_source/mod.zone

@@ -4,6 +4,7 @@
 
 include,knife_ballistic_zm
 include,ray_gun_zm
+include,item_meat_zm
 
 include,held_knife_zm
 include,held_one_inch_punch_zm