StunnableComponent cleanup, proper prediction for stuns and slips. (#3552)

2021-03-08 05:00:50 +01:00
parent 0ad70d62ec
commit 6c77801d90
13 changed files with 243 additions and 226 deletions
--- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
@@ -106,12 +106,18 @@
  - type: Slippery
    paralyzeTime: 2.5
  - type: Physics
+    bodyType: Dynamic
+    mass: 5
    fixtures:
-    - shape:
-        !type:PhysShapeAabb
+      - shape:
+          !type:PhysShapeAabb
          bounds: "-0.3,-0.4,0.3,0.4"
-      layer:
-      - MobImpassable
+        layer:
+          - SmallImpassable
+        mask:
+          - SmallImpassable
+          - MobImpassable
+        hard: false

 - type: entity
  name: soap
--- a/Resources/Prototypes/Entities/puddle.yml
+++ b/Resources/Prototypes/Entities/puddle.yml
@@ -20,9 +20,12 @@
    - shape:
        !type:PhysShapeAabb
          bounds: "-0.4,-0.4,0.4,0.4"
-      hard: false
      layer:
-      - MobImpassable
+        - SmallImpassable
+      mask:
+        - SmallImpassable
+        - MobImpassable
+      hard: false

 - type: entity
  name: puddle