Implement ValveSoftware#1520

Author: Bitl

game/quiver/info_changelog.txt

@@ -76,6 +76,7 @@ Added the following Source SDK Pull Requests:
 	- #1516: Fix not being able to toggle off the orthographic camera
 	- #1517: Implement tf_stats_bogus covnvars to allow High stat tracking in modes with Increased Stats. I.E MvM
 	- #1518: Fix the B.A.S.E. Jumper's parachute not using half of its animations
+	- #1520: Add ForceDifficultyBasedAim CTFBot flag to allow MvM missions to let Spies aim better
 
 Details:
 - Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/server/tf/bot/tf_bot.h

@@ -277,6 +277,9 @@ class CTFBot: public NextBotPlayer< CTFPlayer >, public CGameEventListener
 		FIRE_IMMUNE					= 1<<25,				// "" fire
 		PARACHUTE					= 1<<26,				// demo/soldier parachute when falling
 		PROJECTILE_SHIELD			= 1<<27,				// medic projectile shield
+#ifdef BDSBASE
+		FORCE_DIFFICULTY_BASED_AIM = 1 << 28,				// force difficulty-based aim (for spy)
+#endif
 	};
 	void SetAttribute( int attributeFlag );
 	void ClearAttribute( int attributeFlag );

src/game/server/tf/bot/tf_bot_body.cpp

@@ -18,7 +18,11 @@ float CTFBotBody::GetHeadAimTrackingInterval( void ) const
 	CTFBot *me = (CTFBot *)GetBot();
 
 	// don't let Spies in MvM mode aim too precisely
+#ifdef BDSBASE
+	if (TFGameRules()->IsMannVsMachineMode() && me->IsPlayerClass(TF_CLASS_SPY) && !me->HasAttribute(CTFBot::FORCE_DIFFICULTY_BASED_AIM))
+#else
 	if ( TFGameRules()->IsMannVsMachineMode() && me->IsPlayerClass( TF_CLASS_SPY ) )
+#endif
 	{
 		return 0.25f;
 	}

src/game/server/tf/player_vs_environment/tf_populator_spawners.cpp

@@ -750,6 +750,12 @@ static bool ParseDynamicAttributes( CTFBot::EventChangeAttributes_t& event, KeyV
 		{
 			event.m_attributeFlags |= CTFBot::PROJECTILE_SHIELD;
 		}
+#ifdef BDSBASE
+		else if (!Q_stricmp(value, "ForceDifficultyBasedAim"))
+		{
+			event.m_attributeFlags |= CTFBot::FORCE_DIFFICULTY_BASED_AIM;
+		}
+#endif
 		else
 		{
 			Warning( "TFBotSpawner: Invalid attribute '%s'\n", value );

src/game/server/vscript_server.cpp

@@ -3289,6 +3289,9 @@ DECLARE_SCRIPT_CONST_NAMED( FTFBotAttributeType, "BLAST_IMMUNE", CTFBot::Attribu
 DECLARE_SCRIPT_CONST_NAMED( FTFBotAttributeType, "FIRE_IMMUNE", CTFBot::AttributeType::FIRE_IMMUNE )
 DECLARE_SCRIPT_CONST_NAMED( FTFBotAttributeType, "PARACHUTE", CTFBot::AttributeType::PARACHUTE )
 DECLARE_SCRIPT_CONST_NAMED( FTFBotAttributeType, "PROJECTILE_SHIELD", CTFBot::AttributeType::PROJECTILE_SHIELD )
+#ifdef BDSBASE
+DECLARE_SCRIPT_CONST_NAMED(FTFBotAttributeType, "FORCE_DIFFICULTY_BASED_AIM", CTFBot::AttributeType::FORCE_DIFFICULTY_BASED_AIM)
+#endif
 REGISTER_SCRIPT_CONST_TABLE( FTFBotAttributeType )