diff --git a/plugins/l4d2_feedthetrolls.smx b/plugins/l4d2_feedthetrolls.smx index 82c78ba..0826105 100644 Binary files a/plugins/l4d2_feedthetrolls.smx and b/plugins/l4d2_feedthetrolls.smx differ diff --git a/scripting/include/feedthetrolls/combos.inc b/scripting/include/feedthetrolls/combos.inc index e63468f..18f0035 100644 --- a/scripting/include/feedthetrolls/combos.inc +++ b/scripting/include/feedthetrolls/combos.inc @@ -42,7 +42,9 @@ void SetupsTrollCombos() { SetupCombo(combo, "Magnet Galore"); combo.AddTroll("Special Magnet"); combo.AddTroll("Tank Magnet"); + #if defined _behavior_included combo.AddTroll("Witch Magnet"); + #endif SetupCombo(combo, "Tank Run Noob"); combo.AddTroll("Slow Speed"); @@ -52,7 +54,9 @@ void SetupsTrollCombos() { combo.AddTroll("Slow Speed"); combo.AddTroll("Special Magnet"); combo.AddTroll("Tank Magnet"); + #if defined _behavior_included combo.AddTroll("Witch Magnet"); + #endif combo.AddTroll("Reverse FF", .flags=2); combo.AddTroll("Vomit Player"); diff --git a/scripting/include/feedthetrolls/events.inc b/scripting/include/feedthetrolls/events.inc index 6689036..ee794b4 100644 --- a/scripting/include/feedthetrolls/events.inc +++ b/scripting/include/feedthetrolls/events.inc @@ -737,6 +737,7 @@ public Action OnVocalizeCommand(int client, const char[] vocalize, int initiator return Plugin_Continue; } +#if defined _sceneprocessor_included public void OnSceneStageChanged(int scene, SceneStages stage) { if(stage == SceneStage_Spawned) { static int vocalGagID, vocalizeSpecials; @@ -770,6 +771,7 @@ public void OnSceneStageChanged(int scene, SceneStages stage) { } } } +#endif public Action SoundHook(int clients[MAXPLAYERS], int& numClients, char sample[PLATFORM_MAX_PATH], int& entity, int& channel, float& volume, int& level, int& pitch, int& flags, char soundEntry[PLATFORM_MAX_PATH], int& seed) { static int honkID; diff --git a/scripting/include/feedthetrolls/misc.inc b/scripting/include/feedthetrolls/misc.inc index a2bcf69..61a4b35 100644 --- a/scripting/include/feedthetrolls/misc.inc +++ b/scripting/include/feedthetrolls/misc.inc @@ -17,6 +17,7 @@ void ActivateAutoPunish(int client) { } void SetWitchTarget(int witch, int target) { + #if defined _behavior_included Behavior behavior = Behavior(witch, WITCH_QUERY); BehaviorAction action = behavior.CurrentAction.Last; @@ -25,6 +26,9 @@ void SetWitchTarget(int witch, int target) { IActionResult result; result.Init(CHANGE_TO, newaction); result.ToAction(action); + #else + PrintToServer("[FTT] SetWitchTarget() called when behaviors plugin not found"); + #endif } bool ToggleMarkPlayer(int client, int target) { diff --git a/scripting/include/feedthetrolls/trolls.inc b/scripting/include/feedthetrolls/trolls.inc index ed1f70d..bbe1495 100644 --- a/scripting/include/feedthetrolls/trolls.inc +++ b/scripting/include/feedthetrolls/trolls.inc @@ -18,7 +18,9 @@ void SetupTrolls() { AddMagnetFlags(index); index = SetupTroll("Tank Magnet", "Attracts ALL tanks to any alive target with this troll enabled", TrollMod_Constant); AddMagnetFlags(index); + #if defined _behavior_included index = SetupTroll("Witch Magnet", "All witches when startled will target any player with this troll", TrollMod_Constant); + #endif // fireSpitMagnetTrollIndex = SetupTroll("Fire & Acid Magnet", "Make the player gravitate toward danger", TRollMod_Constant); /// CATEGORY: Infected diff --git a/scripting/l4d2_feedthetrolls.sp b/scripting/l4d2_feedthetrolls.sp index d8cc830..947d02b 100644 --- a/scripting/l4d2_feedthetrolls.sp +++ b/scripting/l4d2_feedthetrolls.sp @@ -11,12 +11,12 @@ #include #include #include -#include -#include +#tryinclude +#tryinclude #include #include #include -#include +#tryinclude public Plugin myinfo =