mirror of
https://github.com/HaodongMo/ARC-9.git
synced 2025-03-04 03:02:58 -05:00
Loc. + Other stuffs
- Updated localizations for the LOD Distance addition. - Weapon and attachment descriptions should no longer consider "<font=??>" in its total length (concept; might need revisit)
This commit is contained in:
parent
973950bcf7
commit
05ce80d82d
@ -1782,7 +1782,7 @@ function ARC9MultiLineText(text, maxw, font)
|
||||
local match = {string.match(word, "<color=%d+,%d+,%d+>")}
|
||||
local matchend = {string.match(word, "</color>")}
|
||||
|
||||
local matchfont = {string.match(word, "<font=^.*$>")}
|
||||
local matchfont = {string.match(word, "<font=([^>]+)>")}
|
||||
local matchfontend = {string.match(word, "</font>")}
|
||||
|
||||
for _, v in ipairs(match) do
|
||||
|
@ -600,6 +600,9 @@ L["settings.effects.muzzle_others.desc"] = "Zeige die Mündungs-Effekte der ARC9
|
||||
L["settings.effects.allflash.title"] = "Taschenlampen anderer"
|
||||
L["settings.effects.allflash.desc"] = "Zeigt die Taschenlampen aller Spieler an.\n\nBeeinträchtigt die Performance."
|
||||
|
||||
-- L["settings.effects.lod.title"] = "LOD (Level of Detail) Distance"
|
||||
-- L["settings.effects.lod.desc"] = "How far away you have to be from models for them to change into lower quality variants without attachments.\n\nLower values make the models change at lower distances, and could improve performance.\n\nHigher values could impact performance, but keeps the highest quality models loaded at further distances.\n\nTPIK distance is also affected."
|
||||
|
||||
////////// Viewmodel Settings
|
||||
L["settings.tabname.vm"] = "Viewmodel-Einstellungen"
|
||||
L["settings.tabname.vm.desc"] = "Passe bestimmte Einstellungen der Viewmodels an."
|
||||
|
@ -601,7 +601,7 @@ L["settings.effects.allflash.title"] = "Other's Flashlights"
|
||||
L["settings.effects.allflash.desc"] = "Renders the flashlights from all players.\n\nImpacts performance."
|
||||
|
||||
L["settings.effects.lod.title"] = "LOD (Level of Detail) Distance"
|
||||
L["settings.effects.lod.desc"] = "How far away you have to be from models for them to change into lower quality variants without attachments. Lower values make the models change at lower distances, and could improve performance. Higher values could impact performance, but keeps the highest quality models loaded at further distances.\n\nTPIK Distance also affected by this setting."
|
||||
L["settings.effects.lod.desc"] = "How far away you have to be from models for them to change into lower quality variants without attachments.\n\nLower values make the models change at lower distances, and could improve performance.\n\nHigher values could impact performance, but keeps the highest quality models loaded at further distances.\n\nTPIK distance is also affected."
|
||||
|
||||
////////// Viewmodel Settings
|
||||
L["settings.tabname.vm"] = "Viewmodel Settings"
|
||||
|
@ -1052,6 +1052,9 @@ L["settings.convar_client"] = "Variable del cliente"
|
||||
-- L["settings.effects.allflash.title"] = "Other's Flashlights"
|
||||
-- L["settings.effects.allflash.desc"] = "Renders the flashlights from all players.\n\nImpacts performance."
|
||||
|
||||
-- L["settings.effects.lod.title"] = "LOD (Level of Detail) Distance"
|
||||
-- L["settings.effects.lod.desc"] = "How far away you have to be from models for them to change into lower quality variants without attachments.\n\nLower values make the models change at lower distances, and could improve performance.\n\nHigher values could impact performance, but keeps the highest quality models loaded at further distances.\n\nTPIK distance is also affected."
|
||||
|
||||
////////// Viewmodel Settings
|
||||
-- L["settings.tabname.vm"] = "Viewmodel Settings"
|
||||
-- L["settings.tabname.vm.desc"] = "Alter various settings related to the viewmodels."
|
||||
|
@ -1044,6 +1044,9 @@ L["settings.tabname.tpik"] = "TPIK - Инверсивная кинематика
|
||||
-- L["settings.effects.allflash.title"] = "Other's Flashlights"
|
||||
-- L["settings.effects.allflash.desc"] = "Renders the flashlights from all players.\n\nImpacts performance."
|
||||
|
||||
-- L["settings.effects.lod.title"] = "LOD (Level of Detail) Distance"
|
||||
-- L["settings.effects.lod.desc"] = "How far away you have to be from models for them to change into lower quality variants without attachments.\n\nLower values make the models change at lower distances, and could improve performance.\n\nHigher values could impact performance, but keeps the highest quality models loaded at further distances.\n\nTPIK distance is also affected."
|
||||
|
||||
////////// Viewmodel Settings
|
||||
L["settings.tabname.vm"] = "Настройки Вьюмодели"
|
||||
-- L["settings.tabname.vm.desc"] = "Alter various settings related to the viewmodels."
|
||||
|
@ -600,6 +600,9 @@ L["settings.effects.muzzle_others.desc"] = "Visa mynningseffekter från andra sp
|
||||
L["settings.effects.allflash.title"] = "Andras Ficklampor"
|
||||
L["settings.effects.allflash.desc"] = "Framställer ficklampor från alla spelare.\n\nPåverkar prestandan."
|
||||
|
||||
L["settings.effects.lod.title"] = "LOD-Avstånd (Level of Detail)"
|
||||
L["settings.effects.lod.desc"] = "Hur långt borta du behöver vara från modeller för att dem ska ändra till sina lägre kvalitets varianter utan tillbehör.\n\nLägre värden gör att modellerna ändras vid lägre avstånd, och kan förbättra prestandan.\n\nHögre värden kan påverka prestandan, men behåller dem högsta kvalitets modellerna laddade vid högre avstånd.\n\nAvståndet i TPIK påverkas också."
|
||||
|
||||
////////// Viewmodel Settings
|
||||
L["settings.tabname.vm"] = "Vymodell Inställningar"
|
||||
L["settings.tabname.vm.desc"] = "Justera diverse inställningar relaterade till vymodeller."
|
||||
|
@ -600,6 +600,9 @@ L["settings.convar_client"] = "Cwient wawiabwe"
|
||||
-- L["settings.effects.allflash.title"] = "Other's Flashlights"
|
||||
-- L["settings.effects.allflash.desc"] = "Renders the flashlights from all players.\n\nImpacts performance."
|
||||
|
||||
-- L["settings.effects.lod.title"] = "LOD (Level of Detail) Distance"
|
||||
-- L["settings.effects.lod.desc"] = "How far away you have to be from models for them to change into lower quality variants without attachments.\n\nLower values make the models change at lower distances, and could improve performance.\n\nHigher values could impact performance, but keeps the highest quality models loaded at further distances.\n\nTPIK distance is also affected."
|
||||
|
||||
////////// Viewmodel Settings
|
||||
-- L["settings.tabname.vm"] = "Viewmodel Settings"
|
||||
-- L["settings.tabname.vm.desc"] = "Alter various settings related to the viewmodels."
|
||||
|
@ -864,6 +864,9 @@ L["settings.desc"] = "简介"
|
||||
-- L["settings.effects.allflash.title"] = "Other's Flashlights"
|
||||
-- L["settings.effects.allflash.desc"] = "Renders the flashlights from all players.\n\nImpacts performance."
|
||||
|
||||
-- L["settings.effects.lod.title"] = "LOD (Level of Detail) Distance"
|
||||
-- L["settings.effects.lod.desc"] = "How far away you have to be from models for them to change into lower quality variants without attachments.\n\nLower values make the models change at lower distances, and could improve performance.\n\nHigher values could impact performance, but keeps the highest quality models loaded at further distances.\n\nTPIK distance is also affected."
|
||||
|
||||
////////// Viewmodel Settings
|
||||
-- L["settings.tabname.vm"] = "Viewmodel Settings"
|
||||
-- L["settings.tabname.vm.desc"] = "Alter various settings related to the viewmodels."
|
||||
|
@ -574,37 +574,35 @@ local ah = GetConVar("arc9_hud_arc9"):GetBool()
|
||||
self.FMHintTime = CurTime()
|
||||
end
|
||||
|
||||
-- local fmhintdrawtime = math.Clamp(1 - (self:GetReloadFinishTime() - CurTime()) / (self.ReloadTime * self:GetAnimationTime("reload")), 0, 1)
|
||||
-- local fmhintdrawanim = self:GetAnimationEntry(self:TranslateAnimation("reload"))
|
||||
|
||||
local bzoom = self:GetOwner():KeyPressed(IN_ZOOM)
|
||||
local batt = self:GetOwner():KeyDown(IN_ATTACK)
|
||||
|
||||
local fmc = GetConVar("arc9_center_firemode_time")
|
||||
|
||||
-- if self:GetOwner():KeyPressed(IN_ZOOM) or (fmhintdrawtime > 0.5 and fmhintdrawtime < 0.51) then fmhintignore() end
|
||||
|
||||
if bzoom or (self:GetSafe() and batt) then fmhintignore() end
|
||||
|
||||
local ft1000 = RealFrameTime() * 2000
|
||||
fmhint = math.max(0, fmhint - ft1000 * 1.25)
|
||||
|
||||
if self.FMHintTime and CurTime() > self.FMHintTime + 0.15 and CurTime() < self.FMHintTime + (fmc:GetFloat() or 1) + 0.15 then
|
||||
if self.FMHintTime and CurTime() > self.FMHintTime + 0.15 and CurTime() < self.FMHintTime + 0.15 + 1 then
|
||||
fmhint = math.min(255, fmhint + ft1000 * 2)
|
||||
end
|
||||
|
||||
if GetConVar("arc9_center_firemode"):GetBool() and fmhint > 0 then
|
||||
local text = self:GetFiremodeName()
|
||||
|
||||
surface.SetTextColor(0, 0, 0, fmhint)
|
||||
surface.SetDrawColor(255, 255, 255, fmhint)
|
||||
surface.SetFont("ARC9_10")
|
||||
local tw = surface.GetTextSize(text)
|
||||
surface.SetTextPos(scrw / 2 - tw / 2, scrh / 2 + ScreenScale(60))
|
||||
local blink = 255 * math.abs(math.sin(CurTime() * 10))
|
||||
|
||||
surface.SetFont("ARC9_10")
|
||||
|
||||
surface.SetDrawColor(255, 255, 255, fmhint)
|
||||
|
||||
surface.SetTextColor(0, 0, 0, fmhint) -- Black BG
|
||||
surface.SetTextPos(scrw / 2 - surface.GetTextSize(text) / 2, scrh / 2 + ScreenScale(60))
|
||||
surface.DrawText(text)
|
||||
|
||||
surface.SetTextColor(255, 255, 255, fmhint)
|
||||
surface.SetTextPos(scrw / 2 - tw / 2 - 2, scrh / 2 + ScreenScale(60) - 2)
|
||||
-- fmhint > 254 and blink or 255 -- if it should start blinking at 255 fmhint value
|
||||
|
||||
surface.SetTextColor(255, 255, 255, fmhint) -- White
|
||||
surface.SetTextPos(scrw / 2 - surface.GetTextSize(text) / 2 - 2, scrh / 2 + ScreenScale(60) - 2)
|
||||
surface.DrawText(text)
|
||||
end
|
||||
|
||||
|
@ -96,6 +96,14 @@ function SWEP:Deploy()
|
||||
if self:LookupPoseParameter("sights") != -1 then self.HasSightsPoseparam = true end
|
||||
if self:LookupPoseParameter("firemode") != -1 then self.HasFiremodePoseparam = true end
|
||||
|
||||
-- self.FMHintTimeP = self.FMHintTime or "N/A"
|
||||
|
||||
-- self.FMHintTime = CurTime()
|
||||
-- print( " " )
|
||||
-- print( "DEPLOYED WEAPON" )
|
||||
-- print( "Cur. " .. string.format( "%.3f", self.FMHintTime ) )
|
||||
-- print( "Pre. " .. string.format( "%.3f", self.FMHintTimeP ) )
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
|
@ -56,6 +56,14 @@ function SWEP:SwitchFiremode()
|
||||
self:CallOnClient("InvalidateCache")
|
||||
end
|
||||
|
||||
-- self.FMHintTimeP = self.FMHintTime or "N/A"
|
||||
|
||||
-- self.FMHintTime = CurTime()
|
||||
-- print( " " )
|
||||
-- print( "SWITCHED FIRING MODE" )
|
||||
-- print( "Cur. " .. string.format( "%.3f", self.FMHintTime ) )
|
||||
-- print( "Pre. " .. string.format( "%.3f", self.FMHintTimeP ) )
|
||||
|
||||
end
|
||||
|
||||
function SWEP:SetFiremodePose(wm)
|
||||
@ -140,7 +148,15 @@ function SWEP:ToggleSafety(onoff)
|
||||
self:ExitSights()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- self.FMHintTimeP = self.FMHintTime or "N/A"
|
||||
|
||||
-- self.FMHintTime = CurTime()
|
||||
-- print( " " )
|
||||
-- print( "TOGGLED SAFETY" )
|
||||
-- print( "Cur. " .. string.format( "%.3f", self.FMHintTime ) )
|
||||
-- print( "Pre. " .. string.format( "%.3f", self.FMHintTimeP ) )
|
||||
|
||||
end
|
||||
|
||||
function SWEP:ThinkFiremodes()
|
||||
@ -149,13 +165,11 @@ function SWEP:ThinkFiremodes()
|
||||
|
||||
if self:GetOwner():KeyPressed(IN_ZOOM) and self:GetOwner():KeyDown(IN_USE) then
|
||||
self:ToggleSafety()
|
||||
self.FMHintTime = CurTime()
|
||||
return
|
||||
end
|
||||
|
||||
if self:GetOwner():KeyPressed(IN_ZOOM) then
|
||||
self:SwitchFiremode()
|
||||
self.FMHintTime = CurTime()
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -1495,6 +1495,8 @@ SWEP.Secondary.Ammo = "none"
|
||||
|
||||
SWEP.DrawCrosshair = true
|
||||
|
||||
SWEP.FMHintTime = 0
|
||||
|
||||
SWEP.ARC9 = true
|
||||
|
||||
SWEP.m_bPlayPickupSound = false
|
||||
|
Loading…
Reference in New Issue
Block a user