Unstable v0.19.1.0
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user