Merge branch 'northivanastan/documentation' into 'master'

[xonotic/xonotic.git] / Docs / mapping.txt

diff --git a/Docs/mapping.txt b/Docs/mapping.txt
index de13f2ad44f194457c5de737f8ea1a650d4e977d..5ab3e356c2a97148bf875803a0aba3c7bb16772a 100644 (file)
--- a/Docs/mapping.txt
+++ b/Docs/mapping.txt
@@ -57,14 +57,13 @@ data/data/wazat1.mapinfo for me. The file may look like:
     _diameter 1966.839355\r
     _spawnpoints 5\r
     has weapons\r
-       cdtrack 5\r
+    cdtrack 5\r
     gametype dm // defaults: timelimit=20 pointlimit=30 leadlimit=0\r
     gametype dom // defaults: timelimit=20 pointlimit=200 teams=2 leadlimit=0\r
     gametype lms // defaults: timelimit=20 lives=9 leadlimit=0\r
-    gametype arena // defaults: timelimit=20 pointlimit=10 leadlimit=0\r
 \r
 As I see, the menu autodetected that my map may be suitable for deathmatch,\r
-domination, last man standing and arena. But I want the map to be played in\r
+domination, last man standing and keepaway. But I want the map to be played in\r
 domination, deathmatch, team deathmatch only, and I also want different\r
 timelimits/fraglimits, so I will change the "gametype" lines to:\r
 \r
@@ -98,7 +97,6 @@ Team Deathmatch | gametype tdm [timelimit=...] [pointlimit=...] [teams=...] [lea
 Domination      | gametype dom [timelimit=...] [pointlimit=...] [teams=...] [leadlimit=...]                                | 2, 3, or 4 teams, only if map has no dom_team ents\r
 CTF             | gametype ctf [timelimit=...] [caplimit=...] [leadlimit=...]                                              |\r
 LMS             | gametype lms [timelimit=...] [lives=...] [leadlimit=...]                                                 |\r
-Arena           | gametype arena [timelimit=...] [pointlinit=...] [leadlimit=...]                                          |\r
 Key Hunt        | gametype kh [timelimit=...] [pointlimit=...] [teams=...] [leadlimit=...]                                 | 2, 3, or 4 teams\r
 Assault         | gametype as [timelimit=...]                                                                              | never uses points\r
 Onslaught       | gametype ons [timelimit=...]                                                                             | never uses points\r