0c97520276
* Fix usages of TryIndex()
Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115)
This then resulted in TryIndex() getting modified to log errors (94f98073b0), which is incorrect as it causes false-positive errors in proper uses of the API: external data validation. (#39098)
This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.
Fixes #39115
Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.
* fix tests
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
75 lines
2.5 KiB
C#
75 lines
2.5 KiB
C#
using System.Threading.Tasks;
|
|
using Content.Server.Parallax;
|
|
using Content.Shared.Maps;
|
|
using Content.Shared.Parallax.Biomes;
|
|
using Content.Shared.Procedural;
|
|
using Content.Shared.Procedural.PostGeneration;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Server.Procedural.DungeonJob;
|
|
|
|
public sealed partial class DungeonJob
|
|
{
|
|
/// <summary>
|
|
/// <see cref="BiomeDunGen"/>
|
|
/// </summary>
|
|
private async Task PostGen(BiomeDunGen dunGen, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
|
|
{
|
|
if (!_prototype.Resolve(dunGen.BiomeTemplate, out var indexedBiome))
|
|
return;
|
|
|
|
var biomeSystem = _entManager.System<BiomeSystem>();
|
|
|
|
var seed = random.Next();
|
|
var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
|
|
|
|
var tiles = _maps.GetAllTilesEnumerator(_gridUid, _grid);
|
|
while (tiles.MoveNext(out var tileRef))
|
|
{
|
|
var node = tileRef.Value.GridIndices;
|
|
|
|
if (reservedTiles.Contains(node))
|
|
continue;
|
|
|
|
if (dunGen.TileMask is not null)
|
|
{
|
|
if (!dunGen.TileMask.Contains(((ContentTileDefinition)_tileDefManager[tileRef.Value.Tile.TypeId]).ID))
|
|
continue;
|
|
}
|
|
|
|
// Need to set per-tile to override data.
|
|
if (biomeSystem.TryGetTile(node, indexedBiome.Layers, seed, (_gridUid, _grid), out var tile))
|
|
{
|
|
_maps.SetTile(_gridUid, _grid, node, tile.Value);
|
|
}
|
|
|
|
if (biomeSystem.TryGetDecals(node, indexedBiome.Layers, seed, (_gridUid, _grid), out var decals))
|
|
{
|
|
foreach (var decal in decals)
|
|
{
|
|
_decals.TryAddDecal(decal.ID, new EntityCoordinates(_gridUid, decal.Position), out _);
|
|
}
|
|
}
|
|
|
|
if (biomeSystem.TryGetEntity(node, indexedBiome.Layers, tile ?? tileRef.Value.Tile, seed, (_gridUid, _grid), out var entityProto))
|
|
{
|
|
var ent = _entManager.SpawnEntity(entityProto, new EntityCoordinates(_gridUid, node + _grid.TileSizeHalfVector));
|
|
var xform = xformQuery.Get(ent);
|
|
|
|
if (!xform.Comp.Anchored)
|
|
{
|
|
_transform.AnchorEntity(ent, xform);
|
|
}
|
|
|
|
// TODO: Engine bug with SpawnAtPosition
|
|
DebugTools.Assert(xform.Comp.Anchored);
|
|
}
|
|
|
|
await SuspendDungeon();
|
|
if (!ValidateResume())
|
|
return;
|
|
}
|
|
}
|
|
}
|