tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Collisiongroup tweaks (#8110)

Browse Source
This commit is contained in:
Jacob Tong
2022-05-11 17:24:00 -07:00
committed by GitHub
parent deaecf746e
commit e6e9f169a0
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ public enum CollisionGroup
// 32 possible groups // 32 possible groups
AllMask = -1, AllMask = -1,
MobMask = Impassable | MidImpassable | LowImpassable, MobMask = Impassable | HighImpassable | MidImpassable | LowImpassable,
MobLayer = Opaque | BulletImpassable, MobLayer = Opaque | BulletImpassable,
SmallMobMask = Impassable | LowImpassable, SmallMobMask = Impassable | LowImpassable,
SmallMobLayer = Opaque | BulletImpassable, SmallMobLayer = Opaque | BulletImpassable,
@@ -57,6 +57,7 @@ public enum CollisionGroup
GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable, GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
HalfWallLayer = MidImpassable | LowImpassable, HalfWallLayer = MidImpassable | LowImpassable,
FullTileMask = Impassable | HighImpassable | MidImpassable | LowImpassable, FullTileMask = Impassable | HighImpassable | MidImpassable | LowImpassable,
FullTileLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
SubfloorMask = Impassable | LowImpassable SubfloorMask = Impassable | LowImpassable
} }

3
Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
View File

@@ -48,8 +48,7 @@
!type:PhysShapeAabb !type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
mask: mask:
- Impassable - TabletopMachineMask
- HighImpassable
layer: layer:
- AirlockLayer - AirlockLayer
- type: Door - type: Door

2
Resources/Prototypes/Entities/Structures/Machines/recycler.yml
View File

@@ -20,7 +20,7 @@
id: brrt id: brrt
hard: false hard: false
layer: layer:
- FullTileMask - FullTileLayer
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,0.49" bounds: "-0.49,-0.49,0.49,0.49"

4
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
View File

@@ -24,9 +24,9 @@
!type:PhysShapeAabb !type:PhysShapeAabb
bounds: "-0.25,-0.45,0.25,0.45" bounds: "-0.25,-0.45,0.25,0.45"
mask: mask:
- FullTileMask - MachineMask
layer: layer:
- WallLayer - MachineLayer
mass: 100 mass: 100
- type: Destructible - type: Destructible
thresholds: thresholds:

4
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
View File

@@ -13,7 +13,7 @@
mask: mask:
- FullTileMask - FullTileMask
layer: layer:
- FullTileMask - WallLayer
- type: InteractionOutline - type: InteractionOutline
- type: Anchorable - type: Anchorable
- type: Sprite - type: Sprite
@@ -50,7 +50,7 @@
mask: mask:
- FullTileMask - FullTileMask
layer: layer:
- FullTileMask - GlassLayer
- type: Transform - type: Transform
anchored: true anchored: true
- type: Sprite - type: Sprite

2
Resources/Prototypes/Entities/Structures/Walls/girder.yml
View File

@@ -18,7 +18,7 @@
mask: mask:
- MachineMask - MachineMask
layer: layer:
- FullTileMask - GlassAirlockLayer
- type: InteractionOutline - type: InteractionOutline
- type: Construction - type: Construction
graph: Girder graph: Girder

4
Resources/Prototypes/Entities/Structures/Windows/window.yml
View File

@@ -117,10 +117,10 @@
!type:PhysShapeAabb !type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,-0.3" bounds: "-0.49,-0.49,0.49,-0.3"
mass: 50 mass: 50
layer:
- GlassLayer
mask: mask:
- FullTileMask - FullTileMask
layer:
- GlassLayer
- type: Repairable - type: Repairable
- type: Damageable - type: Damageable
damageContainer: Inorganic damageContainer: Inorganic