the 3 things walks said + gumballs

Author: wonderfulnewworld

Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs

@@ -13,48 +13,75 @@ public sealed class EntityWhitelistTest : GameTest
         private const string InvalidComponent = "Sprite";
         private const string ValidComponent = "Physics";
 
-        [TestPrototypes]
-        private const string Prototypes = $@"
-- type: Tag
-  id: WhitelistTestValidTag
-- type: Tag
-  id: WhitelistTestInvalidTag
-
-- type: entity
-  id: WhitelistDummy
-  components:
-  - type: ItemSlots
-    slots:
-      slotName:
-        whitelist:
-          prototypes:
-          - ValidPrototypeDummy
-          components:
-          - {ValidComponent}
-          tags:
-          - WhitelistTestValidTag
-
-- type: entity
-  id: InvalidComponentDummy
-  components:
-  - type: {InvalidComponent}
-- type: entity
-  id: WhitelistTestInvalidTagDummy
-  components:
-  - type: Tag
-    tags:
-    - WhitelistTestInvalidTag
-
-- type: entity
-  id: ValidComponentDummy
-  components:
-  - type: {ValidComponent}
-- type: entity
-  id: WhitelistTestValidTagDummy
-  components:
-  - type: Tag
-    tags:
-    - WhitelistTestValidTag";
+        [TestPrototypes] // Starlight, I didn't want to have to modify this entire section, but editor config will yell at me if I don't.
+        private const string Prototypes = $"""
+        -   type: Tag
+            id: WhitelistTestValidTag
+        -   type: Tag
+            id: WhitelistTestInvalidTag
+
+        -   type: entity
+            id: WhitelistDummy
+            components:
+            -   type: ItemSlots
+                slots:
+                    slotName:
+                        whitelist:
+                            prototypes:
+                                - ValidPrototypeDummy
+                            components:
+                                - {ValidComponent}
+                            tags:
+                                - WhitelistTestValidTag
+                            toolQuality:
+                                - Slicing
+
+        -   type: entity
+            id: InvalidComponentDummy
+            components:
+            -   type: {InvalidComponent}
+
+        -   type: entity
+            id: WhitelistTestInvalidTagDummy
+            components:
+            -   type: Tag
+                tags:
+                    - WhitelistTestInvalidTag
+
+        -   type: entity
+            id: ValidComponentDummy
+            components:
+            -   type: {ValidComponent}
+
+        -   type: entity
+            id: WhitelistTestValidTagDummy
+            components:
+            -   type: Tag
+                tags:
+                    - WhitelistTestValidTag
+
+        -   type: entity
+            id: WhitelistTestInvalidToolQualityDummy
+            components:
+            -   type: Tool
+                qualities:
+                    - Anchoring
+
+        -   type: entity
+            id: WhitelistTestValidToolQualityDummy
+            components:
+            -   type: Tool
+                qualities:
+                    - Slicing
+
+        -   type: entity
+            id: WhitelistTestAllToolQualitiesDummy
+            components:
+            -   type: Tool
+                qualities:
+                    - Cutting
+                    - Slicing
+        """;
 
         [Test]
         public async Task Test()
@@ -72,24 +99,44 @@ await server.WaitAssertion(() =>
             {
                 var validComponent = sEntities.SpawnEntity("ValidComponentDummy", mapCoordinates);
                 var WhitelistTestValidTag = sEntities.SpawnEntity("WhitelistTestValidTagDummy", mapCoordinates);
+                var validToolQuality = sEntities.SpawnEntity("WhitelistTestValidToolQualityDummy", mapCoordinates); // Starlight
+                var allToolQualities = sEntities.SpawnEntity("WhitelistTestAllToolQualitiesDummy", mapCoordinates); // Starlight
 
                 var invalidComponent = sEntities.SpawnEntity("InvalidComponentDummy", mapCoordinates);
                 var WhitelistTestInvalidTag = sEntities.SpawnEntity("WhitelistTestInvalidTagDummy", mapCoordinates);
+                var invalidToolQuality = sEntities.SpawnEntity("WhitelistTestInvalidToolQualityDummy", mapCoordinates); // Starlight
 
                 // Test instantiated on its own
                 var whitelistInst = new EntityWhitelist
                 {
                     Components = new[] { $"{ValidComponent}" },
-                    Tags = new() { "WhitelistTestValidTag" }
+                    Tags = new() { "WhitelistTestValidTag" },
+                    ToolQualities = new() { "Slicing" } // Starlight
                 };
 
                 Assert.Multiple(() =>
                 {
                     Assert.That(sys.IsValid(whitelistInst, validComponent), Is.True);
                     Assert.That(sys.IsValid(whitelistInst, WhitelistTestValidTag), Is.True);
+                    Assert.That(sys.IsValid(whitelistInst, validToolQuality), Is.True); // Starlight
 
                     Assert.That(sys.IsValid(whitelistInst, invalidComponent), Is.False);
                     Assert.That(sys.IsValid(whitelistInst, WhitelistTestInvalidTag), Is.False);
+                    #region Starlight
+                    Assert.That(sys.IsValid(whitelistInst, invalidToolQuality), Is.False);
+                });
+
+                var requireAllToolQualities = new EntityWhitelist
+                {
+                    RequireAll = true,
+                    ToolQualities = new() { "Cutting", "Slicing" }
+                };
+
+                Assert.Multiple(() =>
+                {
+                    Assert.That(sys.IsValid(requireAllToolQualities, allToolQualities), Is.True);
+                    Assert.That(sys.IsValid(requireAllToolQualities, validToolQuality), Is.False);
+                    #endregion
                 });
 
                 // Test from serialized
@@ -101,15 +148,18 @@ await server.WaitAssertion(() =>
                 {
                     Assert.That(whitelistSer.Components, Is.Not.Null);
                     Assert.That(whitelistSer.Tags, Is.Not.Null);
+                    Assert.That(whitelistSer.ToolQualities, Is.Not.Null); // Starlight
                 });
 
                 Assert.Multiple(() =>
                 {
                     Assert.That(sys.IsValid(whitelistSer, validComponent), Is.True);
                     Assert.That(sys.IsValid(whitelistSer, WhitelistTestValidTag), Is.True);
+                    Assert.That(sys.IsValid(whitelistSer, validToolQuality), Is.True); // Starlight
 
                     Assert.That(sys.IsValid(whitelistSer, invalidComponent), Is.False);
                     Assert.That(sys.IsValid(whitelistSer, WhitelistTestInvalidTag), Is.False);
+                    Assert.That(sys.IsValid(whitelistSer, invalidToolQuality), Is.False); // Starlight
                 });
             });
         }

Content.Shared/Whitelist/EntityWhitelist.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Item;
 using Content.Shared.Tag;
+using Content.Shared.Tools;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
@@ -26,6 +27,8 @@ namespace Content.Shared.Whitelist;
 ///   sizes:
 ///   - Tiny
 ///   - Large
+///   toolQuality: // Starlight, we support ToolQuality now
+///   - Slicing
 /// </code>
 [DataDefinition]
 [Serializable, NetSerializable]
@@ -52,9 +55,17 @@ public sealed partial class EntityWhitelist
     [DataField]
     public List<ProtoId<TagPrototype>>? Tags;
 
+    #region starlight
     /// <summary>
-    ///     If false, an entity only requires one of these components or tags to pass the whitelist. If true, an
-    ///     entity requires to have ALL of these components and tags to pass.
+    ///     Tool qualities that are allowed in the whitelist.
+    /// </summary>
+    [DataField("toolQuality")]
+    public HashSet<ProtoId<ToolQualityPrototype>>? ToolQualities;
+    #endregion
+
+    /// <summary>
+    ///     If false, an entity only requires one of these components, tags, or tool qualities to pass the whitelist.
+    ///     If true, an entity requires to have ALL of these components, tags, and tool qualities to pass.
     ///     The "Sizes" criteria will ignores this, since an item can only have one size.
     /// </summary>
     [DataField]

Content.Shared/Whitelist/EntityWhitelistSystem.cs

@@ -1,13 +1,15 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Item;
 using Content.Shared.Tag;
+using Content.Shared.Tools.Systems;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Whitelist;
 
 public sealed partial class EntityWhitelistSystem : EntitySystem
 {
     [Dependency] private TagSystem _tag = default!;
+    [Dependency] private SharedToolSystem _tools = default!; // Starlight
 
     private EntityQuery<ItemComponent> _itemQuery;
 
@@ -69,6 +71,25 @@ public bool IsValid(EntityWhitelist list, EntityUid uid)
                 return true;
         }
 
+        #region Starlight
+        if (list.ToolQualities != null)
+        {
+            if (list.RequireAll)
+            {
+                if (!_tools.HasAllQualities(uid, list.ToolQualities))
+                    return false;
+            }
+            else
+            {
+                foreach (var quality in list.ToolQualities)
+                {
+                    if (_tools.HasQuality(uid, quality))
+                        return true;
+                }
+            }
+        }
+        #endregion
+
         if (list.Tags != null)
         {
             return list.RequireAll

Resources/Prototypes/_Starlight/Body/Prototypes/rodentia.yml

@@ -11,6 +11,8 @@
       blacklist:
         components:
           - MindContainer
+        toolQuality:
+          - Slicing
     - type: ContainerContainer
       containers:
         storagebase: !type:Container

Resources/Prototypes/_Starlight/CosmicCult/glyphs.yml

@@ -107,8 +107,8 @@
     - SwordCosmicCult
     - SpearCosmicCult
     whitelist:
-      components:
-      - Tool
+      toolQuality:
+      - Slicing
   - type: CosmicGlyph
     requiredCultists: 2
     activationDamage:

Resources/Prototypes/_Starlight/Entities/Objects/Consumable/Food/gumballs.yml

@@ -15,11 +15,10 @@
     - FoodSnack
     - ReptilianFood
     - ClothMade
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 15
-        reagents:
+  - type: Solution
+    id: food
+    solution:
+      reagents:
         - ReagentId: Sugar
           Quantity: 10
   - type: FlavorProfile
@@ -95,11 +94,10 @@
   components:
   - type: Sprite
     color: "#3d3d3d"
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 25
-        reagents:
+  - type: Solution
+    id: food
+    solution:
+      reagents:
         - ReagentId: Sugar
           Quantity: 10
         - ReagentId: CarpoToxin
@@ -111,11 +109,10 @@
   components:
   - type: Sprite
     color: "#b30000"
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 25
-        reagents:
+  - type: Solution
+    id: food
+    solution:
+      reagents:
         - ReagentId: Sugar
           Quantity: 10
         - ReagentId: Omnizine