Dev

lua/acf/ballistics/world_pen_sv.lua

@@ -72,7 +72,7 @@ function Ballistics.DigTrace(From, To, Filter)
 
             return false
         else -- Penetration
-            return true, Back.HitPos
+            return true, Dig.StartPos
         end
     end
 end

lua/acf/compatibility/baseplate_convert_sv.lua

@@ -59,15 +59,16 @@ function ACF.ConvertEntityToBaseplate(Player, Target)
     local permutation = foundTranslation.permutation
     local w, l, t = BoxSize[permutation.x], BoxSize[permutation.y], BoxSize[permutation.z]
     Baseplate.Class = "acf_baseplate"
-    Baseplate.Length = w
-    Baseplate.Width = l
-    Baseplate.Thickness = t
+    Baseplate.ACF_UserData = Baseplate.ACF_UserData or {}
+    Baseplate.ACF_UserData.Length = w
+    Baseplate.ACF_UserData.Width = l
+    Baseplate.ACF_UserData.Thickness = t
     Baseplate.PhysicsObjects[0].Angle = Baseplate.PhysicsObjects[0].Angle + foundTranslation.addAngles
 
     -- Swap width/thickness if necessary
     if foundTranslation.addAngles.z == 90 then
-        Baseplate.Width = t
-        Baseplate.Thickness = l
+        Baseplate.ACF_UserData.Width = t
+        Baseplate.ACF_UserData.Thickness = l
     end
 
     -- Delete everything now

lua/acf/contraption/contraption_sv.lua

@@ -341,11 +341,12 @@ do -- ASSUMING DIRECT CONTROL
 			end
 
 			function ENT:SetModel(Model)
-				-- MARCH: Just a notice - if you get "attempt to index field ACF (a nil value)" issues here,
-				-- DON'T just add a if self.ACF check - this is intended to be called on ACF entities
-				-- and they should have an ACF table, so you're just suppressing an issue here, only for it to
-				-- probably show up later... do more investigation into *why* self.ACF returned nil.
-				if self.IsACFEntity then Contraption.SetModel(self, self.ACF.Model) return end
+				if self.IsACFEntity and self.ACF and self.ACF.Model then
+					-- Only enforce model if the entity has been initialized by ACF
+					-- ents.Create("acf_ammo") doesn't set ent.ACF, for example
+					Contraption.SetModel(self, self.ACF.Model)
+					return
+				end
 
 				SetModel(self, Model)
 			end

lua/acf/combat/require_player_in_contraption.lua → lua/acf/contraption/track_contraption_players_sv.lua

@@ -51,6 +51,14 @@ hook.Add("cfw.contraption.split", "ACF_CFW_TrackPlayersInContraptions", function
     -- Reset the parent and child contraption states
     ResetContraptionTimes(ParentContraption)
     ResetContraptionTimes(ChildContraption)
+--[[
+    print("Parent: ")
+    print("    Table Address : " .. tostring(ParentContraption))
+    print("    Player Count  : " .. table.Count(ParentContraption.ACF_TrackPlayers))
+    print("Child: ")
+    print("    Table Address : " .. tostring(ChildContraption))
+    print("    Player Count  : " .. table.Count(ChildContraption.ACF_TrackPlayers))
+]]
 end)
 
 -- Engine hooks to track players entering vehicles
@@ -98,7 +106,7 @@ function ResetTime(Entity)
     QueryTimes[Entity] = nil
     Entity:RemoveCallOnRemove("ACF_CleanUpPlayerContraptionCheck")
 end
-
+--[[
 local Clock = ACF.Utilities.Clock
 
 local NO_CONTRAPTION          = 0
@@ -109,7 +117,7 @@ local OK                      = 1
 local ERROR_MESSAGES = {
     [NO_CONTRAPTION]     = "must be part of a contraption",
     [NO_PLAYER]          = "require that a player is inside of the current contraption",
-    [NO_PLAYER_IN_RANGE] = "require that a player in the contraption is within range of the lethal entity"
+    [NO_PLAYER_IN_RANGE] = "cannot fire without a nearby seated player in the same contraption"
 }
 
 local function PlayerContraptionCheck(Entity)
@@ -155,4 +163,5 @@ hook.Add("ACF_PreFireWeapon", "ACF_CheckPlayerContraptionLethals", function(Ent)
         ACF.DisableEntity(Ent, "Player Error", string.format("%s %s.", Ent.PluralName or Ent:GetClass(), ERROR_MESSAGES[ValidPlayerContraptionState]), 5)
         return false
     end
-end)
+end)
+]]

lua/acf/core/classes/ammo_types/registration.lua

@@ -7,3 +7,8 @@ function AmmoTypes.Register(ID, Base)
 end
 
 Classes.AddSimpleFunctions(AmmoTypes, Entries)
+Classes.AddSboxLimit({
+	Name   = "_acf_ammo",
+	Amount = 32,
+	Text   = "Maximum amount of ACF ammo crates a player can create."
+})

lua/acf/core/classes/armor_types/registration.lua

@@ -6,9 +6,4 @@ function ArmorTypes.Register(ID, Base)
 	return Classes.AddObject(ID, Base, Entries)
 end
 
-Classes.AddSimpleFunctions(ArmorTypes, Entries)
-Classes.AddSboxLimit({
-	Name   = "_acf_armor",
-	Amount = 50,
-	Text   = "Maximum amount of ACF procedural armor plates a player can create"
-})
+Classes.AddSimpleFunctions(ArmorTypes, Entries)

lua/acf/core/classes/crew_types/registration.lua

@@ -2,17 +2,15 @@ local Classes     = ACF.Classes
 local CrewTypes   = Classes.CrewTypes
 local Entries     = Classes.GetOrCreateEntries(CrewTypes)
 
-CreateConVar(
-	"sbox_max_acf_crew",
-	8,
-	FCVAR_ARCHIVE + FCVAR_NOTIFY,
-	"Maximum amount of ACF crew members a player can create."
-)
-
 function CrewTypes.Register(ID, Data)
 	local Simple = Classes.AddSimple(ID, Entries, Data)
 	if Simple.LimitConVar then Classes.AddSboxLimit(Simple.LimitConVar) end
 	return Simple
 end
 
-Classes.AddSimpleFunctions(CrewTypes, Entries)
+Classes.AddSimpleFunctions(CrewTypes, Entries)
+Classes.AddSboxLimit({
+	Name   = "_acf_crew",
+	Amount = 8,
+	Text   = "Maximum amount of ACF crew members a player can create."
+})