vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Huskification bugfixes

Browse Source
This commit is contained in:
Regalis
2016-09-07 18:19:42 +03:00
parent d884f23a72
commit 9463b18993
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Subsurface/Source/Characters/Character.cs
View File

@@ -1608,7 +1608,7 @@ namespace Barotrauma
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);
}
@@ -1856,7 +1856,7 @@ namespace Barotrauma
break;
case NetworkEventType.EntityUpdate:
Enabled = true;
if (GameMain.Client != null) Enabled = true;
Vector2 relativeCursorPos = Vector2.Zero;

11
Subsurface/Source/Characters/HuskInfection.cs
View File

@@ -99,14 +99,6 @@ namespace Barotrauma
}
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);
torso.body.SetTransform(torso.SimPosition, 0.0f);
var newLimb = new Limb(character, limbElement);
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.AddJoint(jointElement);