Build 0.18.0.0

2022-05-13 00:55:52 +09:00
parent 15d18e6ff6
commit 7547a9b78a
218 changed files with 3881 additions and 2192 deletions
@@ -39,13 +39,9 @@ namespace Barotrauma
            targetItemIdentifiers = prefab.ConfigElement.GetAttributeIdentifierArray("itemidentifiers", Array.Empty<Identifier>());
        }

-        public override bool CanAffectSubImmediately(Level level)
-        {
-            return Item.ItemList.Count(i => i.Condition > 0.0f && targetItemIdentifiers.Contains(i.Prefab.Identifier)) >= maxItemAmount;
-        }
-
-        public override void Init(bool affectSubImmediately)
+        public override void Init(EventSet parentSet)
        {
+            base.Init(parentSet);
            var matchingItems = Item.ItemList.FindAll(i => i.Condition > 0.0f && targetItemIdentifiers.Contains(i.Prefab.Identifier));
            int itemAmount = Rand.Range(minItemAmount, maxItemAmount, Rand.RandSync.ServerAndClient);
            for (int i = 0; i < itemAmount; i++)
@@ -60,7 +56,7 @@ namespace Barotrauma
            if (isFinished) return;
            if (targetItems.Count == 0 || timer >= duration)
            {
-                Finished();
+                Finish();
                return;
            }