emulate squad-wide pickups by allowing materials picked up by other marines to count as pickups of materials of the same type that are not located in the mission.

Author: BenLubar

src/game/client/swarm/vgui/asw_hud_chat.cpp

@@ -374,6 +374,7 @@ static const char *const s_szItemPickupMessages[] =
 	"#rd_player_found_promo_item",
 	"#rd_player_found_crafting_material",
 	"#rd_player_found_crafting_materials",
+	"#rd_player_found_crafting_materials_assist"
 };
 
 void CHudChat::MsgFunc_RDItemPickupMsg( bf_read &msg )
@@ -424,6 +425,28 @@ void CHudChat::MsgFunc_RDItemPickupMsg( bf_read &msg )
 		return;
 	}
 
+	if ( iMessage == 2 )
+	{
+		C_ASW_Player *pLocalPlayer = C_ASW_Player::GetLocalASWPlayer();
+		if ( pLocalPlayer && pPlayer != pLocalPlayer && pLocalPlayer->GetNPC() && pLocalPlayer->GetNPC()->GetHealth() > 0 )
+		{
+			for ( int i = 0; i < NUM_RD_CRAFTING_MATERIAL_TYPES; i++ )
+			{
+				if ( g_RD_Crafting_Material_Info[i].m_iItemDef != iDef )
+				{
+					continue;
+				}
+
+				if ( g_RD_Crafting_Material_Rarity_Info[g_RD_Crafting_Material_Info[i].m_iRarity].m_bAllowPickupAssist )
+				{
+					ReactiveDropInventory::PickUpCraftingMaterialAssist( static_cast< RD_Crafting_Material_t >( i ) );
+				}
+
+				break;
+			}
+		}
+	}
+
 	wchar_t wszItemName[256];
 	wszItemName[0] = COLOR_ACHIEVEMENT;
 	V_UTF8ToUnicode( pDef->Name.Get(), &wszItemName[1], sizeof( wszItemName ) - sizeof( wchar_t ) );

src/game/shared/swarm/rd_crafting_defs.cpp

@@ -88,11 +88,11 @@ const RD_Crafting_Material_Info g_RD_Crafting_Material_Info[] =
 
 const RD_Crafting_Material_Rarity_Info g_RD_Crafting_Material_Rarity_Info[] =
 {
-	{ "#rd_crafting_material_rarity_industrial", "RD_Crafting_Material_Found.Industrial", true },
-	{ "#rd_crafting_material_rarity_bulk", "RD_Crafting_Material_Found.Bulk", true },
-	{ "#rd_crafting_material_rarity_alien", "RD_Crafting_Material_Found.Alien", true },
-	{ "#rd_crafting_material_rarity_tech", "RD_Crafting_Material_Found.Tech", true },
-	{ "#rd_crafting_material_rarity_salvaged", "RD_Crafting_Material_Found.Salvaged", true },
+	{ "#rd_crafting_material_rarity_industrial", "RD_Crafting_Material_Found.Industrial", true, true },
+	{ "#rd_crafting_material_rarity_bulk", "RD_Crafting_Material_Found.Bulk", true, true },
+	{ "#rd_crafting_material_rarity_alien", "RD_Crafting_Material_Found.Alien", true, true },
+	{ "#rd_crafting_material_rarity_tech", "RD_Crafting_Material_Found.Tech", true, true },
+	{ "#rd_crafting_material_rarity_salvaged", "RD_Crafting_Material_Found.Salvaged", true, true },
 };
 
 // hard-coded so we don't have to search the entire item ID space to figure out which items can appear in a box.

src/game/shared/swarm/rd_crafting_defs.h

@@ -82,6 +82,7 @@ struct RD_Crafting_Material_Rarity_Info
 	const char *m_szDisplayName;
 	const char *m_szPickupSound;
 	bool m_bCanFindInMission;
+	bool m_bAllowPickupAssist;
 };
 
 struct RD_Crafting_Contains_Any_List

src/game/shared/swarm/rd_inventory_command.cpp

@@ -461,6 +461,30 @@ static bool PreValidateInventoryCommand( CASW_Player *pPlayer, EInventoryCommand
 			Warning( "Player %s sent invalid InvCmdInit - out of range location number for material pickup (%d).\n", pPlayer->GetASWNetworkID(), args[0] );
 			return false;
 		}
+#endif
+		break;
+	case INVCMD_MATERIAL_PICKUP_ASSIST:
+#ifdef RD_7A_DROPS
+		if ( args.Count() != 2 )
+		{
+			Warning( "Player %s sent invalid InvCmdInit - wrong number of args for material pickup assist (%d).\n", pPlayer->GetASWNetworkID(), args.Count() );
+			return false;
+		}
+		if ( args[0] < 0 || args[0] >= NUM_RD_CRAFTING_MATERIAL_TYPES )
+		{
+			Warning( "Player %s sent invalid InvCmdInit - out of range location number for material pickup assist (%d).\n", pPlayer->GetASWNetworkID(), args[0] );
+			return false;
+		}
+		if ( !g_RD_Crafting_Material_Rarity_Info[g_RD_Crafting_Material_Info[args[0]].m_iRarity].m_bAllowPickupAssist )
+		{
+			Warning( "Player %s sent invalid InvCmdInit - invalid item type for material pickup assist (%d).\n", pPlayer->GetASWNetworkID(), args[0] );
+			return false;
+		}
+		if ( args[1] < 0 )
+		{
+			Warning( "Player %s sent invalid InvCmdInit - negative quantity for material pickup assist (%d).\n", pPlayer->GetASWNetworkID(), args[1] );
+			return false;
+		}
 #endif
 		break;
 	case INVCMD_PROMO_DROP:
@@ -848,10 +872,25 @@ static void ExecuteInventoryCommand( CASW_Player *pPlayer, EInventoryCommand eCm
 
 		CReliableBroadcastRecipientFilter filter;
 		UserMessageBegin( filter, "RDItemPickupMsg" );
-			WRITE_BYTE( 2 );
-			WRITE_BYTE( pPlayer->entindex() );
-			WRITE_LONG( g_RD_Crafting_Material_Info[eMaterial].m_iItemDef );
-			WRITE_LONG( nTotalQuantity );
+		WRITE_BYTE( 2 );
+		WRITE_BYTE( pPlayer->entindex() );
+		WRITE_LONG( g_RD_Crafting_Material_Info[eMaterial].m_iItemDef );
+		WRITE_LONG( nTotalQuantity );
+		MessageEnd();
+#endif
+		break;
+	}
+	case INVCMD_MATERIAL_PICKUP_ASSIST:
+	{
+#ifdef RD_7A_DROPS
+		// don't bother checking the inventory result for now; just require one so it's hard to make a fake message
+
+		CReliableBroadcastRecipientFilter filter;
+		UserMessageBegin( filter, "RDItemPickupMsg" );
+		WRITE_BYTE( 3 );
+		WRITE_BYTE( pPlayer->entindex() );
+		WRITE_LONG( g_RD_Crafting_Material_Info[args[0]].m_iItemDef );
+		WRITE_LONG( args[1] );
 		MessageEnd();
 #endif
 		break;

src/game/shared/swarm/rd_inventory_command.h

@@ -8,6 +8,7 @@ enum EInventoryCommand
 	INVCMD_MARINE_RESOURCE_EQUIPS,
 	INVCMD_MATERIAL_SPAWN,
 	INVCMD_MATERIAL_PICKUP,
+	INVCMD_MATERIAL_PICKUP_ASSIST,
 	INVCMD_PROMO_DROP,
 };
 

src/game/shared/swarm/rd_inventory_shared.cpp

@@ -1192,6 +1192,7 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 			case CRAFT_DELETE:
 				return true;
 			case CRAFT_PICKUP_MATERIAL:
+			case CRAFT_PICKUP_MATERIAL_ASSIST:
 			case CRAFT_BTS:
 			case CRAFT_DROP:
 			case CRAFT_PROMO:
@@ -1225,6 +1226,7 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 		case CRAFT_DYNAMIC_PROPERTY_INIT_RETRY:
 			return pTask->m_iAccessoryDef != BaseModUI::ItemShowcase::MODE_ITEM_DROP;
 		case CRAFT_PICKUP_MATERIAL:
+		case CRAFT_PICKUP_MATERIAL_ASSIST:
 			// returning false to avoid popping up modal errors during gameplay
 			return false;
 		case CRAFT_BTS:
@@ -1348,6 +1350,51 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 				args.AddToTail( pTask->m_iAccessoryDef );
 				UTIL_RD_SendInventoryCommand( INVCMD_MATERIAL_PICKUP, args, pTask->m_hResult );
 			}
+#endif
+			break;
+		case CRAFT_PICKUP_MATERIAL_ASSIST:
+#ifdef RD_7A_DROPS
+			{
+				RD_Crafting_Material_t eMaterialType = static_cast< RD_Crafting_Material_t >( pTask->m_iAccessoryDef );
+				RD_Crafting_Material_Rarity_t eMaterialRarity = g_RD_Crafting_Material_Info[eMaterialType].m_iRarity;
+				const char *szPickupSound = g_RD_Crafting_Material_Rarity_Info[eMaterialRarity].m_szPickupSound;
+
+				if ( szPickupSound )
+				{
+					CLocalPlayerFilter filter;
+					C_BaseEntity::EmitSound( filter, -1/*SOUND_FROM_LOCAL_PLAYER*/, szPickupSound );
+				}
+
+				uint32 nCount{};
+				pInventory->GetResultItems( pTask->m_hResult, NULL, &nCount );
+				CUtlVector<SteamItemDetails_t> diff;
+				diff.AddMultipleToTail( nCount );
+				pInventory->GetResultItems( pTask->m_hResult, diff.Base(), &nCount );
+
+				int added = 0;
+				FOR_EACH_VEC( diff, i )
+				{
+					if ( diff[i].m_unFlags & ( k_ESteamItemConsumed | k_ESteamItemRemoved ) )
+					{
+						continue;
+					}
+
+					if ( const ItemInstance_t *pCached = GetLocalItemCache( diff[i].m_itemId ) )
+					{
+						diff[i].m_unQuantity = MAX( 0, int( diff[i].m_unQuantity ) - pCached->Quantity );
+					}
+
+					if ( diff[i].m_iDefinition == g_RD_Crafting_Material_Info[eMaterialType].m_iItemDef )
+					{
+						added = diff[i].m_unQuantity;
+					}
+				}
+
+				CUtlVector<int> args;
+				args.AddToTail( eMaterialType );
+				args.AddToTail( added );
+				UTIL_RD_SendInventoryCommand( INVCMD_MATERIAL_PICKUP_ASSIST, args, pTask->m_hResult );
+			}
 #endif
 			break;
 		case CRAFT_BTS:
@@ -2174,7 +2221,8 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 		}
 
 		Assert( eMaterial > RD_CRAFTING_MATERIAL_NONE && eMaterial < NUM_RD_CRAFTING_MATERIAL_TYPES );
-		if ( eMaterial <= 0 || eMaterial >= NUM_RD_CRAFTING_MATERIAL_TYPES)
+		Assert( g_RD_Crafting_Material_Rarity_Info[g_RD_Crafting_Material_Info[eMaterial].m_iRarity].m_bCanFindInMission );
+		if ( eMaterial <= 0 || eMaterial >= NUM_RD_CRAFTING_MATERIAL_TYPES )
 		{
 			Warning( "Cannot pick up crafting material at location %d with out of range type %d!\n", iLocation, eMaterial );
 			return;
@@ -2206,6 +2254,77 @@ static class CRD_Inventory_Manager final : public CAutoGameSystem, public CGameE
 
 		m_CraftingMaterialToken[iLocation] = k_SteamItemInstanceIDInvalid;
 		// leave m_CraftingMaterialType[iLocation] set
+		if ( ItemInstance_t *pConsumed = GetLocalItemCacheForModify( m_CraftingMaterialToken[iLocation] ) )
+		{
+			pConsumed->Quantity--;
+		}
+
+	}
+
+	void PickUpCraftingMaterialAssist( RD_Crafting_Material_t eMaterial )
+	{
+		GET_INVENTORY_OR_BAIL;
+
+		Assert( eMaterial > RD_CRAFTING_MATERIAL_NONE && eMaterial < NUM_RD_CRAFTING_MATERIAL_TYPES );
+		Assert( g_RD_Crafting_Material_Rarity_Info[g_RD_Crafting_Material_Info[eMaterial].m_iRarity].m_bCanFindInMission );
+		Assert( g_RD_Crafting_Material_Rarity_Info[g_RD_Crafting_Material_Info[eMaterial].m_iRarity].m_bAllowPickupAssist );
+		if ( eMaterial <= 0 || eMaterial >= NUM_RD_CRAFTING_MATERIAL_TYPES )
+		{
+			Warning( "Cannot pick up crafting material for assist with out of range type %d!\n", eMaterial );
+			return;
+		}
+
+		CUtlVector<ReactiveDropInventory::ItemInstance_t> optin;
+		ReactiveDropInventory::GetItemsForSlot( optin, "crafting_material_beta_opt_in" );
+		if ( !rd_crafting_material_pickups.GetBool() || !optin.Count() )
+		{
+			// we're pretending we don't have any material tokens.
+			return;
+		}
+
+		SteamItemDef_t generate[1] = { g_RD_Crafting_Material_Info[eMaterial].m_iRedeemDef };
+		SteamItemInstanceID_t consume[1] = { k_SteamItemInstanceIDInvalid };
+		uint32 one[1] = { 1 };
+
+		CUtlVector<ItemInstance_t> tokens;
+		GetItemsForDef( tokens, g_RD_Crafting_Material_Info[eMaterial].m_iTokenDef );
+
+		FOR_EACH_VEC( tokens, i )
+		{
+			int count = tokens[i].Quantity;
+			for ( int iLocation = 0; iLocation < RD_MAX_CRAFTING_MATERIAL_SPAWN_LOCATIONS; iLocation++ )
+			{
+				if ( m_CraftingMaterialToken[iLocation] == tokens[i].ItemID )
+				{
+					count--;
+				}
+			}
+
+			if ( count > 0 )
+			{
+				consume[0] = tokens[i].ItemID;
+				break;
+			}
+		}
+
+		if ( consume[0] == k_SteamItemInstanceIDInvalid )
+		{
+			// don't have a spare token.
+			return;
+		}
+
+		SteamInventoryResult_t *pResult = AddCraftItemTask( CRAFT_PICKUP_MATERIAL_ASSIST, eMaterial, consume[0] );
+		pInventory->ExchangeItems( pResult, generate, one, 1, consume, one, 1 );
+
+		if ( rd_debug_inventory.GetBool() )
+		{
+			Msg( "[C] Sent request to pick up %s (assist) (handle: %08x)\n", g_RD_Crafting_Material_Info[eMaterial].m_szName, *pResult );
+		}
+
+		if ( ItemInstance_t *pConsumed = GetLocalItemCacheForModify( consume[0] ) )
+		{
+			pConsumed->Quantity--;
+		}
 	}
 #endif
 
@@ -3489,6 +3608,15 @@ namespace ReactiveDropInventory
 
 		s_RD_Inventory_Manager.PickUpCraftingMaterialAtLocation( iLocation, eMaterial );
 	}
+	void PickUpCraftingMaterialAssist( RD_Crafting_Material_t eMaterial )
+	{
+		if ( engine->IsPlayingDemo() )
+		{
+			return;
+		}
+
+		s_RD_Inventory_Manager.PickUpCraftingMaterialAssist( eMaterial );
+	}
 	int GetCraftingMaterialsFound()
 	{
 		int nCount = 0;

src/game/shared/swarm/rd_inventory_shared.h

@@ -190,6 +190,7 @@ namespace ReactiveDropInventory
 	void DeleteNotificationItem( SteamItemInstanceID_t id );
 #ifdef RD_7A_DROPS
 	void PickUpCraftingMaterialAtLocation( int iLocation, RD_Crafting_Material_t eMaterial );
+	void PickUpCraftingMaterialAssist( RD_Crafting_Material_t eMaterial );
 	int GetCraftingMaterialsFound();
 	int GetCraftingMaterialsMissed();
 #endif
@@ -207,6 +208,8 @@ namespace ReactiveDropInventory
 		CRAFT_CLAIM_MAJOR,
 		// picking up a crafting material. silent while in progress. in-game notification when complete.
 		CRAFT_PICKUP_MATERIAL,
+		// someone else picked up a material, and we get it too.
+		CRAFT_PICKUP_MATERIAL_ASSIST,
 		// behind-the-scenes item exchange. no notification.
 		CRAFT_BTS,
 		// set dynamic properties on newly created item to 0. modal while in progress. notifies user when complete (replaces notification from craft task that queued this).