Added, Updated and Removed Mods; Removed Backups

mods/Classes and Talents/gamedata/scripts/talents_functions.script

@@ -522,7 +522,7 @@ function actor_hit_npc(npc, s_hit, bone_id, flags)
 	if not kind then return end
 
 	-- machine guns
-	kind = machine_guns_t[wpn:section()] and "w_machine_gun" or kind
+	kind = is_mg_type(wpn:section()) and "w_machine_gun" or kind
 
 	-- sniper
 	if picked_class == "sniper" then
@@ -1309,7 +1309,7 @@ function talent_heavy_guns_expert_reload(obj) 		-- reload
 	if heavy_guns_expert_t.level <= 0 then return end
 
 	local kind = obj and ini_sys:r_string_ex(obj:section(), "kind")
-	local kind_fits = (kind and kind == "w_shotgun") or machine_guns_t[obj:section()]
+	local kind_fits = (kind and kind == "w_shotgun") or is_mg_type(obj:section())
 	if kind_fits then
 		local val = 1 + heavy_guns_expert_t.reload[heavy_guns_expert_t.level] / 100
 		return val
@@ -2893,7 +2893,10 @@ function actor_on_hud_animation_play(t, obj)
 	-- merc grenadier
 	local grenadier_t = talents_table["defensive"]["merc"]["grenadier"]
 	if grenadier_t.level > 0 and t.anm_name == "anm_throw" then
-		durations_t.grenadier_var = grenadier_t.duration
+		local kind = obj and ini_sys:r_string_ex(obj:section(), "kind")
+		if kind and kind == "w_explosive" then
+			durations_t.grenadier_var = grenadier_t.duration
+		end
 	end
 
 	-- assassin knifeman
@@ -3648,6 +3651,16 @@ function get_left_communities()
 	return ret_str
 end
 
+function is_mg_type(sec)
+	if not sec then return end
+
+	for str, _ in pairs(machine_guns_t) do
+		if string.find(sec, str) then
+			return true
+		end
+	end
+end
+
 -- for stats, calculate cur and max stats (all "cur" are included in "max" too)
 local calc_stats_t = {
 	["offensive"] = {
@@ -4222,7 +4235,7 @@ function ui_item.build_desc_header(obj, sec, str)
 	end
 
 	if IsWeapon(obj) or IsOutfit(obj) then
-		if machine_guns_t[sec] then
+		if is_mg_type(sec) then
 			kind = "w_machine_gun"
 		end
 		if in_ar(kinds_to_display, kind) then