Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #993 from ComicIronic/add_collision_group_tag

Browse Source 
Mark CollisionGroup as flag names for engine collision masks
This commit is contained in:
Víctor Aguilera Puerto
2020-05-25 02:24:15 +02:00
committed by GitHub
parent 0c4527197b b54643b243
commit afe5aa3ece
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Physics/CollisionGroup.cs
View File

@@ -1,6 +1,8 @@
using System; using System;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Map; using Robust.Shared.Map;
using RobustPhysics = Robust.Shared.Physics;
using Robust.Shared.Serialization;
namespace Content.Shared.Physics namespace Content.Shared.Physics
{ {
@@ -8,6 +10,7 @@ namespace Content.Shared.Physics
/// Defined collision groups for the physics system. /// Defined collision groups for the physics system.
/// </summary> /// </summary>
[Flags, PublicAPI] [Flags, PublicAPI]
[FlagsFor(typeof(RobustPhysics.CollisionLayer)), FlagsFor(typeof(RobustPhysics.CollisionMask))]
public enum CollisionGroup public enum CollisionGroup
{ {
None = 0, None = 0,

7
Resources/Prototypes/Entities/Buildings/walls.yml
View File

@@ -20,7 +20,12 @@
- type: Collidable - type: Collidable
shapes: shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
layer: 31 layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- type: Damageable - type: Damageable
- type: Destructible - type: Destructible
thresholdvalue: 100 thresholdvalue: 100