X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=Docs%2Fmapping.txt;h=5ab3e356c2a97148bf875803a0aba3c7bb16772a;hb=4d77ee731bf4e0286dd81da2006a83fdd6fe31a3;hp=98dac9a0cdaebdd0c7bd8cfe0fc8e95b7d66a4a1;hpb=807a9b41c07b2f399962d84b8314004459bf31d2;p=xonotic%2Fxonotic.git

diff --git a/Docs/mapping.txt b/Docs/mapping.txt
index 98dac9a0..5ab3e356 100644
--- a/Docs/mapping.txt
+++ b/Docs/mapping.txt
@@ -8,10 +8,8 @@ there's much more available.
 
 Table of Contents
 -----------------
-I        Map Lists & Scripts
+I        Map Settings
          (get your map listed and working)
-  i.     mapinfo
-  ii.    mapname.cfg
 
 II       Map Image
 
@@ -31,24 +29,14 @@ Appendix B - Helpful extras
 
 Appendix C - Advanced Darkplaces shaders
 
-========================
-=I. Map Lists & Scripts=
-========================
+=================
+=I. Map Settings=
+=================
 
-There now is just a single script/cfg file available to you, containing all map
-specific settings:
+All map specific settings goes in a single file:
 
 mapname.mapinfo
 
-The mapinfo is actually required - however, the game is so nice that it
-automatically generates a draft of it for you.
-
-------------------
--The mapinfo file-
-------------------
-
-*cue even more scary music*
-
 The mapinfo file is basically what gets your map listed in the menu, and sets
 up the options needed to change to it. If no mapinfo file exists, the menu
 will automatically generate a rough draft for you on game startup. It will get
@@ -69,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:
 
@@ -97,7 +84,7 @@ the right game modes and with the right description in the menu.
 
 Also, note the "has weapons" line. If this line is not there (which happens if
 the map contains no weapon entities other than the Nex), the map will run in
-MinstaGib only and not be shown in the menu normally. So if you look for your
+InstaGib only and not be shown in the menu normally. So if you look for your
 map and don't find it, add "has weapons" to the mapinfo file, and make sure you
 have weapon entities placed.
 
@@ -110,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
@@ -392,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