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

Map System Code Refactor (#204)

Browse Source 
* Removes static `IoCManager` service locator calls from `Robust.Shared.Map` namespace.
* Misc code cleanup and filling out doc comments for Map classes.
* Added Union and Intersect methods to Box2.
* Any touched component was converted from static IoC calls to field injection.

Sibling PR to https://github.com/space-wizards/RobustToolbox/pull/796.
This commit is contained in:
Acruid
2019-04-20 16:20:18 -07:00
committed by Pieter-Jan Briers
parent 50f42d71a2
commit d3daa83b82
10 changed files with 77 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ namespace Content.Server.GameObjects.Components.Interactable.Tools
#pragma warning disable 649
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
[Dependency] private readonly IEntitySystemManager _entitySystemManager;
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 649
/// <summary>
@@ -20,19 +21,15 @@ namespace Content.Server.GameObjects.Components.Interactable.Tools
/// </summary>
public override string Name => "Crowbar";
public CrowbarComponent()
{
IoCManager.InjectDependencies(this);
}
public void AfterAttack(AfterAttackEventArgs eventArgs)
{
var tile = eventArgs.ClickLocation.Grid.GetTile(eventArgs.ClickLocation);
var tileDef = (ContentTileDefinition) tile.TileDef;
var mapGrid = _mapManager.GetGrid(eventArgs.ClickLocation.GridID);
var tile = mapGrid.GetTile(eventArgs.ClickLocation);
var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId];
if (tileDef.CanCrowbar)
{
var underplating = _tileDefinitionManager["underplating"];
eventArgs.ClickLocation.Grid.SetTile(eventArgs.ClickLocation, underplating.TileId);
mapGrid.SetTile(eventArgs.ClickLocation, underplating.TileId);
_entitySystemManager.GetEntitySystem<AudioSystem>().Play("/Audio/items/crowbar.ogg", Owner);
}
}