]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Christmas anomaly (#33889)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Mon, 16 Dec 2024 19:23:31 +0000 (22:23 +0300)
committerGitHub <noreply@github.com>
Mon, 16 Dec 2024 19:23:31 +0000 (22:23 +0300)
* santa anomaly

* Update anomaly.yml

* injection

* Update anomaly.yml

* Update Resources/Locale/en-US/anomaly/inner_anomaly.ftl

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* Update Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/meta.json

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
* Update Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/meta.json

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
14 files changed:
Resources/Locale/en-US/anomaly/inner_anomaly.ftl
Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/core.png [new file with mode: 0644]
Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/pulse.png [new file with mode: 0644]
Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/santa.png [new file with mode: 0644]
Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/anom.png [new file with mode: 0644]
Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/pulse.png [new file with mode: 0644]

index e55c4391e30a6bf93686a284a17d17e084981c49..f5e8140c5ee5232472f23eb710b34e0ffd4bd220 100644 (file)
@@ -8,6 +8,7 @@ inner-anomaly-start-message-flesh = Your body is growing frantically. You became
 inner-anomaly-start-message-grav = Everything becames unnaturally heavy and light at the same time... You became the host of a gravity anomaly.
 inner-anomaly-start-message-tech = Your head is buzzing with the amount of chaotic information! You became the host of a tech anomaly.
 inner-anomaly-start-message-rock = The crystals are growing through your bones! You became the host of a rock anomaly.
+inner-anomaly-start-message-santa = You're becoming obsessed with the Christmas spirit! You became the host of a Christmas anomaly.
 
 inner-anomaly-end-message = The abnormal activity within you disappears without a trace....
 
index 4697606af9f6830db80d82f47eebb8702747bbad..ef89ed9a16902d81e86002f872d69dcdf73bbc75 100644 (file)
@@ -22,6 +22,7 @@
     - AnomalyFlora
     - AnomalyShadow
     - AnomalyTech
+    - AnomalySanta #Remove in 2025
     rareChance: 0.3
     rarePrototypes:
     - RandomAnomalyInjectorSpawner
@@ -66,5 +67,6 @@
     - AnomalyTrapGravity
     - AnomalyTrapTech
     - AnomalyTrapRock
+    - AnomalyTrapSanta # Remove in 2025
     chance: 1
   
\ No newline at end of file
index f675b2d2c81dd6b761ed600a3a8e096099519919..f111d6b1826984c4e16e5ef2b6e5b58705d05c1e 100644 (file)
   - type: Tag
     tags:
       - HideContextMenu
+
+- type: entity
+  id: AnomalySanta
+  parent: BaseAnomaly
+  suffix: Santa
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Structures/Specific/Anomalies/santa_anom.rsi
+    layers:
+    - state: anom
+      map: ["enum.AnomalyVisualLayers.Base"]
+    - state: pulse
+      map: ["enum.AnomalyVisualLayers.Animated"]
+      visible: false
+  - type: PointLight
+    radius: 8.0
+    energy: 8.5
+    color: "#db8127"
+  - type: Anomaly
+    animationTime: 6
+    offset: 0, 0
+    corePrototype: AnomalyCoreSanta
+    coreInertPrototype: AnomalyCoreSantaInert
+    minPulseLength: 60
+    maxPulseLength: 120
+  - type: EntitySpawnAnomaly
+    entries:
+    - settings:
+        spawnOnPulse: true
+        minAmount: 2
+        maxAmount: 5
+        maxRange: 5
+      spawns:
+      - PresentRandomUnsafe
+      - PresentRandom
+      - PresentRandomCoal
+      - PresentRandomCash
+      - ClothingHeadHatSantahat
+      - FoodCakeChristmasSlice
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 10
+        maxAmount: 20
+        maxRange: 6
+      spawns:
+      - PresentRandomInsane
+  
\ No newline at end of file
index f1e535f15b4cf0827b4815dc7c41920adefd624b..2b10aa1f768d796bd132986cb529b91bd7968335 100644 (file)
       spawns:
       - MobSpawnCrabSilver
       - MobSpawnCrabIron
-      - MobSpawnCrabQuartz
\ No newline at end of file
+      - MobSpawnCrabQuartz
+
+- type: entity
+  parent: AnomalyInjectionBase
+  id: AnomalyInjectionSanta
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    color: "#db8127"
+  - type: EntitySpawnAnomaly
+    entries:
+    - settings:
+        spawnOnPulse: true
+        minAmount: 1
+        maxAmount: 3
+        maxRange: 5
+      spawns:
+      - PresentRandomUnsafe
+      - PresentRandom
+      - PresentRandomCoal
+      - PresentRandomCash
+      - ClothingHeadHatSantahat
+      - FoodCakeChristmasSlice
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 5
+        maxAmount: 10
+        maxRange: 6
+      spawns:
+      - PresentRandomInsane
\ No newline at end of file
index 24a76dfb62e79514f7bfd80d048f53b191c36a1e..d643bcb028fa3de8f8ae7ec7e030c5da48a45275 100644 (file)
         speciesSprites:
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
-            state: rock_VOX
\ No newline at end of file
+            state: rock_VOX
+
+- type: entity
+  parent: BaseAnomalyInjector
+  id: AnomalyTrapSanta
+  suffix: Santa
+  components:
+  - type: Sprite
+    layers:
+    - state: pink
+    - sprite: Structures/Specific/Anomalies/santa_anom.rsi
+      state: pulse
+    - sprite: Mobs/Species/Human/parts.rsi
+      state: full
+  - type: InnerBodyAnomalyInjector
+    injectionComponents:
+      - type: Anomaly
+        deleteEntity: false
+        maxPointsPerSecond: 100
+        corePrototype: AnomalyCoreSanta
+      - type: InnerBodyAnomaly
+        injectionProto: AnomalyInjectionSanta
+        startMessage: inner-anomaly-start-message-santa
+        fallbackSprite:
+          sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+          state: santa
\ No newline at end of file
index 568a133749e71d6a38f2563defc3392c22a03662..45a5a6d4d6a1247b210d5225b1cad6090ef43123 100644 (file)
     color: "#56c1e8"
     castShadows: false
 
+- type: entity
+  parent: BaseAnomalyCore
+  id: AnomalyCoreSanta
+  suffix: Santa
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/Cores/santa_core.rsi
+  - type: PointLight
+    radius: 1.5
+    energy: 2.0
+    color: "#fc0303"
+    castShadows: false
+
 # Inert cores
 
 - type: entity
     energy: 2.0
     color: "#56c1e8"
     castShadows: false
+
+- type: entity
+  parent: BaseAnomalyInertCore
+  id: AnomalyCoreSantaInert
+  suffix: Santa, Inert
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/Cores/santa_core.rsi
+  - type: PointLight
+    radius: 1.5
+    energy: 2.0
+    color: "#fc0303"
+    castShadows: false
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/core.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/core.png
new file mode 100644 (file)
index 0000000..a97b408
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/core.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/meta.json
new file mode 100644 (file)
index 0000000..1263862
--- /dev/null
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by Jaraten (github) for ss14 at https://github.com/space-wizards/space-station-14/pull/33889",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "core"
+    },
+    {
+      "name": "pulse",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/pulse.png
new file mode 100644 (file)
index 0000000..be15a90
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/pulse.png differ
index 4e069d0cd90bac00ce2eb448d5ecf81f24af0481..4aa15c86cd818619c8d4c8070db7180f31257783 100644 (file)
         ]
       ]
     },
+    {
+      "name": "santa",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
     {
       "name": "shadow",
       "directions": 4,
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/santa.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/santa.png
new file mode 100644 (file)
index 0000000..4652438
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/santa.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/anom.png b/Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/anom.png
new file mode 100644 (file)
index 0000000..0788b3c
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/anom.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/meta.json
new file mode 100644 (file)
index 0000000..4681548
--- /dev/null
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by TheShuEd (github) for ss14 at https://github.com/space-wizards/space-station-14/pull/33889",
+  "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/santa_anom.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/pulse.png
new file mode 100644 (file)
index 0000000..b8254ee
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/pulse.png differ