Merge branch 'dev'

.github/workflows/gluatest.yml

@@ -1,6 +1,7 @@
 name: GLuaTest Runner
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches:

.github/workflows/workshop-upload.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Upload to Workshop
         uses: CFC-Servers/gmod-upload@master
         with:
-          id: 3182725803
+          id: 3248769144
           changelog: "${{ github.event.head_commit.message }}"
           title: "[ACF-3] Armored Combat Framework"
           type: "tool"

README.md

@@ -20,6 +20,7 @@ Ammunition is customizable with varying ballistic performance along with armor b
     ACF Requires these to work
 
 Wiremod ([Workshop](https://steamcommunity.com/workshop/filedetails/?id=160250458) or [Github](https://github.com/wiremod))
+Contraption Framework ([Workshop](https://steamcommunity.com/sharedfiles/filedetails/?id=3154971187) or [Github](https://github.com/ACF-Team/CFW))
 
 Prop Protection with [CPPI](http://ulyssesmod.net/archive/CPPI_v1-3.pdf) is not required, but highly recommended. We'd recommend Nadmod PP ([Workshop](https://steamcommunity.com/sharedfiles/filedetails/?id=159298542) or [Github](https://github.com/Nebual/NadmodPP)).
 

lua/acf/ballistics/ballistics_sv.lua

@@ -191,6 +191,18 @@ function Ballistics.OnImpact(Bullet, Trace, Ammo, Type)
 	end
 end
 
+function Ballistics.TestFilter(Entity, Bullet)
+	if not IsValid(Entity) then return true end
+
+	if GlobalFilter[Entity:GetClass()] then return false end
+
+	if HookRun("ACF_OnFilterBullet", Entity, Bullet) == false then return false end
+
+	if Entity._IsSpherical then return false end -- TODO: Remove when damage changes make props unable to be destroyed, as physical props can have friction reduced (good for wheels)
+
+	return true
+end
+
 function Ballistics.DoBulletsFlight(Bullet)
 	if HookRun("ACF Bullet Flight", Bullet) == false then return end
 
@@ -260,7 +272,12 @@ function Ballistics.DoBulletsFlight(Bullet)
 		else
 			local Entity = traceRes.Entity
 
-			if GlobalFilter[Entity:GetClass()] then return end
+			if Ballistics.TestFilter(Entity, Bullet) == false then
+				table.insert(Bullet.Filter, Entity)
+				Ballistics.DoBulletsFlight(Bullet) -- Retries the same trace after adding the entity to the filter, important incase something is embedded in something that shouldn't be hit
+
+				return
+			end
 
 			local Type = Ballistics.GetImpactType(traceRes, Entity)