Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865)

* Add fill level sprite support for equipped items

* Add fill sprites for held/equipped spears

diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index 17b88fb5a8f54dbdc8a469a3688889ee191b19ee..010bfb31845d10ae00277f9fd342259830bb6912 100644 (file)
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
@@ -2,6 +2,8 @@ using Content.Client.Items.Systems;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Clothing;
+using Content.Shared.Clothing.Components;
 using Content.Shared.Hands;
 using Content.Shared.Item;
 using Content.Shared.Rounding;
@@ -20,6 +22,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
         base.Initialize();
         SubscribeLocalEvent<SolutionContainerVisualsComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<SolutionContainerVisualsComponent, GetInhandVisualsEvent>(OnGetHeldVisuals);
+        SubscribeLocalEvent<SolutionContainerVisualsComponent, GetEquipmentVisualsEvent>(OnGetClothingVisuals);
     }
 
     private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args)
@@ -174,4 +177,41 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
             args.Layers.Add((key, layer));
         }
     }
+
+    private void OnGetClothingVisuals(Entity<SolutionContainerVisualsComponent> ent, ref GetEquipmentVisualsEvent args)
+    {
+        if (ent.Comp.EquippedFillBaseName == null)
+            return;
+
+        if (!TryComp<AppearanceComponent>(ent, out var appearance))
+            return;
+
+        if (!TryComp<ClothingComponent>(ent, out var clothing))
+            return;
+
+        if (!AppearanceSystem.TryGetData<float>(ent, SolutionContainerVisuals.FillFraction, out var fraction, appearance))
+            return;
+
+        var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, ent.Comp.EquippedMaxFillLevels + 1);
+
+        if (closestFillSprite > 0)
+        {
+            var layer = new PrototypeLayerData();
+
+            var equippedPrefix = clothing.EquippedPrefix == null ? $"equipped-{args.Slot}" : $" {clothing.EquippedPrefix}-equipped-{args.Slot}";
+            var key = equippedPrefix + ent.Comp.EquippedFillBaseName + closestFillSprite;
+
+            // Make sure the sprite state is valid so we don't show a big red error message
+            // This saves us from having to make fill level sprites for every possible slot the item could be in (including pockets).
+            if (!TryComp<SpriteComponent>(ent, out var sprite) || sprite.BaseRSI == null || !sprite.BaseRSI.TryGetState(key, out _))
+                return;
+
+            layer.State = key;
+
+            if (ent.Comp.ChangeColor && AppearanceSystem.TryGetData<Color>(ent, SolutionContainerVisuals.Color, out var color, appearance))
+                layer.Color = color;
+
+            args.Layers.Add((key, layer));
+        }
+    }
 }

diff --git a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
index 100ee3975f95319b9f6fc73b8cea131a3cbd46ea..1e3c14bfd49951e898162272a5820f0b286efa1a 100644 (file)
--- a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
@@ -53,5 +53,17 @@ namespace Content.Shared.Chemistry.Components
         /// </summary>
         [DataField]
         public int InHandsMaxFillLevels = 0;
+
+        /// <summary>
+        /// Optional equipped visuals to show someone is wearing a something with a filled container.
+        /// </summary>
+        [DataField]
+        public string? EquippedFillBaseName = null;
+
+        /// <summary>
+        /// A separate max fill levels for equipped items (to reduce number of sprites needed)
+        /// </summary>
+        [DataField]
+        public int EquippedMaxFillLevels = 0;
     }
 }

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 608fb2544ae82f03f781587c068b466e9f7df540..d6985c018d7bfe1eeba404b2ade8aef1bde029f5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -112,6 +112,11 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     fillBaseName: spear
+    inHandsFillBaseName: -fill-
+    inHandsMaxFillLevels: 1
+    equippedFillBaseName: -fill-
+    equippedMaxFillLevels: 1
+
 
 - type: entity
   name: reinforced spear

diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..87a1358
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..4d0d61d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
index 421037eac3726d16a0cf57d84e922e67918757a8..33274c57fe5f8f7a54f93a27c3b28fd84759b724 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..e50787d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..0a78a49
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..87a1358
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..4d0d61d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
index 5a18552d2e070f03832848e95d044dc29e05ad56..538317a61debdfe988d00c0aabe4fb14143c39b1 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..e50787d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..0a78a49
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..87a1358
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..4d0d61d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
index 5a18552d2e070f03832848e95d044dc29e05ad56..6ef6a5fa440ff8fb79a90a16f764b73567966a37 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+         "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..e50787d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..0a78a49
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..87a1358
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..4d0d61d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
index 421037eac3726d16a0cf57d84e922e67918757a8..33274c57fe5f8f7a54f93a27c3b28fd84759b724 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..e50787d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..0a78a49
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644 (file)
index 0000000..db23cdc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..87a1358
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..4d0d61d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
index 5a18552d2e070f03832848e95d044dc29e05ad56..538317a61debdfe988d00c0aabe4fb14143c39b1 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644 (file)
index 0000000..e50787d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..0a78a49
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png differ