Simplified logic behind MOTDs

server.cfg

@@ -8,20 +8,8 @@ exec rconpw.cfg
 hostname "/v/ Pacific [Xon/XPM/XDF | Voteable | $g_xonoticversion]"
 bot_prefix "^1∞ ^7| "
 
-// ^xF6C = February
-// ^x5F5 = March
-// ^xFC2 = April
-// ^x07F = June
-set welcome "\nWelcome to /v/ Xonotic Server, North America Pacific\nCheck for Xonotic threads on /v/ for playing times and upcoming events."
-set irc_gate "\n\n\n^xf00IRC Gateway to QuakeNet #xonotic.na is currently ^x3eeactive\n^7Chats on say_team and tell are not sent to IRC."
-set cts_lbs "\n\nOnline CTS Leaderboards:\nhttp://98.176.82.106:15000/cgi/cts"
-set duel_maps "\n\n^x07FJune Duel Event Map Pool: Boil, Fuse, Phrantic, Silentsiege, Iron Lung, Mint, Warfare"
-set border "\n----------------------------------------------\n"
-set match_info "\nCurrent Match Balance: $g_mod_balance"
-set mode_desc_1 "\n\nActive Player Limits:"
-set mode_desc_2 "None"
-
-alias +motd "sv_motd \"$mode_desc_1 $mode_desc_2 $border $welcome $irc_gate $cts_lbs $duel_maps ""
+alias +motd "exec sv_motd.cfg"
++motd
 
 //sv_curl_defaulturl "http://dl.xonotic.co/"
 sv_curl_defaulturl "http://98.176.82.106:15000/"
@@ -46,10 +34,8 @@ g_maplist_mostrecent_count 0
 //-----------------------------------------------
 // vcall: Duel
 //-----------------------------------------------
-alias +duel_msg "set mode_desc_2 Duel; update_motd"
-alias -duel_msg "set mode_desc_2 None; update_motd"
-alias +duel "set g_maxplayers 2; +duel_msg"
-alias -duel "set g_maxplayers 0; -duel_msg"
+alias +duel "set g_maxplayers 2; +motd"
+alias -duel "set g_maxplayers 0; -motd"
 
 //-----------------------------------------------
 // vcall: Komier Weapons
@@ -91,7 +77,7 @@ alias sv_xon "exec sv_xon.cfg"
 alias sv_xdf "exec sv_xdf.cfg"
 alias sv_xpm "exec balance-xpm.cfg; exec sv_xpm.cfg; addvote +duel -duel +smile-physics -smile-physics;" 
 
-alias sv_vote_gametype_hook_all "exec physicsX.cfg; exec balance-xonotic.cfg; sv_xon; ffa_vote; set mode_desc_2 None; +motd""
+alias sv_vote_gametype_hook_all "exec physicsX.cfg; exec balance-xonotic.cfg; sv_xon; ffa_vote; +motd""
 alias sv_vote_gametype_hook_cts "exec physicsXDF.cfg; exec balance-xdf.cfg; sv_xdf"
 alias sv_vote_gametype_hook_ctf "timelimit_override 20; team_vote"
 alias sv_vote_gametype_hook_tdm "timelimit_override 20; team_vote"
@@ -128,7 +114,7 @@ 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_xpm; +duel; fraglimit_override 0; exec sv_maps_duel.cfg; +motd"
+alias sv_vote_gametype_hook_duel "sv_xpm; +duel; fraglimit_override 0; exec sv_maps_duel.cfg"
 
 //-----------------------------------------------
 // Komier's Experimental Balance

sv_motd.cfg

@@ -0,0 +1,19 @@
+// ^xF6C = February
+// ^x5F5 = March
+// ^xFC2 = April
+// ^x07F = June
+set welcome     "\nWelcome to /v/ Xonotic Server, North America Pacific\nCheck for Xonotic threads on /v/ for playing times and upcoming events."
+set irc_gate    "\n\n\n^xf00IRC Gateway to QuakeNet #xonotic.na is currently ^x3eeactive\n^7Chats on say_team and tell are not sent to IRC."
+set cts_lbs     "\n\nOnline CTS Leaderboards:\nhttp://98.176.82.106:15000/cgi/cts"
+set duel_maps   "\n\n^x07FJune Duel Event Map Pool: Boil, Fuse, Phrantic, Silentsiege, Iron Lung, Mint, Warfare"
+set border      "\n_______________________________________\n"
+set match_info  "\nCurrent Match Balance: $g_mod_balance"
+set plimit      "\n\nActive Player Limits:"
+
+#ifeq "$g_maxplayers" 2
+#   set pl "Duel"
+#else
+#   set pl "N/A"
+#endif
+
+sv_motd "$plimit $pl $border $welcome $irc_gate $cts_lbs $duel_maps"