Give all maps correct score / time limits, considering the rate at which fragging...

diff --git a/data/maps/arahia.mapinfo b/data/maps/arahia.mapinfo
index 3b6b325e2052e1f5a086dbe71833d4bac912b439..457c5790d4fc4feb45a43638771e07a48f5bacd7 100644 (file)
--- a/data/maps/arahia.mapinfo
+++ b/data/maps/arahia.mapinfo
@@ -2,7 +2,7 @@ title Arahia
 description Battleground on forgotten planet
 author Morphed
 has weapons
-type dom 1000 45
+type dom 1000 20
 type ons 20
 type rpg 0
 cdtrack out-there

diff --git a/data/maps/basement.mapinfo b/data/maps/basement.mapinfo
index 989919121f092d26cd922fc142945f20acf404d6..6efe902e06358ddca3155b7485a7a9cdc4837d46 100644 (file)
--- a/data/maps/basement.mapinfo
+++ b/data/maps/basement.mapinfo
@@ -2,10 +2,10 @@ title Basement
 description A small map designed for fast constant gameplay\r
 author Garth Hendy\r
 has weapons\r
-type dm 30 20\r
-type tdm 50 20 2\r
-type dom 200 20\r
-type lms 9 20\r
-type arena 10 20\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type dom 200 10\r
+type arena 10 10\r
+type ca 10 10\r
 cdtrack infiltrator\r

diff --git a/data/maps/basementctf.mapinfo b/data/maps/basementctf.mapinfo
index 3d7fe85aae88bb205587e68b6b588b3609919e9c..a4775e7bec98f007795c6d2dc55fcc38f85aec55 100644 (file)
--- a/data/maps/basementctf.mapinfo
+++ b/data/maps/basementctf.mapinfo
@@ -2,5 +2,5 @@ title Basement CTF
 description Remake of basement, "The Basement" for CTF\r
 author Clinton Freeman\r
 has weapons\r
-type ctf 300 20\r
+type ctf 300 10\r
 cdtrack high_tech_lab\r

diff --git a/data/maps/brokenworld.mapinfo b/data/maps/brokenworld.mapinfo
index f24cff7d8a1160590c0753cc652455ced7a8d087..6712e67547e0e2db2e179def1934fdaee9ef170a 100644 (file)
--- a/data/maps/brokenworld.mapinfo
+++ b/data/maps/brokenworld.mapinfo
@@ -2,11 +2,12 @@ title Br0k3nWorld
 description Spacebase ctf\r
 author tZork\r
 has weapons\r
-type dm 30 20\r
-type tdm 50 20 2\r
-type kh 1000 20 3\r
-type ctf 300 20\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type kh 1000 15 3\r
+type ctf 300 15\r
+type ca 10 10\r
 type rpg 0\r
 cdtrack ghost-town\r
 settemp_for_type all g_balance_falldamage_minspeed 1800
\ No newline at end of file

diff --git a/data/maps/desertfactory.mapinfo b/data/maps/desertfactory.mapinfo
index 1ced3dbf6d623e1be3b6aac08e292b12a5726e60..098fbdf05d4c66e6c8cfd4dca31eabd0d8e9049b 100644 (file)
--- a/data/maps/desertfactory.mapinfo
+++ b/data/maps/desertfactory.mapinfo
@@ -2,12 +2,12 @@ title Desert Factory
 description An abandoned factory in the desert.\r
 author Severin Meyer\r
 has weapons\r
-type dm 30 20\r
-type tdm 50 20 2\r
-type dom 200 20\r
-type lms 9 20\r
-type kh 1000 20 3\r
-type arena 10 20\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type dom 200 10\r
+type kh 1000 15 3\r
+type arena 10 10\r
+type ca 10 10\r
 type rpg 0\r
 cdtrack covert_operations\r

diff --git a/data/maps/evilspace.mapinfo b/data/maps/evilspace.mapinfo
index 950d35f02278b706ef6aa9fcfb949f2763ffa33d..bc89b40e62c5d450e33bb1ae61a79cffccc3d620 100644 (file)
--- a/data/maps/evilspace.mapinfo
+++ b/data/maps/evilspace.mapinfo
@@ -2,10 +2,10 @@ title Evilspace
 description A dark space map\r
 author Yves Allaire\r
 has weapons\r
-type dm 30 20\r
-type tdm 50 20 2\r
-type lms 9 20\r
-type arena 10 20\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type arena 10 10\r
+type ca 10 10\r
 type rpg 0\r
 cdtrack space_walk\r

diff --git a/data/maps/farewell.mapinfo b/data/maps/farewell.mapinfo
index d9a61b155d897944c925b6c9ba037ef96628fcb3..9b606199c96f86c69e60ffd041865697d6e802d9 100644 (file)
--- a/data/maps/farewell.mapinfo
+++ b/data/maps/farewell.mapinfo
@@ -2,11 +2,10 @@ title Farewell
 description Small and very fast Tourney Map\r
 author Henning Janssen\r
 has weapons\r
-type dm 30 20\r
-type tdm 50 20 2\r
-type lms 9 20\r
-type arena 10 20\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type arena 10 10\r
+type ca 10 10\r
 type rpg 0\r
 cdtrack quiet\r
-size -1536 -832 -576 896 1152 768\r

diff --git a/data/maps/gasolinepowered.mapinfo b/data/maps/gasolinepowered.mapinfo
index 65059f40b611e122010ca843c017f8e4aa6676a5..28cfb3eda5d88b2bc7bb40cae1467068521b9c07 100644 (file)
--- a/data/maps/gasolinepowered.mapinfo
+++ b/data/maps/gasolinepowered.mapinfo
@@ -2,5 +2,5 @@ title Gasoline Powered
 description Small, fast peaced CTF-spacefloater.
 author FruitieX
 has weapons
-type ctf 300 20
+type ctf 300 15
 cdtrack meltdown
\ No newline at end of file

diff --git a/data/maps/greatwall_revisited.mapinfo b/data/maps/greatwall_revisited.mapinfo
index 08ed930d06de12701cf619fbc0eb032e2853bf79..e7b25553bf86c10b695ada6cf8405c99da30004e 100644 (file)
--- a/data/maps/greatwall_revisited.mapinfo
+++ b/data/maps/greatwall_revisited.mapinfo
@@ -2,6 +2,6 @@ title Greatwall Revisited
 description Good old Greatwall, revisited.
 author FruitieX
 has weapons
-type ctf 300 20 10
+type ctf 300 20
 type rpg 0
 cdtrack inner_peace

diff --git a/data/maps/reslimed.mapinfo b/data/maps/reslimed.mapinfo
index 274d042afc5232910fbba33b26cb009a107d67c2..50e4d8bb7d96fa60d4312f224272bfbc2b274fc0 100644 (file)
--- a/data/maps/reslimed.mapinfo
+++ b/data/maps/reslimed.mapinfo
@@ -2,12 +2,12 @@ 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 30 20\r
-type tdm 50 20 2\r
-type dom 200 20\r
-type lms 9 20\r
-type kh 1000 20 3\r
-type arena 10 20\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type dom 200 10\r
+type kh 1000 15 3\r
+type arena 10 10\r
+type ca 10 10\r
 type rpg 0\r
 cdtrack echelon\r

diff --git a/data/maps/ruiner.mapinfo b/data/maps/ruiner.mapinfo
index 0d4e48324b2d2efacd3025998dd4131b9405221f..5d0d2c73d29620d00aa98a95f089b105b9cdc745 100644 (file)
--- a/data/maps/ruiner.mapinfo
+++ b/data/maps/ruiner.mapinfo
@@ -2,12 +2,12 @@ title Ruiner
 description Small rusty map\r
 author Paul Evers\r
 has weapons\r
-type dm 30 20\r
-type tdm 50 20 2\r
-type dom 200 20\r
-type lms 9 20\r
-type kh 1000 20 3\r
-type arena 10 20\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type dom 200 10\r
+type kh 1000 15 3\r
+type arena 10 10\r
+type ca 10 10\r
 type rpg 0\r
 cdtrack contemplation\r

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

diff --git a/data/maps/soylent.mapinfo b/data/maps/soylent.mapinfo
index 93299f4574152d8afb62f257c0fd3ee203e6c6c9..3b98f39a24a87aa1f1b350f55cbf3305f2e49dbc 100644 (file)
--- a/data/maps/soylent.mapinfo
+++ b/data/maps/soylent.mapinfo
@@ -2,12 +2,12 @@ title Soylent Space
 description Medium sized vertical level\r
 author Paul Evers\r
 has weapons\r
-type dm 30 20\r
-type tdm 50 20 2\r
-type dom 200 20\r
-type lms 9 20\r
-type kh 1000 20 3\r
-type arena 10 20\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type dom 200 10\r
+type kh 1000 15 3\r
+type arena 10 10\r
+type ca 10 10\r
 type rpg 0\r
 cdtrack attack\r

diff --git a/data/maps/stormkeep2.mapinfo b/data/maps/stormkeep2.mapinfo
index 66c09f1d71920883409d5e8ef0472e2a5635a8bc..4018b926c6cdb9af5b7d99eb9028c4934daee119 100644 (file)
--- a/data/maps/stormkeep2.mapinfo
+++ b/data/maps/stormkeep2.mapinfo
@@ -2,12 +2,12 @@ title Stormkeep 2
 description Remake of the large, slow paced complex\r
 author Jakob Markstrom Grohn, Rasmus Eskola\r
 has weapons\r
-type dm 30 20\r
-type tdm 50 20 2\r
-type dom 200 20\r
-type lms 9 20\r
-type arena 10 20\r
-type kh 1000 20 3\r
-type ca 10 20\r
+type dm 15 10\r
+type tdm 25 10 2\r
+type lms 10 10\r
+type dom 200 10\r
+type arena 10 10\r
+type kh 1000 15 3\r
+type ca 10 10\r
 type rpg 0\r
 cdtrack boss_theme\r

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

diff --git a/data/qcsrc/common/mapinfo.qc b/data/qcsrc/common/mapinfo.qc
index 9c5c6bc822c8de057d4eebd7039902178d672366..d84815724b305940febe4c7f05b94ff290f247de 100644 (file)
--- a/data/qcsrc/common/mapinfo.qc
+++ b/data/qcsrc/common/mapinfo.qc
@@ -644,18 +644,18 @@ 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 30 20\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH) fputs(fh, "type tdm 50 20 2\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DOMINATION)      fputs(fh, "type dom 200 20\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTF)             fputs(fh, "type ctf 300 20 10\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_LMS)             fputs(fh, "type lms 9 20\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ARENA)           fputs(fh, "type arena 10 20\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CA)              fputs(fh, "type ca 10 20\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_KEYHUNT)         fputs(fh, "type kh 1000 20 3\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ASSAULT)         fputs(fh, "type as 20\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE)            fputs(fh, "type rc 20 5 7 15\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ONSLAUGHT)       fputs(fh, "type ons 20\n");\r
-               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTS)             fputs(fh, "type cts 20 -1\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_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
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ARENA)           fputs(fh, "type arena 10 10\n");\r
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CA)              fputs(fh, "type ca 10 10\n");\r
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_KEYHUNT)         fputs(fh, "type kh 1000 15 3\n");\r
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ASSAULT)         fputs(fh, "type as 15\n");\r
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE)            fputs(fh, "type rc 15 5 7 15\n");\r
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ONSLAUGHT)       fputs(fh, "type ons 15\n");\r
+               if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTS)             fputs(fh, "type cts 15 -1\n");\r
                if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RPG)             fputs(fh, "type rpg 0\n");\r
 \r
                fh2 = fopen(strcat("scripts/", pFilename, ".arena"), FILE_READ);\r