X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=Docs%2Fmapping.txt;h=5ab3e356c2a97148bf875803a0aba3c7bb16772a;hp=6a0c01ed074f75ecbbf22c7a301917878600681b;hb=883e2b54db7e05149fcd5d4cfcf40ebd7181b29e;hpb=492d615bfe7ac3467358b242099e3cd0096f62c2

diff --git a/Docs/mapping.txt b/Docs/mapping.txt
index 6a0c01ed..5ab3e356 100644
--- 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
     _spawnpoints 5
     has weapons
-	cdtrack 5
+    cdtrack 5
     gametype dm // defaults: timelimit=20 pointlimit=30 leadlimit=0
     gametype dom // defaults: timelimit=20 pointlimit=200 teams=2 leadlimit=0
     gametype lms // defaults: timelimit=20 lives=9 leadlimit=0
-    gametype arena // defaults: timelimit=20 pointlimit=10 leadlimit=0
 
 As I see, the menu autodetected that my map may be suitable for deathmatch,
-domination, last man standing and arena. But I want the map to be played in
+domination, last man standing and keepaway. But I want the map to be played in
 domination, deathmatch, team deathmatch only, and I also want different
 timelimits/fraglimits, so I will change the "gametype" lines to:
 
@@ -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
 CTF             | gametype ctf [timelimit=...] [caplimit=...] [leadlimit=...]                                              |
 LMS             | gametype lms [timelimit=...] [lives=...] [leadlimit=...]                                                 |
-Arena           | gametype arena [timelimit=...] [pointlinit=...] [leadlimit=...]                                          |
 Key Hunt        | gametype kh [timelimit=...] [pointlimit=...] [teams=...] [leadlimit=...]                                 | 2, 3, or 4 teams
 Assault         | gametype as [timelimit=...]                                                                              | never uses points
 Onslaught       | gametype ons [timelimit=...]                                                                             | never uses points
@@ -380,9 +378,9 @@ mapinfo file.
 
 To do this, I can add the following lines to my mapinfo file:
 
-    settemp_for_type ctf g_balance_laser_primary_force 200
-    settemp_for_type all g_start_weapon_shotgun 0
-    settemp_for_type all g_start_weapon_uzi 1
+    settemp_for_type ctf g_balance_blaster_primary_force 200
+    settemp_for_type all g_balance_shotgun_weaponstart 0
+    settemp_for_type all g_balance_machinegun_weaponstart 1
     settemp_for_type all sv_cullentities_trace 0
 
 These "settemp" settings are automatically removed when the map is left and