Skip to content

[TF2] MvM Enhancements #1573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+3 −3
Open

[TF2] MvM Enhancements #1573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
112146d
Don't force MVM bots to capture the flag as the normal AI already cap…
siobhan-saoirse Oct 24, 2025
2105750
Restrict specialized AI to BLU bots in MvM mode
siobhan-saoirse Oct 24, 2025
353460d
Update tf_bot_scenario_monitor.cpp
siobhan-saoirse Oct 24, 2025
588dbd6
Update tf_bot_scenario_monitor.cpp
siobhan-saoirse Oct 24, 2025
640e8ca
Update tf_bot_scenario_monitor.cpp
siobhan-saoirse Oct 24, 2025
cfb2389
Fix typo in comment about TFBot AI
siobhan-saoirse Oct 26, 2025
40b91f7
Merge branch 'ValveSoftware:master' into master
siobhan-saoirse Oct 26, 2025
5093d56
Fix condition to check if target is a player
siobhan-saoirse Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/game/server/tf/bot/behavior/tf_bot_scenario_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Action< CTFBot > *CTFBotScenarioMonitor::DesiredScenarioAndClassAction( CTFBot *
}
#endif // TF_RAID_MODE

if ( TFGameRules()->IsMannVsMachineMode() )
if ( TFGameRules()->IsMannVsMachineMode() && me->GetTeamNumber() == TF_TEAM_PVE_INVADERS ) // Only use this specialized AI for BLU bots
{
if ( me->IsPlayerClass( TF_CLASS_SPY ) )
{
Expand Down Expand Up @@ -218,7 +218,7 @@ Action< CTFBot > *CTFBotScenarioMonitor::DesiredScenarioAndClassAction( CTFBot *
}

// capture the flag
return new CTFBotFetchFlag;
// The normal TFBot AI already captures the flag. See below - Siobhan-Saoirse
}

if ( me->IsPlayerClass( TF_CLASS_SPY ) )
Expand Down
2 changes: 1 addition & 1 deletion src/game/shared/tf/tf_weaponbase_melee.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ bool CTFWeaponBaseMelee::OnSwingHit( trace_t &trace )
// handle hitting a robot
if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() )
{
if ( pTargetPlayer && pTargetPlayer->GetTeamNumber() == TF_TEAM_PVE_INVADERS && !pTargetPlayer->IsPlayer() )
if ( pTargetPlayer && pTargetPlayer->GetTeamNumber() == TF_TEAM_PVE_INVADERS && pTargetPlayer->IsPlayer() )
{
bPlayMvMHitOnly = true;

Expand Down