new Inventory system

and holstering code tweaks whatevs

gamemodes/benny/entities/entities/inventory.lua

@@ -0,0 +1,159 @@
+
+AddCSLuaFile()
+
+ENT.Type = "point"
+
+function ENT:SetupDataTables()
+	for i=1, 32 do
+		self:NetworkVar("Entity", i-1, "Item" .. i )
+	end
+	self:NetworkVar( "Int", "ReservedSlots" )
+end
+
+function ENT:Initialize()
+	self:AddEFlags( EFL_FORCE_CHECK_TRANSMIT )
+	self:SetTransmitWithParent( true ) -- Transmit only when the owner does
+end
+
+function ENT:Think()
+	if !self:GetOwner():IsValid() then
+		self:Print("existing without an owner." )
+	end
+end
+
+function ENT:Print( ... )
+	print( "[Inventory[" .. self:EntIndex() .. "], " .. tostring(self:GetOwner()) .. "]", ...)
+end
+
+function ENT:UpdateTransmitState()
+	return TRANSMIT_ALWAYS
+end
+
+function ENT:ReevalRecreate()
+	self:RemoveEFlags( EFL_KEEP_ON_RECREATE_ENTITIES )
+	if self:GetOwner():IsValid() then
+		if self:GetOwner():IsEFlagSet( EFL_KEEP_ON_RECREATE_ENTITIES ) then
+			self:AddEFlags( EFL_KEEP_ON_RECREATE_ENTITIES )
+			self:Print("To be saved during recreate.")
+			return
+		else
+			self:Print("Will NOT be saved during recreate.")
+			return
+		end
+	end
+	self:Print("Will NOT be saved during recreate. No owner either")
+	return
+end
+
+function ENT:AttachToEntity( ent )
+	if ent.SetInventory then
+		ent:SetInventory( self )
+	else
+		error( "[Inventory " .. tostring(self) .. "] " .. tostring(ent) .. " doesn't have a SetInventory function. Not attaching.")
+		return
+	end
+
+	self:SetOwner( ent )
+	self:SetParent( ent )
+	self:SetPos( vector_origin )
+	self:SetAngles( angle_zero )
+	self:ReevalRecreate()
+	self:Print("Attached to: " .. tostring(ent))
+end
+
+function ENT:GetItems()
+	local itemlist = {}
+	
+	for i=1, 32 do
+		local curr = self["GetItem"..i](self)
+		if curr == NULL then continue end
+		table.insert( itemlist, curr )
+	end
+
+	return itemlist
+end
+
+function ENT:GetWeighted()
+	local itemlist = {}
+
+	for i, v in pairs(self:GetItems()) do
+		if i == 0 then continue end
+		table.insert( itemlist, v )
+	end
+
+	table.sort( itemlist, function( a, b ) 
+		return a:GetAcquisition() < b:GetAcquisition()
+	end)
+
+	return itemlist
+end
+
+function ENT:AddItem( ent )
+	if !ent:IsValid() then
+		self:Print("Invalid entity, printing trace" )
+		debug.Trace()
+		return false
+	end
+
+	for i=1+self:GetReservedSlots(), 32 do
+		local curr = self["GetItem"..i](self)
+		if curr == NULL then continue end
+		if curr == ent then self:Print("We already own this entity " .. tostring(ent) ) return false end
+	end
+
+	for i=1+self:GetReservedSlots(), 32 do
+		local curr = self["GetItem"..i](self)
+		if curr == NULL then
+			self["SetItem"..i](self, ent)
+			ent:SetParent( self:GetOwner() )
+			ent:SetOwner( self:GetOwner() )
+			self:ReevalRecreate() -- Why do I have to do this.
+			if ent.GetInventory then ent:GetInventory():ReevalRecreate() end
+			return true
+		end
+	end
+
+	self:Print("Inventory full, can't fit " .. tostring(ent) )
+	return false
+end
+
+function ENT:RemoveItem( ent )
+	if !ent:IsValid() then
+		self:Print("Invalid entity, printing trace" )
+		debug.Trace()
+		return false
+	end
+	
+	for i=1+self:GetReservedSlots(), 32 do
+		local curr = self["GetItem"..i](self)
+		if curr == ent then
+			self["SetItem"..i](self, NULL)
+			ent:SetParent( NULL )
+			ent:SetOwner( NULL )
+			self:ReevalRecreate() -- Why do I have to do this.
+			if ent.GetInventory then ent:GetInventory():ReevalRecreate() end
+			return true
+		end
+	end
+
+	self:Print("Couldn't remove " .. tostring(ent) .. " from inventory." )
+	return false
+end
+
+function ENT:GetItem( ent )
+	if !ent:IsValid() then
+		self:Print("Invalid entity, printing trace" )
+		debug.Trace()
+		return false
+	end
+	
+	for i=1+self:GetReservedSlots(), 32 do
+		local curr = self["GetItem"..i](self)
+		if curr == ent then
+			return curr, i
+		end
+	end
+
+	self:Print("Couldn't find " .. tostring(ent) .. " in inventory." )
+	return false
+end

gamemodes/benny/entities/weapons/itemhandler.lua

@@ -62,11 +62,14 @@ end
 function SWEP:SetActive( ent )
 	local p = self:GetOwner()
 	if ent:GetOwner() != p then return false end
-	--if self:GetActiveR():IsValid() then self:Deactive() end
 	self:SetActiveR( ent )
-	if self:GetActiveR():IsValid() then
+	if ent:IsValid() then
-		self:GetActiveR():Deploy()
+		ent:Deploy()
-		self:GetActiveR():SetNoDraw( false )
+		ent:SetNoDraw( false )
+		-- LAZY FIX
+		for i, v in ipairs(ent:GetChildren()) do
+			v:SetNoDraw(false)
+		end
 	end
 	return true
 end
@@ -75,7 +78,6 @@ function SWEP:Deactive()
 end
 
 function SWEP:PrimaryAttack()
-	local p = self:GetOwner()
 	if self:GetActiveR():IsValid() then
 		self:GetActiveR():Attack()
 	end
@@ -88,7 +90,6 @@ function SWEP:Reload()
 end
 
 function SWEP:SecondaryAttack()
-	local p = self:GetOwner()
 	if self:GetActiveR():IsValid() then
 		self:GetActiveR():AttackAlt()
 	end
@@ -121,27 +122,34 @@ function SWEP:EquipItem( ent )
 		end
 		print("[equip]", ent)
 
-		self:SetDesireR( ent )
+		--self:SetDesireR( ent )
+		ent:SetHandler( self )
 
 		ent:AddEFlags( EFL_KEEP_ON_RECREATE_ENTITIES )
-		ent:AddEffects( EF_BONEMERGE )
+		ent:AddEffects( EF_BONEMERGE + EF_BONEMERGE_FASTCULL + EF_NOINTERP )
 		ent:PhysicsInit( SOLID_NONE )
 		ent:SetMoveType( MOVETYPE_NONE )
+		ent:SetAcquisition( CurTime() )
+
+		-- Inventory
+		local inv = p:GetInventory()
+		local result = inv:AddItem( ent )
+		if !result then
+			print("[EquipItem " .. tostring(self) .. "] AddItem failed! " .. tostring(ent))
+			return
+		end
+
 		ent:SetNoDraw( true )
-		ent:SetParent( p )
+		-- LAZY FIX
-		ent:SetOwner( p )
+		for i, v in ipairs(ent:GetChildren()) do
-		ent:SetHandler( self )
+			v:SetNoDraw(true)
+		end
 		ent:SetLocalPos( vector_origin )
 		ent:SetLocalAngles( angle_zero )
-		ent:SetAcquisition( CurTime() )
 
 		ent:EmitSound( "ae/items/pickup.ogg", 70, 100, 1, CHAN_STATIC )
 
-		--self:SetActive( ent )
+		-- Start prediction
-		local inv = p:GetInventory()
-		inv[ent] = true
-		inv:Sync()
-
 		net.Start("AEINV_PredictItem")
 			net.WriteEntity( ent )
 			net.WriteBool( true )
@@ -156,30 +164,36 @@ function SWEP:DropItem()
 		if CLIENT then print("[drop] DropItem called on cl not allowed") return end
 
 		self:SetDesireR( NULL )
-		
-		ent:SetParent( NULL )
-		ent:SetOwner( NULL )
 		ent:SetHandler( NULL )
 
 		ent:RemoveEFlags( EFL_KEEP_ON_RECREATE_ENTITIES )
-		ent:RemoveEffects( EF_BONEMERGE )
+		ent:RemoveEffects( EF_BONEMERGE + EF_BONEMERGE_FASTCULL )
 		ent:PhysicsInit( SOLID_VPHYSICS )
 		ent:SetMoveType( MOVETYPE_VPHYSICS )
 		ent:SetCollisionGroup( COLLISION_GROUP_PROJECTILE )
-		ent:SetNoDraw( false )
 
+		-- Inventory
+		local inv = p:GetInventory()
+		local result = inv:RemoveItem( ent )
+		if !result then
+			print("[DropItem " .. tostring(self) .. "] RemoveItem failed! " .. tostring(ent))
+			return
+		end
+		
+		ent:SetNoDraw( false )
+		-- LAZY FIX
+		for i, v in ipairs(ent:GetChildren()) do
+			v:SetNoDraw(false)
+		end
 		ent:SetPos( p:EyePos() + p:GetAimVector() * 0 )
 		ent:SetAngles( p:EyeAngles() + Angle( 0, 180, 0 ) )
 		
-
-		local inv = p:GetInventory()
-		inv[ent] = nil
-		inv:Sync()
-		
 		local ep = ent:GetPhysicsObject()
 		ep:SetVelocity( p:GetAimVector() * 800 )
 		ep:SetAngleVelocity( Vector( 0, -360*3, 0 ) )
 		ep:Wake()
+
+		-- Prediction is not actually turned off here, for better throwing
 		--net.Start("AEINV_PredictItem")
 		--	net.WriteEntity( ent )
 		--	net.WriteBool( false )
@@ -193,23 +207,23 @@ function SWEP:Think()
 	if p:IsValid() then
 		local DesireR = self:GetDesireR()
 		local ActiveR = self:GetActiveR()
-		local DesireR_Valid = DesireR:IsValid()
+		DesireR = DesireR:IsValid() and DesireR or false
-		local ActiveR_Valid = ActiveR:IsValid()
+		ActiveR = ActiveR:IsValid() and ActiveR or false
 
 		if DesireR != ActiveR then
-			if ActiveR_Valid then
+			if ActiveR then
 				if ActiveR:GetHolsterIn() == 0 then
 					ActiveR:StartHolster()
 				else
 					-- Waiting for holster to finish
 				end
 			else
-				if DesireR_Valid then
+				if DesireR then
 					self:SetActive( DesireR )
 				end
 			end
 		else
-			if ActiveR_Valid and ActiveR:GetHolsterIn() != 0 then
+			if ActiveR and ActiveR:GetHolsterIn() != 0 then
 				ActiveR:CancelHolster()
 			end
 		end

gamemodes/benny/gamemode/camera.lua

@@ -88,8 +88,8 @@ function GM:CalcView( ply, pos, ang, fov )
 		view.origin = bm:GetTranslation()
 		view.origin:Add( vector_up*8 )
 
-		if ply:GetLayerSequence( GESTURE_SLOT_JUMP ) == ply:LookupSequence("dive_end_handgun") then
+		if ply:GetLayerSequence( BGESTURE_JUMP ) == ply:LookupSequence("dive_end_handgun") then
-			local progress = ply:GetLayerCycle( GESTURE_SLOT_JUMP )
+			local progress = ply:GetLayerCycle( BGESTURE_JUMP )
 
 			progress = math.TimeFraction( 0.15, 0.7, progress )
 			progress = math.Clamp( progress, 0, 1 )

gamemodes/benny/gamemode/debugmenu.lua

@@ -368,6 +368,6 @@ function printallbones( ent )
 	end
 end
 
-concommand.Add("b-debug_listbones", function( ply, cmd )
+concommand.Add("b-debug_listbones", function( ply, cmd, args )
-	printallbones( ply )
+	printallbones( args[1] and Entity(args[1]) or ply )
 end)

gamemodes/benny/gamemode/hud.lua

@@ -369,6 +369,9 @@ function GM:HUDPaint()
 		S_Pop()
 
 		if handler then
+			if !p:GetInventory():IsValid() then
+				hTextS( "No inventory entity!!", "HUD_36", ScrW()/2, ScrH() - 20 - 36, COLOR_MAIN, TEXT_ALIGN_CENTER, nil, COLOR_DARK )
+			else
 				-- Inventory
 				local Pw, Ph, Pg = 110, 30, 10
 				local thespace = 0
@@ -442,6 +445,7 @@ function GM:HUDPaint()
 					S_Pop()
 				end
 			end
+		end
 
 		if MP then S_Push( w/2, 20 )
 			local BARWIDE, BARTALL, GAP = 240, 30, 100
@@ -873,6 +877,82 @@ local function QuickDrawStat( wide, data, first )
 	return gap
 end
 
+local c_swag = HSVToColor( 120, 0.5, 1 )
+local c_swag2 = HSVToColor( 60, 0.5, 1 )
+local c_swag3 = HSVToColor( 180, 0.5, 1 )
+
+local function recurse( ent, y )
+	local p = LocalPlayer()
+	local h = p:HandlerCheck()
+	local inv = ent:GetInventory()
+	local irs = inv:GetReservedSlots()
+
+	S_Push( 20, 0 )
+		hTextS( "Inventory [" .. inv:EntIndex() .. "]", "HUD_16", 0, y, nil, nil, nil, color_black )
+		y = y + 12
+		for i=1, 32 do
+			local curr = inv["GetItem"..i](self)
+			if irs < i and curr == NULL then continue end
+			local ofinterest = curr != NULL and
+			((curr == h:GetActiveR() or curr == h:GetActiveL()) and c_swag or
+			(curr == h:GetDesireR() or curr == h:GetDesireL()) and c_swag2) or
+			irs >= i and c_swag3 or nil
+
+			local entname = curr == NULL and (irs >= i and "Reserved" or "Null") or tostring(curr)
+			hTextS( i, "HUD_16", 0, y, ofinterest, nil, nil, color_black )
+			hTextS( entname, "HUD_16", 20, y, ofinterest, nil, nil, color_black )
+			y = y + 12
+			if curr.GetInventory then
+				y = recurse( curr, y )
+			end
+		end
+	S_Pop()
+
+	return y
+end
+
+hook.Add("HUDPaint", "Benny_HUDPaint_Debug", function()
+	local p = LocalPlayer()
+	stack = util.Stack()
+
+	local y = 0
+	S_Push( 20, 120 )
+		hTextS( p, "HUD_16", 0, y, nil, nil, nil, color_black )
+		y = y + 12
+		
+		local h = p:HandlerCheck()
+		if h then
+			hTextS( "Handler:", "HUD_16", 20, y, nil, nil, nil, color_black )
+			y = y + 12
+
+			hTextS( "R Active: " .. tostring(h:GetActiveR()), "HUD_16", 40, y, nil, nil, nil, color_black )
+			y = y + 12
+			hTextS( "R Desire: " .. tostring(h:GetDesireR()), "HUD_16", 40, y, nil, nil, nil, color_black )
+			y = y + 12
+			hTextS( "L Active: " .. tostring(h:GetActiveL()), "HUD_16", 40, y, nil, nil, nil, color_black )
+			y = y + 12
+			hTextS( "L Desire: " .. tostring(h:GetDesireL()), "HUD_16", 40, y, nil, nil, nil, color_black )
+			y = y + 12
+		end
+
+		local x = 20+20
+		y = recurse( p, y )
+		
+		if false then
+			hTextS( "Inventory (Weighted):", "HUD_16", 20, y, nil, nil, nil, color_black )
+			y = y + 12
+			
+			for i, v in ipairs(p:GetInventory():GetWeighted()) do
+				hTextS( i .. ": " .. tostring(v), "HUD_16", 20+20, y, nil, nil, nil, color_black )
+				y = y + 12
+			end
+		end
+	S_Pop()
+
+	if stack:Size() != 0 then print("Stack unfinished.") end
+	return
+end)
+
 local ScoreWide = 600
 function GM:ScoreboardShow()
 	drawscoreboard = true

gamemodes/benny/gamemode/inventory.lua

@@ -1,121 +1,7 @@
 
----------------------
+local Emeta = FindMetaTable("Entity")
--- Your Name is Benny
----------------------
 
-local PT = FindMetaTable("Player")
+local qt2 = {
-
-function PT:GetItems()
-	return
-end
-
-InventoryMeta = {}
-
-function InventoryMeta:Destroy()
-	local p = self[0].Owner
-	p.Inventory = nil
-	p:GetInventory()
-end
-
-function InventoryMeta:BugCheck()
-	for i, v in pairs(self) do
-		if i != 0 and !i:IsValid() then
-			self[i] = nil
-		end
-	end
-end
-
-function InventoryMeta:GetWeighted()
-	local itemlist = {}
-
-	for i, v in pairs(self) do
-		if i == 0 then continue end
-		table.insert( itemlist, i )
-	end
-
-	table.sort( itemlist, function( a, b ) 
-		return a:GetAcquisition() < b:GetAcquisition()
-	end)
-
-	return itemlist
-end
-
-function InventoryMeta:Sync()
-	if SERVER then
-		net.Start("AEINV_InvSync")
-			local count = table.Count( self )-1 -- The header is included
-			net.WriteUInt( count, 8 )
-			for key, _ in pairs( self ) do
-				if key == 0 then continue end
-				net.WriteEntity( key )
-			end
-		net.Send( self[0].Owner )
-	end
-end
-
-InventoryMeta.__index = InventoryMeta
-
-function PT:GetInventory()
-	if !self.Inventory then
-		print("[inventory] new inventory created: ", self)
-		self.Inventory = {}
-		self.Inventory[0] = { Owner = self }
-		setmetatable( self.Inventory, InventoryMeta )
-
-		if SERVER then
-			for i, v in pairs( self:GetChildren() ) do
-				if v.AEItem then
-					print( "[inventory] regen: adding", v)
-					self.Inventory[v] = true
-				end
-			end
-			self.Inventory:Sync()
-		end
-	end
-
-	self.Inventory:BugCheck()
-
-	return self.Inventory
-end
-
-gameevent.Listen( "OnRequestFullUpdate" )
-hook.Add( "OnRequestFullUpdate", "Benny_OnRequestFullUpdate_Inventory", function( data )
-	local name = data.name			// Same as Player:Nick()
-	local steamid = data.networkid	// Same as Player:SteamID()
-	local id = data.userid			// Same as Player:UserID()
-	local index = data.index   		// Same as Entity:EntIndex() minus one
-
-	if SERVER then
-		print("[inventory]", Player(id), "FullUpdate resync")
-		Player(id):GetInventory():Sync()
-	end
-end )
-
-if SERVER then
-	util.AddNetworkString("AEINV_InvSync")
-else
-	net.Receive("AEINV_InvSync", function()
-		print("[inventory] sync start:")
-		local p = LocalPlayer()
-		p.Inventory = nil
-		if p.GetInventory then
-			local inv = p:GetInventory()
-			local count = net.ReadUInt(8)
-			for i=1, count do
-				local key = net.ReadEntity()
-				print( "\tadded", key)
-				inv[key] = true
-			end
-		else
-			print("\ti don't have an inventory, maybe you asked too early!!")
-		end
-		print("\tsync done")
-	end)
-end
-
-
-do
-	local qt2 = {
 	["slot1"] = 1,
 	["slot2"] = 2,
 	["slot3"] = 3,
@@ -126,13 +12,13 @@ do
 	["slot8"] = 8,
 	["slot9"] = 9,
 	["slot0"] = 0,
-	}
+}
-	local qt = {
+local qt = {
 	["invprev"] = -1,
 	["invnext"] = 1,
-	}
+}
 
-	hook.Add( "PlayerBindPress", "Benny_PlayerBindPress_Original", function( ply, bind, pressed, code )
+hook.Add( "PlayerBindPress", "Benny_PlayerBindPress_Original", function( ply, bind, pressed, code )
 	if qt2[bind] then
 		local Num = qt2[bind]
 		if pressed then
@@ -172,8 +58,7 @@ do
 		end
 		return true
 	end
-	end)
+end)
-end
 
 hook.Add( "PlayerSwitchWeapon", "Benny_PlayerSwitchWeapon_Goat", function( ply, old, ent )
 	if ent.BennyItemHandler then return true end -- what happened?
@@ -195,7 +80,6 @@ end)
 
 for i=0, 9 do
 	local tent = {}
-	--tent.Base = "goat"
 	tent.Goat = i
 	
 	weapons.Register( tent, "goat_" .. i )

gamemodes/benny/gamemode/items.lua

@@ -19,6 +19,22 @@ function Emeta:__index( key )
 	return Emetaindex( self, key )
 end
 
+function Emeta:SetupInventory()
+	local oldinv = self:GetInventory()
+	if IsValid( oldinv ) then
+		print( "[Inventory " .. tostring(oldinv) .. "] Removing to create a new inv" )
+		oldinv:Remove()
+	end
+
+	local inventory = ents.Create( "inventory" )
+	if IsValid( inventory ) then
+		inventory:AttachToEntity( self )
+		inventory:Spawn()
+		return inventory
+	end
+	return false
+end
+
 local Itemmeta = {}
 
 function Itemmeta:__tostring()

gamemodes/benny/gamemode/items/base.lua

@@ -23,7 +23,6 @@ do -- Base
 	ITEM.CancelHolsterSound = bSound("dev/grab.ogg")
 
 	function ITEM:EntInitialize()
-		print( self )
 		for k, v in ipairs(self.DefaultBodygroups) do
 			if v then
 				self:SetBodygroup( k-1, v )
@@ -51,7 +50,24 @@ do -- Base
 
 	function ITEM:PlayerAnimation( seqname )
 		local p = self:GetOwner()
-		p:DoAnimationEvent( p:LookupSequence( seqname ) )
+		p:DoCustomAnimEvent( BGESTURE_ITEM1_RIGHT, p:LookupSequence( seqname ) )
+	end
+
+	-- Use after children added.
+	function ITEM:ReevalRecreate()
+		self:RemoveEFlags( EFL_KEEP_ON_RECREATE_ENTITIES )
+		if self:GetOwner():IsValid() then
+			if self:GetOwner():IsEFlagSet( EFL_KEEP_ON_RECREATE_ENTITIES ) then
+				self:AddEFlags( EFL_KEEP_ON_RECREATE_ENTITIES )
+				print( "[Item " .. tostring(self) .. "] To be saved during recreate.")
+				return
+			else
+				print( "[Item " .. tostring(self) .. "] Will NOT be saved during recreate.")
+				return
+			end
+		end
+		print( "[Item " .. tostring(self) .. "] Will NOT be saved during recreate. No owner either")
+		return
 	end
 
 	function ITEM:EntThink() end
@@ -72,6 +88,10 @@ do -- Base
 		
 		self:GetHandler():SetActiveR( NULL )
 		self:SetNoDraw( true )
+		-- LAZY FIX
+		for i, v in ipairs(self:GetChildren()) do
+			v:SetNoDraw(true)
+		end
 	end
 
 	function ITEM:CancelHolster()

gamemodes/benny/gamemode/items/firearms.lua

@@ -1,5 +1,4 @@
 
-
 do -- Base Firearm
 	local AnimationLookup = {
 		["fire"] = {
@@ -42,7 +41,6 @@ do -- Base Firearm
 			"Clip",
 			"BurstCount",
 			"Firemode",
-			"ReloadStage",
 		},
 		["Float"] = {
 			"Delay",
@@ -52,6 +50,9 @@ do -- Base Firearm
 			"Accuracy_Amount",
 			"DelayReload",
 		},
+		["Entity"] = {
+			"Inventory"
+		},
 	}
 
 	ITEM.Delay = 0.2
@@ -71,6 +72,10 @@ do -- Base Firearm
 
 	function ITEM:EntInitialize()
 		Base.EntInitialize( self )
+		if SERVER then
+			local inv = self:SetupInventory()
+			inv:SetReservedSlots( 1 )
+		end
 	end
 
 	function ITEM:Attack()
@@ -133,8 +138,27 @@ do -- Base Firearm
 			end
 		end
 		if self:GetRefillTime() != 0 and self:GetRefillTime() <= CurTime() then
-			self:SetClip( class.ClipSize )
+			self:SetClip( self.ClipSize )
 			self:SetRefillTime( 0 )
+
+			if SERVER then
+				local inv = self:GetInventory()
+				local ent = ents.Create("b-item_mag_m16a2")
+				if IsValid(ent) then
+					ent:AddEffects( EF_BONEMERGE + EF_BONEMERGE_FASTCULL )
+					ent:SetOwner( self )
+					ent:SetParent( self )
+					ent:SetLocalPos( vector_origin )
+					ent:SetLocalAngles( angle_zero )
+					ent:Spawn()
+					self:ReevalRecreate()
+					ent:ReevalRecreate()
+
+					ent:SetMoveType( MOVETYPE_NONE )
+
+					inv:SetItem1( ent )
+				end
+			end
 		end
 		Base.Think( self )
 	end
@@ -150,23 +174,52 @@ do -- Base Firearm
 		local p = self:GetOwner()
 		local time = 0.4
 
-		if self:GetReloadStage() == 0 then -- Mag loaded
+		if self:GetInventory():GetItem1():IsValid() then -- Mag loaded
 			-- Unload the mag
-			self:SetReloadStage(1)
 			self:SetClip( 0 )
 			self:Sound( self.MagOutSound, 70, 100, 0.4 )
 			self:PlayerAnimation( AnimationLookup["reload"][self.HoldType] )
 			self:PlayAnimation( self:LookupSequence( "magout" ) )
 			time = 0.4
+
+			if CLIENT then
+				local inv = self:GetInventory()
+				local curr = inv:GetItem1()
+				if curr:IsValid() then
+					local bm = self:GetBoneMatrix( self:LookupBone("Weapon") )
+					debugoverlay.Cross( bm:GetTranslation(), 16, 0.5 )
+
+					local class = ITEMS["mag_m16a2"]
+					local ent = ents.CreateClientProp( class.Model ) --- TO BE A SHARED ENTITY IN THE FUTURE :3
+					ent:SetPos( bm:GetTranslation() )
+					ent:SetAngles( bm:GetAngles() + Angle( 0, -90, -90 ) )
+					ent:Spawn()
+				end
+			end
+
+			if SERVER then
+				local inv = self:GetInventory()
+				local curr = inv:GetItem1()
+				if curr:IsValid() then
+					inv:SetItem1( NULL )
+					curr:SetOwner( NULL )
+					curr:SetParent( NULL )
+					
+					curr:Remove()
+					self:ReevalRecreate()
+					-- curr:SetMoveType( MOVETYPE_VPHYSICS )
+					-- curr:GetPhysicsObject():Wake()
+				end
+			end
 		else
 			-- Load it
-			self:SetReloadStage(0)
+			self:SetRefillTime( CurTime() + 0.4 )
-			self:SetClip( self.ClipSize )
 			self:Sound( self.MagInSound, 70, 100, 0.4 )
 			self:PlayerAnimation( AnimationLookup["reload_insert"][self.HoldType] )
 			self:PlayAnimation( self:LookupSequence( "magin" ) )
-			time = 0.8
 		end
+
+		time = 0.8
 		self:SetDelay( CurTime() + time )
 	end
 	
@@ -186,6 +239,14 @@ do -- Base Firearm
 		Base.CancelHolster( self )
 	end
 
+	do -- Base Mag
+		local ITEM, Base = CreateItem( "base_mag", "base" )
+
+		ITEM.PrintName = "Magazine Base"
+		ITEM.Description = "Testing testing"
+		ITEM.Category = "base"
+	end
+
 	do -- Handguns
 		do -- G18
 			local ITEM, Base = CreateItem( "g18", "base_firearm" )
@@ -262,6 +323,20 @@ do -- Base Firearm
 			ITEM.MagInSound = bSound("weapons/m16a2/magin.ogg")
 			ITEM.BoltDropSound = bSound("weapons/m16a2/cock.ogg")
 			ITEM.BoltPullSound = bSound("weapons/fnc/cock.ogg")
+
+			do
+				local ITEM, Base = CreateItem( "mag_m16a2", "base_mag" )
+
+				ITEM.PrintName = "#Item.mag_m16a2.Name"
+				ITEM.Description = "#Item.mag_m16a2.Description"
+				ITEM.Category = "magazine"
+
+				ITEM.Model = bModel("weapons/test_m16a2_mag")
+				ITEM.DefaultBodygroups = {}
+				ITEM.HoldType = "magazine"
+
+				ITEM.ClipSize = 30
+			end
 		end
 	end
 end

gamemodes/benny/gamemode/player.lua

@@ -44,6 +44,8 @@ function GM:PlayerSpawn( ply )
 	ply:SetHealth_Blood( 1000 )
 	ply:SetHealth_Stamina( 1000 )
 
+	ply:SetupInventory()
+
 	ply:MakeCharacter()
 end
 
@@ -189,10 +191,33 @@ function PT:HandlerCheck()
 	return ( wep:IsValid() and wep:GetClass() == "itemhandler" and wep.GetActiveR ) and wep or false
 end
 
--- breaks GESTURE_SLOT_ATTACK_AND_RELOAD and I can't fucking have that
+BGESTURE_ITEM1_RIGHT		= GESTURE_SLOT_ATTACK_AND_RELOAD	-- 0
+BGESTURE_ITEM1_LEFT			= GESTURE_SLOT_GRENADE				-- 1
+BGESTURE_ITEM2_RIGHT		= GESTURE_SLOT_JUMP					-- 2
+BGESTURE_ITEM2_LEFT			= GESTURE_SLOT_SWIM					-- 3
+BGESTURE_ACTION_RIGHT		= GESTURE_SLOT_FLINCH				-- 4
+BGESTURE_ACTION_LEFT		= GESTURE_SLOT_VCD					-- 5
+BGESTURE_JUMP				= GESTURE_SLOT_CUSTOM				-- 6
+
+-- PLAYERANIMEVENT_ATTACK_PRIMARY	= 0	-- Primary attack
+-- PLAYERANIMEVENT_ATTACK_SECONDARY	= 1	-- Secondary attack
+-- PLAYERANIMEVENT_ATTACK_GRENADE	= 2	-- Grenade throw
+-- PLAYERANIMEVENT_RELOAD			= 3	-- Reload
+-- PLAYERANIMEVENT_RELOAD_LOOP		= 4	-- Looping reload (single-reload shotguns)
+-- PLAYERANIMEVENT_RELOAD_END		= 5	-- Looping reload end
+-- PLAYERANIMEVENT_JUMP				= 6	-- Jump
+
+-- breaks GESTURE_SLOT_ATTACK_AND_RELOAD, so do my own thing
+-- 0 through 6 are real
 hook.Add("DoAnimationEvent", "Benny_DoAnimationEvent_FixAnimations", function( p, event, data )
-	if event == PLAYERANIMEVENT_CUSTOM_GESTURE then
+	-- 23, PLAYERANIMEVENT_CANCEL_RELOAD, is annoying and breaks animations
-		p:AddVCDSequenceToGestureSlot( GESTURE_SLOT_ATTACK_AND_RELOAD, data, 0, true )
+	if event >= 0 and event <= 6 then
+		if data == 0 then
+			-- print("[DoAnimationEvent] Called " .. event .. " with data 0." )
+			return ACT_INVALID
+		end
+		-- print("running?", event, data )
+		p:AddVCDSequenceToGestureSlot( event, math.floor(data), 0, true )
 	end
 	return ACT_INVALID
 end)
@@ -214,8 +239,8 @@ function GM:UpdateAnimation( ply, vel, maxseqgroundspeed )
 	normal.x = normal.x * needer
 	normal.y = normal.y * needer
 	
-	local diveend = ply:GetLayerSequence( GESTURE_SLOT_JUMP ) == ply:LookupSequence("dive_end_handgun")
+	local diveend = ply:GetLayerSequence( BGESTURE_JUMP ) == ply:LookupSequence("dive_end_handgun")
-	local divestart = ply:GetLayerSequence( GESTURE_SLOT_JUMP ) == ply:LookupSequence("dive_start_handgun")
+	local divestart = ply:GetLayerSequence( BGESTURE_JUMP ) == ply:LookupSequence("dive_start_handgun")
 
 	if ply:GetInDive() or diveend then speed = 1 end
 
@@ -248,17 +273,17 @@ function GM:UpdateAnimation( ply, vel, maxseqgroundspeed )
 	ply:SetRenderAngles( Angle( 0, ply:EyeAngles().y, 0 ) )
 
 	if diveend then
-		local magicnumber = ply:GetLayerCycle( GESTURE_SLOT_JUMP )
+		local magicnumber = ply:GetLayerCycle( BGESTURE_JUMP )
 		magicnumber = math.Remap( magicnumber, 0.5, 0.75, 1, 0 )
 		magicnumber = math.Clamp( magicnumber, 0, 1 )
-		ply:AnimSetGestureWeight( GESTURE_SLOT_JUMP, magicnumber )
+		ply:AnimSetGestureWeight( BGESTURE_JUMP, magicnumber )
 	elseif divestart then
-		local magicnumber = ply:GetLayerCycle( GESTURE_SLOT_JUMP )
+		local magicnumber = ply:GetLayerCycle( BGESTURE_JUMP )
 		magicnumber = math.Remap( magicnumber, 0.1, 0.6, 1, 0 )
 		magicnumber = math.Clamp( magicnumber, 0, 1 )
-		ply:AnimSetGestureWeight( GESTURE_SLOT_JUMP, magicnumber )
+		ply:AnimSetGestureWeight( BGESTURE_JUMP, magicnumber )
 	else
-		ply:AnimSetGestureWeight( GESTURE_SLOT_JUMP, 1 )
+		ply:AnimSetGestureWeight( BGESTURE_JUMP, 1 )
 	end
 
 	--local dir = ply:GetVelocity():GetNormalized()
@@ -296,10 +321,8 @@ function GM:CalcMainActivity( ply, velocity )
 
 	local w = ply:HandlerCheck()
 	local wpntype = "none"
-	if w then
+	if w and w:ItemR() then
-		if w:ItemR() and w:ItemR().Class.HoldType then
+		wpntype = w:ItemR().HoldType
-			wpntype = w:ItemR().Class.HoldType
-		end
 	end
 	plyTable.CalcSeqOverride = ply:LookupSequence( Animations["idle"][wpntype] )
 	
@@ -393,35 +416,19 @@ hook.Add("Move", "Benny_Move", function( ply, mv )
 		ply:SetInDive( true )
 		ply:SetDivedAt( CurTime() )
 		if SERVER or CLIENT and IsFirstTimePredicted() then
-			ply:AddVCDSequenceToGestureSlot( GESTURE_SLOT_JUMP, ply:LookupSequence( "dive_start_handgun" ), 0, true )
+			ply:HandlerCheck():EmitSound( "weapons/slam/throw.wav", 70, 100, .25 )
-		end
+			ply:DoCustomAnimEvent( BGESTURE_JUMP, ply:LookupSequence( "dive_start_handgun" ) )
-		if (SERVER) or (CLIENT and IsFirstTimePredicted()) then
-			local rfil = nil
-			if SERVER then
-				rfil = RecipientFilter()
-				rfil:AddPAS(ply:GetPos())
-				rfil:RemovePlayer( ply )
-			end
-			ply:EmitSound("weapons/slam/throw.wav", 70, 100, .25, nil, nil, nil, rfil)
 		end
 	end
 	if ply:OnGround() and ply:GetInDive() then
-		if (SERVER) or (CLIENT and IsFirstTimePredicted()) then
-			local rfil = nil
-			if SERVER then
-				rfil = RecipientFilter()
-				rfil:AddPAS(ply:GetPos())
-				rfil:RemovePlayer( ply )
-			end
-			ply:EmitSound("npc/combine_soldier/gear1.wav", 70, 100, .25, nil, nil, nil, rfil)
-		end
 		ply:SetInDive(false)
 		ply:SetDivedAt( CurTime() )
-		if SERVER or CLIENT and IsFirstTimePredicted() then
-			ply:AddVCDSequenceToGestureSlot( GESTURE_SLOT_JUMP, ply:LookupSequence( "dive_end_handgun" ), 0, true )
-		end
 		mv:SetVelocity( mv:GetVelocity() + Vector( 0, 0, 120 ) )
 		ply:SetGroundEntity( NULL )
+		if SERVER or CLIENT and IsFirstTimePredicted() then
+			ply:HandlerCheck():EmitSound( "npc/combine_soldier/gear1.wav", 70, 100, .25 )
+			ply:DoCustomAnimEvent( BGESTURE_JUMP, ply:LookupSequence( "dive_end_handgun" ) )
+		end
 	end
 	--if !ply:OnGround() and ply:GetInDive() then
 	--	local da = ply:GetDivedAt()

gamemodes/benny/gamemode/player_class.lua

@@ -47,6 +47,7 @@ function PLAYER:SetupDataTables()
 	self.Player:NetworkVar( "Float",		"DivedAt" )
 	self.Player:NetworkVar( "Float",		"TouchedObjectiveTime" )
 
+	self.Player:NetworkVar( "Entity",		"Inventory" )
 	self.Player:NetworkVar( "Entity",		"TouchedObjective" )
 
 	self.Player:NetworkVar( "Vector",		"VaultPos1")