Changes

1 files changed, 153 insertions, 54 deletions

diff --git a/gamemode/cl_deathmenu.lua b/gamemode/cl_deathmenu.lua
index 259f48b..e206ff3 100644
--- a/gamemode/cl_deathmenu.lua
+++ b/gamemode/cl_deathmenu.lua
@@ -58,6 +58,7 @@ local PANEL = {}
 width = 100
 height = 100
 
+
 function PANEL:Init()
 	
 	self:SetSize( 440, 400 )
@@ -170,20 +171,166 @@ function PANEL:Init()
 			
 		resPNL.DoClick = function()
 			local mb = DermaMenu()
+			mb:AddOption("Take x1", function()
+		
+				if (amount - 1 <= 0) then
+					
+					if (amount - 1 == 0) then
+						amount = 0
+						for i,o in pairs(res) do
+							if (getResName(v) == getResName(o)) then
+								giveRes(getResName(o), 1, i)
+								table.remove(res, i)
+							end
+						end
+						resPNL:Remove()
+					else
+							
+						num1 = amount - 1
+						num2 = 1 + num1
+						amount = 0
+						
+								
+						for i,o in pairs(res) do
+							if (getResName(v) == getResName(o)) then
+								giveRes(getResName(o), num2, i)
+								table.remove(res,i)
+							end
+						end
+								
+						resPNL:Remove()
+					end
+					
+				else
+					
+					amount = amount - 1
+							
+							
+					for i,o in pairs(res) do
+						if (getResName(v) == getResName(o)) then
+							giveRes(getResName(o), 1, i)
+							res[i] = getResName(o) .. " x" .. amount
+							v = res[i]
+						end
+					end
+					
+				end
+				
+			end)
+			mb:AddOption("Take x5", function()
+	
+				if (amount - 5 <= 0) then
+					
+					if (amount - 5 == 0) then
+						amount = 0
+						for i,o in pairs(res) do
+							if (getResName(v) == getResName(o)) then
+								giveRes(getResName(o), 5, i)
+								table.remove(res, i)
+							end
+						end
+						resPNL:Remove()
+					else
+							
+						num1 = amount - 5
+						num2 = 5 + num1
+						amount = 0
+						
+								
+						for i,o in pairs(res) do
+							if (getResName(v) == getResName(o)) then
+								giveRes(getResName(o), num2, i)
+								table.remove(res,i)
+							end
+						end
+								
+						resPNL:Remove()
+					end
+					
+				else
+					
+					amount = amount - 5
+							
+							
+					for i,o in pairs(res) do
+						if (getResName(v) == getResName(o)) then
+							giveRes(getResName(o), 5, i)
+							res[i] = getResName(o) .. " x" .. amount
+							v = res[i]
+						end
+					end
+					
+				end
+				
+			end)
+			mb:AddOption("Take x10", function()
+		
+				if (amount - 10 <= 0) then
+					
+					if (amount - 10 == 0) then
+						amount = 0
+						for i,o in pairs(res) do
+							if (getResName(v) == getResName(o)) then
+								giveRes(getResName(o), 10, i)
+								table.remove(res, i)
+							end
+						end
+						resPNL:Remove()
+					else
+							
+						num1 = amount - 10
+						num2 = 10 + num1
+						amount = 0
+						
+								
+						for i,o in pairs(res) do
+							if (getResName(v) == getResName(o)) then
+								giveRes(getResName(o), num2, i)
+								table.remove(res,i)
+							end
+						end
+								
+						resPNL:Remove()
+					end
+					
+				else
+					
+					amount = amount - 10
+							
+							
+					for i,o in pairs(res) do
+						if (getResName(v) == getResName(o)) then
+							giveRes(getResName(o), 10, i)
+							res[i] = getResName(o) .. " x" .. amount
+							v = res[i]
+						end
+					end
+					
+				end
+				
+			end)
+			mb:AddOption("Take All", function()
+		
+				for i,o in pairs(res) do
+				    if (getResName(v) == getResName(o)) then
+						giveRes(getResName(o), amount, i)
+						table.remove(res, i)
+					end
+				end
+				amount = 0
+				resPNL:Remove()
+				
+			end)
+			
+			mb:Open()
 			
-			addMenuButton(mb, resPNL, "Take x1", amount, 1, v)
-			addMenuButton(mb, resPNL, "Take x5", amount, 5, v)
-			addMenuButton(mb, resPNL, "Take x10", amount, 10, v)
-			addMenuButton(mb, resPNL, "Take All", amount, amount, v)
 			
 			
-			mb:Open()
 		end
 		
 		resPNL.Paint = function()
 			draw.RoundedBox( 0, 0, 0, resPNL:GetWide(), resPNL:GetTall(), Color( 69, 69, 69, 125 ) )
 			
-			
 			surface.SetFont("Items")
 			surface.SetTextColor( 0,0,0 )
 			surface.SetTextPos( (width/2)-(surface.GetTextSize(v)/2), height-20 )
@@ -205,54 +352,6 @@ function getResName(str)
 	return string.Implode(" ", spl)
 end
 
-function addMenuButton(mb, resPNL, name, amount, remove, v)
-	mb:AddOption(name, function()
-		
-		if (amount - remove <= 0) then
-			
-			if (amount - remove == 0) then
-				amount = 0
-				for i,o in pairs(res) do
-					if (getResName(v) == getResName(o)) then
-						giveRes(getResName(o), remove, i)
-						table.remove(res, i)
-					end
-				end
-				resPNL:Remove()
-			else
-					
-				num1 = amount - remove
-				num2 = remove + num1
-				amount = 0
-				
-						
-				for i,o in pairs(res) do
-					if (getResName(v) == getResName(o)) then
-						giveRes(getResName(o), num2, i)
-						table.remove(res,i)
-					end
-				end
-						
-				resPNL:Remove()
-			end
-			
-		else
-			
-			amount = amount - remove
-					
-					
-			for i,o in pairs(res) do
-				if (getResName(v) == getResName(o)) then
-					giveRes(getResName(o), remove, i)
-					res[i] = getResName(o) .. " x" .. amount
-					v = res[i]
-				end
-			end
-			
-		end
-		
-	end)
-end
 
 function PANEL:Close()
 	active = 0