From b54d46468f4e14064051e2a42bc64cc50d889536 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 21 Sep 2023 23:28:35 +0200 Subject: [PATCH] Minor tweaks --- Deliveroo/DeliverooPlugin.cs | 5 ++--- Deliveroo/GameData/GcRewardItem.cs | 2 +- Deliveroo/Windows/TurnInWindow.cs | 6 ++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Deliveroo/DeliverooPlugin.cs b/Deliveroo/DeliverooPlugin.cs index bc96ed8..68807cd 100644 --- a/Deliveroo/DeliverooPlugin.cs +++ b/Deliveroo/DeliverooPlugin.cs @@ -76,7 +76,7 @@ public sealed class DeliverooPlugin : IDalamudPlugin public string Name => "Deliveroo"; - private Stage CurrentStage + internal Stage CurrentStage { get => _currentStageInternal; set @@ -85,7 +85,6 @@ public sealed class DeliverooPlugin : IDalamudPlugin { PluginLog.Information($"Changing stage from {_currentStageInternal} to {value}"); _currentStageInternal = value; - _turnInWindow.Debug = CurrentStage.ToString(); } } } @@ -657,7 +656,7 @@ public sealed class DeliverooPlugin : IDalamudPlugin (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)obj.Address, false); } - private enum Stage + internal enum Stage { TargetPersonnelOfficer, OpenGcSupply, diff --git a/Deliveroo/GameData/GcRewardItem.cs b/Deliveroo/GameData/GcRewardItem.cs index ec83cd9..588ddb4 100644 --- a/Deliveroo/GameData/GcRewardItem.cs +++ b/Deliveroo/GameData/GcRewardItem.cs @@ -8,7 +8,7 @@ internal sealed class GcRewardItem : IEquatable public static GcRewardItem None { get; } = new GcRewardItem { ItemId = 0, - Name = "Buy Nothing", + Name = "---", GrandCompany = GrandCompany.None, Tier = RewardTier.First, SubCategory = RewardSubCategory.Unknown, diff --git a/Deliveroo/Windows/TurnInWindow.cs b/Deliveroo/Windows/TurnInWindow.cs index 7f0cb19..ce77ccd 100644 --- a/Deliveroo/Windows/TurnInWindow.cs +++ b/Deliveroo/Windows/TurnInWindow.cs @@ -70,8 +70,6 @@ internal sealed class TurnInWindow : Window } } - public string Debug { get; set; } - public override void OnOpen() { SelectedItemId = _configuration.SelectedPurchaseItemId; @@ -101,7 +99,7 @@ internal sealed class TurnInWindow : Window ImGui.Spacing(); ImGui.BeginDisabled(state); - List comboValues = new() { "Buy Nothing" }; + List comboValues = new() { GcRewardItem.None.Name }; foreach (var itemId in _configuration.ItemsAvailableForPurchase) { var name = _gcRewardsCache.Rewards[grandCompany].First(x => x.ItemId == itemId).Name; @@ -127,7 +125,7 @@ internal sealed class TurnInWindow : Window ImGui.Unindent(27); ImGui.Separator(); - ImGui.Text($"Debug (State): {Debug}"); + ImGui.Text($"Debug (State): {_plugin.CurrentStage}"); } private unsafe int GetItemCount(uint itemId)