diff --git a/plugins/l4d2_feedthetrolls.smx b/plugins/l4d2_feedthetrolls.smx index cef53fa..638914b 100644 Binary files a/plugins/l4d2_feedthetrolls.smx and b/plugins/l4d2_feedthetrolls.smx differ diff --git a/scripting/include/feedthetrolls/events.inc b/scripting/include/feedthetrolls/events.inc index a5e53b5..e76055f 100644 --- a/scripting/include/feedthetrolls/events.inc +++ b/scripting/include/feedthetrolls/events.inc @@ -486,7 +486,6 @@ public Action Event_ItemPickup(int client, int weapon) { } } } else if(Trolls[SpicyGasIndex].IsActive(client)) { - PrintToChat(client, "spice active"); if(GetEntityClassname(weapon, wpnName, sizeof(wpnName))) { float max = 1.0; if(Trolls[SpicyGasIndex].activeFlagClients[client] & 2) max = 0.5; @@ -495,7 +494,7 @@ public Action Event_ItemPickup(int client, int weapon) { if(StrEqual(wpnName, "weapon_gascan")) { AcceptEntityInput(weapon, "Ignite", client, client); } else if(StrEqual(wpnName, "weapon_propanetank") || StrEqual(wpnName, "weapon_oxygentank")) { - ExplodeProjectile(weapon); + ExplodeProjectile(weapon, false); } } } @@ -568,10 +567,6 @@ public Action Event_TakeDamage(int victim, int& attacker, int& inflictor, float& if(reverseFF == 0) reverseFF = GetTrollID("Reverse FF"); if(attacker > 0 && attacker <= MaxClients && GetClientTeam(attacker) == 4 && IsFakeClient(attacker)) return Plugin_Continue; - if (victim > 0 && victim <= MaxClients && damagetype != 263168 && damagetype != 265216) { - PrintToChat(victim, "you are in spit."); - } - if(attacker > 0 && victim <= MaxClients && attacker <= MaxClients && IsClientInGame(attacker) && IsPlayerAlive(attacker)) { if(shootAtTarget[attacker] == victim) return Plugin_Continue; if(g_PendingBanTroll[attacker] > 0 && GetClientTeam(attacker) == 2 && GetClientTeam(victim) == 2) { diff --git a/scripting/include/feedthetrolls/misc.inc b/scripting/include/feedthetrolls/misc.inc index 3c854df..e3656f2 100644 --- a/scripting/include/feedthetrolls/misc.inc +++ b/scripting/include/feedthetrolls/misc.inc @@ -370,9 +370,10 @@ bool SetBotTarget(int bot, int target, int targetHP, int loops = 15) { } // Taken from https://forums.alliedmods.net/showthread.php?t=220132&page=2 -stock void ExplodeProjectile(int entity) { - SetEntProp(entity, Prop_Data, "m_takedamage", 2); - SetEntProp(entity, Prop_Data, "m_iHealth", 1); - SDKHooks_TakeDamage(entity, 0, 0, 1.0); - SetEntProp(entity, Prop_Data, "m_nNextThinkTick", 1); //for smoke +stock void ExplodeProjectile(int entity, bool smoke = true) { + SetEntProp(entity, Prop_Data, "m_takedamage", 2); + SetEntProp(entity, Prop_Data, "m_iHealth", 1); + SDKHooks_TakeDamage(entity, 0, 0, 1.0); + if(smoke) + SetEntProp(entity, Prop_Data, "m_nNextThinkTick", 1); //for smoke } diff --git a/scripting/include/feedthetrolls/trolls.inc b/scripting/include/feedthetrolls/trolls.inc index 14b0a7e..88de755 100644 --- a/scripting/include/feedthetrolls/trolls.inc +++ b/scripting/include/feedthetrolls/trolls.inc @@ -239,7 +239,6 @@ bool ApplyAffect(int victim, const Troll troll, int activator, trollModifier mod } else if(StrEqual(troll.name, "Amazon Special Combo")) { SpecialSpawnFlags spawnFlag = Special_Anywhere; if(flags & (1 << 8)) spawnFlag = Special_OnTarget; - PrintToChatAll("spawnFlag: %d", spawnFlag); for(int i = 1; i < 7; i++) { if(flags & (1 << i)) { SpawnSpecialForTarget(view_as(i), victim, spawnFlag);