Added "Allow Custom NPC Skins" option + GoldSrc Corpse Fix

Author: DrVrej

lua/autorun/vj_hlr_autorun.lua

@@ -443,7 +443,7 @@ if VJExists == true then
 	local colorYellow = VJ_Color2Byte(Color(255, 221, 35))
 	local colorRed = VJ_Color2Byte(Color(130, 19, 10))
 	hook.Add("EntityTakeDamage", "VJ_HLR_EntityTakeDamage", function(target, dmginfo)
-		if target.HLR_Corpse && !target.Dead && CurTime() > target.HLR_Corpse_StartT then
+		if target.HLR_Corpse && !target.Dead && CurTime() > target.HLR_Corpse_StartT && target:GetColor().a > 50 then
 			local dmgForce = dmginfo:GetDamageForce()
 
 			-- Blood hit effects & decals
@@ -471,6 +471,7 @@ if VJExists == true then
 				end
 			end
 
+			-- Damage & Gibs
 			if GetConVar("vj_hlr1_corpse_gibbable"):GetInt() == 1 && !dmginfo:IsBulletDamage() && target.HLR_Corpse_Gibbable then
 				local noDamage = false
 				local dmgType = dmginfo:GetDamageType()
@@ -618,6 +619,7 @@ VJ.AddConVar("vj_hlr1_osprey_deploysoldiers", 1, {FCVAR_ARCHIVE})
 VJ.AddConVar("vj_hlr1_assassin_cloaks", 1, {FCVAR_ARCHIVE})
 -- Source
 VJ.AddConVar("vj_hlr2_merkava_gunner", 1, {FCVAR_ARCHIVE})
+VJ.AddConVar("vj_hlr2_custom_skins", 1, {FCVAR_ARCHIVE})
 
 VJ.AddConVar("vj_hlr_autoreplace", 0, {FCVAR_ARCHIVE, FCVAR_NOTIFY})
 VJ.AddConVar("vj_hlr_autoreplace_hl1", 1, {FCVAR_ARCHIVE, FCVAR_NOTIFY})
@@ -637,7 +639,7 @@ if CLIENT then
 				return
 			end
 			Panel:AddControl( "Label", {Text = "#vjbase.menu.general.admin.only"})
-			Panel:AddControl("Button", {Text = "#vjbase.menu.general.reset.everything", Command = "vj_hlr1_gonarch_babylimit 20\nvj_hlr1_bradley_deploygrunts 1\nvj_hlr1_osprey_deploysoldiers 1\nvj_hlr2_merkava_gunner 1\nvj_hlr1_assassin_cloaks 1\nvj_hlr1_corpse_effects 1\n vj_hlr1_corpse_gibbable 1"})
+			Panel:AddControl("Button", {Text = "#vjbase.menu.general.reset.everything", Command = "vj_hlr1_gonarch_babylimit 20\nvj_hlr1_bradley_deploygrunts 1\nvj_hlr1_osprey_deploysoldiers 1\nvj_hlr2_merkava_gunner 1\nvj_hlr1_assassin_cloaks 1\nvj_hlr1_corpse_effects 1\nvj_hlr1_corpse_gibbable 1\nvj_hlr2_custom_skins 1"})
 			Panel:AddControl( "Label", {Text = "GoldSrc Engine:"})
 			Panel:AddControl("Checkbox", {Label = "Corpses Create Effects & Decals", Command = "vj_hlr1_corpse_effects"})
 			Panel:AddControl("Checkbox", {Label = "Corpses Can Be Dismembered", Command = "vj_hlr1_corpse_gibbable"})
@@ -647,6 +649,8 @@ if CLIENT then
 			Panel:AddControl("Slider", {Label = "Gonarch Baby Headcrab Limit", min = 0, max = 100, Command = "vj_hlr1_gonarch_babylimit"})
 			Panel:AddControl( "Label", {Text = "Source Engine:"})
 			Panel:AddControl("Checkbox", {Label = "Merkava Spawns With a Gunner", Command = "vj_hlr2_merkava_gunner"})
+			Panel:AddControl("Checkbox", {Label = "Allow Custom NPC Skins", Command = "vj_hlr2_custom_skins"})
+			Panel:ControlHelp("Ex: Custom skins for Rebels & Refugees")
 		end)
 
 		spawnmenu.AddToolMenuOption("DrVrej", "SNPC Configures", "HL Resurgence (AutoReplace)", "HL Resurgence (AutoReplace)", "", "", function(Panel)

lua/entities/npc_vj_hlr1_hgrunt/init.lua

@@ -381,6 +381,7 @@ function ENT:CustomOnThink()
 		end
 	end
 
+	-- Rappelling System
 	if self.HECU_Rappelling && !self.Dead then
 		-- If it's on ground then stop rappelling!
 		if self:IsOnGround() then
@@ -403,7 +404,7 @@ function ENT:CustomOnThink()
 	end
 	self:HECU_CustomOnThink()
 
-	-- Hurt walking
+	-- Hurt Walking
 	if self.HECU_CanHurtWalk && self:Health() <= (self:GetMaxHealth() / 2.2) then
 		if !self.HECU_UsingHurtWalk then
 			self.AnimTbl_Walk = {ACT_WALK_HURT}

lua/entities/npc_vj_hlr1_xen_cannon/init.lua

@@ -91,7 +91,7 @@ function ENT:CustomRangeAttackCode()
 	//local endPos = (self:GetEnemy():GetPos() + self:GetEnemy():OBBCenter()) + attach.Ang:Forward()*20000 - Vector(0, 0, 10)
 	local tr = util.TraceLine({
 		start = startPos,
-		endpos = self:GetEnemy():GetPos() + self:GetEnemy():OBBCenter() + VectorRand(-5, 5),
+		endpos = self:GetEnemy():GetPos() + self:GetEnemy():OBBCenter() + VectorRand(-15, 15),
 		filter = {self} // self.extmdl
 	})
 	local hitPos = tr.HitPos

lua/entities/npc_vj_hlr2_rebel/init.lua

@@ -211,7 +211,7 @@ function ENT:CustomOnInitialize()
 	end
 
 	-- Set different clothing --
-	-- For Engineers
+	-- For Engineers (Always have custom skin!)
 	if self.Human_Type == 1 then
 		for k, v in ipairs(self:GetMaterials()) do
 			-- Female Engineer
@@ -224,7 +224,8 @@ function ENT:CustomOnInitialize()
 				self:SetSubMaterial(k - 1, "models/hl_resurgence/hl2/humans/male/group03/citizen_sheet_engineer")
 			end
 		end
-	else
+	-- Set custom skins (If enabled!)
+	elseif GetConVar("vj_hlr2_custom_skins"):GetInt() == 1 then
 		local rand_refugee = math.random(1, 2)
 		local rand_rebel = math.random(1, 7)
 		for k, v in ipairs(self:GetMaterials()) do