From 54e2e82901150d54edb92082dab52bbddc68f51d Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Thu, 24 Aug 2023 22:25:17 +0500 Subject: [PATCH] sort weapons and change names --- .../beatrun/entities/weapons/aewep_357.lua | 3 +- .../beatrun/entities/weapons/aewep_base.lua | 3 +- .../beatrun/entities/weapons/aewep_nt.lua | 5 +- .../entities/weapons/runnerhands/shared.lua | 6 +- .../entities/weapons/shapedrawer/shared.lua | 70 ++++++++++--------- 5 files changed, 47 insertions(+), 40 deletions(-) diff --git a/beatrun/gamemodes/beatrun/entities/weapons/aewep_357.lua b/beatrun/gamemodes/beatrun/entities/weapons/aewep_357.lua index f46e3db..5635322 100644 --- a/beatrun/gamemodes/beatrun/entities/weapons/aewep_357.lua +++ b/beatrun/gamemodes/beatrun/entities/weapons/aewep_357.lua @@ -22,7 +22,7 @@ SWEP.Secondary.Ammo = "none" SWEP.UseHands = true -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.BobScale = 0 SWEP.SwayScale = 0 SWEP.ViewModelFOV = 70 @@ -30,6 +30,7 @@ SWEP.ViewModelFOV = 70 SWEP.PrintName = "357" SWEP.Author = "datae" SWEP.Instructions = "" +SWEP.Category = "Beatrun" SWEP.BulletData = {} SWEP.Damage = 150 diff --git a/beatrun/gamemodes/beatrun/entities/weapons/aewep_base.lua b/beatrun/gamemodes/beatrun/entities/weapons/aewep_base.lua index 2230443..a40d6a1 100644 --- a/beatrun/gamemodes/beatrun/entities/weapons/aewep_base.lua +++ b/beatrun/gamemodes/beatrun/entities/weapons/aewep_base.lua @@ -27,9 +27,10 @@ SWEP.BobScale = 0 SWEP.SwayScale = 0 SWEP.ViewModelFOV = 70 -SWEP.PrintName = "AE" +SWEP.PrintName = "Beatrun SMG?" SWEP.Author = "datae" SWEP.Instructions = "" +SWEP.Category = "Beatrun" SWEP.BulletData = {} SWEP.Damage = 15 diff --git a/beatrun/gamemodes/beatrun/entities/weapons/aewep_nt.lua b/beatrun/gamemodes/beatrun/entities/weapons/aewep_nt.lua index 755d4b2..549f6a6 100644 --- a/beatrun/gamemodes/beatrun/entities/weapons/aewep_nt.lua +++ b/beatrun/gamemodes/beatrun/entities/weapons/aewep_nt.lua @@ -22,14 +22,15 @@ SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.Automatic = false SWEP.Secondary.Ammo = "none" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.BobScale = 0 SWEP.SwayScale = 0 SWEP.ViewModelFOV = 70 -SWEP.PrintName = "AE" +SWEP.PrintName = "idk" SWEP.Author = "datae" SWEP.Instructions = "" +SWEP.Category = "Beatrun" SWEP.BulletData = {} SWEP.Damage = 15 diff --git a/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua b/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua index 01cab51..4ff6265 100644 --- a/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua +++ b/beatrun/gamemodes/beatrun/entities/weapons/runnerhands/shared.lua @@ -16,7 +16,7 @@ if CLIENT then end) end -SWEP.Author = "" +SWEP.Author = "datae" SWEP.Contact = "" SWEP.Purpose = "" SWEP.Instructions = "" @@ -28,9 +28,9 @@ SWEP.HoldType = "fist" SWEP.Spawnable = true SWEP.AdminSpawnable = true +SWEP.Category = "Beatrun" - ---[[Just don't draw the hands, we don't need 'em]] +-- Just don't draw the hands, we don't need 'em SWEP.UseHands = false SWEP.ViewModel = "models/runnerhands.mdl" diff --git a/beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua b/beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua index 15eb7d4..3ce1b44 100644 --- a/beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua +++ b/beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua @@ -1,48 +1,48 @@ -SWEP.PrintName = "X" -SWEP.Slot = 0 -SWEP.SlotPos = 1 -SWEP.DrawAmmo = false -SWEP.DrawCrosshair = true +SWEP.PrintName = "ShapeDrawer" +SWEP.Slot = 0 +SWEP.SlotPos = 1 +SWEP.DrawAmmo = false +SWEP.DrawCrosshair = true - -SWEP.Author = "" -SWEP.Contact = "" -SWEP.Purpose = "" -SWEP.Instructions = "" +SWEP.Author = "datae" +SWEP.Contact = "" +SWEP.Purpose = "" +SWEP.Instructions = "" SWEP.BounceWeaponIcon = false SWEP.DrawWeaponInfoBox = false SWEP.HoldType = "crossbow" -SWEP.Spawnable = true -SWEP.AdminSpawnable = true +SWEP.Spawnable = true +SWEP.AdminSpawnable = true SWEP.Category = "Beatrun" SWEP.UseHands = true -SWEP.ViewModel = "models/weapons/c_pistol.mdl" -SWEP.WorldModel = "models/weapons/w_crossbow.mdl" +SWEP.ViewModel = "models/weapons/c_pistol.mdl" +SWEP.WorldModel = "models/weapons/w_crossbow.mdl" -SWEP.ViewModelFOV=75 --65 75 +SWEP.ViewModelFOV = 75 --65 75 -SWEP.Primary.ClipSize = -1 -SWEP.Primary.DefaultClip = -1 -SWEP.Primary.Automatic = true -SWEP.Primary.Ammo = "none" +SWEP.Primary.ClipSize = -1 +SWEP.Primary.DefaultClip = -1 +SWEP.Primary.Automatic = true +SWEP.Primary.Ammo = "none" -SWEP.Secondary.ClipSize = -1 -SWEP.Secondary.DefaultClip = -1 -SWEP.Secondary.Automatic = false -SWEP.Secondary.Ammo = "none" +SWEP.Secondary.ClipSize = -1 +SWEP.Secondary.DefaultClip = -1 +SWEP.Secondary.Automatic = false +SWEP.Secondary.Ammo = "none" function SWEP:SetupDataTables() end function SWEP:Deploy() self:CallOnClient("Deploy") - self:SetHoldType( self.HoldType ) + self:SetHoldType(self.HoldType) self:SendWeaponAnim(ACT_VM_DRAW) + self.points = {} self.center = Vector() end @@ -51,10 +51,8 @@ function SWEP:Initialize() end function SWEP:Think() - end - function SWEP:Holster() return true end @@ -64,31 +62,37 @@ end function SWEP:Reload() self:CallOnClient("Reload") + table.Empty(self.points) end function SWEP:PrimaryAttack() self:CallOnClient("PrimaryAttack") local ply = self.Owner - if !self.points[#self.points] or (ply:EyePos()+ply:EyeAngles():Forward()*50):Distance(self.points[#self.points]) > 5 then - table.insert(self.points, ply:EyePos()+ply:EyeAngles():Forward()*50) + + if not self.points[#self.points] or (ply:EyePos() + ply:EyeAngles():Forward() * 50):Distance(self.points[#self.points]) > 5 then + table.insert(self.points, ply:EyePos() + ply:EyeAngles():Forward() * 50) end end function SWEP:SecondaryAttack() self:CallOnClient("SecondaryAttack") + local ply = self.Owner + self.center:Set(ply:GetEyeTrace().HitPos) end -hook.Add("PostDrawTranslucentRenderables","ShapeGun",function() +hook.Add("PostDrawTranslucentRenderables", "ShapeGun", function() local ply = Entity(1) local wep = ply:GetActiveWeapon() or nil - if IsValid(wep) and wep:GetClass()=="shapedrawer" then - for k,v in ipairs(wep.points) do - render.DrawWireframeBox(v,angle_zero,Vector(-1,-1,-1),Vector(1,1,1)) + + if IsValid(wep) and wep:GetClass() == "shapedrawer" then + for k, v in ipairs(wep.points) do + render.DrawWireframeBox(v, angle_zero, Vector(-1, -1, -1), Vector(1, 1, 1)) end - render.DrawWireframeBox(wep.center,angle_zero,Vector(-2,-2,-2),Vector(2,2,2)) + + render.DrawWireframeBox(wep.center, angle_zero, Vector(-2, -2, -2), Vector(2, 2, 2)) end end) \ No newline at end of file