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

Пару изменений (#468)

Browse Source 
* fix: Двери больше нельзя моментально открыть голыми руками

* add: Несколько целевой пинпоинтер для оперативников синдиката

* add: Боеголовка синдиката
This commit is contained in:
Spatison
2024-07-20 05:33:14 +03:00
committed by GitHub
parent 0dff5a3f79
commit 88a09bea71
15 changed files with 295 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
View File

@@ -251,8 +251,32 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
continue;
}
MapId? targetStationMap = null;
if (nukeops.TargetStation != null && TryComp(nukeops.TargetStation, out StationDataComponent? stationData))
{
var stationGrid = stationData.Grids.FirstOrNull();
targetStationMap = stationGrid != null
? Transform(stationGrid.Value).MapID
: null;
}
// WD EDIT
nukeops.WinConditions.Add(WinCondition.NukeExplodedOnCorrectStation);
SetWinType(uid, WinType.OpsMajor, nukeops);
var operatives = EntityQuery<NukeOperativeComponent, TransformComponent>(true);
var operativesAlive = operatives
.Any(ent => ent.Item2.MapID != targetStationMap && ent.Item1.Running);
if (operativesAlive)
SetWinType(uid, WinType.OpsMajor, nukeops);
else
{
nukeops.WinConditions.Add(WinCondition.AllNukiesDead);
SetWinType(uid, WinType.OpsMinor, nukeops);
}
// WD EDIT
correctStation = true;
}
@@ -516,7 +540,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
return;
// If the win condition was set to operative/crew major win, ignore.
if (component.WinType == WinType.OpsMajor || component.WinType == WinType.CrewMajor)
if (component.WinType == WinType.OpsMajor || component.WinType == WinType.CrewMajor || component.WinType == WinType.OpsMinor)
return;
var nukeQuery = AllEntityQuery<NukeComponent, TransformComponent>();
@@ -527,6 +551,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
if (nuke.Status != NukeStatus.ARMED)
continue;
Log.Error("hyi");
// UH OH
if (nukeTransform.MapUid != null && centcomms.Contains(nukeTransform.MapUid.Value))
{
@@ -552,39 +577,42 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
}
}
var allAlive = true;
var query = EntityQueryEnumerator<NukeopsRoleComponent, MindContainerComponent, MobStateComponent>();
while (query.MoveNext(out var nukeopsUid, out _, out var mindContainer, out var mobState))
if (!component.WinConditions.Contains(WinCondition.AllNukiesDead)) // WD EDIT
{
// mind got deleted somehow so ignore it
if (!_mind.TryGetMind(nukeopsUid, out _, out var mind, mindContainer))
continue;
// check if player got gibbed or ghosted or something - count as dead
if (mind.OwnedEntity != null &&
// if the player somehow isn't a mob anymore that also counts as dead
// have to be alive, not crit or dead
mobState.CurrentState is MobState.Alive)
var allAlive = true;
var query = EntityQueryEnumerator<NukeopsRoleComponent, MindContainerComponent, MobStateComponent>();
while (query.MoveNext(out var nukeopsUid, out _, out var mindContainer, out var mobState))
{
continue;
// mind got deleted somehow so ignore it
if (!_mind.TryGetMind(nukeopsUid, out _, out var mind, mindContainer))
continue;
// check if player got gibbed or ghosted or something - count as dead
if (mind.OwnedEntity != null &&
// if the player somehow isn't a mob anymore that also counts as dead
// have to be alive, not crit or dead
mobState.CurrentState is MobState.Alive)
{
continue;
}
allAlive = false;
break;
}
allAlive = false;
break;
}
// If all nuke ops were alive at the end of the round,
// the nuke ops win. This is to prevent people from
// running away the moment nuke ops appear.
if (allAlive)
{
SetWinType(uid, WinType.OpsMinor, component);
component.WinConditions.Add(WinCondition.AllNukiesAlive);
return;
}
// If all nuke ops were alive at the end of the round,
// the nuke ops win. This is to prevent people from
// running away the moment nuke ops appear.
if (allAlive)
{
SetWinType(uid, WinType.OpsMinor, component);
component.WinConditions.Add(WinCondition.AllNukiesAlive);
return;
component.WinConditions.Add(WinCondition.SomeNukiesAlive);
}
component.WinConditions.Add(WinCondition.SomeNukiesAlive);
var diskAtCentCom = false;
var diskQuery = AllEntityQuery<NukeDiskComponent, TransformComponent>();
@@ -619,7 +647,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
component.WinType = type;
if (endRound && (type == WinType.CrewMajor || type == WinType.OpsMajor))
if (endRound && (type == WinType.CrewMajor || type == WinType.OpsMajor || type == WinType.OpsMinor))
_roundEndSystem.EndRound();
}

4
Content.Server/Nuke/NukeCodePaperSystem.cs
View File

@@ -114,9 +114,7 @@ namespace Content.Server.Nuke
foreach (var (nukeUid, nuke) in nukes)
{
if (!onlyCurrentStation &&
(owningStation == null &&
nuke.OriginMapGrid != (transform.MapID, transform.GridUid) ||
nuke.OriginStation != owningStation))
nuke.OriginStation != owningStation)
{
continue;
}

4
Content.Server/Pinpointer/PinpointerSystem.cs
View File

@@ -8,7 +8,7 @@ using Content.Shared.IdentityManagement;
namespace Content.Server.Pinpointer;
public sealed class PinpointerSystem : SharedPinpointerSystem
public sealed partial class PinpointerSystem : SharedPinpointerSystem
{
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -18,6 +18,8 @@ public sealed class PinpointerSystem : SharedPinpointerSystem
public override void Initialize()
{
base.Initialize();
InitializeMultiplePinpointer(); // WD EDIT
_xformQuery = GetEntityQuery<TransformComponent>();
SubscribeLocalEvent<PinpointerComponent, ActivateInWorldEvent>(OnActivate);

75
Content.Server/_White/Pinpointer/PinpointerSystem.multiple.cs Normal file
View File

@@ -0,0 +1,75 @@
using Content.Shared._White.Pinpointer;
using Content.Shared.Interaction;
using Content.Shared.Pinpointer;
namespace Content.Server.Pinpointer;
public sealed partial class PinpointerSystem
{
public void InitializeMultiplePinpointer()
{
SubscribeLocalEvent<MultiplePinpointerComponent, ComponentStartup>(OnMultiplePinpointerStartup);
SubscribeLocalEvent<MultiplePinpointerComponent, ActivateInWorldEvent>(OnMultiplePinpointerActivated);
SubscribeLocalEvent<MultiplePinpointerComponent, AfterAutoHandleStateEvent>(OnMultiplePinpointerHandleState);
}
private void OnMultiplePinpointerHandleState(EntityUid uid, MultiplePinpointerComponent component, ref AfterAutoHandleStateEvent args)
{
SetMultiplePinpointer(uid, component);
}
private void OnMultiplePinpointerStartup(EntityUid uid, MultiplePinpointerComponent multiple, ComponentStartup args)
{
var pinpointer = EntityManager.EnsureComponent<PinpointerComponent>(uid);
SetMultiplePinpointer(uid, multiple, pinpointer);
}
private void OnMultiplePinpointerActivated(EntityUid uid, MultiplePinpointerComponent multiple, ActivateInWorldEvent args)
{
if (args.Handled)
return;
args.Handled = CycleMultiplePinpointer(uid, multiple, args.User);
}
private bool CycleMultiplePinpointer(EntityUid uid, MultiplePinpointerComponent? multiple = null, EntityUid? user = null)
{
if (!Resolve(uid, ref multiple))
return false;
if (multiple.Modes.Length == 0)
return false;
multiple.CurrentEntry = (uint)((multiple.CurrentEntry + 1) % multiple.Modes.Length);
SetMultiplePinpointer(uid, multiple, user: user);
return true;
}
private void SetMultiplePinpointer(EntityUid uid,
MultiplePinpointerComponent? multiple = null,
PinpointerComponent? pin = null,
EntityUid? user = null)
{
if (!Resolve(uid, ref multiple, ref pin))
return;
if (multiple.Modes.Length <= multiple.CurrentEntry)
return;
var current = multiple.Modes[multiple.CurrentEntry];
SetDistance(uid, Distance.Unknown, pin);
if (current == "Off")
{
SetActive(uid, true, pin);
pin.Component = null;
}
else
{
SetActive(uid, false, pin);
pin.Component = current;
}
LocateTarget(uid, pin);
}
}