Fix various issues with the emitter (#3329)

Co-authored-by: cyclowns <cyclowns@protonmail.ch>

Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml

@@ -8,7 +8,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
-    bodyType: Dynamic
+    bodyType: Static
     mass: 25
     fixtures:
     - shape:

Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/containment.yml

@@ -8,7 +8,7 @@
   - type: InteractionOutline
   - type: Clickable
   - type: Physics
-    bodyType: Dynamic
+    bodyType: Static
     mass: 25
     fixtures:
     - shape:

Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml

@@ -1,6 +1,4 @@
 - type: entity
-  name: emitter
-  description: "A machine that fires bolts of energy, used for powering containment fields at a safe distance."
   id: Emitter
   placement:
     mode: SnapgridCenter
@@ -8,12 +6,12 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
-    mass: 25
-    bodyType: Dynamic
+    mass: 100
+    bodyType: Static
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+          bounds: "-0.25, -0.25, 0.25, 0.25"
       layer:
       - Impassable
       - MobImpassable
@@ -43,6 +41,23 @@
     nodes:
     - !type:AdjacentNode
       nodeGroupID: MVPower
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+        - !type:PlaySoundBehavior
+          sound: /Audio/Effects/metalbreak.ogg
+        - !type:SpawnEntitiesBehavior
+          spawn:
+            SheetSteel1:
+              min: 5
+              max: 5
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
   - type: Anchorable
     snap: true
   - type: Pullable
@@ -53,23 +68,3 @@
   - type: AccessReader
     access: [[ "Engineering" ]]
 
-- type: entity
-  name: Emitter Bolt
-  description: "A bolt of energy."
-  id: EmitterBolt
-  parent: BulletBase
-  components:
-  - type: Sprite
-    sprite: Constructible/Power/Singularity/emitter.rsi
-    state: ''
-    layers:
-    - state: projectile
-      shader: unshaded
-  - type: Icon
-    sprite: Constructible/Power/Singularity/emitter.rsi
-    state: projectile
-  - type: EmitterBoltComponent
-  - type: Projectile
-    soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
-    damages:
-      Heat: 20

Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/generator.yml

@@ -12,7 +12,7 @@
   - type: InteractionOutline
   - type: Clickable
   - type: Physics
-    bodyType: Dynamic
+    bodyType: Static
     mass: 25
     fixtures:
     - shape:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -73,11 +73,29 @@
   - type: StunnableProjectile
     paralyzeAmount: 2
 
+# Energy projectiles
 - type: entity
-  name : taser
+  name : taser bolt
   id: BulletTaser
+  parent: BulletBase
   abstract: true
   components:
+  - type: Sprite
+    directional: false
+    sprite: Objects/Weapons/Guns/Projectiles/spark.rsi
+    color: "#ffff33"
+    layers:
+    - state: spark
+      shader: unshaded
+  - type: Physics
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+      hard: false
+      mask:
+          - Impassable
+          - MobImpassable
   - type: Ammo
     isProjectile: true
     ammoVelocity: 20
@@ -89,22 +107,35 @@
   - type: StunnableProjectile
     stunAmount: 5
     knockdownAmount: 5
+
+- type: entity
+  name: emitter bolt
+  id: EmitterBolt
+  parent: BulletBase
+  abstract: true
+  components:
   - type: Sprite
-    noRot: false
-    sprite: Objects/Weapons/Guns/Projectiles/spark.rsi
     color: "#ffff33"
-    layers:
-    - state: spark
-      shader: unshaded
+    sprite: Constructible/Power/Singularity/emitter.rsi
+    state: 'projectile'
   - type: Physics
-    bodyType: Dynamic
     fixtures:
     - shape:
         !type:PhysShapeAabb
           bounds: "-0.2,-0.2,0.2,0.2"
       hard: false
-      layer: 32
-      mask: 30
+      layer:
+        - Impassable
+        - MobImpassable
+      mask:
+        - Opaque
+  - type: Projectile
+    soundHit: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
+    damages:
+      Heat: 20
+  - type: Tag
+    tags:
+    - EmitterBolt
 
 # Launcher projectiles (grenade / rocket)
 - type: entity

Resources/Prototypes/tags.yml

@@ -45,3 +45,6 @@
 
 - type: Tag
   id: Write
+
+- type: Tag
+  id: EmitterBolt