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

Merge pull request #261 from Filipao5036/Filipao5036-patch-1

Browse Source 
Akimbo Trigger Animations Compatibility
This commit is contained in:
Twilight Sparkle 2024-10-03 23:21:24 -03:00 committed by GitHub
commit 787524b781
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lua/weapons/arc9_base/sh_shoot.lua
View File

@ -276,6 +276,8 @@ function SWEP:PrimaryAttack()
if self:SprintLock() then return end
local nthShot = self:GetNthShot()
if self:HasAmmoInClip() then
if processedValue(self,"TriggerDelay") then
local primedAttack = self:GetPrimedAttack()
@ -285,8 +287,28 @@ function SWEP:PrimaryAttack()
self:SetTriggerDelay(time + processedValue(self,"TriggerDelayTime"))
local isEmpty = self:Clip1() == processedValue(self, "AmmoPerShot")
local anim = "trigger"
if processedValue(self,"Akimbo", true) then
if processedValue(self, "AkimboBoth", true) then
anim = "trigger_both"
elseif nthShot % 2 == 0 then
anim = "trigger_right"
else
anim = "trigger_left"
end
end
if processedValue(self,"TriggerStartFireAnim", true) then
anim = "fire"
if processedValue(self,"Akimbo", true) then
if processedValue(self, "AkimboBoth", true) then
anim = "fire_both"
elseif nthShot % 2 == 0 then
anim = "fire_right"
else
anim = "fire_left"
end
else anim = "fire"
end
end
if self:HasAnimation(anim .. "_empty") and isEmpty then
anim = anim .. "_empty"
@ -317,7 +339,7 @@ end
function SWEP:DoPrimaryAttack()
local processedValue = self.GetProcessedValue
if self.FireInterruptInspect and self:GetInspecting() then self:CancelInspect() end
if self:StillWaiting() then return end
if self.NoFireDuringSighting and (self:GetInSights() and self:GetSightAmount() < 0.8 or false) then return end
@ -1086,4 +1108,4 @@ hook.Add("PostEntityTakeDamage", "ARC9_AP", function(ent, dmginfo, took)
end
ent.ARC9APDamage = nil
end
end)
end)