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

Fixed player-controlled creatures being able to do damage to themselves and RepairTools causing damage to the user regardless of the user's skills.

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-04-18 15:04:18 +03:00
parent edf5bacc89
commit eed7b72b4e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+5 -2
View File
@@ -910,10 +910,13 @@ namespace Barotrauma
Vector2 attackPos = Vector2 attackPos =
attackLimb.SimPosition + Vector2.Normalize(cursorPosition - attackLimb.Position) * ConvertUnits.ToSimUnits(attackLimb.attack.Range); attackLimb.SimPosition + Vector2.Normalize(cursorPosition - attackLimb.Position) * ConvertUnits.ToSimUnits(attackLimb.attack.Range);
List<Body> ignoredBodies = AnimController.Limbs.Select(l => l.body.FarseerBody).ToList();
ignoredBodies.Add(AnimController.Collider.FarseerBody);
var body = Submarine.PickBody( var body = Submarine.PickBody(
attackLimb.SimPosition, attackLimb.SimPosition,
attackPos, attackPos,
AnimController.Limbs.Select(l => l.body.FarseerBody).ToList(), ignoredBodies,
Physics.CollisionCharacter | Physics.CollisionWall); Physics.CollisionCharacter | Physics.CollisionWall);
IDamageable attackTarget = null; IDamageable attackTarget = null;
@@ -928,7 +931,7 @@ namespace Barotrauma
body = Submarine.PickBody( body = Submarine.PickBody(
attackLimb.SimPosition - ((Submarine)body.UserData).SimPosition, attackLimb.SimPosition - ((Submarine)body.UserData).SimPosition,
attackPos - ((Submarine)body.UserData).SimPosition, attackPos - ((Submarine)body.UserData).SimPosition,
AnimController.Limbs.Select(l => l.body.FarseerBody).ToList(), ignoredBodies,
Physics.CollisionWall); Physics.CollisionWall);
if (body != null) if (body != null)
Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs
+1
View File
@@ -142,6 +142,7 @@ namespace Barotrauma.Items.Components
if (Rand.Range(0.0f, 0.5f) > degreeOfSuccess) continue; if (Rand.Range(0.0f, 0.5f) > degreeOfSuccess) continue;
ignoredBodies.Add(limb.body.FarseerBody); ignoredBodies.Add(limb.body.FarseerBody);
} }
ignoredBodies.Add(character.AnimController.Collider.FarseerBody);
IsActive = true; IsActive = true;
activeTimer = 0.1f; activeTimer = 0.1f;