tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move ninja objectives code into generic antag system (#20186)

Browse Source 
Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-09-21 15:33:18 +01:00
committed by GitHub
parent 8629a3ab9e
commit 37c5020a71
11 changed files with 205 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ using Content.Server.Power.EntitySystems;
using Content.Server.PowerCell;
using Content.Server.Research.Systems;
using Content.Server.Roles;
using Content.Server.GenericAntag;
using Content.Server.Warps;
using Content.Shared.Alert;
using Content.Shared.Clothing.EntitySystems;
@@ -42,13 +43,14 @@ namespace Content.Server.Ninja.Systems;
// TODO: when criminal records is merged, hack it to set everyone to arrest
/// <summary>
/// Main ninja system that handles ninja setup and greentext, provides helper methods for the rest of the code to use.
/// Main ninja system that handles ninja setup, provides helper methods for the rest of the code to use.
/// </summary>
public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
{
[Dependency] private readonly AlertsSystem _alerts = default!;
[Dependency] private readonly BatterySystem _battery = default!;
[Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly GenericAntagSystem _genericAntag = default!;
[Dependency] private readonly IChatManager _chatMan = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly PowerCellSystem _powerCell = default!;
@@ -63,7 +65,7 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
{
base.Initialize();
SubscribeLocalEvent<SpaceNinjaComponent, MindAddedMessage>(OnNinjaMindAdded);
SubscribeLocalEvent<SpaceNinjaComponent, GenericAntagCreatedEvent>(OnNinjaCreated);
SubscribeLocalEvent<SpaceNinjaComponent, EmaggedSomethingEvent>(OnDoorjack);
SubscribeLocalEvent<SpaceNinjaComponent, ResearchStolenEvent>(OnResearchStolen);
SubscribeLocalEvent<SpaceNinjaComponent, ThreatCalledInEvent>(OnThreatCalledIn);
@@ -78,24 +80,6 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
}
}
/// <summary>
/// Turns the player into a space ninja
/// </summary>
public void MakeNinja(EntityUid mindId, MindComponent mind)
{
if (mind.OwnedEntity == null)
return;
// prevent double ninja'ing
var user = mind.OwnedEntity.Value;
if (HasComp<SpaceNinjaComponent>(user))
return;
AddComp<SpaceNinjaComponent>(user);
SetOutfitCommand.SetOutfit(user, "SpaceNinjaGear", EntityManager);
GreetNinja(mindId, mind);
}
/// <summary>
/// Download the given set of nodes, returning how many new nodes were downloaded.
/// </summary>
@@ -114,29 +98,16 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
/// Returns a ninja's gamerule config data.
/// If the gamerule was not started then it will be started automatically.
/// </summary>
public NinjaRuleComponent? NinjaRule(EntityUid uid, SpaceNinjaComponent? comp = null)
public NinjaRuleComponent? NinjaRule(EntityUid uid, GenericAntagComponent? comp = null)
{
if (!Resolve(uid, ref comp))
return null;
// already exists so just check it
if (comp.Rule != null)
return CompOrNull<NinjaRuleComponent>(comp.Rule);
// start it
_gameTicker.StartGameRule("Ninja", out var rule);
comp.Rule = rule;
if (!TryComp<NinjaRuleComponent>(rule, out var ninjaRule))
// mind not added yet so no rule
if (comp.RuleEntity == null)
return null;
// add ninja mind to the rule's list for objective showing
if (TryComp<MindContainerComponent>(uid, out var mindContainer) && mindContainer.Mind != null)
{
ninjaRule.Minds.Add(mindContainer.Mind.Value);
}
return ninjaRule;
return CompOrNull<NinjaRuleComponent>(comp.RuleEntity);
}
// TODO: can probably copy paste borg code here
@@ -185,24 +156,18 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
return GetNinjaBattery(user, out var uid, out var battery) && _battery.TryUseCharge(uid.Value, charge, battery);
}
/// <summary>
/// Greets the ninja when a ghost takes over a ninja, if that happens.
/// </summary>
private void OnNinjaMindAdded(EntityUid uid, SpaceNinjaComponent comp, MindAddedMessage args)
{
if (TryComp<MindContainerComponent>(uid, out var mind) && mind.Mind != null)
GreetNinja(mind.Mind.Value);
}
/// <summary>
/// Set up everything for ninja to work and send the greeting message/sound.
/// Objectives are added by <see cref="GenericAntagSystem"/>.
/// </summary>
private void GreetNinja(EntityUid mindId, MindComponent? mind = null)
private void OnNinjaCreated(EntityUid uid, SpaceNinjaComponent comp, ref GenericAntagCreatedEvent args)
{
if (!Resolve(mindId, ref mind) || mind.OwnedEntity == null || mind.Session == null)
var mindId = args.MindId;
var mind = args.Mind;
if (mind.Session == null)
return;
var uid = mind.OwnedEntity.Value;
var config = NinjaRule(uid);
if (config == null)
return;
@@ -226,15 +191,6 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
if (warps.Count > 0)
role.SpiderChargeTarget = _random.Pick(warps);
// assign objectives - must happen after spider charge target so that the obj requirement works
foreach (var objective in config.Objectives)
{
if (!_mind.TryAddObjective(mindId, mind, objective))
{
Log.Error($"Failed to add {objective} to ninja {mind.OwnedEntity.Value}");
}
}
var session = mind.Session;
_audio.PlayGlobal(config.GreetingSound, Filter.Empty().AddPlayer(session), false, AudioParams.Default);
_chatMan.DispatchServerMessage(session, Loc.GetString("ninja-role-greeting"));