From 662c83a8a299216f8c1dd55077130a7fa8cf9fc6 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 9 Jun 2023 10:44:25 +0000 Subject: [PATCH] artifact extract tweaks (#17164) * make extract button green, rename Destroy internally to Extract * 5 --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Ui/AnalysisConsoleBoundUserInterface.cs | 4 ++-- .../Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml | 8 ++++---- .../Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs | 10 +++++----- .../Equipment/Components/AnalysisConsoleComponent.cs | 6 +++--- .../Equipment/Components/ArtifactAnalyzerComponent.cs | 2 +- .../Equipment/Systems/ArtifactAnalyzerSystem.cs | 9 +++++---- .../Equipment/SharedArtifactAnalyzer.cs | 2 +- .../Locale/en-US/xenoarchaeology/artifact-analyzer.ftl | 6 +++--- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs index 3b10a8b97b..7baa32c1c8 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs @@ -35,9 +35,9 @@ public sealed class AnalysisConsoleBoundUserInterface : BoundUserInterface { SendMessage(new AnalysisConsolePrintButtonPressedMessage()); }; - _consoleMenu.OnDestroyButtonPressed += () => + _consoleMenu.OnExtractButtonPressed += () => { - SendMessage(new AnalysisConsoleDestroyButtonPressedMessage()); + SendMessage(new AnalysisConsoleExtractButtonPressedMessage()); }; } diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml index 86060b29fe..ed4008004f 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml @@ -20,10 +20,10 @@ Text="{Loc 'analysis-console-print-button'}" ToolTip="{Loc 'analysis-console-print-tooltip-info'}"> - - diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs index 9f0a424b3e..344df37a00 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs @@ -15,7 +15,7 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow public event Action? OnServerSelectionButtonPressed; public event Action? OnScanButtonPressed; public event Action? OnPrintButtonPressed; - public event Action? OnDestroyButtonPressed; + public event Action? OnExtractButtonPressed; public AnalysisConsoleMenu() { @@ -25,7 +25,7 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow ServerSelectionButton.OnPressed += _ => OnServerSelectionButtonPressed?.Invoke(); ScanButton.OnPressed += _ => OnScanButtonPressed?.Invoke(); PrintButton.OnPressed += _ => OnPrintButtonPressed?.Invoke(); - DestroyButton.OnPressed += _ => OnDestroyButtonPressed?.Invoke(); + ExtractButton.OnPressed += _ => OnExtractButtonPressed?.Invoke(); } public void SetButtonsDisabled(AnalysisConsoleScanUpdateState state) @@ -35,15 +35,15 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow var disabled = !state.ServerConnected || !state.CanScan || state.PointAmount <= 0; - DestroyButton.Disabled = disabled; + ExtractButton.Disabled = disabled; if (disabled) { - DestroyButton.RemoveStyleClass(StyleBase.ButtonCaution); + ExtractButton.RemoveStyleClass("ButtonColorGreen"); } else { - DestroyButton.AddStyleClass(StyleBase.ButtonCaution); + ExtractButton.AddStyleClass("ButtonColorGreen"); } } diff --git a/Content.Server/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs b/Content.Server/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs index 5a4b0e876a..d65fed28a8 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs @@ -26,10 +26,10 @@ public sealed class AnalysisConsoleComponent : Component public readonly string LinkingPort = "ArtifactAnalyzerSender"; /// - /// The sound played when an artifact is destroyed. + /// The sound played when an artifact has points extracted. /// - [DataField("destroySound")] - public SoundSpecifier DestroySound = new SoundPathSpecifier("/Audio/Effects/radpulse11.ogg"); + [DataField("extractSound")] + public SoundSpecifier ExtractSound = new SoundPathSpecifier("/Audio/Effects/radpulse11.ogg"); /// /// The entity spawned by a report. diff --git a/Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs b/Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs index f21c8a6b51..d07819fd06 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs @@ -8,7 +8,7 @@ namespace Content.Server.Xenoarchaeology.Equipment.Components; /// /// A machine that is combined and linked to the -/// in order to analyze and destroy artifacts. +/// in order to analyze artifacts and extract points. /// [RegisterComponent] public sealed class ArtifactAnalyzerComponent : Component diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs index d4375f95e1..a9930ec36f 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs @@ -64,7 +64,7 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem SubscribeLocalEvent(OnServerSelectionMessage); SubscribeLocalEvent(OnScanButton); SubscribeLocalEvent(OnPrintButton); - SubscribeLocalEvent(OnDestroyButton); + SubscribeLocalEvent(OnExtractButton); SubscribeLocalEvent((e,c,_) => UpdateUserInterface(e,c), after: new []{typeof(ResearchSystem)}); @@ -339,12 +339,12 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem } /// - /// destroys the artifact and updates the server points + /// Extracts points from the artifact and updates the server points /// /// /// /// - private void OnDestroyButton(EntityUid uid, AnalysisConsoleComponent component, AnalysisConsoleDestroyButtonPressedMessage args) + private void OnExtractButton(EntityUid uid, AnalysisConsoleComponent component, AnalysisConsoleExtractButtonPressedMessage args) { if (component.AnalyzerEntity == null) return; @@ -358,13 +358,14 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem var pointValue = _artifact.GetResearchPointValue(artifact.Value); + // no new nodes triggered so nothing to add if (pointValue == 0) return; _research.ModifyServerPoints(server.Value, pointValue, serverComponent); _artifact.AdjustConsumedPoints(artifact.Value, pointValue); - _audio.PlayPvs(component.DestroySound, component.AnalyzerEntity.Value, AudioParams.Default.WithVolume(2f)); + _audio.PlayPvs(component.ExtractSound, component.AnalyzerEntity.Value, AudioParams.Default.WithVolume(2f)); _popup.PopupEntity(Loc.GetString("analyzer-artifact-extract-popup"), component.AnalyzerEntity.Value, PopupType.Large); diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzer.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzer.cs index 0215c84992..3945d93ca3 100644 --- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzer.cs +++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzer.cs @@ -25,7 +25,7 @@ public sealed class AnalysisConsolePrintButtonPressedMessage : BoundUserInterfac } [Serializable, NetSerializable] -public sealed class AnalysisConsoleDestroyButtonPressedMessage : BoundUserInterfaceMessage +public sealed class AnalysisConsoleExtractButtonPressedMessage : BoundUserInterfaceMessage { } diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-analyzer.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-analyzer.ftl index 87c96ffc48..453680f427 100644 --- a/Resources/Locale/en-US/xenoarchaeology/artifact-analyzer.ftl +++ b/Resources/Locale/en-US/xenoarchaeology/artifact-analyzer.ftl @@ -4,8 +4,8 @@ analysis-console-scan-button = Scan analysis-console-scan-tooltip-info = Scan artifacts to learn information about their structure. analysis-console-print-button = Print analysis-console-print-tooltip-info = Print out the current information about the artifact. -analysis-console-destroy-button = Extract -analysis-console-destroy-button-info = Extract points from an artifact based on the explored nodes. +analysis-console-extract-button = Extract +analysis-console-extract-button-info = Extract points from an artifact based on the newly explored nodes. analysis-console-info-no-scanner = No analyzer connected! Please connect one using a multitool. analysis-console-info-no-artifact = No artifact present! Place one on the pad then scan for information. @@ -31,4 +31,4 @@ analyzer-artifact-component-upgrade-analysis = analysis duration analysis-console-print-popup = The console printed out a report. analyzer-artifact-extract-popup = Energy shimmers on the artifact's surface! -analysis-report-title = Artifact Report: Node {$id} \ No newline at end of file +analysis-report-title = Artifact Report: Node {$id}