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

Makes players spawn on job spawn markers on roundstart (#543)

Browse Source 
* Adds job type to spawn points, makes players spawn on job spawn markers on roundstart

* Update Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs

Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com>

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
This commit is contained in:
Víctor Aguilera Puerto
2020-01-23 17:31:47 +01:00
committed by Pieter-Jan Briers
parent 1996893a26
commit 09a27df6db
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,7 @@ namespace Content.Server.GameTicking
// Spawn everybody in!
foreach (var (player, job) in assignedJobs)
{
SpawnPlayer(player, job);
SpawnPlayer(player, job, false);
}
_sendStatusToAll();
@@ -258,9 +258,9 @@ namespace Content.Server.GameTicking
UpdateInfoText();
}
private IEntity _spawnPlayerMob(Job job)
private IEntity _spawnPlayerMob(Job job, bool lateJoin = true)
{
var entity = _entityManager.SpawnEntityAt(PlayerPrototypeName, _getLateJoinSpawnPoint());
var entity = _entityManager.SpawnEntityAt(PlayerPrototypeName, lateJoin ? _getLateJoinSpawnPoint() : _getJobSpawnPoint(job.Prototype.ID));
if (entity.TryGetComponent(out InventoryComponent inventory))
{
var gear = _prototypeManager.Index<StartingGearPrototype>(job.StartingGear).Equipment;
@@ -271,7 +271,6 @@ namespace Content.Server.GameTicking
inventory.Equip(slot, equipmentEntity.GetComponent<ItemComponent>());
}
}
return entity;
}
@@ -304,6 +303,22 @@ namespace Content.Server.GameTicking
return location;
}
private GridCoordinates _getJobSpawnPoint(string jobId)
{
var location = _spawnPoint;
var possiblePoints = new List<GridCoordinates>();
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 (possiblePoints.Count != 0) location = _robustRandom.Pick(possiblePoints);
return location;
}
/// <summary>
/// Cleanup that has to run to clear up anything from the previous round.
/// Stuff like wiping the previous map clean.
@@ -416,7 +431,7 @@ namespace Content.Server.GameTicking
}
}
private void SpawnPlayer(IPlayerSession session, string jobId = null)
private void SpawnPlayer(IPlayerSession session, string jobId = null, bool lateJoin = true)
{
var character = (HumanoidCharacterProfile) _prefsManager
.GetPreferences(session.SessionId.Username)
@@ -438,7 +453,7 @@ namespace Content.Server.GameTicking
var job = new Job(data.Mind, jobPrototype);
data.Mind.AddRole(job);
var mob = _spawnPlayerMob(job);
var mob = _spawnPlayerMob(job, lateJoin);
data.Mind.TransferTo(mob);
ApplyCharacterProfile(mob, character);