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

Suspicion on the Space Station gamemode (#849)

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-05-03 11:25:39 +02:00
committed by GitHub
parent ccbe4bc23f
commit 5d7514674e
15 changed files with 305 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Mobs/MindComponent.cs
View File

@@ -118,9 +118,17 @@ namespace Content.Server.GameObjects.Components.Mobs
if (!ShowExamineInfo)
return;
var dead = false;
if(Owner.TryGetComponent<SpeciesComponent>(out var species))
if (species.CurrentDamageState is DeadState)
dead = true;
// TODO: Use gendered pronouns depending on the entity
if(!HasMind)
message.AddMarkup($"[color=red]They are totally catatonic. The stresses of life in deep-space must have been too much for them. Any recovery is unlikely.[/color]");
message.AddMarkup(!dead
? $"[color=red]They are totally catatonic. The stresses of life in deep-space must have been too much for them. Any recovery is unlikely.[/color]"
: $"[color=purple]Their soul has departed.[/color]");
else if(Mind.Session == null)
message.AddMarkup("[color=yellow]They have a blank, absent-minded stare and appears completely unresponsive to anything. They may snap out of it soon.[/color]");
}

2
Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
View File

@@ -177,7 +177,7 @@ namespace Content.Server.GameObjects
currentstate = threshold;
EntityEventArgs toRaise = new MobDamageStateChangedMessage(this);
var toRaise = new MobDamageStateChangedMessage(this);
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, toRaise);
}

7
Content.Server/GameTicking/GamePreset.cs
View File

@@ -1,11 +1,14 @@
namespace Content.Server.GameTicking
using System.Collections.Generic;
using Robust.Server.Interfaces.Player;
namespace Content.Server.GameTicking
{
/// <summary>
/// A round-start setup preset, such as which antagonists to spawn.
/// </summary>
public abstract class GamePreset
{
public abstract void Start();
public abstract bool Start(IReadOnlyList<IPlayerSession> players);
public virtual string ModeTitle => "Sandbox";
public virtual string Description => "Secret!";
}

7
Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs
View File

@@ -1,5 +1,7 @@
using Content.Server.GameTicking.GameRules;
using System.Collections.Generic;
using Content.Server.GameTicking.GameRules;
using Content.Server.Interfaces.GameTicking;
using Robust.Server.Interfaces.Player;
using Robust.Shared.IoC;
namespace Content.Server.GameTicking.GamePresets
@@ -10,9 +12,10 @@ namespace Content.Server.GameTicking.GamePresets
[Dependency] private readonly IGameTicker _gameTicker;
#pragma warning restore 649
public override void Start()
public override bool Start(IReadOnlyList<IPlayerSession> readyPlayers)
{
_gameTicker.AddGameRule<RuleDeathMatch>();
return true;
}
public override string ModeTitle => "Deathmatch";

7
Content.Server/GameTicking/GamePresets/PresetSandbox.cs
View File

@@ -1,4 +1,6 @@
using Content.Server.Sandbox;
using System.Collections.Generic;
using Content.Server.Sandbox;
using Robust.Server.Interfaces.Player;
using Robust.Shared.IoC;
namespace Content.Server.GameTicking.GamePresets
@@ -9,9 +11,10 @@ namespace Content.Server.GameTicking.GamePresets
[Dependency] private readonly ISandboxManager _sandboxManager;
#pragma warning restore 649
public override void Start()
public override bool Start(IReadOnlyList<IPlayerSession> readyPlayers)
{
_sandboxManager.IsSandboxEnabled = true;
return true;
}
public override string ModeTitle => "Sandbox";

63
Content.Server/GameTicking/GamePresets/PresetSuspicion.cs Normal file
View File

@@ -0,0 +1,63 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameTicking.GameRules;
using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Mobs.Roles;
using Content.Server.Players;
using Content.Server.Sandbox;
using NFluidsynth;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC;
using Robust.Shared.Random;
using Logger = Robust.Shared.Log.Logger;
namespace Content.Server.GameTicking.GamePresets
{
public class PresetSuspicion : GamePreset
{
#pragma warning disable 649
[Dependency] private readonly ISandboxManager _sandboxManager;
[Dependency] private readonly IChatManager _chatManager;
[Dependency] private readonly IGameTicker _gameTicker;
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public int MinPlayers { get; set; } = 5;
public int MinTraitors { get; set; } = 2;
public int PlayersPerTraitor { get; set; } = 5;
public override bool Start(IReadOnlyList<IPlayerSession> readyPlayers)
{
if (readyPlayers.Count < MinPlayers)
{
_chatManager.DispatchServerAnnouncement($"Not enough players readied up for the game! There were {readyPlayers.Count} players readied up out of {MinPlayers} needed.");
return false;
}
var list = new List<IPlayerSession>(readyPlayers);
var numTraitors = Math.Max(readyPlayers.Count() % PlayersPerTraitor, MinTraitors);
for (var i = 0; i < numTraitors; i++)
{
var traitor = _random.PickAndTake(list);
var mind = traitor.Data.ContentData().Mind;
mind.AddRole(new SuspicionTraitorRole(mind));
}
foreach (var player in list)
{
var mind = player.Data.ContentData().Mind;
mind.AddRole(new SuspicionInnocentRole(mind));
}
_gameTicker.AddGameRule<RuleSuspicion>();
return true;
}
public override string ModeTitle => "Suspicion";
public override string Description => "Suspicion on the Space Station. There are traitors on board... Can you kill them before they kill you?";
}
}

122
Content.Server/GameTicking/GameRules/RuleSuspicion.cs Normal file
View File

@@ -0,0 +1,122 @@
using System;
using System.Threading;
using Content.Server.GameObjects;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Observer;
using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Mobs.Roles;
using Content.Server.Players;
using NFluidsynth;
using Robust.Server.Interfaces.Player;
using Robust.Server.Player;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Logger = Robust.Shared.Log.Logger;
using Timer = Robust.Shared.Timers.Timer;
namespace Content.Server.GameTicking.GameRules
{
/// <summary>
/// Simple GameRule that will do a free-for-all death match.
/// Kill everybody else to win.
/// </summary>
public sealed class RuleSuspicion : GameRule, IEntityEventSubscriber
{
private static readonly TimeSpan DeadCheckDelay = TimeSpan.FromSeconds(1);
#pragma warning disable 649
[Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private readonly IChatManager _chatManager;
[Dependency] private readonly IEntityManager _entityManager;
[Dependency] private readonly IGameTicker _gameTicker;
#pragma warning restore 649
private readonly CancellationTokenSource _checkTimerCancel = new CancellationTokenSource();
public override void Added()
{
_chatManager.DispatchServerAnnouncement("There are traitors on the station! Find them, and kill them!");
_entityManager.EventBus.SubscribeEvent<MobDamageStateChangedMessage>(EventSource.Local, this, _onMobDamageStateChanged);
Timer.SpawnRepeating(DeadCheckDelay, _checkWinConditions, _checkTimerCancel.Token);
}
private void _onMobDamageStateChanged(MobDamageStateChangedMessage message)
{
var owner = message.Species.Owner;
if (!(message.Species.CurrentDamageState is DeadState))
return;
if (!owner.TryGetComponent<MindComponent>(out var mind))
return;
if (!mind.HasMind)
return;
message.Species.Owner.Description +=
mind.Mind.HasRole<SuspicionTraitorRole>() ? "\nThey were a traitor!" : "\nThey were an innocent!";
}
public override void Removed()
{
base.Removed();
_checkTimerCancel.Cancel();
}
private void _checkWinConditions()
{
var traitorsAlive = 0;
var innocentsAlive = 0;
foreach (var playerSession in _playerManager.GetAllPlayers())
{
if (playerSession.AttachedEntity == null
|| !playerSession.AttachedEntity.TryGetComponent(out SpeciesComponent species))
{
continue;
}
if (!species.CurrentDamageState.IsConscious)
{
continue;
}
if (playerSession.ContentData().Mind.HasRole<SuspicionTraitorRole>())
traitorsAlive++;
else
innocentsAlive++;
}
if ((innocentsAlive + traitorsAlive) == 0)
{
_chatManager.DispatchServerAnnouncement("Everybody is dead, it's a stalemate!");
EndRound();
}
else if (traitorsAlive == 0)
{
_chatManager.DispatchServerAnnouncement("The traitors are dead! The innocents win.");
EndRound();
}
else if (innocentsAlive == 0)
{
_chatManager.DispatchServerAnnouncement("The innocents are dead! The traitors win.");
EndRound();
}
}
private void EndRound()
{
_gameTicker.EndRound();
_chatManager.DispatchServerAnnouncement($"Restarting in 10 seconds.");
_checkTimerCancel.Cancel();
Timer.Spawn(TimeSpan.FromSeconds(10), () => _gameTicker.RestartRound());
}
}
}

34
Content.Server/GameTicking/GameTicker.cs
View File

@@ -104,7 +104,8 @@ namespace Content.Server.GameTicking
_configurationManager.RegisterCVar("game.lobbyenabled", false, CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.lobbyduration", 20, CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.defaultpreset", "Sandbox", CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.defaultpreset", "Suspicion", CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.fallbackpreset", "Sandbox", CVar.ARCHIVE);
_playerManager.PlayerStatusChanged += _handlePlayerStatusChanged;
@@ -181,11 +182,6 @@ namespace Content.Server.GameTicking
SendServerMessage("The round is starting now...");
RunLevel = GameRunLevel.InRound;
var preset = MakeGamePreset();
preset.Start();
List<IPlayerSession> readyPlayers;
if (LobbyEnabled)
{
@@ -196,6 +192,8 @@ namespace Content.Server.GameTicking
readyPlayers = _playersInLobby.Keys.ToList();
}
RunLevel = GameRunLevel.InRound;
// Get the profiles for each player for easier lookup.
var profiles = readyPlayers.ToDictionary(p => p, GetPlayerProfile);
@@ -222,6 +220,18 @@ namespace Content.Server.GameTicking
SpawnPlayer(player, job, false);
}
// Time to start the preset.
var preset = MakeGamePreset();
if (!preset.Start(assignedJobs.Keys.ToList()))
{
SetStartPreset(_configurationManager.GetCVar<string>("game.fallbackpreset"));
var newPreset = MakeGamePreset();
_chatManager.DispatchServerAnnouncement($"Failed to start {preset.ModeTitle} mode! Defaulting to {newPreset.ModeTitle}...");
if(!newPreset.Start(readyPlayers))
throw new ApplicationException("Fallback preset failed to start!");
}
_roundStartTimeSpan = IoCManager.Resolve<IGameTiming>().RealTime;
_sendStatusToAll();
}
@@ -255,15 +265,16 @@ namespace Content.Server.GameTicking
var listOfPlayerInfo = new List<RoundEndPlayerInfo>();
foreach(var ply in _playerManager.GetAllPlayers().OrderBy(p => p.Name))
{
if(ply.AttachedEntity.TryGetComponent<MindComponent>(out var mindComponent)
&& mindComponent.HasMind)
var mind = ply.ContentData().Mind;
if(mind != null)
{
var antag = mind.AllRoles.Any(role => role.Antag);
var playerEndRoundInfo = new RoundEndPlayerInfo()
{
PlayerOOCName = ply.Name,
PlayerICName = mindComponent.Mind.CurrentEntity.Name,
Role = mindComponent.Mind.AllRoles.FirstOrDefault()?.Name ?? Loc.GetString("Unkown"),
Antag = false
PlayerICName = mind.CurrentEntity.Name,
Role = antag ? mind.AllRoles.First(role => role.Antag).Name : mind.AllRoles.FirstOrDefault()?.Name ?? Loc.GetString("Unkown"),
Antag = antag
};
listOfPlayerInfo.Add(playerEndRoundInfo);
}
@@ -339,6 +350,7 @@ namespace Content.Server.GameTicking
{
"Sandbox" => typeof(PresetSandbox),
"DeathMatch" => typeof(PresetDeathMatch),
"Suspicion" => typeof(PresetSuspicion),
_ => throw new NotSupportedException()
});

10
Content.Server/Mobs/Mind.cs
View File

@@ -1,12 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Players;
using Robust.Server.Interfaces.GameObjects;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Network;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace Content.Server.Mobs
@@ -130,6 +133,13 @@ namespace Content.Server.Mobs
_roles.Remove(role);
}
public bool HasRole<T>() where T : Role
{
var t = typeof(T);
return _roles.Any(role => role.GetType() == t);
}
/// <summary>
/// Transfer this mind's control over to a new entity.
/// </summary>

8
Content.Server/Mobs/Role.cs
View File

@@ -1,6 +1,9 @@
// Hey look,
// Antag Datums.
using Content.Server.GameObjects.EntitySystems;
using Robust.Shared.Utility;
namespace Content.Server.Mobs
{
/// <summary>
@@ -20,6 +23,11 @@ namespace Content.Server.Mobs
/// </summary>
public abstract string Name { get; }
/// <summary>
/// Whether this role should be considered antagonistic or not.
/// </summary>
public abstract bool Antag { get; }
protected Role(Mind mind)
{
Mind = mind;

7
Content.Server/Mobs/Roles/Job.cs
View File

@@ -11,8 +11,9 @@ namespace Content.Server.Mobs.Roles
public JobPrototype Prototype { get; }
public override string Name { get; }
public override bool Antag => false;
public String StartingGear => Prototype.StartingGear;
public string StartingGear => Prototype.StartingGear;
public Job(Mind mind, JobPrototype jobPrototype) : base(mind)
{
@@ -25,9 +26,7 @@ namespace Content.Server.Mobs.Roles
base.Greet();
var chat = IoCManager.Resolve<IChatManager>();
chat.DispatchServerMessage(
Mind.Session,
String.Format("You're a new {0}. Do your best!", Name));
chat.DispatchServerMessage(Mind.Session, $"You're a new {Name}. Do your best!");
}
}

25
Content.Server/Mobs/Roles/SuspicionInnocentRole.cs Normal file
View File

@@ -0,0 +1,25 @@
using Content.Server.GameObjects;
using Content.Server.Interfaces.Chat;
using Robust.Shared.IoC;
using Robust.Shared.Utility;
namespace Content.Server.Mobs.Roles
{
public class SuspicionInnocentRole : Role
{
public SuspicionInnocentRole(Mind mind) : base(mind)
{
}
public override string Name => "Innocent";
public override bool Antag => false;
public override void Greet()
{
base.Greet();
var chat = IoCManager.Resolve<IChatManager>();
chat.DispatchServerMessage(Mind.Session, "You're an innocent!");
}
}
}

25
Content.Server/Mobs/Roles/SuspicionTraitorRole.cs Normal file
View File

@@ -0,0 +1,25 @@
using Content.Server.GameObjects;
using Content.Server.Interfaces.Chat;
using Robust.Shared.IoC;
using Robust.Shared.Utility;
namespace Content.Server.Mobs.Roles
{
public sealed class SuspicionTraitorRole : Role
{
public SuspicionTraitorRole(Mind mind) : base(mind)
{
}
public override string Name => "Traitor";
public override bool Antag => true;
public override void Greet()
{
base.Greet();
var chat = IoCManager.Resolve<IChatManager>();
chat.DispatchServerMessage(Mind.Session, "You're a traitor!");
}
}
}

24
Content.Server/Mobs/Roles/Traitor.cs
View File

@@ -1,24 +0,0 @@
using Content.Server.Interfaces.Chat;
using Robust.Shared.IoC;
namespace Content.Server.Mobs.Roles
{
public sealed class Traitor : Role
{
public Traitor(Mind mind) : base(mind)
{
}
public override string Name => "Traitor";
public override void Greet()
{
base.Greet();
var chat = IoCManager.Resolve<IChatManager>();
chat.DispatchServerMessage(
Mind.Session,
"You're a traitor. Go fuck something up. Or something. I don't care to be honest.");
}
}
}

2
Content.Shared/SharedGameTicker.cs
View File

@@ -138,7 +138,7 @@ namespace Content.Shared
public string GamemodeTitle;
public TimeSpan RoundDuration;
public uint PlayerCount;