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

Allow more lobby parameters to be configured.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-02-08 21:23:37 +01:00
parent c7043d20b1
commit 913b4d97a1
5 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,9 +48,6 @@ namespace Content.Server.GameTicking
private const string ObserverPrototypeName = "MobObserver";
private const string MapFile = "Maps/stationstation.yml";
// Seconds.
private const float LobbyDuration = 20;
[ViewVariables] private readonly List<GameRule> _gameRules = new List<GameRule>();
[ViewVariables] private readonly List<ManifestEntry> _manifest = new List<ManifestEntry>();
@@ -86,11 +83,17 @@ namespace Content.Server.GameTicking
public event Action<GameRunLevelChangedEventArgs> OnRunLevelChanged;
private TimeSpan LobbyDuration =>
TimeSpan.FromSeconds(_configurationManager.GetCVar<int>("game.lobbyduration"));
public void Initialize()
{
DebugTools.Assert(!_initialized);
_configurationManager.RegisterCVar("game.lobbyenabled", false, CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.lobbyduration", 20, CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.defaultpreset", "Sandbox", CVar.ARCHIVE);
_playerManager.PlayerStatusChanged += _handlePlayerStatusChanged;
_netManager.RegisterNetMessage<MsgTickerJoinLobby>(nameof(MsgTickerJoinLobby));
@@ -98,6 +101,8 @@ namespace Content.Server.GameTicking
_netManager.RegisterNetMessage<MsgTickerLobbyStatus>(nameof(MsgTickerLobbyStatus));
_netManager.RegisterNetMessage<MsgTickerLobbyInfo>(nameof(MsgTickerLobbyInfo));
SetStartPreset(_configurationManager.GetCVar<string>("game.defaultpreset"));
RestartRound();
_initialized = true;
@@ -131,7 +136,7 @@ namespace Content.Server.GameTicking
if (_playerManager.PlayerCount == 0)
_roundStartCountdownHasNotStartedYetDueToNoPlayers = true;
else
_roundStartTimeUtc = DateTime.UtcNow + TimeSpan.FromSeconds(LobbyDuration);
_roundStartTimeUtc = DateTime.UtcNow + LobbyDuration;
_sendStatusToAll();
}
@@ -258,6 +263,14 @@ namespace Content.Server.GameTicking
UpdateInfoText();
}
public void SetStartPreset(string type) =>
SetStartPreset(type switch
{
"Sandbox" => typeof(PresetSandbox),
"DeathMatch" => typeof(PresetDeathMatch),
_ => throw new NotSupportedException()
});
private IEntity _spawnPlayerMob(Job job, bool lateJoin = true)
{
GridCoordinates coordinates = lateJoin ? _getLateJoinSpawnPoint() : _getJobSpawnPoint(job.Prototype.ID);
@@ -272,6 +285,7 @@ namespace Content.Server.GameTicking
inventory.Equip(slot, equipmentEntity.GetComponent<ItemComponent>());
}
}
return entity;
}
@@ -313,7 +327,8 @@ namespace Content.Server.GameTicking
foreach (var entity in _entityManager.GetEntities(new TypeEntityQuery(typeof(SpawnPointComponent))))
{
var point = entity.GetComponent<SpawnPointComponent>();
if (point.SpawnType == SpawnPointType.Job && point.Job.ID == jobId) possiblePoints.Add(entity.Transform.GridPosition);
if (point.SpawnType == SpawnPointType.Job && point.Job.ID == jobId)
possiblePoints.Add(entity.Transform.GridPosition);
}
if (possiblePoints.Count != 0) location = _robustRandom.Pick(possiblePoints);
@@ -388,7 +403,7 @@ namespace Content.Server.GameTicking
if (LobbyEnabled && _roundStartCountdownHasNotStartedYetDueToNoPlayers)
{
_roundStartCountdownHasNotStartedYetDueToNoPlayers = false;
_roundStartTimeUtc = DateTime.UtcNow + TimeSpan.FromSeconds(LobbyDuration);
_roundStartTimeUtc = DateTime.UtcNow + LobbyDuration;
}
break;