fix Steam's broken auto_stack for playtime generators

Author: BenLubar

src/game/client/swarm/rd_collections_crafting.cpp

@@ -136,6 +136,8 @@ void CRD_Crafting_Panel::OnCommand( const char *szCommand )
 			// (this assumption allows us to use a greedy algorithm)
 			FOR_EACH_VEC( variant.m_Inputs, j )
 			{
+				Assert( variant.m_Inputs[j].m_iQuantity == 1 );
+
 				FOR_EACH_VEC( variant.m_Inputs[j].m_AllowedItem, k )
 				{
 					CUtlVector<ReactiveDropInventory::ItemInstance_t> instances;

src/game/shared/swarm/rd_crafting_defs.h

@@ -100,6 +100,7 @@ struct RD_Crafting_Recipe_Input
 {
 	CCopyableUtlVector<SteamItemDef_t> m_AllowedItem;
 	uint32_t m_iFlags = 0;
+	uint32_t m_iQuantity = 1;
 };
 
 struct RD_Crafting_Recipe_Variant

src/game/shared/swarm/rd_inventory_shared.cpp

@@ -281,21 +281,34 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 
 		m_HighOwnedInventoryDefIDs.Purge();
 
+		CUtlMap<SteamItemDef_t, CCopyableUtlVector<SteamItemInstanceID_t>> autoStackDefs( DefLessFunc( SteamItemDef_t ) );
 		for ( uint32 i = 0; i < nItems; i++ )
 		{
 			ReactiveDropInventory::ItemInstance_t instance{ hResult, i };
 			m_LocalInventoryCache.AddToTail( instance );
 
-			// precache item def + icon
-			( void )ReactiveDropInventory::GetItemDef( instance.ItemDefID );
+			// precache item def + icon and check for auto-stack flag
+			const ReactiveDropInventory::ItemDef_t *pDef = ReactiveDropInventory::GetItemDef( instance.ItemDefID );
+			if ( pDef && pDef->AutoStack )
+			{
+				unsigned short index = autoStackDefs.Find( instance.ItemDefID );
+				if ( !autoStackDefs.IsValidIndex( index ) )
+				{
+					index = autoStackDefs.Insert( instance.ItemDefID );
+				}
+
+				autoStackDefs[index].AddToTail( instance.ItemID );
+			}
 
 			// The Steam inventory API doesn't list item def IDs that are between 1 million and 1 billion unless we ask about them specifically.
 			// If we own any items with def IDs in this range, remember that and re-write the schema cache to include them.
 			// These IDs are used for donation receipt medals as well as unique medals.
 			if ( instance.ItemDefID >= 1000000 )
 			{
 				if ( !m_HighOwnedInventoryDefIDs.IsValidIndex( m_HighOwnedInventoryDefIDs.Find( instance.ItemDefID ) ) )
+				{
 					m_HighOwnedInventoryDefIDs.AddToTail( instance.ItemDefID );
+				}
 			}
 		}
 
@@ -320,6 +333,33 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 			}
 		}
 
+		if ( rd_debug_inventory.GetBool() )
+		{
+			DevMsg( 3, "Verifying %d auto-stack defs...\n", autoStackDefs.Count() );
+		}
+		FOR_EACH_MAP_FAST( autoStackDefs, i )
+		{
+			if ( autoStackDefs[i].Count() == 1 )
+			{
+				continue;
+			}
+
+			Assert( autoStackDefs[i].Count() != 0 );
+
+			if ( rd_debug_inventory.GetBool() )
+			{
+				Msg( "Have %d stacks of auto-stack item %d; merging\n", autoStackDefs[i].Count(), autoStackDefs.Key( i ) );
+			}
+
+			pInventory->TransferItemQuantity( AddCraftItemTask( CRAFT_AUTO_STACK, autoStackDefs.Key( i ) ), autoStackDefs[i][1], GetLocalItemCache( autoStackDefs[i][1] )->Quantity, autoStackDefs[i][0] );
+			if ( autoStackDefs[i].Count() > 2 )
+			{
+				m_CraftingQueue.Tail()->m_RetryItemList.AddVectorToTail( autoStackDefs[i] );
+				m_CraftingQueue.Tail()->m_RetryItemList.FastRemove( 1 );
+				m_CraftingQueue.Tail()->m_RetryItemList.FastRemove( 0 );
+			}
+		}
+
 		ThreadExecute( WriteInventoryCacheHelper );
 	}
 
@@ -1277,6 +1317,7 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 			case CRAFT_DELETE_SILENT:
 			case CRAFT_NOTIFICATION_DYNAMIC_PROPERTY_UPDATE:
 			case CRAFT_AUTO_BACKGROUND:
+			case CRAFT_AUTO_STACK:
 				break;
 			default:
 				Assert( !"unhandled crafting task type" );
@@ -1313,6 +1354,7 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 		case CRAFT_DELETE_SILENT:
 		case CRAFT_NOTIFICATION_DYNAMIC_PROPERTY_UPDATE:
 		case CRAFT_AUTO_BACKGROUND:
+		case CRAFT_AUTO_STACK:
 			break;
 		default:
 			Assert( !"unhandled crafting task type" );
@@ -1457,14 +1499,22 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 						continue;
 					}
 
+					char buf[12]{};
+					uint32 len = sizeof( buf );
+					int32 quantity = 0;
+					if ( pInventory->GetResultItemProperty( pTask->m_hResult, i, "quantity", buf, &len ) )
+					{
+						quantity = strtol( buf, NULL, 10 );
+					}
+
 					if ( const ItemInstance_t *pCached = GetLocalItemCache( diff[i].m_itemId ) )
 					{
-						diff[i].m_unQuantity = MAX( 0, int( diff[i].m_unQuantity ) - pCached->Quantity );
+						quantity = MAX( 0, quantity - pCached->Quantity );
 					}
 
 					if ( diff[i].m_iDefinition == g_RD_Crafting_Material_Info[eMaterialType].m_iItemDef )
 					{
-						added = diff[i].m_unQuantity;
+						added += quantity;
 					}
 				}
 
@@ -1527,6 +1577,53 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 			break;
 		case CRAFT_AUTO_BACKGROUND:
 			break;
+		case CRAFT_AUTO_STACK:
+			if ( pTask->m_RetryItemList.Count() != 0 )
+			{
+				uint32 nCount{};
+				pInventory->GetResultItems( pTask->m_hResult, NULL, &nCount );
+				CUtlVector<SteamItemDetails_t> items;
+				items.AddMultipleToTail( nCount );
+				pInventory->GetResultItems( pTask->m_hResult, items.Base(), &nCount );
+
+				SteamItemInstanceID_t iStacked = k_SteamItemInstanceIDInvalid;
+				FOR_EACH_VEC( items, i )
+				{
+					if ( items[i].m_unFlags & ( k_ESteamItemConsumed | k_ESteamItemRemoved ) )
+					{
+						continue;
+					}
+
+					char buf[12]{};
+					uint32 len = sizeof( buf );
+					int32 quantity = 0;
+					if ( pInventory->GetResultItemProperty( pTask->m_hResult, i, "quantity", buf, &len ) )
+					{
+						quantity = strtol( buf, NULL, 10 );
+					}
+
+					if ( quantity > 0 )
+					{
+						Assert( items[i].m_iDefinition == pTask->m_iAccessoryDef );
+						Assert( iStacked == k_SteamItemInstanceIDInvalid );
+						iStacked = items[i].m_itemId;
+					}
+				}
+
+				Assert( iStacked != k_SteamItemInstanceIDInvalid );
+				if ( iStacked != k_SteamItemInstanceIDInvalid )
+				{
+					if ( rd_debug_inventory.GetBool() )
+					{
+						Msg( "Have %d remaining stacks of auto-stack item %d; merging\n", pTask->m_RetryItemList.Count() + 1, pTask->m_iAccessoryDef );
+					}
+
+					pInventory->TransferItemQuantity( AddCraftItemTask( CRAFT_AUTO_STACK, pTask->m_iAccessoryDef ), pTask->m_RetryItemList[0], GetLocalItemCache( pTask->m_RetryItemList[0] )->Quantity, iStacked );
+					m_CraftingQueue.Tail()->m_RetryItemList.AddVectorToTail( pTask->m_RetryItemList );
+					m_CraftingQueue.Tail()->m_RetryItemList.FastRemove( 0 );
+				}
+			}
+			break;
 		default:
 			Assert( !"unhandled crafting task type" );
 			break;

src/game/shared/swarm/rd_inventory_shared.h

@@ -236,6 +236,8 @@ namespace ReactiveDropInventory
 		CRAFT_NOTIFICATION_DYNAMIC_PROPERTY_UPDATE,
 		// automated actions, like upgrading stacks of medals after a player has added a new color to the stack.
 		CRAFT_AUTO_BACKGROUND,
+		// automatically fixing auto-stack items that are in separate piles.
+		CRAFT_AUTO_STACK,
 	};
 	void PerformCraftingAction( CraftItemType_t eCraftType, SteamItemDef_t recipe, std::initializer_list<SteamItemInstanceID_t> ingredient, std::initializer_list<uint32> quantity, SteamItemDef_t iAccessoryDef = 0, SteamItemInstanceID_t iReplaceItemInstance = k_SteamItemInstanceIDInvalid );
 	void RequestFullInventoryRefresh();