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

Fix crowbar distance to work on adjacent tiles (#424)

Browse Source 
* Fix crowbar distance to work on max 1.5 tiles

* Use existing distance methods

* Use the existing InteractionRange
This commit is contained in:
rok-povsic
2019-11-10 21:50:13 +01:00
committed by Pieter-Jan Briers
parent 7032c8a92e
commit e5150d3714
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.GameObjects.EntitySystems; using System;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Maps; using Content.Shared.Maps;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -27,6 +28,15 @@ namespace Content.Server.GameObjects.Components.Interactable.Tools
{ {
var mapGrid = _mapManager.GetGrid(eventArgs.ClickLocation.GridID); var mapGrid = _mapManager.GetGrid(eventArgs.ClickLocation.GridID);
var tile = mapGrid.GetTileRef(eventArgs.ClickLocation); var tile = mapGrid.GetTileRef(eventArgs.ClickLocation);
var coordinates = mapGrid.GridTileToLocal(tile.GridIndices);
float distance = coordinates.Distance(_mapManager, Owner.Transform.GridPosition);
if (distance > InteractionSystem.InteractionRange)
{
return;
}
var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId]; var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId];
if (tileDef.CanCrowbar) if (tileDef.CanCrowbar)
{ {