tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add space dungeon support (#14619)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-24 13:19:29 +11:00
committed by GitHub
parent 10f2443286
commit 56d7fe4f62
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Procedural/DungeonJob.cs
View File

@@ -6,6 +6,7 @@ using Content.Server.Decals;
using Content.Shared.Procedural; using Content.Shared.Procedural;
using Content.Shared.Procedural.DungeonGenerators; using Content.Shared.Procedural.DungeonGenerators;
using Content.Shared.Procedural.PostGeneration; using Content.Shared.Procedural.PostGeneration;
using Robust.Server.Physics;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
@@ -76,6 +77,7 @@ public sealed partial class DungeonJob : Job<Dungeon>
{ {
Dungeon dungeon; Dungeon dungeon;
_sawmill.Info($"Generating dungeon {_gen.ID} with seed {_seed} on {_entManager.ToPrettyString(_gridUid)}"); _sawmill.Info($"Generating dungeon {_gen.ID} with seed {_seed} on {_entManager.ToPrettyString(_gridUid)}");
_grid.CanSplit = false;
switch (_gen.Generator) switch (_gen.Generator)
{ {
@@ -126,6 +128,8 @@ public sealed partial class DungeonJob : Job<Dungeon>
ValidateResume(); ValidateResume();
} }
_grid.CanSplit = true;
_entManager.System<GridFixtureSystem>().CheckSplits(_gridUid);
return dungeon; return dungeon;
} }

18
Content.Server/Procedural/DungeonSystem.Commands.cs
View File

@@ -30,13 +30,6 @@ public sealed partial class DungeonSystem
} }
var mapId = new MapId(mapInt); var mapId = new MapId(mapInt);
var mapUid = _mapManager.GetMapEntityId(mapId);
if (!TryComp<MapGridComponent>(mapUid, out var mapGrid))
{
shell.WriteError(Loc.GetString("cmd-dungen-mapgrid"));
return;
}
if (!_prototype.TryIndex<DungeonConfigPrototype>(args[1], out var dungeon)) if (!_prototype.TryIndex<DungeonConfigPrototype>(args[1], out var dungeon))
{ {
@@ -51,6 +44,15 @@ public sealed partial class DungeonSystem
} }
var position = new Vector2(posX, posY); var position = new Vector2(posX, posY);
var dungeonUid = _mapManager.GetMapEntityId(mapId);
if (!TryComp<MapGridComponent>(dungeonUid, out var dungeonGrid))
{
dungeonUid = EntityManager.CreateEntityUninitialized(null, new EntityCoordinates(dungeonUid, position));
dungeonGrid = EntityManager.AddComponent<MapGridComponent>(dungeonUid);
EntityManager.InitializeAndStartEntity(dungeonUid, mapId);
}
int seed; int seed;
if (args.Length >= 5) if (args.Length >= 5)
@@ -67,7 +69,7 @@ public sealed partial class DungeonSystem
} }
shell.WriteLine(Loc.GetString("cmd-dungen-start", ("seed", seed))); shell.WriteLine(Loc.GetString("cmd-dungen-start", ("seed", seed)));
GenerateDungeon(dungeon, mapUid, mapGrid, position, seed); GenerateDungeon(dungeon, dungeonUid, dungeonGrid, position, seed);
} }
private CompletionResult CompletionCallback(IConsoleShell shell, string[] args) private CompletionResult CompletionCallback(IConsoleShell shell, string[] args)

2
Resources/Locale/en-US/procedural/command.ftl
View File

@@ -1,4 +1,4 @@
cmd-dungen-desc = Generates a procedural dungeon with the specified preset, position, and seed. cmd-dungen-desc = Generates a procedural dungeon with the specified preset, position, and seed. Will spawn in space if the MapId doesn't have MapGridComponent.
cmd-dungen-help = dungen <MapId> <DungeonPreset> <PosX> <PosY> [seed] cmd-dungen-help = dungen <MapId> <DungeonPreset> <PosX> <PosY> [seed]
cmd-dungen-arg-count = Require 4 args. cmd-dungen-arg-count = Require 4 args.
cmd-dungen-map-parse = Unable to parse MapId. cmd-dungen-map-parse = Unable to parse MapId.