diff options
| -rw-r--r-- | gamemode/client/cl_inventory.lua | 33 | ||||
| -rw-r--r-- | gamemode/itemsystem/items/deaddroppable.lua | 20 | ||||
| -rw-r--r-- | gamemode/itemsystem/items/waterbottle.lua | 2 |
3 files changed, 20 insertions, 35 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index 0bab5fe..d3bdd52 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -262,8 +262,8 @@ function PANEL:Init() end local img = vgui.Create("DImage", slot) - img:SetPos(0, 0) - img:SetSize(slot:GetWide(), slot:GetTall()) + img:SetPos(20, 10) + img:SetSize(slot:GetWide()-40, slot:GetTall()-40) if(GMS.Resources[k] == nil) then --This resource is not registered! img:SetImage("vgui/avatar_default") @@ -513,17 +513,9 @@ function PANEL:Init() draw.RoundedBox( 4, 0, 0, self:GetWide(), self:GetTall(), Color( 75, 75, 75 ) ) end - self.Encapsulate = vgui.Create("DScrollPanel",self) - self.Encapsulate:SetSize((dPanelWidth/3)*2,dPanelHeight) - --self.Encapsulate:SetSize(200,200) - self.Encapsulate:SetPos(dPanelWidth/3,0) - --self.Encapsulate:EnableVerticalScrollbar(true) - - self.ControlPanel = vgui.Create("DForm") - self.ControlPanel:SetSize(((dPanelWidth*2)/3)-15,500) - --self.ControlPanel:SetPos(dPanelWidth/3,0) - --self.ControlPanel:Dock(FILL) - self.Encapsulate:AddItem(self.ControlPanel) + self.ControlPanel = vgui.Create("DForm",self) + self.ControlPanel:SetSize((dPanelWidth*2)/3,dPanelWidth) + self.ControlPanel:SetPos(dPanelWidth/3,0) self.PanelProxy = {} self.PanelProxy.cp = self.ControlPanel @@ -565,7 +557,6 @@ function PANEL:Init() elseif(type == "Color") then local color = vgui.Create( "DRGBPicker" ) local color_cube = vgui.Create( "DColorCube" ) - color_cube:SetSize(200,200) local colorvars = {} local curcolor = {} for k,v in pairs({"Red","Green","Blue"}) do @@ -602,17 +593,13 @@ function PANEL:Init() self.cp:AddItem(DComboBox) elseif(type == "PropSelect") then local grid = vgui.Create( "DGrid" ) - grid:SetSize(256,64) - grid:SetPos( 0, 0 ) - grid:SetCols( 3 ) - grid:SetColWide( 128 ) - grid:SetRowHeight(64) + grid:SetPos( 10, 30 ) + grid:SetCols( 5 ) + grid:SetColWide( 36 ) for k,v in pairs(table.Models) do local icon = vgui.Create( "DModelPanel", Panel ) - icon:SetSize( 64, 64 ) + icon:SetSize( 32, 32 ) icon:SetModel( k ) - icon:SetCamPos( Vector( 15,15,15 ) ) - icon:SetLookAt( Vector( 0, 0, 1 ) ) icon.DoClick = function() GetConVar(table.ConVar):SetString(k) end @@ -664,8 +651,6 @@ function PANEL:Init() button.DoClick = function() --print("Before calling function, PanelProxy is:") --PrintTable(self.PanelProxy) - --self.Encapsulate:SetExpanded(false) - --self.Encapsulate:SetExpanded(true) LocalPlayer():ConCommand(btable.Command) local cp = controlpanel.Get(btable.Text) if ( !cp:GetInitialized() ) then diff --git a/gamemode/itemsystem/items/deaddroppable.lua b/gamemode/itemsystem/items/deaddroppable.lua index 64b6933..75c127f 100644 --- a/gamemode/itemsystem/items/deaddroppable.lua +++ b/gamemode/itemsystem/items/deaddroppable.lua @@ -2,7 +2,7 @@ --Try to keep this table in alphabetical order so if something needs changeing, you can find it local tbl = { - {"Adamantine Ore","Something you can craft with!","test.png"}, + {"Adamantine Ore","Something you can craft with!","items/adamantine_ore.png"}, {"Air Rune","This stone seems like it should be heavier.","test.png"}, {"Baits","Something you can use to fish with! (Consumed automatically)","test.png"}, {"Basic Rune","Something you can craft with!","test.png"}, @@ -10,7 +10,7 @@ local tbl = { {"Batteries","It holds a charge!","test.png"}, {"Cedar","You can identify that this is wood.","test.png"}, {"Charcoal","Bits of burnt wood.","test.png"}, - {"Copper Ore","Something you can craft with!","test.png"}, + {"Copper Ore","Something you can craft with!","items/copper_ore.png"}, {"Dough","Something you can craft with!","test.png"}, {"Dust","Ever wondered what would happen if sand got smaller?","test.png"}, {"Earth Rune","A stone that's heavier than it looks.","test.png"}, @@ -19,38 +19,38 @@ local tbl = { {"Flashlight","Lights up the dark!","test.png"}, {"Glass","Useful in construction!","test.png"}, {"Gold","You're Rich!","test.png"}, - {"Gold Ore","Something you can craft with!","test.png"}, + {"Gold Ore","Something you can craft with!","items/gold_ore.png"}, {"Gunpowder","Something you can craft with!","test.png"}, {"Herbs","Blech, vegtables...","test.png"}, {"Iron","Something you can craft with!","test.png"}, - {"Iron Ore","Something you can craft with!","test.png"}, + {"Iron Ore","Something you can craft with!","items/iron_ore.png"}, {"Mahogany","A rich dark color.","test.png"}, {"Maple","It's some nice wood, Eh?","test.png"}, {"Meat","Something you can craft with!","test.png"}, - {"Mithril Ore","Something you can craft with!","test.png"}, + {"Mithril Ore","Something you can craft with!","items/mithril_ore.png"}, {"Pickaxe Handle","Something you can craft with!","test.png"}, {"Pickaxe Head","Something you can craft with!","test.png"}, {"Plastic","Some solidified resin!","test.png"}, {"Platinum","Something you can craft with!","test.png"}, - {"Platinum Ore","Something you can craft with!","test.png"}, + {"Platinum Ore","Something you can craft with!","items/platinum_ore.png"}, {"Pure Mithril","Something you can craft with!","test.png"}, {"Resin","Something you can craft with!","test.png"}, {"Salmon","Something you can craft with!","test.png"}, {"Sand","How in the world are you holding this stuff?","test.png"}, {"Shark","Something you can craft with!","test.png"}, {"Silver","Something you can craft with!","test.png"}, - {"Silver Ore","Something you can craft with!","test.png"}, + {"Silver Ore","Something you can craft with!","items/silver_ore.png"}, {"Spices","Freshen up that stinking mutton!","test.png"}, {"Steel","Something you can craft with!","test.png"}, - {"Steel Ore","Something you can craft with!","test.png"}, + {"Steel Ore","Something you can craft with!","items/steel_ore.png"}, {"Stone","Something you can craft with!","test.png"}, {"Strange Stone","Something you can craft with!","test.png"}, {"Sulpher","Watch out, it's explosive!","test.png"}, {"Teak","You've got wood.","test.png"}, {"Tech","You're blinded by SCIENCE!","test.png"}, - {"Tech Ore","Something you can craft with!","test.png"}, + {"Tech Ore","Something you can craft with!","items/tech_ore.png"}, {"Trout","A flippy floppy fish!","test.png"}, - {"Urine Bottles","Something you can craft with!","test.png"}, + {"Urine Bottles","Something you can craft with!","items/urine.png"}, {"Water Rune","Whenever you touch it, your hand feels slightly damp.","test.png"}, {"Wood","Something you can craft with!","test.png"}, {"Wrist Watch","See the time wherever you go!","test.png"}, diff --git a/gamemode/itemsystem/items/waterbottle.lua b/gamemode/itemsystem/items/waterbottle.lua index 8375a54..8f0fca0 100644 --- a/gamemode/itemsystem/items/waterbottle.lua +++ b/gamemode/itemsystem/items/waterbottle.lua @@ -3,7 +3,7 @@ ITEM = {} ITEM.Name = "Water Bottles" ITEM.Description = "Something you can drink!" -ITEM.Icon = "test.png" +ITEM.Icon = "items/water_bottle.png" ITEM.UniqueData = false if(SERVER) then |