a halfway commit to show scott

1 files changed, 30 insertions, 14 deletions

diff --git a/gamemode/server/player_functions.lua b/gamemode/server/player_functions.lua
index b4cc7c0..b335553 100644
--- a/gamemode/server/player_functions.lua
+++ b/gamemode/server/player_functions.lua
@@ -140,17 +140,39 @@ function PlayerMeta:DecXP( skill, int )
 	umsg.End()
 end
 
+util.AddNetworkString( "gms_SetResource" )
+
 function PlayerMeta:SetResource( resource, int )
-	resource = string.Capitalize( resource )
-	if ( !self.Resources[resource] ) then self.Resources[resource] = 0 end
+	print("SetResource called!")
+	if(isstring(resource)) then
+		resource = GMS.GetResourceByName(resource)
+	end
+	PrintTable(resource)
+	print(int)
 
+	if ( !self.Resources[resource] ) then self.Resources[resource] = 0 end
 
 	self.Resources[resource] = int
 
-	umsg.Start( "gms_SetResource", self )
-		umsg.String( resource )
-		umsg.Short( int )
-	umsg.End()
+	if(net.Start("gms_SetResource",false)) then
+		net.WriteString(resource.Name)
+		if(resource.UniqueData) then
+			if(self.Resources[resource.Name] == nil) then
+				self.Resources[resource.Name] = {}
+			end
+			table.insert(self.Resources[resource.Name],resource.UniqueDataID,resource)
+			net.WriteTable(resource)
+		else
+			if(self.Resources[resource.Name] == nil) then
+				self.Resources[resource.Name] = 0
+			end
+			self.Resources[resource.Name] = int
+			net.WriteInt(int, GMS.NETINT_BITCOUNT)
+		end
+		net.Send(self)
+	else
+		print("Error! could not send resource change data to client: " .. self:GetName())
+	end
 end
 
 function PlayerMeta:GetResource( resource )
@@ -173,10 +195,7 @@ function PlayerMeta:IncResource( resource, int )
 		self.Resources[resource] = self.Resources[resource] + int
 	end
 
-	umsg.Start( "gms_SetResource", self )
-		umsg.String( resource )
-		umsg.Short( self:GetResource( resource ) )
-	umsg.End()
+	self:SetResource(resource, self:GetResource( resource ))
 end
 
 function PlayerMeta:DecResource( resource, int )
@@ -192,10 +211,7 @@ function PlayerMeta:DecResource( resource, int )
 		self:UpdateNeeds()
 	end
 
-	umsg.Start( "gms_SetResource", self )
-		umsg.String( resource )
-		umsg.Short( self:GetResource( resource ) )
-	umsg.End()
+	self:SetResource(resource, self:GetResource( resource ))
 end
 
 function PlayerMeta:GetAllResources()