Skip to content

Changed sound to be cvar-able, updates #16

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

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

Changed sound to be cvar-able, updates #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5c1027
Changed sound to be cvar-able, updates
epilimic Mar 15, 2014
b5f588e
updated to match readyup's new sound controls
epilimic Mar 15, 2014
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
20 changes: 12 additions & 8 deletions pause.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public Plugin:myinfo =
name = "Pause plugin",
author = "CanadaRox",
description = "Adds pause functionality without breaking pauses",
version = "8",
version = "8.1",
url = ""
};

Expand Down Expand Up @@ -46,7 +46,9 @@ new Handle:pauseForward;
new Handle:unpauseForward;
new Handle:deferredPauseTimer;
new Handle:l4d_ready_delay;
new Handle:l4d_ready_blips;
new Handle:l4d_ready_enable_sound;
new Handle:l4d_ready_live_sound;
new String:liveSound[256];

public APLRes:AskPluginLoad2(Handle:myself, bool:late, String:error[], err_max)
{
Expand Down Expand Up @@ -79,7 +81,8 @@ public OnPluginStart()

pauseDelayCvar = CreateConVar("sm_pausedelay", "0", "Delay to apply before a pause happens. Could be used to prevent Tactical Pauses", FCVAR_PLUGIN, true, 0.0);
l4d_ready_delay = CreateConVar("l4d_ready_delay", "5", "Number of seconds to count down before the round goes live.", FCVAR_PLUGIN, true, 0.0);
l4d_ready_blips = CreateConVar("l4d_ready_blips", "1", "Enable beep on unpause");
l4d_ready_enable_sound = CreateConVar("l4d_ready_enable_sound", "1", "Enable sound on unpause");
l4d_ready_live_sound = CreateConVar("l4d_ready_live_sound", "buttons/blip2.wav", "The sound that plays when a round goes live");

HookEvent("round_end", RoundEnd_Event, EventHookMode_PostNoCopy);
}
Expand Down Expand Up @@ -115,7 +118,8 @@ public OnClientPutInServer(client)

public OnMapStart()
{
PrecacheSound("buttons/blip2.wav");
GetConVarString(l4d_ready_live_sound, liveSound, sizeof(liveSound));
PrecacheSound(liveSound);
}

public RoundEnd_Event(Handle:event, const String:name[], bool:dontBroadcast)
Expand Down Expand Up @@ -361,9 +365,9 @@ public Action:ReadyCountdownDelay_Timer(Handle:timer)
if (readyDelay == 0)
{
PrintToChatAll("Round is live!");
if (GetConVarBool(l4d_ready_blips))
if (GetConVarBool(l4d_ready_enable_sound))
{
CreateTimer(0.01, BlipDelay_Timer);
CreateTimer(0.01, LiveSoundDelay_Timer);
}
Unpause();
return Plugin_Stop;
Expand All @@ -376,9 +380,9 @@ public Action:ReadyCountdownDelay_Timer(Handle:timer)
return Plugin_Continue;
}

public Action:BlipDelay_Timer(Handle:timer)
public Action:LiveSoundDelay_Timer(Handle:timer)
{
EmitSoundToAll("buttons/blip2.wav", _, SNDCHAN_AUTO, SNDLEVEL_NORMAL, SND_NOFLAGS, 0.5);
EmitSoundToAll(liveSound, _, SNDCHAN_AUTO, SNDLEVEL_NORMAL, SND_NOFLAGS, 0.5);
}

CancelFullReady(client)
Expand Down
73 changes: 60 additions & 13 deletions readyup.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public Plugin:myinfo =
name = "L4D2 Ready-Up",
author = "CanadaRox",
description = "New and improved ready-up plugin.",
version = "8",
version = "8.2",
url = ""
};

Expand All @@ -36,8 +36,9 @@ new Handle:l4d_ready_cfg_name;
new Handle:l4d_ready_survivor_freeze;
new Handle:l4d_ready_max_players;
new Handle:l4d_ready_delay;
new Handle:l4d_ready_blips;
new Handle:l4d_ready_enable_sound;
new Handle:l4d_ready_chuckle;
new Handle:l4d_ready_live_sound;

// Game Cvars
new Handle:director_no_specials;
Expand All @@ -58,6 +59,9 @@ new bool:isPlayerReady[MAXPLAYERS + 1];
new footerCounter = 0;
new readyDelay;
new bool:blockSecretSpam[MAXPLAYERS + 1];
new String:liveSound[256];

new Handle:allowedCastersTrie;

new String:countdownSound[MAX_SOUNDS][]=
{
Expand Down Expand Up @@ -87,14 +91,16 @@ public OnPluginStart()
l4d_ready_survivor_freeze = CreateConVar("l4d_ready_survivor_freeze", "1", "Freeze the survivors during ready-up. When unfrozen they are unable to leave the saferoom but can move freely inside", FCVAR_PLUGIN, true, 0.0, true, 1.0);
l4d_ready_max_players = CreateConVar("l4d_ready_max_players", "12", "Maximum number of players to show on the ready-up panel.", FCVAR_PLUGIN, true, 0.0, true, MAXPLAYERS+1.0);
l4d_ready_delay = CreateConVar("l4d_ready_delay", "5", "Number of seconds to count down before the round goes live.", FCVAR_PLUGIN, true, 0.0);
l4d_ready_blips = CreateConVar("l4d_ready_blips", "1", "Enable blips during countdown");
l4d_ready_chuckle = CreateConVar("l4d_ready_chuckle", "1", "Enable chuckle during countdown");
l4d_ready_enable_sound = CreateConVar("l4d_ready_enable_sound", "1", "Enable sound during countdown & on live");
l4d_ready_live_sound = CreateConVar("l4d_ready_live_sound", "buttons/blip2.wav", "The sound that plays when a round goes live");
l4d_ready_chuckle = CreateConVar("l4d_ready_chuckle", "0", "Enable random moustachio chuckle during countdown");
HookConVarChange(l4d_ready_survivor_freeze, SurvFreezeChange);

HookEvent("round_start", RoundStart_Event);
HookEvent("player_team", PlayerTeam_Event);

casterTrie = CreateTrie();
allowedCastersTrie = CreateTrie();

director_no_specials = FindConVar("director_no_specials");
god = FindConVar("god");
Expand All @@ -113,7 +119,9 @@ public OnPluginStart()
RegConsoleCmd("sm_toggleready", ToggleReady_Cmd, "Toggle your ready status");
RegConsoleCmd("sm_unready", Unready_Cmd, "Mark yourself as not ready if you have set yourself as ready");
RegConsoleCmd("sm_return", Return_Cmd, "Return to a valid saferoom spawn if you get stuck during an unfrozen ready-up period");
RegConsoleCmd("sm_cast", Cast_Cmd, "Registers the calling player as a caster so the round will not go live unless they are ready");
RegServerCmd("sm_resetcasters", ResetCaster_Cmd, "Used to reset casters between matches. This should be in confogl_off.cfg or equivalent for your system");
RegServerCmd("sm_add_caster_id", AddCasterSteamID_Cmd, "Used for adding casters to the whitelist -- i.e. who's allowed to self-register as a caster");

#if DEBUG
RegAdminCmd("sm_initready", InitReady_Cmd, ADMFLAG_ROOT);
Expand All @@ -132,9 +140,10 @@ public OnPluginEnd()
public OnMapStart()
{
/* OnMapEnd needs this to work */
GetConVarString(l4d_ready_live_sound, liveSound, sizeof(liveSound));
PrecacheSound(SOUND);
PrecacheSound("buttons/blip1.wav");
PrecacheSound("buttons/blip2.wav");
PrecacheSound(liveSound);
for (new i = 0; i < MAX_SOUNDS; i++)
{
PrecacheSound(countdownSound[i]);
Expand Down Expand Up @@ -205,17 +214,34 @@ stock bool:IsIDCaster(const String:AuthID[])
return GetTrieValue(casterTrie, AuthID, dummy);
}

public Action:Cast_Cmd(client, args)
{
decl String:buffer[64];
GetClientAuthString(client, buffer, sizeof(buffer));
new index = FindStringInArray(allowedCastersTrie, buffer);
if (index != -1)
{
SetTrieValue(casterTrie, buffer, 1);
ReplyToCommand(client, "You have registered yourself as a caster");
}
else
{
ReplyToCommand(client, "Your SteamID was not found in this server's caster whitelist. Contact the admins to get approved.");
}
return Plugin_Handled;
}

public Action:Caster_Cmd(client, args)
{
{
if (args < 1)
{
ReplyToCommand(client, "[SM] Usage: sm_caster <player>");
return Plugin_Handled;
}

decl String:buffer[64];
decl String:buffer[64];
GetCmdArg(1, buffer, sizeof(buffer));

new target = FindTarget(client, buffer, true, false);
if (target > 0) // If FindTarget fails we don't need to print anything as it prints it for us!
{
Expand All @@ -226,7 +252,7 @@ public Action:Caster_Cmd(client, args)
}
else
{
ReplyToCommand(client, "Couldn't find Steam ID. Check for typos and let the player get fully connected.");
ReplyToCommand(client, "Couldn't find Steam ID. Check for typos and let the player get fully connected.");
}
}
return Plugin_Handled;
Expand All @@ -238,6 +264,24 @@ public Action:ResetCaster_Cmd(args)
return Plugin_Handled;
}

public Action:AddCasterSteamID_Cmd(args)
{
decl String:buffer[128];
GetCmdArg(1, buffer, sizeof(buffer));
if (buffer[0] != EOS)
{
new index = FindStringInArray(allowedCastersTrie, buffer);
if (index == -1)
{
PushArrayString(allowedCastersTrie, buffer);
PrintToServer("[casters_database] Added '%s'", buffer);
}
else PrintToServer("[casters_database] '%s' already exists", buffer);
}
else PrintToServer("[casters_database] No args specified / empty buffer");
return Plugin_Handled;
}

public Action:Hide_Cmd(client, args)
{
hiddenPanel[client] = true;
Expand Down Expand Up @@ -731,17 +775,20 @@ public Action:ReadyCountdownDelay_Timer(Handle:timer)
PrintHintTextToAll("Round is live!");
InitiateLive();
readyCountdownTimer = INVALID_HANDLE;
if (GetConVarBool(l4d_ready_chuckle))
if (GetConVarBool(l4d_ready_enable_sound))
{
EmitSoundToAll(countdownSound[GetRandomInt(0,MAX_SOUNDS-1)]);
if (GetConVarBool(l4d_ready_chuckle))
{
EmitSoundToAll(countdownSound[GetRandomInt(0,MAX_SOUNDS-1)]);
}
else { EmitSoundToAll(liveSound, _, SNDCHAN_AUTO, SNDLEVEL_NORMAL, SND_NOFLAGS, 0.5); }
}
else { EmitSoundToAll("buttons/blip2.wav", _, SNDCHAN_AUTO, SNDLEVEL_NORMAL, SND_NOFLAGS, 0.5); }
return Plugin_Stop;
}
else
{
PrintHintTextToAll("Live in: %d\nSay !unready to cancel", readyDelay);
if (GetConVarBool(l4d_ready_blips))
if (GetConVarBool(l4d_ready_enable_sound))
{
EmitSoundToAll("buttons/blip1.wav", _, SNDCHAN_AUTO, SNDLEVEL_NORMAL, SND_NOFLAGS, 0.5);
}
Expand Down