Skip to content

mapchooser: Set minimum number maps to include in vote #1333

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

mapchooser: Set minimum number maps to include in vote #1333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d44669e
mapchooser: Set minimum number maps to include in vote
stickz Aug 9, 2020
f6b8278
Remove whitespace
stickz Aug 9, 2020
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
26 changes: 16 additions & 10 deletions plugins/mapchooser.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ ConVar g_Cvar_ExtendTimeStep;
ConVar g_Cvar_ExtendRoundStep;
ConVar g_Cvar_ExtendFragStep;
ConVar g_Cvar_ExcludeMaps;
ConVar g_Cvar_IncludeMaps;
ConVar g_Cvar_IncludeMinMaps;
ConVar g_Cvar_IncludeMaxMaps;
ConVar g_Cvar_PersistentMaps;
ConVar g_Cvar_NoVoteMode;
ConVar g_Cvar_Extend;
Expand Down Expand Up @@ -127,7 +128,8 @@ public void OnPluginStart()
g_Cvar_ExtendRoundStep = CreateConVar("sm_extendmap_roundstep", "5", "Specifies how many more rounds each extension makes", _, true, 1.0);
g_Cvar_ExtendFragStep = CreateConVar("sm_extendmap_fragstep", "10", "Specifies how many more frags are allowed when map is extended.", _, true, 5.0);
g_Cvar_ExcludeMaps = CreateConVar("sm_mapvote_exclude", "5", "Specifies how many past maps to exclude from the vote.", _, true, 0.0);
g_Cvar_IncludeMaps = CreateConVar("sm_mapvote_include", "5", "Specifies how many maps to include in the vote.", _, true, 2.0, true, 6.0);
g_Cvar_IncludeMinMaps = CreateConVar("sm_mapvote_include_min", "4", "Specifies the minimum number of maps to include in the vote.", _, true, 2.0, true, 6.0);
g_Cvar_IncludeMaxMaps = CreateConVar("sm_mapvote_include_max", "6", "Specifies the maximum number of maps to include in the vote.", _, true, 2.0, true, 6.0);
g_Cvar_PersistentMaps = CreateConVar("sm_mapvote_persistentmaps", "0", "Specifies if previous maps should be stored persistently.", _, true, 0.0, true, 1.0);
g_Cvar_NoVoteMode = CreateConVar("sm_mapvote_novote", "1", "Specifies whether or not MapChooser should pick a map if no votes are received.", _, true, 0.0, true, 1.0);
g_Cvar_Extend = CreateConVar("sm_mapvote_extend", "0", "Number of extensions allowed each map.", _, true, 0.0);
Expand Down Expand Up @@ -609,7 +611,7 @@ void InitiateVote(MapChange when, ArrayList inputlist=null)
if (inputlist == null)
{
int nominateCount = g_NominateList.Length;
int voteSize = g_Cvar_IncludeMaps.IntValue;
int voteSize = g_Cvar_IncludeMaxMaps.IntValue;

/* Smaller of the two - It should be impossible for nominations to exceed the size though (cvar changed mid-map?) */
int nominationsToAdd = nominateCount >= voteSize ? voteSize : nominateCount;
Expand Down Expand Up @@ -993,16 +995,20 @@ void CreateNextVote()
GetCurrentMap(map, sizeof(map));
RemoveStringFromArray(tempMaps, map);

if (g_Cvar_ExcludeMaps.IntValue && tempMaps.Length > g_Cvar_ExcludeMaps.IntValue)
// Start excluding the most recently played maps first
for (int i = g_OldMapList.Length-1; i >= 0; i--)
{
for (int i = 0; i < g_OldMapList.Length; i++)
if (tempMaps.Length <= g_Cvar_IncludeMinMaps.IntValue)
{
g_OldMapList.GetString(i, map, sizeof(map));
RemoveStringFromArray(tempMaps, map);
// Exit if we hit the minimum option count
break;
}

g_OldMapList.GetString(i, map, sizeof(map));
Copy link
Member

@KyleSanderson KyleSanderson Oct 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not correct. There's no reason to triple scan the array.

RemoveStringFromArray(tempMaps, map);
}

int limit = (g_Cvar_IncludeMaps.IntValue < tempMaps.Length ? g_Cvar_IncludeMaps.IntValue : tempMaps.Length);
int limit = (g_Cvar_IncludeMaxMaps.IntValue < tempMaps.Length ? g_Cvar_IncludeMaxMaps.IntValue : tempMaps.Length);
for (int i = 0; i < limit; i++)
{
int b = GetRandomInt(0, tempMaps.Length - 1);
Expand Down Expand Up @@ -1054,15 +1060,15 @@ NominateResult InternalNominateMap(char[] map, bool force, int owner)
}

/* Too many nominated maps. */
if (g_NominateList.Length >= g_Cvar_IncludeMaps.IntValue && !force)
if (g_NominateList.Length >= g_Cvar_IncludeMaxMaps.IntValue && !force)
{
return Nominate_VoteFull;
}

g_NominateList.PushString(map);
g_NominateOwners.Push(owner);

while (g_NominateList.Length > g_Cvar_IncludeMaps.IntValue)
while (g_NominateList.Length > g_Cvar_IncludeMaxMaps.IntValue)
{
char oldmap[PLATFORM_MAX_PATH];
g_NominateList.GetString(0, oldmap, sizeof(oldmap));
Expand Down