From c767cda9807e170b7c4bc96b7e031df7b4f992cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 14 Aug 2024 20:13:00 +0300 Subject: [PATCH] Add summary and some fixes --- .../Ranged/Systems/BatteryWeaponFireModesSystem.cs | 1 + .../Components/BatteryWeaponFireModesComponent.cs | 11 ++++++++++- .../Ranged/Systems/BatteryWeaponFireModesSystem.cs | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Content.Client/SS220/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Client/SS220/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs index 2df577de3c22..f10618cacf84 100644 --- a/Content.Client/SS220/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs +++ b/Content.Client/SS220/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs @@ -4,6 +4,7 @@ using static Content.Shared.Weapons.Ranged.Systems.BatteryWeaponFireModesSystem; namespace Content.Client.SS220.Weapons.Ranged.Systems; + public sealed partial class BatteryWeaponFireModesSystem : EntitySystem { [Dependency] private readonly GunSystem _gunSystem = default!; diff --git a/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs b/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs index 7202ee06e830..0abc99096844 100644 --- a/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs @@ -38,12 +38,21 @@ public sealed partial class BatteryWeaponFireMode public string Prototype = default!; //SS220 Add Multifaze gun //SS220 Add Multifaze gun begin - [DataField("fireModeName")] + /// + /// Name of the fire mode + /// + [DataField] public string? FireModeName; + /// + /// Sound of a gunshot that is used in the selected fire mode + /// [DataField] public string? SoundGunshot; + /// + /// Sprite of the remaining charge that is used in the selected fire mode + /// [DataField] public string? MagState; //SS220 Add Multifaze gun end diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs index 757c44ef61de..51874806176d 100644 --- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs @@ -6,7 +6,6 @@ using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; using Robust.Shared.Timing; namespace Content.Shared.Weapons.Ranged.Systems; @@ -207,6 +206,12 @@ private void OnInit(EntityUid uid, BatteryWeaponFireModesComponent component, re SetFireMode(uid, component, component.CurrentFireMode); } + /// + /// The event that rises when the fire mode is selected + /// + /// + /// + /// [ByRefEvent] public record struct ChangeFireModeEvent(EntityUid Uid, BatteryWeaponFireModesComponent Component, int Index); //SS220 Add Multifaze gun end