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

change

Browse Source
This commit is contained in:
CaYpeN1
2024-03-25 14:40:56 +05:00
parent 428a153ddb
commit 0796ca7bee
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,36 +34,38 @@ 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, BaseModuleComponent component, EntGotInsertedIntoContainerMessage args, [NotNullWhen(true)] out WeaponModulesComponent? weaponModulesComponent) private bool TryInsertModule(EntityUid module, EntityUid weapon, BaseModuleComponent component,
EntGotInsertedIntoContainerMessage args, [NotNullWhen(true)] out WeaponModulesComponent? weaponModulesComponent,
[NotNullWhen(true)] out AppearanceComponent? appearanceComponent)
{ {
if (!TryComp<WeaponModulesComponent>(weapon, out var weaponModulesComponents) || !TryComp<AppearanceComponent>(weapon, out var appearanceComponent) || ModulesSlot != args.Container.ID) if (!TryComp(weapon, out weaponModulesComponent) || !TryComp(weapon, out appearanceComponent) ||
ModulesSlot != args.Container.ID)
{ {
weaponModulesComponent = null; weaponModulesComponent = null;
appearanceComponent = null; appearanceComponent = null;
return false; return false;
} }
if(!weaponModulesComponents.Modules.Contains(module)) if(!weaponModulesComponent.Modules.Contains(module))
weaponModulesComponents.Modules.Add(module); weaponModulesComponent.Modules.Add(module);
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, component.AppearanceValue, appearanceComponent); _appearanceSystem.SetData(weapon, ModuleVisualState.Module, component.AppearanceValue, appearanceComponent);
weaponModulesComponent = weaponModulesComponents;
return true; return true;
} }
private bool TryEjectModule(EntityUid module, EntityUid weapon, EntGotRemovedFromContainerMessage args, [NotNullWhen(true)] out WeaponModulesComponent? weaponModulesComponent) private bool TryEjectModule(EntityUid module, EntityUid weapon, EntGotRemovedFromContainerMessage args, [NotNullWhen(true)] out WeaponModulesComponent? weaponModulesComponent, [NotNullWhen(true)] out AppearanceComponent? appearanceComponent)
{ {
if (!TryComp<WeaponModulesComponent>(weapon, out var weaponModulesComponents) || !TryComp<AppearanceComponent>(weapon, out var appearanceComponent) || ModulesSlot != args.Container.ID) if (!TryComp(weapon, out weaponModulesComponent) || !TryComp(weapon, out appearanceComponent) || ModulesSlot != args.Container.ID)
{ {
weaponModulesComponent = null; weaponModulesComponent = null;
appearanceComponent = null; appearanceComponent = null;
return false; return false;
} }
if(weaponModulesComponents.Modules.Contains(module)) if(weaponModulesComponent.Modules.Contains(module))
weaponModulesComponents.Modules.Remove(module); weaponModulesComponent.Modules.Remove(module);
_appearanceSystem.SetData(weapon, ModuleVisualState.Module, "none", appearanceComponent); _appearanceSystem.SetData(weapon, ModuleVisualState.Module, "none", appearanceComponent);
weaponModulesComponent = weaponModulesComponents;
return true; return true;
} }
@@ -72,11 +74,9 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
if(!TryComp<AppearanceComponent>(weapon, out var appearanceComponent)) return;
_lightSystem.EnsureLight(weapon); _lightSystem.EnsureLight(weapon);
_lightSystem.TryGetLight(weapon, out var light); _lightSystem.TryGetLight(weapon, out var light);
@@ -90,7 +90,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
if (!TryComp<GunComponent>(weapon, out var gunComp)) return; if (!TryComp<GunComponent>(weapon, out var gunComp)) return;
@@ -104,7 +104,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
weaponModulesComponent.UseEffect = true; weaponModulesComponent.UseEffect = true;
@@ -115,7 +115,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
if (!TryComp<GunComponent>(weapon, out var gunComp)) return; if (!TryComp<GunComponent>(weapon, out var gunComp)) return;
@@ -132,7 +132,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
if (!TryComp<GunComponent>(weapon, out var gunComp)) return; if (!TryComp<GunComponent>(weapon, out var gunComp)) return;
@@ -148,7 +148,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
_lightSystem.TryGetLight(weapon, out var light); _lightSystem.TryGetLight(weapon, out var light);
@@ -160,7 +160,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
_gunSystem.SetProjectileSpeed(weapon, component.OldProjectileSpeed); _gunSystem.SetProjectileSpeed(weapon, component.OldProjectileSpeed);
@@ -170,7 +170,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
weaponModulesComponent.UseEffect = false; weaponModulesComponent.UseEffect = false;
@@ -181,7 +181,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
weaponModulesComponent.UseEffect = false; weaponModulesComponent.UseEffect = false;
@@ -193,7 +193,7 @@ public sealed class WeaponModulesSystem : EntitySystem
{ {
EntityUid weapon = args.Container.Owner; EntityUid weapon = args.Container.Owner;
if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent))
return; return;
_gunSystem.SetFireRate(weapon, component.OldFireRate); _gunSystem.SetFireRate(weapon, component.OldFireRate);