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

You can now pry multiple tiles at once (#29231)

Browse Source 
* You can now pry multiple tiles at once

* More advanced do after duplicate checking.

Instead of just saying "lol tile prying can raise duplicates", we now have a system so tile prying can properly distinguish events on 2 different tiles. This is achieved with a virtual function on DoAfterEvent.
This commit is contained in:
Pieter-Jan Briers
2024-06-20 16:05:40 +02:00
committed by GitHub
parent d15eafe133
commit cf374ac905
5 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs
View File

@@ -37,24 +37,24 @@ public abstract partial class SharedToolSystem
if (!TryComp<ToolComponent>(ent, out var tool))
return;
var coordinates = GetCoordinates(args.Coordinates);
var gridUid = coordinates.GetGridUid(EntityManager);
var gridUid = GetEntity(args.Grid);
if (!TryComp<MapGridComponent>(gridUid, out var grid))
{
Log.Error("Attempted use tool on a non-existent grid?");
return;
}
var tileRef = _maps.GetTileRef(gridUid.Value, grid, coordinates);
if (comp.RequiresUnobstructed && _turfs.IsTileBlocked(gridUid.Value, tileRef.GridIndices, CollisionGroup.MobMask))
var tileRef = _maps.GetTileRef(gridUid, grid, args.GridTile);
var coords = _maps.ToCoordinates(tileRef, grid);
if (comp.RequiresUnobstructed && _turfs.IsTileBlocked(gridUid, tileRef.GridIndices, CollisionGroup.MobMask))
return;
if (!TryDeconstructWithToolQualities(tileRef, tool.Qualities))
return;
AdminLogger.Add(LogType.LatticeCut, LogImpact.Medium,
$"{ToPrettyString(args.User):player} used {ToPrettyString(ent)} to edit the tile at {args.Coordinates}");
$"{ToPrettyString(args.User):player} used {ToPrettyString(ent)} to edit the tile at {coords}");
args.Handled = true;
}
@@ -66,7 +66,7 @@ public abstract partial class SharedToolSystem
var comp = ent.Comp1!;
var tool = ent.Comp2!;
if (!_mapManager.TryFindGridAt(clickLocation.ToMap(EntityManager, _transformSystem), out var gridUid, out var mapGrid))
if (!_mapManager.TryFindGridAt(_transformSystem.ToMapCoordinates(clickLocation), out var gridUid, out var mapGrid))
return false;
var tileRef = _maps.GetTileRef(gridUid, mapGrid, clickLocation);
@@ -85,7 +85,7 @@ public abstract partial class SharedToolSystem
if (!InteractionSystem.InRangeUnobstructed(user, coordinates, popup: false))
return false;
var args = new TileToolDoAfterEvent(GetNetCoordinates(coordinates));
var args = new TileToolDoAfterEvent(GetNetEntity(gridUid), tileRef.GridIndices);
UseTool(ent, user, ent, comp.Delay, tool.Qualities, args, out _, toolComponent: tool);
return true;
}