Add support for Texan Trickshot taunt kill

Author: Bitl

src/game/server/tf/tf_player.cpp

@@ -19711,7 +19711,11 @@ void CTFPlayer::DoTauntAttack( void )
 			}
 		}
 	}
+#ifdef BDSBASE
+	else if (iTauntAttack == TAUNTATK_HEAVY_HIGH_NOON || iTauntAttack == TAUNTATK_ENGINEER_TRICKSHOT)
+#else
 	else if ( iTauntAttack == TAUNTATK_HEAVY_HIGH_NOON )
+#endif
 	{
 		// Heavy "High Noon" attack
 		Vector vecForward;
@@ -19730,7 +19734,18 @@ void CTFPlayer::DoTauntAttack( void )
 			{
 				// Launch them up a little
 				AngleVectors( QAngle(-45, m_angEyeAngles[YAW], 0), &vecForward );
+#ifdef BDSBASE
+				int iCustomDamage = TF_DMG_CUSTOM_TAUNTATK_HIGH_NOON;
+
+				if (iTauntAttack == TAUNTATK_ENGINEER_TRICKSHOT)
+				{
+					iCustomDamage = TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT;
+				}
+
+				pEnt->TakeDamage(CTakeDamageInfo(this, this, GetActiveTFWeapon(), vecForward * 25000, WorldSpaceCenter(), 500.0f, DMG_BULLET, iCustomDamage));
+#else
 				pEnt->TakeDamage( CTakeDamageInfo( this, this, GetActiveTFWeapon(), vecForward * 25000, WorldSpaceCenter(), 500.0f, DMG_BULLET, TF_DMG_CUSTOM_TAUNTATK_HIGH_NOON ) );
+#endif
 			}
 		}
 	}

src/game/server/vscript_server.cpp

@@ -3853,6 +3853,12 @@ DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_SLAP_KILL )
 DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_CROC )
 DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_TAUNTATK_GASBLAST )
 DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_AXTINGUISHER_BOOSTED )
+#ifdef BDSBASE
+DECLARE_SCRIPT_CONST(ETFDmgCustom, TF_DMG_CUSTOM_KRAMPUS_MELEE)
+DECLARE_SCRIPT_CONST(ETFDmgCustom, TF_DMG_CUSTOM_KRAMPUS_RANGED)
+DECLARE_SCRIPT_CONST(ETFDmgCustom, TF_DMG_CUSTOM_DECAPITATION_BOSS_HAMMER)
+DECLARE_SCRIPT_CONST(ETFDmgCustom, TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT)
+#endif
 DECLARE_SCRIPT_CONST( ETFDmgCustom, TF_DMG_CUSTOM_END )
 REGISTER_SCRIPT_CONST_TABLE( ETFDmgCustom )
 

src/game/shared/tf/tf_gamerules.cpp

@@ -12826,6 +12826,12 @@ const char *CTFGameRules::GetKillingWeaponName( const CTakeDamageInfo &info, CTF
 	{
 		killer_weapon_name = "krampus_ranged";
 	}
+#ifdef BDSBASE
+	else if (info.GetDamageCustom() == TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT)
+	{
+		killer_weapon_name = "tf_weapon_taunt_trickshot";
+	}
+#endif
 	else if ( info.GetDamageCustom() == TF_DMG_CUSTOM_THROWABLE ||
 			  info.GetDamageCustom() == TF_DMG_CUSTOM_THROWABLE_KILL )			// Throwables
 	{

src/game/shared/tf/tf_shareddefs.cpp

@@ -932,6 +932,7 @@ const char *g_szSpecialDamageNames[] =
 	"TF_DMG_CUSTOM_KRAMPUS_RANGED",
 #ifdef BDSBASE
 	"TF_DMG_CUSTOM_DECAPITATION_BOSS_HAMMER",
+	"TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT",
 #endif
 };
 COMPILE_TIME_ASSERT( ARRAYSIZE( g_szSpecialDamageNames ) == TF_DMG_CUSTOM_END );
@@ -1079,6 +1080,7 @@ static const char* taunt_attack_name[] =
 #ifdef BDSBASE
 	"TAUNTATK_ALLCLASS_GUITAR_RIFF_EXPLODE",
 	"TAUNTATK_DEMOMAN_CABER_SWING",
+	"TAUNTATK_ENGINEER_TRICKSHOT",
 #endif
 };
 

src/game/shared/tf/tf_shareddefs.h

@@ -988,6 +988,7 @@ enum taunt_attack_t
 #ifdef BDSBASE
 	TAUNTATK_ALLCLASS_GUITAR_RIFF_EXPLODE,
 	TAUNTATK_DEMOMAN_CABER_SWING,
+	TAUNTATK_ENGINEER_TRICKSHOT,
 #endif
 
 	TAUNTATK_COUNT
@@ -1288,6 +1289,7 @@ enum ETFDmgCustom
 
 #ifdef BDSBASE
 	TF_DMG_CUSTOM_DECAPITATION_BOSS_HAMMER,
+	TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT,
 #endif
 
 	TF_DMG_CUSTOM_END // END
@@ -1310,7 +1312,12 @@ inline bool IsTauntDmg( int iType )
 			iType == TF_DMG_CUSTOM_TAUNTATK_ARMAGEDDON ||
 			iType == TF_DMG_CUSTOM_TAUNTATK_ALLCLASS_GUITAR_RIFF || 
 			iType == TF_DMG_CUSTOM_TAUNTATK_ENGINEER_ARM_KILL ||
+#ifdef BDSBASE
+			iType == TF_DMG_CUSTOM_TAUNTATK_GASBLAST ||
+			iType == TF_DMG_CUSTOM_TAUNTATK_TRICKSHOT);
+#else
 			iType == TF_DMG_CUSTOM_TAUNTATK_GASBLAST );
+#endif
 }
 inline bool IsDOTDmg( int iType )
 {