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

Latejoin Job Selection (#1284)

Browse Source 
* UI version 1

* Latejoining

* cleanup

* missed a line

* Various fixes

* comment
This commit is contained in:
ike709
2020-07-10 08:27:55 -05:00
committed by GitHub
parent 4a772c9e59
commit 915fffb635
8 changed files with 159 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameTicking/GameTicker.JobController.cs
View File

@@ -124,7 +124,7 @@ namespace Content.Server.GameTicking
/// <summary>
/// Gets the remaining available job positions in the current round.
/// </summary>
private Dictionary<string, int> GetAvailablePositions()
public Dictionary<string, int> GetAvailablePositions()
{
var basePositions = GetBasePositions(false);

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

@@ -352,11 +352,11 @@ namespace Content.Server.GameTicking
_spawnObserver(player);
}
public void MakeJoinGame(IPlayerSession player)
public void MakeJoinGame(IPlayerSession player, string jobId = null)
{
if (!_playersInLobby.ContainsKey(player)) return;
SpawnPlayer(player);
SpawnPlayer(player, jobId);
}
public void ToggleReady(IPlayerSession player, bool ready)

30
Content.Server/GameTicking/GameTickerCommands.cs
View File

@@ -1,11 +1,15 @@
using System;
using Content.Server.GameTicking.GamePresets;
using System.Collections.Generic;
using Content.Server.GameTicking;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Players;
using Content.Shared.Jobs;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.IoC;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
using Robust.Shared.Log;
namespace Content.Server.GameTicking
{
@@ -175,12 +179,20 @@ namespace Content.Server.GameTicking
class JoinGameCommand : IClientCommand
{
#pragma warning disable 649
[Dependency] private IPrototypeManager _prototypeManager;
#pragma warning restore 649
public string Command => "joingame";
public string Description => "";
public string Help => "";
public JoinGameCommand()
{
IoCManager.InjectDependencies(this);
}
public void Execute(IConsoleShell shell, IPlayerSession player, string[] args)
{
var output = string.Join(".", args);
if (player == null)
{
return;
@@ -192,8 +204,22 @@ namespace Content.Server.GameTicking
shell.SendText(player, "Round has not started.");
return;
}
else if(ticker.RunLevel == GameRunLevel.InRound)
{
string ID = args[0];
var positions = ticker.GetAvailablePositions();
ticker.MakeJoinGame(player);
if(positions.GetValueOrDefault(ID, 0) == 0) //n < 0 is treated as infinite
{
var jobPrototype = _prototypeManager.Index<JobPrototype>(ID);
shell.SendText(player, $"{jobPrototype.Name} has no available slots.");
return;
}
ticker.MakeJoinGame(player, args[0].ToString());
return;
}
ticker.MakeJoinGame(player, null);
}
}