Biome rework (#37735)
* DungeonData rework Back to fields, serializes better, just make new layers dumby. * wawawewa * Fix this * Fixes * Port the work over * wawawewa * zoom * Kinda workin * Adjust wawa * Unloading work * Ore + entitytable fixes Iterate every dungeon not just last. * Big shot * wawawewa * Fixes * true * Fixes # Conflicts: # Content.Server/Procedural/DungeonJob/DungeonJob.cs * wawawewa * Fixes * Fix * Lot of work * wawawewa * Fixing * eh? * a * Fix a heap of stuff * Better ignored check * Reserve tile changes * biome * changes * wawawewa * Fixes & snow * Shadow fixes * wawawewa * smol * Add layer API * More work * wawawewa * Preloads and running again * wawawewa * Modified * Replacements and command * Runtime support * werk * Fix expeds + dungeon alltiles * reh --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
This commit is contained in:
@@ -1,12 +1,11 @@
|
||||
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;
|
||||
@@ -111,7 +110,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
|
||||
};
|
||||
AddComp(mapUid, restricted);
|
||||
|
||||
_biome.EnsurePlanet(mapUid, _protoManager.Index<BiomeTemplatePrototype>("Continental"), seed);
|
||||
_biome.EnsurePlanet(mapUid, _protoManager.Index("BiomeContinental"), seed);
|
||||
|
||||
var grid = Comp<MapGridComponent>(mapUid);
|
||||
|
||||
@@ -199,7 +198,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
|
||||
var layer = lootLayers[layerIdx];
|
||||
lootLayers.RemoveSwap(layerIdx);
|
||||
|
||||
_biome.AddMarkerLayer(ent.Owner, biomeComp, layer.Id);
|
||||
_biome.AddLayer((ent.Owner, biomeComp), $"{layer.Id}-{i}", layer.Id);
|
||||
}
|
||||
|
||||
// - Mobs
|
||||
@@ -211,7 +210,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
|
||||
var layer = mobLayers[layerIdx];
|
||||
mobLayers.RemoveSwap(layerIdx);
|
||||
|
||||
_biome.AddMarkerLayer(ent.Owner, biomeComp, layer.Id);
|
||||
_biome.AddLayer((ent.Owner, biomeComp), $"{layer.Id}-{i}", layer.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user