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

Set max length of battlecry to 12 chars. (#16958)

Browse Source 
* Set max length of battlecry to 12 chars. Deleted a duplicate file.

* Also cleanup some leftovers
This commit is contained in:
HerCoyote23
2023-05-30 10:57:53 -07:00
committed by GitHub
parent 159a0a8eb2
commit d1a0f5f09e
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs
View File

@@ -1,6 +1,6 @@
using Content.Server.Administration.Logs; using Content.Server.Administration.Logs;
using Content.Shared.Speech.Components; using Content.Shared.Speech.Components;
using Content.Shared.Weapons.Melee; using Content.Shared.Speech.EntitySystems;
using Content.Shared.Database; using Content.Shared.Database;
@@ -22,10 +22,15 @@ public sealed class MeleeSpeechSystem : SharedMeleeSpeechSystem
private void OnBattlecryChanged(EntityUid uid, MeleeSpeechComponent comp, MeleeSpeechBattlecryChangedMessage args) private void OnBattlecryChanged(EntityUid uid, MeleeSpeechComponent comp, MeleeSpeechBattlecryChangedMessage args)
{ {
if (!TryComp<MeleeSpeechComponent>(uid, out var meleeSpeechUser)) if (!TryComp<MeleeSpeechComponent>(uid, out var meleeSpeechUser))
return; return;
TryChangeBattlecry(uid, args.Battlecry, meleeSpeechUser); string battlecry = args.Battlecry;
if (battlecry.Length > comp.MaxBattlecryLength)
battlecry = battlecry[..comp.MaxBattlecryLength];
TryChangeBattlecry(uid, battlecry, meleeSpeechUser);
} }
@@ -41,12 +46,14 @@ public sealed class MeleeSpeechSystem : SharedMeleeSpeechSystem
public bool TryChangeBattlecry(EntityUid uid, string? battlecry, MeleeSpeechComponent? meleeSpeechComp = null) public bool TryChangeBattlecry(EntityUid uid, string? battlecry, MeleeSpeechComponent? meleeSpeechComp = null)
{ {
if (!Resolve(uid, ref meleeSpeechComp)) if (!Resolve(uid, ref meleeSpeechComp))
return false; return false;
if (!string.IsNullOrWhiteSpace(battlecry)) if (!string.IsNullOrWhiteSpace(battlecry))
{ {
battlecry = battlecry.Trim(); battlecry = battlecry.Trim();
} }
else else
{ {
@@ -56,6 +63,9 @@ public sealed class MeleeSpeechSystem : SharedMeleeSpeechSystem
if (meleeSpeechComp.Battlecry == battlecry) if (meleeSpeechComp.Battlecry == battlecry)
return true; return true;
meleeSpeechComp.Battlecry = battlecry; meleeSpeechComp.Battlecry = battlecry;
Dirty(meleeSpeechComp); Dirty(meleeSpeechComp);

6
Content.Shared/Speech/Components/MeleeSpeechComponent.cs
View File

@@ -5,15 +5,17 @@ namespace Content.Shared.Speech.Components;
[RegisterComponent] [RegisterComponent]
[AutoGenerateComponentState] [AutoGenerateComponentState]
[Access(typeof(SharedMeleeSpeechSystem), Other = AccessPermissions.ReadWrite)]
public sealed partial class MeleeSpeechComponent : Component public sealed partial class MeleeSpeechComponent : Component
{ {
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("Battlecry")] [DataField("Battlecry")]
[AutoNetworkedField] [AutoNetworkedField]
[Access(typeof(SharedMeleeSpeechSystem), Other = AccessPermissions.ReadWrite)]
public string? Battlecry; public string? Battlecry;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("MaxBattlecryLength")]
public int MaxBattlecryLength = 12;
} }
/// <summary> /// <summary>

2
Content.Shared/Speech/EntitySystems/SharedMeleeSpeechSystem.cs
View File

@@ -1,6 +1,6 @@
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
namespace Content.Shared.Weapons.Melee; namespace Content.Shared.Speech.EntitySystems;
public abstract class SharedMeleeSpeechSystem : EntitySystem public abstract class SharedMeleeSpeechSystem : EntitySystem
{ {

7
Content.Shared/Weapons/Melee/SharedMeleeSpeechSystem.cs
View File

@@ -1,7 +0,0 @@
using Robust.Shared.Serialization;
namespace Content.Shared.Speech.EntitySystems;
public abstract class SharedMeleeSpeechSystem : EntitySystem
{
}