Add mappool

cfg/sourcemod/pugsetup/all.txt

@@ -0,0 +1 @@
+// add all maps on the server here

cfg/sourcemod/pugsetup/competitive.txt

@@ -0,0 +1 @@
+// add competitive maps here

cfg/sourcemod/pugsetup/fun.txt

@@ -0,0 +1 @@
+// add fun maps for casual games here

scripting/pugsetup.sp

@@ -12,7 +12,7 @@
 #include <SteamWorks>
 
 #undef REQUIRE_PLUGIN
-#include "include/updater.inc"
+#include <updater>
 #define UPDATE_URL "http://dl.whiffcity.com/plugins/pugsetup/pugsetup.txt"
 
 #define ALIAS_LENGTH 64
@@ -269,7 +269,7 @@ public void OnPluginStart() {
       "sm_pugsetup_force_defaults", "0",
       "Whether the default setup options are forced as the setup options (note that admins can override them still).");
   g_InstantRunoffVotingCvar = CreateConVar(
-      "sm_pugsetup_instant_runoff_voting", "1",
+      "sm_pugsetup_instant_runoff_voting", "0",
       "If set, map votes will run instant-runoff style where each client selects their top 3 maps in preference order.");
   g_KnifeConfigCvar = CreateConVar(
       "sm_pugsetup_knife_cfg", "sourcemod/pugsetup/knife.cfg",
@@ -1196,6 +1196,7 @@ public int MatchEndHandler(Menu menu, MenuAction action, int param1, int param2)
   } else if (action == MenuAction_End) {
     CloseHandle(menu);
   }
+  return 1;
 }
 
 public Action Command_ForceEnd(int client, int args) {
@@ -1603,10 +1604,12 @@ public Action Event_MatchOver(Event event, const char[] name, bool dontBroadcast
 /** Helper timer to delay starting warmup period after match is over by a little bit **/
 public Action Timer_EndMatch(Handle timer) {
   EndMatch(false, false);
+  return Plugin_Continue;
 }
 
 public Action Event_RoundStart(Event event, const char[] name, bool dontBroadcast) {
   CheckAutoSetup();
+  return Plugin_Continue;
 }
 
 public Action Event_RoundEnd(Event event, const char[] name, bool dontBroadcast) {
@@ -1633,23 +1636,26 @@ public Action Event_RoundEnd(Event event, const char[] name, bool dontBroadcast)
       PugSetup_MessageToAll("%t", "KnifeRoundWinner", teamString, stayCmd, swapCmd);
     }
   }
+  return Plugin_Continue;
 }
 
 public Action Event_PlayerSpawn(Event event, const char[] name, bool dontBroadcast) {
   if (g_GameState != GameState_Warmup)
-    return;
+    return Plugin_Continue;
 
   int client = GetClientOfUserId(event.GetInt("userid"));
   if (IsPlayer(client) && OnActiveTeam(client) && g_WarmupMoneyOnSpawnCvar.IntValue != 0) {
     SetEntProp(client, Prop_Send, "m_iAccount", GetCvarIntSafe("mp_maxmoney"));
   }
+  return Plugin_Continue;
 }
 
 public Action Event_PlayerConnect(Event event, const char[] name, bool dontBroadcast) {
   int userid = event.GetInt("userid");
   int client = GetClientOfUserId(userid);
   g_Teams[client] = CS_TEAM_NONE;
   g_PlayerAtStart[client] = false;
+  return Plugin_Continue;
 }
 
 public Action Event_PlayerDisconnect(Event event, const char[] name, bool dontBroadcast) {
@@ -1661,6 +1667,7 @@ public Action Event_PlayerDisconnect(Event event, const char[] name, bool dontBr
     g_capt1 = -1;
   if (g_capt2 == client)
     g_capt2 = -1;
+  return Plugin_Continue;
 }
 
 /**
@@ -1874,6 +1881,7 @@ public Action Timer_BeginMatch(Handle timer) {
     ChangeState(GameState_GoingLive);
     CreateTimer(3.0, BeginLO3, _, TIMER_FLAG_NO_MAPCHANGE);
   }
+  return Plugin_Continue;
 }
 
 public void ScrambleTeams() {
@@ -2236,4 +2244,4 @@ stock bool PermissionFromString(const char[] permissionString, Permission& p,
   }
 
   return true;
-}
+}

scripting/pugsetup/captainpickmenus.sp

@@ -46,6 +46,7 @@ public int InitialChoiceHandler(Menu menu, MenuAction action, int param1, int pa
   } else if (action == MenuAction_End) {
     delete menu;
   }
+  return 1;
 }
 
 public void SideMenu(int client) {
@@ -88,6 +89,7 @@ public int SideMenuHandler(Menu menu, MenuAction action, int param1, int param2)
   } else if (action == MenuAction_End) {
     delete menu;
   }
+  return 1;
 }
 
 /**
@@ -123,7 +125,7 @@ public Action GivePlayerSelectionMenu(Handle timer, int serial) {
 
 public int PlayerMenuHandler(Menu menu, MenuAction action, int param1, int param2) {
   if (g_GameState != GameState_PickingPlayers)
-    return;
+    return 0;
 
   if (action == MenuAction_Select) {
     int client = param1;
@@ -155,6 +157,7 @@ public int PlayerMenuHandler(Menu menu, MenuAction action, int param1, int param
   } else if (action == MenuAction_End) {
     delete menu;
   }
+  return 1;
 }
 
 static void MoreMenuPicks(int client) {

scripting/pugsetup/instantrunoffvote.sp

@@ -186,6 +186,7 @@ static int CountMapsAlive(int& winner) {
 
 public Action Timer_CollectIRVResults(Handle timer) {
   CollectIRVResults();
+  return Plugin_Continue;
 }
 
 public void CollectIRVResults() {

scripting/pugsetup/kniferounds.sp

@@ -45,6 +45,7 @@ public Action Timer_AnnounceKnife(Handle timer) {
 
 public Action Timer_HandleKnifeDecisionVote(Handle timer) {
   HandleKnifeDecisionVote(true);
+  return Plugin_Continue;
 }
 
 static void HandleKnifeDecisionVote(bool timeExpired = false) {

scripting/pugsetup/leadermenus.sp

@@ -32,6 +32,7 @@ public int Captain1MenuHandler(Menu menu, MenuAction action, int param1, int par
   } else if (action == MenuAction_End) {
     CloseHandle(menu);
   }
+  return 1;
 }
 
 public void Captain2Menu(int client) {
@@ -62,6 +63,7 @@ public int Captain2MenuHandler(Menu menu, MenuAction action, int param1, int par
   } else if (action == MenuAction_End) {
     CloseHandle(menu);
   }
+  return 1;
 }
 
 static int CountPotentialCaptains(int otherCaptain) {
@@ -110,6 +112,7 @@ public int LeaderMenuHandler(Menu menu, MenuAction action, int param1, int param
   } else if (action == MenuAction_End) {
     CloseHandle(menu);
   }
+  return 1;
 }
 
 static int AddAllPlayers(Menu menu) {

scripting/pugsetup/mapveto.sp

@@ -71,6 +71,7 @@ public int VetoHandler(Menu menu, MenuAction action, int param1, int param2) {
   } else if (action == MenuAction_End) {
     CloseHandle(menu);
   }
+  return 1;
 }
 
 static void VetoStatusDisplay(int client) {
@@ -89,4 +90,5 @@ public int VetoStatusHandler(Menu menu, MenuAction action, int param1, int param
   if (action == MenuAction_End) {
     CloseHandle(menu);
   }
+  return 1;
 }

scripting/pugsetup/mapvote.sp

@@ -1,9 +1,53 @@
 #define RANDOM_MAP_VOTE "-1"  // must be in invalid index for array indexing
 
+char mapGroups[][] = {
+      "competitive.txt", "fun.txt", "all.txt"
+};
+
 /**
  * Map voting functions
  */
 public void CreateMapVote() {
+          StartMapVote2();
+}
+static void StartMapVote2() {
+  Menu menu = new Menu(MapVoteHandler2);
+  menu.SetTitle("%T", "VoteMenuTitle", LANG_SERVER);
+  menu.ExitButton = false;
+  for (int i = 0; i < sizeof(mapGroups); i++) {
+        char text[64], id[4];
+        Format(text, 64, mapGroups[i]);
+        Format(id, 4, "%i", i);
+        ReplaceString(text, 64, ".txt", "", false);
+        AddMenuItem(menu, id, text);
+  }
+  VoteMenuToAll(menu, g_MapVoteTimeCvar.IntValue);
+}
+public int MapVoteHandler2(Menu menu, MenuAction action, int param1, int param2) {
+  if (action == MenuAction_VoteEnd) {
+        int winner = GetMenuInt(menu, param1);
+
+        ServerCommand("sm_pugsetup_maplist %s", mapGroups[winner]);
+
+        char text[64];
+        Format(text, 64, mapGroups[winner]);
+        ReplaceString(text, 64, ".txt", "", false);
+
+        PrintCenterTextAll("Winner is %s", text);
+
+        CreateTimer(0.5, Timer_Continue, _, TIMER_FLAG_NO_MAPCHANGE);
+
+  } else if (action == MenuAction_End) {
+    CloseHandle(menu);
+  }
+  return 0;
+}
+public Action Timer_Continue(Handle timer)
+{
+        CreateMapVote2();
+        return Plugin_Handled;
+}
+public void CreateMapVote2() {
   if (g_ExcludedMaps.IntValue > 0 && g_MapList.Length > g_PastMaps.Length) {
     SetupMapVotePool(true);
   } else {
@@ -22,6 +66,7 @@ public void CreateMapVote() {
 }
 
 static void StartMapVote() {
+  FillMapList(g_MapListCvar, g_MapVotePool);
   Menu menu = new Menu(MapVoteHandler);
   menu.SetTitle("%T", "VoteMenuTitle", LANG_SERVER);
   menu.ExitButton = false;
@@ -39,6 +84,8 @@ static void StartMapVote() {
   }
 
   for (int i = 0; i < g_MapVotePool.Length; i++) {
+    char mapName[64];
+    g_MapVotePool.GetString(i, mapName, sizeof(mapName));
     AddMapIndexToMenu(menu, g_MapVotePool, i);
   }
 

scripting/pugsetup/natives.sp

@@ -75,6 +75,7 @@ public int Native_SetupGame(Handle plugin, int numParams) {
   }
 
   SetupFinished();
+  return 1;
 }
 
 public int Native_GetSetupOptions(Handle plugin, int numParams) {
@@ -88,6 +89,7 @@ public int Native_GetSetupOptions(Handle plugin, int numParams) {
   SetNativeCellRef(4, g_RecordGameOption);
   SetNativeCellRef(5, g_DoKnifeRound);
   SetNativeCellRef(6, g_AutoLive);
+  return 1;
 }
 
 public int Native_SetSetupOptions(Handle plugin, int numParams) {
@@ -97,6 +99,7 @@ public int Native_SetSetupOptions(Handle plugin, int numParams) {
   g_RecordGameOption = GetNativeCell(4);
   g_DoKnifeRound = GetNativeCell(5);
   g_AutoLive = GetNativeCell(6);
+  return 1;
 }
 
 public int Native_ReadyPlayer(Handle plugin, int numParams) {
@@ -218,6 +221,7 @@ public int Native_SetLeader(Handle plugin, int numParams) {
     PugSetup_MessageToAll("%t", "NewLeader", client);
     g_Leader = client;
   }
+  return 1;
 }
 
 public int Native_GetLeader(Handle plugin, int numParams) {
@@ -277,6 +281,7 @@ public int Native_SetCaptain(Handle plugin, int numParams) {
       PugSetup_MessageToAll("%t", "CaptMessage", captainNumber, buffer);
     }
   }
+  return 1;
 }
 
 public int Native_GetCaptain(Handle plugin, int numParams) {
@@ -294,7 +299,7 @@ public int Native_GetCaptain(Handle plugin, int numParams) {
 public int Native_Message(Handle plugin, int numParams) {
   int client = GetNativeCell(1);
   if (client != 0 && (!IsClientConnected(client) || !IsClientInGame(client)))
-    return;
+    return 0;
 
   char buffer[1024];
   int bytesWritten = 0;
@@ -317,6 +322,7 @@ public int Native_Message(Handle plugin, int numParams) {
     Colorize(finalMsg, sizeof(finalMsg));
     PrintToChat(client, finalMsg);
   }
+  return 1;
 }
 
 public int Native_MessageToAll(Handle plugin, int numParams) {
@@ -346,6 +352,7 @@ public int Native_MessageToAll(Handle plugin, int numParams) {
       PrintToConsole(i, finalMsg);
     }
   }
+  return 1;
 }
 
 public int Native_GetPugMaxPlayers(Handle plugin, int numParams) {
@@ -397,7 +404,7 @@ public int Native_HasPermissions(Handle plugin, int numParams) {
     return isAdmin;
   else if (p == Permission_Leader)
     return isLeader || isAdmin;
-  else if (p == Permission_Captains)
+  else if (p == Permission_Captains && UsingCaptains())
     return isCapt || isLeader || isAdmin;
   else if (p == Permission_All)
     return true;
@@ -426,6 +433,8 @@ public int Native_SetRandomCaptains(Handle plugin, int numParams) {
 
   if (IsPlayer(c2))
     PugSetup_SetCaptain(2, c2, true);
+
+  return 1;
 }
 
 public int Native_AddChatAlias(Handle plugin, int numParams) {
@@ -445,6 +454,7 @@ public int Native_AddChatAlias(Handle plugin, int numParams) {
     g_ChatAliasesCommands.PushString(command);
     g_ChatAliasesModes.Push(mode);
   }
+  return 1;
 }
 
 public int Native_GiveSetupMenu(Handle plugin, int numParams) {
@@ -459,12 +469,14 @@ public int Native_GiveSetupMenu(Handle plugin, int numParams) {
   }
 
   SetupMenu(client, displayOnly, menuPosition);
+  return 1;
 }
 
 public int Native_GiveMapChangeMenu(Handle plugin, int numParams) {
   int client = GetNativeCell(1);
   CHECK_CLIENT(client);
   ChangeMapMenu(client);
+  return 1;
 }
 
 public int Native_IsValidCommand(Handle plugin, int numParams) {
@@ -501,7 +513,19 @@ public int Native_SetTeamBalancer(Handle plugin, int numParams) {
   bool override = GetNativeCell(2);
   if (!PugSetup_IsTeamBalancerAvaliable() || override) {
     g_BalancerFunctionPlugin = plugin;
+    //ArrayList players = new ArrayList();
     g_BalancerFunction = view_as<TeamBalancerFunction>(GetNativeFunction(1));
+    for (int i = 1; i <= MaxClients; i++) {
+      if (IsPlayer(i)) {
+        if (PugSetup_IsReady(i))
+          players.Push(i);
+      }
+    }
+    Call_StartFunction(g_BalancerFunctionPlugin, g_BalancerFunction);
+    Call_PushCell(players);
+    Call_Finish();
+    delete players;
+
     return true;
   }
   return false;