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

Jump to bottom

feat: Dynamic Channels support #6

Merged
merged 1 commit into from
Mar 23, 2024
Merged

feat: Dynamic Channels support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 38 additions & 8 deletions addons/sourcemod/scripting/mapchooser_extended.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,16 @@

#undef REQUIRE_PLUGIN
#tryinclude <nativevotes>
#tryinclude <DynamicChannels>
#tryinclude <nominations_extended>
#tryinclude <zleader>
#define REQUIRE_PLUGIN

#define MCE_VERSION "1.11.0"
#define MCE_VERSION "1.11.1"

#define NV "nativevotes"
#define ZLEADER "zleader"
#define DYNCHANNELS "DynamicChannels"

enum RoundCounting
{
Expand Down Expand Up @@ -123,6 +125,7 @@ ConVar g_Cvar_Extend;
ConVar g_Cvar_DontChange;
ConVar g_Cvar_EndOfMapVote;
ConVar g_Cvar_EndOfMapInfo;
ConVar g_cvHUDChannel;
ConVar g_Cvar_VoteDuration;
ConVar g_Cvar_RandomStartTime;
ConVar g_Cvar_CountBots;
Expand Down Expand Up @@ -202,6 +205,7 @@ bool g_WarningInProgress = false;
bool g_AddNoVote = false;
bool g_SaveCDOnMapEnd = true;
bool g_ZLeader = false;
bool g_DynamicChannels = false;

RoundCounting g_RoundCounting = RoundCounting_Standard;

Expand Down Expand Up @@ -253,6 +257,7 @@ public void OnPluginStart()

g_Cvar_EndOfMapVote = CreateConVar("mce_endvote", "1", "Specifies if MapChooser should run an end of map vote", _, true, 0.0, true, 1.0);
g_Cvar_EndOfMapInfo = CreateConVar("mce_endmap_info", "1", "Specifies if MapChooser should print a message with nextmap when the map end.", _, true, 0.0, true, 1.0);
g_cvHUDChannel = CreateConVar("mce_hud_channel", "1", "Channel for the HUD messages", _, true, 0.0, true, 6.0);

g_Cvar_StartTime = CreateConVar("mce_starttime", "10.0", "Specifies when to start the vote based on time remaining.", _, true, 1.0);
g_Cvar_RandomStartTime = CreateConVar("mce_random_starttime", "30.0", "The max interval time to add up to the original interval time for map vote in seconds", _, true, 1.0, true, 180.0);
Expand Down Expand Up @@ -471,6 +476,7 @@ public void OnAllPluginsLoaded()
g_NativeVotes = LibraryExists(NV);
#endif
g_ZLeader = LibraryExists(ZLEADER);
g_DynamicChannels = LibraryExists(DYNCHANNELS);
}

public void OnLibraryAdded(const char[] name)
Expand All @@ -485,6 +491,8 @@ public void OnLibraryAdded(const char[] name)
}
if (StrEqual(name, ZLEADER))
g_ZLeader = true;
if (StrEqual(name, DYNCHANNELS))
g_DynamicChannels = true;
}

public void OnLibraryRemoved(const char[] name)
Expand All @@ -493,6 +501,8 @@ public void OnLibraryRemoved(const char[] name)
g_NativeVotes = false;
if (StrEqual(name, ZLEADER))
g_ZLeader = false;
if (StrEqual(name, DYNCHANNELS))
g_DynamicChannels = false;
}

public void OnMapStart()
Expand Down Expand Up @@ -924,23 +934,43 @@ public void Event_WinPanel(Handle event, const char[] name, bool dontBroadcast)
if(!GetNextMap(nextMap, sizeof(nextMap)))
return;

bool bDynamicAvailable = false;
int iChannel = 1;
int iHUDChannel = -1;

iChannel = g_cvHUDChannel.IntValue;
if (iChannel < 0 || iChannel > 6)
iChannel = 1;

bDynamicAvailable = g_DynamicChannels && CanTestFeatures() && GetFeatureStatus(FeatureType_Native, "GetDynamicChannel") == FeatureStatus_Available;

#if defined _DynamicChannels_included_
if (bDynamicAvailable)
iHUDChannel = GetDynamicChannel(iChannel);
#endif

Handle g_hHud = CreateHudSynchronizer();
SetHudTextParams(-1.0, 0.89, 7.0, 255, 71, 1, 1, 1, 4.0, 0.6, 0.6);

if (g_hHud != INVALID_HANDLE)
if (!bDynamicAvailable && g_hHud != INVALID_HANDLE || bDynamicAvailable)
{
SetHudTextParams(-1.0, 0.89, 7.0, 255, 71, 1, 1, 1, 4.0, 0.6, 0.6);
for(int i = 1; i <= MaxClients; i++)
{
if(!IsClientInGame(i) || IsFakeClient(i))
continue;

ClearSyncHud(i, g_hHud);
ShowSyncHudText(i, g_hHud, "Next Map: %s", nextMap);
if (bDynamicAvailable)
ShowHudText(i, iHUDChannel, "Next Map %s", nextMap);
else
{
ClearSyncHud(i, g_hHud);
ShowSyncHudText(i, g_hHud, "Next Map: %s", nextMap);
}
}
}

CPrintToChatAll("{lightgreen}Next Map: {green}%s", nextMap);
CPrintToChatAll("{lightgreen}Next Map: {green}%s", nextMap);
CPrintToChatAll("{lightgreen}Next Map: {green}%s", nextMap);
CPrintToChatAll("{lightgreen}Next Map: {green}%s", nextMap);
CPrintToChatAll("{lightgreen}Next Map: {green}%s", nextMap);

delete g_hHud;
Expand Down Expand Up @@ -3370,4 +3400,4 @@ stock void Forward_OnNominationDisconnect(char[] oldmap, int owner)
Call_PushString(oldmap);
Call_PushCell(owner);
Call_Finish();
}
}
7 changes: 7 additions & 0 deletions sourceknight.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ project:
- source: /addons/sourcemod/scripting/include
dest: /addons/sourcemod/scripting/include

- name: dynamicchannels
type: git
repo: https://github.com/srcdslab/sm-plugin-DynamicChannels
unpack:
- source: /scripting/include
dest: /addons/sourcemod/scripting/include

root: /
output: /addons/sourcemod/plugins
targets:
Expand Down