From e7f6a9908716eaf4bf6f696c7efca0eba433ab6d Mon Sep 17 00:00:00 2001 From: Ross Bemrose Date: Fri, 7 Nov 2014 11:16:26 -0500 Subject: [PATCH 1/3] New Halloween 2014 conditions. --- plugins/include/tf2.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index 1aa0b126..6048a0cf 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -157,6 +157,13 @@ enum TFCond TFCond_DodgeChance = 79, TFCond_Parachute, TFCond_BlastJumping, + TFCond_HalloweenKart, + TFCond_HalloweenKartDash, + TFCond_HalloweenBigHeadLowGravity, + TFCond_HalloweenMiniMelee, + TFCond_HalloweenSwimming, + TFCond_HalloweenKartNoTurn, + TFCond_HalloweenKartCage, }; const Float:TFCondDuration_Infinite = -1.0; From b76c948c95a83991dc757e44cde868b1775bc692 Mon Sep 17 00:00:00 2001 From: Ross Bemrose Date: Fri, 7 Nov 2014 15:44:03 -0500 Subject: [PATCH 2/3] Update condition names. Remove condition 87 for now. --- plugins/include/tf2.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index 6048a0cf..82268173 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -159,11 +159,11 @@ enum TFCond TFCond_BlastJumping, TFCond_HalloweenKart, TFCond_HalloweenKartDash, - TFCond_HalloweenBigHeadLowGravity, - TFCond_HalloweenMiniMelee, - TFCond_HalloweenSwimming, - TFCond_HalloweenKartNoTurn, - TFCond_HalloweenKartCage, + TFCond_BalloonHead, + TFCond_MeleeOnly, + TFCond_SwimmingCurse, + + TFCond_HalloweenKartCage = 88, }; const Float:TFCondDuration_Infinite = -1.0; From f55bc6719de9af3fc8c5b0f7f9eb4b77472aebbd Mon Sep 17 00:00:00 2001 From: Ross Bemrose Date: Mon, 10 Nov 2014 14:44:26 -0500 Subject: [PATCH 3/3] Add condition 87 back. --- plugins/include/tf2.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index 82268173..6f9ba37e 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -162,8 +162,8 @@ enum TFCond TFCond_BalloonHead, TFCond_MeleeOnly, TFCond_SwimmingCurse, - - TFCond_HalloweenKartCage = 88, + TFCond_HalloweenKartNoTurn, + TFCond_HalloweenKartCage, }; const Float:TFCondDuration_Infinite = -1.0;