Fixed mute campfire mercenaries

Author: Decane

SRP v1.1.4 - Readme.txt

@@ -294,6 +294,7 @@ Audio fixes:
 + Fixed the issue where zombified stalkers would sometimes shout battle slogans as if they were ordinary stalkers.
 + Fixed the overlapping audio transmissions during the initial cutscene in the Abandoned Hospital.
 + Fixed Professor Beanpolev's overlapping greeting audio.
++ Fixed mercenaries' silent guitar playing around campfires.
 + Fixed some NPCs using the wrong voice files.
 + Fixed unlit campfires emitting a burning sound.
 

SRP v1.1.4 - Version History.txt

@@ -25,6 +25,7 @@ v1.1.4
 + Fixed the issue where the Freedom NPCs that hold the player at gunpoint at a Dark Valley entrance would refuse to talk to the player after the hold-up has ended. - Decane
 + Fixed the issue where the Freedom base megaphone could start playing Yar and Ashot's banter even if the player is in Yar's armory or Ashot's shop, resulting in the conversation being abruptly cut off immediately after starting. - Decane
 + Mitigated the issue where the weather would sometimes inexplicably change after loading. - Decane
++ Fixed the issue where mercenaries would fall mute around campfires and play the guitar silently. - Decane
 + Mitigated the issue where the player's character model would revert back to the default rookie jacket model upon picking up another suit of armor. - Artos, Shoker
 + Fixed the issue where the player would be rejected from playing the shooting minigame if their money precisely matches the entry fee instead of exceeding it. - Decane
 + Fixed an SRP v1.1.3 (or v1.0.2 with the optional 'No NPC Weapon Tossing Upon Death' feature) regression that prevented killed NPCs from ever dropping a grenade. - Decane

gamedata/configs/misc/script_sound_music_and_stories.ltx

@@ -163,31 +163,31 @@ idle = 0,0
 
 [intro_music]
 type = npc
-avail_communities = csky, stalker, bandit, dolg, freedom, army ; also supported: killer, monolith
+avail_communities = csky, stalker, bandit, dolg, freedom, army, killer ; SRP: added killer; also supported: monolith
 npc_prefix = true
 path = talk\intros\intro_music_
 shuffle = rnd
 idle = 1,1
 
 [play_guitar]
 type = npc
-avail_communities = csky, stalker, bandit, dolg, freedom, army ; also supported: killer, monolith
+avail_communities = csky, stalker, bandit, dolg, freedom, army, killer ; SRP: added killer; also supported: monolith
 npc_prefix = true
 path = music\guitar_
 shuffle = rnd
 idle = 1,1
 
 [harmonica]
 type = npc
-avail_communities = csky, stalker, bandit, dolg, freedom, army ; also supported: killer, monolith
+avail_communities = csky, stalker, bandit, dolg, freedom, army, killer ; SRP: added killer; also supported: monolith
 npc_prefix = true
 path = music\harmonica_
 shuffle = rnd
 idle = 1,1
 
 [reac_music]
 type = npc
-avail_communities = csky, stalker, bandit, dolg, freedom, army ; also supported: killer, monolith
+avail_communities = csky, stalker, bandit, dolg, freedom, army, killer ; SRP: added killer; also supported: monolith
 npc_prefix = true
 path = reactions\music\reaction_music_
 shuffle = rnd
@@ -196,7 +196,7 @@ group_snd = true
 
 [intro_joke]
 type = npc
-avail_communities = csky, stalker, bandit, dolg, freedom, army, monolith ; also supported: killer
+avail_communities = csky, stalker, bandit, dolg, freedom, army, monolith, killer ; SRP: added killer
 npc_prefix = true
 path = talk\intros\intro_joke_
 shuffle = rnd
@@ -205,7 +205,7 @@ group_snd = true
 
 [joke]
 type = npc
-avail_communities = csky, stalker, bandit, dolg, freedom, army, monolith ; also supported: killer
+avail_communities = csky, stalker, bandit, dolg, freedom, army, monolith, killer ; SRP: added killer
 npc_prefix = true
 path = talk\jokes\joke_
 shuffle = rnd
@@ -214,7 +214,7 @@ group_snd = true
 
 [reac_joke]
 type = npc
-avail_communities = csky, stalker, bandit, dolg, freedom, army, monolith ; also supported: killer
+avail_communities = csky, stalker, bandit, dolg, freedom, army, monolith, killer ; SRP: added killer
 npc_prefix = true
 path = reactions\joke\reaction_joke_
 shuffle = rnd
@@ -223,7 +223,7 @@ group_snd = true
 
 [reac_laugh]
 type = npc
-avail_communities = csky, stalker, bandit, dolg, freedom, army, monolith ; also supported: killer
+avail_communities = csky, stalker, bandit, dolg, freedom, army, monolith, killer ; SRP: added killer
 npc_prefix = true
 path = reactions\story\laughter_
 shuffle = rnd

gamedata/scripts/sound_theme.script

@@ -107,9 +107,7 @@ function npc_sound:init_npc(npc)
 	if self.group_snd then
 		self.can_play_group_sound = true
 	else
-		if self.can_play_sound[npc_id] ~= false then
-			self.can_play_sound[npc_id] = true
-		end
+		self.can_play_sound[npc_id] = true
 	end
 end
 
@@ -264,6 +262,9 @@ function npc_sound:stop()
 	end
 end
 
+-- TODO: Stop saving self.can_play_group_sound and self.can_play_sound[npc_id].
+-- They get clobbered in npc_sound:init_npc on NPC net_spawn(), so saving them is useless.
+
 function npc_sound:save(thread)
 	thread:w_stringZ(tostring(self.played_id))
 	if self.group_snd then