Huskification bugfixes
This commit is contained in:
@@ -1608,7 +1608,7 @@ namespace Barotrauma
|
|||||||
|
|
||||||
message.WriteRangedSingle(health, minHealth, maxHealth, 8);
|
message.WriteRangedSingle(health, minHealth, maxHealth, 8);
|
||||||
|
|
||||||
if (AnimController.StunTimer <= 0.0f && bleeding <= 0.0f && oxygen > 99.0f)
|
if (AnimController.StunTimer <= 0.0f && bleeding <= 0.0f && oxygen > 99.0f && huskInfection == null)
|
||||||
{
|
{
|
||||||
message.Write(true);
|
message.Write(true);
|
||||||
}
|
}
|
||||||
@@ -1856,7 +1856,7 @@ namespace Barotrauma
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
case NetworkEventType.EntityUpdate:
|
case NetworkEventType.EntityUpdate:
|
||||||
Enabled = true;
|
if (GameMain.Client != null) Enabled = true;
|
||||||
|
|
||||||
Vector2 relativeCursorPos = Vector2.Zero;
|
Vector2 relativeCursorPos = Vector2.Zero;
|
||||||
|
|
||||||
|
|||||||
@@ -99,14 +99,6 @@ namespace Barotrauma
|
|||||||
}
|
}
|
||||||
|
|
||||||
character.AddDamage(CauseOfDeath.Husk, 0.5f*deltaTime, null);
|
character.AddDamage(CauseOfDeath.Husk, 0.5f*deltaTime, null);
|
||||||
|
|
||||||
if (character.AnimController.limbJoints[0].LimitEnabled &&
|
|
||||||
(character.AnimController.CurrentHull == null ||
|
|
||||||
character.AnimController.CurrentHull.LethalPressure > 50.0f))
|
|
||||||
{
|
|
||||||
character.BreakJoints();
|
|
||||||
character.AnimController.limbJoints.Last().LimitEnabled = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -142,11 +134,10 @@ namespace Barotrauma
|
|||||||
}
|
}
|
||||||
|
|
||||||
var torso = character.AnimController.GetLimb(LimbType.Torso);
|
var torso = character.AnimController.GetLimb(LimbType.Torso);
|
||||||
torso.body.SetTransform(torso.SimPosition, 0.0f);
|
|
||||||
|
|
||||||
var newLimb = new Limb(character, limbElement);
|
var newLimb = new Limb(character, limbElement);
|
||||||
newLimb.body.Submarine = character.Submarine;
|
newLimb.body.Submarine = character.Submarine;
|
||||||
newLimb.body.SetTransform(torso.SimPosition, 0.0f);
|
newLimb.body.SetTransform(torso.SimPosition, torso.Rotation);
|
||||||
|
|
||||||
character.AnimController.AddLimb(newLimb);
|
character.AnimController.AddLimb(newLimb);
|
||||||
character.AnimController.AddJoint(jointElement);
|
character.AnimController.AddJoint(jointElement);
|
||||||
|
|||||||
Reference in New Issue
Block a user