Skip to content

Commit 6b0a346

Browse files
committed
Add support for Texan Trickshot taunt kill
1 parent c672711 commit 6b0a346

File tree

5 files changed

+36
-0
lines changed

5 files changed

+36
-0
lines changed

src/game/server/tf/tf_player.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19711,7 +19711,11 @@ void CTFPlayer::DoTauntAttack( void )
1971119711
}
1971219712
}
1971319713
}
19714+
#ifdef BDSBASE
19715+
else if (iTauntAttack == TAUNTATK_HEAVY_HIGH_NOON || iTauntAttack == TAUNTATK_ENGINEER_TRICKSHOT)
19716+
#else
1971419717
else if ( iTauntAttack == TAUNTATK_HEAVY_HIGH_NOON )
19718+
#endif
1971519719
{
1971619720
// Heavy "High Noon" attack
1971719721
Vector vecForward;
@@ -19730,7 +19734,18 @@ void CTFPlayer::DoTauntAttack( void )
1973019734
{
1973119735
// Launch them up a little
1973219736
AngleVectors( QAngle(-45, m_angEyeAngles[YAW], 0), &vecForward );
19737+
#ifdef BDSBASE
19738+
int iCustomDamage = TF_DMG_CUSTOM_TAUNTATK_HIGH_NOON;
19739+
19740+
if (iTauntAttack == TAUNTATK_ENGINEER_TRICKSHOT)
19741+
{
19742+
iCustomDamage = TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT;
19743+
}
19744+
19745+
pEnt->TakeDamage(CTakeDamageInfo(this, this, GetActiveTFWeapon(), vecForward * 25000, WorldSpaceCenter(), 500.0f, DMG_BULLET, iCustomDamage));
19746+
#else
1973319747
pEnt->TakeDamage( CTakeDamageInfo( this, this, GetActiveTFWeapon(), vecForward * 25000, WorldSpaceCenter(), 500.0f, DMG_BULLET, TF_DMG_CUSTOM_TAUNTATK_HIGH_NOON ) );
19748+
#endif
1973419749
}
1973519750
}
1973619751
}

src/game/server/vscript_server.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,6 +3853,12 @@ DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_SLAP_KILL )
38533853
DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_CROC )
38543854
DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_TAUNTATK_GASBLAST )
38553855
DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_AXTINGUISHER_BOOSTED )
3856+
#ifdef BDSBASE
3857+
DECLARE_SCRIPT_CONST(ETFDmgCustom, TF_DMG_CUSTOM_KRAMPUS_MELEE)
3858+
DECLARE_SCRIPT_CONST(ETFDmgCustom, TF_DMG_CUSTOM_KRAMPUS_RANGED)
3859+
DECLARE_SCRIPT_CONST(ETFDmgCustom, TF_DMG_CUSTOM_DECAPITATION_BOSS_HAMMER)
3860+
DECLARE_SCRIPT_CONST(ETFDmgCustom, TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT)
3861+
#endif
38563862
DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_END )
38573863
REGISTER_SCRIPT_CONST_TABLE( ETFDmgCustom )
38583864

src/game/shared/tf/tf_gamerules.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12826,6 +12826,12 @@ const char *CTFGameRules::GetKillingWeaponName( const CTakeDamageInfo &info, CTF
1282612826
{
1282712827
killer_weapon_name = "krampus_ranged";
1282812828
}
12829+
#ifdef BDSBASE
12830+
else if (info.GetDamageCustom() == TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT)
12831+
{
12832+
killer_weapon_name = "tf_weapon_taunt_trickshot";
12833+
}
12834+
#endif
1282912835
else if ( info.GetDamageCustom() == TF_DMG_CUSTOM_THROWABLE ||
1283012836
info.GetDamageCustom() == TF_DMG_CUSTOM_THROWABLE_KILL ) // Throwables
1283112837
{

src/game/shared/tf/tf_shareddefs.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,7 @@ const char *g_szSpecialDamageNames[] =
932932
"TF_DMG_CUSTOM_KRAMPUS_RANGED",
933933
#ifdef BDSBASE
934934
"TF_DMG_CUSTOM_DECAPITATION_BOSS_HAMMER",
935+
"TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT",
935936
#endif
936937
};
937938
COMPILE_TIME_ASSERT( ARRAYSIZE( g_szSpecialDamageNames ) == TF_DMG_CUSTOM_END );
@@ -1079,6 +1080,7 @@ static const char* taunt_attack_name[] =
10791080
#ifdef BDSBASE
10801081
"TAUNTATK_ALLCLASS_GUITAR_RIFF_EXPLODE",
10811082
"TAUNTATK_DEMOMAN_CABER_SWING",
1083+
"TAUNTATK_ENGINEER_TRICKSHOT",
10821084
#endif
10831085
};
10841086

src/game/shared/tf/tf_shareddefs.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,7 @@ enum taunt_attack_t
988988
#ifdef BDSBASE
989989
TAUNTATK_ALLCLASS_GUITAR_RIFF_EXPLODE,
990990
TAUNTATK_DEMOMAN_CABER_SWING,
991+
TAUNTATK_ENGINEER_TRICKSHOT,
991992
#endif
992993

993994
TAUNTATK_COUNT
@@ -1288,6 +1289,7 @@ enum ETFDmgCustom
12881289

12891290
#ifdef BDSBASE
12901291
TF_DMG_CUSTOM_DECAPITATION_BOSS_HAMMER,
1292+
TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT,
12911293
#endif
12921294

12931295
TF_DMG_CUSTOM_END // END
@@ -1310,7 +1312,12 @@ inline bool IsTauntDmg( int iType )
13101312
iType == TF_DMG_CUSTOM_TAUNTATK_ARMAGEDDON ||
13111313
iType == TF_DMG_CUSTOM_TAUNTATK_ALLCLASS_GUITAR_RIFF ||
13121314
iType == TF_DMG_CUSTOM_TAUNTATK_ENGINEER_ARM_KILL ||
1315+
#ifdef BDSBASE
1316+
iType == TF_DMG_CUSTOM_TAUNTATK_GASBLAST ||
1317+
iType == TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT);
1318+
#else
13131319
iType == TF_DMG_CUSTOM_TAUNTATK_GASBLAST );
1320+
#endif
13141321
}
13151322
inline bool IsDOTDmg( int iType )
13161323
{

0 commit comments

Comments
 (0)