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

Misc ItemToggleSystem changes (#26489)

Browse Source 
* Minor ItemToggleSystem tweaks

* Update visuals on startup

* Remove SetIgnited

* Misc toggle fixes

* Update ItemToggleHotComponent.cs
This commit is contained in:
Leon Friedrich
2024-03-28 17:05:04 +13:00
committed by GitHub
parent 77e029d4ca
commit 8a6879bb1b
8 changed files with 114 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
View File

@@ -1,19 +1,21 @@
namespace Content.Server.Item;
/// <summary>
/// Handles whether this item applies a disarm malus when active.
/// Handles whether this item applies a disarm malus when active.
/// </summary>
[RegisterComponent]
public sealed partial class ItemToggleDisarmMalusComponent : Component
{
/// <summary>
/// Item has this modifier to the chance to disarm when activated.
/// If null, the value will be inferred from the current malus just before the malus is first deactivated.
/// </summary>
[ViewVariables(VVAccess.ReadOnly), DataField]
public float? ActivatedDisarmMalus = null;
/// <summary>
/// Item has this modifier to the chance to disarm when deactivated. If none is mentioned, it uses the item's default disarm modifier.
/// If null, the value will be inferred from the current malus just before the malus is first activated.
/// </summary>
[ViewVariables(VVAccess.ReadOnly), DataField]
public float? DeactivatedDisarmMalus = null;

7
Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs
View File

@@ -1,14 +1,9 @@
namespace Content.Server.Item;
/// <summary>
/// Handles whether this item is sharp when toggled on.
/// Handles whether this item is sharp when toggled on.
/// </summary>
[RegisterComponent]
public sealed partial class ItemToggleSharpComponent : Component
{
/// <summary>
/// Item can be used to butcher when activated.
/// </summary>
[ViewVariables(VVAccess.ReadOnly), DataField]
public bool ActivatedSharp = true;
}

61
Content.Server/Item/ItemToggle/ItemToggleSystem.cs
View File

@@ -1,9 +1,7 @@
using Content.Shared.Item;
using Content.Server.CombatMode.Disarm;
using Content.Server.Kitchen.Components;
using Content.Shared.Item.ItemToggle;
using Content.Shared.Item.ItemToggle.Components;
using ItemToggleComponent = Content.Shared.Item.ItemToggle.Components.ItemToggleComponent;
namespace Content.Server.Item;
@@ -13,47 +11,34 @@ public sealed class ItemToggleSystem : SharedItemToggleSystem
{
base.Initialize();
SubscribeLocalEvent<ItemToggleComponent, ItemToggledEvent>(Toggle);
SubscribeLocalEvent<ItemToggleSharpComponent, ItemToggledEvent>(ToggleSharp);
SubscribeLocalEvent<ItemToggleDisarmMalusComponent, ItemToggledEvent>(ToggleMalus);
}
private void Toggle(EntityUid uid, ItemToggleComponent comp, ref ItemToggledEvent args)
private void ToggleSharp(Entity<ItemToggleSharpComponent> ent, ref ItemToggledEvent args)
{
if (args.Activated == true)
{
if (TryComp<ItemToggleSharpComponent>(uid, out var itemSharpness))
{
if (itemSharpness.ActivatedSharp)
EnsureComp<SharpComponent>(uid);
}
if (!TryComp<ItemToggleDisarmMalusComponent>(uid, out var itemToggleDisarmMalus) ||
!TryComp<DisarmMalusComponent>(uid, out var malus))
return;
//Default the deactivated DisarmMalus to the item's value before activation happens.
itemToggleDisarmMalus.DeactivatedDisarmMalus ??= malus.Malus;
if (itemToggleDisarmMalus.ActivatedDisarmMalus != null)
{
malus.Malus = (float) itemToggleDisarmMalus.ActivatedDisarmMalus;
}
}
// TODO generalize this into a "ToggleComponentComponent", though probably with a better name
if (args.Activated)
EnsureComp<SharpComponent>(ent);
else
RemCompDeferred<SharpComponent>(ent);
}
private void ToggleMalus(Entity<ItemToggleDisarmMalusComponent> ent, ref ItemToggledEvent args)
{
if (!TryComp<DisarmMalusComponent>(ent, out var malus))
return;
if (args.Activated)
{
if (TryComp<ItemToggleSharpComponent>(uid, out var itemSharpness))
{
if (itemSharpness.ActivatedSharp)
RemCompDeferred<SharpComponent>(uid);
}
if (!TryComp<ItemToggleDisarmMalusComponent>(uid, out var itemToggleDisarmMalus) ||
!TryComp<DisarmMalusComponent>(uid, out var malus))
return;
if (itemToggleDisarmMalus.DeactivatedDisarmMalus != null)
{
malus.Malus = (float) itemToggleDisarmMalus.DeactivatedDisarmMalus;
}
ent.Comp.DeactivatedDisarmMalus ??= malus.Malus;
if (ent.Comp.ActivatedDisarmMalus is {} activatedMalus)
malus.Malus = activatedMalus;
return;
}
ent.Comp.ActivatedDisarmMalus ??= malus.Malus;
if (ent.Comp.DeactivatedDisarmMalus is {} deactivatedMalus)
malus.Malus = deactivatedMalus;
}
}