Halloween: Cauldron to replace deep fryers (#2240)

new-frontiers-14 · Oct 17, 2024 · 79626e3 · 79626e3
1 parent 4eda96d
commit 79626e3
Show file tree

Hide file tree

Showing 23 changed files with 238 additions and 1 deletion.
diff --git a/Content.Server/Holiday/HolidayPrototype.cs b/Content.Server/Holiday/HolidayPrototype.cs
@@ -41,6 +41,9 @@ public sealed partial class HolidayPrototype : IPrototype
         [DataField("celebrate")]
         private IHolidayCelebrate? _celebrate = null;
 
+        [DataField("entityReplacements")] // Frontier
+        public Dictionary<EntProtoId, EntProtoId>? EntityReplacements = null; // Frontier
+
         public bool ShouldCelebrate(DateTime date)
         {
             return _shouldCelebrate.ShouldCelebrate(date, this);

diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Holiday;
 using Robust.Shared.Configuration;
+using Robust.Shared.Map.Events;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Holiday
@@ -26,6 +27,7 @@ public override void Initialize()
             Subs.CVar(_configManager, CCVars.HolidaysEnabled, OnHolidaysEnableChange);
             SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRunLevelChanged);
             SubscribeLocalEvent<HolidayVisualsComponent, ComponentInit>(OnVisualsInit);
+            SubscribeLocalEvent<BeforeEntityReadEvent>(OnBeforeRead);
         }
 
         public void RefreshCurrentHolidays()
@@ -115,6 +117,20 @@ private void OnVisualsInit(Entity<HolidayVisualsComponent> ent, ref ComponentIni
                 break;
             }
         }
+
+        private void OnBeforeRead(BeforeEntityReadEvent ev)
+        {
+            foreach (var holiday in _currentHolidays)
+            {
+                if (holiday.EntityReplacements is { } replacements)
+                {
+                    foreach (var (original, replacement) in replacements)
+                    {
+                        ev.RenamedPrototypes.TryAdd(original, replacement);
+                    }
+                }
+            }
+        }
     }
 
     /// <summary>

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml
@@ -170,3 +170,18 @@
       machine_board: !type:Container
       machine_parts: !type:Container
   - type: PowerSwitch
+
+# Frontier: Halloween special
+- type: entity
+  id: KitchenDeepFryerCauldron
+  parent: KitchenDeepFryer
+  name: cauldron
+  description: A mysterious and mystical cauldron, sputtering with magical energy. Or is that oil?
+  suffix: Holiday Special
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Machines/cauldron.rsi
+    snapCardinals: true
+  - type: SolutionContainerVisuals
+    maxFillLevels: 8
+# End Frontier
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
@@ -329,4 +329,14 @@
   suffix: POI
   components:
   - type: Machine
-    board: Null
+    board: Null
+
+- type: entity
+  id: KitchenDeepFryerCauldronPOI
+  parent:
+  - BaseStructureDisableToolUse
+  - KitchenDeepFryerCauldron
+  suffix: Holiday Special, POI
+  components:
+  - type: Machine
+    board: null
diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml
@@ -329,6 +329,9 @@
   greet:
     !type:Custom
     text: holiday-custom-halloween
+  entityReplacements: # Frontier
+    KitchenDeepFryer: KitchenDeepFryerCauldron # Frontier
+    KitchenDeepFryerPOI: KitchenDeepFryerCauldronPOI # Frontier
 
 - type: holiday
   id: VeganDay

diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json
@@ -0,0 +1,190 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Bing Guss (gentlebutter) for Frontier Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "off-0"
+        },
+        {
+            "name": "off-1"
+        },
+        {
+            "name": "off-2"
+        },
+        {
+            "name": "off-3"
+        },
+        {
+            "name": "off-4"
+        },
+        {
+            "name": "off-5"
+        },
+        {
+            "name": "off-6"
+        },
+        {
+            "name": "off-7"
+        },
+        {
+            "name": "off-8"
+        },
+        {
+            "name": "on-1",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-2",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-3",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-4",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-5",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-6",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-7",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-8",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-0.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-0.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-1.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-1.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-2.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-2.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-3.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-3.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-4.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-4.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-5.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-5.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-6.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-6.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-7.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-7.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-8.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-8.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-1.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-1.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-2.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-2.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-3.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-3.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-4.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-4.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-5.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-5.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-6.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-6.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-7.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-7.png
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-8.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-8.png