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

Salvage dungeons (#14520)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-10 16:41:22 +11:00
committed by GitHub
parent 214ca06997
commit 6157dfa3c0
145 changed files with 24649 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

338
Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs
View File

@@ -1,8 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.Decals;
using Content.Shared.Maps;
using Robust.Shared.Console;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
@@ -20,8 +17,6 @@ public abstract class SharedBiomeSystem : EntitySystem
protected const byte ChunkSize = 8;
// TODO: After I wrote all of this FastNoiseLite got ported so this needs updating for that don't @ me
public override void Initialize()
{
base.Initialize();
@@ -35,6 +30,8 @@ public abstract class SharedBiomeSystem : EntitySystem
return;
component.Seed = state.Seed;
component.BiomePrototype = state.Prototype;
component.Noise.SetSeed(component.Seed);
}
private void OnBiomeGetState(EntityUid uid, BiomeComponent component, ref ComponentGetState args)
@@ -86,9 +83,9 @@ public abstract class SharedBiomeSystem : EntitySystem
throw new ArgumentOutOfRangeException();
}
public bool TryGetBiomeTile(EntityUid uid, MapGridComponent grid, Vector2i indices, [NotNullWhen(true)] out Tile? tile)
public bool TryGetBiomeTile(EntityUid uid, MapGridComponent grid, FastNoiseLite noise, Vector2i indices, [NotNullWhen(true)] out Tile? tile)
{
if (grid.TryGetTileRef(indices, out var tileRef))
if (grid.TryGetTileRef(indices, out var tileRef) && !tileRef.Tile.IsEmpty)
{
tile = tileRef.Tile;
return true;
@@ -101,13 +98,13 @@ public abstract class SharedBiomeSystem : EntitySystem
}
return TryGetBiomeTile(indices, ProtoManager.Index<BiomePrototype>(biome.BiomePrototype),
new FastNoise(biome.Seed), grid, out tile);
biome.Noise, grid, out tile);
}
/// <summary>
/// Tries to get the tile, real or otherwise, for the specified indices.
/// </summary>
public bool TryGetBiomeTile(Vector2i indices, BiomePrototype prototype, FastNoise seed, MapGridComponent? grid, [NotNullWhen(true)] out Tile? tile)
public bool TryGetBiomeTile(Vector2i indices, BiomePrototype prototype, FastNoiseLite noise, MapGridComponent? grid, [NotNullWhen(true)] out Tile? tile)
{
if (grid?.TryGetTileRef(indices, out var tileRef) == true && !tileRef.Tile.IsEmpty)
{
@@ -115,7 +112,7 @@ public abstract class SharedBiomeSystem : EntitySystem
return true;
}
var oldFrequency = seed.GetFrequency();
var oldSeed = noise.GetSeed();
for (var i = prototype.Layers.Count - 1; i >= 0; i--)
{
@@ -124,179 +121,31 @@ public abstract class SharedBiomeSystem : EntitySystem
if (layer is not BiomeTileLayer tileLayer)
continue;
seed.SetFrequency(tileLayer.Frequency);
SetNoise(noise, oldSeed, layer.Noise);
if (TryGetTile(indices, seed, tileLayer.Threshold, ProtoManager.Index<ContentTileDefinition>(tileLayer.Tile), tileLayer.Variants, out tile))
if (TryGetTile(indices, noise, tileLayer.Threshold, ProtoManager.Index<ContentTileDefinition>(tileLayer.Tile), tileLayer.Variants, out tile))
{
seed.SetFrequency(oldFrequency);
noise.SetSeed(oldSeed);
return true;
}
}
seed.SetFrequency(oldFrequency);
noise.SetSeed(oldSeed);
tile = null;
return false;
}
/// <summary>
/// Tries to get the relevant entity for this tile.
/// </summary>
protected bool TryGetEntity(Vector2i indices, BiomePrototype prototype, FastNoise noise, MapGridComponent grid,
[NotNullWhen(true)] out string? entity)
{
if (!TryGetBiomeTile(indices, prototype, noise, grid, out var tileRef))
{
entity = null;
return false;
}
var tileId = TileDefManager[tileRef.Value.TypeId].ID;
var oldFrequency = noise.GetFrequency();
var seed = noise.GetSeed();
for (var i = prototype.Layers.Count - 1; i >= 0; i--)
{
var layer = prototype.Layers[i];
var offset = 0;
// Decals might block entity so need to check if there's one in front of us.
switch (layer)
{
case IBiomeWorldLayer worldLayer:
if (!worldLayer.AllowedTiles.Contains(tileId))
continue;
offset = worldLayer.SeedOffset;
noise.SetSeed(seed + offset);
noise.SetFrequency(worldLayer.Frequency);
break;
default:
continue;
}
var value = (noise.GetCellular(indices.X, indices.Y) + 1f) / 2f;
if (value < layer.Threshold)
{
DebugTools.Assert(value is <= 1f and >= 0f);
continue;
}
if (layer is not BiomeEntityLayer biomeLayer)
{
entity = null;
noise.SetFrequency(oldFrequency);
noise.SetSeed(seed);
return false;
}
entity = Pick(biomeLayer.Entities, (noise.GetSimplex(indices.X, indices.Y) + 1f) / 2f);
noise.SetFrequency(oldFrequency);
noise.SetSeed(seed);
return true;
}
noise.SetFrequency(oldFrequency);
noise.SetSeed(seed);
entity = null;
return false;
}
/// <summary>
/// Tries to get the relevant decals for this tile.
/// </summary>
public bool TryGetDecals(Vector2i indices, BiomePrototype prototype, FastNoise noise, MapGridComponent grid,
[NotNullWhen(true)] out List<(string ID, Vector2 Position)>? decals)
{
if (!TryGetBiomeTile(indices, prototype, noise, grid, out var tileRef))
{
decals = null;
return false;
}
var tileId = TileDefManager[tileRef.Value.TypeId].ID;
var oldFrequency = noise.GetFrequency();
var seed = noise.GetSeed();
for (var i = prototype.Layers.Count - 1; i >= 0; i--)
{
var layer = prototype.Layers[i];
var offset = 0;
// Entities might block decal so need to check if there's one in front of us.
switch (layer)
{
case IBiomeWorldLayer worldLayer:
if (!worldLayer.AllowedTiles.Contains(tileId))
continue;
offset = worldLayer.SeedOffset;
noise.SetSeed(seed + offset);
noise.SetFrequency(worldLayer.Frequency);
break;
default:
continue;
}
// Check if the other layer should even render, if not then keep going.
if (layer is not BiomeDecalLayer decalLayer)
{
if ((noise.GetCellular(indices.X, indices.Y) + 1f) / 2f < layer.Threshold)
continue;
decals = null;
noise.SetFrequency(oldFrequency);
noise.SetSeed(seed);
return false;
}
decals = new List<(string ID, Vector2 Position)>();
for (var x = 0; x < decalLayer.Divisions; x++)
{
for (var y = 0; y < decalLayer.Divisions; y++)
{
var index = new Vector2(indices.X + x * 1f / decalLayer.Divisions, indices.Y + y * 1f / decalLayer.Divisions);
var decalValue = (noise.GetCellular(index.X, index.Y) + 1f) / 2f;
if (decalValue < decalLayer.Threshold)
continue;
DebugTools.Assert(decalValue is <= 1f and >= 0f);
decals.Add((Pick(decalLayer.Decals, (noise.GetSimplex(index.X, index.Y) + 1f) / 2f), index));
}
}
noise.SetFrequency(oldFrequency);
noise.SetSeed(seed);
// Check other layers
if (decals.Count == 0)
continue;
return true;
}
noise.SetFrequency(oldFrequency);
noise.SetSeed(seed);
decals = null;
return false;
}
/// <summary>
/// Gets the underlying biome tile, ignoring any existing tile that may be there.
/// </summary>
public bool TryGetTile(Vector2i indices, FastNoise seed, float threshold, ContentTileDefinition tileDef, List<byte>? variants, [NotNullWhen(true)] out Tile? tile)
private bool TryGetTile(Vector2i indices, FastNoiseLite seed, float threshold, ContentTileDefinition tileDef, List<byte>? variants, [NotNullWhen(true)] out Tile? tile)
{
if (threshold > 0f)
{
var found = (seed.GetSimplexFractal(indices.X, indices.Y) + 1f) / 2f;
var found = seed.GetNoise(indices.X, indices.Y);
if (found < threshold)
{
tile = null;
return false;
}
if (found < threshold)
{
tile = null;
return false;
}
byte variant = 0;
@@ -305,7 +154,7 @@ public abstract class SharedBiomeSystem : EntitySystem
// Pick a variant tile if they're available as well
if (variantCount > 1)
{
var variantValue = (seed.GetSimplex(indices.X * 2f, indices.Y * 2f) + 1f) / 2f;
var variantValue = (seed.GetNoise(indices.X * 8, indices.Y * 8, variantCount) + 1f) / 2f;
variant = (byte) Pick(variantCount, variantValue);
if (variants != null)
@@ -318,6 +167,157 @@ public abstract class SharedBiomeSystem : EntitySystem
return true;
}
/// <summary>
/// Tries to get the relevant entity for this tile.
/// </summary>
protected bool TryGetEntity(Vector2i indices, BiomePrototype prototype, FastNoiseLite noise, MapGridComponent grid,
[NotNullWhen(true)] out string? entity)
{
if (!TryGetBiomeTile(indices, prototype, noise, grid, out var tileRef))
{
entity = null;
return false;
}
var tileId = TileDefManager[tileRef.Value.TypeId].ID;
var oldSeed = noise.GetSeed();
for (var i = prototype.Layers.Count - 1; i >= 0; i--)
{
var layer = prototype.Layers[i];
// Decals might block entity so need to check if there's one in front of us.
switch (layer)
{
case IBiomeWorldLayer worldLayer:
if (!worldLayer.AllowedTiles.Contains(tileId))
continue;
break;
default:
continue;
}
SetNoise(noise, oldSeed, layer.Noise);
var value = noise.GetNoise(indices.X, indices.Y);
if (value < layer.Threshold)
{
continue;
}
if (layer is not BiomeEntityLayer biomeLayer)
{
entity = null;
noise.SetSeed(oldSeed);
return false;
}
entity = Pick(biomeLayer.Entities, (noise.GetNoise(indices.X, indices.Y, i) + 1f) / 2f);
noise.SetSeed(oldSeed);
return true;
}
noise.SetSeed(oldSeed);
entity = null;
return false;
}
/// <summary>
/// Tries to get the relevant decals for this tile.
/// </summary>
public bool TryGetDecals(Vector2i indices, BiomePrototype prototype, FastNoiseLite noise, MapGridComponent grid,
[NotNullWhen(true)] out List<(string ID, Vector2 Position)>? decals)
{
if (!TryGetBiomeTile(indices, prototype, noise, grid, out var tileRef))
{
decals = null;
return false;
}
var tileId = TileDefManager[tileRef.Value.TypeId].ID;
var oldSeed = noise.GetSeed();
for (var i = prototype.Layers.Count - 1; i >= 0; i--)
{
var layer = prototype.Layers[i];
// Entities might block decal so need to check if there's one in front of us.
switch (layer)
{
case IBiomeWorldLayer worldLayer:
if (!worldLayer.AllowedTiles.Contains(tileId))
continue;
break;
default:
continue;
}
SetNoise(noise, oldSeed, layer.Noise);
// Check if the other layer should even render, if not then keep going.
if (layer is not BiomeDecalLayer decalLayer)
{
if (noise.GetNoise(indices.X, indices.Y) < layer.Threshold)
continue;
decals = null;
noise.SetSeed(oldSeed);
return false;
}
decals = new List<(string ID, Vector2 Position)>();
for (var x = 0; x < decalLayer.Divisions; x++)
{
for (var y = 0; y < decalLayer.Divisions; y++)
{
var index = new Vector2(indices.X + x * 1f / decalLayer.Divisions, indices.Y + y * 1f / decalLayer.Divisions);
var decalValue = noise.GetNoise(index.X, index.Y);
if (decalValue < decalLayer.Threshold)
continue;
decals.Add((Pick(decalLayer.Decals, (noise.GetNoise(indices.X, indices.Y, x + y * decalLayer.Divisions) + 1f) / 2f), index));
}
}
// Check other layers
if (decals.Count == 0)
continue;
noise.SetSeed(oldSeed);
return true;
}
noise.SetSeed(oldSeed);
decals = null;
return false;
}
private void SetNoise(FastNoiseLite noise, int oldSeed, FastNoiseLite data)
{
// General
noise.SetSeed(oldSeed + data.GetSeed());
noise.SetFrequency(data.GetFrequency());
noise.SetNoiseType(data.GetNoiseType());
noise.GetRotationType3D();
// Fractal
noise.SetFractalType(data.GetFractalType());
noise.SetFractalOctaves(data.GetFractalOctaves());
noise.SetFractalLacunarity(data.GetFractalLacunarity());
// Cellular
noise.SetCellularDistanceFunction(data.GetCellularDistanceFunction());
noise.SetCellularReturnType(data.GetCellularReturnType());
noise.SetCellularJitter(data.GetCellularJitter());
// Domain warps require separate noise
}
[Serializable, NetSerializable]
private sealed class BiomeComponentState : ComponentState
{