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

use weighted random for ninja threats (#20469)

Browse Source 
* change threats to be weighted random and a little cleanup

* ninja rule stores weighted random id for threats

* move threats out of the rule and into weighted random

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-09-25 04:16:09 +01:00
committed by GitHub
parent 2616cb69e8
commit 91a157d7ed
6 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Communications/CommsHackerSystem.cs
View File

@@ -4,6 +4,9 @@ using Content.Server.Ninja.Systems;
using Content.Shared.Communications;
using Content.Shared.DoAfter;
using Content.Shared.Interaction;
using Content.Shared.Random;
using Content.Shared.Random.Helpers;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Serialization;
@@ -13,6 +16,7 @@ public sealed class CommsHackerSystem : SharedCommsHackerSystem
{
[Dependency] private readonly ChatSystem _chat = default!;
[Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly IRobustRandom _random = default!;
// TODO: remove when generic check event is used
[Dependency] private readonly NinjaGlovesSystem _gloves = default!;
@@ -55,11 +59,12 @@ public sealed class CommsHackerSystem : SharedCommsHackerSystem
/// </summary>
private void OnDoAfter(EntityUid uid, CommsHackerComponent comp, TerrorDoAfterEvent args)
{
if (args.Cancelled || args.Handled || comp.Threats.Count == 0 || args.Target == null)
if (args.Cancelled || args.Handled || args.Target == null)
return;
var threat = _random.Pick(comp.Threats);
CallInThreat(threat);
var threats = _proto.Index<WeightedRandomPrototype>(comp.Threats);
var threat = threats.Pick(_random);
CallInThreat(_proto.Index<ThreatPrototype>(threat));
// prevent calling in multiple threats
RemComp<CommsHackerComponent>(uid);
@@ -71,7 +76,7 @@ public sealed class CommsHackerSystem : SharedCommsHackerSystem
/// <summary>
/// Makes announcement and adds game rule of the threat.
/// </summary>
public void CallInThreat(Threat threat)
public void CallInThreat(ThreatPrototype threat)
{
_gameTicker.StartGameRule(threat.Rule, out _);
_chat.DispatchGlobalAnnouncement(Loc.GetString(threat.Announcement), playSound: true, colorOverride: Color.Red);