Fire anom rework (#24666)

* content

* d

* fix artifact

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
index ed4afd061f552a0d88734f0fa50691b286679b08..57b3dab921fa11c041f256326194140df8b1cc16 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
@@ -42,7 +42,6 @@
           density: 75
           layer: # doesn't collide with artifact storage
           - Opaque
-          - BulletImpassable
           mask:
           - MachineMask
     - type: InteractionOutline

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index bd789402d259d925dc105f47ef701c0c4f8ba0f6..3556d1c8f8b21734ba3205828c0e795519f1c710 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -5,16 +5,46 @@
   parent: BulletRocket
   noSpawn: true
   components:
+  - type: PointLight
+    color: "#E25822"
+    radius: 2.0
+    energy: 5.0
+  - type: Projectile
+    damage:
+      types:
+        Heat: 10
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
     layers:
     - state: fireball
+      shader: unshaded
   - type: Explosive
     explosionType: Default
     maxIntensity: 40
     intensitySlope: 6
     totalIntensity: 200
     maxTileBreak: 0
+  - type: IgnitionSource
+    temperature: 400
+    ignited: true
+  - type: IgniteOnCollide
+    fireStacks: 0.35
+
+- type: entity
+  id: ProjectileAnomalyFireball
+  name: fireball
+  description: Hovering blob of flame.
+  parent: ProjectileFireball
+  noSpawn: true
+  components:
+  - type: TimedDespawn
+    lifetime: 30
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 100
+    intensitySlope: 0.1
+    totalIntensity: 0.3
+    maxTileBreak: 0
 
 - type: entity
   id: ProjectilePolyboltBase

diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index e357769aa50ba006c1d03ad31a994df3fd8199fb..4eb9d70e08ee075cf47000ebcf2f594e58440422 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -53,20 +53,26 @@
   parent: BaseAnomaly
   suffix: Pyroclastic
   components:
+  - type: AmbientSound
+    volume: 5
+    range: 5
+    sound:
+      path: /Audio/Ambience/Objects/fireplace.ogg
   - type: Anomaly
     corePrototype: AnomalyCorePyroclastic
     coreInertPrototype: AnomalyCorePyroclasticInert
   - type: Sprite
+    sprite: Structures/Specific/Anomalies/pyro_anom.rsi
     layers:
-    - state: anom1
+    - state: anom
       map: ["enum.AnomalyVisualLayers.Base"]
-    - state: anom1-pulse
+    - state: pulse
       map: ["enum.AnomalyVisualLayers.Animated"]
       visible: false
   - type: PointLight
-    radius: 2.0
+    radius: 6.0
     energy: 7.5
-    color: "#fca3c0"
+    color: "#E25822"
     castShadows: false
   - type: PyroclasticAnomaly
   - type: TempAffectingAnomaly
@@ -75,9 +81,21 @@
   - type: GasProducerAnomaly
     releasedGas: 3
     releaseOnMaxSeverity: true
-    spawnRadius: 3
+    spawnRadius: 4
     tileCount: 5
-    tempChange: 550
+    tempChange: 420
+  - type: ProjectileAnomaly
+    projectilePrototype: ProjectileAnomalyFireball
+    targetNonSentientChance: 0.6
+    projectileSpeed: 0.5
+    minProjectiles: 3
+    maxProjectiles: 6
+  - type: IgnitionSource
+    temperature: 800
+    ignited: true
+  - type: IgniteOnCollide
+    fixtureId: fix1
+    fireStacks: 1
 
 - type: entity
   id: AnomalyGravity

diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
index dc8f8464d489641aedabe35d78be5a1caa8a9044..dcd376c91b731f7411b81e61bbada0797b53bec6 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
@@ -40,8 +40,11 @@
   - type: PointLight
     radius: 1.5
     energy: 1.5
-    color: "#fca3c0"
+    color: "#E25822"
     castShadows: false
+  - type: IgnitionSource
+    temperature: 400
+    ignited: true
 
 - type: entity
   parent: BaseAnomalyCore

diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/core.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/core.png
index 61a5f22489ea5dd5e32a9a1fb97e1ec9cecab426..739e14dbf1d879d98c0160418350a31101cbc731 100644 (file)
Binary files a/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/core.png and b/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/core.png differ

diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/pulse.png
index 537c619d19d063aab1961bd880d31f4529cc92d3..e0c2c7eed1d7b62eadbef2bb09ba89c1376d8b4d 100644 (file)
Binary files a/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/pulse.png and b/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/pulse.png differ

diff --git a/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/anom.png b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/anom.png
new file mode 100644 (file)
index 0000000..f0a171f
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/anom.png differ

diff --git a/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/meta.json
new file mode 100644 (file)
index 0000000..aa4c127
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by TheShuEd (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "anom",
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "pulse",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}

diff --git a/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/pulse.png
new file mode 100644 (file)
index 0000000..a064a8d
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/pulse.png differ