Skip to content

Commit 6c48c37

Browse files
committed
1 parent 95fefc2 commit 6c48c37

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

game/mod_tf/scripts/talker/heavy.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,14 +1715,15 @@ Rule MvMDeployRageHeavy
17151715

17161716
Response RocketDestroyedHeavy
17171717
{
1718-
scene "scenes/Player/Heavy/low/3979.vcd"
1719-
scene "scenes/Player/Heavy/low/3980.vcd"
1720-
scene "scenes/Player/Heavy/low/3982.vcd"
1718+
scene "scenes/Player/Heavy/low/3979.vcd"
1719+
scene "scenes/Player/Heavy/low/3980.vcd"
1720+
scene "scenes/Player/Heavy/low/3982.vcd"
17211721
}
17221722
Rule RocketDestroyedHeavy
17231723
{
1724-
criteria ConceptRocketDestroyed 50PercentChance IsHeavy
1725-
Response RocketDestroyedHeavy
1724+
criteria ConceptRocketDestroyed 10PercentChance IsHeavy
1725+
ApplyContext "IsDominating:1:5" // Adding this so Heavy doesn't get cut off when taking damage
1726+
Response RocketDestroyedHeavy
17261727
}
17271728

17281729
//--------------------------------------------------------------------------------------------------------------

src/game/shared/tf/tf_weapon_minigun.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
#include "particle_parse.h"
3030
#include "tf_gamestats.h"
3131
#include "baseprojectile.h"
32+
#ifdef BDSBASE
33+
#include "tf_projectile_rocket.h"
34+
#endif
3235
#endif
3336

3437
#define MAX_BARREL_SPIN_VELOCITY 20
@@ -683,6 +686,20 @@ void CTFMinigun::AttackEnemyProjectiles( void )
683686

684687
EmitSound( "Halloween.HeadlessBossAxeHitWorld" );
685688

689+
#ifdef BDSBASE
690+
// Trigger response rule, we only have vo for Rockets so limit to that type
691+
CTFProjectile_Rocket* pRocket = dynamic_cast<CTFProjectile_Rocket*>(pProjectile);
692+
if (pRocket)
693+
{
694+
// Making sure Heavy has a chance to speak the lines, he will be typically be under fire in these scenarios
695+
CMultiplayer_Expresser* pExpresser = pPlayer->GetMultiplayerExpresser();
696+
Assert(pExpresser);
697+
pExpresser->AllowMultipleScenes();
698+
pPlayer->SpeakConceptIfAllowed(MP_CONCEPT_ROCKET_DESTOYED);
699+
pExpresser->DisallowMultipleScenes();
700+
}
701+
#endif
702+
686703
CTF_GameStats.Event_PlayerAwardBonusPoints( pPlayer, NULL, 2 );
687704

688705
// Weaker version has a longer cooldown

0 commit comments

Comments
 (0)