Better frag limits for maps

diff --git a/data/maps/basement.mapinfo b/data/maps/basement.mapinfo
index 0cd81d07266b0a4447d2505afbed4911373ae6e1..23eec5970ca28a434dd34a6e72dbfc02149c6d04 100644 (file)
--- a/data/maps/basement.mapinfo
+++ b/data/maps/basement.mapinfo
@@ -2,8 +2,8 @@ title Basement
 description A small map designed for fast constant gameplay\r
 author Garth Hendy\r
 has weapons\r
-type dm 20 10\r
-type tdm 30 10 2\r
+type dm 25 10\r
+type tdm 35 10 2\r
 type lms 15 10\r
 type dom 300 10\r
 type arena 15 10\r

diff --git a/data/maps/evilspace.mapinfo b/data/maps/evilspace.mapinfo
index 8cbbeceabb445f62fa60a897c1268b085f61c774..b09977d0df09a03378f870e7982e5c870e0a417a 100644 (file)
--- a/data/maps/evilspace.mapinfo
+++ b/data/maps/evilspace.mapinfo
@@ -2,8 +2,8 @@ title Evilspace
 description A dark space map\r
 author Yves Allaire\r
 has weapons\r
-type dm 20 10\r
-type tdm 30 10 2\r
+type dm 25 10\r
+type tdm 35 10 2\r
 type lms 15 10\r
 type arena 15 10\r
 type ca 15 10\r

diff --git a/data/maps/farewell.mapinfo b/data/maps/farewell.mapinfo
index 9b606199c96f86c69e60ffd041865697d6e802d9..ad6216307b7ba6c0cf7d781d62e0749c8f3ffd54 100644 (file)
--- a/data/maps/farewell.mapinfo
+++ b/data/maps/farewell.mapinfo
@@ -2,8 +2,8 @@ title Farewell
 description Small and very fast Tourney Map\r
 author Henning Janssen\r
 has weapons\r
-type dm 15 10\r
-type tdm 25 10 2\r
+type dm 20 10\r
+type tdm 30 10 2\r
 type lms 10 10\r
 type arena 10 10\r
 type ca 10 10\r

diff --git a/data/maps/reslimed.mapinfo b/data/maps/reslimed.mapinfo
index 50e4d8bb7d96fa60d4312f224272bfbc2b274fc0..1a4363286c412be5b633446ba624ada29a328e62 100644 (file)
--- a/data/maps/reslimed.mapinfo
+++ b/data/maps/reslimed.mapinfo
@@ -2,8 +2,8 @@ title Slimepit Revisited
 description An industrial arena with deadly slime\r
 author Paul Evers, Mattrew Rye, Garth Hendy, Maik Merten\r
 has weapons\r
-type dm 15 10\r
-type tdm 25 10 2\r
+type dm 20 10\r
+type tdm 30 10 2\r
 type lms 10 10\r
 type dom 200 10\r
 type kh 1000 15 3\r

diff --git a/data/maps/ruiner.mapinfo b/data/maps/ruiner.mapinfo
index 5d0d2c73d29620d00aa98a95f089b105b9cdc745..27ee92732a8e4c8c74a75f1dee7c2232d2c6e324 100644 (file)
--- a/data/maps/ruiner.mapinfo
+++ b/data/maps/ruiner.mapinfo
@@ -2,8 +2,8 @@ title Ruiner
 description Small rusty map\r
 author Paul Evers\r
 has weapons\r
-type dm 15 10\r
-type tdm 25 10 2\r
+type dm 20 10\r
+type tdm 30 10 2\r
 type lms 10 10\r
 type dom 200 10\r
 type kh 1000 15 3\r

diff --git a/data/maps/skycastle.mapinfo b/data/maps/skycastle.mapinfo
index 176606fa1bc31d608f18d8f1a0a10f835f1c1b11..d5b43c7370a2584c45954c51e60b3d3a7473e490 100644 (file)
--- a/data/maps/skycastle.mapinfo
+++ b/data/maps/skycastle.mapinfo
@@ -2,8 +2,8 @@ title Skycastle
 description A castle in the sky\r
 author cortez\r
 has weapons\r
-type dm 15 10\r
-type tdm 25 10 2\r
+type dm 20 10\r
+type tdm 30 10 2\r
 type lms 10 10\r
 type ctf 300 15\r
 type arena 10 10\r

diff --git a/data/maps/soylent.mapinfo b/data/maps/soylent.mapinfo
index 3b98f39a24a87aa1f1b350f55cbf3305f2e49dbc..7c1e266ab023bb7ae9f684ea0982b920e3079af7 100644 (file)
--- a/data/maps/soylent.mapinfo
+++ b/data/maps/soylent.mapinfo
@@ -2,8 +2,8 @@ title Soylent Space
 description Medium sized vertical level\r
 author Paul Evers\r
 has weapons\r
-type dm 15 10\r
-type tdm 25 10 2\r
+type dm 20 10\r
+type tdm 30 10 2\r
 type lms 10 10\r
 type dom 200 10\r
 type kh 1000 15 3\r

diff --git a/data/maps/stormkeep.mapinfo b/data/maps/stormkeep.mapinfo
index 1cec39b18a61c6bc8289309ed638923d9bc51d02..fe4e03e85a0be07f0f63f5bf7d43a530b3bbb8f7 100644 (file)
--- a/data/maps/stormkeep.mapinfo
+++ b/data/maps/stormkeep.mapinfo
@@ -2,8 +2,8 @@ title Stormkeep
 description Large, slow paced complex\r
 author Jakob Markstrom Grohn, Rasmus Eskola\r
 has weapons\r
-type dm 15 10\r
-type tdm 25 10 2\r
+type dm 20 10\r
+type tdm 30 10 2\r
 type lms 10 10\r
 type dom 200 10\r
 type arena 10 10\r

diff --git a/data/maps/warfare.mapinfo b/data/maps/warfare.mapinfo
index f17189420d9eae8d1e741d0f43e9edf5e4ecde41..2f9be6355acd5079da2bf504aeb949c35b92f149 100644 (file)
--- a/data/maps/warfare.mapinfo
+++ b/data/maps/warfare.mapinfo
@@ -2,8 +2,8 @@ title Stabilized Warfare: Resurrection
 description Medium sized map with a central area\r
 author Henning Janssen\r
 has weapons\r
-type dm 15 10\r
-type tdm 25 10 2\r
+type dm 20 10\r
+type tdm 30 10 2\r
 type lms 10 10\r
 type dom 200 10\r
 type kh 1000 15 3\r

diff --git a/data/qcsrc/common/mapinfo.qc b/data/qcsrc/common/mapinfo.qc
index d84815724b305940febe4c7f05b94ff290f247de..5f58477e77d4a67e5991dbdba276815a69e9e243 100644 (file)
--- a/data/qcsrc/common/mapinfo.qc
+++ b/data/qcsrc/common/mapinfo.qc
@@ -644,8 +644,8 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
                        fputs(fh, "// uncomment this if you added weapon pickups: has weapons\n");\r
                if(MapInfo_Map_flags & MAPINFO_FLAG_FRUSTRATING)\r
                        fputs(fh, "frustrating\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH)      fputs(fh, "type dm 15 10\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH) fputs(fh, "type tdm 25 10 2\n");\r
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH)      fputs(fh, "type dm 20 10\n");\r
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH) fputs(fh, "type tdm 30 10 2\n");\r
                if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DOMINATION)      fputs(fh, "type dom 200 10\n");\r
                if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTF)             fputs(fh, "type ctf 300 15 10\n");\r
                if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_LMS)             fputs(fh, "type lms 10 10\n");\r