Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Give pried tiles a random rotation (#5482)

Browse Source 
Also made it so they start with a random offset to avoid the additional MoveEvent going out.
This commit is contained in:
metalgearsloth
2021-11-24 04:15:49 +11:00
committed by GitHub
parent 1de82b4324
commit 32c36ad221
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs
View File

@@ -257,7 +257,7 @@ namespace Content.Server.Atmos.EntitySystems
if (!mapGrid.TryGetTileRef(tile, out var tileRef)) if (!mapGrid.TryGetTileRef(tile, out var tileRef))
return; return;
tileRef.PryTile(_mapManager, _tileDefinitionManager, EntityManager); tileRef.PryTile(_mapManager, _tileDefinitionManager, EntityManager, _robustRandom);
} }
#endregion #endregion

17
Content.Shared/Maps/TurfHelpers.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@@ -10,6 +11,7 @@ using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Physics.Broadphase; using Robust.Shared.Physics.Broadphase;
using Robust.Shared.Random;
namespace Content.Shared.Maps namespace Content.Shared.Maps
{ {
@@ -114,7 +116,10 @@ namespace Content.Shared.Maps
} }
public static bool PryTile(this TileRef tileRef, public static bool PryTile(this TileRef tileRef,
IMapManager? mapManager = null, ITileDefinitionManager? tileDefinitionManager = null, IEntityManager? entityManager = null) IMapManager? mapManager = null,
ITileDefinitionManager? tileDefinitionManager = null,
IEntityManager? entityManager = null,
IRobustRandom? robustRandom = null)
{ {
var tile = tileRef.Tile; var tile = tileRef.Tile;
var indices = tileRef.GridIndices; var indices = tileRef.GridIndices;
@@ -123,6 +128,7 @@ namespace Content.Shared.Maps
mapManager ??= IoCManager.Resolve<IMapManager>(); mapManager ??= IoCManager.Resolve<IMapManager>();
tileDefinitionManager ??= IoCManager.Resolve<ITileDefinitionManager>(); tileDefinitionManager ??= IoCManager.Resolve<ITileDefinitionManager>();
entityManager ??= IoCManager.Resolve<IEntityManager>(); entityManager ??= IoCManager.Resolve<IEntityManager>();
robustRandom ??= IoCManager.Resolve<IRobustRandom>();
if (tile.IsEmpty) return false; if (tile.IsEmpty) return false;
@@ -136,11 +142,14 @@ namespace Content.Shared.Maps
mapGrid.SetTile(tileRef.GridIndices, new Tile(plating.TileId)); mapGrid.SetTile(tileRef.GridIndices, new Tile(plating.TileId));
var half = mapGrid.TileSize / 2f; const float margin = 0.1f;
var (x, y) = ((mapGrid.TileSize - 2 * margin) * robustRandom.NextFloat() + margin, (mapGrid.TileSize - 2 * margin) * robustRandom.NextFloat() + margin);
//Actually spawn the relevant tile item at the right position and give it some random offset. //Actually spawn the relevant tile item at the right position and give it some random offset.
var tileItem = entityManager.SpawnEntity(tileDef.ItemDropPrototypeName, indices.ToEntityCoordinates(tileRef.GridIndex, mapManager).Offset(new Vector2(half, half))); var tileItem = entityManager.SpawnEntity(tileDef.ItemDropPrototypeName, indices.ToEntityCoordinates(tileRef.GridIndex, mapManager).Offset(new Vector2(x, y)));
tileItem.RandomOffset(0.25f); entityManager.GetComponent<TransformComponent>(tileItem.Uid).LocalRotation = robustRandom.NextDouble() * Math.Tau;
return true; return true;
} }