From 5d77d8475af7aff27eb026a4b56065387c024165 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Sat, 4 Nov 2017 22:42:24 -0400 Subject: Massive changes * New error messages for missing dependencies * Removed useless art_serverchanger entity * Added a sweet ascii logo * Added Skills * Minor fixes to cl_inventory tracker * Changed a few prints to use logging module --- gamemode/client/cl_inventory.lua | 20 ++++++++++++-------- gamemode/client/qtabs/cl_qprayers.lua | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'gamemode/client') diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index 4e2545d..df0f453 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -54,6 +54,7 @@ end) local function CreateSheetTree(tabs,dpropertysheet) print("Createing sheet tree!") PrintTable(tabs) + local observers = {} for k,v in pairs(tabs) do if type(k) == "string" then print("Makeing inventory ", k) @@ -64,7 +65,8 @@ local function CreateSheetTree(tabs,dpropertysheet) print("Makeing inventory number ", k) local tsheet = vgui.Create("DPanel") dpropertysheet:AddSheet(v.Name,tsheet,"icon16/user.png") - v:DrawOnDPanel(tsheet) + local prox = v:DrawOnDPanel(tsheet) + v:AddObserver(prox) else error("k was not a number or string, it was a " .. type(k)) end @@ -114,7 +116,8 @@ local function BuildInventory() initalsheet:Dock(FILL) CreateSheetTree(clt.known_inventories,initalsheet) - + print("After createing sheet tree, known inventories was") + PrintTable(clt.known_inventories) end function inv.ShowInventory() @@ -140,10 +143,7 @@ function inv.ShowInventory() end,{}) end - - -hook.Add("OnSpawnMenuOpen","ArteryOpenInventory",inv.ShowInventory) -hook.Add("OnSpawnMenuClose","ArteryCloseInventory",function() +function inv.HideInventory() droppanel:Remove() state.invopen = false qframe:Hide() @@ -155,14 +155,18 @@ hook.Add("OnSpawnMenuClose","ArteryCloseInventory",function() v.panel:Close() LocalPlayer().invdisplays[k] = nil end -end) +end + + +hook.Add("OnSpawnMenuOpen","ArteryOpenInventory",inv.ShowInventory) +hook.Add("OnSpawnMenuClose","ArteryCloseInventory",inv.HideInventory) concommand.Add("showinventory",inv.ShowInventory) local viewdistance = 100 local rotatespeed = 65 local bone = nil local previousheadscale = Vector(1,1,1) -local toggle_arteryview = true +local toggle_arteryview = false hook.Add("CalcView","ArteryInventoryView",function(ply,pos,ang,fov,nearz,farz) if not toggle_arteryview then return end if bone == nil then diff --git a/gamemode/client/qtabs/cl_qprayers.lua b/gamemode/client/qtabs/cl_qprayers.lua index 9f1b9ab..af2b29f 100644 --- a/gamemode/client/qtabs/cl_qprayers.lua +++ b/gamemode/client/qtabs/cl_qprayers.lua @@ -1,4 +1,4 @@ - +do return end local p = {} function p.CreatePrayerSheet(dpanel_parent) -- cgit v1.2.3-70-g09d2