Adds speed modifier values to examine clothing (#11107)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
This commit is contained in:
@@ -1,6 +1,9 @@
|
|||||||
using Content.Shared.Movement.Systems;
|
using Content.Shared.Examine;
|
||||||
|
using Content.Shared.Movement.Systems;
|
||||||
|
using Content.Shared.Verbs;
|
||||||
using Robust.Shared.Containers;
|
using Robust.Shared.Containers;
|
||||||
using Robust.Shared.GameStates;
|
using Robust.Shared.GameStates;
|
||||||
|
using Robust.Shared.Utility;
|
||||||
|
|
||||||
namespace Content.Shared.Clothing;
|
namespace Content.Shared.Clothing;
|
||||||
|
|
||||||
@@ -8,6 +11,7 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
|
|||||||
{
|
{
|
||||||
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
|
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
|
||||||
[Dependency] private readonly SharedContainerSystem _container = default!;
|
[Dependency] private readonly SharedContainerSystem _container = default!;
|
||||||
|
[Dependency] private readonly ExamineSystemShared _examine = default!;
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
@@ -16,6 +20,7 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
|
|||||||
SubscribeLocalEvent<ClothingSpeedModifierComponent, ComponentGetState>(OnGetState);
|
SubscribeLocalEvent<ClothingSpeedModifierComponent, ComponentGetState>(OnGetState);
|
||||||
SubscribeLocalEvent<ClothingSpeedModifierComponent, ComponentHandleState>(OnHandleState);
|
SubscribeLocalEvent<ClothingSpeedModifierComponent, ComponentHandleState>(OnHandleState);
|
||||||
SubscribeLocalEvent<ClothingSpeedModifierComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMoveSpeed);
|
SubscribeLocalEvent<ClothingSpeedModifierComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMoveSpeed);
|
||||||
|
SubscribeLocalEvent<ClothingSpeedModifierComponent, GetVerbsEvent<ExamineVerb>>(OnClothingVerbExamine);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Public API
|
// Public API
|
||||||
@@ -67,4 +72,63 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
|
|||||||
|
|
||||||
args.ModifySpeed(component.WalkModifier, component.SprintModifier);
|
args.ModifySpeed(component.WalkModifier, component.SprintModifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent component, GetVerbsEvent<ExamineVerb> args)
|
||||||
|
{
|
||||||
|
if (!args.CanInteract || !args.CanAccess)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var walkModifierPercentage = MathF.Round((1.0f - component.WalkModifier) * 100f, 1);
|
||||||
|
var sprintModifierPercentage = MathF.Round((1.0f - component.SprintModifier) * 100f, 1);
|
||||||
|
|
||||||
|
if (walkModifierPercentage == 0.0f && sprintModifierPercentage == 0.0f)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var msg = new FormattedMessage();
|
||||||
|
|
||||||
|
if (walkModifierPercentage == sprintModifierPercentage)
|
||||||
|
{
|
||||||
|
if (walkModifierPercentage < 0.0f)
|
||||||
|
msg.AddMarkup(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", MathF.Abs(walkModifierPercentage)), ("runSpeed", MathF.Abs(sprintModifierPercentage))));
|
||||||
|
else
|
||||||
|
msg.AddMarkup(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", walkModifierPercentage), ("runSpeed", sprintModifierPercentage)));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (sprintModifierPercentage < 0.0f)
|
||||||
|
{
|
||||||
|
msg.AddMarkup(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", MathF.Abs(sprintModifierPercentage))));
|
||||||
|
}
|
||||||
|
else if (sprintModifierPercentage > 0.0f)
|
||||||
|
{
|
||||||
|
msg.AddMarkup(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", sprintModifierPercentage)));
|
||||||
|
}
|
||||||
|
if (walkModifierPercentage != 0.0f && sprintModifierPercentage != 0.0f)
|
||||||
|
{
|
||||||
|
msg.PushNewline();
|
||||||
|
}
|
||||||
|
if (walkModifierPercentage < 0.0f)
|
||||||
|
{
|
||||||
|
msg.AddMarkup(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", MathF.Abs(walkModifierPercentage))));
|
||||||
|
}
|
||||||
|
else if (walkModifierPercentage > 0.0f)
|
||||||
|
{
|
||||||
|
msg.AddMarkup(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", walkModifierPercentage)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var verb = new ExamineVerb()
|
||||||
|
{
|
||||||
|
Act = () =>
|
||||||
|
{
|
||||||
|
_examine.SendExamineTooltip(args.User, uid, msg, false, false);
|
||||||
|
},
|
||||||
|
Text = Loc.GetString("clothing-speed-examinable-verb-text"),
|
||||||
|
Message = Loc.GetString("clothing-speed-examinable-verb-message"),
|
||||||
|
Category = VerbCategory.Examine,
|
||||||
|
IconTexture = "/Textures/Interface/VerbIcons/outfit.svg.192dpi.png"
|
||||||
|
};
|
||||||
|
|
||||||
|
args.Verbs.Add(verb);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
9
Resources/Locale/en-US/clothing/clothing-speed.ftl
Normal file
9
Resources/Locale/en-US/clothing/clothing-speed.ftl
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# Clothing speed examine
|
||||||
|
clothing-speed-examinable-verb-text = Clothing
|
||||||
|
clothing-speed-examinable-verb-message = Examine the clothing speed values.
|
||||||
|
clothing-speed-increase-equal-examine = This increases your speed by [color=yellow]{$walkSpeed}%[/color].
|
||||||
|
clothing-speed-decrease-equal-examine = This decreases your speed by [color=yellow]{$walkSpeed}%[/color].
|
||||||
|
clothing-speed-increase-run-examine = This increases your running speed by [color=yellow]{$runSpeed}%[/color].
|
||||||
|
clothing-speed-decrease-run-examine = This decreases your running speed by [color=yellow]{$runSpeed}%[/color].
|
||||||
|
clothing-speed-increase-walk-examine = This increases your walking speed by [color=yellow]{$walkSpeed}%[/color].
|
||||||
|
clothing-speed-decrease-walk-examine = This decreases your walking speed by [color=yellow]{$walkSpeed}%[/color].
|
||||||
Reference in New Issue
Block a user