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

Some fixes to magboots (#15392)

Browse Source
This commit is contained in:
Menshin
2023-04-22 12:42:36 +02:00
committed by GitHub
parent 035fcaa5b1
commit 8ddef7611b
5 changed files with 25 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Shared/Clothing/MagbootsComponent.cs
View File

@@ -1,26 +1,15 @@
using Content.Shared.Actions.ActionTypes;
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;
namespace Content.Shared.Clothing;
[RegisterComponent, NetworkedComponent()]
public sealed class MagbootsComponent : Component
[RegisterComponent, NetworkedComponent(), AutoGenerateComponentState]
[Access(typeof(SharedMagbootsSystem))]
public sealed partial class MagbootsComponent : Component
{
[DataField("toggleAction", required: true)]
public InstantAction ToggleAction = new();
[ViewVariables]
[DataField("on"), AutoNetworkedField]
public bool On;
[Serializable, NetSerializable]
public sealed class MagbootsComponentState : ComponentState
{
public bool On { get; }
public MagbootsComponentState(bool @on)
{
On = on;
}
}
}

28
Content.Shared/Clothing/SharedMagbootsSystem.cs
View File

@@ -35,29 +35,35 @@ public abstract class SharedMagbootsSystem : EntitySystem
return;
args.Handled = true;
component.On = !component.On;
ToggleMagboots(uid, component);
}
private void ToggleMagboots(EntityUid uid, MagbootsComponent magboots)
{
magboots.On = !magboots.On;
if (_sharedContainer.TryGetContainingContainer(uid, out var container) &&
_inventory.TryGetSlotEntity(container.Owner, "shoes", out var entityUid) && entityUid == component.Owner)
UpdateMagbootEffects(container.Owner, uid, true, component);
_inventory.TryGetSlotEntity(container.Owner, "shoes", out var entityUid) && entityUid == uid)
UpdateMagbootEffects(container.Owner, uid, true, magboots);
if (TryComp<ItemComponent>(uid, out var item))
{
_item.SetHeldPrefix(uid, component.On ? "on" : null, item);
_clothing.SetEquippedPrefix(uid, component.On ? "on" : null);
_item.SetHeldPrefix(uid, magboots.On ? "on" : null, item);
_clothing.SetEquippedPrefix(uid, magboots.On ? "on" : null);
}
_appearance.SetData(uid, ToggleVisuals.Toggled, component.Owner);
OnChanged(component);
Dirty(component);
_appearance.SetData(uid, ToggleVisuals.Toggled, magboots.On);
OnChanged(uid, magboots);
Dirty(magboots);
}
protected virtual void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bool state, MagbootsComponent? component) { }
protected void OnChanged(MagbootsComponent component)
protected void OnChanged(EntityUid uid, MagbootsComponent component)
{
_sharedActions.SetToggled(component.ToggleAction, component.On);
_clothingSpeedModifier.SetClothingSpeedModifierEnabled(component.Owner, component.On);
_clothingSpeedModifier.SetClothingSpeedModifierEnabled(uid, component.On);
}
private void AddToggleVerb(EntityUid uid, MagbootsComponent component, GetVerbsEvent<ActivationVerb> args)
@@ -67,7 +73,7 @@ public abstract class SharedMagbootsSystem : EntitySystem
ActivationVerb verb = new();
verb.Text = Loc.GetString("toggle-magboots-verb-get-data-text");
verb.Act = () => component.On = !component.On;
verb.Act = () => ToggleMagboots(uid, component);
// TODO VERB ICON add toggle icon? maybe a computer on/off symbol?
args.Verbs.Add(verb);
}