Implement ValveSoftware#1424

Author: Bitl

src/game/shared/tf/tf_gamerules.cpp

@@ -2199,7 +2199,11 @@ bool CTFGameRules::GameModeUsesUpgrades( void )
 	if ( m_nForceUpgrades == 1 )
 		return false;
 
+#ifdef BDSBASE
+	if (m_nForceUpgrades == 2 || m_nForceUpgrades == 3)
+#else
 	if ( m_nForceUpgrades == 2 )
+#endif
 		return true;
 
 	if ( IsMannVsMachineMode() || IsBountyMode() )
@@ -3810,6 +3814,14 @@ bool CTFGameRules::CanInitiateDuels( void )
 	return true;
 }
 
+#ifdef BDSBASE
+//-----------------------------------------------------------------------------
+bool CTFGameRules::ShouldProvidePowerupBottle(void)
+{
+	return GameModeUsesUpgrades() && m_nForceUpgrades != 3;
+}
+#endif
+
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------

src/game/shared/tf/tf_gamerules.h

@@ -743,6 +743,9 @@ bool IsCreepWaveMode( void ) const;
 
 	bool IsUsingSpells( void ) const;
 	bool IsUsingGrapplingHook( void ) const;
+#ifdef BDSBASE
+	bool ShouldProvidePowerupBottle(void);
+#endif
 
 	bool IsTruceActive( void ) const; 
 

src/game/shared/tf/tf_item_inventory.cpp

@@ -745,6 +745,11 @@ bool CTFInventoryManager::SlotContainsBaseItems( EEquipType_t eType, int iSlot )
 
 		if ( TFGameRules() && TFGameRules()->IsUsingGrapplingHook() )
 			return true;
+
+#ifdef BDSBASE
+		if (TFGameRules() && TFGameRules()->ShouldProvidePowerupBottle())
+			return true;
+#endif
 	}
 	// Normal game
 	return iSlot < LOADOUT_POSITION_HEAD;
@@ -786,7 +791,11 @@ CEconItemView *CTFInventoryManager::GetBaseItemForClass( int iClass, int iSlot )
 		}
 
 		static CSchemaItemDefHandle pItemDef_MvMCanteen( "Default Power Up Canteen (MvM)" );
+#ifdef BDSBASE
+		if (TFGameRules() && TFGameRules()->ShouldProvidePowerupBottle() && pItemDef_MvMCanteen)
+#else
 		if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() && pItemDef_MvMCanteen )
+#endif
 		{
 			stockActionItemDefIndices.AddToTail( pItemDef_MvMCanteen->GetDefinitionIndex() );
 		}