Fixed computers and vending machines collision (#350)

* Fixed computers and vending machines collision

* Also fixed mapped entities
This commit is contained in:
DamianX
2019-09-20 19:42:01 +02:00
committed by Pieter-Jan Briers
parent 892d0ee162
commit de141c49c5
3 changed files with 18 additions and 6 deletions

View File

@@ -1833,7 +1833,9 @@ entities:
type: Transform type: Transform
- shapes: - shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
layer: 8 bounds: "-0.5,-0.25,0.5,0.25"
mask: 19
layer: 16
type: Collidable type: Collidable
- type: computerAlert - type: computerAlert
uid: 154 uid: 154
@@ -1844,7 +1846,9 @@ entities:
type: Transform type: Transform
- shapes: - shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
layer: 8 bounds: "-0.5,-0.25,0.5,0.25"
mask: 19
layer: 16
type: Collidable type: Collidable
- type: table - type: table
uid: 155 uid: 155
@@ -5049,7 +5053,9 @@ entities:
type: Sprite type: Sprite
- shapes: - shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
layer: 8 bounds: "-0.5,-0.25,0.5,0.25"
mask: 19
layer: 16
type: Collidable type: Collidable
- type: vending_machine_youtool - type: vending_machine_youtool
uid: 419 uid: 419
@@ -5062,7 +5068,9 @@ entities:
type: Sprite type: Sprite
- shapes: - shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
layer: 8 bounds: "-0.5,-0.25,0.5,0.25"
mask: 19
layer: 16
type: Collidable type: Collidable
- type: Generator - type: Generator
uid: 420 uid: 420

View File

@@ -6,7 +6,9 @@
- type: Collidable - type: Collidable
shapes: shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
layer: 8 bounds: "-0.5,-0.25,0.5,0.25"
mask: 19
layer: 16
- type: Icon - type: Icon
sprite: Buildings/computer.rsi sprite: Buildings/computer.rsi
state: computer state: computer

View File

@@ -16,7 +16,9 @@
- type: Collidable - type: Collidable
shapes: shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
layer: 8 bounds: "-0.5,-0.25,0.5,0.25"
mask: 19
layer: 16
- type: SnapGrid - type: SnapGrid
offset: Center offset: Center
- type: Damageable - type: Damageable