Separate end-vote timing into new ConVar

Introduce a new ConVar multimode_endvote_type (g_Cvar_EndVoteType) to control end-vote timing (Next Map / Next Round / Instant). Refactor PerformEndVote and Event_RoundEnd to keep vote method selection using multimode_endvote_method while using the new multimode_endvote_type for TimingMode calculation and clamping. Update logging and local variable names accordingly.

Author: TheDGB

addons/sourcemod/scripting/multimode_endvote.sp

@@ -29,6 +29,7 @@ ConVar g_Cvar_EndVoteRounds;
 ConVar g_Cvar_EndVoteFrags;
 ConVar g_Cvar_EndVoteOnRoundEnd;
 ConVar g_Cvar_EndVoteMethod;
+ConVar g_Cvar_EndVoteType;
 ConVar g_hCvarTimeLimit;
 
 // Vote Configuration ConVars
@@ -73,6 +74,7 @@ public void OnPluginStart()
     g_Cvar_EndVoteFrags = CreateConVar("multimode_endvote_frags", "10", "Frags remaining before map ends to trigger vote (0 = disabled)", _, true, 0.0);
     g_Cvar_EndVoteOnRoundEnd = CreateConVar("multimode_endvote_onroundend", "0", "Wait for round end before starting vote", _, true, 0.0, true, 1.0);
     g_Cvar_EndVoteMethod = CreateConVar("multimode_endvote_method", "1", "Vote method for end vote: 1 = Groups then Maps, 2 = Groups only (random map), 3 = Maps only", _, true, 1.0, true, 3.0);
+    g_Cvar_EndVoteType = CreateConVar("multimode_endvote_type", "1", "Voting Type for End Vote: 1 = Next Map, 2 = Next Round, 3 = Instant", _, true, 1.0, true, 3.0);
     g_hCvarTimeLimit = FindConVar("mp_timelimit");
 
     g_Cvar_VoteTime = CreateConVar("multimode_endvote_vote_time", "20", "Vote duration in seconds");
@@ -333,29 +335,29 @@ void PerformEndVote()
         return;
     }
 
-    int endType = g_Cvar_EndVoteMethod.IntValue;
-    if (endType < 1) endType = 1;
-    else if (endType > 3) endType = 3;
-    
-    TimingMode timing = view_as<TimingMode>(endType - 1);
+    int voteTypeInt = g_Cvar_EndVoteMethod.IntValue;
     MultimodeMethodType voteType;
-    
-    int method = g_Cvar_EndVoteMethod.IntValue;
-    if (method == 3)
+    if (voteTypeInt == 3)
     {
         voteType = VOTE_TYPE_MAPS_ONLY;
     }
-    else if (method == 2)
+    else if (voteTypeInt == 2)
     {
         voteType = VOTE_TYPE_GROUPS_ONLY;
     }
     else
     {
         voteType = VOTE_TYPE_GROUPS_THEN_MAPS;
     }
+    
+    int endType = g_Cvar_EndVoteType.IntValue;
+    if (endType < 1) endType = 1;
+    else if (endType > 3) endType = 3;
+    
+    TimingMode timing = view_as<TimingMode>(endType - 1);
 
     if (g_Cvar_EndVoteDebug.BoolValue)
-        MMC_WriteToLogFile(g_Cvar_EndVoteLogs, "[MultiMode End Vote] Vote type selected: %d (Timing: %d)", endType, timing);
+        MMC_WriteToLogFile(g_Cvar_EndVoteLogs, "[MultiMode End Vote] Vote type selected: %d (Timing: %d)", voteTypeInt, timing);
 
     char mapcycle[256];
     strcopy(mapcycle, sizeof(mapcycle), "");
@@ -436,19 +438,13 @@ public void Event_RoundEnd(Event event, const char[] name, bool dontBroadcast)
     {
         g_bEndVotePending = false;
 
-        int endType = g_Cvar_EndVoteMethod.IntValue;
-        if (endType < 1) endType = 1;
-        else if (endType > 3) endType = 3;
-        
-        TimingMode timing = view_as<TimingMode>(endType - 1);
+        int voteTypeInt = g_Cvar_EndVoteMethod.IntValue;
         MultimodeMethodType voteType;
-        
-        int method = g_Cvar_EndVoteMethod.IntValue;
-        if (method == 3)
+        if (voteTypeInt == 3)
         {
             voteType = VOTE_TYPE_MAPS_ONLY;
         }
-        else if (method == 2)
+        else if (voteTypeInt == 2)
         {
             voteType = VOTE_TYPE_GROUPS_ONLY;
         }
@@ -457,6 +453,12 @@ public void Event_RoundEnd(Event event, const char[] name, bool dontBroadcast)
             voteType = VOTE_TYPE_GROUPS_THEN_MAPS;
         }
 
+        int endType = g_Cvar_EndVoteType.IntValue;
+        if (endType < 1) endType = 1;
+        else if (endType > 3) endType = 3;
+        
+        TimingMode timing = view_as<TimingMode>(endType - 1);
+        
         char mapcycle[256];
         strcopy(mapcycle, sizeof(mapcycle), "");