diff options
| author | Scott <scotth0828@gmail.com> | 2016-05-05 22:42:51 -0400 |
|---|---|---|
| committer | Scott <scotth0828@gmail.com> | 2016-05-05 22:42:51 -0400 |
| commit | 26f185f8f83667cb2a2d4dc45559ac91d0fcd36c (patch) | |
| tree | 932930fa8fa19dfc536875963a0cfba4feae28fe | |
| parent | 7fbe965805c7e54468c299d157e1d28c911e2579 (diff) | |
| download | gmstranded-26f185f8f83667cb2a2d4dc45559ac91d0fcd36c.tar.gz gmstranded-26f185f8f83667cb2a2d4dc45559ac91d0fcd36c.tar.bz2 gmstranded-26f185f8f83667cb2a2d4dc45559ac91d0fcd36c.zip | |
Added medicine as a resource and added images to combinations menu
| -rw-r--r-- | content/materials/items/medicine.png | bin | 0 -> 702 bytes | |||
| -rw-r--r-- | gamemode/client/cl_inventory.lua | 8 | ||||
| -rw-r--r-- | gamemode/craftablesystem/playermade/medicine.lua | 1 | ||||
| -rw-r--r-- | gamemode/itemsystem/items/medicine.lua | 19 |
4 files changed, 24 insertions, 4 deletions
diff --git a/content/materials/items/medicine.png b/content/materials/items/medicine.png Binary files differnew file mode 100644 index 0000000..c73c646 --- /dev/null +++ b/content/materials/items/medicine.png diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index 076dd2a..d3d10be 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -418,14 +418,14 @@ function PANEL:Init() surface.SetFont( "ButtonText" ) surface.SetTextColor( 255,255,255 ) - surface.SetTextPos( (slot:GetWide()/2) - ( surface.GetTextSize(k)/2 ), (slot:GetTall()/2) + (select( 2, surface.GetTextSize( k ) )/2) ) + surface.SetTextPos( (slot:GetWide()/2) - ( surface.GetTextSize(k)/2 ), (slot:GetTall()/2) + (select( 2, surface.GetTextSize( k ) )-5) ) surface.DrawText( v.Name ) end local img = vgui.Create("DImage", slot) - img:SetPos(0, 0) - img:SetSize(slot:GetWide(), slot:GetTall()-20) - img:SetImage("gms_icons/gms_weapon.png") + img:SetPos(20, 10) + img:SetSize(slot:GetWide()-40, slot:GetTall()-40) + if (v.Icon != nil) then img:SetImage(v.Icon) else img:SetImage("vgui/avatar_default") end i=i+1 diff --git a/gamemode/craftablesystem/playermade/medicine.lua b/gamemode/craftablesystem/playermade/medicine.lua index 223cc1c..998c1a2 100644 --- a/gamemode/craftablesystem/playermade/medicine.lua +++ b/gamemode/craftablesystem/playermade/medicine.lua @@ -2,6 +2,7 @@ local COMBI = {} COMBI.Name = "Medicine" COMBI.Description = "To restore your health." +COMBI.Icon = "items/medicine.png" COMBI.Req = {} COMBI.Req["Herbs"] = 7 diff --git a/gamemode/itemsystem/items/medicine.lua b/gamemode/itemsystem/items/medicine.lua new file mode 100644 index 0000000..7b178f8 --- /dev/null +++ b/gamemode/itemsystem/items/medicine.lua @@ -0,0 +1,19 @@ + +ITEM = {} + +ITEM.Name = "Medicine" +ITEM.Description = "Heals you!" +ITEM.Icon = "items/medicine.png" +ITEM.UniqueData = false + +local use_medicine = function(ln, player) + + LocalPlayer():ConCommand( "gms_takemedicine" ) + +end + +ITEM.Actions = {} +genericMakeDroppable(ITEM) +ITEM.Actions["Use"] = use_medicine + +GMS.RegisterResource(ITEM)
\ No newline at end of file |
