From d34c783c30d620b8392ef356e38ef869d9b3f9bf Mon Sep 17 00:00:00 2001 From: juanjp600 Date: Wed, 6 Dec 2017 13:33:54 -0300 Subject: [PATCH] Removed collision from wall gaps --- .../Source/Items/Components/Holdable/RepairTool.cs | 2 +- Barotrauma/BarotraumaShared/Source/Map/Structure.cs | 7 ++++++- Barotrauma/BarotraumaShared/Source/Physics/Physics.cs | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs index ba4afeea3..b6bc208fc 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs @@ -176,7 +176,7 @@ namespace Barotrauma.Items.Components } Body targetBody = Submarine.PickBody(rayStart, rayEnd, ignoredBodies, - Physics.CollisionWall | Physics.CollisionCharacter | Physics.CollisionItem | Physics.CollisionLevel, false); + Physics.CollisionWall | Physics.CollisionCharacter | Physics.CollisionItem | Physics.CollisionLevel | Physics.CollisionRepair, false); if (targetBody == null || targetBody.UserData == null) return; diff --git a/Barotrauma/BarotraumaShared/Source/Map/Structure.cs b/Barotrauma/BarotraumaShared/Source/Map/Structure.cs index c7501b38d..a9f7f8330 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Structure.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Structure.cs @@ -774,7 +774,12 @@ namespace Barotrauma //if the section has holes (or is just one big hole with no bodies), //we need a sensor for repairtools to be able to target the structure - if (hasHoles || !bodies.Any()) CreateRectBody(rect).IsSensor = true; + if (hasHoles || !bodies.Any()) + { + Body sensorBody = CreateRectBody(rect); + sensorBody.CollisionCategories = Physics.CollisionRepair; + sensorBody.IsSensor = true; + } } private Body CreateRectBody(Rectangle rect) diff --git a/Barotrauma/BarotraumaShared/Source/Physics/Physics.cs b/Barotrauma/BarotraumaShared/Source/Physics/Physics.cs index 01f0a8fab..17cf3e840 100644 --- a/Barotrauma/BarotraumaShared/Source/Physics/Physics.cs +++ b/Barotrauma/BarotraumaShared/Source/Physics/Physics.cs @@ -13,6 +13,7 @@ namespace Barotrauma public const Category CollisionItem = Category.Cat5; public const Category CollisionProjectile = Category.Cat6; public const Category CollisionLevel = Category.Cat7; + public const Category CollisionRepair = Category.Cat8; public static float DisplayToRealWorldRatio = 1.0f / 80.0f;