Unstable v0.19.1.0

This commit is contained in:
Juan Pablo Arce
2022-08-19 13:59:08 -03:00
parent 6b55adcdd9
commit 1219615d64
192 changed files with 3875 additions and 2648 deletions
@@ -87,11 +87,11 @@ namespace Barotrauma
if (_attackLimb != value)
{
_previousAttackLimb = _attackLimb;
_previousAttackLimb?.AttachedRope?.Snap();
if (_previousAttackLimb != null && _previousAttackLimb.attack.SnapRopeOnNewAttack) { _previousAttackLimb.AttachedRope?.Snap(); }
}
else if (_attackLimb != null && _attackLimb.attack.CoolDownTimer <= 0)
{
_attackLimb.AttachedRope?.Snap();
if (_attackLimb != null && _attackLimb.attack.SnapRopeOnNewAttack) { _attackLimb.AttachedRope?.Snap(); }
}
_attackLimb = value;
attackVector = null;
@@ -3660,7 +3660,7 @@ namespace Barotrauma
targetDir = Vector2.UnitY;
}
}
float margin = 30000;
float margin = Level.OutsideBoundsCurrentMargin;
if (pos.X < -margin)
{
// Too far left
@@ -197,6 +197,10 @@ namespace Barotrauma
return;
}
character.SelectedItem = null;
if (character.SelectedSecondaryItem != null && !character.SelectedSecondaryItem.IsLadder)
{
character.SelectedSecondaryItem = null;
}
if (Target is Entity e)
{
if (e.Removed)