From 48c8052afe44a4b36155e19c3c36c697bbc22f2a Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 26 Nov 2023 13:21:44 +0100 Subject: [PATCH] Add antique gear (from Snowcloak/Sastasha Hard/Qarn Hard) to allowed discardable items --- ARDiscard/ARDiscard.csproj | 2 +- ARDiscard/AutoDiscardPlogon.cs | 2 +- ARDiscard/GameData/InternalConfiguration.cs | 20 +++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ARDiscard/ARDiscard.csproj b/ARDiscard/ARDiscard.csproj index ef5b0c0..dfbb39d 100644 --- a/ARDiscard/ARDiscard.csproj +++ b/ARDiscard/ARDiscard.csproj @@ -1,7 +1,7 @@ net7.0-windows - 3.4 + 3.5 11.0 enable true diff --git a/ARDiscard/AutoDiscardPlogon.cs b/ARDiscard/AutoDiscardPlogon.cs index 5029068..522597b 100644 --- a/ARDiscard/AutoDiscardPlogon.cs +++ b/ARDiscard/AutoDiscardPlogon.cs @@ -161,7 +161,7 @@ public class AutoDiscardPlogon : IDalamudPlugin InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard(itemFilter); if (nextItem == null) { - _pluginLog.Information($"No item to discard found"); + _pluginLog.Information("No item to discard found"); FinishDiscarding(type); } else diff --git a/ARDiscard/GameData/InternalConfiguration.cs b/ARDiscard/GameData/InternalConfiguration.cs index 83c9ffd..415e0e1 100644 --- a/ARDiscard/GameData/InternalConfiguration.cs +++ b/ARDiscard/GameData/InternalConfiguration.cs @@ -4,18 +4,22 @@ namespace ARDiscard.GameData; internal static class InternalConfiguration { + /// + /// Not all of these *can* be discarded, but we shouldn't attempt it either. + /// public static readonly IReadOnlyList BlacklistedItems = new List { 2820, // red onion helm + 16039, // ala mhigan earrings 24589, // aetheryte earrings 33648, // menphina's earrings - 21197, // UCOB - 23175, // UWU - 28633, // TEA - 36810, // DSR - 38951, // TOP + 21197, // UCOB token + 23175, // UWU token + 28633, // TEA token + 36810, // DSR token + 38951, // TOP token }.AsReadOnly(); /// @@ -27,5 +31,11 @@ internal static class InternalConfiguration 2962, // Onion Doublet 3279, // Onion Gaskins 3743, // Onion Patterns + + 9387, // Antique Helm + 9388, // Antique Mail + 9389, // Antique Gauntlets + 9390, // Antique Breeches + 9391, // Antique Sollerets }.AsReadOnly(); }