force part update

split AffectSelf into two to distinguish between player owner and root owner (e.g. projectiles)

for backward compatibility, AffectSelf will still act as both by default, but with AlternateAffectSelf the split occurs. you can then use AffectPlayerOwner to affect your player, and AffectSelf to affect the root part owner separately

Author: pingu7867

lua/pac3/core/client/parts/force.lua

@@ -67,7 +67,9 @@ Radial gets the base directions from the targets to the force part]]})
 		:GetSet("DampingReverseFalloff", false, {description = "Whether the damping should fade with distance but reverse (closer is weaker influence)"})
 
 	:SetPropertyGroup("Targets")
-		:GetSet("AffectSelf",false)
+		:GetSet("AffectSelf", false, {description = "Affect Root Owner (i.e. it can be a projectile entity)"})
+		:GetSet("AlternateAffectSelf", false, {description = "'Affect Self' was split into two. For backward compatibility reasons, this must be a setting.\nif this is off, affect self will affect both player owner and root owner, which may not be desired"})
+		:GetSet("AffectPlayerOwner", false)
 		:GetSet("Players",true)
 		:GetSet("PhysicsProps", true)
 		:GetSet("PointEntities",true, {description = "other entities not covered by physics props but with potential physics"})
@@ -85,6 +87,9 @@ end
 function PART:Initialize()
 	self.next_impulse = CurTime() + 0.05
 	if not GetConVar("pac_sv_force"):GetBool() or pac.Blocked_Combat_Parts[self.ClassName] then self:SetError("force parts are disabled on this server!") end
+	timer.Simple(0, function()
+		self.initialized = true
+	end)
 end
 
 function PART:OnShow()
@@ -213,9 +218,6 @@ local function ProcessForcesList(ents_hits, tbl, pos, ang, ply)
 	end
 	for _,ent in pairs(ents_hits) do
 		if ent:IsWeapon() or ent:GetClass() == "viewmodel" or ent:GetClass() == "func_physbox_multiplayer" then continue end
-		if ent:GetPos():Distance(ply:GetPos()) < 300 then
-			print(ent)
-		end
 		local phys_ent
 		local is_player = ent:IsPlayer()
 		local is_physics = (physics_point_ent_classes[ent:GetClass()] or string.find(ent:GetClass(),"item_") or string.find(ent:GetClass(),"ammo_") or (ent:IsWeapon() and not IsValid(ent:GetOwner())))
@@ -503,6 +505,8 @@ function PART:Impulse(on)
 		if not pac.CountNetMessage() then self:SetInfo("Went beyond the allowance") return end
 	end
 
+	if not self.initialized then return end
+
 	local locus_pos = Vector(0,0,0)
 	if self.Locus ~= nil then
 		if self.Locus:IsValid() then
@@ -518,7 +522,8 @@ function PART:Impulse(on)
 		end
 	end
 
-	if not self.NPC and not self.Players and not self.AffectSelf and not self.PhysicsProps and not self.PointEntities then return end
+	if not self.NPC and not self.Players and not self.AffectSelf and not self.AffectPlayerOwner and not self.PhysicsProps and not self.PointEntities then return end
+
 	net.Start("pac_request_force", true)
 	net.WriteVector(self:GetWorldPosition())
 	net.WriteAngle(self:GetWorldAngles())
@@ -549,7 +554,14 @@ function PART:Impulse(on)
 	net.WriteBool(self.DampingFalloff)
 	net.WriteBool(self.DampingReverseFalloff)
 	net.WriteBool(self.Levitation)
-	net.WriteBool(self.AffectSelf)
+	if self.AlternateAffectSelf then
+		net.WriteBool(self.AffectSelf)
+		net.WriteBool(self.AffectPlayerOwner)
+	else
+		net.WriteBool(self.AffectSelf)
+		net.WriteBool(self.AffectPlayerOwner or self.AffectSelf)
+	end
+	
 	net.WriteBool(self.Players)
 	net.WriteBool(self.PhysicsProps)
 	net.WriteBool(self.PointEntities)

lua/pac3/extra/shared/net_combat.lua

@@ -1316,27 +1316,35 @@ if SERVER then
 			if v.CPPICanPickup and not v:CPPICanPickup(ply) then ents_hits[i] = nil end
 			if v.CPPICanPunt and not v:CPPICanPunt(ply) then ents_hits[i] = nil end
 			if v:IsConstraint() then ents_hits[i] = nil end
-			if pre_excluded_ent_classes[v:GetClass()] or (Is_NPC(v) and not tbl.NPC) or (v:IsPlayer() and not tbl.Players and not (v == ply and tbl.AffectSelf)) then ents_hits[i] = nil
-			else ent_count = ent_count + 1 end
+
+			if v == ply then
+				if not tbl.AffectPlayerOwner then ents_hits[i] = nil end
+			elseif v == tbl.RootPartOwner then
+				if (not tbl.AffectSelf) and v == tbl.RootPartOwner then ents_hits[i] = nil end
+			end
+
+			if pre_excluded_ent_classes[v:GetClass()] or (Is_NPC(v) and not tbl.NPC) or (v:IsPlayer() and not tbl.Players and not (v == ply and tbl.AffectPlayerOwner)) then ents_hits[i] = nil
+			end
+			if ents_hits[i] ~= nil then
+				ent_count = ent_count + 1
+			end
 		end
-		if TooManyEnts(ent_count, ply) and not (tbl.AffectSelf and not tbl.Players and not tbl.NPC and not tbl.PhysicsProps and not tbl.PointEntities) then return end
+		if TooManyEnts(ent_count, ply) and not ((tbl.AffectSelf or tbl.AffectPlayerOwner) and not tbl.Players and not tbl.NPC and not tbl.PhysicsProps and not tbl.PointEntities) then return end
 		for _,ent in pairs(ents_hits) do
 			local phys_ent
 			local ent_getphysobj = ent:GetPhysicsObject()
 			local owner = Try_CPPIGetOwner(ent)
 			local is_player = ent:IsPlayer()
 			local is_physics = (physics_point_ent_classes[ent:GetClass()] or string.find(ent:GetClass(),"item_") or string.find(ent:GetClass(),"ammo_") or (ent:IsWeapon() and not IsValid(ent:GetOwner())))
 			local is_npc = Is_NPC(ent)
-
-
-			if (ent ~= tbl.RootPartOwner or (tbl.AffectSelf and ent == tbl.RootPartOwner))
+			if (ent ~= tbl.RootPartOwner or (tbl.AffectSelf and ent == tbl.RootPartOwner) or (tbl.AffectPlayerOwner and ent == ply))
 					and (
 						is_player
 						or is_npc
 						or is_physics
 						or IsValid( ent_getphysobj )
 					) then
-
+				
 				local is_phys = true
 				if ent_getphysobj ~= nil then
 					phys_ent = ent_getphysobj
@@ -1465,8 +1473,8 @@ if SERVER then
 				local unconsenting_owner = owner ~= ply and force_consents[owner] == false
 
 				if is_player then
-					if  tbl.Players or (ent == ply and tbl.AffectSelf) then
-						if (ent ~= ply and force_consents[ent] ~= false) or (ent == ply and tbl.AffectSelf) then
+					if  tbl.Players or (ent == ply and tbl.AffectPlayerOwner) then
+						if (ent ~= ply and force_consents[ent] ~= false) or (ent == ply and tbl.AffectPlayerOwner) then
 							oldvel = ent:GetVelocity()
 							phys_ent:SetVelocity(oldvel * (-1 + final_damping) + addvel)
 							ent:SetVelocity(oldvel * (-1 + final_damping) + addvel)
@@ -1513,7 +1521,7 @@ if SERVER then
 						end
 					end
 
-				elseif tbl.PointEntities then
+				elseif tbl.PointEntities or (tbl.AffectSelf and ent == tbl.RootPartOwner) then
 					if not (IsPropProtected(ent, ply) and global_combat_prop_protection:GetBool()) or not unconsenting_owner then
 						phys_ent:SetVelocity(final_damping * oldvel + addvel)
 					end
@@ -1757,6 +1765,7 @@ if SERVER then
 			tbl.DampingReverseFalloff = net.ReadBool()
 			tbl.Levitation = net.ReadBool()
 			tbl.AffectSelf = net.ReadBool()
+			tbl.AffectPlayerOwner = net.ReadBool()
 			tbl.Players = net.ReadBool()
 			tbl.PhysicsProps = net.ReadBool()
 			tbl.PointEntities = net.ReadBool()