Bennydev
/
Benny
4
0
Fork 0
Code Issues Pull Requests Wiki Activity

Add features tag and WIP start on nades

This commit is contained in:
Fesiug 2023-11-10 10:56:06 -05:00
parent bf35c52dcc
commit d3f9e859b2
5 changed files with 117 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gamemodes/benny/entities/entities/bgrenade/shared.lua Normal file
View File

@ -0,0 +1,15 @@
AddCSLuaFile()
ENT.Type = "anim"
function ENT:Initialize()
return
end
function ENT:Think()
return
end
function ENT:Explode()
return
end

12
gamemodes/benny/entities/entities/bgrenade_frag.lua Normal file
View File

@ -0,0 +1,12 @@
AddCSLuaFile()
ENT.Type = "anim"
ENT.Base = "bgrenade"
function ENT:Think()
return
end
function ENT:Explode()
return
end

2
gamemodes/benny/gamemode/modules/player/cl_hud.lua
View File

@ -258,7 +258,7 @@ hook.Add( "HUDPaint", "Benny_HUDPaint", function()
surface.DrawRect( sw - b - ss(w-4), sh - b + ss(16) - ss(BOXHEIGHT-4), ss(fmpw), ss(10) ) surface.DrawRect( sw - b - ss(w-4), sh - b + ss(16) - ss(BOXHEIGHT-4), ss(fmpw), ss(10) )
-- PROTO: Make grenade/melee/firearm logic way way better. -- PROTO: Make grenade/melee/firearm logic way way better.
if wep1c.Features != "grenade" then if wep1c.Features == "firearm" then
surface.SetFont( "Benny_12" ) surface.SetFont( "Benny_12" )
local str = wep:B_FiremodeName( false ) local str = wep:B_FiremodeName( false )
local tw = surface.GetTextSize( str ) local tw = surface.GetTextSize( str )

2
gamemodes/benny/gamemode/modules/player/sh_basic.lua
View File

@ -77,7 +77,7 @@ concommand.Add("benny_inv_equip", function( ply, cmd, args )
wep:SetWep1Clip( item.Loaded ) wep:SetWep1Clip( item.Loaded )
-- PROTO: Make grenade/melee/firearm logic way way better. -- PROTO: Make grenade/melee/firearm logic way way better.
if class.Features != "grenade" then if class.Features == "firearm" then
if item.Loaded != 0 then if item.Loaded != 0 then
assert( item[ "Ammo" .. item.Loaded ], "That magazine doesn't exist." ) assert( item[ "Ammo" .. item.Loaded ], "That magazine doesn't exist." )
end end

112
gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua
View File

@ -197,6 +197,8 @@ WEAPONS["toolgun"] = {
-- Return true to skip weapon logic -- Return true to skip weapon logic
return true return true
end, end,
Features = "firearm",
} }
-- Melee -- Melee
@ -213,6 +215,8 @@ WEAPONS["melee_bat"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 0, Ammo = 0,
Damage = 0, Damage = 0,
Features = "melee",
} }
WEAPONS["melee_baton"] = { WEAPONS["melee_baton"] = {
@ -227,6 +231,8 @@ WEAPONS["melee_baton"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 0, Ammo = 0,
Damage = 0, Damage = 0,
Features = "melee",
} }
WEAPONS["melee_knife"] = { WEAPONS["melee_knife"] = {
@ -241,6 +247,8 @@ WEAPONS["melee_knife"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 0, Ammo = 0,
Damage = 0, Damage = 0,
Features = "melee",
} }
WEAPONS["melee_machete"] = { WEAPONS["melee_machete"] = {
@ -255,6 +263,8 @@ WEAPONS["melee_machete"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 0, Ammo = 0,
Damage = 0, Damage = 0,
Features = "melee",
} }
-- Handguns -- Handguns
@ -280,6 +290,8 @@ WEAPONS["1911"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 8, Ammo = 8,
Damage = 30, Damage = 30,
Features = "firearm",
} }
WEAPONS["usp"] = { WEAPONS["usp"] = {
@ -303,6 +315,8 @@ WEAPONS["usp"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 12, Ammo = 12,
Damage = 30, Damage = 30,
Features = "firearm",
} }
WEAPONS["m92"] = { WEAPONS["m92"] = {
@ -326,6 +340,8 @@ WEAPONS["m92"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 15, Ammo = 15,
Damage = 30, Damage = 30,
Features = "firearm",
} }
WEAPONS["p226"] = { WEAPONS["p226"] = {
@ -349,6 +365,8 @@ WEAPONS["p226"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 13, Ammo = 13,
Damage = 30, Damage = 30,
Features = "firearm",
} }
WEAPONS["glock"] = { WEAPONS["glock"] = {
@ -371,6 +389,8 @@ WEAPONS["glock"] = {
Firemodes = FIREMODE_AUTOSEMI, Firemodes = FIREMODE_AUTOSEMI,
Ammo = 17, Ammo = 17,
Damage = 18, Damage = 18,
Features = "firearm",
} }
WEAPONS["nambu"] = { WEAPONS["nambu"] = {
@ -393,6 +413,8 @@ WEAPONS["nambu"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 6, Ammo = 6,
Damage = 26, Damage = 26,
Features = "firearm",
} }
WEAPONS["anaconda"] = { WEAPONS["anaconda"] = {
@ -415,6 +437,8 @@ WEAPONS["anaconda"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 6, Ammo = 6,
Damage = 40, Damage = 40,
Features = "firearm",
} }
WEAPONS["deagle"] = { WEAPONS["deagle"] = {
@ -437,6 +461,8 @@ WEAPONS["deagle"] = {
Firemodes = FIREMODE_SEMI, Firemodes = FIREMODE_SEMI,
Ammo = 7, Ammo = 7,
Damage = 40, Damage = 40,
Features = "firearm",
} }
-- SMGs & PDWs -- SMGs & PDWs
@ -461,6 +487,8 @@ WEAPONS["tmp"] = {
Ammo = 15, Ammo = 15,
Damage = 18, Damage = 18,
Spread = 20/60, Spread = 20/60,
Features = "firearm",
} }
WEAPONS["mp7"] = { WEAPONS["mp7"] = {
@ -483,6 +511,8 @@ WEAPONS["mp7"] = {
Ammo = 20, Ammo = 20,
Damage = 16, Damage = 16,
Spread = 20/60, Spread = 20/60,
Features = "firearm",
} }
WEAPONS["mp5k"] = { WEAPONS["mp5k"] = {
@ -505,6 +535,8 @@ WEAPONS["mp5k"] = {
Ammo = 15, Ammo = 15,
Damage = 18, Damage = 18,
Spread = 20/60, Spread = 20/60,
Features = "firearm",
} }
WEAPONS["mac11"] = { WEAPONS["mac11"] = {
@ -527,6 +559,8 @@ WEAPONS["mac11"] = {
Ammo = 16, Ammo = 16,
Damage = 16, Damage = 16,
Spread = 30/60, Spread = 30/60,
Features = "firearm",
} }
WEAPONS["bizon"] = { WEAPONS["bizon"] = {
@ -549,6 +583,8 @@ WEAPONS["bizon"] = {
Ammo = 40, Ammo = 40,
Damage = 16, Damage = 16,
Spread = 40/60, Spread = 40/60,
Features = "firearm",
} }
WEAPONS["chicom"] = { WEAPONS["chicom"] = {
@ -571,6 +607,8 @@ WEAPONS["chicom"] = {
Ammo = 36, Ammo = 36,
Damage = 12, Damage = 12,
Spread = 40/60, Spread = 40/60,
Features = "firearm",
} }
-- Shotguns -- Shotguns
@ -595,6 +633,8 @@ WEAPONS["spas12"] = {
Damage = 10, Damage = 10,
Pellets = 8, Pellets = 8,
Spread = 150/60, Spread = 150/60,
Features = "firearm",
} }
WEAPONS["aa12"] = { WEAPONS["aa12"] = {
@ -617,6 +657,8 @@ WEAPONS["aa12"] = {
Damage = 8, Damage = 8,
Pellets = 8, Pellets = 8,
Spread = 250/60, Spread = 250/60,
Features = "firearm",
} }
-- Rifles -- Rifles
@ -640,6 +682,8 @@ WEAPONS["fnc"] = {
Firemodes = FIREMODE_AUTOSEMI, Firemodes = FIREMODE_AUTOSEMI,
Ammo = 30, Ammo = 30,
Damage = 10, Damage = 10,
Features = "firearm",
} }
WEAPONS["qbz"] = { WEAPONS["qbz"] = {
@ -661,6 +705,8 @@ WEAPONS["qbz"] = {
Firemodes = FIREMODE_AUTOSEMI, Firemodes = FIREMODE_AUTOSEMI,
Ammo = 30, Ammo = 30,
Damage = 10, Damage = 10,
Features = "firearm",
} }
WEAPONS["m16a2"] = { WEAPONS["m16a2"] = {
@ -685,6 +731,8 @@ WEAPONS["m16a2"] = {
}, },
Ammo = 30, Ammo = 30,
Damage = 10, Damage = 10,
Features = "firearm",
} }
-- Machine guns -- Machine guns
@ -707,6 +755,8 @@ WEAPONS["stoner63"] = {
Firemodes = FIREMODE_AUTOSEMI, Firemodes = FIREMODE_AUTOSEMI,
Ammo = 75, Ammo = 75,
Damage = 10, Damage = 10,
Features = "firearm",
} }
WEAPONS["qbblsw"] = { WEAPONS["qbblsw"] = {
@ -727,19 +777,33 @@ WEAPONS["qbblsw"] = {
Firemodes = FIREMODE_AUTOSEMI, Firemodes = FIREMODE_AUTOSEMI,
Ammo = 70, Ammo = 70,
Damage = 10, Damage = 10,
Features = "firearm",
} }
-- Grenades -- Grenades
-- Nothing here is guaranteed. -- Nothing here is guaranteed.
local function GrenadeFire()
print("yay")
return true
end
local function GrenadeThink()
-- print("yay")
return true
end
WEAPONS["g_frag"] = { WEAPONS["g_frag"] = {
Name = "FRAG GRENADE", Name = "FRAG GRENADE",
Description = "Pull the pin and throw it the hell away!", Description = "Pull the pin and throw it the hell away!",
Type = "grenade", Type = "grenade",
Fire = GrenadeFire,
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_semtex"] = { WEAPONS["g_semtex"] = {
@ -749,7 +813,7 @@ WEAPONS["g_semtex"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_molotov"] = { WEAPONS["g_molotov"] = {
@ -759,7 +823,7 @@ WEAPONS["g_molotov"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_tknife"] = { WEAPONS["g_tknife"] = {
@ -769,7 +833,7 @@ WEAPONS["g_tknife"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_smoke"] = { WEAPONS["g_smoke"] = {
@ -779,7 +843,7 @@ WEAPONS["g_smoke"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_flashbang"] = { WEAPONS["g_flashbang"] = {
@ -789,7 +853,7 @@ WEAPONS["g_flashbang"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_gas"] = { WEAPONS["g_gas"] = {
@ -799,7 +863,7 @@ WEAPONS["g_gas"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_prox"] = { WEAPONS["g_prox"] = {
@ -809,7 +873,7 @@ WEAPONS["g_prox"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_claymore"] = { WEAPONS["g_claymore"] = {
@ -819,7 +883,7 @@ WEAPONS["g_claymore"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_scrambler"] = { WEAPONS["g_scrambler"] = {
@ -829,7 +893,7 @@ WEAPONS["g_scrambler"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_emp"] = { WEAPONS["g_emp"] = {
@ -839,7 +903,7 @@ WEAPONS["g_emp"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["g_shockcharge"] = { WEAPONS["g_shockcharge"] = {
@ -849,7 +913,7 @@ WEAPONS["g_shockcharge"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
-- Equipment -- Equipment
@ -861,7 +925,7 @@ WEAPONS["e_tacinsertion"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_medkit"] = { WEAPONS["e_medkit"] = {
@ -871,7 +935,7 @@ WEAPONS["e_medkit"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_ammo"] = { WEAPONS["e_ammo"] = {
@ -881,7 +945,7 @@ WEAPONS["e_ammo"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_cover"] = { WEAPONS["e_cover"] = {
@ -891,7 +955,7 @@ WEAPONS["e_cover"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_ddos"] = { WEAPONS["e_ddos"] = {
@ -901,7 +965,7 @@ WEAPONS["e_ddos"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_trophysystem"] = { WEAPONS["e_trophysystem"] = {
@ -911,7 +975,7 @@ WEAPONS["e_trophysystem"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_portableradar"] = { WEAPONS["e_portableradar"] = {
@ -921,7 +985,7 @@ WEAPONS["e_portableradar"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_cameraspike"] = { WEAPONS["e_cameraspike"] = {
@ -931,7 +995,7 @@ WEAPONS["e_cameraspike"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_recondrone"] = { WEAPONS["e_recondrone"] = {
@ -941,7 +1005,7 @@ WEAPONS["e_recondrone"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_gasdrone"] = { WEAPONS["e_gasdrone"] = {
@ -951,7 +1015,7 @@ WEAPONS["e_gasdrone"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_suppressionmine"] = { WEAPONS["e_suppressionmine"] = {
@ -961,7 +1025,7 @@ WEAPONS["e_suppressionmine"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }
WEAPONS["e_antiarmor"] = { WEAPONS["e_antiarmor"] = {
@ -971,5 +1035,5 @@ WEAPONS["e_antiarmor"] = {
WModel = "models/weapons/w_eq_flashbang.mdl", WModel = "models/weapons/w_eq_flashbang.mdl",
Features = "grenade", -- All weapons should have this? Features = "grenade",
} }