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

Makes tools and welders ECS, add ToolQualityPrototype. (#4741)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-10-07 13:01:27 +02:00
committed by GitHub
parent f2760d0002
commit 365c7da4dc
44 changed files with 1144 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Client/Tools/Components/MultiToolComponent.cs → Content.Client/Tools/Components/MultipleToolComponent.cs
View File

@@ -1,7 +1,7 @@
using Content.Client.Items.Components;
using Content.Client.Message;
using Content.Client.Stylesheets;
using Content.Shared.Tool;
using Content.Shared.Tools.Components;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
@@ -13,26 +13,23 @@ using Robust.Shared.ViewVariables;
namespace Content.Client.Tools.Components
{
[RegisterComponent]
[NetworkedComponent()]
public class MultiToolComponent : Component, IItemStatus
public class MultipleToolComponent : SharedMultipleToolComponent, IItemStatus
{
private ToolQuality _behavior;
private string? _behavior;
[DataField("statusShowBehavior")]
private bool _statusShowBehavior = true;
[ViewVariables(VVAccess.ReadWrite)] private bool _uiUpdateNeeded;
[ViewVariables] public bool StatusShowBehavior => _statusShowBehavior;
[ViewVariables] public ToolQuality? Behavior => _behavior;
public override string Name => "MultiTool";
[ViewVariables] public string? Behavior => _behavior;
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
base.HandleComponentState(curState, nextState);
if (curState is not MultiToolComponentState tool) return;
if (curState is not MultipleToolComponentState tool) return;
_behavior = tool.Quality;
_behavior = tool.QualityName;
_uiUpdateNeeded = true;
}
@@ -41,10 +38,10 @@ namespace Content.Client.Tools.Components
private sealed class StatusControl : Control
{
private readonly MultiToolComponent _parent;
private readonly MultipleToolComponent _parent;
private readonly RichTextLabel _label;
public StatusControl(MultiToolComponent parent)
public StatusControl(MultipleToolComponent parent)
{
_parent = parent;
_label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
@@ -64,7 +61,7 @@ namespace Content.Client.Tools.Components
_parent._uiUpdateNeeded = false;
_label.SetMarkup(_parent.StatusShowBehavior ? _parent.Behavior.ToString() ?? string.Empty : string.Empty);
_label.SetMarkup(_parent.StatusShowBehavior ? _parent.Behavior ?? string.Empty : string.Empty);
}
}
}

39
Content.Client/Tools/Components/WelderComponent.cs
View File

@@ -2,43 +2,30 @@ using System;
using Content.Client.Items.Components;
using Content.Client.Message;
using Content.Client.Stylesheets;
using Content.Shared.Tool;
using Content.Shared.Tools.Components;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.Localization;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
namespace Content.Client.Tools.Components
{
[RegisterComponent]
[NetworkedComponent()]
public class WelderComponent : SharedToolComponent, IItemStatus
[RegisterComponent, Friend(typeof(ToolSystem), typeof(StatusControl))]
public class WelderComponent : SharedWelderComponent, IItemStatus
{
public override string Name => "Welder";
private ToolQuality _behavior;
[ViewVariables(VVAccess.ReadWrite)] private bool _uiUpdateNeeded;
[ViewVariables] public float FuelCapacity { get; private set; }
[ViewVariables] public float Fuel { get; private set; }
[ViewVariables] public bool Activated { get; private set; }
[ViewVariables] public override ToolQuality Qualities => _behavior;
[ViewVariables(VVAccess.ReadWrite)]
public bool UiUpdateNeeded { get; set; }
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
base.HandleComponentState(curState, nextState);
[ViewVariables]
public float FuelCapacity { get; set; }
if (curState is not WelderComponentState weld)
return;
FuelCapacity = weld.FuelCapacity;
Fuel = weld.Fuel;
Activated = weld.Activated;
_behavior = weld.Quality;
_uiUpdateNeeded = true;
}
[ViewVariables]
public float Fuel { get; set; }
public Control MakeControl() => new StatusControl(this);
@@ -53,7 +40,7 @@ namespace Content.Client.Tools.Components
_label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
AddChild(_label);
parent._uiUpdateNeeded = true;
parent.UiUpdateNeeded = true;
}
/// <inheritdoc />
@@ -61,12 +48,12 @@ namespace Content.Client.Tools.Components
{
base.FrameUpdate(args);
if (!_parent._uiUpdateNeeded)
if (!_parent.UiUpdateNeeded)
{
return;
}
_parent._uiUpdateNeeded = false;
_parent.UiUpdateNeeded = false;
var fuelCap = _parent.FuelCapacity;
var fuel = _parent.Fuel;