Flesh Stun Fix (#39324)
This commit is contained in:
committed by
GitHub
parent
66f64bc952
commit
6ffec751ee
@@ -4,6 +4,7 @@ using Content.Shared.Damage.Systems;
|
||||
using Content.Shared.Mobs;
|
||||
using Content.Shared.Mobs.Systems;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
namespace Content.Client.Damage.Systems;
|
||||
|
||||
@@ -104,6 +105,8 @@ public sealed partial class StaminaSystem : SharedStaminaSystem
|
||||
|
||||
private void PlayAnimation(Entity<StaminaComponent, SpriteComponent> entity)
|
||||
{
|
||||
DebugTools.Assert(entity.Comp1.CritThreshold > entity.Comp1.AnimationThreshold, $"Animation threshold on {ToPrettyString(entity)} was not less than the crit threshold. This will cause errors, animation has been cancelled.");
|
||||
|
||||
var step = Math.Clamp((entity.Comp1.StaminaDamage - entity.Comp1.AnimationThreshold) /
|
||||
(entity.Comp1.CritThreshold - entity.Comp1.AnimationThreshold),
|
||||
0f,
|
||||
|
||||
@@ -113,6 +113,7 @@
|
||||
10: Dead
|
||||
- type: Stamina
|
||||
critThreshold: 10
|
||||
animationThreshold: 1
|
||||
- type: DamageStateVisuals
|
||||
states:
|
||||
Alive:
|
||||
@@ -3143,7 +3144,7 @@
|
||||
factions:
|
||||
- Syndicate
|
||||
- type: Access
|
||||
tags:
|
||||
tags:
|
||||
- NuclearOperative
|
||||
- SyndicateAgent
|
||||
- type: MeleeWeapon
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
75: Dead
|
||||
- type: Stamina
|
||||
critThreshold: 50
|
||||
animationThreshold: 25
|
||||
- type: Butcherable
|
||||
spawned:
|
||||
- id: FoodMeat
|
||||
@@ -240,6 +241,7 @@
|
||||
75: Dead
|
||||
- type: Stamina
|
||||
critThreshold: 50
|
||||
animationThreshold: 25
|
||||
- type: Butcherable
|
||||
spawned:
|
||||
- id: FoodMeat
|
||||
@@ -359,4 +361,4 @@
|
||||
30: Dead
|
||||
- type: MovementSpeedModifier
|
||||
baseWalkSpeed: 2
|
||||
baseSprintSpeed: 2.5
|
||||
baseSprintSpeed: 2.5
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
recursive: false
|
||||
- type: Stamina
|
||||
critThreshold: 15
|
||||
animationThreshold: 5
|
||||
- type: MovementAlwaysTouching
|
||||
- type: DamageStateVisuals
|
||||
states:
|
||||
|
||||
Reference in New Issue
Block a user