Fixed Tipped ammo not being Spent (#25167)

Fix Tipped Ammo not being Spent

diff --git a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
index 665ebf7145575a5be282138114c7598b03b029d3..622a168fbf4435acfce9e7112d41bf409cc5ac52 100644 (file)
--- a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
+++ b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
@@ -17,4 +17,5 @@ public sealed partial class SpentAmmoVisualsComponent : Component
 public enum AmmoVisualLayers : byte
 {
     Base,
+    Tip,
 }

diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
index 7227f333c026bbca2f6f43191f350a4c491ceaec..adfdc89b897b27dbc351b17a4606a875a9ae4fe4 100644 (file)
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
@@ -30,5 +30,8 @@ public sealed partial class GunSystem
             state = component.State;
 
         sprite.LayerSetState(AmmoVisualLayers.Base, state);
+        if (sprite.LayerExists(AmmoVisualLayers.Tip)){
+            sprite.RemoveLayer(AmmoVisualLayers.Tip);
+        }
     }
 }

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
index 6f0c4df18ab323a3e353bf5a58cdb3fd30fed3ce..8d7b94a50a0e6ed335a5096b4495f07e57765975 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -39,7 +39,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"
 
 - type: entity
@@ -52,5 +54,7 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#43c4f7"

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
index b3da905f0df0fec6d5aff7bcba165103346da69a..cda812ed033dbb4ce20f12c755a95e1753fd0468 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -36,7 +36,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"
 
 - type: entity
@@ -49,7 +51,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#43c4f7"
 
 - type: entity
@@ -62,7 +66,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#ff6e52"
 
 - type: entity
@@ -75,5 +81,7 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#65fe08"

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
index 13f9aef2d1b77a4fa512551b028dfdfb03be9a77..c5c5ad1f8d6583d4e8d559d8a05de3ed94e7388d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -36,7 +36,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"
 
 - type: entity
@@ -49,7 +51,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#43c4f7"
 
 - type: entity
@@ -62,7 +66,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#ff6e52"
 
 - type: entity
@@ -75,7 +81,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#0a0a0a"
 
 - type: entity
@@ -88,5 +96,8 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#65fe08"
+

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index 47bf6b8933272df199f5fdd5207b66b3e1adc8a4..69aa8664aa39cf1eb1f967f083a196a0c64ccb20 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -13,8 +13,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     layers:
-    - state: base
-      map: ["enum.AmmoVisualLayers.Base"]
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
   - type: Appearance
   - type: SpentAmmoVisuals
 
@@ -33,11 +33,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolPractice
-  - type: Sprite
-    layers:
-      - state: base
-      - state: tip
-        color: "#dbdbdb"
+  -  type: Sprite
+     layers:
+       - state: base
+         map: [ "enum.AmmoVisualLayers.Base" ]
+       - state: tip
+         map: [ "enum.AmmoVisualLayers.Tip" ]
+         color: "#dbdbdb"
 
 - type: entity
   id: CartridgePistolRubber
@@ -49,7 +51,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#43c4f7"
 
 - type: entity
@@ -62,7 +66,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#ff6e52"
 
 - type: entity
@@ -75,5 +81,7 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#65fe08"

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
index 76abd1bd81cc77e8f8e665374e5c22d891f03f35..c47688ab018cbbb14146b5d1e88a111f10f67d61 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -36,7 +36,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"
 
 
@@ -50,7 +52,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#43c4f7"
 
 - type: entity
@@ -63,7 +67,9 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#ff6e52"
 
 - type: entity
@@ -76,5 +82,7 @@
   - type: Sprite
     layers:
       - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
       - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#65fe08"