Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed Tipped ammo not being Spent (#25167)

Browse Source 
Fix Tipped Ammo not being Spent
This commit is contained in:
PoorMansDreams
2024-02-13 13:40:15 -08:00
committed by GitHub
parent 6b16bda9f3
commit e40318b831
7 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
View File

@@ -17,4 +17,5 @@ public sealed partial class SpentAmmoVisualsComponent : Component
public enum AmmoVisualLayers : byte
{
Base,
Tip,
}

3
Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
View File

@@ -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);
}
}
}

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
View File

@@ -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"

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
View File

@@ -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"

11
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
View File

@@ -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"

22
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
View File

@@ -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"

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
View File

@@ -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"