diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs index 52cf806e84..a9df905b61 100644 --- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs @@ -1,4 +1,5 @@ using Content.Server.GameObjects.Components.Stack; +using Content.Shared.Audio; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Maps; using Content.Shared.Utility; @@ -8,6 +9,7 @@ using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Maths; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Items @@ -33,23 +35,52 @@ namespace Content.Server.GameObjects.Components.Items Owner.EnsureComponent(); } + private bool HasBaseTurf(ContentTileDefinition tileDef, string baseTurf) + { + foreach (var tileBaseTurf in tileDef.BaseTurfs) + { + if (baseTurf == tileBaseTurf) + { + return true; + } + } + + return false; + } + + private void PlaceAt(IMapGrid mapGrid, EntityCoordinates location, ushort tileId, float offset = 0) + { + mapGrid.SetTile(location.Offset(new Vector2(offset, offset)), new Tile(tileId)); + EntitySystem.Get().PlayAtCoords("/Audio/Items/genhit.ogg", location, AudioHelpers.WithVariation(0.125f)); + } + public void AfterInteract(AfterInteractEventArgs eventArgs) { if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true)) return; if (!Owner.TryGetComponent(out StackComponent stack)) return; - var attacked = eventArgs.Target; - var mapGrid = _mapManager.GetGrid(eventArgs.ClickLocation.GetGridId(Owner.EntityManager)); - var tile = mapGrid.GetTileRef(eventArgs.ClickLocation); - var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId]; + var location = eventArgs.ClickLocation.AlignWithClosestGridTile(); + var locationMap = location.ToMap(Owner.EntityManager); - if (tileDef.IsSubFloor && attacked == null && stack.Use(1)) + var desiredTile = (ContentTileDefinition)_tileDefinitionManager[_outputTile]; + + if (_mapManager.TryGetGrid(location.GetGridId(Owner.EntityManager), out var mapGrid)) { - var desiredTile = _tileDefinitionManager[_outputTile]; - mapGrid.SetTile(eventArgs.ClickLocation, new Tile(desiredTile.TileId)); - EntitySystem.Get().PlayAtCoords("/Audio/Items/genhit.ogg", eventArgs.ClickLocation); - } + var tile = mapGrid.GetTileRef(location); + var baseTurf = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId]; + if (HasBaseTurf(desiredTile, baseTurf.Name) && eventArgs.Target == null && stack.Use(1)) + { + PlaceAt(mapGrid, location, desiredTile.TileId); + } + } + else if(HasBaseTurf(desiredTile, "space")) + { + mapGrid = _mapManager.CreateGrid(locationMap.MapId); + mapGrid.WorldPosition = locationMap.Position; + location = new EntityCoordinates(mapGrid.GridEntityId, Vector2.Zero); + PlaceAt(mapGrid, location, desiredTile.TileId, mapGrid.TileSize/2f); + } } diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index b0e611e96d..0a6d5e4765 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -156,7 +156,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click private bool HandleWideAttack(ICommonSession session, EntityCoordinates coords, EntityUid uid) { // client sanitization - if (!_mapManager.GridExists(coords.GetGridId(_entityManager))) + if (!coords.IsValid(_entityManager)) { Logger.InfoS("system.interaction", $"Invalid Coordinates: client={session}, coords={coords}"); return true; @@ -211,7 +211,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click private bool HandleClientUseItemInHand(ICommonSession session, EntityCoordinates coords, EntityUid uid) { // client sanitization - if (!_mapManager.GridExists(coords.GetGridId(_entityManager))) + if (!coords.IsValid(_entityManager)) { Logger.InfoS("system.interaction", $"Invalid Coordinates: client={session}, coords={coords}"); return true; @@ -242,7 +242,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click private bool HandleTryPullObject(ICommonSession session, EntityCoordinates coords, EntityUid uid) { // client sanitization - if (!_mapManager.GridExists(coords.GetGridId(_entityManager))) + if (!coords.IsValid(_entityManager)) { Logger.InfoS("system.interaction", $"Invalid Coordinates for pulling: client={session}, coords={coords}"); return false; @@ -303,7 +303,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click } // Verify player is on the same map as the entity he clicked on - if (_mapManager.GetGrid(coordinates.GetGridId(EntityManager)).ParentMapId != playerTransform.MapID) + if (coordinates.GetMapId(_entityManager) != playerTransform.MapID) { Logger.WarningS("system.interaction", $"Player named {player.Name} clicked on a map he isn't located on");