juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions 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

9
Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
View File

@@ -1,11 +1,12 @@
using System.Linq;
using Content.Server.Gateway.Components;
using Content.Server.Parallax;
using Content.Server.Procedural;
using Content.Shared.CCVar;
using Content.Shared.Dataset;
using Content.Shared.Maps;
using Content.Shared.Parallax.Biomes;
using Content.Shared.Procedural;
using Content.Shared.Procedural.Components;
using Content.Shared.Salvage;
using Robust.Shared.Configuration;
using Robust.Shared.Map;
@@ -110,7 +111,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
};
AddComp(mapUid, restricted);
_biome.EnsurePlanet(mapUid, _protoManager.Index("BiomeGrasslands"), seed);
_biome.EnsurePlanet(mapUid, _protoManager.Index<BiomeTemplatePrototype>("Continental"), seed);
var grid = Comp<MapGridComponent>(mapUid);
@@ -198,7 +199,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
var layer = lootLayers[layerIdx];
lootLayers.RemoveSwap(layerIdx);
_biome.AddLayer((ent.Owner, biomeComp), $"{layer.Id}-{i}", layer.Id);
_biome.AddMarkerLayer(ent.Owner, biomeComp, layer.Id);
}
// - Mobs
@@ -210,7 +211,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
var layer = mobLayers[layerIdx];
mobLayers.RemoveSwap(layerIdx);
_biome.AddLayer((ent.Owner, biomeComp), $"{layer.Id}-{i}", layer.Id);
_biome.AddMarkerLayer(ent.Owner, biomeComp, layer.Id);
}
}
}