From 6074bf4450a35ff60fb68d104db8aba58d8c4de9 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Fri, 6 May 2016 17:49:37 -0400 Subject: Added all gun chunk icons --- .../items/weaponparts/Copper_Gunbarrel.png | Bin 0 -> 502 bytes .../materials/items/weaponparts/Copper_Gungrip.png | Bin 0 -> 597 bytes .../items/weaponparts/Copper_Gunmagazine.png | Bin 0 -> 456 bytes .../items/weaponparts/Copper_Gunslide.png | Bin 0 -> 3278 bytes .../items/weaponparts/Copper_Reflex_Scope.png | Bin 0 -> 413 bytes .../items/weaponparts/Copper_Weapon_Scope.png | Bin 0 -> 476 bytes .../materials/items/weaponparts/Gold_Gunbarrel.png | Bin 0 -> 481 bytes .../materials/items/weaponparts/Gold_Gungrip.png | Bin 0 -> 579 bytes .../items/weaponparts/Gold_Gunmagazine.png | Bin 0 -> 445 bytes .../materials/items/weaponparts/Gold_Gunslide.png | Bin 0 -> 2955 bytes .../items/weaponparts/Gold_Reflex_Scope.png | Bin 0 -> 398 bytes .../items/weaponparts/Gold_Weapon_Scope.png | Bin 0 -> 473 bytes .../materials/items/weaponparts/Iron_Gunbarrel.png | Bin 0 -> 472 bytes .../materials/items/weaponparts/Iron_Gungrip.png | Bin 0 -> 578 bytes .../items/weaponparts/Iron_Gunmagazine.png | Bin 0 -> 435 bytes .../materials/items/weaponparts/Iron_Gunslide.png | Bin 0 -> 2937 bytes .../items/weaponparts/Iron_Reflex_Scope.png | Bin 0 -> 422 bytes .../items/weaponparts/Iron_Weapon_Scope.png | Bin 0 -> 476 bytes .../items/weaponparts/Platinum_Gunbarrel.png | Bin 0 -> 503 bytes .../items/weaponparts/Platinum_Gungrip.png | Bin 0 -> 609 bytes .../items/weaponparts/Platinum_Gunmagazine.png | Bin 0 -> 450 bytes .../items/weaponparts/Platinum_Gunslide.png | Bin 0 -> 3375 bytes .../items/weaponparts/Platinum_Reflex_Scope.png | Bin 0 -> 449 bytes .../items/weaponparts/Platinum_Weapon_Scope.png | Bin 0 -> 492 bytes .../items/weaponparts/Silver_Gunbarrel.png | Bin 0 -> 416 bytes .../materials/items/weaponparts/Silver_Gungrip.png | Bin 0 -> 580 bytes .../items/weaponparts/Silver_Gunmagazine.png | Bin 0 -> 421 bytes .../items/weaponparts/Silver_Gunslide.png | Bin 0 -> 1904 bytes .../items/weaponparts/Silver_Reflex_Scope.png | Bin 0 -> 372 bytes .../items/weaponparts/Silver_Weapon_Scope.png | Bin 0 -> 429 bytes .../items/weaponparts/Steel_Gunbarrel.png | Bin 0 -> 493 bytes .../materials/items/weaponparts/Steel_Gungrip.png | Bin 0 -> 580 bytes .../items/weaponparts/Steel_Gunmagazine.png | Bin 0 -> 430 bytes .../materials/items/weaponparts/Steel_Gunslide.png | Bin 0 -> 3458 bytes .../items/weaponparts/Steel_Reflex_Scope.png | Bin 0 -> 419 bytes .../items/weaponparts/Steel_Weapon_Scope.png | Bin 0 -> 456 bytes .../materials/items/weaponparts/Tech_Gunbarrel.png | Bin 0 -> 1479 bytes .../materials/items/weaponparts/Tech_Gungrip.png | Bin 0 -> 1793 bytes .../items/weaponparts/Tech_Gunmagazine.png | Bin 0 -> 1166 bytes .../materials/items/weaponparts/Tech_Gunslide.png | Bin 0 -> 3630 bytes .../items/weaponparts/Tech_Reflex_Scope.png | Bin 0 -> 812 bytes .../items/weaponparts/Tech_Weapon_Scope.png | Bin 0 -> 1123 bytes entities/entities/gms_bed.lua | 9 ++++---- entities/entities/gms_campfire.lua | 23 --------------------- gamemode/itemsystem/items/gunchunks.lua | 19 ++++++++++------- 45 files changed, 16 insertions(+), 35 deletions(-) create mode 100644 content/materials/items/weaponparts/Copper_Gunbarrel.png create mode 100644 content/materials/items/weaponparts/Copper_Gungrip.png create mode 100644 content/materials/items/weaponparts/Copper_Gunmagazine.png create mode 100644 content/materials/items/weaponparts/Copper_Gunslide.png create mode 100644 content/materials/items/weaponparts/Copper_Reflex_Scope.png create mode 100644 content/materials/items/weaponparts/Copper_Weapon_Scope.png create mode 100644 content/materials/items/weaponparts/Gold_Gunbarrel.png create mode 100644 content/materials/items/weaponparts/Gold_Gungrip.png create mode 100644 content/materials/items/weaponparts/Gold_Gunmagazine.png create mode 100644 content/materials/items/weaponparts/Gold_Gunslide.png create mode 100644 content/materials/items/weaponparts/Gold_Reflex_Scope.png create mode 100644 content/materials/items/weaponparts/Gold_Weapon_Scope.png create mode 100644 content/materials/items/weaponparts/Iron_Gunbarrel.png create mode 100644 content/materials/items/weaponparts/Iron_Gungrip.png create mode 100644 content/materials/items/weaponparts/Iron_Gunmagazine.png create mode 100644 content/materials/items/weaponparts/Iron_Gunslide.png create mode 100644 content/materials/items/weaponparts/Iron_Reflex_Scope.png create mode 100644 content/materials/items/weaponparts/Iron_Weapon_Scope.png create mode 100644 content/materials/items/weaponparts/Platinum_Gunbarrel.png create mode 100644 content/materials/items/weaponparts/Platinum_Gungrip.png create mode 100644 content/materials/items/weaponparts/Platinum_Gunmagazine.png create mode 100644 content/materials/items/weaponparts/Platinum_Gunslide.png create mode 100644 content/materials/items/weaponparts/Platinum_Reflex_Scope.png create mode 100644 content/materials/items/weaponparts/Platinum_Weapon_Scope.png create mode 100644 content/materials/items/weaponparts/Silver_Gunbarrel.png create mode 100644 content/materials/items/weaponparts/Silver_Gungrip.png create mode 100644 content/materials/items/weaponparts/Silver_Gunmagazine.png create mode 100644 content/materials/items/weaponparts/Silver_Gunslide.png create mode 100644 content/materials/items/weaponparts/Silver_Reflex_Scope.png create mode 100644 content/materials/items/weaponparts/Silver_Weapon_Scope.png create mode 100644 content/materials/items/weaponparts/Steel_Gunbarrel.png create mode 100644 content/materials/items/weaponparts/Steel_Gungrip.png create mode 100644 content/materials/items/weaponparts/Steel_Gunmagazine.png create mode 100644 content/materials/items/weaponparts/Steel_Gunslide.png create mode 100644 content/materials/items/weaponparts/Steel_Reflex_Scope.png create mode 100644 content/materials/items/weaponparts/Steel_Weapon_Scope.png create mode 100644 content/materials/items/weaponparts/Tech_Gunbarrel.png create mode 100644 content/materials/items/weaponparts/Tech_Gungrip.png create mode 100644 content/materials/items/weaponparts/Tech_Gunmagazine.png create mode 100644 content/materials/items/weaponparts/Tech_Gunslide.png create mode 100644 content/materials/items/weaponparts/Tech_Reflex_Scope.png create mode 100644 content/materials/items/weaponparts/Tech_Weapon_Scope.png diff --git a/content/materials/items/weaponparts/Copper_Gunbarrel.png b/content/materials/items/weaponparts/Copper_Gunbarrel.png new file mode 100644 index 0000000..86dc923 Binary files /dev/null and b/content/materials/items/weaponparts/Copper_Gunbarrel.png differ diff --git a/content/materials/items/weaponparts/Copper_Gungrip.png b/content/materials/items/weaponparts/Copper_Gungrip.png new file mode 100644 index 0000000..7819c01 Binary files /dev/null and b/content/materials/items/weaponparts/Copper_Gungrip.png differ diff --git a/content/materials/items/weaponparts/Copper_Gunmagazine.png b/content/materials/items/weaponparts/Copper_Gunmagazine.png new file mode 100644 index 0000000..3740830 Binary files /dev/null and b/content/materials/items/weaponparts/Copper_Gunmagazine.png differ diff --git a/content/materials/items/weaponparts/Copper_Gunslide.png b/content/materials/items/weaponparts/Copper_Gunslide.png new file mode 100644 index 0000000..766c57a Binary files /dev/null and b/content/materials/items/weaponparts/Copper_Gunslide.png differ diff --git a/content/materials/items/weaponparts/Copper_Reflex_Scope.png b/content/materials/items/weaponparts/Copper_Reflex_Scope.png new file mode 100644 index 0000000..fa90f4d Binary files /dev/null and b/content/materials/items/weaponparts/Copper_Reflex_Scope.png differ diff --git a/content/materials/items/weaponparts/Copper_Weapon_Scope.png b/content/materials/items/weaponparts/Copper_Weapon_Scope.png new file mode 100644 index 0000000..eae7e55 Binary files /dev/null and b/content/materials/items/weaponparts/Copper_Weapon_Scope.png differ diff --git a/content/materials/items/weaponparts/Gold_Gunbarrel.png b/content/materials/items/weaponparts/Gold_Gunbarrel.png new file mode 100644 index 0000000..3b9075b Binary files /dev/null and b/content/materials/items/weaponparts/Gold_Gunbarrel.png differ diff --git a/content/materials/items/weaponparts/Gold_Gungrip.png b/content/materials/items/weaponparts/Gold_Gungrip.png new file mode 100644 index 0000000..8c68730 Binary files /dev/null and b/content/materials/items/weaponparts/Gold_Gungrip.png differ diff --git a/content/materials/items/weaponparts/Gold_Gunmagazine.png b/content/materials/items/weaponparts/Gold_Gunmagazine.png new file mode 100644 index 0000000..0d26279 Binary files /dev/null and b/content/materials/items/weaponparts/Gold_Gunmagazine.png differ diff --git a/content/materials/items/weaponparts/Gold_Gunslide.png b/content/materials/items/weaponparts/Gold_Gunslide.png new file mode 100644 index 0000000..2ada887 Binary files /dev/null and b/content/materials/items/weaponparts/Gold_Gunslide.png differ diff --git a/content/materials/items/weaponparts/Gold_Reflex_Scope.png b/content/materials/items/weaponparts/Gold_Reflex_Scope.png new file mode 100644 index 0000000..25e7114 Binary files /dev/null and b/content/materials/items/weaponparts/Gold_Reflex_Scope.png differ diff --git a/content/materials/items/weaponparts/Gold_Weapon_Scope.png b/content/materials/items/weaponparts/Gold_Weapon_Scope.png new file mode 100644 index 0000000..7bf2f3d Binary files /dev/null and b/content/materials/items/weaponparts/Gold_Weapon_Scope.png differ diff --git a/content/materials/items/weaponparts/Iron_Gunbarrel.png b/content/materials/items/weaponparts/Iron_Gunbarrel.png new file mode 100644 index 0000000..aa8cf6a Binary files /dev/null and b/content/materials/items/weaponparts/Iron_Gunbarrel.png differ diff --git a/content/materials/items/weaponparts/Iron_Gungrip.png b/content/materials/items/weaponparts/Iron_Gungrip.png new file mode 100644 index 0000000..7c97a18 Binary files /dev/null and b/content/materials/items/weaponparts/Iron_Gungrip.png differ diff --git a/content/materials/items/weaponparts/Iron_Gunmagazine.png b/content/materials/items/weaponparts/Iron_Gunmagazine.png new file mode 100644 index 0000000..3923658 Binary files /dev/null and b/content/materials/items/weaponparts/Iron_Gunmagazine.png differ diff --git a/content/materials/items/weaponparts/Iron_Gunslide.png b/content/materials/items/weaponparts/Iron_Gunslide.png new file mode 100644 index 0000000..4a8c040 Binary files /dev/null and b/content/materials/items/weaponparts/Iron_Gunslide.png differ diff --git a/content/materials/items/weaponparts/Iron_Reflex_Scope.png b/content/materials/items/weaponparts/Iron_Reflex_Scope.png new file mode 100644 index 0000000..64522c6 Binary files /dev/null and b/content/materials/items/weaponparts/Iron_Reflex_Scope.png differ diff --git a/content/materials/items/weaponparts/Iron_Weapon_Scope.png b/content/materials/items/weaponparts/Iron_Weapon_Scope.png new file mode 100644 index 0000000..cb2702c Binary files /dev/null and b/content/materials/items/weaponparts/Iron_Weapon_Scope.png differ diff --git a/content/materials/items/weaponparts/Platinum_Gunbarrel.png b/content/materials/items/weaponparts/Platinum_Gunbarrel.png new file mode 100644 index 0000000..55acc5f Binary files /dev/null and b/content/materials/items/weaponparts/Platinum_Gunbarrel.png differ diff --git a/content/materials/items/weaponparts/Platinum_Gungrip.png b/content/materials/items/weaponparts/Platinum_Gungrip.png new file mode 100644 index 0000000..6760351 Binary files /dev/null and b/content/materials/items/weaponparts/Platinum_Gungrip.png differ diff --git a/content/materials/items/weaponparts/Platinum_Gunmagazine.png b/content/materials/items/weaponparts/Platinum_Gunmagazine.png new file mode 100644 index 0000000..49eb5aa Binary files /dev/null and b/content/materials/items/weaponparts/Platinum_Gunmagazine.png differ diff --git a/content/materials/items/weaponparts/Platinum_Gunslide.png b/content/materials/items/weaponparts/Platinum_Gunslide.png new file mode 100644 index 0000000..052653e Binary files /dev/null and b/content/materials/items/weaponparts/Platinum_Gunslide.png differ diff --git a/content/materials/items/weaponparts/Platinum_Reflex_Scope.png b/content/materials/items/weaponparts/Platinum_Reflex_Scope.png new file mode 100644 index 0000000..76ba3fb Binary files /dev/null and b/content/materials/items/weaponparts/Platinum_Reflex_Scope.png differ diff --git a/content/materials/items/weaponparts/Platinum_Weapon_Scope.png b/content/materials/items/weaponparts/Platinum_Weapon_Scope.png new file mode 100644 index 0000000..007233d Binary files /dev/null and b/content/materials/items/weaponparts/Platinum_Weapon_Scope.png differ diff --git a/content/materials/items/weaponparts/Silver_Gunbarrel.png b/content/materials/items/weaponparts/Silver_Gunbarrel.png new file mode 100644 index 0000000..182a0af Binary files /dev/null and b/content/materials/items/weaponparts/Silver_Gunbarrel.png differ diff --git a/content/materials/items/weaponparts/Silver_Gungrip.png b/content/materials/items/weaponparts/Silver_Gungrip.png new file mode 100644 index 0000000..186e88f Binary files /dev/null and b/content/materials/items/weaponparts/Silver_Gungrip.png differ diff --git a/content/materials/items/weaponparts/Silver_Gunmagazine.png b/content/materials/items/weaponparts/Silver_Gunmagazine.png new file mode 100644 index 0000000..c85ef4c Binary files /dev/null and b/content/materials/items/weaponparts/Silver_Gunmagazine.png differ diff --git a/content/materials/items/weaponparts/Silver_Gunslide.png b/content/materials/items/weaponparts/Silver_Gunslide.png new file mode 100644 index 0000000..26837f9 Binary files /dev/null and b/content/materials/items/weaponparts/Silver_Gunslide.png differ diff --git a/content/materials/items/weaponparts/Silver_Reflex_Scope.png b/content/materials/items/weaponparts/Silver_Reflex_Scope.png new file mode 100644 index 0000000..e06070f Binary files /dev/null and b/content/materials/items/weaponparts/Silver_Reflex_Scope.png differ diff --git a/content/materials/items/weaponparts/Silver_Weapon_Scope.png b/content/materials/items/weaponparts/Silver_Weapon_Scope.png new file mode 100644 index 0000000..05ac0a3 Binary files /dev/null and b/content/materials/items/weaponparts/Silver_Weapon_Scope.png differ diff --git a/content/materials/items/weaponparts/Steel_Gunbarrel.png b/content/materials/items/weaponparts/Steel_Gunbarrel.png new file mode 100644 index 0000000..6ab61f1 Binary files /dev/null and b/content/materials/items/weaponparts/Steel_Gunbarrel.png differ diff --git a/content/materials/items/weaponparts/Steel_Gungrip.png b/content/materials/items/weaponparts/Steel_Gungrip.png new file mode 100644 index 0000000..807da49 Binary files /dev/null and b/content/materials/items/weaponparts/Steel_Gungrip.png differ diff --git a/content/materials/items/weaponparts/Steel_Gunmagazine.png b/content/materials/items/weaponparts/Steel_Gunmagazine.png new file mode 100644 index 0000000..2456250 Binary files /dev/null and b/content/materials/items/weaponparts/Steel_Gunmagazine.png differ diff --git a/content/materials/items/weaponparts/Steel_Gunslide.png b/content/materials/items/weaponparts/Steel_Gunslide.png new file mode 100644 index 0000000..9999ad3 Binary files /dev/null and b/content/materials/items/weaponparts/Steel_Gunslide.png differ diff --git a/content/materials/items/weaponparts/Steel_Reflex_Scope.png b/content/materials/items/weaponparts/Steel_Reflex_Scope.png new file mode 100644 index 0000000..5114d83 Binary files /dev/null and b/content/materials/items/weaponparts/Steel_Reflex_Scope.png differ diff --git a/content/materials/items/weaponparts/Steel_Weapon_Scope.png b/content/materials/items/weaponparts/Steel_Weapon_Scope.png new file mode 100644 index 0000000..6fcd5c1 Binary files /dev/null and b/content/materials/items/weaponparts/Steel_Weapon_Scope.png differ diff --git a/content/materials/items/weaponparts/Tech_Gunbarrel.png b/content/materials/items/weaponparts/Tech_Gunbarrel.png new file mode 100644 index 0000000..52f2173 Binary files /dev/null and b/content/materials/items/weaponparts/Tech_Gunbarrel.png differ diff --git a/content/materials/items/weaponparts/Tech_Gungrip.png b/content/materials/items/weaponparts/Tech_Gungrip.png new file mode 100644 index 0000000..02f9db7 Binary files /dev/null and b/content/materials/items/weaponparts/Tech_Gungrip.png differ diff --git a/content/materials/items/weaponparts/Tech_Gunmagazine.png b/content/materials/items/weaponparts/Tech_Gunmagazine.png new file mode 100644 index 0000000..c8ef050 Binary files /dev/null and b/content/materials/items/weaponparts/Tech_Gunmagazine.png differ diff --git a/content/materials/items/weaponparts/Tech_Gunslide.png b/content/materials/items/weaponparts/Tech_Gunslide.png new file mode 100644 index 0000000..4c3a8a3 Binary files /dev/null and b/content/materials/items/weaponparts/Tech_Gunslide.png differ diff --git a/content/materials/items/weaponparts/Tech_Reflex_Scope.png b/content/materials/items/weaponparts/Tech_Reflex_Scope.png new file mode 100644 index 0000000..486eb24 Binary files /dev/null and b/content/materials/items/weaponparts/Tech_Reflex_Scope.png differ diff --git a/content/materials/items/weaponparts/Tech_Weapon_Scope.png b/content/materials/items/weaponparts/Tech_Weapon_Scope.png new file mode 100644 index 0000000..fb49725 Binary files /dev/null and b/content/materials/items/weaponparts/Tech_Weapon_Scope.png differ diff --git a/entities/entities/gms_bed.lua b/entities/entities/gms_bed.lua index 7b7a87b..21723e7 100644 --- a/entities/entities/gms_bed.lua +++ b/entities/entities/gms_bed.lua @@ -1,7 +1,3 @@ ---[[ -A useful command for createing structures. -lua_run for k,v in pairs(ents.GetAll()) do if(v:GetClass() == "prop_physics") then print(v:GetModel()) print(v:GetPos()) print(v:GetAngles()) end end -]] AddCSLuaFile() --[[ Some lua_run functions useful for finding props @@ -38,21 +34,25 @@ ENT.VisParts = { "models/props_c17/gravestone001a.mdl", Vector(3.3, 1.5, -4.8), Angle(-90,90,180), + "Models/Gibs/furniture_gibs/FurnitureWoodDrawers001a", }, { "models/props_c17/gravestone001a.mdl", Vector(3.6, 2.5, -5), Angle(-90, -90, 180), + "Models/Gibs/furniture_gibs/FurnitureWoodDrawers001a", }, { "models/props_c17/canister01a.mdl", Vector(17.5, -41.6, -5), Angle(0, 90, 180), + "models/props_debris/metalwall001a", }, { "models/props_c17/canister01a.mdl", Vector(-12, -41.6, -5), Angle(0, 90, -180), + "models/props_debris/metalwall001a", }, { "models/props_c17/playground_teetertoter_stan.mdl", @@ -73,6 +73,7 @@ function ENT:OnInitialize() e:SetModel(v[1]) e:SetPos(v[2] + self:GetPos()) e:SetAngles(v[3]) + if(v[4] != nil) then e:SetMaterial(v[4]) end e:Spawn() e:SetParent(self) self.Props[k] = e diff --git a/entities/entities/gms_campfire.lua b/entities/entities/gms_campfire.lua index 776cfbc..3e6c877 100644 --- a/entities/entities/gms_campfire.lua +++ b/entities/entities/gms_campfire.lua @@ -35,30 +35,7 @@ ENT.VisParts = { Angle(68.427, 118.366, 9.406), }, } ---[[ -models/props_debris/wood_chunk08b.mdl -1.240417 5.524837 -7.739258 --89.377 -65.131 -82.987 -models/props_debris/wood_chunk06d.mdl --0.861053 -7.099247 -3.869141 --68.427 -61.634 -141.252 -models/props_debris/wood_chunk02a.mdl --3.136078 11.640522 -3.352539 --62.440 122.254 1.722 -models/props_debris/wood_chunk04d.mdl --12.100769 3.301933 -0.352539 --45.086 67.079 -161.642 -models/props_debris/wood_chunk02b.mdl --1.157349 -9.414154 -2.000000 -68.427 118.366 9.406 -models/hunter/blocks/cube1x1x05.mdl -0.000000 0.000000 0.000000 -0.010 -45.169 0.018 -models/props_debris/wood_chunk04d.mdl -3.393311 17.393948 -3.345703 -58.830 -82.344 13.865 -]] function ENT:OnInitialize() self:SetModel( self.Model ) self:PhysicsInit( SOLID_VPHYSICS ) diff --git a/gamemode/itemsystem/items/gunchunks.lua b/gamemode/itemsystem/items/gunchunks.lua index 9e1c157..412ae68 100644 --- a/gamemode/itemsystem/items/gunchunks.lua +++ b/gamemode/itemsystem/items/gunchunks.lua @@ -10,20 +10,23 @@ local materials = { } local gunparts = { - {"Gunslide","test.png"}, - {"Gunbarrel","test.png"}, - {"Gungrip", "test.png"}, - {"Gunmagazine", "test.png"}, - {"Weapon Scope", "test.png"}, - {"Reflex Scope", "test.png"}, + "Gunslide", + "Gunbarrel", + "Gungrip", + "Gunmagazine", + "Weapon Scope", + "Reflex Scope", } for k,v in pairs(materials) do for i,j in pairs(gunparts) do local ITEM = {} - ITEM.Name = v .. " " .. j[1] + ITEM.Name = v .. " " .. j ITEM.Description = "A part of a weapon!" - ITEM.Icon = j[2] + local filename = string.Replace(v .. " " .. j," ","_") + local directory = "items/weaponparts/" .. filename .. ".png" + print("File for " .. ITEM.Name .. " is " .. directory) + ITEM.Icon = directory ITEM.UniqueData = false genericMakeDroppable(ITEM) GMS.RegisterResource(ITEM) -- cgit v1.2.3-70-g09d2