Fix blunt stamina double dipping (#4419)
* Fix StaminaRes double dipping * Fix Oni Species Description
This commit is contained in:
parent
317040cbde
commit
f47dd7b21f
|
|
@ -542,7 +542,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
|
|||
// If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
|
||||
if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))
|
||||
{
|
||||
_stamina.TakeStaminaDamage(target.Value, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid);
|
||||
_stamina.TakeStaminaDamage(target.Value, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid, ignoreResist: true); // DeltaV - No Stamina Resistance Doubledipping
|
||||
}
|
||||
|
||||
if (meleeUid == user)
|
||||
|
|
@ -697,7 +697,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
|
|||
// If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
|
||||
if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))
|
||||
{
|
||||
_stamina.TakeStaminaDamage(entity, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid);
|
||||
_stamina.TakeStaminaDamage(entity, (bluntDamage * component.BluntStaminaDamageFactor).Float(), visual: false, source: user, with: meleeUid == user ? null : meleeUid, ignoreResist: true); // DeltaV - No Stamina Resistance Doubledipping
|
||||
}
|
||||
|
||||
appliedDamage += damageResult;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
- type: Sprite
|
||||
scale: 1.2, 1.2
|
||||
- type: PlayerToolModifier
|
||||
pryTimeMultiplier: 0.6
|
||||
pryTimeMultiplier: 0.5
|
||||
- type: PlayerAccuracyModifier
|
||||
spreadMultiplier: 15
|
||||
maxSpreadAngle: 180
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
- Due to their big size, they can easily carry, shove, and pull any other morphotypes.
|
||||
- They are harder to shove.
|
||||
- Slightly more stamina than Humans.
|
||||
- They have an easier time prying open doors, taking around 50% less time than other species.
|
||||
- Deal [color=#1e90ff]25% more stamina damage[/color], excluding truncheons and similar.
|
||||
- They have an easier time prying open doors, taking 50% less time than other species.
|
||||
|
||||
## Drawbacks
|
||||
- Their accuracy with guns is terrible.
|
||||
|
|
|
|||
Loading…
Reference in New Issue