Fixes Singularity part physics, material crates (#3453)

* Initial * Hot
2021-03-01 20:55:34 +00:00
parent a1049e521b
commit f0b5235e2f
9 changed files with 67 additions and 55 deletions
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -41473,7 +41473,7 @@ entities:
    rot: 4.371139006309477E-08 rad
    type: Transform
 - uid: 4714
-  type: CrateMaterialMetal
+  type: CrateMaterialSteel
  components:
  - parent: 853
    pos: 21.5,13.5
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -37,7 +37,7 @@
 - type: cargoProduct
  name: "singularity generator crate"
  id: cargo.enginesingularitygenerator
-  description: "Contains one singularity generator. The mother of the beast."
+  description: "Contains a singularity generator. The mother of the beast."
  icon:
    sprite: Constructible/Power/Singularity/generator.rsi
    state: icon
@@ -49,36 +49,36 @@
 - type: cargoProduct
  name: "singularity containment crate"
  id: cargo.enginesingularitycontainment
-  description: "Contains 2 singularity containment field generators."
+  description: "Contains a singularity containment field generator."
  icon:
    sprite: Constructible/Power/Singularity/containment.rsi
    state: icon
  product: CrateEngineeringSingularityContainment
-  cost: 1500
+  cost: 1000
  category: Engineering
  group: market

 - type: cargoProduct
  name: "emitter crate"
  id: cargo.enginesingularityemitter
-  description: "Contains 2 emitters. Used only for dangerous applications."
+  description: "Contains an emitter. Used only for dangerous applications."
  icon:
    sprite: Constructible/Power/Singularity/emitter.rsi
    state: emitter2
  product: CrateEngineeringSingularityEmitter
-  cost: 1500
+  cost: 1000
  category: Engineering
  group: market

 - type: cargoProduct
  name: "radiation collector crate"
  id: cargo.enginesingularitycollector
-  description: "Contains 2 radiation collectors. Safety first!"
+  description: "Contains a radiation collector. Safety first!"
  icon:
    sprite: Constructible/Power/Singularity/collector.rsi
    state: ca_on
  product: CrateEngineeringSingularityCollector
-  cost: 1500
+  cost: 1000
  category: Engineering
  group: market

--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -17,7 +17,7 @@
  icon:
    sprite: Objects/Materials/Sheets/metal.rsi
    state: steel_3
-  product: CrateMaterialGlass
+  product: CrateMaterialSteel
  cost: 1500
  category: Materials
  group: market
--- a/Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml
@@ -44,7 +44,7 @@
  - type: StorageFill
    contents:
      - name: Emitter
-        amount: 2
+        amount: 1

 - type: entity
  id: CrateEngineeringSingularityCollector
@@ -55,7 +55,7 @@
  - type: StorageFill
    contents:
      - name: RadiationCollector
-        amount: 2
+        amount: 1

 - type: entity
  id: CrateEngineeringSingularityContainment
@@ -66,7 +66,7 @@
  - type: StorageFill
    contents:
      - name: ContainmentFieldGenerator
-        amount: 2
+        amount: 1

 - type: entity
  id: CrateEngineeringSingularityGenerator
--- a/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: CrateMaterialGlass
-  name:  glass crate
+  name:  glass sheet crate
  parent: CrateGenericonimo
  components:
  - type: StorageFill
@@ -9,8 +9,8 @@
        amount: 3

 - type: entity
-  id: CrateMaterialMetal
-  name:  metals crate
+  id: CrateMaterialSteel
+  name:  steel sheet crate
  parent: CrateGenericonimo
  components:
  - type: StorageFill
@@ -20,7 +20,7 @@

 - type: entity
  id: CrateMaterialPlastic
-  name:  plastics crate
+  name:  plastic sheet crate
  parent: CrateGenericonimo
  components:
  - type: StorageFill
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml
@@ -8,18 +8,20 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
+    anchored: false
+    mass: 25
    shapes:
    - !type:PhysShapeAabb
      bounds: "-0.5, -0.5, 0.5, 0.5"
-      # layer:
-      # - Impassable
-      # - MobImpassable
-      # - VaultImpassable
-      # - Opaque
-      # mask:
-      # - Impassable
-      # - MobImpassable
-      # - VaultImpassable
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - Opaque
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
  - type: SnapGrid
    offset: Center
  - type: Sprite
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml
@@ -8,18 +8,20 @@
  - type: InteractionOutline
  - type: Clickable
  - type: Physics
+    anchored: false
+    mass: 25
    shapes:
    - !type:PhysShapeAabb
      bounds: "-0.5, -0.5, 0.5, 0.5"
-      # layer:
-      # - Impassable
-      # - MobImpassable
-      # - VaultImpassable
-      # - Opaque
-      # mask:
-      # - Impassable
-      # - MobImpassable
-      # - VaultImpassable
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - Opaque
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
  - type: SnapGrid
    offset: Center
  - type: Sprite
@@ -53,7 +55,15 @@
    shapes:
    - !type:PhysShapeAabb
      bounds: "-0.5, -0.5, 0.5, 0.5"
-      layer: [MobMask, Opaque]
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - Opaque
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
  - type: SnapGrid
    offset: Center
  - type: Sprite
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml
@@ -8,19 +8,20 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
+    anchored: false
    mass: 25
    shapes:
    - !type:PhysShapeAabb
      bounds: "-0.5, -0.5, 0.5, 0.5"
-      # layer:
-      # - Impassable
-      # - MobImpassable
-      # - VaultImpassable
-      # - Opaque
-      # mask:
-      # - Impassable
-      # - MobImpassable
-      # - VaultImpassable
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - Opaque
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
  - type: SnapGrid
    offset: Center
  - type: Sprite
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml
@@ -2,6 +2,8 @@
  name: gravitational singularity generator
  description: An Odd Device which produces a Gravitational Singularity when set up.
  id: SingularityGenerator
+  placement:
+    mode: SnapgridCenter
  components:
  - type: Sprite
    sprite: Constructible/Power/Singularity/generator.rsi
@@ -10,18 +12,15 @@
  - type: InteractionOutline
  - type: Clickable
  - type: Physics
+    anchored: false
+    mass: 25
    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5, -0.5, 0.5, 0.5"
-      # layer:
-      # - Impassable
-      # - MobImpassable
-      # - VaultImpassable
-      # - Opaque
-      # mask:
-      # - Impassable
-      # - MobImpassable
-      # - VaultImpassable
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
+      layer:
+      - Opaque
+      mask:
+      - MobImpassable
  - type: SnapGrid
    offset: Center
  - type: Anchorable