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

Antag Datums. Oh also minds. (#100)

Browse Source 
AKA: Minds and there's a stupid basic roles framework.
This commit is contained in:
Pieter-Jan Briers
2018-08-21 00:59:04 +02:00
committed by Acruid
parent e8c4dc9a34
commit cd4442b81e
9 changed files with 523 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.Server/EntryPoint.cs
View File

@@ -28,11 +28,16 @@ using Content.Server.GameObjects.Components.Weapon.Melee;
using Content.Server.GameObjects.Components.Materials;
using Content.Server.GameObjects.Components.Stack;
using Content.Server.GameObjects.Components.Construction;
using Content.Server.Players;
using Content.Server.Mobs;
using Content.Server.GameObjects.Components.Mobs;
namespace Content.Server
{
public class EntryPoint : GameServer
{
const string PlayerPrototypeName = "HumanMob_Content";
private IBaseServer _server;
private IPlayerManager _players;
private IEntityManager entityManager;
@@ -40,6 +45,8 @@ namespace Content.Server
private bool _countdownStarted;
private GridLocalCoordinates SpawnPoint;
/// <inheritdoc />
public override void Init()
{
@@ -52,7 +59,6 @@ namespace Content.Server
_server.RunLevelChanged += HandleRunLevelChanged;
_players.PlayerStatusChanged += HandlePlayerStatusChanged;
_players.PlayerPrototypeName = "HumanMob_Content";
var factory = IoCManager.Resolve<IComponentFactory>();
@@ -106,6 +112,8 @@ namespace Content.Server
factory.Register<ConstructionComponent>();
factory.Register<ConstructorComponent>();
factory.RegisterIgnore("ConstructionGhost");
factory.Register<MindComponent>();
}
/// <inheritdoc />
@@ -132,7 +140,7 @@ namespace Content.Server
var newMap = mapMan.CreateMap();
var grid = mapLoader.LoadBlueprint(newMap, "Maps/stationstation.yml");
_players.FallbackSpawnPoint = new GridLocalCoordinates(Vector2.Zero, grid);
SpawnPoint = new GridLocalCoordinates(Vector2.Zero, grid);
var startTime = timing.RealTime;
var timeSpan = timing.RealTime - startTime;
@@ -152,10 +160,16 @@ namespace Content.Server
private void HandlePlayerStatusChanged(object sender, SessionStatusEventArgs args)
{
var session = args.Session;
switch (args.NewStatus)
{
case SessionStatus.Connected:
{
if (session.Data.ContentDataUncast == null)
{
session.Data.ContentDataUncast = new PlayerData(session.SessionId);
}
// timer time must be > tick length
Timer.Spawn(250, args.Session.JoinLobby);
@@ -183,15 +197,22 @@ namespace Content.Server
case SessionStatus.InGame:
{
//TODO: Check for existing mob and re-attach
var session = args.Session;
if (session.Data.AttachedEntityUid.HasValue
&& entityManager.TryGetEntity(session.Data.AttachedEntityUid.Value, out var entity))
var data = session.ContentData();
if (data.Mind == null)
{
session.AttachToEntity(entity);
// No mind yet (new session), make a new one.
data.Mind = new Mind(session.SessionId);
var mob = SpawnPlayerMob();
data.Mind.TransferTo(mob);
}
else
{
_players.SpawnPlayerMob(args.Session);
if (data.Mind.CurrentMob == null)
{
var mob = SpawnPlayerMob();
data.Mind.TransferTo(mob);
}
session.AttachToEntity(data.Mind.CurrentEntity);
}
chatManager.DispatchMessage(ChatChannel.Server, "Gamemode: Player joined Game!", args.Session.SessionId);
}
@@ -204,5 +225,10 @@ namespace Content.Server
break;
}
}
IEntity SpawnPlayerMob()
{
return entityManager.ForceSpawnEntityAt(PlayerPrototypeName, SpawnPoint);
}
}
}