Storagefill component refactor (#2093)

* refactored storagefill component to allow for random items, amount, and conditional exclusion * i fudged it * yaml for the already deleted filler components * ignoredcomponents & janifill * remainder of toolboxes done * emergencyclosetfill * really makes you think * it DOES really make you think * orGroup * exp111 suggestions * last touches * isNullOrEmpty
2020-09-21 12:47:52 +02:00
parent 8238a89190
commit 37d6ca556f
23 changed files with 247 additions and 562 deletions
--- a/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using Robust.Server.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.Random;
+using Robust.Shared.Interfaces.Serialization;
+using Robust.Shared.IoC;
+using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+using Logger = Robust.Shared.Log.Logger;
+
+namespace Content.Server.GameObjects.Components.Items.Storage
+{
+    [RegisterComponent]
+    internal sealed class StorageFillComponent : Component, IMapInit
+    {
+        [Dependency] private readonly IEntityManager _entityManager;
+
+        public override string Name => "StorageFill";
+
+        private List<PrototypeItemData> _contents;
+
+        public override void ExposeData(ObjectSerializer serializer)
+        {
+            base.ExposeData(serializer);
+
+            serializer.DataField(ref _contents, "contents", new List<PrototypeItemData>());
+        }
+
+        void IMapInit.MapInit()
+        {
+            if (_contents.Count == 0)
+            {
+                return;
+            }
+
+            if (!Owner.TryGetComponent(out IStorageComponent storage))
+            {
+                Logger.Error($"StorageFillComponent couldn't find any StorageComponent ({Owner})");
+                return;
+            }
+            var random = IoCManager.Resolve<IRobustRandom>();
+
+            var alreadySpawnedGroups = new List<string>();
+            foreach (var storageItem in _contents)
+            {
+                if (string.IsNullOrEmpty(storageItem.PrototypeName)) continue;
+                if (string.IsNullOrEmpty(storageItem.GroupId) && alreadySpawnedGroups.Contains(storageItem.GroupId)) continue;
+
+                if (storageItem.SpawnProbability != 1f &&
+                    !random.Prob(storageItem.SpawnProbability))
+                {
+                    continue;
+                }
+
+                storage.Insert(_entityManager.SpawnEntity(storageItem.PrototypeName, Owner.Transform.Coordinates));
+                if(string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId);
+            }
+        }
+
+        [Serializable]
+        private struct PrototypeItemData : IExposeData
+        {
+            public string PrototypeName;
+            public float SpawnProbability;
+            public string GroupId;
+            public int Amount;
+
+            public void ExposeData(ObjectSerializer serializer)
+            {
+                serializer.DataField(ref PrototypeName, "name", null);
+                serializer.DataField(ref Amount, "amount", 1);
+                serializer.DataField(ref SpawnProbability, "prob", 1f);
+                serializer.DataField(ref GroupId, "orGroup", null);
+            }
+        }
+    }
+}