diff --git a/ArchiSteamFarm/JSON/Steam.cs b/ArchiSteamFarm/JSON/Steam.cs index 990b2501f69b8..54e5dbfa4c4ba 100644 --- a/ArchiSteamFarm/JSON/Steam.cs +++ b/ArchiSteamFarm/JSON/Steam.cs @@ -249,16 +249,16 @@ internal ulong OtherSteamID64 { } } - internal bool IsSteamOnlyTrade { + internal bool IsSteamCardsOnlyTrade { get { foreach (Item item in ItemsToGive) { - if (item.AppID != Item.SteamAppID || item.ContextID != Item.SteamContextID) { + if (item.AppID != Item.SteamAppID || item.ContextID != Item.SteamContextID || (item.Type != Item.EType.FoilTradingCard && item.Type != Item.EType.TradingCard)) { return false; } } foreach (Item item in ItemsToReceive) { - if (item.AppID != Item.SteamAppID || item.ContextID != Item.SteamContextID) { + if (item.AppID != Item.SteamAppID || item.ContextID != Item.SteamContextID || (item.Type != Item.EType.FoilTradingCard && item.Type != Item.EType.TradingCard)) { return false; } } diff --git a/ArchiSteamFarm/Trading.cs b/ArchiSteamFarm/Trading.cs index e66cff66c6e11..3df71faf56310 100644 --- a/ArchiSteamFarm/Trading.cs +++ b/ArchiSteamFarm/Trading.cs @@ -153,13 +153,13 @@ private bool ShouldAcceptTrade(Steam.TradeOffer tradeOffer) { return false; } - // Rule 2 - We always trade steam itmes and only for the same set - if (!tradeOffer.IsSteamOnlyTrade || !tradeOffer.IsPotentiallyDupesTrade) { + // Rule 2 - We always trade steam cards and only for the same set + if (!tradeOffer.IsSteamCardsOnlyTrade || !tradeOffer.IsPotentiallyDupesTrade) { return false; } // This STM trade SHOULD be fine - // Potential TODO: Ensure that our inventory in fact has proper amount of both received and given items + // Potential TODO: Ensure that our inventory in fact has proper amount of both received and given cards // This way we could calculate amounts before and after trade, ensuring that we're in fact trading dupes and not 1 + 2 -> 0 + 3 return true; }