Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support to disable spawn protection with third party plugins #7

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add support to disable spawn protection with third party plugins #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
061b948
add sakp_otherplugins_consolecmds cvar to hook 3rd party plugins cons…
foobarhl Oct 11, 2013
e8df299
remove extraneous local debugging, reset version to 1.4.6
foobarhl Oct 11, 2013
6259941
new build for 1.4.6
foobarhl Oct 21, 2013
65ef515
add sakp_overlay to display a particular overlay to the spawn protect…
foobarhl Dec 22, 2013
c974049
update smx to 1.4.7
foobarhl Dec 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified plugins/spawnandkillprotection.smx
View file
Open in desktop
Binary file not shown.
38 changes: 34 additions & 4 deletions scripting/spawnandkillprotection.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <sdkhooks>
#include <smlib>

#define PLUGIN_VERSION "1.4.5"
#define PLUGIN_VERSION "1.4.7"

#define KILLPROTECTION_DISABLE_BUTTONS (IN_ATTACK | IN_JUMP | IN_DUCK | IN_FORWARD | IN_BACK | IN_USE | IN_LEFT | IN_RIGHT | IN_MOVELEFT | IN_MOVERIGHT | IN_ATTACK2 | IN_RUN | IN_WALK | IN_GRENADE1 | IN_GRENADE2 )
#define SHOOT_DISABLE_BUTTONS (IN_ATTACK | IN_ATTACK2)
Expand All @@ -22,7 +22,7 @@

public Plugin:myinfo = {
name = "Spawn & kill protection",
author = "Berni, Chanz, ph",
author = "Berni, Chanz, ph, [foo] bar",
description = "Spawn protection against spawnkilling and kill protection when you stand close to the wall for a longer time",
version = PLUGIN_VERSION,
url = "http://forums.alliedmods.net/showthread.php?p=901294"
Expand Down Expand Up @@ -64,6 +64,8 @@ new Handle:player_color_b = INVALID_HANDLE;
new Handle:player_color_a = INVALID_HANDLE;
new Handle:noblock = INVALID_HANDLE;
new Handle:collisiongroupcvar = INVALID_HANDLE;
new Handle:otherPlugins = INVALID_HANDLE;
new Handle:overlay = INVALID_HANDLE;

// Misc
new bool:bNoBlock = true;
Expand Down Expand Up @@ -116,7 +118,7 @@ public OnPluginStart()

HookConVarChange(noblock, ConVarChange_Noblock);

collisiongroupcvar = Sakp_CreateConVar("collisiongroup", "8", "Collision group players are part of. Change to match group if you are using a noblock or anti stick plugin");
collisiongroupcvar = Sakp_CreateConVar("collisiongroup", "8", "Collision group players are part of. Change to match group if you are using a noblock.smx (2) or anti stick plugin");
defaultcollisiongroup = GetConVarInt(collisiongroupcvar);
HookConVarChange(collisiongroupcvar, ConVarChange_CollisionGroup);

Expand All @@ -133,11 +135,13 @@ public OnPluginStart()
maxspawnprotection_team2 = Sakp_CreateConVar("maxspawnprotection_team2", "-1", "same as sakp_maxspawnprotection, but for team 2 only (overrides sakp_maxspawnprotection if not set to -1)",FCVAR_PLUGIN);
fadescreen = Sakp_CreateConVar("fadescreen", "1", "Fade screen to black");
hidehud = Sakp_CreateConVar("hidehud", "1", "Set to 1 to hide the HUD when being protected");
overlay = Sakp_CreateConVar("overlay", "", "Overlay material to display. fadescreen should be set to 0 if you use this");
player_color_r = Sakp_CreateConVar("player_color_red", "255", "amount of red when a player is protected 0-255");
player_color_g = Sakp_CreateConVar("player_color_green", "0", "amount of green when a player is protected 0-255");
player_color_b = Sakp_CreateConVar("player_color_blue", "0", "amount of blue when a player is protected 0-255");
player_color_a = Sakp_CreateConVar("player_alpha", "50", "alpha amount of a protected player 0-255");

otherPlugins = Sakp_CreateConVar("otherplugins_consolecmds", "+hook +jet +jetpack", "Console commands of 3rd party plugins that should disable spawn protection");
AutoExecConfig(true);
File_LoadTranslations("spawnandkillprotection.phrases");

Expand All @@ -156,9 +160,24 @@ public OnPluginStart()
CreateTestHudSynchronizer();
}

new String:otherPluginCmds[1000];
GetConVarString(otherPlugins, otherPluginCmds, sizeof(otherPluginCmds));
if(otherPluginCmds[0] != '\0'){
new String:otherPluginCmdsA[50][20];
new numOtherCmds = ExplodeString(otherPluginCmds, " ", otherPluginCmdsA, sizeof(otherPluginCmdsA), sizeof(otherPluginCmdsA[]));
for(new i=0; i < numOtherCmds; i++){
RegConsoleCmd(otherPluginCmdsA[i], Command_OtherPluginDisableClientProtection);
}
}

RegAdminCmd("sm_enablekillprotection", Command_EnableKillProtection, ADMFLAG_ROOT);
}

public Action:Command_OtherPluginDisableClientProtection(client, args)
{
DisableKillProtection(client);
}

public Action:Command_EnableKillProtection(client, args)
{
new clientAimTarget = GetClientAimTarget(client, true);
Expand Down Expand Up @@ -220,7 +239,6 @@ public OnGameFrame()
}

if (isSpawnKillProtected[client]) {

if (GetConVarInt(disableonmoveshoot) == 0) {
continue;
}
Expand Down Expand Up @@ -568,6 +586,12 @@ EnableKillProtection(client)
Client_ScreenFade(client, 0, FFADE_OUT | FFADE_STAYOUT | FFADE_PURGE, -1, 0, 0, 0, 240);
}

new String:overlayFile[255];
GetConVarString(overlay, overlayFile, sizeof(overlayFile));
if(overlayFile[0]!='\0'){
ClientCommand(client, "r_screenoverlay %s", overlayFile);
}

NotifyClientEnableProtection(client);
}

Expand Down Expand Up @@ -595,6 +619,12 @@ DisableKillProtection(client)
Client_ScreenFade(client, 0, FFADE_IN | FFADE_PURGE, -1, 0, 0, 0, 0);
}

new String:overlayFile[255];
GetConVarString(overlay, overlayFile, sizeof(overlayFile));
if(overlayFile[0]!='\0'){
ClientCommand(client, "r_screenoverlay off");
}

NotifyClientDisableProtection(client);
}

Expand Down