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

Move MultipleTool to shared (#9964)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-16 22:19:54 +12:00
committed by GitHub
parent 3c3a44ec49
commit cf8ad5f815
7 changed files with 188 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.Server/Tools/Components/MultipleToolComponent.cs
View File

@@ -1,39 +1,9 @@
using Content.Shared.Tools;
using Content.Shared.Tools.Components;
using Robust.Shared.Audio;
using Robust.Shared.Utility;
namespace Content.Server.Tools.Components
namespace Content.Server.Tools.Components;
[RegisterComponent]
[ComponentReference(typeof(SharedMultipleToolComponent))]
public sealed class MultipleToolComponent : SharedMultipleToolComponent
{
/// <summary>
/// Not to be confused with Multitool (power)
/// </summary>
[RegisterComponent]
public sealed class MultipleToolComponent : SharedMultipleToolComponent
{
[DataDefinition]
public sealed class ToolEntry
{
[DataField("behavior", required:true)]
public PrototypeFlags<ToolQualityPrototype> Behavior { get; } = new();
[DataField("useSound")]
public SoundSpecifier? Sound { get; } = null;
[DataField("changeSound")]
public SoundSpecifier? ChangeSound { get; } = null;
[DataField("sprite")]
public SpriteSpecifier? Sprite { get; } = null;
}
[DataField("entries", required:true)]
public ToolEntry[] Entries { get; } = Array.Empty<ToolEntry>();
[ViewVariables]
public int CurrentEntry = 0;
[ViewVariables]
public string CurrentQualityName = string.Empty;
}
}

94
Content.Server/Tools/ToolSystem.MultipleTool.cs
View File

@@ -1,94 +0,0 @@
using System.Linq;
using Content.Server.Tools.Components;
using Content.Shared.Interaction;
using Content.Shared.Tools;
using Content.Shared.Tools.Components;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Player;
namespace Content.Server.Tools
{
public sealed partial class ToolSystem
{
private void InitializeMultipleTools()
{
SubscribeLocalEvent<MultipleToolComponent, ComponentStartup>(OnMultipleToolStartup);
SubscribeLocalEvent<MultipleToolComponent, ActivateInWorldEvent>(OnMultipleToolActivated);
SubscribeLocalEvent<MultipleToolComponent, ComponentGetState>(OnMultipleToolGetState);
}
private void OnMultipleToolStartup(EntityUid uid, MultipleToolComponent multiple, ComponentStartup args)
{
// Only set the multiple tool if we have a tool component.
if(EntityManager.TryGetComponent(uid, out ToolComponent? tool))
SetMultipleTool(uid, multiple, tool);
}
private void OnMultipleToolActivated(EntityUid uid, MultipleToolComponent multiple, ActivateInWorldEvent args)
{
if (args.Handled)
return;
args.Handled = CycleMultipleTool(uid, multiple);
}
private void OnMultipleToolGetState(EntityUid uid, MultipleToolComponent multiple, ref ComponentGetState args)
{
args.State = new MultipleToolComponentState(multiple.CurrentQualityName);
}
public bool CycleMultipleTool(EntityUid uid, MultipleToolComponent? multiple = null)
{
if (!Resolve(uid, ref multiple))
return false;
if (multiple.Entries.Length == 0)
return false;
multiple.CurrentEntry = (multiple.CurrentEntry + 1) % multiple.Entries.Length;
SetMultipleTool(uid, multiple);
var current = multiple.Entries[multiple.CurrentEntry];
if(current.ChangeSound is {} changeSound)
SoundSystem.Play(changeSound.GetSound(), Filter.Pvs(uid), uid);
return true;
}
public void SetMultipleTool(EntityUid uid, MultipleToolComponent? multiple = null, ToolComponent? tool = null, SpriteComponent? sprite = null)
{
if (!Resolve(uid, ref multiple, ref tool))
return;
// Sprite is optional.
Resolve(uid, ref sprite, false);
if (multiple.Entries.Length == 0)
{
multiple.CurrentQualityName = Loc.GetString("multiple-tool-component-no-behavior");
multiple.Dirty();
return;
}
var current = multiple.Entries[multiple.CurrentEntry];
tool.UseSound = current.Sound;
tool.Qualities = current.Behavior;
if (_prototypeManager.TryIndex(current.Behavior.First(), out ToolQualityPrototype? quality))
{
multiple.CurrentQualityName = Loc.GetString(quality.Name);
}
multiple.Dirty();
if (current.Sprite == null || sprite == null)
return;
sprite.LayerSetSprite(0, current.Sprite);
}
}
}

10
Content.Server/Tools/ToolSystem.cs
View File

@@ -1,26 +1,25 @@
using System.Threading;
using System.Threading.Tasks;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.DoAfter;
using Content.Server.Popups;
using Content.Shared.Audio;
using Content.Shared.Item;
using Content.Shared.Tools;
using Content.Shared.Tools.Components;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using System.Threading;
using System.Threading.Tasks;
namespace Content.Server.Tools
{
// TODO move tool system to shared, and make it a friend of Tool Component.
public sealed partial class ToolSystem : EntitySystem
public sealed partial class ToolSystem : SharedToolSystem
{
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
@@ -34,7 +33,6 @@ namespace Content.Server.Tools
InitializeTilePrying();
InitializeWelders();
InitializeMultipleTools();
SubscribeLocalEvent<ToolDoAfterComplete>(OnDoAfterComplete);
SubscribeLocalEvent<ToolDoAfterCancelled>(OnDoAfterCancelled);