This commit is contained in:
Pieter-Jan Briers
2018-05-27 23:27:32 +02:00
parent e36033a3ac
commit 77222824c3
5 changed files with 2751 additions and 10 deletions

View File

@@ -112,19 +112,19 @@ namespace Content.Server
case ServerRunLevel.PreGame: case ServerRunLevel.PreGame:
var timing = IoCManager.Resolve<IGameTiming>(); var timing = IoCManager.Resolve<IGameTiming>();
IoCManager.Resolve<IPlayerManager>().FallbackSpawnPoint = new LocalCoordinates(0, 0, GridId.DefaultGrid, new MapId(2)); var mainMap = new MapId(1);
var mainGrid = new GridId(1);
IoCManager.Resolve<IPlayerManager>().FallbackSpawnPoint = new LocalCoordinates(0, 0, mainGrid, mainMap);
var mapLoader = IoCManager.Resolve<IMapLoader>(); var mapLoader = IoCManager.Resolve<IMapLoader>();
var mapMan = IoCManager.Resolve<IMapManager>(); var mapMan = IoCManager.Resolve<IMapManager>();
var startTime = timing.RealTime; var startTime = timing.RealTime;
{ {
var newMap = mapMan.CreateMap(new MapId(2)); var newMap = mapMan.CreateMap(mainMap);
mapLoader.LoadBlueprint(newMap, new GridId(4), "Maps/Demo/DemoGrid.yaml"); mapLoader.LoadBlueprint(newMap, mainGrid, "Maps/stationstation.yml");
var grid = newMap.GetGrid(new GridId(4));
SpawnHelpers.SpawnLightTurret(grid, new Vector2(-15, 15));
} }
var timeSpan = timing.RealTime - startTime; var timeSpan = timing.RealTime - startTime;
Logger.Info($"Loaded map in {timeSpan.TotalMilliseconds:N2}ms."); Logger.Info($"Loaded map in {timeSpan.TotalMilliseconds:N2}ms.");

View File

@@ -50,9 +50,12 @@ namespace Content.Server.GameObjects
base.ExposeData(serializer); base.ExposeData(serializer);
serializer.DataField(ref orderedHands, "hands", new List<string>(0)); serializer.DataField(ref orderedHands, "hands", new List<string>(0));
foreach (var handsname in orderedHands) if (serializer.Reading)
{ {
AddHand(handsname); foreach (var handsname in orderedHands)
{
AddHand(handsname);
}
} }
} }

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,5 @@
- type: entity - type: entity
save: false
name: Urist McHands name: Urist McHands
id: HumanMob_Content id: HumanMob_Content
parent: __engine_human parent: __engine_human
@@ -24,4 +25,4 @@
- type: Icon - type: Icon
icon: Mob/observer.png icon: Mob/observer.png
- type: Physics - type: Physics
mass: 5 mass: 5

2
engine

Submodule engine updated: b761d9a1eb...00fe03b61b