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

ninja bombing target whitelist warp point (#19977)

Browse Source 
* ninja bombing target whitelist

* :trollface:

* add bombing targets to saltern

* oops remove jordans

* remove aspid js too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-09-10 23:04:00 +01:00
committed by GitHub
parent d68fa97fda
commit 6953070d40
5 changed files with 147 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
View File

@@ -151,7 +151,7 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
return;
}
if (GetNinjaBattery(uid, out var _, out var battery))
if (GetNinjaBattery(uid, out _, out var battery))
{
var severity = ContentHelpers.RoundToLevels(MathF.Max(0f, battery.CurrentCharge), battery.MaxCharge, 8);
_alerts.ShowAlert(uid, AlertType.SuitPower, (short) severity);
@@ -214,14 +214,12 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
_role.MindAddRole(mindId, role, mind);
// choose spider charge detonation point
// currently based on warp points, something better could be done (but would likely require mapping work)
var warps = new List<EntityUid>();
var query = EntityQueryEnumerator<WarpPointComponent, TransformComponent>();
var query = EntityQueryEnumerator<BombingTargetComponent, WarpPointComponent, TransformComponent>();
var map = Transform(uid).MapID;
while (query.MoveNext(out var warpUid, out var warp, out var xform))
while (query.MoveNext(out var warpUid, out _, out var warp, out var xform))
{
// won't be asked to detonate the nuke disk or singularity or centcomm
if (warp.Location != null && !HasComp<PhysicsComponent>(warpUid) && xform.MapID == map)
if (warp.Location != null)
warps.Add(warpUid);
}