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

basemodulecomponent & sharedgunsystem

Browse Source
This commit is contained in:
CaYpeN1
2024-03-22 19:36:18 +05:00
parent 5f610860f5
commit 3dbd027b52
9 changed files with 89 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Numerics;
using Content.Shared._White.WeaponModules;
using Content.Shared.ActionBlocker;
using Content.Shared.Actions;
using Content.Shared.Administration.Logs;
@@ -476,6 +477,9 @@ public abstract partial class SharedGunSystem : EntitySystem
protected void MuzzleFlash(EntityUid gun, AmmoComponent component, EntityUid? user = null)
{
bool cancelled = TryComp<WeaponModulesComponent>(gun, out var weaponModulesComponent) && weaponModulesComponent.UseEffect;
if(cancelled) return;
var attemptEv = new GunMuzzleFlashAttemptEvent();
RaiseLocalEvent(gun, ref attemptEv);
if (attemptEv.Cancelled)

2
Content.Shared/_White/WeaponModules/AcceleratorModuleComponent.cs
View File

@@ -4,7 +4,7 @@
/// This is used for...
/// </summary>
[RegisterComponent]
public sealed partial class AcceleratorModuleComponent : WeaponModulesComponent
public sealed partial class AcceleratorModuleComponent : BaseModuleComponent
{
[ViewVariables(VVAccess.ReadWrite), DataField]
public float OldFireRate;

9
Content.Shared/_White/WeaponModules/BaseModuleComponent.cs Normal file
View File

@@ -0,0 +1,9 @@
using Robust.Shared.GameStates;
namespace Content.Shared._White.WeaponModules;
[RegisterComponent, NetworkedComponent]
public partial class BaseModuleComponent : Component
{
}

2
Content.Shared/_White/WeaponModules/FlameHiderModuleComponent.cs
View File

@@ -4,6 +4,6 @@
/// This is used for...
/// </summary>
[RegisterComponent]
public sealed partial class FlameHiderModuleComponent : WeaponModulesComponent
public sealed partial class FlameHiderModuleComponent : BaseModuleComponent
{
}

2
Content.Shared/_White/WeaponModules/LaserModuleComponent.cs
View File

@@ -4,7 +4,7 @@
/// This is used for...
/// </summary>
[RegisterComponent]
public sealed partial class LaserModuleComponent : WeaponModulesComponent
public sealed partial class LaserModuleComponent : BaseModuleComponent
{
}

2
Content.Shared/_White/WeaponModules/LightModuleComponent.cs
View File

@@ -4,7 +4,7 @@
/// LightModuleComponent
/// </summary>
[RegisterComponent]
public sealed partial class LightModuleComponent : WeaponModulesComponent
public sealed partial class LightModuleComponent : BaseModuleComponent
{
[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled;

6
Content.Shared/_White/WeaponModules/SharedWeaponModulesSystem.cs
View File

@@ -6,11 +6,5 @@ public abstract class SharedWeaponModulesSystem : EntitySystem
{
public override void Initialize()
{
SubscribeLocalEvent<WeaponModulesComponent, GunMuzzleFlashAttemptEvent>(OnMuzzleFlashEvent);
}
private void OnMuzzleFlashEvent(EntityUid weapon, WeaponModulesComponent component, ref GunMuzzleFlashAttemptEvent args)
{
args.Cancelled = component.UseEffect;
}
}

2
Content.Shared/_White/WeaponModules/SilencerModuleComponent.cs
View File

@@ -6,7 +6,7 @@ namespace Content.Shared._White.WeaponModules;
/// This is used for...
/// </summary>
[RegisterComponent]
public sealed partial class SilencerModuleComponent : WeaponModulesComponent
public sealed partial class SilencerModuleComponent : BaseModuleComponent
{
[ViewVariables(VVAccess.ReadWrite), DataField]
public SoundSpecifier? OldSoundGunshot;