edshot99/ArcCW
1
0
Fork 0
forked from HaodongMo/ArcCW
Code Pull Requests Activity

Network TP anims, clamp playbackrate

Browse Source
This commit is contained in:
TheOnly8Z 2021-04-21 20:02:04 +08:00
parent f52ef18eca
commit e659be3d4c
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/arccw/server/sv_net.lua
View File

@ -32,4 +32,6 @@ util.AddNetworkString("arccw_ttt_bodyattinfo")
util.AddNetworkString("arccw_networksound")
util.AddNetworkString("arccw_togglenum")
util.AddNetworkString("arccw_togglenum")
util.AddNetworkString("arccw_networktpanim")

31
lua/weapons/arccw_base/sh_anim.lua
View File

@ -222,12 +222,12 @@ function SWEP:PlayAnimation(key, mult, pred, startfrom, tt, skipholster, ignorer
timer.Simple(0, function()
vm:SendViewModelMatchingSequence(seq)
local dur = vm:SequenceDuration()
vm:SetPlaybackRate(math.Clamp(dur / (ttime + startfrom), 0, 100))
vm:SetPlaybackRate(math.Clamp(dur / (ttime + startfrom), 0, 10))
end)
else
vm:SendViewModelMatchingSequence(seq)
local dur = vm:SequenceDuration()
vm:SetPlaybackRate(math.Clamp(dur / (ttime + startfrom), 0, 100))
vm:SetPlaybackRate(math.Clamp(dur / (ttime + startfrom), 0, 10))
self.LastAnimStartTime = CurTime()
self.LastAnimFinishTime = CurTime() + (dur * mult)
end
@ -265,14 +265,16 @@ function SWEP:PlayAnimation(key, mult, pred, startfrom, tt, skipholster, ignorer
-- end
if anim.TPAnim then
if anim.TPAnimStartTime then
local aseq = self:GetOwner():SelectWeightedSequence(anim.TPAnim)
if aseq then
self:GetOwner():AddVCDSequenceToGestureSlot( GESTURE_SLOT_ATTACK_AND_RELOAD, aseq, anim.TPAnimStartTime, true )
local aseq = self:GetOwner():SelectWeightedSequence(anim.TPAnim)
if aseq then
self:GetOwner():AddVCDSequenceToGestureSlot( GESTURE_SLOT_ATTACK_AND_RELOAD, aseq, anim.TPAnimStartTime or 0, true )
if !game.SinglePlayer() and SERVER then
net.Start("arccw_networktpanim")
net.WriteEntity(self:GetOwner())
net.WriteUInt(aseq, 16)
net.WriteFloat(anim.TPAnimStartTime or 0)
net.SendOmit(self:GetOwner())
end
else
local aseq = self:GetOwner():SelectWeightedSequence(anim.TPAnim)
self:GetOwner():AddVCDSequenceToGestureSlot( GESTURE_SLOT_ATTACK_AND_RELOAD, aseq, 0, true )
end
end
@ -389,4 +391,15 @@ function SWEP:NextAnimation()
local anim = table.remove(self.AnimQueue, 1)
self:PlayAnimation(anim.k, anim.m, anim.p, 0, anim.sf)
end
if CLIENT then
net.Receive("arccw_networktpanim", function()
local ent = net.ReadEntity()
local aseq = net.ReadUInt(16)
local start = net.ReadFloat()
if IsValid(ent) then
ent:AddVCDSequenceToGestureSlot(GESTURE_SLOT_ATTACK_AND_RELOAD, aseq, start, true)
end
end)
end