Move XPM configs to an alias and added Duel mode vote

server.cfg

@@ -28,6 +28,7 @@ maxplayers 16
 g_maplist ""
 g_maplist_votable 9
 g_maplist_shuffle 1	
+g_maplist_votable_nodetail 0
 
 //-----------------------------------------------
 // vcall: Duel
@@ -39,7 +40,7 @@ alias -duel "set g_maxplayers 0"
 // Game Type & Per-Type Configurations
 //-----------------------------------------------
 gametype dm
-alias allgt_vote "sv_vote_commands \"restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams"\"
+alias allgt_vote "sv_vote_commands \"restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams movetospec"\"
 
 alias cagt_vote "sv_vote_commands \"restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto"\"
 
@@ -67,8 +68,11 @@ g_cts_respawn_delay_large -1
 // g_playerclip_collisions are turned off for CTS because some mappers were
 // putting invisible walls at the spawn and blocking the map from being finishable.
 alias sv_defaultXon "g_playerclip_collisions 1; g_balance_kill_antispam 5; g_start_delay 15; g_powerups -1; g_warmup 1; g_norecoil 0; g_shootfromeye 0; g_spawnshieldtime 1; g_cts_selfdamage 1; g_cts_finish_kill_delay 10; set g_maxplayers 0; sv_autodemo_perclient 0;"
+
 alias sv_defaultXDF "g_playerclip_collisions 0; g_balance_kill_antispam 0; g_start_delay 3; g_powerups 0; g_warmup 0; sv_friction_slick 0; g_cts_selfdamage 0; g_cts_finish_kill_delay 2;"
 
+alias sv_defaultXPM "exec balance-xpm.cfg; g_norecoil 1; g_shootfromeye 1; g_spawnshieldtime 0; g_powerups 0; addvote +duel; addvote -duel;"
+
 // For cts have defrag physics, all others get vanilla,
 // Essentially set things for defrag and then unset for everything else.
 // Note: it is possible to "exec defaultXDF.cfg, but it's not clear what file would unset defrag 
@@ -87,10 +91,20 @@ alias sv_vote_gametype_hook_dm "addvote +duel; addvote -duel"
 // Xonotic Pro Mode Deathmatch
 //-----------------------------------------------
 set sv_vote_gametype_xpmdm_type dm
-set sv_vote_gametype_xpmdm_name "Deathmatch (XPM)"
+set sv_vote_gametype_xpmdm_name "DM (XPM)"
 set sv_vote_gametype_xpmdm_description "Deathmatch with Pro Mode configurations and rules."
 // Gametype hook does not inherit from DM.
-alias sv_vote_gametype_hook_xpmdm "exec physicsX.cfg; exec balance-xpm.cfg; g_norecoil 1; g_shootfromeye 1; g_spawnshieldtime 0; g_powerups 0; addvote +duel; addvote -duel;"
+alias sv_vote_gametype_hook_xpmdm "sv_defaultXPM;"
+
+//-----------------------------------------------
+// Xonotic Pro Mode Duel
+//-----------------------------------------------
+set sv_vote_gametype_duel_type dm
+set sv_vote_gametype_duel_name "Duel (XPM)"
+set sv_vote_gametype_duel_description "One on one match."
+// Gametype hook does not inherit from DM.
+// Standard Xonotic physics is reset automatically on game mode vote.
+alias sv_vote_gametype_hook_duel "sv_defaultXPM; +duel;"
 
 //-----------------------------------------------
 // Komier's Experimental Balance
@@ -98,11 +112,11 @@ alias sv_vote_gametype_hook_xpmdm "exec physicsX.cfg; exec balance-xpm.cfg; g_no
 set sv_vote_gametype_kdm_type dm
 set sv_vote_gametype_kdm_name "Experimental DM"
 set sv_vote_gametype_kdm_description "Adjusted weapon balance. Uses XPM rules."
-alias sv_vote_gametype_hook_kdm "exec balance-xpm.cfg; exec xperimental-balance.cfg; g_norecoil 1; g_shootfromeye 1; g_spawnshieldtime 0; g_powerups 0; sv_autodemo_perclient 1; addvote +duel; addvote -duel;"
+alias sv_vote_gametype_hook_kdm "sv_defaultXPM; exec xperimental-balance.cfg; sv_autodemo_perclient 1;"
 
 //-----------------------------------------------
 // Gametype Voting
 //-----------------------------------------------
 sv_vote_gametype 1
-sv_vote_gametype_options "dm tdm ctf ca ft lms kh cts ka xpmdm kdm" 
+sv_vote_gametype_options "dm tdm ctf ca ft lms kh cts ka xpmdm kdm duel"