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

Finish refactoring tools. Add multitools. (as in multiple tools in one)

Browse Source
This commit is contained in:
zumorica
2020-04-29 13:43:07 +02:00
parent ca5638badf
commit ff5549a0d1
37 changed files with 840 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Content.Client/GameObjects/Components/WelderComponent.cs → Content.Client/GameObjects/Components/Interactable/ToolComponent.cs
View File

@@ -1,38 +1,49 @@
using System;
using Content.Client.UserInterface;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components;
using Content.Shared.GameObjects.Components.Interactable;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Serialization;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects.Components
namespace Content.Client.GameObjects.Components.Interactable
{
[RegisterComponent]
public class WelderComponent : Component, IItemStatus
public class ToolComponent : SharedToolComponent, IItemStatus
{
public override string Name => "Welder";
public override uint? NetID => ContentNetIDs.WELDER;
private Tool _behavior;
[ViewVariables(VVAccess.ReadWrite)] private bool _uiUpdateNeeded;
private bool _statusShowBehavior;
[ViewVariables] public float FuelCapacity { get; private set; }
[ViewVariables] public float Fuel { get; private set; }
[ViewVariables] public bool Activated { get; private set; }
[ViewVariables] public bool StatusShowBehavior => _statusShowBehavior;
[ViewVariables]
public override Tool Behavior
{
get => _behavior;
set {}
}
[ViewVariables(VVAccess.ReadWrite)] private bool _uiUpdateNeeded;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _statusShowBehavior, "statusShowBehavior", false);
}
public override void HandleComponentState(ComponentState curState, ComponentState nextState)
{
if (!(curState is WelderComponentState cast))
if (!(curState is ToolComponentState cast))
return;
FuelCapacity = cast.FuelCapacity;
Fuel = cast.Fuel;
Activated = cast.Activated;
_behavior = cast.Behavior;
_uiUpdateNeeded = true;
}
@@ -41,10 +52,10 @@ namespace Content.Client.GameObjects.Components
private sealed class StatusControl : Control
{
private readonly WelderComponent _parent;
private readonly ToolComponent _parent;
private readonly RichTextLabel _label;
public StatusControl(WelderComponent parent)
public StatusControl(ToolComponent parent)
{
_parent = parent;
_label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
@@ -64,11 +75,22 @@ namespace Content.Client.GameObjects.Components
_parent._uiUpdateNeeded = false;
var fuelCap = _parent.FuelCapacity;
var fuel = _parent.Fuel;
if (_parent.Behavior == Tool.Welder)
{
var fuelCap = _parent.FuelCapacity;
var fuel = _parent.Fuel;
_label.SetMarkup(Loc.GetString("Fuel: [color={0}]{1}/{2}[/color]",
fuel < fuelCap / 4f ? "darkorange" : "orange", Math.Round(fuel), fuelCap));
}
else
{
if(!_parent.StatusShowBehavior)
_label.SetMarkup(string.Empty);
else
_label.SetMarkup(_parent.Behavior.ToString());
}
_label.SetMarkup(Loc.GetString("Fuel: [color={0}]{1}/{2}[/color]",
fuel < fuelCap / 4f ? "darkorange" : "orange", Math.Round(fuel), fuelCap));
}
}
}