Adds shoddy death match system.
It barely even works but oh well.
This commit is contained in:
@@ -67,7 +67,6 @@ namespace Content.Client.GameObjects
|
|||||||
{
|
{
|
||||||
base.OnAdd();
|
base.OnAdd();
|
||||||
|
|
||||||
IoCManager.InjectDependencies(this);
|
|
||||||
_window = new SpeciesWindow();
|
_window = new SpeciesWindow();
|
||||||
|
|
||||||
EffectsDictionary = new Dictionary<ScreenEffects, Overlay>()
|
EffectsDictionary = new Dictionary<ScreenEffects, Overlay>()
|
||||||
|
|||||||
@@ -141,7 +141,10 @@
|
|||||||
<Compile Include="GameObjects\EntitySystems\WelderSystem.cs" />
|
<Compile Include="GameObjects\EntitySystems\WelderSystem.cs" />
|
||||||
<Compile Include="GameObjects\EntitySystems\TemperatureSystem.cs" />
|
<Compile Include="GameObjects\EntitySystems\TemperatureSystem.cs" />
|
||||||
<Compile Include="GameTicking\GamePreset.cs" />
|
<Compile Include="GameTicking\GamePreset.cs" />
|
||||||
|
<Compile Include="GameTicking\GamePresets\PresetDeathMatch.cs" />
|
||||||
<Compile Include="GameTicking\GamePresets\PresetTraitor.cs" />
|
<Compile Include="GameTicking\GamePresets\PresetTraitor.cs" />
|
||||||
|
<Compile Include="GameTicking\GameRule.cs" />
|
||||||
|
<Compile Include="GameTicking\GameRules\RuleDeathMatch.cs" />
|
||||||
<Compile Include="GameTicking\GameTicker.cs" />
|
<Compile Include="GameTicking\GameTicker.cs" />
|
||||||
<Compile Include="Interfaces\Chat\IChatCommand.cs" />
|
<Compile Include="Interfaces\Chat\IChatCommand.cs" />
|
||||||
<Compile Include="Interfaces\Chat\IChatManager.cs" />
|
<Compile Include="Interfaces\Chat\IChatManager.cs" />
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ namespace Content.Server.GameObjects
|
|||||||
void EnterState(IEntity entity);
|
void EnterState(IEntity entity);
|
||||||
|
|
||||||
void ExitState(IEntity entity);
|
void ExitState(IEntity entity);
|
||||||
|
|
||||||
|
bool IsConscious { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -28,6 +30,8 @@ namespace Content.Server.GameObjects
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IsConscious => true;
|
||||||
|
|
||||||
bool IActionBlocker.CanInteract()
|
bool IActionBlocker.CanInteract()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
@@ -57,6 +61,8 @@ namespace Content.Server.GameObjects
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IsConscious => false;
|
||||||
|
|
||||||
bool IActionBlocker.CanInteract()
|
bool IActionBlocker.CanInteract()
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
@@ -96,6 +102,8 @@ namespace Content.Server.GameObjects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IsConscious => false;
|
||||||
|
|
||||||
bool IActionBlocker.CanInteract()
|
bool IActionBlocker.CanInteract()
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -112,6 +112,24 @@ namespace Content.Server.GameObjects
|
|||||||
CurrentDamageState.EnterState(Owner);
|
CurrentDamageState.EnterState(Owner);
|
||||||
|
|
||||||
currentstate = threshold;
|
currentstate = threshold;
|
||||||
|
|
||||||
|
Owner.RaiseEvent(new MobDamageStateChangedMessage(this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Fired when <see cref="SpeciesComponent.CurrentDamageState"/> changes.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class MobDamageStateChangedMessage : EntitySystemMessage
|
||||||
|
{
|
||||||
|
public MobDamageStateChangedMessage(SpeciesComponent species)
|
||||||
|
{
|
||||||
|
Species = species;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The species component that was changed.
|
||||||
|
/// </summary>
|
||||||
|
public SpeciesComponent Species { get; }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,18 @@
|
|||||||
|
using JetBrains.Annotations;
|
||||||
|
|
||||||
namespace Content.Server.GameTicking
|
namespace Content.Server.GameTicking
|
||||||
{
|
{
|
||||||
public class GameRule
|
[PublicAPI]
|
||||||
|
public abstract class GameRule
|
||||||
{
|
{
|
||||||
|
public virtual void Added()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void Removed()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,112 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
using Content.Server.GameObjects;
|
||||||
|
using Content.Server.Interfaces.Chat;
|
||||||
|
using Content.Server.Interfaces.GameTicking;
|
||||||
|
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 Timer = Robust.Shared.Timers.Timer;
|
||||||
|
|
||||||
namespace Content.Server.GameTicking.GameRules
|
namespace Content.Server.GameTicking.GameRules
|
||||||
{
|
{
|
||||||
public class DeathMatch
|
/// <summary>
|
||||||
|
/// Simple GameRule that will do a free-for-all death match.
|
||||||
|
/// Kill everybody else to win.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class RuleDeathMatch : GameRule, IEntityEventSubscriber
|
||||||
{
|
{
|
||||||
|
private static readonly TimeSpan DeadCheckDelay = TimeSpan.FromSeconds(5);
|
||||||
|
|
||||||
|
#pragma warning disable 649
|
||||||
|
[Dependency] private readonly IPlayerManager _playerManager;
|
||||||
|
[Dependency] private readonly IEntityManager _entityManager;
|
||||||
|
[Dependency] private readonly IChatManager _chatManager;
|
||||||
|
[Dependency] private readonly IGameTicker _gameTicker;
|
||||||
|
#pragma warning restore 649
|
||||||
|
|
||||||
|
private CancellationTokenSource _checkTimerCancel;
|
||||||
|
|
||||||
|
public override void Added()
|
||||||
|
{
|
||||||
|
_chatManager.DispatchServerAnnouncement("The game is now a death match. Kill everybody else to win!");
|
||||||
|
|
||||||
|
_entityManager.SubscribeEvent<MobDamageStateChangedMessage>(_onMobDamageStateChanged, this);
|
||||||
|
_playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Removed()
|
||||||
|
{
|
||||||
|
base.Removed();
|
||||||
|
|
||||||
|
_entityManager.UnsubscribeEvent<MobDamageStateChangedMessage>(this);
|
||||||
|
_playerManager.PlayerStatusChanged -= PlayerManagerOnPlayerStatusChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _onMobDamageStateChanged(object sender, MobDamageStateChangedMessage message)
|
||||||
|
{
|
||||||
|
_runDelayedCheck();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _checkForWinner()
|
||||||
|
{
|
||||||
|
_checkTimerCancel = null;
|
||||||
|
|
||||||
|
IPlayerSession winner = null;
|
||||||
|
foreach (var playerSession in _playerManager.GetAllPlayers())
|
||||||
|
{
|
||||||
|
if (playerSession.AttachedEntity == null
|
||||||
|
|| !playerSession.AttachedEntity.TryGetComponent(out SpeciesComponent species))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!species.CurrentDamageState.IsConscious)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (winner != null)
|
||||||
|
{
|
||||||
|
// Found a second person alive, nothing decided yet!
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
winner = playerSession;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (winner == null)
|
||||||
|
{
|
||||||
|
_chatManager.DispatchServerAnnouncement("Everybody is dead, it's a stalemate!");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// We have a winner!
|
||||||
|
_chatManager.DispatchServerAnnouncement($"{winner} wins the death match!");
|
||||||
|
}
|
||||||
|
|
||||||
|
_chatManager.DispatchServerAnnouncement($"Restarting in 10 seconds.");
|
||||||
|
|
||||||
|
Timer.Spawn(TimeSpan.FromSeconds(10), () => _gameTicker.RestartRound());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PlayerManagerOnPlayerStatusChanged(object sender, SessionStatusEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.NewStatus == SessionStatus.Disconnected)
|
||||||
|
{
|
||||||
|
_runDelayedCheck();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _runDelayedCheck()
|
||||||
|
{
|
||||||
|
_checkTimerCancel?.Cancel();
|
||||||
|
_checkTimerCancel = new CancellationTokenSource();
|
||||||
|
|
||||||
|
Timer.Spawn(DeadCheckDelay, _checkForWinner, _checkTimerCancel.Token);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,6 +79,8 @@ namespace Content.Server.GameTicking
|
|||||||
|
|
||||||
private readonly Random _spawnRandom = new Random();
|
private readonly Random _spawnRandom = new Random();
|
||||||
|
|
||||||
|
[ViewVariables] private readonly List<GameRule> _gameRules = new List<GameRule>();
|
||||||
|
|
||||||
#pragma warning disable 649
|
#pragma warning disable 649
|
||||||
[Dependency] private IEntityManager _entityManager;
|
[Dependency] private IEntityManager _entityManager;
|
||||||
[Dependency] private IMapManager _mapManager;
|
[Dependency] private IMapManager _mapManager;
|
||||||
@@ -88,6 +90,7 @@ namespace Content.Server.GameTicking
|
|||||||
[Dependency] private IPlayerManager _playerManager;
|
[Dependency] private IPlayerManager _playerManager;
|
||||||
[Dependency] private IChatManager _chatManager;
|
[Dependency] private IChatManager _chatManager;
|
||||||
[Dependency] private IServerNetManager _netManager;
|
[Dependency] private IServerNetManager _netManager;
|
||||||
|
[Dependency] private IDynamicTypeFactory _dynamicTypeFactory;
|
||||||
#pragma warning restore 649
|
#pragma warning restore 649
|
||||||
|
|
||||||
public void Initialize()
|
public void Initialize()
|
||||||
@@ -150,7 +153,7 @@ namespace Content.Server.GameTicking
|
|||||||
RunLevel = GameRunLevel.InRound;
|
RunLevel = GameRunLevel.InRound;
|
||||||
|
|
||||||
// TODO: Allow other presets to be selected.
|
// TODO: Allow other presets to be selected.
|
||||||
var preset = new PresetTraitor();
|
var preset = _dynamicTypeFactory.CreateInstance<PresetTraitor>();
|
||||||
preset.Start();
|
preset.Start();
|
||||||
|
|
||||||
foreach (var (playerSession, ready) in _playersInLobby.ToList())
|
foreach (var (playerSession, ready) in _playersInLobby.ToList())
|
||||||
@@ -219,6 +222,30 @@ namespace Content.Server.GameTicking
|
|||||||
_netManager.ServerSendMessage(_getStatusMsg(player), player.ConnectedClient);
|
_netManager.ServerSendMessage(_getStatusMsg(player), player.ConnectedClient);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public T AddGameRule<T>() where T : GameRule, new()
|
||||||
|
{
|
||||||
|
var instance = _dynamicTypeFactory.CreateInstance<T>();
|
||||||
|
|
||||||
|
_gameRules.Add(instance);
|
||||||
|
instance.Added();
|
||||||
|
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveGameRule(GameRule rule)
|
||||||
|
{
|
||||||
|
if (_gameRules.Contains(rule))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
rule.Removed();
|
||||||
|
|
||||||
|
_gameRules.Remove(rule);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<GameRule> ActiveGameRules => _gameRules;
|
||||||
|
|
||||||
private IEntity _spawnPlayerMob()
|
private IEntity _spawnPlayerMob()
|
||||||
{
|
{
|
||||||
var entity = _entityManager.ForceSpawnEntityAt(PlayerPrototypeName, _getLateJoinSpawnPoint());
|
var entity = _entityManager.ForceSpawnEntityAt(PlayerPrototypeName, _getLateJoinSpawnPoint());
|
||||||
@@ -290,6 +317,14 @@ namespace Content.Server.GameTicking
|
|||||||
{
|
{
|
||||||
unCastData.ContentData().WipeMind();
|
unCastData.ContentData().WipeMind();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clear up any game rules.
|
||||||
|
foreach (var rule in _gameRules)
|
||||||
|
{
|
||||||
|
rule.Removed();
|
||||||
|
}
|
||||||
|
|
||||||
|
_gameRules.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _preRoundSetup()
|
private void _preRoundSetup()
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using Content.Server.GameTicking;
|
using Content.Server.GameTicking;
|
||||||
using Robust.Server.Interfaces.Player;
|
using Robust.Server.Interfaces.Player;
|
||||||
using Robust.Server.Player;
|
using Robust.Server.Player;
|
||||||
@@ -27,5 +28,10 @@ namespace Content.Server.Interfaces.GameTicking
|
|||||||
void MakeObserve(IPlayerSession player);
|
void MakeObserve(IPlayerSession player);
|
||||||
void MakeJoinGame(IPlayerSession player);
|
void MakeJoinGame(IPlayerSession player);
|
||||||
void ToggleReady(IPlayerSession player, bool ready);
|
void ToggleReady(IPlayerSession player, bool ready);
|
||||||
|
|
||||||
|
// GameRule system.
|
||||||
|
T AddGameRule<T>() where T : GameRule, new();
|
||||||
|
void RemoveGameRule(GameRule rule);
|
||||||
|
IEnumerable<GameRule> ActiveGameRules { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user