Allows objects to be pulled round corners (#7541)

* allow corner pulling for BaseStructureDynamic's children * corner pulling pass over all Pullable component prototypes
2022-04-14 03:28:32 +01:00
parent 2a128ca006
commit 061bd8bb21
32 changed files with 90 additions and 9 deletions
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
@@ -20,6 +20,8 @@
        mass: 150
        layer:
        - SmallImpassable
+        mask:
+        - VaultImpassable
    - type: Nuke
      # ~50 tile radius in open space
      # close to defaulkt max cap.
@@ -65,6 +67,8 @@
        mass: 150
        layer:
        - SmallImpassable
+        mask:
+        - VaultImpassable
    - type: SolutionContainerManager
      solutions:
        tank:
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -51,6 +51,9 @@
      - Wringer
  - type: Physics
    bodyType: Dynamic
+    fixedRotation: false
+  - type: Transform
+    noRot: true
  - type: Fixtures
    fixtures:
    - shape:
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -27,6 +27,9 @@
  - type: MovedByPressure
  - type: Physics
    bodyType: Dynamic
+    fixedRotation: false
+  - type: Transform
+    noRot: true
  - type: Fixtures
    fixtures:
    - shape:
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifacts.yml
@@ -11,6 +11,8 @@
      state: ano01
    - type: Physics
      bodyType: Dynamic
+    - type: Transform
+      noRot: true
    - type: Fixtures
      fixtures:
        - shape:
--- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml
@@ -9,6 +9,8 @@
    sprite: Structures/Decoration/banner.rsi
    state: banner
    netsync: false
+  - type: Transform
+    noRot: true
  - type: Fixtures
    fixtures:
    - shape:
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -6,10 +6,12 @@
  components:
  - type: Transform
    anchored: true
+    noRot: true
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -10,11 +10,12 @@
    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
    state: "assembly"
  - type: Physics
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
+          bounds: "-0.45,-0.45,0.45,0.45"
      mass: 100
      mask:
      - MobMask
@@ -26,6 +27,7 @@
  - type: Pullable
  - type: Transform
    anchored: true
+    noRot: true
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Metallic
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -28,9 +28,11 @@
    fixtures:
    - shape:
        !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
+          bounds: "-0.45,-0.45,0.45,0.45"
      mass: 50
      layer:
      - SmallImpassable
      mask:
      - VaultImpassable
+  - type: Transform
+    noRot: true
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -177,7 +177,11 @@
    fixtures:
    - shape:
        !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
+          bounds: "-0.45,-0.45,0.45,0.45"
      mass: 50
      layer:
      - Opaque
+      mask:
+      - VaultImpassable
+  - type: Transform
+    noRot: true
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -47,6 +47,7 @@
            max: 2
  - type: Transform
    anchored: true
+    noRot: true
  - type: Anchorable
  - type: Pullable

--- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
@@ -42,6 +42,7 @@
    - Wooden
  - type: Transform
    anchored: true
+    noRot: true
  - type: Physics
    bodyType: Static
  - type: Anchorable
--- a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
@@ -29,6 +29,16 @@
    interfaces:
    - key: enum.InstrumentUiKey.Key
      type: InstrumentBoundUserInterface
+  - type: Fixtures
+    fixtures:
+      - shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        mass: 50
+        layer:
+          - SmallImpassable
+        mask:
+          - VaultImpassable

 - type: entity
  parent: BasePlaceableInstrument
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -6,6 +6,7 @@
  components:
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
--- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
@@ -8,6 +8,8 @@
    delay: 2
  - type: Physics
    bodyType: Static
+  - type: Transform
+    noRot: true
  - type: Fixtures
    fixtures:
    - shape:
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -8,8 +8,10 @@
  components:
    - type: Transform
      anchored: true
+      noRot: true
    - type: Physics
      bodyType: Static
+      fixedRotation: false
    - type: Fixtures
      fixtures:
      - shape:
@@ -59,8 +61,10 @@
  components:
    - type: Transform
      anchored: true
+      noRot: true
    - type: Physics
      bodyType: Static
+      fixedRotation: false
    - type: Fixtures
      fixtures:
      - shape:
@@ -116,9 +120,12 @@
  components:
    - type: Transform
      anchored: true
+      noRot: true
    - type: Construction
      graph: Machine
      node: destroyedMachineFrame
+    - type: Physics
+      fixedRotation: false
    - type: Damageable
      damageContainer: Inorganic
      damageModifierSet: Metallic
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -16,11 +16,13 @@
    netsync: false
  - type: Physics
    bodyType: Static
+  - type: Transform
+    noRot: true
  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
-          bounds: "-0.25,-0.5,0.25,0.5"
+          bounds: "-0.25,-0.45,0.25,0.45"
      mask:
      - Impassable
      - VaultImpassable
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
@@ -7,8 +7,10 @@
  components:
    - type: Transform
      anchored: true
+      noRot: true
    - type: Physics
      bodyType: Static
+      fixedRotation: false
    - type: Fixtures
      fixtures:
        - shape:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml
@@ -9,11 +9,12 @@
    - type: Rotatable
    - type: Physics
      bodyType: Static
+      fixedRotation: false
    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeAabb
-            bounds: "-0.49,-0.49,0.49,0.49"
+            bounds: "-0.45,-0.45,0.45,0.45"
        mass: 25
        mask:
        - Opaque
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
@@ -9,11 +9,12 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+          bounds: "-0.45,-0.45,0.45,0.45"
      mass: 25
      layer:
      - Impassable
@@ -26,6 +27,7 @@
      - VaultImpassable
  - type: Transform
    anchored: true
+    noRot: true
  - type: Sprite
    sprite: Structures/Power/Generation/Singularity/collector.rsi
    netsync: false
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -9,6 +9,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
@@ -14,6 +14,7 @@
  - type: Clickable
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
@@ -28,5 +29,6 @@
      - MobMask
  - type: Transform
    anchored: true
+    noRot: true
  - type: Anchorable
  - type: Pullable
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -11,6 +11,7 @@
    sprite: Structures/Power/Generation/ame.rsi
    state: control
  - type: Physics
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
@@ -43,6 +44,7 @@
        acts: ["Destruction"]
  - type: Transform
    anchored: true
+    noRot: true
  - type: Anchorable
  - type: Pullable
  - type: AMEController
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -16,6 +16,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
@@ -34,6 +35,7 @@
      - SmallImpassable
  - type: Transform
    anchored: true
+    noRot: true
  - type: Sprite
    sprite: Structures/Power/power.rsi
    state: generator
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -11,6 +11,7 @@
    anchored: true
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
@@ -111,6 +112,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
@@ -126,6 +128,7 @@
    state: solar_assembly
  - type: Transform
    anchored: true
+    noRot: true
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Metallic
@@ -153,6 +156,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
@@ -174,6 +178,7 @@
    netsync: false
  - type: Transform
    anchored: true
+    noRot: true
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Metallic
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -6,6 +6,8 @@
  description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench.
  components:
    - type: InteractionOutline
+    - type: Transform
+      noRot: true
    - type: Sprite
      netsync: false
      sprite: Structures/Storage/canister.rsi
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -54,3 +54,5 @@
  - type: DrainableSolution
    solution: tank
  - type: ReagentTank
+  - type: Transform
+    noRot: true
--- a/Resources/Prototypes/Entities/Structures/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
@@ -6,12 +6,14 @@
  components:
  - type: Transform
    anchored: true
+    noRot: true
  - type: Physics
    bodyType: Static
  - type: Fixtures
    fixtures:
    - shape:
-        !type:PhysShapeAabb {}
+        !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
      mass: 50
      layer:
      - Impassable
--- a/Resources/Prototypes/Entities/Structures/base_structure.yml
+++ b/Resources/Prototypes/Entities/Structures/base_structure.yml
@@ -9,6 +9,7 @@
  - type: Clickable
  - type: Physics
    bodyType: Static
+    fixedRotation: false
  - type: Fixtures
    fixtures:
    - shape:
--- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
@@ -9,6 +9,7 @@
    bodyType: Static
  - type: Transform
    anchored: true
+    noRot: true
  - type: Fixtures
    fixtures:
    - shape:
@@ -17,6 +18,8 @@
      mass: 25
      layer:
      - Passable
+      mask:
+      - VaultImpassable
  - type: Sprite
    netsync: false
    sprite: Structures/cargo_telepad.rsi
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -5,10 +5,14 @@
  description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
  components:
  - type: Physics
+    fixedRotation: false
+  - type: Transform
+    noRot: true
  - type: Fixtures
    fixtures:
    - shape:
-        !type:PhysShapeAabb {}
+        !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.1"
      mass: 25
      hard: true
      mask:
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -29,6 +29,8 @@
          SheetSteel1:
            min: 1
            max: 1
+  - type: Transform
+    noRot: true
  - type: KitchenSpike
  - type: Anchorable
  - type: Pullable
--- a/Resources/Prototypes/Entities/Structures/soil.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -12,7 +12,7 @@
    fixtures:
    - shape:
        !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.1"
+          bounds: "-0.45,-0.45,0.45,0.1"
      mass: 25
      hard: false
      mask: