mirror of
https://github.com/HaodongMo/ARC-9.git
synced 2025-03-04 03:02:58 -05:00
Tooltip BG, RecoilAutoControl -, true
- Added a background for the tooltip text for Low Ammo, Bipod and Jam, - "RecoilAutoControl" is no longer affected by the ProcessedValue delay.
This commit is contained in:
parent
55042baf3a
commit
63105e8553
@ -283,47 +283,47 @@ L["sticker_skibidi_arctic.printname"] = "Skibidi Arctic"
|
||||
L["sticker_skibidi_arctic.compactname"] = "Skibidi"
|
||||
L["sticker_skibidi_arctic.description"] = [[Design by Stan_Jacobs.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_arcobson.printname"] = "Arcobson"
|
||||
L["sticker_arcobson.compactname"] = "Arcobson"
|
||||
L["sticker_arcobson.description"] = [[Design by Stan_Jacobs.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_slopfox.printname"] = "Slop Fox"
|
||||
L["sticker_slopfox.compactname"] = "Fox"
|
||||
L["sticker_slopfox.description"] = [[In memory of that guy.
|
||||
Design by Stan_Jacobs.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_malbert.printname"] = "Malbert"
|
||||
L["sticker_malbert.compactname"] = "Malbert"
|
||||
L["sticker_malbert.description"] = [[For every brainless gamers' brainless needs.
|
||||
Design by Elorus.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_screw.printname"] = "Screw"
|
||||
L["sticker_screw.compactname"] = "Screw"
|
||||
L["sticker_screw.description"] = [[Design by Stan_Jacobs.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_northern_petrol.printname"] = "Northern Petrol"
|
||||
L["sticker_northern_petrol.compactname"] = "Petrol"
|
||||
L["sticker_northern_petrol.description"] = [[Northern Petrol from hit game Half-Life Two.
|
||||
Design by Stan_Jacobs.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_polygonal_pineapple.printname"] = "Polygonal Pineapple"
|
||||
L["sticker_polygonal_pineapple.compactname"] = "Pineapple"
|
||||
L["sticker_polygonal_pineapple.description"] = [["My dad told me if I want his respect that I'd have to make a polygonal pineapple and eat the extra sharp piece of fruit... Half way there"
|
||||
Design by Ender2point0.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_nervos.printname"] = "NervOS Eye"
|
||||
L["sticker_nervos.compactname"] = "NervOS"
|
||||
@ -331,13 +331,19 @@ L["sticker_nervos.description"] = [["We See You"
|
||||
From Neosun's upcoming book, "Tom Aero 0".
|
||||
Design by Neosun.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_puzzle.printname"] = "Take A Crack At It"
|
||||
L["sticker_puzzle.compactname"] = "Puzzle"
|
||||
L["sticker_puzzle.description"] = [["symbol of gmod community struggling with basic tasks"
|
||||
Design by Stan_Jacobs.
|
||||
|
||||
Sticker included in the ARC9 Base.]]
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
||||
L["sticker_loverealism.printname"] = "I <3 Realism"
|
||||
L["sticker_loverealism.compactname"] = "Realism"
|
||||
L["sticker_loverealism.description"] = [["I LOVE REALISM"
|
||||
"hey i got question why does it take so long to load garrys mod??"
|
||||
Design by Neosun.
|
||||
|
||||
Sticker included in the ARC9 Base, part of Community Sticker Contest 2.]]
|
||||
|
@ -307,7 +307,7 @@ function ARC9.StartCommand(ply, cmd)
|
||||
|
||||
ARC9.RecoilRise = ARC9.RecoilRise + Angle(diff_p, diff_y, 0)
|
||||
|
||||
local recreset = ARC9.RecoilRise * wpn:GetProcessedValue("RecoilAutoControl", true) * cft * 2
|
||||
local recreset = ARC9.RecoilRise * wpn:GetProcessedValue("RecoilAutoControl") * cft * 2
|
||||
|
||||
if math.abs(recreset.p) > 1e-5 then
|
||||
eyeang.p = eyeang.p - recreset.p
|
||||
|
@ -390,6 +390,9 @@ function SWEP:DrawHUD()
|
||||
|
||||
surface.SetFont("ARC9_10")
|
||||
|
||||
surface.SetDrawColor(0, 0, 0, math.Clamp(bipodhint, 0, 175))
|
||||
surface.DrawRect(scrw / 2 + 2 - twbp / 2 + ScreenScale(5) - 4, scrh / 2 + 2 + ScreenScale(96), twbp + 7, 27.5)
|
||||
|
||||
surface.SetTextColor(0, 0, 0, bipodhint) -- Black
|
||||
surface.SetTextPos(scrw / 2 + 2 - twbp / 2 + ScreenScale(5), scrh / 2 + 2 + ScreenScale(97))
|
||||
surface.DrawText(text)
|
||||
@ -432,14 +435,20 @@ function SWEP:DrawHUD()
|
||||
local ia = GetConVar("arc9_infinite_ammo"):GetBool()
|
||||
|
||||
if !ia and (magazine == 0 and maxmag == 0) then -- If no ammo and no reserve
|
||||
surface.SetTextPos(scrw / 2 + 2 - twlow / 2, scrh / 2 + 2 + ScreenScale(97) + (bipodhint / 7.5)) -- Black
|
||||
surface.SetDrawColor(0, 0, 0, 175 * math.abs(math.sin(CurTime() * 5)))
|
||||
surface.DrawRect(scrw / 2 + 2 - twempty / 2 - 5, scrh / 2 + 2 + ScreenScale(98) + (bipodhint / 7.5), twempty + 7, 27.5)
|
||||
|
||||
surface.SetTextPos(scrw / 2 + 2 - twempty / 2, scrh / 2 + 2 + ScreenScale(97) + (bipodhint / 7.5)) -- Black
|
||||
surface.SetTextColor(0, 0, 0, blink)
|
||||
surface.DrawText(textempty)
|
||||
|
||||
surface.SetTextPos(scrw / 2 - twlow / 2, scrh / 2 + ScreenScale(97) + (bipodhint / 7.5)) -- White
|
||||
surface.SetTextPos(scrw / 2 - twempty / 2, scrh / 2 + ScreenScale(97) + (bipodhint / 7.5)) -- White
|
||||
surface.SetTextColor(255, 100, 100, blink)
|
||||
surface.DrawText(textempty)
|
||||
elseif !ia and mag and maxmag == 0 then -- If low on ammo with no reserve ammo
|
||||
elseif !ia and mag and maxmag == 0 then -- If low on ammo with no reserve ammo
|
||||
surface.SetDrawColor(0, 0, 0, 175 * math.abs(math.sin(CurTime() * 5)))
|
||||
surface.DrawRect(scrw / 2 + 2 - twlow / 2 - 5, scrh / 2 + 2 + ScreenScale(98) + (bipodhint / 7.5), twlow + 7, 27.5)
|
||||
|
||||
surface.SetTextPos(scrw / 2 + 2 - twlow / 2, scrh / 2 + 2 + ScreenScale(97) + (bipodhint / 7.5)) -- Black
|
||||
surface.SetTextColor(0, 0, 0, blink)
|
||||
surface.DrawText(textlow)
|
||||
@ -450,7 +459,10 @@ function SWEP:DrawHUD()
|
||||
elseif (ia and mag) or (!ia and mag and maxmag > 0) then -- If low on ammo and have reserve ammo
|
||||
surface.SetTextColor(255, 255, 255, 255)
|
||||
local symbol = CreateControllerKeyLine({x = scrw / 2-ScreenScale(10) - (tw * 0.5) + ScreenScale(5), y = scrh / 2 + 7.5 + ScreenScale(96) + (bipodhint / 7.5), size = ScreenScale(8), font = "ARC9_12", font_keyb = "ARC9_12" }, { glyph, ScreenScale(7) })
|
||||
|
||||
|
||||
surface.SetDrawColor(0, 0, 0, 175 * math.abs(math.sin(CurTime() * 5)))
|
||||
surface.DrawRect(scrw / 2 - tw / 2 + ScreenScale(4.75), scrh / 2 + ScreenScale(98) + (bipodhint / 7.5), tw + 5, 27.5)
|
||||
|
||||
surface.SetTextPos(scrw / 2 - tw / 2 + 2 + ScreenScale(5), scrh / 2 + 2 + ScreenScale(97) + (bipodhint / 7.5)) -- Black
|
||||
surface.SetTextColor(0, 0, 0, blink)
|
||||
surface.DrawText(text)
|
||||
@ -458,6 +470,7 @@ function SWEP:DrawHUD()
|
||||
surface.SetTextPos(scrw / 2 - tw / 2 + ScreenScale(5), scrh / 2 + ScreenScale(97) + (bipodhint / 7.5)) -- White
|
||||
surface.SetTextColor(255, 255, 255, blink)
|
||||
surface.DrawText(text)
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -468,11 +481,14 @@ function SWEP:DrawHUD()
|
||||
local twunjam = surface.GetTextSize(textunjam)
|
||||
|
||||
surface.SetDrawColor(255, 255, 255, 255)
|
||||
surface.SetFont("ARC9_10")
|
||||
surface.SetFont("ARC9_12")
|
||||
|
||||
surface.SetTextColor(255, 255, 255, 255)
|
||||
local symbol = CreateControllerKeyLine({x = scrw / 2-ScreenScale(10) - (twunjam * 0.5) + ScreenScale(5), y = scrh / 2 + 7.5 + ScreenScale(96) + (bipodhint / 7.5), size = ScreenScale(8), font = "ARC9_12", font_keyb = "ARC9_12" }, { glyph, ScreenScale(7) })
|
||||
|
||||
|
||||
surface.SetDrawColor(0, 0, 0, 175 * math.abs(math.sin(CurTime() * 5)))
|
||||
surface.DrawRect(scrw / 2 - twunjam / 2 + ScreenScale(4.75), scrh / 2 + ScreenScale(98) + (bipodhint / 7.5), twunjam + 30, 27.5)
|
||||
|
||||
surface.SetTextPos(scrw / 2 - twunjam / 2 + 2 + ScreenScale(5), scrh / 2 + 2 + ScreenScale(97) + (bipodhint / 7.5)) -- Black
|
||||
surface.SetTextColor(0, 0, 0, blink)
|
||||
surface.DrawText(textunjam)
|
||||
@ -480,6 +496,7 @@ function SWEP:DrawHUD()
|
||||
surface.SetTextPos(scrw / 2 - twunjam / 2 + ScreenScale(5), scrh / 2 + ScreenScale(97) + (bipodhint / 7.5)) -- White
|
||||
surface.SetTextColor(255, 255, 255, blink)
|
||||
surface.DrawText(textunjam)
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@ -628,6 +645,35 @@ local ah = GetConVar("arc9_hud_arc9"):GetBool()
|
||||
surface.DrawLine(reloadline_x - (reloadline_target_w / 2), reloadline_mover_y, reloadline_x + (reloadline_target_w / 2), reloadline_mover_y)
|
||||
end
|
||||
|
||||
-- if !self:GetCustomize() and self:GetInspecting() then -- If weapon is inspecting
|
||||
-- local deadzonex = GetConVar("arc9_hud_deadzonex")
|
||||
-- local hx = ARC9ScreenScale(10) + deadzonex:GetInt()
|
||||
-- local hy = ScrH() / 2 + ARC9ScreenScale(100)
|
||||
-- local hud_sillyhints = Material("arc9/sillyhintsblur.png", "mips")
|
||||
|
||||
-- surface.SetDrawColor(ARC9.GetHUDColor("shadow", 200))
|
||||
-- surface.SetMaterial(hud_sillyhints)
|
||||
-- surface.DrawTexturedRect(hx - ARC9ScreenScale(12.5), hy, ARC9ScreenScale(100), ARC9ScreenScale(11)+ARC9ScreenScale(10))
|
||||
|
||||
-- surface.SetFont("ARC9_12") -- Weapon Name
|
||||
-- surface.SetTextPos(hx + ARC9ScreenScale(1.5), hy + ARC9ScreenScale(1.5)) -- Black
|
||||
-- surface.SetTextColor(0, 0, 0, 175)
|
||||
-- surface.DrawText(self:GetPrintName())
|
||||
|
||||
-- surface.SetTextPos(hx, hy) -- White
|
||||
-- surface.SetTextColor(255, 255, 255, 255)
|
||||
-- surface.DrawText(self:GetPrintName())
|
||||
|
||||
-- surface.SetFont("ARC9_8")-- Category
|
||||
-- surface.SetTextPos(hx + ARC9ScreenScale(1.5), hy + ARC9ScreenScale(11.5)) -- Black
|
||||
-- surface.SetTextColor(0, 0, 0, 175)
|
||||
-- surface.DrawText(self.Class or " ")
|
||||
|
||||
-- surface.SetTextPos(hx, hy + ARC9ScreenScale(10)) -- White
|
||||
-- surface.SetTextColor(255, 255, 255, 255)
|
||||
-- surface.DrawText(self.Class or " ")
|
||||
-- end
|
||||
|
||||
self:HoldBreathHUD()
|
||||
self:DrawCustomizeHUD()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user