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

Refactor a bunch of stuff.

Browse Source
This commit is contained in:
zumorica
2020-05-19 13:55:52 +02:00
parent 06c7030514
commit 06d2cc74ed
17 changed files with 153 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/WiresComponent.cs
View File

@@ -248,7 +248,7 @@ namespace Content.Server.GameObjects.Components
switch (msg.Action)
{
case WiresAction.Cut:
if (tool == null || tool.Behavior != Tool.Wirecutter)
if (tool == null || !tool.HasQuality(ToolQuality.Cutting))
{
_notifyManager.PopupMessage(Owner.Transform.GridPosition, player, _localizationManager.GetString("You need to hold a wirecutter in your hand!"));
return;
@@ -258,7 +258,7 @@ namespace Content.Server.GameObjects.Components
UpdateUserInterface();
break;
case WiresAction.Mend:
if (tool == null || tool.Behavior != Tool.Wirecutter)
if (tool == null || !tool.HasQuality(ToolQuality.Cutting))
{
_notifyManager.PopupMessage(Owner.Transform.GridPosition, player, _localizationManager.GetString("You need to hold a wirecutter in your hand!"));
return;
@@ -268,7 +268,7 @@ namespace Content.Server.GameObjects.Components
UpdateUserInterface();
break;
case WiresAction.Pulse:
if (tool == null || tool.Behavior != Tool.Multitool)
if (tool == null || !tool.HasQuality(ToolQuality.Multitool))
{
_notifyManager.PopupMessage(Owner.Transform.GridPosition, player, _localizationManager.GetString("You need to hold a multitool in your hand!"));
return;
@@ -300,13 +300,13 @@ namespace Content.Server.GameObjects.Components
{
if (!eventArgs.AttackWith.TryGetComponent<ToolComponent>(out var tool))
return false;
if (tool.Behavior != Tool.Screwdriver)
if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Screwing))
return false;
IsPanelOpen = !IsPanelOpen;
IoCManager.Resolve<IEntitySystemManager>()
.GetEntitySystem<AudioSystem>()
.Play(IsPanelOpen ? "/Audio/machines/screwdriveropen.ogg" : "/Audio/machines/screwdriverclose.ogg");
.Play(IsPanelOpen ? "/Audio/machines/screwdriveropen.ogg" : "/Audio/machines/screwdriverclose.ogg", Owner);
return true;
}