huh?
This commit is contained in:
@@ -43,6 +43,7 @@ public sealed class BattledAspect : AspectSystem<BattledAspectComponent>
|
|||||||
while (query.MoveNext(out var ent, out _))
|
while (query.MoveNext(out var ent, out _))
|
||||||
{
|
{
|
||||||
GiveItem(ent);
|
GiveItem(ent);
|
||||||
|
ChatHelper.SendAspectDescription(ent, Loc.GetString("battled-aspect-desc"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -61,6 +62,7 @@ public sealed class BattledAspect : AspectSystem<BattledAspectComponent>
|
|||||||
var mob = ev.Mob;
|
var mob = ev.Mob;
|
||||||
|
|
||||||
GiveItem(mob);
|
GiveItem(mob);
|
||||||
|
ChatHelper.SendAspectDescription(mob, Loc.GetString("battled-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ public sealed class CatEarsAspect : AspectSystem<CatEarsAspectComponent>
|
|||||||
while (query.MoveNext(out var ent, out var appearance))
|
while (query.MoveNext(out var ent, out var appearance))
|
||||||
{
|
{
|
||||||
AddMarkings(ent, appearance);
|
AddMarkings(ent, appearance);
|
||||||
|
ChatHelper.SendAspectDescription(ent, Loc.GetString("cat-ears-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,6 +82,7 @@ public sealed class CatEarsAspect : AspectSystem<CatEarsAspectComponent>
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
AddMarkings(ev.Mob);
|
AddMarkings(ev.Mob);
|
||||||
|
ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("cat-ears-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ public sealed class DancingAspect : AspectSystem<DancingAspectComponent>
|
|||||||
while (query.MoveNext(out var ent, out _, out _))
|
while (query.MoveNext(out var ent, out _, out _))
|
||||||
{
|
{
|
||||||
EnsureComp<DancingComponent>(ent);
|
EnsureComp<DancingComponent>(ent);
|
||||||
|
ChatHelper.SendAspectDescription(ent, Loc.GetString("dancing-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,6 +46,7 @@ public sealed class DancingAspect : AspectSystem<DancingAspectComponent>
|
|||||||
var mob = ev.Mob;
|
var mob = ev.Mob;
|
||||||
|
|
||||||
EnsureComp<DancingComponent>(mob);
|
EnsureComp<DancingComponent>(mob);
|
||||||
|
ChatHelper.SendAspectDescription(mob, Loc.GetString("dancing-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ public sealed class DrunkAspect : AspectSystem<DrunkAspectComponent>
|
|||||||
while (query.MoveNext(out var ent, out _))
|
while (query.MoveNext(out var ent, out _))
|
||||||
{
|
{
|
||||||
_drunkSystem.TryApplyDrunkenness(ent, 50);
|
_drunkSystem.TryApplyDrunkenness(ent, 50);
|
||||||
|
|
||||||
|
ChatHelper.SendAspectDescription(ent, Loc.GetString("drunk-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,6 +46,9 @@ public sealed class DrunkAspect : AspectSystem<DrunkAspectComponent>
|
|||||||
var mob = ev.Mob;
|
var mob = ev.Mob;
|
||||||
|
|
||||||
_drunkSystem.TryApplyDrunkenness(mob, 50);
|
_drunkSystem.TryApplyDrunkenness(mob, 50);
|
||||||
|
|
||||||
|
ChatHelper.SendAspectDescription(mob, Loc.GetString("drunk-aspect-desc"));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ public sealed class FastAndFuriousAspect : AspectSystem<FastAndFuriousAspectComp
|
|||||||
while (query.MoveNext(out var ent, out _))
|
while (query.MoveNext(out var ent, out _))
|
||||||
{
|
{
|
||||||
EnsureComp<FastAndFuriousComponent>(ent);
|
EnsureComp<FastAndFuriousComponent>(ent);
|
||||||
|
ChatHelper.SendAspectDescription(ent, Loc.GetString("fast-and-furious-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,6 +54,7 @@ public sealed class FastAndFuriousAspect : AspectSystem<FastAndFuriousAspectComp
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
ModifySpeedIfActive(ev.Mob);
|
ModifySpeedIfActive(ev.Mob);
|
||||||
|
ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("fast-and-furious-aspect-desc"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ModifySpeedIfActive(EntityUid mob)
|
private void ModifySpeedIfActive(EntityUid mob)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using System.Numerics;
|
using System.Numerics;
|
||||||
using Content.Server.GameTicking.Rules.Components;
|
using Content.Server.GameTicking.Rules.Components;
|
||||||
using Content.Server._White.AspectsSystem.Aspects.Components;
|
using Content.Server._White.AspectsSystem.Aspects.Components;
|
||||||
using Content.Server._White.AspectsSystem.Base;
|
using Content.Server._White.AspectsSystem.Base;
|
||||||
@@ -48,9 +48,7 @@ public sealed class ImmersiveAspect : AspectSystem<ImmersiveAspectComponent>
|
|||||||
|
|
||||||
FuckUpEye(entity, 0.6f);
|
FuckUpEye(entity, 0.6f);
|
||||||
AddTelescope(entity);
|
AddTelescope(entity);
|
||||||
_playerManager.TryGetSessionByEntity(entity, out var session);
|
ChatHelper.SendAspectDescription(entity, Loc.GetString("immersive-aspect-desc"));
|
||||||
if (session != null)
|
|
||||||
_chatManager.DispatchServerMessage(session, Loc.GetString("immersive-aspect-desc"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,9 +81,7 @@ public sealed class ImmersiveAspect : AspectSystem<ImmersiveAspectComponent>
|
|||||||
|
|
||||||
FuckUpEye(ev.Mob, 0.6f);
|
FuckUpEye(ev.Mob, 0.6f);
|
||||||
AddTelescope(ev.Mob);
|
AddTelescope(ev.Mob);
|
||||||
_playerManager.TryGetSessionByEntity(ev.Mob, out var session);
|
ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("immersive-aspect-desc"));
|
||||||
if (session != null)
|
|
||||||
_chatManager.DispatchServerMessage(session, Loc.GetString("immersive-aspect-desc"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
|
|||||||
while (query.MoveNext(out var ent, out _))
|
while (query.MoveNext(out var ent, out _))
|
||||||
{
|
{
|
||||||
ApplyRandomAccent(ent);
|
ApplyRandomAccent(ent);
|
||||||
|
ChatHelper.SendAspectDescription(ent, Loc.GetString("random-accent-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,8 +44,7 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
var mob = ev.Mob;
|
var mob = ev.Mob;
|
||||||
|
ChatHelper.SendAspectDescription(mob, Loc.GetString("random-accent-aspect-desc"));
|
||||||
ApplyRandomAccent(mob);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ public sealed class RandomAppearanceAspect : AspectSystem<RandomAppearanceAspect
|
|||||||
while (query.MoveNext(out var ent, out _))
|
while (query.MoveNext(out var ent, out _))
|
||||||
{
|
{
|
||||||
EnsureComp<RandomHumanComponent>(ent);
|
EnsureComp<RandomHumanComponent>(ent);
|
||||||
|
ChatHelper.SendAspectDescription(ent, Loc.GetString("random-appearance-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,6 +42,7 @@ public sealed class RandomAppearanceAspect : AspectSystem<RandomAppearanceAspect
|
|||||||
var mob = ev.Mob;
|
var mob = ev.Mob;
|
||||||
|
|
||||||
EnsureComp<RandomHumanComponent>(mob);
|
EnsureComp<RandomHumanComponent>(mob);
|
||||||
|
ChatHelper.SendAspectDescription(mob, Loc.GetString("random-appearance-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ public sealed class RandomItemAspect : AspectSystem<RandomItemAspectComponent>
|
|||||||
while (query.MoveNext(out var ent, out _))
|
while (query.MoveNext(out var ent, out _))
|
||||||
{
|
{
|
||||||
GiveItem(ent, component);
|
GiveItem(ent, component);
|
||||||
|
ChatHelper.SendAspectDescription(ent, Loc.GetString("random-item-aspect-desc"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -48,6 +49,7 @@ public sealed class RandomItemAspect : AspectSystem<RandomItemAspectComponent>
|
|||||||
var mob = ev.Mob;
|
var mob = ev.Mob;
|
||||||
|
|
||||||
GiveItem(mob, component);
|
GiveItem(mob, component);
|
||||||
|
ChatHelper.SendAspectDescription(mob, Loc.GetString("random-item-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,9 @@ public sealed class SkeletonAspect : AspectSystem<SkeletonAspectComponent>
|
|||||||
foreach (var ent in entitiesToPolymorph)
|
foreach (var ent in entitiesToPolymorph)
|
||||||
{
|
{
|
||||||
PolymorphEntity(ent.Key, ent.Value);
|
PolymorphEntity(ent.Key, ent.Value);
|
||||||
|
ChatHelper.SendAspectDescription(ent.Key, Loc.GetString("skeleton-aspect-desc"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HandleLateJoin(PlayerSpawnCompleteEvent ev)
|
private void HandleLateJoin(PlayerSpawnCompleteEvent ev)
|
||||||
@@ -57,6 +59,8 @@ public sealed class SkeletonAspect : AspectSystem<SkeletonAspectComponent>
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
PolymorphEntity(ev.Mob);
|
PolymorphEntity(ev.Mob);
|
||||||
|
|
||||||
|
ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("skeleton-aspect-desc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
33
Content.Server/_White/AspectsSystem/Base/ChatHelper.cs
Normal file
33
Content.Server/_White/AspectsSystem/Base/ChatHelper.cs
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Content.Server.Chat.Managers;
|
||||||
|
using Robust.Shared.Player;
|
||||||
|
|
||||||
|
namespace Content.Server._White.AspectsSystem.Base
|
||||||
|
{
|
||||||
|
public static class ChatHelper
|
||||||
|
{
|
||||||
|
[Dependency] private static ISharedPlayerManager _playerManager = default!;
|
||||||
|
[Dependency] private static IChatManager _chatManager = default!;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public static void Initialize(ISharedPlayerManager playerManager, IChatManager chatManager)
|
||||||
|
{
|
||||||
|
_playerManager = playerManager;
|
||||||
|
_chatManager = chatManager;
|
||||||
|
}
|
||||||
|
public static void SendAspectDescription(EntityUid mob, string messageKey)
|
||||||
|
{
|
||||||
|
_playerManager.TryGetSessionByEntity(mob, out var session);
|
||||||
|
if (session != null)
|
||||||
|
{
|
||||||
|
_chatManager.DispatchServerMessage(session, Loc.GetString(messageKey));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
namespace Content.Server._White;
|
||||||
|
|
||||||
@@ -9,7 +12,7 @@ public static class UnsafePseudoIoC // Я НАНАВИЖУ IOCMAANGERRESOLVEPOSH
|
|||||||
public static void Initialize()
|
public static void Initialize()
|
||||||
{
|
{
|
||||||
ConfigurationManager = IoCManager.Resolve<IConfigurationManager>();
|
ConfigurationManager = IoCManager.Resolve<IConfigurationManager>();
|
||||||
ChatHelper.Initialize(IoCManager.Resolve<ISharedPlayerManager>(), IoCManager.Resolve<IChatManager>());// heh IOCMAANGERRESOLVEPOSHEL NAHUI
|
ChatHelper.Initialize(IoCManager.Resolve<ISharedPlayerManager>(), IoCManager.Resolve<IChatManager>());// heh IOCMAANGERRESOLVEPOSHEL NAHUI X2
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1,10 @@
|
|||||||
immersive-aspect-desc = Для осмотра своего окружение, нажмите клавишу присмотреться/прицелиться (по умолчанию - Пробел).
|
immersive-aspect-desc = Для осмотра своего окружение, нажмите клавишу присмотреться/прицелиться (по умолчанию - Пробел).
|
||||||
|
skeleton-aspect-desc = temp1.
|
||||||
|
battled-aspect-desc = temp2.
|
||||||
|
cat-ears-aspect-desc = temp3.
|
||||||
|
dancing-aspect-desc = temp4.
|
||||||
|
drunk-aspect-desc = temp5.
|
||||||
|
fast-and-furious-aspect-desc = temp6.
|
||||||
|
random-accent-aspect-desc = temp7.
|
||||||
|
random-appearance-aspect-desc = temp8.
|
||||||
|
random-item-aspect-desc = temp9.
|
||||||
Reference in New Issue
Block a user