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

Construction Improvements (#1381)

Browse Source 
* Actually set the tool interaction message to handled.
Remove the floating text explaining why deconstruction failed.

* Removed unused IServerNotifyManager dependency.
This commit is contained in:
Acruid
2020-07-28 15:11:11 -07:00
committed by GitHub
parent b7eef464f1
commit b5667230c1
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs
View File

@@ -6,7 +6,6 @@ using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Interactable;
using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.Components.Stack;
using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.GameObjects.EntitySystems.Click;
using Content.Server.Interfaces;
using Content.Server.Utility; using Content.Server.Utility;
using Content.Shared.Construction; using Content.Shared.Construction;
using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components;
@@ -38,7 +37,6 @@ namespace Content.Server.GameObjects.EntitySystems
#pragma warning disable 649 #pragma warning disable 649
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IPrototypeManager _prototypeManager;
[Dependency] private readonly IMapManager _mapManager; [Dependency] private readonly IMapManager _mapManager;
[Dependency] private readonly IServerNotifyManager _notifyManager;
#pragma warning restore 649 #pragma warning restore 649
private readonly Dictionary<string, ConstructionPrototype> _craftRecipes = new Dictionary<string, ConstructionPrototype>(); private readonly Dictionary<string, ConstructionPrototype> _craftRecipes = new Dictionary<string, ConstructionPrototype>();
@@ -117,32 +115,17 @@ namespace Content.Server.GameObjects.EntitySystems
// no known recipe for entity // no known recipe for entity
if (!_craftRecipes.TryGetValue(targetPrototype.ID, out var prototype)) if (!_craftRecipes.TryGetValue(targetPrototype.ID, out var prototype))
{
_notifyManager.PopupMessage(msg.Attacked, msg.User,
"Cannot be deconstructed.");
msg.Handled = true;
return; return;
}
// there is a recipe, but it can't be deconstructed. // there is a recipe, but it can't be deconstructed.
var lastStep = prototype.Stages[^1].Backward; var lastStep = prototype.Stages[^1].Backward;
if (!(lastStep is ConstructionStepTool)) if (!(lastStep is ConstructionStepTool))
{
_notifyManager.PopupMessage(msg.Attacked, msg.User,
"Cannot be deconstructed.");
msg.Handled = true;
return; return;
}
// wrong tool // wrong tool
var caps = ((ConstructionStepTool) lastStep).ToolQuality; var caps = ((ConstructionStepTool) lastStep).ToolQuality;
if ((toolComp.Qualities & caps) == 0) if ((toolComp.Qualities & caps) == 0)
{
_notifyManager.PopupMessage(msg.Attacked, msg.User,
"Wrong tool to start deconstruct.");
msg.Handled = true;
return; return;
}
// ask around and see if the deconstruction prerequisites are satisfied // ask around and see if the deconstruction prerequisites are satisfied
// (remove bulbs, approved access, open panels, etc) // (remove bulbs, approved access, open panels, etc)
@@ -157,6 +140,7 @@ namespace Content.Server.GameObjects.EntitySystems
return; return;
// --- GOOD TO GO --- // --- GOOD TO GO ---
msg.Handled = true;
// pop off the material and switch to frame // pop off the material and switch to frame
var targetEntPos = targetEnt.Transform.MapPosition; var targetEntPos = targetEnt.Transform.MapPosition;