HaodongMo/ARC-9
1
0
Fork 0
mirror of https://github.com/HaodongMo/ARC-9.git synced 2025-03-04 03:02:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't hate me, Darsu

Browse Source 
- Made all variables related to CustomCrosshairs into ProcessedValues so they can be modified to be used when, for example, using UBGL's or any other action.
- Additionally, made the crosshair dot a ProcessedValue, in case creators want that part hidden for whatever reason.
- Also fixed that the CustomCrosshairMaterial by default caused a LUA error when no CustomCrosshairMaterial was defined previously.
This commit is contained in:
MokaAkashiya85 2024-07-24 00:37:47 +02:00
parent 8a9a5e879e
commit b991cd9552
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lua/weapons/arc9_base/cl_hud.lua
View File

@ -86,6 +86,7 @@ function SWEP:DoDrawCrosshair(x, y)
local miniprong_2 = ARC9ScreenScale(2) * m * sizeprong
local gap = 0
local staticgap = ARC9ScreenScale(4)
local hidedot = self:GetProcessedValue("CrosshairHideDot", true)
-- local col = Color(255, 255, 255, 255)
-- col.r = arc9_cross_r:GetFloat()
@ -130,7 +131,7 @@ function SWEP:DoDrawCrosshair(x, y)
lasthelperalpha = math.Approach(lasthelperalpha, helpertarget, FrameTime() / 0.1)
drawshadowrect(x - (dotsize / 2), y - (dotsize / 2), dotsize, dotsize, col)
if !hidedot then drawshadowrect(x - (dotsize / 2), y - (dotsize / 2), dotsize, dotsize, col) end
return true
else
@ -163,7 +164,7 @@ function SWEP:DoDrawCrosshair(x, y)
gap = lastgap
drawshadowrect(x - (dotsize / 2), y - (dotsize / 2), dotsize, dotsize, col)
if !hidedot then drawshadowrect(x - (dotsize / 2), y - (dotsize / 2), dotsize, dotsize, col) end
if self:GetSprintAmount() > 0 then return true end
if self:GetReloading() then return true end
@ -173,11 +174,11 @@ function SWEP:DoDrawCrosshair(x, y)
if self:GetProcessedValue("CustomCrosshair", true) then
surface.SetDrawColor(col)
surface.SetMaterial( self.CustomCrosshairMaterial or Material("arc9/ui/share.png", "mips smooth") )
surface.SetMaterial( self:GetProcessedValue("CustomCrosshairMaterial", true) or Material("arc9/ui/share.png", "mips smooth") )
local size = self.CustomCrosshairSize or 40
local size = self:GetProcessedValue("CustomCrosshairSize", true) or 40
if self.CustomCrosshairSingle then
if self:GetProcessedValue("CustomCrosshairSingle", true) then
surface.DrawTexturedRectRotated(x, y, size + gap, size + gap, 0) -- Central
else
surface.DrawTexturedRectRotated(x - (dotsize / 2) - gap - ARC9.ScreenScale(11), y - (dotsize / 2), size, size, 0) -- Left

2
lua/weapons/arc9_base/shared.lua
View File

@ -126,7 +126,7 @@ SWEP.ForceStandardCrosshair = nil -- Force default + or T crosshair no matter wh
SWEP.CustomCrosshair = false -- Enables custom crosshair use.
SWEP.CustomCrosshairSingle = false -- Enables a single image to be used as the custom crosshair.
SWEP.CustomCrosshairMaterial = "" -- Point towards a file to use as the custom crosshair.
SWEP.CustomCrosshairMaterial = nil -- Point towards a file to use as the custom crosshair. Must use Material(PATH) format.
SWEP.CustomCrosshairSize = 40 -- Changes the custom crosshair size. (Default 40)
SWEP.ViewModelFOVBase = nil -- Set to override viewmodel FOV