Properly fix chair collision & disallow pulling objects you're buckled to (#3241)
Co-authored-by: cyclowns <cyclowns@protonmail.ch>
This commit is contained in:
@@ -15,13 +15,6 @@
|
||||
bounds: "-0.5,-0.25,0.5,0.25"
|
||||
mask:
|
||||
- Impassable
|
||||
- MobImpassable
|
||||
- VaultImpassable
|
||||
- SmallImpassable
|
||||
layer:
|
||||
- Opaque
|
||||
- Impassable
|
||||
- MobImpassable
|
||||
- VaultImpassable
|
||||
- SmallImpassable
|
||||
- type: Sprite
|
||||
@@ -52,9 +45,12 @@
|
||||
color: "#8e9799"
|
||||
- type: Physics
|
||||
shapes:
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.45, -0.45, 0.05, 0.45"
|
||||
layer: [ Passable ]
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.45, -0.45, 0.05, 0.45"
|
||||
mask:
|
||||
- Impassable
|
||||
- VaultImpassable
|
||||
- SmallImpassable
|
||||
|
||||
- type: entity
|
||||
name: stool
|
||||
@@ -67,9 +63,12 @@
|
||||
color: "#8e9799"
|
||||
- type: Physics
|
||||
shapes:
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.5, -0.25, 0.05, 0.25"
|
||||
layer: [ Passable ]
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.5, -0.25, 0.05, 0.25"
|
||||
mask:
|
||||
- Impassable
|
||||
- VaultImpassable
|
||||
- SmallImpassable
|
||||
|
||||
- type: entity
|
||||
name: bar stool
|
||||
@@ -81,9 +80,12 @@
|
||||
color: "white"
|
||||
- type: Physics
|
||||
shapes:
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.5, -0.2, 0.2, 0.25"
|
||||
layer: [ Passable ]
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.5, -0.2, 0.2, 0.25"
|
||||
mask:
|
||||
- Impassable
|
||||
- VaultImpassable
|
||||
- SmallImpassable
|
||||
|
||||
- type: entity
|
||||
name: white office chair
|
||||
@@ -96,9 +98,12 @@
|
||||
state: officechair_white
|
||||
- type: Physics
|
||||
shapes:
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.49, -0.25, 0.37, 0.25"
|
||||
layer: [ Passable ]
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.49, -0.25, 0.37, 0.25"
|
||||
mask:
|
||||
- Impassable
|
||||
- VaultImpassable
|
||||
- SmallImpassable
|
||||
|
||||
- type: entity
|
||||
name: dark office chair
|
||||
@@ -118,9 +123,12 @@
|
||||
state: comfychair_preview
|
||||
- type: Physics
|
||||
shapes:
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.45, -0.3, 0.35, 0.3"
|
||||
layer: [ Passable ]
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.45, -0.3, 0.35, 0.3"
|
||||
mask:
|
||||
- Impassable
|
||||
- VaultImpassable
|
||||
- SmallImpassable
|
||||
|
||||
- type: entity
|
||||
name: wooden chair
|
||||
@@ -132,6 +140,9 @@
|
||||
color: "white"
|
||||
- type: Physics
|
||||
shapes:
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.37, -0.25, 0.49, 0.24"
|
||||
layer: [ Passable ]
|
||||
- !type:PhysShapeAabb
|
||||
bounds: "-0.37, -0.25, 0.49, 0.24"
|
||||
mask:
|
||||
- Impassable
|
||||
- VaultImpassable
|
||||
- SmallImpassable
|
||||
|
||||
Reference in New Issue
Block a user