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

Revert biome rework (#38724)

Browse Source 
* Revert "Fix world generation (#38713)"

This reverts commit 10fa6ff4af.

* Revert "Biome rework (#37735)"

This reverts commit fe7b96147c.
This commit is contained in:
Pieter-Jan Briers
2025-07-03 20:48:04 +02:00
committed by GitHub
parent 047a49a505
commit e99fc501a6
116 changed files with 3541 additions and 3009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Procedural/DungeonSystem.cs
View File

@@ -199,8 +199,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
MapGridComponent grid,
Vector2i position,
int seed,
EntityCoordinates? coordinates = null,
HashSet<Vector2i>? reservedTiles = null)
EntityCoordinates? coordinates = null)
{
var cancelToken = new CancellationTokenSource();
var job = new DungeonJob.DungeonJob(
@@ -222,20 +221,18 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
seed,
position,
coordinates,
cancelToken.Token,
reservedTiles);
cancelToken.Token);
_dungeonJobs.Add(job, cancelToken);
_dungeonJobQueue.EnqueueJob(job);
}
public async Task<(List<Dungeon>, DungeonData)> GenerateDungeonAsync(
public async Task<List<Dungeon>> GenerateDungeonAsync(
DungeonConfig gen,
EntityUid gridUid,
MapGridComponent grid,
Vector2i position,
int seed,
HashSet<Vector2i>? reservedTiles = null)
int seed)
{
var cancelToken = new CancellationTokenSource();
var job = new DungeonJob.DungeonJob(
@@ -257,8 +254,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
seed,
position,
null,
cancelToken.Token,
reservedTiles);
cancelToken.Token);
_dungeonJobs.Add(job, cancelToken);
_dungeonJobQueue.EnqueueJob(job);
@@ -269,7 +265,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
throw job.Exception;
}
return job.Result;
return job.Result!;
}
public Angle GetDungeonRotation(int seed)