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

я устала босс

Browse Source
This commit is contained in:
Remuchi
2024-03-27 19:30:19 +07:00
parent 8514b94683
commit c04b962141
45 changed files with 693 additions and 927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
View File

@@ -18,37 +18,35 @@ namespace Content.Server._White.Cult.GameRule;
[RegisterComponent]
public sealed partial class CultRuleComponent : Component
{
public readonly SoundSpecifier GreatingsSound = new SoundPathSpecifier("/Audio/White/Cult/blood_cult_greeting.ogg");
public readonly SoundSpecifier GreetingsSound = new SoundPathSpecifier("/Audio/White/Cult/blood_cult_greeting.ogg");
[DataField("cultPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<GamePresetPrototype>))]
public static string CultGamePresetPrototype = "Cult";
[DataField(customTypeSerializer: typeof(PrototypeIdSerializer<GamePresetPrototype>))]
public string CultGamePresetPrototype = "Cult";
[DataField("cultistPrototypeId", customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
public static string CultistPrototypeId = "Cultist";
[DataField(customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
public string CultistPrototypeId = "Cultist";
[DataField("reaperPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public static string ReaperPrototype = "ReaperConstruct";
[DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string ReaperPrototype = "ReaperConstruct";
[ViewVariables(VVAccess.ReadOnly), DataField("tileId")]
public static string CultFloor = "CultFloor";
public string CultFloor = "CultFloor";
[DataField("eyeColor")]
public static Color EyeColor = Color.FromHex("#f80000");
[DataField]
public Color EyeColor = Color.FromHex("#f80000");
public static string HolyWaterReagent = "Holywater";
public string HolyWaterReagent = "Holywater";
[DataField("redEyeThreshold")]
public static int ReadEyeThreshold = 5;
[DataField]
public int ReadEyeThreshold = 5;
[DataField("pentagramThreshold")]
public static int PentagramThreshold = 8;
[DataField]
public int PentagramThreshold = 8;
public Dictionary<ICommonSession, HumanoidCharacterProfile> StarCandidates = new();
[DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
public List<string> StartingItems = [];
[DataField("cultistStartingItems", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
public List<string> StartingItems = new();
[DataField("cultistRolePrototype", customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
[DataField(customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
public string CultistRolePrototype = "Cultist";
/// <summary>
@@ -58,19 +56,17 @@ public sealed partial class CultRuleComponent : Component
public EntityUid? CultTarget;
public List<CultistComponent> CurrentCultists = new();
public List<CultistComponent> CurrentCultists = [];
public List<ConstructComponent> Constructs = new();
public List<ConstructComponent> Constructs = [];
public CultWinCondition WinCondition;
}
public enum CultWinCondition : byte
{
CultWin,
CultFailure
Win,
Failure
}
public sealed class CultNarsieSummoned : EntityEventArgs
{
}
public sealed class CultNarsieSummoned : EntityEventArgs;

527
Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
View File

@@ -1,14 +1,9 @@
using System.Linq;
using Content.Server._Miracle.Components;
using Content.Server._Miracle.GulagSystem;
using Content.Server.Actions;
using Content.Server.Chat.Managers;
using Content.Server.Antag;
using Content.Server.GameTicking;
using Content.Server.GameTicking.Rules;
using Content.Server.NPC.Systems;
using Content.Server.Roles.Jobs;
using Content.Server.RoundEnd;
using Content.Server.Shuttles.Components;
using Content.Server.Storage.EntitySystems;
using Content.Shared.Body.Systems;
using Content.Shared.Humanoid;
@@ -17,7 +12,6 @@ using Content.Shared.Mind.Components;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Preferences;
using Content.Shared.Roles;
using Robust.Shared.Configuration;
using Robust.Shared.Player;
@@ -26,40 +20,38 @@ using Content.Shared._White;
using Content.Shared._White.Chaplain;
using Content.Shared._White.Cult.Components;
using Content.Shared.Mind;
using Robust.Shared.Audio.Systems;
using Content.Shared.NPC.Systems;
using Robust.Server.Player;
namespace Content.Server._White.Cult.GameRule;
public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
{
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly StorageSystem _storageSystem = default!;
[Dependency] private readonly NpcFactionSystem _factionSystem = default!;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
[Dependency] private readonly SharedBodySystem _bodySystem = default!;
[Dependency] private readonly SharedRoleSystem _roleSystem = default!;
[Dependency] private readonly JobSystem _jobSystem = default!;
[Dependency] private readonly SharedMindSystem _mindSystem = default!;
[Dependency] private readonly ActionsSystem _actions = default!;
[Dependency] private readonly AntagSelectionSystem _antagSelection = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly GulagSystem _gulag = default!;
private ISawmill _sawmill = default!;
private int _minimalCultists;
private int _cultGameRuleMinimapPlayers;
private const int PlayerPerCultist = 10;
private int _minStartingCultists;
private int _maxStartingCultists;
public override void Initialize()
{
base.Initialize();
_sawmill = Logger.GetSawmill("preset");
_minimalCultists = _cfg.GetCVar(WhiteCVars.CultMinStartingPlayers);
_cultGameRuleMinimapPlayers = _cfg.GetCVar(WhiteCVars.CultMinPlayers);
_minStartingCultists = _cfg.GetCVar(WhiteCVars.CultMinStartingPlayers);
_maxStartingCultists = _cfg.GetCVar(WhiteCVars.CultMaxStartingPlayers);
SubscribeLocalEvent<RoundStartAttemptEvent>(OnStartAttempt);
SubscribeLocalEvent<RulePlayerJobsAssignedEvent>(OnPlayersSpawned);
@@ -71,6 +63,101 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
SubscribeLocalEvent<CultistComponent, MobStateChangedEvent>(OnCultistsStateChanged);
}
private void OnStartAttempt(RoundStartAttemptEvent ev)
{
TryRoundStartAttempt(ev, "CULT");
}
private void OnPlayersSpawned(RulePlayerJobsAssignedEvent ev)
{
var query = QueryActiveRules();
while (query.MoveNext(out _, out var cult, out _))
{
DoCultistsStart(cult);
}
}
private void OnRoundEndText(RoundEndTextAppendEvent ev)
{
var query = QueryActiveRules();
while (query.MoveNext(out _, out var cult, out _))
{
var winText = Loc.GetString($"cult-condition-{cult.WinCondition.ToString().ToLower()}");
ev.AddLine(winText);
ev.AddLine(Loc.GetString("cultists-list-start"));
foreach (var (entityName, ckey) in cult.CultistsCache)
{
var lising = Loc.GetString("cultists-list-name", ("name", entityName), ("user", ckey));
ev.AddLine(lising);
}
}
}
private void OnNarsieSummon(CultNarsieSummoned ev)
{
var query = EntityQueryEnumerator<MobStateComponent, MindContainerComponent, CultistComponent>();
var rulesQuery = QueryActiveRules();
while (rulesQuery.MoveNext(out _, out var cult, out _))
{
cult.WinCondition = CultWinCondition.Win;
_roundEndSystem.EndRound();
while (query.MoveNext(out var uid, out _, out var mindContainer, out _))
{
if (!mindContainer.HasMind || mindContainer.Mind is null)
{
continue;
}
var reaper = Spawn(cult.ReaperPrototype, Transform(uid).Coordinates);
_mindSystem.TransferTo(mindContainer.Mind.Value, reaper);
_bodySystem.GibBody(uid);
}
}
}
private void OnCultistComponentInit(EntityUid uid, CultistComponent component, ComponentInit args)
{
var query = QueryActiveRules();
while (query.MoveNext(out _, out var cult, out _))
{
if (!TryComp<MindContainerComponent>(uid, out var mindComponent))
return;
if (!mindComponent.HasMind)
return;
cult.CurrentCultists.Add(component);
if (TryComp<ActorComponent>(uid, out var actor))
{
cult.CultistsCache.Add(MetaData(uid).EntityName, actor.PlayerSession.Name);
}
UpdateCultistsAppearance(cult);
}
}
private void OnCultistComponentRemoved(EntityUid uid, CultistComponent component, ComponentRemove args)
{
var query = QueryActiveRules();
while (query.MoveNext(out _, out var cult, out _))
{
cult.CurrentCultists.Remove(component);
foreach (var empower in component.SelectedEmpowers)
{
_actions.RemoveAction(uid, GetEntity(empower));
}
RemoveCultistAppearance(uid);
CheckRoundShouldEnd();
}
}
private void OnCultistsStateChanged(EntityUid uid, CultistComponent component, MobStateChangedEvent ev)
{
if (ev.NewMobState == MobState.Dead)
@@ -79,111 +166,96 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
}
}
public MindComponent? GetTarget()
private void DoCultistsStart(CultRuleComponent rule)
{
var cultistsRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
var eligiblePlayers =
_antagSelection.GetEligiblePlayers(_playerManager.Sessions, rule.CultistRolePrototype);
if (cultistsRule?.CultTarget == null || !TryComp<MindComponent>(cultistsRule.CultTarget.Value, out var mind))
eligiblePlayers.RemoveAll(HasComp<HolyComponent>);
if (eligiblePlayers.Count == 0)
{
return null;
return;
}
return mind;
var cultistsToSelect =
Math.Clamp(_playerManager.PlayerCount / PlayerPerCultist, _minStartingCultists, _maxStartingCultists);
var selectedCultists = _antagSelection.ChooseAntags(cultistsToSelect, eligiblePlayers);
foreach (var cultist in selectedCultists)
{
MakeCultist(cultist, rule);
}
var potentialTargets = FindPotentialTargets(selectedCultists);
rule.CultTarget = _random.PickAndTake(potentialTargets).Mind;
}
public MindComponent? GetTarget()
{
var query = QueryActiveRules();
while (query.MoveNext(out _, out var cult, out _))
{
if (cult.CultTarget == null || !TryComp(cult.CultTarget.Value, out MindComponent? mind))
{
continue;
}
return mind;
}
return null;
}
public bool CanSummonNarsie()
{
var cultistsRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
if (cultistsRule is null)
var query = QueryActiveRules();
while (query.MoveNext(out _, out var cult, out _))
{
return false;
var cultistsAmount = cult.CurrentCultists.Count;
var constructsAmount = cult.Constructs.Count;
var enoughCultists = cultistsAmount + constructsAmount > 10;
if (!enoughCultists)
{
return false;
}
var target = GetTarget();
var targetKilled = target == null || _mindSystem.IsCharacterDeadIc(target);
return targetKilled;
}
var cultistsAmount = cultistsRule.CurrentCultists.Count;
var constructsAmount = cultistsRule.Constructs.Count;
var enoughCultists = cultistsAmount + constructsAmount > 10;
if (!enoughCultists)
{
return false;
}
var target = GetTarget();
var targetKilled = target == null || _mindSystem.IsCharacterDeadIc(target);
return targetKilled;
return false;
}
private void CheckRoundShouldEnd()
{
var cultistsRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
if (cultistsRule is null)
var query = QueryActiveRules();
while (query.MoveNext(out _, out var cult, out _))
{
return;
}
var aliveCultists = 0;
var aliveCultists = 0;
foreach (var cultistComponent in cultistsRule.CurrentCultists)
{
var owner = cultistComponent.Owner;
if (!TryComp<MobStateComponent>(owner, out var mobState))
continue;
if (_mobStateSystem.IsAlive(owner, mobState))
foreach (var cultistComponent in cult.CurrentCultists)
{
aliveCultists++;
var owner = cultistComponent.Owner;
if (!TryComp<MobStateComponent>(owner, out var mobState))
continue;
if (_mobStateSystem.IsAlive(owner, mobState))
{
aliveCultists++;
}
}
if (aliveCultists != 0)
return;
cult.WinCondition = CultWinCondition.Failure;
_roundEndSystem.EndRound();
}
if (aliveCultists != 0)
return;
cultistsRule.WinCondition = CultWinCondition.CultFailure;
_roundEndSystem.EndRound();
}
private void OnCultistComponentInit(EntityUid uid, CultistComponent component, ComponentInit args)
{
var cultistsRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
if (cultistsRule is null)
{
return;
}
if (!TryComp<MindContainerComponent>(uid, out var mindComponent))
return;
if (!mindComponent.HasMind)
return;
cultistsRule.CurrentCultists.Add(component);
if (TryComp<ActorComponent>(uid, out var actor))
{
cultistsRule.CultistsCache.Add(MetaData(uid).EntityName, actor.PlayerSession.Name);
}
UpdateCultistsAppearance(cultistsRule);
}
private void OnCultistComponentRemoved(EntityUid uid, CultistComponent component, ComponentRemove args)
{
var cultistsRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
if (cultistsRule is null)
{
return;
}
cultistsRule.CurrentCultists.Remove(component);
foreach (var empower in component.SelectedEmpowers)
{
_actions.RemoveAction(uid, GetEntity(empower));
}
RemoveCultistAppearance(uid);
CheckRoundShouldEnd();
}
private void RemoveCultistAppearance(EntityUid cultist)
@@ -203,104 +275,32 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
var cultistsCount = cultRuleComponent.CurrentCultists.Count;
var constructsCount = cultRuleComponent.Constructs.Count;
var totalCultMembers = cultistsCount + constructsCount;
if (totalCultMembers < CultRuleComponent.ReadEyeThreshold)
if (totalCultMembers < cultRuleComponent.ReadEyeThreshold)
return;
foreach (var cultistComponent in cultRuleComponent.CurrentCultists)
{
if (TryComp<HumanoidAppearanceComponent>(cultistComponent.Owner, out var appearanceComponent))
{
appearanceComponent.EyeColor = CultRuleComponent.EyeColor;
Dirty(appearanceComponent);
appearanceComponent.EyeColor = cultRuleComponent.EyeColor;
Dirty(cultistComponent.Owner, appearanceComponent);
}
if (totalCultMembers < CultRuleComponent.PentagramThreshold)
if (totalCultMembers < cultRuleComponent.PentagramThreshold)
return;
EnsureComp<PentagramComponent>(cultistComponent.Owner);
}
}
private void OnRoundEndText(RoundEndTextAppendEvent ev)
private List<MindContainerComponent> FindPotentialTargets(List<EntityUid> exclude = null!)
{
var cultistsRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
if (cultistsRule is null)
{
return;
}
var winText = Loc.GetString($"cult-cond-{cultistsRule.WinCondition.ToString().ToLower()}");
ev.AddLine(winText);
ev.AddLine(Loc.GetString("cultists-list-start"));
foreach (var (entityName, ckey) in cultistsRule.CultistsCache)
{
var lising = Loc.GetString("cultists-list-name", ("name", entityName), ("user", ckey));
ev.AddLine(lising);
}
}
private void OnStartAttempt(RoundStartAttemptEvent ev)
{
var cultistsRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
if (cultistsRule is null)
{
return;
}
var minPlayers = _cultGameRuleMinimapPlayers;
if (!ev.Forced && ev.Players.Length < minPlayers)
{
_chatManager.DispatchServerAnnouncement(Loc.GetString("traitor-not-enough-ready-players",
("readyPlayersCount", ev.Players.Length), ("minimumPlayers", minPlayers)));
ev.Cancel();
return;
}
if (ev.Players.Length != 0)
return;
_chatManager.DispatchServerAnnouncement(Loc.GetString("traitor-no-one-ready"));
ev.Cancel();
}
private void OnPlayersSpawned(RulePlayerJobsAssignedEvent ev)
{
var cultistsRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
if (cultistsRule is null)
{
return;
}
foreach (var player in ev.Players)
{
if (!ev.Profiles.ContainsKey(player.UserId))
continue;
cultistsRule.StarCandidates[player] = ev.Profiles[player.UserId];
}
var potentialCultists = FindPotentialCultist(cultistsRule.StarCandidates);
var pickedCultist = PickCultists(potentialCultists);
var potentialTargets = FindPotentialTargets(pickedCultist);
cultistsRule.CultTarget = _random.PickAndTake(potentialTargets).Mind;
foreach (var pickerCultist in pickedCultist)
{
MakeCultist(pickerCultist);
}
}
private List<MindContainerComponent> FindPotentialTargets(List<ICommonSession> exclude = null!)
{
var querry = EntityManager.EntityQuery<MindContainerComponent, HumanoidAppearanceComponent, ActorComponent>();
var querry =
EntityManager.EntityQueryEnumerator<MindContainerComponent, HumanoidAppearanceComponent, ActorComponent>();
var potentialTargets = new List<MindContainerComponent>();
foreach (var (mind, _, actor) in querry)
while (querry.MoveNext(out var uid, out var mind, out _, out var actor))
{
var entity = mind.Mind;
@@ -310,7 +310,7 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
if (_gulag.IsUserGulaged(actor.PlayerSession.UserId, out _))
continue;
if (exclude?.Contains(actor.PlayerSession) is true)
if (exclude?.Contains(uid) is true)
{
continue;
}
@@ -321,134 +321,38 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
return potentialTargets;
}
private List<ICommonSession> FindPotentialCultist(
in Dictionary<ICommonSession, HumanoidCharacterProfile> candidates)
public bool MakeCultist(EntityUid cultist, CultRuleComponent rule)
{
var list = new List<ICommonSession>();
var pendingQuery = GetEntityQuery<PendingClockInComponent>();
foreach (var player in candidates.Keys)
{
// Gulag
if (_gulag.IsUserGulaged(player.UserId, out _))
continue;
// Role prevents antag.
if (!_jobSystem.CanBeAntag(player))
continue;
// Chaplain
if (!_mindSystem.TryGetMind(player, out _, out var mind) ||
mind.OwnedEntity is not { } ownedEntity || HasComp<HolyComponent>(ownedEntity))
continue;
// Latejoin
if (player.AttachedEntity != null && pendingQuery.HasComponent(player.AttachedEntity.Value))
continue;
list.Add(player);
}
var prefList = new List<ICommonSession>();
foreach (var player in list)
{
var profile = candidates[player];
if (profile.AntagPreferences.Contains(CultRuleComponent.CultistPrototypeId))
{
prefList.Add(player);
}
}
if (prefList.Count == 0)
{
_sawmill.Info("Insufficient preferred cultists, picking at random.");
prefList = list;
return prefList;
}
if (prefList.Count >= _minimalCultists)
{
return prefList;
}
var playersToAdd = _minimalCultists - prefList.Count;
foreach (var prefPlayer in prefList)
{
list.Remove(prefPlayer);
}
for (var i = 0; i < playersToAdd; i++)
{
var randomPlayer = _random.PickAndTake(list);
prefList.Add(randomPlayer);
}
return prefList;
}
private List<ICommonSession> PickCultists(List<ICommonSession> prefList)
{
var result = new List<ICommonSession>();
var maxCultists = _cfg.GetCVar(WhiteCVars.CultMaxStartingPlayers);
if (prefList.Count < _minimalCultists)
{
_sawmill.Info("Insufficient ready players to fill up with cultists, stopping the selection.");
return result;
}
var actualCultistCount = prefList.Count > maxCultists ? maxCultists : _minimalCultists;
for (var i = 0; i < actualCultistCount; i++)
{
result.Add(_random.PickAndTake(prefList));
}
return result;
}
public bool MakeCultist(ICommonSession cultist)
{
var cultistRule = EntityQuery<CultRuleComponent>().FirstOrDefault();
if (cultistRule == null)
{
GameTicker.StartGameRule(CultRuleComponent.CultGamePresetPrototype, out var ruleEntity);
cultistRule = Comp<CultRuleComponent>(ruleEntity);
}
if (!_mindSystem.TryGetMind(cultist, out var mindId, out var mind))
{
Log.Info("Failed getting mind for picked cultist.");
return false;
}
if (mind.OwnedEntity is not { } playerEntity)
if (HasComp<CultistRoleComponent>(mindId))
{
Log.Error("Mind picked for cultist did not have an attached entity.");
Log.Error($"Player {mind.CharacterName} is already a cultist.");
return false;
}
var cultistComponent = new CultistRoleComponent
var briefing = Loc.GetString("cult-role-greeting");
_antagSelection.SendBriefing(cultist, briefing, null, rule.GreetingsSound);
_roleSystem.MindAddRole(mindId, new CultistRoleComponent
{
PrototypeId = cultistRule.CultistRolePrototype
};
PrototypeId = rule.CultistRolePrototype
});
_roleSystem.MindAddRole(mindId, cultistComponent);
EnsureComp<CultistComponent>(playerEntity);
EnsureComp<CultistComponent>(cultist);
_factionSystem.RemoveFaction(playerEntity, "NanoTrasen", false);
_factionSystem.AddFaction(playerEntity, "Cultist");
_factionSystem.RemoveFaction(cultist, "NanoTrasen", false);
_factionSystem.AddFaction(cultist, "Cultist");
if (_inventorySystem.TryGetSlotEntity(playerEntity, "back", out var backPack))
if (_inventorySystem.TryGetSlotEntity(cultist, "back", out var backPack))
{
foreach (var itemPrototype in cultistRule.StartingItems)
foreach (var itemPrototype in rule.StartingItems)
{
var itemEntity = Spawn(itemPrototype, Transform(playerEntity).Coordinates);
var itemEntity = Spawn(itemPrototype, Transform(cultist).Coordinates);
if (backPack != null)
{
@@ -457,43 +361,11 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
}
}
// Notificate player about new role assignment
if (_mindSystem.TryGetSession(mindId, out var session))
{
_audioSystem.PlayGlobal(cultistRule.GreatingsSound, session);
_chatManager.DispatchServerMessage(session, Loc.GetString("cult-role-greeting"));
}
_mindSystem.TryAddObjective(mindId, mind, "KillCultTargetObjective");
return true;
}
private void OnNarsieSummon(CultNarsieSummoned ev)
{
foreach (var rule in EntityQuery<CultRuleComponent>())
{
rule.WinCondition = CultWinCondition.CultWin;
}
_roundEndSystem.EndRound();
var query = EntityQueryEnumerator<MobStateComponent, MindContainerComponent, CultistComponent>();
while (query.MoveNext(out var uid, out _, out var mindContainer, out _))
{
if (!mindContainer.HasMind || mindContainer.Mind is null)
{
continue;
}
var reaper = Spawn(CultRuleComponent.ReaperPrototype, Transform(uid).Coordinates);
_mindSystem.TransferTo(mindContainer.Mind.Value, reaper);
_bodySystem.GibBody(uid);
}
}
public void TransferRole(EntityUid transferFrom, EntityUid transferTo)
{
if (HasComp<PentagramComponent>(transferFrom))
@@ -507,7 +379,8 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
{
cultRule.CultistsCache.Remove(Name(transferFrom));
}
EnsureComp<CultistComponent>(transferTo);
RemComp<CultistComponent>(transferFrom);
}
}
}

32
Content.Server/_White/Cult/Items/Systems/TorchCultistsProviderSystem.cs
View File

@@ -1,16 +1,16 @@
using Content.Server.Atmos.EntitySystems;
using Content.Server.Popups;
using Content.Server.Pulling;
using Content.Server.Station.Systems;
using Content.Server.Station.Components;
using Content.Server._White.Cult.Items.Components;
using Content.Shared._White.Cult.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Item;
using Content.Shared.Mind.Components;
using Content.Shared.Physics;
using Content.Shared._White.Cult;
using Content.Shared._White.Cult.Items;
using Content.Shared.Movement.Pulling.Systems;
using Robust.Server.GameObjects;
using Robust.Shared.Map.Components;
using Robust.Shared.Physics;
@@ -18,7 +18,6 @@ using Robust.Shared.Physics.Components;
using Robust.Shared.Player;
using Robust.Shared.Random;
using Robust.Shared.Timing;
using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;
namespace Content.Server._White.Cult.Items.Systems;
@@ -36,6 +35,7 @@ public sealed class TorchCultistsProviderSystem : EntitySystem
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly UserInterfaceSystem _ui = default!;
[Dependency] private readonly PullingSystem _pulling = default!;
[Dependency] private readonly MapSystem _map = default!;
public override void Initialize()
{
@@ -104,18 +104,18 @@ public sealed class TorchCultistsProviderSystem : EntitySystem
provider.ItemSelected = args.Target;
var cultists = EntityQuery<CultistComponent>();
var cultistsQuery = EntityQueryEnumerator<CultistComponent>();
var list = new Dictionary<string, string>();
foreach (var cultist in cultists)
while (cultistsQuery.MoveNext(out var cultistUid, out _))
{
if (!TryComp<MetaDataComponent>(cultist.Owner, out var meta))
if (!TryComp<MetaDataComponent>(cultistUid, out var meta))
return;
if (cultist.Owner == args.User)
if (cultistUid == args.User)
continue;
list.Add(meta.Owner.ToString(), meta.EntityName);
list.Add(cultistUid.ToString(), meta.EntityName);
}
if (list.Count == 0)
@@ -138,12 +138,12 @@ public sealed class TorchCultistsProviderSystem : EntitySystem
TorchWindowItemSelectedMessage args)
{
var entityUid = args.Session.AttachedEntity;
var cultists = EntityQuery<CultistComponent>();
var cultistsQuery = EntityQueryEnumerator<CultistComponent>();
foreach (var cultist in cultists)
while (cultistsQuery.MoveNext(out var cultistUid, out _))
{
if (cultist.Owner.ToString() == args.EntUid)
entityUid = cultist.Owner;
if (cultistUid.ToString() == args.EntUid)
entityUid = cultistUid;
}
if (entityUid == args.Session.AttachedEntity && entityUid != null)
@@ -182,7 +182,7 @@ public sealed class TorchCultistsProviderSystem : EntitySystem
return;
}
if (_pulling.GetPulled(args.User) != args.Target.Value)
if (_pulling.TryGetPulledEntity(args.User, out var pulled) || pulled != args.Target.Value)
{
return;
}
@@ -226,7 +226,7 @@ public sealed class TorchCultistsProviderSystem : EntitySystem
// don't spawn inside of solid objects
var physQuery = GetEntityQuery<PhysicsComponent>();
var valid = true;
foreach (var ent in gridComp.GetAnchoredEntities(tile))
foreach (var ent in _map.GetAnchoredEntities(grid, gridComp, tile))
{
if (!physQuery.TryGetComponent(ent, out var body))
continue;
@@ -243,7 +243,7 @@ public sealed class TorchCultistsProviderSystem : EntitySystem
if (!valid)
continue;
targetCoords = gridComp.GridTileToLocal(tile);
targetCoords = _map.GridTileToLocal(grid, gridComp, tile);
break;
}
@@ -275,4 +275,4 @@ public sealed class TorchCultistsProviderSystem : EntitySystem
_pointLight.SetEnabled(torch, false, light);
}
}
}
}

57
Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs
View File

@@ -1,18 +1,18 @@
using System.Threading;
using Content.Shared._White.Cult.Components;
using Content.Shared.Coordinates.Helpers;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction.Events;
using Content.Shared.Maps;
using Content.Shared.Physics;
using Content.Shared.Popups;
using Content.Shared.Pulling.Components;
using Content.Shared._White.Cult;
using Content.Shared._White.Cult.Items;
using Content.Shared.Movement.Pulling.Systems;
using Robust.Server.GameObjects;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Map;
using Robust.Shared.Random;
using Robust.Shared.Timing;
using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;
using Timer = Robust.Shared.Timing.Timer;
namespace Content.Server._White.Cult.Items.Systems;
@@ -27,6 +27,10 @@ public sealed class VoidTeleportSystem : EntitySystem
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private readonly PointLightSystem _pointLight = default!;
[Dependency] private readonly PullingSystem _pulling = default!;
[Dependency] private readonly RobustRandom _random = default!;
public override void Initialize()
{
@@ -75,7 +79,7 @@ public sealed class VoidTeleportSystem : EntitySystem
{
attempts--;
//Get coords to where tp
var random = new Random().Next(component.MinRange, component.MaxRange);
var random = _random.Next(component.MinRange, component.MaxRange);
var offset = transform.LocalRotation.ToWorldVec().Normalized();
var direction = transform.LocalRotation.GetDir().ToVec();
var newOffset = offset + direction * random;
@@ -97,20 +101,17 @@ public sealed class VoidTeleportSystem : EntitySystem
CreatePulse(uid, component);
_xform.SetCoordinates(args.User, coords);
transform.AttachToGridOrMap();
_transform.AttachToGridOrMap(args.User, transform);
var pulled = GetPulledEntity(args.User);
if (pulled != null)
if (_pulling.TryGetPulledEntity(args.User, out var pulled))
{
_xform.SetCoordinates(pulled.Value, coords);
if (TryComp<TransformComponent>(pulled.Value, out var pulledTransform))
pulledTransform.AttachToGridOrMap();
_transform.AttachToGridOrMap(pulled.Value);
}
//Play tp sound
_audio.PlayPvs(component.TeleportInSound, coords);
_audio.PlayPvs(component.TeleportOutSound,oldCoords);
_audio.PlayPvs(component.TeleportOutSound, oldCoords);
//Create tp effect
_entMan.SpawnEntity(component.TeleportInEffect, coords);
@@ -129,45 +130,31 @@ public sealed class VoidTeleportSystem : EntitySystem
_appearance.SetData(uid, VeilVisuals.Activated, comp.Active, appearance);
}
private EntityUid? GetPulledEntity(EntityUid user)
{
EntityUid? pulled = null;
if (TryComp<SharedPullerComponent>(user, out var puller))
pulled = puller.Pulling;
return pulled;
}
private void CreatePulse(EntityUid uid, VoidTeleportComponent component)
{
if (TryComp<PointLightComponent>(uid, out var light))
#pragma warning disable RA0002
light.Energy = 5f;
#pragma warning restore RA0002
if (_pointLight.TryGetLight(uid, out var light))
{
_pointLight.SetEnergy(uid, 5f, light);
}
Timer.Spawn(component.TimerDelay, () => TurnOffPulse(uid, component), component.Token.Token);
}
private void TurnOffPulse(EntityUid uid ,VoidTeleportComponent comp)
private void TurnOffPulse(EntityUid uid, VoidTeleportComponent comp)
{
if (!TryComp<PointLightComponent>(uid, out var light))
if (!_pointLight.TryGetLight(uid, out var light))
return;
#pragma warning disable RA0002
light.Energy = 1f;
#pragma warning restore RA0002
_pointLight.SetEnergy(uid, 1f, light);
comp.Token = new CancellationTokenSource();
if (comp.UsesLeft <= 0)
{
comp.Active = false;
UpdateAppearance(uid, comp);
_pointLight.SetEnabled(uid, false);
#pragma warning disable RA0002
light.Enabled = false;
#pragma warning restore RA0002
UpdateAppearance(uid, comp);
}
}
}
}

3
Content.Server/_White/Cult/Runes/Systems/CultSystem.Narsie.cs
View File

@@ -1,5 +1,4 @@
using System.Threading;
using Content.Shared._White.Cult;
using Content.Shared._White.Cult;
using Robust.Server.GameObjects;
using Timer = Robust.Shared.Timing.Timer;

139
Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
View File

@@ -29,7 +29,6 @@ using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Popups;
using Content.Shared.Projectiles;
using Content.Shared.Pulling.Components;
using Content.Shared.Rejuvenate;
using Content.Shared._White.Cult;
using Content.Shared._White.Cult.Components;
@@ -37,7 +36,8 @@ using Content.Shared._White.Cult.Runes;
using Content.Shared._White.Cult.UI;
using Content.Shared.Cuffs;
using Content.Shared.Mindshield.Components;
using Content.Shared.Pulling;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Systems;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
@@ -66,11 +66,10 @@ public sealed partial class CultSystem : EntitySystem
[Dependency] private readonly GunSystem _gunSystem = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly FlammableSystem _flammableSystem = default!;
[Dependency] private readonly SharedPullingSystem _pulling = default!;
[Dependency] private readonly PullingSystem _pulling = default!;
[Dependency] private readonly SharedCuffableSystem _cuffable = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
public override void Initialize()
{
base.Initialize();
@@ -113,8 +112,10 @@ public sealed partial class CultSystem : EntitySystem
InitializeConstructs();
InitializeBarrierSystem();
InitializeConstructsAbilities();
InitializeCultists();
InitializeActions();
InitializeVerb();
}
private float _timeToDraw;
@@ -139,7 +140,7 @@ public sealed partial class CultSystem : EntitySystem
private readonly SoundPathSpecifier _narsie40Sec = new("/Audio/White/Cult/40sec.ogg");
/*
* Rune draw start ----
* Rune draw start ----
*/
private void OnRuneDrawerUseInHand(EntityUid uid, RuneDrawerProviderComponent component, UseInHandEvent args)
@@ -168,17 +169,13 @@ public sealed partial class CultSystem : EntitySystem
var runePrototype = args.SelectedItem;
var whoCalled = args.Session.AttachedEntity.Value;
if (!TryComp<ActorComponent>(whoCalled, out var actorComponent))
if (!TryComp<ActorComponent>(whoCalled, out _))
return;
if (!TryDraw(whoCalled, runePrototype))
return;
/*if (component.UserInterface != null)
_ui.CloseUi(component.UserInterface, actorComponent.PlayerSession);*/
TryDraw(whoCalled, runePrototype);
}
private bool TryDraw(EntityUid whoCalled, string runePrototype)
private void TryDraw(EntityUid whoCalled, string runePrototype)
{
_timeToDraw = 4f;
@@ -193,7 +190,7 @@ public sealed partial class CultSystem : EntitySystem
}
if (!IsAllowedToDraw(whoCalled))
return false;
return;
var ev = new CultDrawEvent
{
@@ -202,15 +199,14 @@ public sealed partial class CultSystem : EntitySystem
var argsDoAfterEvent = new DoAfterArgs(_entityManager, whoCalled, _timeToDraw, ev, whoCalled)
{
BreakOnUserMove = true,
BreakOnMove = true,
NeedHand = true
};
if (!_doAfterSystem.TryStartDoAfter(argsDoAfterEvent))
return false;
return;
_audio.PlayPvs("/Audio/White/Cult/butcher.ogg", whoCalled, AudioParams.Default.WithMaxDistance(2f));
return true;
}
private void OnDraw(EntityUid uid, CultistComponent comp, CultDrawEvent args)
@@ -272,7 +268,7 @@ public sealed partial class CultSystem : EntitySystem
return;
}
var entityPrototype = _entityManager.GetComponent<MetaDataComponent>(args.Used).EntityPrototype;
var entityPrototype = MetaData(args.Used).EntityPrototype;
if (entityPrototype == null)
return;
@@ -300,7 +296,7 @@ public sealed partial class CultSystem : EntitySystem
var argsDoAfterEvent = new DoAfterArgs(_entityManager, user, time, ev, target)
{
BreakOnUserMove = true,
BreakOnMove = true,
NeedHand = true
};
@@ -340,7 +336,7 @@ public sealed partial class CultSystem : EntitySystem
//Erasing end
/*
* Rune draw end ----
* Rune draw end ----
*/
//------------------------------------------//
@@ -395,8 +391,8 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* Base End ----
*/
* Base End ----
*/
//------------------------------------------//
@@ -432,7 +428,7 @@ public sealed partial class CultSystem : EntitySystem
if (state.CurrentState != MobState.Dead)
{
var canBeConverted = _entityManager.TryGetComponent<MindContainerComponent>(victim.Value, out var mind) &&
mind is {Mind: { }};
mind is { Mind: { } };
// Проверка, является ли жертва целью
_entityManager.TryGetComponent<MindContainerComponent>(target?.CurrentEntity, out var targetMind);
@@ -551,7 +547,7 @@ public sealed partial class CultSystem : EntitySystem
//------------------------------------------//
/*
* Buff Rune Start ----
* Buff Rune Start ----
*/
private void OnInvokeBuff(EntityUid uid, CultRuneBuffComponent component, CultRuneInvokeEvent args)
@@ -596,13 +592,13 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* Empower Rune End ----
* Empower Rune End ----
*/
//------------------------------------------//
/*
* Teleport rune start ----
* Teleport rune start ----
*/
private void OnInvokeTeleport(EntityUid uid, CultRuneTeleportComponent component, CultRuneInvokeEvent args)
@@ -620,22 +616,19 @@ public sealed partial class CultSystem : EntitySystem
private bool Teleport(EntityUid rune, EntityUid user, List<EntityUid>? victims = null)
{
var runes = EntityQuery<CultRuneTeleportComponent>();
var runesQuery = EntityQueryEnumerator<CultRuneTeleportComponent>();
var list = new List<int>();
var labels = new List<string>();
foreach (var teleportRune in runes)
while (runesQuery.MoveNext(out var runeUid, out var teleportComponent))
{
if (!TryComp<CultRuneTeleportComponent>(teleportRune.Owner, out var teleportComponent))
continue;
if (teleportComponent.Label == null)
continue;
if (teleportRune.Owner == rune)
if (runeUid == rune)
continue;
if (!int.TryParse(teleportRune.Owner.ToString(), out var intValue))
if (!int.TryParse(runeUid.ToString(), out var intValue))
continue;
list.Add(intValue);
@@ -707,13 +700,13 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* Teleport rune end ----
* Teleport rune end ----
*/
//------------------------------------------//
/*
* Apocalypse rune start ----
* Apocalypse rune start ----
*/
private void OnInvokeApocalypse(EntityUid uid, CultRuneApocalypseComponent component, CultRuneInvokeEvent args)
@@ -756,7 +749,7 @@ public sealed partial class CultSystem : EntitySystem
var argsDoAfterEvent = new DoAfterArgs(_entityManager, user, TimeSpan.FromSeconds(40), ev, user)
{
BreakOnUserMove = true
BreakOnMove = true
};
if (!_doAfterSystem.TryStartDoAfter(argsDoAfterEvent))
@@ -769,7 +762,8 @@ public sealed partial class CultSystem : EntitySystem
_chat.DispatchGlobalAnnouncement(Loc.GetString("cult-ritual-started"), "CULT", false,
colorOverride: Color.DarkRed);
_audio.PlayGlobal(_narsie40Sec, Filter.Broadcast(), false, AudioParams.Default.WithLoop(true).WithVolume(0.15f));
_audio.PlayGlobal(_narsie40Sec, Filter.Broadcast(), false,
AudioParams.Default.WithLoop(true).WithVolume(0.15f));
return true;
}
@@ -800,14 +794,14 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* Apocalypse rune end ----
* Apocalypse rune end ----
*/
//------------------------------------------//
/*
* Revive rune start ----
*/
* Revive rune start ----
*/
private void OnInvokeRevive(EntityUid uid, CultRuneReviveComponent component, CultRuneInvokeEvent args)
{
@@ -856,13 +850,13 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* Revive rune end ----
*/
* Revive rune end ----
*/
//------------------------------------------//
/*
* Barrier rune start ----
* Barrier rune start ----
*/
private void OnInvokeBarrier(EntityUid uid, CultRuneBarrierComponent component, CultRuneInvokeEvent args)
@@ -884,14 +878,14 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* Barrier rune end ----
*/
* Barrier rune end ----
*/
//------------------------------------------//
/*
* Summoning rune start ----
*/
* Summoning rune start ----
*/
private void OnInvokeSummoning(EntityUid uid, CultRuneSummoningComponent component, CultRuneInvokeEvent args)
{
@@ -904,7 +898,7 @@ public sealed partial class CultSystem : EntitySystem
HashSet<EntityUid> cultistHashSet,
CultRuneSummoningComponent component)
{
var cultists = EntityQuery<CultistComponent>();
var cultistsQuery = EntityQueryEnumerator<CultistComponent>();
var list = new List<int>();
var labels = new List<string>();
@@ -914,15 +908,13 @@ public sealed partial class CultSystem : EntitySystem
return false;
}
foreach (var cultist in cultists)
while (cultistsQuery.MoveNext(out var cultistUid, out _))
{
if (!TryComp<MetaDataComponent>(cultist.Owner, out var meta))
var meta = MetaData(cultistUid);
if (cultistHashSet.Contains(cultistUid))
continue;
if (cultistHashSet.Contains(cultist.Owner))
continue;
if (!int.TryParse(cultist.Owner.ToString(), out var intValue))
if (!int.TryParse(cultistUid.ToString(), out var intValue))
continue;
list.Add(intValue);
@@ -964,7 +956,7 @@ public sealed partial class CultSystem : EntitySystem
var target = new EntityUid(args.SelectedItem);
var baseRune = component.BaseRune;
if (!TryComp<SharedPullableComponent>(target, out var pullableComponent))
if (!TryComp<PullableComponent>(target, out var pullableComponent))
return;
if (!TryComp<CuffableComponent>(target, out var cuffableComponent))
@@ -1004,14 +996,14 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* Summoning rune end ----
*/
* Summoning rune end ----
*/
//------------------------------------------//
/*
* BloodBoil rune start ----
*/
* BloodBoil rune start ----
*/
private void OnInvokeBloodBoil(EntityUid uid, CultRuneBloodBoilComponent component, CultRuneInvokeEvent args)
{
@@ -1126,14 +1118,14 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* BloodBoil rune end ----
*/
* BloodBoil rune end ----
*/
//------------------------------------------//
/*
* Empower rune start ----
*/
* Empower rune start ----
*/
private void OnActiveInWorld(EntityUid uid, CultEmpowerComponent component, ActivateInWorldEvent args)
{
@@ -1183,13 +1175,13 @@ public sealed partial class CultSystem : EntitySystem
}
/*
* Empower rune end ----
*/
* Empower rune end ----
*/
//------------------------------------------//
/*
* Helpers Start ----
* Helpers Start ----
*/
private EntityUid? FindNearestTarget(EntityUid uid, List<EntityUid> targets)
@@ -1265,7 +1257,7 @@ public sealed partial class CultSystem : EntitySystem
return;
}
var pos = transComp.MapPosition;
var pos = _transform.GetMapCoordinates(uid, transComp);
var x = (int) pos.X;
var y = (int) pos.Y;
var posText = $"(x = {x}, y = {y})";
@@ -1339,20 +1331,19 @@ public sealed partial class CultSystem : EntitySystem
private void StopPulling(EntityUid target, bool checkPullable = true)
{
// break pulls before portal enter so we dont break shit
if (checkPullable && TryComp<SharedPullableComponent>(target, out var pullable) && pullable.BeingPulled)
if (checkPullable && TryComp<PullableComponent>(target, out var pullable) && pullable.BeingPulled)
{
_pulling.TryStopPull(pullable);
_pulling.TryStopPull(target, pullable);
}
if (TryComp<SharedPullerComponent>(target, out var pulling)
&& pulling.Pulling != null &&
TryComp<SharedPullableComponent>(pulling.Pulling.Value, out var subjectPulling))
if (_pulling.TryGetPulledEntity(target, out var pulledEntity)
&& TryComp(pulledEntity, out PullableComponent? subjectPulling))
{
_pulling.TryStopPull(subjectPulling);
_pulling.TryStopPull(pulledEntity.Value, subjectPulling);
}
}
/*
* Helpers End ----
* Helpers End ----
*/
}
}

67
Content.Server/_White/Cult/UI/TeleportSpellEui.cs
View File

@@ -1,14 +1,11 @@
using Content.Server.EUI;
using Content.Server.Popups;
using Content.Server._White.Cult.Runes.Comps;
using Content.Shared.Actions;
using Content.Shared.Eui;
using Content.Shared.Popups;
using Content.Shared._White.Cult.UI;
using Content.Shared.Pulling;
using Content.Shared.Pulling.Components;
using Robust.Server.GameObjects;
using Robust.Shared.Map;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Systems;
using Robust.Shared.Timing;
namespace Content.Server._White.Cult.UI;
@@ -16,45 +13,37 @@ namespace Content.Server._White.Cult.UI;
public sealed class TeleportSpellEui : BaseEui
{
[Dependency] private readonly EntityManager _entityManager = default!;
private SharedTransformSystem _transformSystem;
private SharedPullingSystem _pulling;
private PopupSystem _popupSystem;
private readonly SharedTransformSystem _transformSystem;
private readonly PullingSystem _pulling;
private readonly PopupSystem _popupSystem;
private EntityUid _performer;
private EntityUid _target;
private EntityCoordinates _initialOwnerCoords;
private EntityCoordinates _initialTargetCoords;
private readonly EntityUid _performer;
private readonly EntityUid _target;
private bool _used;
public TeleportSpellEui(EntityUid performer, EntityUid target)
{
IoCManager.InjectDependencies(this);
_transformSystem = _entityManager.System<SharedTransformSystem>();
_pulling = _entityManager.System<SharedPullingSystem>();
_pulling = _entityManager.System<PullingSystem>();
_popupSystem = _entityManager.System<PopupSystem>();
_performer = performer;
_target = target;
_initialOwnerCoords = _entityManager.GetComponent<TransformComponent>(_performer).Coordinates;
_initialTargetCoords = _entityManager.GetComponent<TransformComponent>(_target).Coordinates;
Timer.Spawn(TimeSpan.FromSeconds(10), Close );
Timer.Spawn(TimeSpan.FromSeconds(10), Close);
}
public override EuiStateBase GetNewState()
{
var runes = _entityManager.EntityQuery<CultRuneTeleportComponent>();
var runesQuery = _entityManager.EntityQueryEnumerator<CultRuneTeleportComponent>();
var state = new TeleportSpellEuiState();
foreach (var rune in runes)
while (runesQuery.MoveNext(out var runeUid, out var rune))
{
state.Runes.Add((int)rune.Owner, rune.Label!);
state.Runes.Add((int) runeUid, rune.Label!);
}
return state;
@@ -64,7 +53,10 @@ public sealed class TeleportSpellEui : BaseEui
{
base.HandleMessage(msg);
if(_used) return;
if (_used)
{
return;
}
if (msg is not TeleportSpellTargetRuneSelected cast)
{
@@ -72,23 +64,24 @@ public sealed class TeleportSpellEui : BaseEui
}
var performerPosition = _entityManager.GetComponent<TransformComponent>(_performer).Coordinates;
var targetPosition = _entityManager.GetComponent<TransformComponent>(_target).Coordinates;;
var targetPosition = _entityManager.GetComponent<TransformComponent>(_target).Coordinates;
performerPosition.TryDistance(_entityManager, targetPosition, out var distance);
if(distance > 1.5f)
if (distance > 1.5f)
{
_popupSystem.PopupEntity("Too far", _performer, PopupType.Medium);
return;
}
TransformComponent? runeTransform = null!;
TransformComponent? runeTransform = null;
foreach (var runeComponent in _entityManager.EntityQuery<CultRuneTeleportComponent>())
var teleportRuneQuery = _entityManager.EntityQueryEnumerator<CultRuneTeleportComponent, TransformComponent>();
while (teleportRuneQuery.MoveNext(out var runeUid, out _, out var transformComponent))
{
if (runeComponent.Owner == new EntityUid(cast.RuneUid))
if (runeUid == new EntityUid(cast.RuneUid))
{
runeTransform = _entityManager.GetComponent<TransformComponent>(runeComponent.Owner);
runeTransform = transformComponent;
}
}
@@ -102,19 +95,19 @@ public sealed class TeleportSpellEui : BaseEui
_used = true;
// break pulls before portal enter so we dont break shit
if (_entityManager.TryGetComponent<SharedPullableComponent>(_target, out var pullable) && pullable.BeingPulled)
if (_entityManager.TryGetComponent<PullableComponent>(_target, out var pullable) && pullable.BeingPulled)
{
_pulling.TryStopPull(pullable);
_pulling.TryStopPull(_target, pullable);
}
if (_entityManager.TryGetComponent<SharedPullerComponent>(_target, out var pulling)
&& pulling.Pulling != null &&
_entityManager.TryGetComponent<SharedPullableComponent>(pulling.Pulling.Value, out var subjectPulling))
if (_entityManager.TryGetComponent<PullerComponent>(_target, out var pulling)
&& pulling.Pulling != null
&& _entityManager.TryGetComponent<PullableComponent>(pulling.Pulling.Value, out var subjectPulling))
{
_pulling.TryStopPull(subjectPulling);
_pulling.TryStopPull(pulling.Pulling.Value, subjectPulling);
}
_transformSystem.SetCoordinates(_target, runeTransform.Coordinates);
Close();
}
}
}