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

new method

Browse Source
This commit is contained in:
CaYpeN1
2024-03-24 21:28:59 +05:00
parent 21278b73ca
commit 7198ad69b2
7 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Server/_White/WeaponModules/WeaponModulesSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared._White.WeaponModules; using System.Diagnostics.CodeAnalysis;
using Content.Shared._White.WeaponModules;
using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Components;
using Content.Shared.Weapons.Ranged.Systems; using Content.Shared.Weapons.Ranged.Systems;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
@@ -32,7 +33,6 @@ public sealed class WeaponModulesSystem : EntitySystem
SubscribeLocalEvent<AcceleratorModuleComponent, EntGotInsertedIntoContainerMessage>(AcceleratorModuleOnInsert); SubscribeLocalEvent<AcceleratorModuleComponent, EntGotInsertedIntoContainerMessage>(AcceleratorModuleOnInsert);
SubscribeLocalEvent<AcceleratorModuleComponent, EntGotRemovedFromContainerMessage>(AcceleratorModuleOnEject); SubscribeLocalEvent<AcceleratorModuleComponent, EntGotRemovedFromContainerMessage>(AcceleratorModuleOnEject);
} }
private bool TryInsertModule(EntityUid module, EntityUid weapon, EntGotInsertedIntoContainerMessage args) private bool TryInsertModule(EntityUid module, EntityUid weapon, EntGotInsertedIntoContainerMessage args)
{ {
if (TryComp<WeaponModulesComponent>(weapon, out var weaponModulesComponent) && ModulesSlot == args.Container.ID) if (TryComp<WeaponModulesComponent>(weapon, out var weaponModulesComponent) && ModulesSlot == args.Container.ID)
@@ -57,6 +57,11 @@ public sealed class WeaponModulesSystem : EntitySystem
return false; return false;
} }
private void SetAppearance(EntityUid weapon, Enum key, string value, AppearanceComponent appearanceComponent)
{
_appearanceSystem.SetData(weapon, key, value, appearanceComponent);
}
#region InsertModules #region InsertModules
private void LightModuleOnInsert(EntityUid module, LightModuleComponent component, EntGotInsertedIntoContainerMessage args) private void LightModuleOnInsert(EntityUid module, LightModuleComponent component, EntGotInsertedIntoContainerMessage args)
{ {
@@ -67,7 +72,7 @@ public sealed class WeaponModulesSystem : EntitySystem
if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return; if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "light", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, component.AppearanceValue, appearanceComponent);
_lightSystem.EnsureLight(weapon); _lightSystem.EnsureLight(weapon);
@@ -90,7 +95,7 @@ public sealed class WeaponModulesSystem : EntitySystem
component.OldProjectileSpeed = gunComp.ProjectileSpeed; component.OldProjectileSpeed = gunComp.ProjectileSpeed;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "laser", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, component.AppearanceValue, appearanceComponent);
_gunSystem.SetProjectileSpeed(weapon, component.OldProjectileSpeed + 15F); _gunSystem.SetProjectileSpeed(weapon, component.OldProjectileSpeed + 15F);
} }
@@ -103,7 +108,7 @@ public sealed class WeaponModulesSystem : EntitySystem
if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return; if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "flamehider", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, component.AppearanceValue, appearanceComponent);
weaponModulesComponent.UseEffect = true; weaponModulesComponent.UseEffect = true;
Dirty(module, weaponModulesComponent); Dirty(module, weaponModulesComponent);
} }
@@ -120,7 +125,7 @@ public sealed class WeaponModulesSystem : EntitySystem
component.OldSoundGunshot = gunComp.SoundGunshot; component.OldSoundGunshot = gunComp.SoundGunshot;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "silencer", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, component.AppearanceValue, appearanceComponent);
weaponModulesComponent.UseEffect = true; weaponModulesComponent.UseEffect = true;
_gunSystem.SetSound(weapon, component.NewSoundGunshot); _gunSystem.SetSound(weapon, component.NewSoundGunshot);
@@ -140,7 +145,7 @@ public sealed class WeaponModulesSystem : EntitySystem
component.OldFireRate = gunComp.FireRate; component.OldFireRate = gunComp.FireRate;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "accelerator", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, component.AppearanceValue, appearanceComponent);
_gunSystem.SetFireRate(weapon, component.OldFireRate + 2F); _gunSystem.SetFireRate(weapon, component.OldFireRate + 2F);
} }
#endregion #endregion
@@ -155,7 +160,7 @@ public sealed class WeaponModulesSystem : EntitySystem
if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return; if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "none", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, "none", appearanceComponent);
_lightSystem.TryGetLight(weapon, out var light); _lightSystem.TryGetLight(weapon, out var light);
_lightSystem.SetRadius(weapon, 0F, light); _lightSystem.SetRadius(weapon, 0F, light);
_lightSystem.SetEnabled(weapon, false, light); _lightSystem.SetEnabled(weapon, false, light);
@@ -170,7 +175,7 @@ public sealed class WeaponModulesSystem : EntitySystem
if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return; if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "none", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, "none", appearanceComponent);
_gunSystem.SetProjectileSpeed(weapon, component.OldProjectileSpeed); _gunSystem.SetProjectileSpeed(weapon, component.OldProjectileSpeed);
} }
@@ -183,7 +188,7 @@ public sealed class WeaponModulesSystem : EntitySystem
if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return; if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "none", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, "none", appearanceComponent);
weaponModulesComponent.UseEffect = false; weaponModulesComponent.UseEffect = false;
Dirty(module, weaponModulesComponent); Dirty(module, weaponModulesComponent);
} }
@@ -197,7 +202,7 @@ public sealed class WeaponModulesSystem : EntitySystem
if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return; if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "none", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, "none", appearanceComponent);
weaponModulesComponent.UseEffect = false; weaponModulesComponent.UseEffect = false;
_gunSystem.SetSound(weapon, component.OldSoundGunshot!); _gunSystem.SetSound(weapon, component.OldSoundGunshot!);
Dirty(module, weaponModulesComponent); Dirty(module, weaponModulesComponent);
@@ -212,9 +217,8 @@ public sealed class WeaponModulesSystem : EntitySystem
if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return; if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return;
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "none", appearanceComponent); SetAppearance(weapon, ModuleVisualState.Module, "none", appearanceComponent);
_gunSystem.SetFireRate(weapon, component.OldFireRate); _gunSystem.SetFireRate(weapon, component.OldFireRate);
} }
#endregion #endregion
} }

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

@@ -8,4 +8,7 @@ public sealed partial class AcceleratorModuleComponent : BaseModuleComponent
{ {
[ViewVariables(VVAccess.ReadWrite), DataField] [ViewVariables(VVAccess.ReadWrite), DataField]
public float OldFireRate; public float OldFireRate;
[ViewVariables(VVAccess.ReadWrite), DataField]
public string AppearanceValue = "accelerator";
} }

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

@@ -6,4 +6,6 @@
[RegisterComponent] [RegisterComponent]
public sealed partial class FlameHiderModuleComponent : BaseModuleComponent public sealed partial class FlameHiderModuleComponent : BaseModuleComponent
{ {
[ViewVariables(VVAccess.ReadWrite), DataField]
public string AppearanceValue = "flamehider";
} }

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

@@ -8,4 +8,7 @@ public sealed partial class LaserModuleComponent : BaseModuleComponent
{ {
[ViewVariables(VVAccess.ReadWrite), DataField] [ViewVariables(VVAccess.ReadWrite), DataField]
public float OldProjectileSpeed; public float OldProjectileSpeed;
[ViewVariables(VVAccess.ReadWrite), DataField]
public string AppearanceValue = "laser";
} }

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

@@ -8,4 +8,7 @@ public sealed partial class LightModuleComponent : BaseModuleComponent
{ {
[ViewVariables(VVAccess.ReadWrite), DataField] [ViewVariables(VVAccess.ReadWrite), DataField]
public bool Enabled; public bool Enabled;
[ViewVariables(VVAccess.ReadWrite), DataField]
public string AppearanceValue = "light";
} }

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

@@ -1,10 +0,0 @@
using Content.Shared.Weapons.Ranged.Events;
namespace Content.Shared._White.WeaponModules;
public abstract class SharedWeaponModulesSystem : EntitySystem
{
public override void Initialize()
{
}
}

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

@@ -13,4 +13,7 @@ public sealed partial class SilencerModuleComponent : BaseModuleComponent
[ViewVariables(VVAccess.ReadWrite), DataField] [ViewVariables(VVAccess.ReadWrite), DataField]
public SoundSpecifier NewSoundGunshot = new SoundPathSpecifier("/Audio/White/Weapons/Modules/silence.ogg"); public SoundSpecifier NewSoundGunshot = new SoundPathSpecifier("/Audio/White/Weapons/Modules/silence.ogg");
[ViewVariables(VVAccess.ReadWrite), DataField]
public string AppearanceValue = "silencer";
} }