diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2018-11-03 18:23:45 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2018-11-03 18:23:45 -0400 |
| commit | 28affa22541b9ef251707793f6b1c1a26d663592 (patch) | |
| tree | 622754894d75c74dc5e8516ccf184ad4bf328fef /gamemode/inventorysystem | |
| parent | c639e7c7c6ab1595fdce39f56312e3d6a886bbe8 (diff) | |
| download | artery-28affa22541b9ef251707793f6b1c1a26d663592.tar.gz artery-28affa22541b9ef251707793f6b1c1a26d663592.tar.bz2 artery-28affa22541b9ef251707793f6b1c1a26d663592.zip | |
Started on new npc system
Started work on the new npc system
Diffstat (limited to 'gamemode/inventorysystem')
| -rw-r--r-- | gamemode/inventorysystem/abilities/cl_abilities.lua (renamed from gamemode/inventorysystem/prayers/cl_prayers.lua) | 0 | ||||
| -rw-r--r-- | gamemode/inventorysystem/abilities/sh_abilities.lua (renamed from gamemode/inventorysystem/prayers/sh_prayers.lua) | 2 | ||||
| -rw-r--r-- | gamemode/inventorysystem/cl_common.lua | 1 | ||||
| -rw-r--r-- | gamemode/inventorysystem/skills/cl_skills.lua | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/gamemode/inventorysystem/prayers/cl_prayers.lua b/gamemode/inventorysystem/abilities/cl_abilities.lua index e28db63..e28db63 100644 --- a/gamemode/inventorysystem/prayers/cl_prayers.lua +++ b/gamemode/inventorysystem/abilities/cl_abilities.lua diff --git a/gamemode/inventorysystem/prayers/sh_prayers.lua b/gamemode/inventorysystem/abilities/sh_abilities.lua index 9d8ff3b..fc6cd82 100644 --- a/gamemode/inventorysystem/prayers/sh_prayers.lua +++ b/gamemode/inventorysystem/abilities/sh_abilities.lua @@ -11,7 +11,7 @@ if CLIENT then inv = nrequire("cl_prayers.lua") end -inv.Name = "Prayers" +inv.Name = "Abilities" inv.track = {} function inv:FindPlaceFor(item) if item.Pray ~= nil then diff --git a/gamemode/inventorysystem/cl_common.lua b/gamemode/inventorysystem/cl_common.lua index bf9fb6f..a83deb1 100644 --- a/gamemode/inventorysystem/cl_common.lua +++ b/gamemode/inventorysystem/cl_common.lua @@ -63,6 +63,7 @@ function com.generatereceiver() if posequal then return end local item = frominv:Get(frompos) + if not item then return end --Fake remove the item, in case the position we want to move it to overlaps with where it is now. frominv:Remove(frompos) local cf = toinv:CanFitIn(topos,item) diff --git a/gamemode/inventorysystem/skills/cl_skills.lua b/gamemode/inventorysystem/skills/cl_skills.lua index b5e4620..208cc73 100644 --- a/gamemode/inventorysystem/skills/cl_skills.lua +++ b/gamemode/inventorysystem/skills/cl_skills.lua @@ -24,6 +24,7 @@ inv.DrawOnDPanel = function(self,panel) local label = vgui.Create("DLabel",ipanel) label:Dock(TOP) label:SetDark(true) + label:SetWrap(true) local bar = vgui.Create("DProgress",ipanel) bar:Dock(TOP) elements[j] = { |