Merge #2579 #2588

2579: Ship map_convert_07 executable, allow drag'n'drop and ship Gold Mine map (with sixup version) instead of Kobra 4 and Goo! r=def- a=def-



2588: Add instructions about how to kill and pause game r=def- a=def-



Co-authored-by: def <dennis@felsin9.de>

CMakeLists.txt

@@ -1102,21 +1102,10 @@ set(EXPECTED_DATA
   mapres/winter_mountains.png
   mapres/winter_mountains2.png
   mapres/winter_mountains3.png
-  maps/Goo!.map
-  maps/Kobra\ 4.map
-  maps/ctf1.map
-  maps/ctf2.map
-  maps/ctf3.map
-  maps/ctf4.map
-  maps/ctf5.map
-  maps/ctf6.map
-  maps/ctf7.map
-  maps/dm1.map
-  maps/dm2.map
-  maps/dm6.map
-  maps/dm7.map
-  maps/dm8.map
-  maps/dm9.map
+  maps/Gold\ Mine.map
+  maps/license.txt
+  maps7/Gold\ Mine.map
+  maps7/readme.txt
   particles.png
   shader/bordertile.frag
   shader/bordertile.vert
@@ -2251,6 +2240,7 @@ set(CPACK_TARGETS
   config_retrieve
   config_store
   dilate
+  map_convert_07
   map_diff
   map_extract
 )

autoexec_server.cfg

@@ -33,7 +33,7 @@ sv_rcon_mod_password ""
 sv_rcon_helper_password ""
 
 # Map to start server with
-sv_map "Kobra 4"
+sv_map "Gold Mine"
 
 # Whether this is a test server and rcon cheats are allowed. Also indicated in
 # the server type, which is:
@@ -127,8 +127,7 @@ sv_reset_file "reset.cfg"
 #
 # You can learn more about tunes on http://ddnet.tw/settingscommands/#tunings
 
-add_vote "Map: Kobra 4" "change_map \"Kobra 4\""
-add_vote "Map: Goo!" "change_map Goo!"
+add_vote "Map: Gold Mine" "change_map \"Gold Mine\""
 add_vote " " "info"
 add_vote "Option: Normal gravity" "tune gravity 0.50"
 add_vote "Option: Moon gravity" "tune gravity 0.25"

data/languages/belarusian.txt

@@ -711,6 +711,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/bosnian.txt

@@ -713,6 +713,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/brazilian_portuguese.txt

@@ -1182,6 +1182,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/bulgarian.txt

@@ -708,6 +708,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/catalan.txt

@@ -1187,5 +1187,8 @@ Replay %3d:%02d
 9+ new mentions
 == 9+ noves mencions
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 Client message
 == 

data/languages/chuvash.txt

@@ -711,6 +711,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/czech.txt

@@ -714,6 +714,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/danish.txt

@@ -711,6 +711,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/dutch.txt

@@ -1199,6 +1199,9 @@ Grabs
 9+ new mentions
 == 9+ nieuwe berichten
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 Client message
 == 
 

data/languages/finnish.txt

@@ -712,6 +712,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/french.txt

@@ -1215,6 +1215,9 @@ Show DDNet map finishes in server browser
 transmits your player name to info.ddnet.tw
 == transmet votre pseudonyme à info.ddnet.tw
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 Client message
 == 
 

data/languages/german.txt

@@ -1209,5 +1209,8 @@ Toggle dyncam
 Show others (own team only)
 == Andere Spieler zeigen (nur eigenes Team)
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== Benutze die Taste k um neuzustarten, q zum pausieren und andere Spieler zu beobachten. In den Einstellungen sieht man weitere Tasten.
+
 Client message
-== 
+== Client-Nachricht

data/languages/greek.txt

@@ -714,6 +714,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/hungarian.txt

@@ -1193,6 +1193,9 @@ Length
 Are you sure that you want to disconnect your dummy?
 == Biztos, hogy kiakarod léptetni a másolatodat?
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 Skin prefix
 == 
 

data/languages/italian.txt

@@ -717,6 +717,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/japanese.txt

@@ -711,6 +711,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/korean.txt

@@ -710,6 +710,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/kyrgyz.txt

@@ -705,6 +705,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/norwegian.txt

@@ -711,6 +711,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/persian.txt

@@ -790,6 +790,9 @@ Personal best:
 Best
 == ﻦﯾﺮﺘﻬﺑ
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 may cause delay
 == 
 

data/languages/polish.txt

@@ -1199,5 +1199,8 @@ Indicate map finish
 Show others (own team only)
 == Pokazuj innych (tylko drużynę)
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 Client message
 == 

data/languages/portuguese.txt

@@ -952,6 +952,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/romanian.txt

@@ -720,6 +720,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/russian.txt

@@ -1217,5 +1217,8 @@ Grabs
 9+ new mentions
 == 9+ новых упоминаний
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 Client message
 == 

data/languages/serbian.txt

@@ -713,6 +713,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/simplified_chinese.txt

@@ -1205,3 +1205,6 @@ Client message
 
 Show others (own team only)
 == 显示其他玩家(仅同队伍)
+
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 

data/languages/slovak.txt

@@ -711,6 +711,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/spanish.txt

@@ -1200,5 +1200,8 @@ Grabs
 9+ new mentions
 == 9+ nuevas menciones
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 Client message
 == 

data/languages/swedish.txt

@@ -1196,5 +1196,8 @@ Connect Dummy
 Show others (own team only)
 == Visa andra (eget lag endast)
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 Client message
 == 

data/languages/traditional_chinese.txt

@@ -1061,6 +1061,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/turkish.txt

@@ -713,6 +713,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/languages/ukrainian.txt

@@ -555,6 +555,9 @@ Hook (right mouse) can be used to swing through the map and to hook other tees t
 Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
 == 
 
+Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
+== 
+
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 

data/maps/license.txt

@@ -0,0 +1,3 @@
+Gold Mine:
+Copyright <BµmM>
+CC-BY-SA license

data/maps7/readme.txt

@@ -0,0 +1,2 @@
+Maps in this directory are created using the map_convert_07 tool for
+server compatibility with Teeworlds 0.7 clients

src/engine/shared/config_variables.h

@@ -120,7 +120,7 @@ MACRO_CONFIG_INT(SvIpv4Only, sv_ipv4only, 0, 0, 1, CFGFLAG_SERVER, "Whether to b
 MACRO_CONFIG_INT(SvPort, sv_port, 0, 0, 0, CFGFLAG_SERVER, "Port to use for the server (Only ports 8303-8310 work in LAN server browser, 0 to automatically find a free port in 8303-8310)")
 MACRO_CONFIG_INT(SvExternalPort, sv_external_port, 0, 0, 0, CFGFLAG_SERVER, "External port to report to the master servers")
 MACRO_CONFIG_STR(SvHostname, sv_hostname, 128, "", CFGFLAG_SAVE|CFGFLAG_SERVER, "Server hostname (0.7 only)")
-MACRO_CONFIG_STR(SvMap, sv_map, 128, "Kobra 4", CFGFLAG_SERVER, "Map to use on the server")
+MACRO_CONFIG_STR(SvMap, sv_map, 128, "Gold Mine", CFGFLAG_SERVER, "Map to use on the server")
 MACRO_CONFIG_INT(SvMaxClients, sv_max_clients, MAX_CLIENTS, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients that are allowed on a server")
 MACRO_CONFIG_INT(SvMaxClientsPerIP, sv_max_clients_per_ip, 4, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients with the same IP that can connect to the server")
 MACRO_CONFIG_INT(SvHighBandwidth, sv_high_bandwidth, 0, 0, 1, CFGFLAG_SERVER, "Use high bandwidth mode. Doubles the bandwidth required for the server. LAN use only")

src/game/client/components/menus.cpp

@@ -1198,12 +1198,13 @@ int CMenus::Render()
 		else if(m_Popup == POPUP_FIRST_LAUNCH)
 		{
 			pTitle = Localize("Welcome to DDNet");
-			str_format(aBuf, sizeof(aBuf), "%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s",
+			str_format(aBuf, sizeof(aBuf), "%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s",
 				Localize("DDraceNetwork is a cooperative online game where the goal is for you and your group of tees to reach the finish line of the map. As a newcomer you should start on Novice servers, which host the easiest maps. Consider the ping to choose a server close to you."),
 				Localize("The maps contain freeze, which temporarily make a tee unable to move. You have to work together to get through these parts."),
 				Localize("The mouse wheel changes weapons. Hammer (left mouse) can be used to hit other tees and wake them up from being frozen."),
 				Localize("Hook (right mouse) can be used to swing through the map and to hook other tees to you."),
 				Localize("Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game."),
+				Localize("Use k key to kill (restart), q to pause and watch other players. See settings for other key binds."),
 				Localize("It's recommended that you check the settings to adjust them to your liking before joining a server."),
 				Localize("Please enter your nick name below."));
 			pExtraText = aBuf;

src/tools/map_convert_07.cpp

@@ -148,21 +148,40 @@ int main(int argc, const char **argv)
 
 	IStorage *pStorage = CreateStorage("Teeworlds", IStorage::STORAGETYPE_BASIC, argc, argv);
 
-	if(argc != 3)
+	if(argc < 2 || argc > 3)
 	{
 		dbg_msg("map_convert_07", "Invalid arguments");
-		dbg_msg("map_convert_07", "Usage: map_convert_07 <source map filepath> <dest map filepath>");
+		dbg_msg("map_convert_07", "Usage: map_convert_07 <source map filepath> [<dest map filepath>]");
 		return -1;
 	}
 
-	if (!pStorage)
+	if(!pStorage)
 	{
 		dbg_msg("map_convert_07", "error loading storage");
 		return -1;
 	}
 
 	const char *pSourceFileName = argv[1];
-	const char *pDestFileName = argv[2];
+
+	const char *pDestFileName;
+	char aDestFileName[MAX_PATH_LENGTH];
+
+	if(argc == 3)
+	{
+		pDestFileName = argv[2];
+	}
+	else
+	{
+		char aBuf[MAX_PATH_LENGTH];
+		IStorage::StripPathAndExtension(pSourceFileName, aBuf, sizeof(aBuf));
+		str_format(aDestFileName, sizeof(aDestFileName), "data/maps7/%s.map", aBuf);
+		pDestFileName = aDestFileName;
+		if(fs_makedir("data/maps7") != 0)
+		{
+			dbg_msg("map_convert_07", "failed to create maps7 directory");
+			return -1;
+		}
+	}
 
 	int ID = 0;
 	int Type = 0;