sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-07 10:28:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move !extend to shavit-timelimit

Browse Source
This commit is contained in:
rtldg 2022-01-11 09:44:36 +00:00
parent f474a944ae
commit 150bd15b55
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
addons/sourcemod/scripting/shavit-mapchooser.sp
View File

@ -214,14 +214,12 @@ public void OnPluginStart()
Convar.AutoExecConfig(); Convar.AutoExecConfig();
RegAdminCmd("sm_extend", Command_Extend, ADMFLAG_CHANGEMAP, "Admin command for extending map");
RegAdminCmd("sm_extendmap", Command_Extend, ADMFLAG_CHANGEMAP, "Admin command for extending map");
RegAdminCmd("sm_forcemapvote", Command_ForceMapVote, ADMFLAG_CHANGEMAP, "Admin command for forcing the end of map vote"); RegAdminCmd("sm_forcemapvote", Command_ForceMapVote, ADMFLAG_CHANGEMAP, "Admin command for forcing the end of map vote");
RegAdminCmd("sm_reloadmaplist", Command_ReloadMaplist, ADMFLAG_CHANGEMAP, "Admin command for forcing maplist to be reloaded"); RegAdminCmd("sm_reloadmaplist", Command_ReloadMaplist, ADMFLAG_CHANGEMAP, "Admin command for forcing maplist to be reloaded");
RegAdminCmd("sm_reloadmap", Command_ReloadMap, ADMFLAG_CHANGEMAP, "Admin command for reloading current map"); RegAdminCmd("sm_reloadmap", Command_ReloadMap, ADMFLAG_CHANGEMAP, "Admin command for reloading current map");
RegAdminCmd("sm_restartmap", Command_ReloadMap, ADMFLAG_CHANGEMAP, "Admin command for reloading current map"); RegAdminCmd("sm_restartmap", Command_ReloadMap, ADMFLAG_CHANGEMAP, "Admin command for reloading current map");
RegAdminCmd("sm_loadunzonedmap", Command_LoadUnzonedMap, ADMFLAG_ROOT, "Loads the next map from the maps folder that is unzoned."); RegAdminCmd("sm_loadunzonedmap", Command_LoadUnzonedMap, ADMFLAG_CHANGEMAP, "Loads the next map from the maps folder that is unzoned.");
RegConsoleCmd("sm_nominate", Command_Nominate, "Lets players nominate maps to be on the end of map vote"); RegConsoleCmd("sm_nominate", Command_Nominate, "Lets players nominate maps to be on the end of map vote");
RegConsoleCmd("sm_unnominate", Command_UnNominate, "Removes nominations"); RegConsoleCmd("sm_unnominate", Command_UnNominate, "Removes nominations");
@ -1015,21 +1013,6 @@ public int Handler_MapVoteMenu(Menu menu, MenuAction action, int param1, int par
return 0; return 0;
} }
// extends map while also notifying players and setting plugin data
void ExtendMap(int client, int time)
{
if(time == 0)
{
time = RoundFloat(g_cvMapVoteExtendTime.FloatValue * 60);
}
ExtendMapTimeLimit(time);
PrintToChatAll("%s%N extended the map by %d minutes", g_cPrefix, client, time / 60);
//g_bMapVoteStarted = false;
//g_bMapVoteFinished = false;
}
public void Shavit_OnDatabaseLoaded() public void Shavit_OnDatabaseLoaded()
{ {
GetTimerSQLPrefix(g_cSQLPrefix, sizeof(g_cSQLPrefix)); GetTimerSQLPrefix(g_cSQLPrefix, sizeof(g_cSQLPrefix));
@ -1326,25 +1309,6 @@ public Action Timer_ChangeMap(Handle timer, DataPack data)
} }
/* Commands */ /* Commands */
public Action Command_Extend(int client, int args)
{
int extendtime;
if(args > 0)
{
char sArg[8];
GetCmdArg(1, sArg, sizeof(sArg));
extendtime = RoundFloat(StringToFloat(sArg) * 60);
}
else
{
extendtime = RoundFloat(g_cvMapVoteExtendTime.FloatValue * 60.0);
}
ExtendMap(client, extendtime);
return Plugin_Handled;
}
public Action Command_ForceMapVote(int client, int args) public Action Command_ForceMapVote(int client, int args)
{ {
if(g_bMapVoteStarted || g_bMapVoteFinished) if(g_bMapVoteStarted || g_bMapVoteFinished)

29
addons/sourcemod/scripting/shavit-timelimit.sp
View File

@ -124,6 +124,9 @@ public void OnPluginStart()
Convar.AutoExecConfig(); Convar.AutoExecConfig();
RegAdminCmd("sm_extend", Command_Extend, ADMFLAG_CHANGEMAP, "Admin command for extending map");
RegAdminCmd("sm_extendmap", Command_Extend, ADMFLAG_CHANGEMAP, "Admin command for extending map");
HookEvent("round_end", round_end, EventHookMode_Pre); HookEvent("round_end", round_end, EventHookMode_Pre);
GetTimerSQLPrefix(gS_MySQLPrefix, 32); GetTimerSQLPrefix(gS_MySQLPrefix, 32);
@ -424,3 +427,29 @@ public Action round_end(Event event, const char[] name, bool dontBroadcast)
return Plugin_Continue; return Plugin_Continue;
} }
public Action Command_Extend(int client, int args)
{
int extendtime = 10 * 60;
if (args > 0)
{
char sArg[8];
GetCmdArg(1, sArg, sizeof(sArg));
extendtime = RoundFloat(StringToFloat(sArg) * 60);
}
else
{
ConVar smc_mapvote_extend_time = FindConVar("smc_mapvote_extend_time");
if (smc_mapvote_extend_time)
{
extendtime = RoundFloat(smc_mapvote_extend_time.FloatValue * 60.0);
}
}
ExtendMapTimeLimit(extendtime);
Shavit_PrintToChatAll("%N extended the map by %d minutes", client, extendtime / 60);
return Plugin_Handled;
}