From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Mon, 29 Jan 2024 01:30:54 +0000 (+0300)
Subject: Fire anom rework (#24666)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3deea2f7d68c05ec415e075328533c6eb1d4f8e6;p=space-station-14.git

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 ed4afd061f..57b3dab921 100644
--- 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 bd789402d2..3556d1c8f8 100644
--- 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 e357769aa5..4eb9d70e08 100644
--- 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 dc8f8464d4..dcd376c91b 100644
--- 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 61a5f22489..739e14dbf1 100644
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 537c619d19..e0c2c7eed1 100644
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
index 0000000000..f0a171fdd1
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
index 0000000000..aa4c1273a1
--- /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
index 0000000000..a064a8d226
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/pulse.png differ