zedtest3 #3

Merged
dkanus merged 15 commits from :zedtest3 into master 2022-01-21 11:56:43 +03:00
Showing only changes of commit 692b66b9a6 - Show all commits

View File

@ -536,16 +536,22 @@ simulated function NonRelevantSpeedupTick(float deltaTime){
SetGroundSpeed(GetOriginalGroundSpeed()); SetGroundSpeed(GetOriginalGroundSpeed());
} }
} }
// Kill zed if it has been bleeding long enough // Kill zed if it has been bleeding long enough
simulated function BleedOutTick(float deltaTick){ simulated function BleedOutTick(float deltaTick)
if(Role < ROLE_Authority || !bDecapitated) return; {
if(BleedOutTime <= 0 || Level.TimeSeconds < BleedOutTime) return; if (Role < ROLE_Authority || !bDecapitated)
if(LastDamagedBy != none) return;
Died(LastDamagedBy.Controller, class'DamTypeBleedOut', Location); if (BleedOutTime <= 0 || Level.TimeSeconds < BleedOutTime)
else return;
Died(none, class'DamTypeBleedOut', Location); if (LastDamagedBy != none)
BleedOutTime = 0; Died(LastDamagedBy.Controller, class'DamTypeBleedOut', Location);
// else we can say we killed ourselves, none -> self
else
Died(self, class'DamTypeBleedOut', Location);
BleedOutTime = 0;
} }
// FX-stuff TWI did in the tick, unchanged // FX-stuff TWI did in the tick, unchanged
simulated function TWIFXTick(float deltaTime){ simulated function TWIFXTick(float deltaTime){
if(Level.netMode == NM_DedicatedServer) return; if(Level.netMode == NM_DedicatedServer) return;