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

Fix RCDs on space somewhat - space-wizards/space-station-14#4742 compatibility edition (#4878)

Browse Source
This commit is contained in:
20kdc
2021-10-25 04:33:49 +01:00
committed by GitHub
parent 16e3b6a08e
commit 63dd23ad8c
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/RCD/Systems/RCDSystem.cs
View File

@@ -64,16 +64,25 @@ namespace Content.Server.RCD.Systems
return; return;
// FIXME: Make this work properly. Right now it relies on the click location being on a grid, which is bad. // FIXME: Make this work properly. Right now it relies on the click location being on a grid, which is bad.
if (!args.ClickLocation.IsValid(EntityManager)) var clickLocationMod = args.ClickLocation;
// Initial validity check
if (!clickLocationMod.IsValid(EntityManager))
return; return;
// Try to fix it (i.e. if clicking on space)
var gridID = args.ClickLocation.GetGridId(EntityManager); // Note: Ideally there'd be a better way, but there isn't right now.
var gridID = clickLocationMod.GetGridId(EntityManager);
if (!gridID.IsValid())
{
clickLocationMod = clickLocationMod.AlignWithClosestGridTile();
gridID = clickLocationMod.GetGridId(EntityManager);
}
// Check if fixing it failed / get final grid ID
if (!gridID.IsValid()) if (!gridID.IsValid())
return; return;
var mapGrid = _mapManager.GetGrid(gridID); var mapGrid = _mapManager.GetGrid(gridID);
var tile = mapGrid.GetTileRef(args.ClickLocation); var tile = mapGrid.GetTileRef(clickLocationMod);
var snapPos = mapGrid.TileIndicesFor(args.ClickLocation); var snapPos = mapGrid.TileIndicesFor(clickLocationMod);
//No changing mode mid-RCD //No changing mode mid-RCD
var startingMode = rcd.Mode; var startingMode = rcd.Mode;
@@ -99,7 +108,7 @@ namespace Content.Server.RCD.Systems
{ {
//Floor mode just needs the tile to be a space tile (subFloor) //Floor mode just needs the tile to be a space tile (subFloor)
case RcdMode.Floors: case RcdMode.Floors:
mapGrid.SetTile(args.ClickLocation, new Tile(_tileDefinitionManager["floor_steel"].TileId)); mapGrid.SetTile(clickLocationMod, new Tile(_tileDefinitionManager["floor_steel"].TileId));
break; break;
//We don't want to place a space tile on something that's already a space tile. Let's do the inverse of the last check. //We don't want to place a space tile on something that's already a space tile. Let's do the inverse of the last check.
case RcdMode.Deconstruct: case RcdMode.Deconstruct: