From 2e28b036f83de7b39913ec36da256011d9be653f Mon Sep 17 00:00:00 2001 From: nosoop Date: Wed, 16 Oct 2019 00:13:34 -0700 Subject: [PATCH 1/2] Add new condition and custom damage type from Scream Fortress XI --- plugins/include/tf2.inc | 3 ++- plugins/include/tf2_stocks.inc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index 4e1e3add..19eb142a 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -206,7 +206,8 @@ enum TFCond TFCond_BurningPyro, //124: Dragon's Fury afterburn on Pyros TFCond_RocketPack, //125: Thermal Thruster launched effects, prevents reusing TFCond_LostFooting, //126: Less ground friction - TFCond_AirCurrent //127: Reduced air control and friction + TFCond_AirCurrent, //127: Reduced air control and friction + TFCond_HalloweenHellHeal // 128: Used when a player gets teleported to hell }; const float TFCondDuration_Infinite = -1.0; diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc index 02c00542..6aaa34e9 100644 --- a/plugins/include/tf2_stocks.inc +++ b/plugins/include/tf2_stocks.inc @@ -166,7 +166,8 @@ enum { TF_CUSTOM_SLAP_KILL, TF_CUSTOM_CROC, TF_CUSTOM_TAUNTATK_GASBLAST, - TF_CUSTOM_AXTINGUISHER_BOOSTED + TF_CUSTOM_AXTINGUISHER_BOOSTED, + TF_CUSTOM_GENERIC_BOMB }; // Weapon codes as used in some events, such as player_death From 06d327e76c54e752025a3e226d75681a2a1f25a2 Mon Sep 17 00:00:00 2001 From: nosoop Date: Wed, 16 Oct 2019 17:10:57 -0700 Subject: [PATCH 2/2] Reverted addition of TF_CUSTOM_GENERIC_BOMB --- plugins/include/tf2_stocks.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc index 6aaa34e9..02c00542 100644 --- a/plugins/include/tf2_stocks.inc +++ b/plugins/include/tf2_stocks.inc @@ -166,8 +166,7 @@ enum { TF_CUSTOM_SLAP_KILL, TF_CUSTOM_CROC, TF_CUSTOM_TAUNTATK_GASBLAST, - TF_CUSTOM_AXTINGUISHER_BOOSTED, - TF_CUSTOM_GENERIC_BOMB + TF_CUSTOM_AXTINGUISHER_BOOSTED }; // Weapon codes as used in some events, such as player_death