8 files changed, 53 insertions, 124 deletions
diff --git a/gamemode/itemsystem/common.lua b/gamemode/itemsystem/common.lua
index f7d6c72..65239d6 100644
--- a/gamemode/itemsystem/common.lua
+++ b/gamemode/itemsystem/common.lua
@@ -17,6 +17,43 @@ function startProcessGeneric(player, string, time, ondone)
   end)
 end
 
+function genericMakeDroppable(tbl)
+  local drop1 = function(player)
+    genericDropResource(player,tbl.Name,1)
+  end
+  local dropall = function(player)
+    PrintTable(Resources)
+    print("Ammount:" .. Resources[tbl.Name])
+    genericDropResource(player,tbl.Name,Resources[tbl.Name])
+  end
+  local dropx = function(player)
+    if(SERVER) then return end
+    local frame = vgui.Create( "DFrame" )
+    frame:SetSize( 400, 200 )
+    frame:Center()
+    frame:MakePopup()
+
+    local TextEntry = vgui.Create( "DTextEntry", frame )	-- create the form as a child of frame
+    TextEntry:SetPos( 25, 50 )
+    TextEntry:SetSize( 75, 85 )
+    TextEntry:SetText( "Sample String" )
+    TextEntry.OnEnter = function( self )
+      genericDropResource(player,tbl.Name,self:GetValue())
+    end
+
+  end
+  if(tbl.Actions == nil) then
+    tbl.Actions = {}
+  end
+  if(tbl.Actions["Drop"] == nil) then
+    tbl.Actions["Drop"] = {}
+  end
+  tbl.Actions["Drop"]["Drop 1"] = drop1
+  tbl.Actions["Drop"]["Drop all"] = dropall
+  tbl.Actions["Drop"]["Drop X"] = dropx
+end
+
+
 if(SERVER) then
   util.AddNetworkString( "gms_dropresources" )
 end
@@ -28,19 +65,23 @@ function genericDropResource(player, resource, ammount)
     net.SendToServer()
   end
   if(SERVER) then
-    if(player.Resources[resource] <= ammount) then
+    if(player.Resources[resource] < ammount) then
       player:SendMessage("You don't have that many to drop!", 3, Color(255, 255, 255, 255))
       return
     end
-    local res = ply:GetResource( Type )
+    local res = player.Resources[resource]
 
     if ( ammount > res ) then
       ammount = res
     end
-    ply:DropResource( Type, int )
-    ply:DecResource( Type, int )
+    player:DropResource( resource, ammount )
+    player:DecResource( resource, ammount )
   end
 end
 net.Receive( "gms_dropresources", function(len,pl)
-  genericDropResource(pl,net.ReadString(),net.ReadInt(GMS.NETINT_BITCOUNT))
+  local resourcename = net.ReadString()
+  local resourcenum = net.ReadInt(GMS.NETINT_BITCOUNT)
+  print("resourcename:" .. resourcename)
+  print("resourcenum:" .. resourcenum)
+  genericDropResource(pl,resourcename,resourcenum)
 end)
diff --git a/gamemode/itemsystem/items/baits.lua b/gamemode/itemsystem/items/baits.lua
index 47bf1d0..f6824cd 100644
--- a/gamemode/itemsystem/items/baits.lua
+++ b/gamemode/itemsystem/items/baits.lua
@@ -5,22 +5,6 @@ ITEM.Description = "Something you can plant!"
 ITEM.Icon = "test.png"
 ITEM.UniqueData = false
 
-local drop1 = function(player)
-  print("Drop 1 called")
-end
-
-local dropall = function(player)
-  print("Drop all called")
-end
-
-local dropx = function(player)
-  print("Drop x called")
-end
-
-ITEM.Actions = {}
-ITEM.Actions["Drop"] = {}
-ITEM.Actions["Drop"]["Drop 1"] = drop1
-ITEM.Actions["Drop"]["Drop all"] = dropall
-ITEM.Actions["Drop"]["Drop X"] = dropx
+genericMakeDroppable(ITEM)
 
 GMS.RegisterResource(ITEM)
diff --git a/gamemode/itemsystem/items/bananaseeds.lua b/gamemode/itemsystem/items/bananaseeds.lua
index 358ed63..103bca9 100644
--- a/gamemode/itemsystem/items/bananaseeds.lua
+++ b/gamemode/itemsystem/items/bananaseeds.lua
@@ -5,22 +5,6 @@ ITEM.Description = "Something you can plant!"
 ITEM.Icon = "test.png"
 ITEM.UniqueData = false
 
-local drop1 = function(player)
-  print("Drop 1 called")
-end
-
-local dropall = function(player)
-  print("Drop all called")
-end
-
-local dropx = function(player)
-  print("Drop x called")
-end
-
-ITEM.Actions = {}
-ITEM.Actions["Drop"] = {}
-ITEM.Actions["Drop"]["Drop 1"] = drop1
-ITEM.Actions["Drop"]["Drop all"] = dropall
-ITEM.Actions["Drop"]["Drop X"] = dropx
+genericMakeDroppable(ITEM)
 
 GMS.RegisterResource(ITEM)
diff --git a/gamemode/itemsystem/items/berry.lua b/gamemode/itemsystem/items/berry.lua
index 2021ffd..125a78b 100644
--- a/gamemode/itemsystem/items/berry.lua
+++ b/gamemode/itemsystem/items/berry.lua
@@ -30,24 +30,8 @@ local eat = function(ln, player)
 end
 net.Receive( "gms_eatberry", eat)
 
-local drop1 = function(player)
-  genericDropResource(player,ITEM.Name,1)
-end
-
-local dropall = function(player)
-  genericDropResource(player,ITEM.Name,9999)
-end
-
-local dropx = function(player)
-  print("Drop x called")
-end
-
 ITEM.Actions = {}
+genericMakeDroppable(ITEM)
 ITEM.Actions["EatBerry"] = eat
 
-ITEM.Actions["Drop"] = {}
-ITEM.Actions["Drop"]["Drop 1"] = drop1
-ITEM.Actions["Drop"]["Drop all"] = dropall
-ITEM.Actions["Drop"]["Drop X"] = dropx
-
 GMS.RegisterResource(ITEM)
diff --git a/gamemode/itemsystem/items/grainseeds.lua b/gamemode/itemsystem/items/grainseeds.lua
index 9b22a0b..be81e5f 100644
--- a/gamemode/itemsystem/items/grainseeds.lua
+++ b/gamemode/itemsystem/items/grainseeds.lua
@@ -5,22 +5,6 @@ ITEM.Description = "Something you can plant, or mash up into flour"
 ITEM.Icon = "test.png"
 ITEM.UniqueData = false
 
-local drop1 = function(player)
-  print("Drop 1 called")
-end
-
-local dropall = function(player)
-  print("Drop all called")
-end
-
-local dropx = function(player)
-  print("Drop x called")
-end
-
-ITEM.Actions = {}
-ITEM.Actions["Drop"] = {}
-ITEM.Actions["Drop"]["Drop 1"] = drop1
-ITEM.Actions["Drop"]["Drop all"] = dropall
-ITEM.Actions["Drop"]["Drop X"] = dropx
+genericMakeDroppable(ITEM)
 
 GMS.RegisterResource(ITEM)
diff --git a/gamemode/itemsystem/items/herbs.lua b/gamemode/itemsystem/items/herbs.lua
index 9db5417..c9339ce 100644
--- a/gamemode/itemsystem/items/herbs.lua
+++ b/gamemode/itemsystem/items/herbs.lua
@@ -5,22 +5,6 @@ ITEM.Description = "Something you can plant!"
 ITEM.Icon = "test.png"
 ITEM.UniqueData = false
 
-local drop1 = function(player)
-  print("Drop 1 called")
-end
-
-local dropall = function(player)
-  print("Drop all called")
-end
-
-local dropx = function(player)
-  print("Drop x called")
-end
-
-ITEM.Actions = {}
-ITEM.Actions["Drop"] = {}
-ITEM.Actions["Drop"]["Drop 1"] = drop1
-ITEM.Actions["Drop"]["Drop all"] = dropall
-ITEM.Actions["Drop"]["Drop X"] = dropx
+genericMakeDroppable(ITEM)
 
 GMS.RegisterResource(ITEM)
diff --git a/gamemode/itemsystem/items/melonseeds.lua b/gamemode/itemsystem/items/melonseeds.lua
index 874ac46..84d4f95 100644
--- a/gamemode/itemsystem/items/melonseeds.lua
+++ b/gamemode/itemsystem/items/melonseeds.lua
@@ -5,22 +5,6 @@ ITEM.Description = "Something you can plant!"
 ITEM.Icon = "test.png"
 ITEM.UniqueData = false
 
-local drop1 = function(player)
-  print("Drop 1 called")
-end
-
-local dropall = function(player)
-  print("Drop all called")
-end
-
-local dropx = function(player)
-  print("Drop x called")
-end
-
-ITEM.Actions = {}
-ITEM.Actions["Drop"] = {}
-ITEM.Actions["Drop"]["Drop 1"] = drop1
-ITEM.Actions["Drop"]["Drop all"] = dropall
-ITEM.Actions["Drop"]["Drop X"] = dropx
+genericMakeDroppable(ITEM)
 
 GMS.RegisterResource(ITEM)
diff --git a/gamemode/itemsystem/items/orangeseeds.lua b/gamemode/itemsystem/items/orangeseeds.lua
index 33fd698..39a2bec 100644
--- a/gamemode/itemsystem/items/orangeseeds.lua
+++ b/gamemode/itemsystem/items/orangeseeds.lua
@@ -5,22 +5,6 @@ ITEM.Description = "Something you can plant!"
 ITEM.Icon = "test.png"
 ITEM.UniqueData = false
 
-local drop1 = function(player)
-  print("Drop 1 called")
-end
-
-local dropall = function(player)
-  print("Drop all called")
-end
-
-local dropx = function(player)
-  print("Drop x called")
-end
-
-ITEM.Actions = {}
-ITEM.Actions["Drop"] = {}
-ITEM.Actions["Drop"]["Drop 1"] = drop1
-ITEM.Actions["Drop"]["Drop all"] = dropall
-ITEM.Actions["Drop"]["Drop X"] = dropx
+genericMakeDroppable(ITEM)
 
 GMS.RegisterResource(ITEM)