tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ClothingSpeedModifierSystem.cs (#29994)

Browse Source 
* TryGetContainerContainer

* Math

* Changed AddMarkup to AddMarkupOrThrow

* Better math

* engine version

* engine version
This commit is contained in:
Errant
2024-08-28 11:28:24 +02:00
committed by GitHub
parent 2a28a05550
commit 4d4a10dae6
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
View File

@@ -1,10 +1,8 @@
using Content.Shared.Clothing.Components;
using Content.Shared.Examine; using Content.Shared.Examine;
using Content.Shared.Inventory; using Content.Shared.Inventory;
using Content.Shared.Item.ItemToggle; using Content.Shared.Item.ItemToggle;
using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Item.ItemToggle.Components;
using Content.Shared.Movement.Systems; using Content.Shared.Movement.Systems;
using Content.Shared.PowerCell;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
@@ -73,22 +71,22 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
var msg = new FormattedMessage(); var msg = new FormattedMessage();
if (walkModifierPercentage == sprintModifierPercentage) if (MathHelper.CloseTo(walkModifierPercentage, sprintModifierPercentage, 0.5f))
{ {
if (walkModifierPercentage < 0.0f) if (walkModifierPercentage < 0.0f)
msg.AddMarkup(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)), ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)), ("runSpeed", (int) MathF.Abs(sprintModifierPercentage))));
else else
msg.AddMarkup(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", (int) walkModifierPercentage), ("runSpeed", (int) sprintModifierPercentage))); msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", (int) walkModifierPercentage), ("runSpeed", (int) sprintModifierPercentage)));
} }
else else
{ {
if (sprintModifierPercentage < 0.0f) if (sprintModifierPercentage < 0.0f)
{ {
msg.AddMarkup(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", (int) MathF.Abs(sprintModifierPercentage))));
} }
else if (sprintModifierPercentage > 0.0f) else if (sprintModifierPercentage > 0.0f)
{ {
msg.AddMarkup(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", (int) sprintModifierPercentage))); msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", (int) sprintModifierPercentage)));
} }
if (walkModifierPercentage != 0.0f && sprintModifierPercentage != 0.0f) if (walkModifierPercentage != 0.0f && sprintModifierPercentage != 0.0f)
{ {
@@ -96,11 +94,11 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem
} }
if (walkModifierPercentage < 0.0f) if (walkModifierPercentage < 0.0f)
{ {
msg.AddMarkup(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)))); msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage))));
} }
else if (walkModifierPercentage > 0.0f) else if (walkModifierPercentage > 0.0f)
{ {
msg.AddMarkup(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", (int) walkModifierPercentage))); msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", (int) walkModifierPercentage)));
} }
} }