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

wawa finish this shit later

Browse Source
This commit is contained in:
Darsu 2023-01-18 19:17:56 +07:00
parent 92801fed26
commit 5e8ace9db7
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lua/weapons/arc9_base/cl_customize_ui.lua
View File

@ -77,8 +77,8 @@ SWEP.CustomizeButtons = {
if self2.CustomizeHUD.lowerpanel then
if self2.CustomizeHUD.lowerpanel.Extended then
self2.CustomizeHUD.lowerpanel:MoveTo(ARC9ScreenScale(19), ScrH() - ARC9ScreenScale(93+73.5), 0.2, 0, 0.5, nil)
self2.CustomizeHUD.lowerpanel:SizeTo(ScrW() - ARC9ScreenScale(38), ARC9ScreenScale(74+73.5), 0.2, 0, 0.5, nil)
self2.CustomizeHUD.lowerpanel:MoveTo(ARC9ScreenScale(19), ScrH() - ARC9ScreenScale(93+73.5+5), 0.2, 0, 0.5, nil)
self2.CustomizeHUD.lowerpanel:SizeTo(ScrW() - ARC9ScreenScale(38), ARC9ScreenScale(74+73.5+5), 0.2, 0, 0.5, nil)
else
self2.CustomizeHUD.lowerpanel:MoveTo(ARC9ScreenScale(19), ScrH() - ARC9ScreenScale(93), 0.2, 0, 0.5, nil)
self2.CustomizeHUD.lowerpanel:SizeTo(ScrW() - ARC9ScreenScale(38), ARC9ScreenScale(74), 0.2, 0, 0.5, nil)
@ -111,8 +111,8 @@ SWEP.CustomizeButtons = {
if self2.CustomizeHUD.lowerpanel then
if self2.CustomizeHUD.lowerpanel.Extended then
self2.CustomizeHUD.lowerpanel:MoveTo(ARC9ScreenScale(19), ScrH() - ARC9ScreenScale(93+73.5), 0.2, 0, 0.5, nil)
self2.CustomizeHUD.lowerpanel:SizeTo(ScrW() - ARC9ScreenScale(38), ARC9ScreenScale(74+73.5), 0.2, 0, 0.5, nil)
self2.CustomizeHUD.lowerpanel:MoveTo(ARC9ScreenScale(19), ScrH() - ARC9ScreenScale(93+73.5+5), 0.2, 0, 0.5, nil)
self2.CustomizeHUD.lowerpanel:SizeTo(ScrW() - ARC9ScreenScale(38), ARC9ScreenScale(74+73.5+5), 0.2, 0, 0.5, nil)
else
self2.CustomizeHUD.lowerpanel:MoveTo(ARC9ScreenScale(19), ScrH() - ARC9ScreenScale(93), 0.2, 0, 0.5, nil)
self2.CustomizeHUD.lowerpanel:SizeTo(ScrW() - ARC9ScreenScale(38), ARC9ScreenScale(74), 0.2, 0, 0.5, nil)
@ -1470,23 +1470,23 @@ function SWEP:CreateHUD_RHP()
draw.NoTexture()
if self2.Extended then
surface.DrawPoly({{x = cornercut, y = h},{x = 0, y = h-cornercut}, {x = 0, y = ARC9ScreenScale(15.5+60)}, {x = w*0.5-ARC9ScreenScale(0.75), y = ARC9ScreenScale(15.5+60)}, {x = w*0.5-ARC9ScreenScale(0.75), y = h}})
surface.DrawPoly({{x = cornercut, y = h},{x = 0, y = h-cornercut}, {x = 0, y = ARC9ScreenScale(15.5+60+3.5)}, {x = w*0.5-ARC9ScreenScale(0.75), y = ARC9ScreenScale(15.5+60+3.5)}, {x = w*0.5-ARC9ScreenScale(0.75), y = h}})
surface.DrawRect(0, ARC9ScreenScale(15.5+60-2.5), w*0.5-ARC9ScreenScale(0.5), ARC9ScreenScale(1.5))
surface.DrawRect(0, ARC9ScreenScale(15.5+60-2.5+3.5), w*0.5-ARC9ScreenScale(0.5), ARC9ScreenScale(1.5))
surface.DrawRect(0, ARC9ScreenScale(15.5), w, ARC9ScreenScale(60-3.5))
surface.DrawRect(0, ARC9ScreenScale(15.5), w, ARC9ScreenScale(60-3.5+3.5))
surface.SetDrawColor(self2.HasPros and ARC9.GetHUDColor("bg_pro") or ARC9.GetHUDColor("bg"))
surface.DrawPoly({{x = w*0.5+ARC9ScreenScale(0.75), y = h}, {x = w*0.5+ARC9ScreenScale(0.75), y = ARC9ScreenScale(15.5+60)}, {x = w*0.75-ARC9ScreenScale(0.75), y = ARC9ScreenScale(15.5+60)}, {x = w*0.75-ARC9ScreenScale(0.75), y = h}})
surface.DrawPoly({{x = w*0.5+ARC9ScreenScale(0.75), y = h}, {x = w*0.5+ARC9ScreenScale(0.75), y = ARC9ScreenScale(15.5+60+3.5)}, {x = w*0.75-ARC9ScreenScale(0.75), y = ARC9ScreenScale(15.5+60+3.5)}, {x = w*0.75-ARC9ScreenScale(0.75), y = h}})
surface.SetDrawColor(self2.HasPros and ARC9.GetHUDColor("pro") or ARC9.GetHUDColor("bg"))
surface.DrawRect(w*0.5+ARC9ScreenScale(0.75), ARC9ScreenScale(15.5+60-2.5), w*0.25-ARC9ScreenScale(1), ARC9ScreenScale(1.5))
surface.DrawRect(w*0.5+ARC9ScreenScale(0.75), ARC9ScreenScale(15.5+60-2.5+3.5), w*0.25-ARC9ScreenScale(1), ARC9ScreenScale(1.5))
surface.SetDrawColor(self2.HasCons and ARC9.GetHUDColor("bg_con") or ARC9.GetHUDColor("bg"))
surface.DrawPoly({{x = w*0.75+ARC9ScreenScale(0.75), y = h}, {x = w*0.75+ARC9ScreenScale(0.75), y = ARC9ScreenScale(15.5+60)}, {x = w, y = ARC9ScreenScale(15.5+60)}, {x = w, y = h-cornercut}, {x = w-cornercut, y = h}})
surface.DrawPoly({{x = w*0.75+ARC9ScreenScale(0.75), y = h}, {x = w*0.75+ARC9ScreenScale(0.75), y = ARC9ScreenScale(15.5+60+3.5)}, {x = w, y = ARC9ScreenScale(15.5+60+3.5)}, {x = w, y = h-cornercut}, {x = w-cornercut, y = h}})
surface.SetDrawColor(self2.HasCons and ARC9.GetHUDColor("con") or ARC9.GetHUDColor("bg"))
surface.DrawRect(w*0.75+ARC9ScreenScale(1), ARC9ScreenScale(15.5+60-2.5), w*0.25, ARC9ScreenScale(1.5))
surface.DrawRect(w*0.75+ARC9ScreenScale(1), ARC9ScreenScale(15.5+60-2.5+3.5), w*0.25, ARC9ScreenScale(1.5))
else
surface.DrawPoly({{x = cornercut, y = h},{x = 0, y = h-cornercut}, {x = 0, y = ARC9ScreenScale(15.5)}, {x = w, y = ARC9ScreenScale(15.5)}, {x = w, y = h-cornercut}, {x = w-cornercut, y = h}})
end

17
lua/weapons/arc9_base/cl_customize_ui_bottombar.lua
View File

@ -459,13 +459,20 @@ function SWEP:CreateHUD_Bottom()
scroll:SetOverlap(-ARC9ScreenScale(7)) -- If this is too small, the right side will be cut out. idk why and idk how to fix it elegantly so here you go
scroll:MoveToFront()
function scroll.btnLeft:Paint(w, h) end
function scroll.btnRight:Paint(w, h) end
local scrollerpanel = vgui.Create("DPanel", scroll)
scrollerpanel:SetPos(0, scroll:GetTall() - ARC9ScreenScale(2))
scrollerpanel:SetSize(scroll:GetWide(), ARC9ScreenScale(2))
-- scrollerpanel.LastX = ARC9ScreenScale(79)
-- self.scrollerpanel = scrollerpanel -- for later integration
-- function scroll.btnLeft:Paint(w, h) end
-- function scroll.btnRight:Paint(w, h) end
if self.BottomBarMode == 1 then
self.CustomizeHUD.lowerpanel:MoveTo(ARC9ScreenScale(19), ScrH() - ARC9ScreenScale(93+73.5), 0.2, 0, 0.5, nil)
self.CustomizeHUD.lowerpanel:SizeTo(ScrW() - ARC9ScreenScale(38), ARC9ScreenScale(74+73.5), 0.2, 0, 0.5, nil)
self.CustomizeHUD.lowerpanel:MoveTo(ARC9ScreenScale(19), ScrH() - ARC9ScreenScale(93+73.5+5), 0.2, 0, 0.5, nil)
self.CustomizeHUD.lowerpanel:SizeTo(ScrW() - ARC9ScreenScale(38), ARC9ScreenScale(74+73.5+5), 0.2, 0, 0.5, nil)
self.CustomizeHUD.lowerpanel.Extended = true
self:ClosePresetMenu()
@ -592,7 +599,7 @@ function SWEP:CreateHUD_AttInfo()
local infopanel = vgui.Create("DPanel", lowerpanel)
infopanel:SetSize(lowerpanel:GetWide(), ARC9ScreenScale(70))
infopanel:SetPos(0, ARC9ScreenScale(75.5))
infopanel:SetPos(0, ARC9ScreenScale(75.5+25))
infopanel.title = ARC9:GetPhraseForAtt(self.AttInfoBarAtt, "PrintName") or atttbl.PrintName
infopanel.Paint = function(self2, w, h)
if !IsValid(self) then return end