From f589757485e72ece0fc5e08f3e9bc63cac7605b4 Mon Sep 17 00:00:00 2001 From: Scott Date: Sat, 7 May 2016 19:39:48 -0400 Subject: Images added to gravestone and combinations menu now gets images from resources --- gamemode/cl_deathmenu.lua | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'gamemode/cl_deathmenu.lua') diff --git a/gamemode/cl_deathmenu.lua b/gamemode/cl_deathmenu.lua index 0a3474b..259f48b 100644 --- a/gamemode/cl_deathmenu.lua +++ b/gamemode/cl_deathmenu.lua @@ -46,13 +46,6 @@ local function receive_message(len) res = net.ReadTable() wep = net.ReadTable() -for k,v in pairs(wep) do - print("death weapon: "..k.." : "..v) - end - for k,v in pairs(res) do - print("death resource: "..k.." : "..v) - end - if (active == 0) then dmFrame = vgui.Create("dmFrame") active = 1 end end @@ -139,7 +132,7 @@ function PANEL:Init() local img = vgui.Create("DImage", wepPNL) img:SetPos(0, 0) img:SetSize(wepPNL:GetSize()) - img:SetImage("gms_icons/gms_weapon.png") + img:SetImage("items/gms_weapon.png") end @@ -159,6 +152,7 @@ function PANEL:Init() for k,v in pairs(res) do local resPNL = vgui.Create( "DButton", DScrollPanel ) resPNL:SetSize( width, height ) + resPNL:SetText("") if (k/4 <= column2) then resPNL:SetPos( (row2-1)*(width+2) + XOffset,(column2-1)*(height+2) + (column*height + 50)) row2=row2+1 @@ -198,9 +192,9 @@ function PANEL:Init() end local img = vgui.Create("DImage", resPNL) - img:SetPos(0, 0) - img:SetSize(resPNL:GetSize()) - img:SetImage("gms_icons/gms_resourcepack.png") + img:SetPos(20, 10) + img:SetSize(resPNL:GetWide()-40, resPNL:GetTall()-40) + if (GMS.GetResourceByName(getResName(v)).Icon != nil) then img:SetImage(GMS.GetResourceByName(getResName(v)).Icon) else img:SetImage("vgui/avatar_default") end end end -- cgit v1.2.3-70-g09d2 From 99faf35965c51e9b5340ffaaab102718a875d7d8 Mon Sep 17 00:00:00 2001 From: Scott Date: Sat, 7 May 2016 20:30:10 -0400 Subject: Changes --- gamemode/cl_deathmenu.lua | 207 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 153 insertions(+), 54 deletions(-) (limited to 'gamemode/cl_deathmenu.lua') 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 -- cgit v1.2.3-70-g09d2