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

Merge branch 'master' into Stuff

Browse Source
This commit is contained in:
BIGZi0348
2025-01-07 13:14:18 +03:00
parent 1d89533709 0d5e9e21a8
commit 5756ab19fb
20 changed files with 212 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs
View File

@@ -18,6 +18,7 @@ public sealed class BattledAspect : AspectSystem<BattledAspectComponent>
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly ChatHelper _chatHelper = default!;
private NonPeacefulRoundItemsPrototype _nonPeacefulRoundItemsPrototype = default!;
@@ -32,7 +33,7 @@ public sealed class BattledAspect : AspectSystem<BattledAspectComponent>
{
base.Started(uid, component, gameRule, args);
var prototypes = _prototypeManager.EnumeratePrototypes<NonPeacefulRoundItemsPrototype>().ToList();
var prototypes = _prototypeManager.EnumeratePrototypes<NonPeacefulRoundItemsPrototype>().ToList();
if (prototypes.Count == 0)
ForceEndSelf(uid, gameRule);
@@ -61,6 +62,7 @@ public sealed class BattledAspect : AspectSystem<BattledAspectComponent>
var mob = ev.Mob;
GiveItem(mob);
_chatHelper.SendAspectDescription(mob, Loc.GetString("battled-aspect-desc"));
}
}
@@ -72,10 +74,10 @@ public sealed class BattledAspect : AspectSystem<BattledAspectComponent>
var transform = CompOrNull<TransformComponent>(player);
if(transform == null)
if (transform == null)
return;
if(!HasComp<HandsComponent>(player))
if (!HasComp<HandsComponent>(player))
return;
var weaponEntity = EntityManager.SpawnEntity(item, transform.Coordinates);

22
Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs
View File

@@ -21,6 +21,7 @@ public sealed class CatEarsAspect : AspectSystem<CatEarsAspectComponent>
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly ChatSystem _chat = default!;
[Dependency] private readonly ChatHelper _chatHelper = default!;
private MarkingPrototype _ears = default!;
private MarkingPrototype _tail = default!;
@@ -81,6 +82,7 @@ public sealed class CatEarsAspect : AspectSystem<CatEarsAspectComponent>
return;
AddMarkings(ev.Mob);
_chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("cat-ears-aspect-desc"));
}
}
@@ -94,18 +96,18 @@ public sealed class CatEarsAspect : AspectSystem<CatEarsAspectComponent>
case "Felinid":
return;
case "Human":
{
if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.HeadTop, out var markings) ||
markings.Count == 0)
AddEars(appearance);
{
if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.HeadTop, out var markings) ||
markings.Count == 0)
AddEars(appearance);
if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.Tail, out markings) || markings.Count == 0)
AddTail(appearance);
if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.Tail, out markings) || markings.Count == 0)
AddTail(appearance);
Dirty(uid, appearance);
ChangeEmotesVoice(uid, appearance);
return;
}
Dirty(uid, appearance);
ChangeEmotesVoice(uid, appearance);
return;
}
default:
AddEars(appearance);
AddTail(appearance);

3
Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs
View File

@@ -11,6 +11,8 @@ namespace Content.Server._White.AspectsSystem.Aspects;
public sealed class DancingAspect : AspectSystem<DancingAspectComponent>
{
[Dependency] private readonly ChatHelper _chatHelper = default!;
public override void Initialize()
{
base.Initialize();
@@ -45,6 +47,7 @@ public sealed class DancingAspect : AspectSystem<DancingAspectComponent>
var mob = ev.Mob;
EnsureComp<DancingComponent>(mob);
_chatHelper.SendAspectDescription(mob, Loc.GetString("dancing-aspect-desc"));
}
}
}

3
Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs
View File

@@ -11,6 +11,7 @@ namespace Content.Server._White.AspectsSystem.Aspects;
public sealed class DrunkAspect : AspectSystem<DrunkAspectComponent>
{
[Dependency] private readonly SharedDrunkSystem _drunkSystem = default!;
[Dependency] private readonly ChatHelper _chatHelper = default!;
public override void Initialize()
{
@@ -44,6 +45,8 @@ public sealed class DrunkAspect : AspectSystem<DrunkAspectComponent>
var mob = ev.Mob;
_drunkSystem.TryApplyDrunkenness(mob, 50);
_chatHelper.SendAspectDescription(mob, Loc.GetString("drunk-aspect-desc"));
}
}
}

15
Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs
View File

@@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects;
public sealed class FastAndFuriousAspect : AspectSystem<FastAndFuriousAspectComponent>
{
[Dependency] private readonly ChatHelper _chatHelper = default!;
public override void Initialize()
{
base.Initialize();
@@ -49,10 +50,18 @@ public sealed class FastAndFuriousAspect : AspectSystem<FastAndFuriousAspectComp
private void HandleLateJoin(PlayerSpawnCompleteEvent ev)
{
if (!ev.LateJoin)
return;
var query = EntityQueryEnumerator<FastAndFuriousAspectComponent, GameRuleComponent>();
while (query.MoveNext(out var ruleEntity, out _, out var gameRule))
{
if (!GameTicker.IsGameRuleAdded(ruleEntity, gameRule))
continue;
ModifySpeedIfActive(ev.Mob);
if (!ev.LateJoin)
return;
ModifySpeedIfActive(ev.Mob);
_chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("fast-and-furious-aspect-desc"));
}
}
private void ModifySpeedIfActive(EntityUid mob)

17
Content.Server/_White/AspectsSystem/Aspects/ImmersiveAspect.cs
View File

@@ -1,5 +1,4 @@
using System.Numerics;
using Content.Server.GameTicking.Rules.Components;
using System.Numerics;
using Content.Server._White.AspectsSystem.Aspects.Components;
using Content.Server._White.AspectsSystem.Base;
using Content.Server.GameTicking;
@@ -8,18 +7,14 @@ using Content.Shared._White.Telescope;
using Content.Shared.Humanoid;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems;
using Content.Server.Chat.Managers;
using Robust.Shared.Player;
namespace Content.Server._White.AspectsSystem.Aspects;
public sealed class ImmersiveAspect : AspectSystem<ImmersiveAspectComponent>
{
[Dependency] private readonly SharedContentEyeSystem _eye = default!;
[Dependency] private readonly SharedTelescopeSystem _telescope = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly ISharedPlayerManager _playerManager = default!;
[Dependency] private readonly ChatHelper _chatHelper = default!;
public override void Initialize()
{
@@ -48,9 +43,7 @@ public sealed class ImmersiveAspect : AspectSystem<ImmersiveAspectComponent>
FuckUpEye(entity, 0.6f);
AddTelescope(entity);
_playerManager.TryGetSessionByEntity(entity, out var session);
if (session != null)
_chatManager.DispatchServerMessage(session, Loc.GetString("immersive-aspect-desc"));
_chatHelper.SendAspectDescription(entity, Loc.GetString("immersive-aspect-desc"));
}
}
@@ -83,9 +76,7 @@ public sealed class ImmersiveAspect : AspectSystem<ImmersiveAspectComponent>
FuckUpEye(ev.Mob, 0.6f);
AddTelescope(ev.Mob);
_playerManager.TryGetSessionByEntity(ev.Mob, out var session);
if (session != null)
_chatManager.DispatchServerMessage(session, Loc.GetString("immersive-aspect-desc"));
_chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("immersive-aspect-desc"));
}
}

3
Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs
View File

@@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects;
public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponent>
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly ChatHelper _chatHelper = default!;
public override void Initialize()
{
@@ -43,8 +44,8 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
return;
var mob = ev.Mob;
ApplyRandomAccent(mob);
_chatHelper.SendAspectDescription(mob, Loc.GetString("random-accent-aspect-desc"));
}
}

4
Content.Server/_White/AspectsSystem/Aspects/RandomAppearanceAspect.cs
View File

@@ -11,10 +11,11 @@ namespace Content.Server._White.AspectsSystem.Aspects;
public sealed class RandomAppearanceAspect : AspectSystem<RandomAppearanceAspectComponent>
{
[Dependency] private readonly ChatHelper _chatHelper = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<PlayerSpawnCompleteEvent>(HandleLateJoin, after: new [] {typeof(StationRecordsSystem)});
SubscribeLocalEvent<PlayerSpawnCompleteEvent>(HandleLateJoin, after: new[] { typeof(StationRecordsSystem) });
}
protected override void Started(EntityUid uid, RandomAppearanceAspectComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
@@ -41,6 +42,7 @@ public sealed class RandomAppearanceAspect : AspectSystem<RandomAppearanceAspect
var mob = ev.Mob;
EnsureComp<RandomHumanComponent>(mob);
_chatHelper.SendAspectDescription(mob, Loc.GetString("random-appearance-aspect-desc"));
}
}
}

6
Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs
View File

@@ -14,6 +14,7 @@ public sealed class RandomItemAspect : AspectSystem<RandomItemAspectComponent>
{
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly RandomGiftSystem _giftSystem = default!;
[Dependency] private readonly ChatHelper _chatHelper = default!;
public override void Initialize()
{
@@ -48,6 +49,7 @@ public sealed class RandomItemAspect : AspectSystem<RandomItemAspectComponent>
var mob = ev.Mob;
GiveItem(mob, component);
_chatHelper.SendAspectDescription(mob, Loc.GetString("random-item-aspect-desc"));
}
}
@@ -62,10 +64,10 @@ public sealed class RandomItemAspect : AspectSystem<RandomItemAspectComponent>
var transform = CompOrNull<TransformComponent>(player);
if(transform == null)
if (transform == null)
return;
if(!HasComp<HandsComponent>(player))
if (!HasComp<HandsComponent>(player))
return;
var weaponEntity = EntityManager.SpawnEntity(component.Item, transform.Coordinates);

4
Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs
View File

@@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects;
public sealed class SkeletonAspect : AspectSystem<SkeletonAspectComponent>
{
[Dependency] private readonly ChatHelper _chatHelper = default!;
// [Dependency] private readonly IPrototypeManager _protoMan = default!;
// [Dependency] private readonly PolymorphSystem _polymorph = default!;
// [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!;
@@ -43,6 +44,7 @@ public sealed class SkeletonAspect : AspectSystem<SkeletonAspectComponent>
{
PolymorphEntity(ent.Key, ent.Value);
}
}
private void HandleLateJoin(PlayerSpawnCompleteEvent ev)
@@ -57,6 +59,8 @@ public sealed class SkeletonAspect : AspectSystem<SkeletonAspectComponent>
return;
PolymorphEntity(ev.Mob);
_chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("skeleton-aspect-desc"));
}
}

2
Content.Server/_White/AspectsSystem/Base/AspectComponent.cs
View File

@@ -12,6 +12,8 @@ public sealed partial class AspectComponent : Component
[DataField] public string? Requires;
[DataField] public string? Sender;
[DataField] public float Weight = 1.0f;
[DataField] public bool IsForbidden;

17
Content.Server/_White/AspectsSystem/Base/AspectSystem.cs
View File

@@ -66,8 +66,10 @@ public abstract class AspectSystem<T> : GameRuleSystem<T> where T : Component
if (aspect is { Description: not null, IsHidden: false })
{
_chatSystem.DispatchGlobalAnnouncement(aspect.Description, playSound: false,
colorOverride: Color.Aquamarine);
_chatSystem.DispatchGlobalAnnouncement(aspect.Description,
sender: aspect.Sender ??= "Центральное Командование",
playSound: false,
colorOverride: Color.Aquamarine);
}
_audio.PlayGlobal(aspect.StartAudio, Filter.Broadcast(), true);
@@ -105,14 +107,17 @@ public abstract class AspectSystem<T> : GameRuleSystem<T> where T : Component
if (aspect is { Name: not null, IsHidden: false })
{
_chatSystem.DispatchGlobalAnnouncement($"Именем аспекта являлось: {aspect.Name}", playSound: false,
colorOverride: Color.Aquamarine);
_chatSystem.DispatchGlobalAnnouncement($"Именем аспекта являлось: {aspect.Name}",
sender: aspect.Sender ??= "Центральное Командование",
playSound: false,
colorOverride: Color.Aquamarine);
}
_audio.PlayGlobal(aspect.EndAudio, Filter.Broadcast(), true);
}
#region Helpers
#region Helpers
/// <summary>
/// Forces this aspect to end prematurely.
@@ -140,5 +145,5 @@ public abstract class AspectSystem<T> : GameRuleSystem<T> where T : Component
return grids.Count > 0;
}
#endregion
#endregion
}

19
Content.Server/_White/AspectsSystem/Base/ChatHelper.cs Normal file
View File

@@ -0,0 +1,19 @@
using Content.Server.Chat.Managers;
using Robust.Shared.Player;
namespace Content.Server._White.AspectsSystem.Base;
public sealed class ChatHelper : EntitySystem
{
[Dependency] private readonly ISharedPlayerManager _playerManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
public void SendAspectDescription(EntityUid mob, string messageKey)
{
_playerManager.TryGetSessionByEntity(mob, out var session);
if (session != null)
{
_chatManager.DispatchServerMessage(session, Loc.GetString(messageKey));
}
}
}

5
Content.Server/_White/UnsafePseudoIoC.cs
View File

@@ -1,4 +1,7 @@
using Robust.Shared.Configuration;
using Content.Server._White.AspectsSystem.Base;
using Content.Server.Chat.Managers;
using Robust.Shared.Configuration;
using Robust.Shared.Player;
namespace Content.Server._White;