diff --git a/lua/arccw/client/cl_blacklist.lua b/lua/arccw/client/cl_blacklist.lua index a991ec16..e0bf8395 100644 --- a/lua/arccw/client/cl_blacklist.lua +++ b/lua/arccw/client/cl_blacklist.lua @@ -1,15 +1,6 @@ local srf = surface -local og_ScreenScale = ScreenScale -local ScreenScale_Cache = {} - -local function ScreenScale(a) - if ScreenScale_Cache[a] then return ScreenScale_Cache[a] end - - ScreenScale_Cache[a] = og_ScreenScale(a) - return ScreenScale_Cache[a] -end local function ScreenScaleMulti(input) return ScreenScale(input) * GetConVar("arccw_hud_size"):GetFloat() diff --git a/lua/arccw/client/cl_hud.lua b/lua/arccw/client/cl_hud.lua index 26f50ad0..efb11ae1 100644 --- a/lua/arccw/client/cl_hud.lua +++ b/lua/arccw/client/cl_hud.lua @@ -111,6 +111,17 @@ local function generatefonts() end +local og_ScreenScale = ScreenScale + +local ScreenScale_Cache = {} + +function ScreenScale(a) + if ScreenScale_Cache[a] then return ScreenScale_Cache[a] end + + ScreenScale_Cache[a] = og_ScreenScale(a) + return ScreenScale_Cache[a] +end + generatefonts() language.Add("SniperPenetratedRound_ammo", "Sniper Ammo") @@ -121,6 +132,7 @@ local lastScrW = ScrW() hook.Add("HUDPaint", "ArcCW_FontRegen", function() if (lastScrH != ScrH()) or (lastScrW != ScrW()) then generatefonts() + ScreenScale_Cache = {} end lastScrH = ScrH() diff --git a/lua/arccw/client/cl_singleplayer.lua b/lua/arccw/client/cl_singleplayer.lua index 5368747f..75e16c92 100644 --- a/lua/arccw/client/cl_singleplayer.lua +++ b/lua/arccw/client/cl_singleplayer.lua @@ -51,6 +51,20 @@ concommand.Add("arccw_listvmanims", function() PrintTable(vm:GetSequenceList()) end) +concommand.Add("arccw_listvmbones", function() + local wep = LocalPlayer():GetActiveWeapon() + + if !wep then return end + + local vm = LocalPlayer():GetViewModel() + + if !vm then return end + + for i = 0, (vm:GetBoneCount() - 1) do + print(vm:GetBoneName(i)) + end +end) + net.Receive("arccw_sp_loadautosave", function(len, ply) local wep = LocalPlayer():GetActiveWeapon() diff --git a/lua/arccw/client/cl_ttt.lua b/lua/arccw/client/cl_ttt.lua index cc0a4cb2..1bea204f 100644 --- a/lua/arccw/client/cl_ttt.lua +++ b/lua/arccw/client/cl_ttt.lua @@ -1,15 +1,6 @@ if engine.ActiveGamemode() != "terrortown" then return end -local og_ScreenScale = ScreenScale -local ScreenScale_Cache = {} - -local function ScreenScale(a) - if ScreenScale_Cache[a] then return ScreenScale_Cache[a] end - - ScreenScale_Cache[a] = og_ScreenScale(a) - return ScreenScale_Cache[a] -end CreateClientConVar("arccw_ttt_inforoundstart", "1", true, false, "Whether to show ArcCW config every round.") CreateClientConVar("arccw_ttt_rolecrosshair", "1", true, false, "Whether to color your crosshair according to your role.") diff --git a/lua/arccw/client/cl_warnings.lua b/lua/arccw/client/cl_warnings.lua index 71d16f44..1a8543ba 100644 --- a/lua/arccw/client/cl_warnings.lua +++ b/lua/arccw/client/cl_warnings.lua @@ -11,16 +11,7 @@ ArcCW.IncompatibleAddons = { -- ["1429489453"] = "Causes issues with arms." -- bio annihilation extended sninctbur } -local og_ScreenScale = ScreenScale -local ScreenScale_Cache = {} - -local function ScreenScale(a) - if ScreenScale_Cache[a] then return ScreenScale_Cache[a] end - - ScreenScale_Cache[a] = og_ScreenScale(a) - return ScreenScale_Cache[a] -end local function ScreenScaleMulti(input) return ScreenScale(input) * GetConVar("arccw_hud_size"):GetFloat() diff --git a/lua/weapons/arccw_base/cl_crosshair.lua b/lua/weapons/arccw_base/cl_crosshair.lua index 592b4032..584aacb6 100644 --- a/lua/weapons/arccw_base/cl_crosshair.lua +++ b/lua/weapons/arccw_base/cl_crosshair.lua @@ -4,16 +4,7 @@ local cw = nil local clump_inner = Material("hud/clump_inner.png", "mips smooth") local clump_outer = Material("hud/clump_outer.png", "mips smooth") -local og_ScreenScale = ScreenScale -local ScreenScale_Cache = {} - -local function ScreenScale(a) - if ScreenScale_Cache[a] then return ScreenScale_Cache[a] end - - ScreenScale_Cache[a] = og_ScreenScale(a) - return ScreenScale_Cache[a] -end function SWEP:ShouldDrawCrosshair() if GetConVar("arccw_override_crosshair_off"):GetBool() then return false end diff --git a/lua/weapons/arccw_base/cl_hud.lua b/lua/weapons/arccw_base/cl_hud.lua index 4a868d79..bd5e4bc8 100644 --- a/lua/weapons/arccw_base/cl_hud.lua +++ b/lua/weapons/arccw_base/cl_hud.lua @@ -1,13 +1,4 @@ -local og_ScreenScale = ScreenScale -local ScreenScale_Cache = {} - -local function ScreenScale(a) - if ScreenScale_Cache[a] then return ScreenScale_Cache[a] end - - ScreenScale_Cache[a] = og_ScreenScale(a) - return ScreenScale_Cache[a] -end local function ScreenScaleMulti(input) return ScreenScale(input) * GetConVar("arccw_hud_size"):GetFloat() diff --git a/lua/weapons/arccw_base/cl_presets.lua b/lua/weapons/arccw_base/cl_presets.lua index 263be18a..af7ab5a7 100644 --- a/lua/weapons/arccw_base/cl_presets.lua +++ b/lua/weapons/arccw_base/cl_presets.lua @@ -1,16 +1,7 @@ -- atts are comma separated -- optic_mrs,,,perk_quickdraw,ammo_match -local og_ScreenScale = ScreenScale -local ScreenScale_Cache = {} - -local function ScreenScale(a) - if ScreenScale_Cache[a] then return ScreenScale_Cache[a] end - - ScreenScale_Cache[a] = og_ScreenScale(a) - return ScreenScale_Cache[a] -end local function ScreenScaleMulti(input) return ScreenScale(input) * GetConVar("arccw_hud_size"):GetFloat() diff --git a/materials/models/drgordon/weapons/akt/akt_74s.vmt b/materials/models/drgordon/weapons/akt/akt_74s.vmt new file mode 100644 index 00000000..aacb1766 --- /dev/null +++ b/materials/models/drgordon/weapons/akt/akt_74s.vmt @@ -0,0 +1,11 @@ +"VertexLitGeneric" +{ + "$basetexture" "models\drgordon\weapons\akt\akt_74s" + "$bumpmap" "models\drgordon\weapons\akt\akt_74s_n" + + "$phong" "1" + "$phongexponent" "4" + "$phongalbedotint" "1" + "$phongboost" "0.4" + "$phongfresnelranges" "[1 1 1]" +} diff --git a/materials/models/drgordon/weapons/akt/akt_74s.vtf b/materials/models/drgordon/weapons/akt/akt_74s.vtf new file mode 100644 index 00000000..6bf11477 Binary files /dev/null and b/materials/models/drgordon/weapons/akt/akt_74s.vtf differ diff --git a/materials/models/drgordon/weapons/akt/akt_74s_n.vtf b/materials/models/drgordon/weapons/akt/akt_74s_n.vtf new file mode 100644 index 00000000..320f6e35 Binary files /dev/null and b/materials/models/drgordon/weapons/akt/akt_74s_n.vtf differ