From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 11 Jul 2011 17:21:54 +0000 (+0300)
Subject: Give all maps correct score / time limits, considering the rate at which fragging...
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5f880786052d899cb27f8ce32122570b485cbfd4;p=voretournament%2Fvoretournament.git
Give all maps correct score / time limits, considering the rate at which fragging happens in the current VT
---
diff --git a/data/maps/arahia.mapinfo b/data/maps/arahia.mapinfo
index 3b6b325e..457c5790 100644
--- 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 98991912..6efe902e 100644
--- 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
author Garth Hendy
has weapons
-type dm 30 20
-type tdm 50 20 2
-type dom 200 20
-type lms 9 20
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type dom 200 10
+type arena 10 10
+type ca 10 10
cdtrack infiltrator
diff --git a/data/maps/basementctf.mapinfo b/data/maps/basementctf.mapinfo
index 3d7fe85a..a4775e7b 100644
--- 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
author Clinton Freeman
has weapons
-type ctf 300 20
+type ctf 300 10
cdtrack high_tech_lab
diff --git a/data/maps/brokenworld.mapinfo b/data/maps/brokenworld.mapinfo
index f24cff7d..6712e675 100644
--- a/data/maps/brokenworld.mapinfo
+++ b/data/maps/brokenworld.mapinfo
@@ -2,11 +2,12 @@ title Br0k3nWorld
description Spacebase ctf
author tZork
has weapons
-type dm 30 20
-type tdm 50 20 2
-type kh 1000 20 3
-type ctf 300 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type kh 1000 15 3
+type ctf 300 15
+type ca 10 10
type rpg 0
cdtrack ghost-town
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 1ced3dbf..098fbdf0 100644
--- a/data/maps/desertfactory.mapinfo
+++ b/data/maps/desertfactory.mapinfo
@@ -2,12 +2,12 @@ title Desert Factory
description An abandoned factory in the desert.
author Severin Meyer
has weapons
-type dm 30 20
-type tdm 50 20 2
-type dom 200 20
-type lms 9 20
-type kh 1000 20 3
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type dom 200 10
+type kh 1000 15 3
+type arena 10 10
+type ca 10 10
type rpg 0
cdtrack covert_operations
diff --git a/data/maps/evilspace.mapinfo b/data/maps/evilspace.mapinfo
index 950d35f0..bc89b40e 100644
--- a/data/maps/evilspace.mapinfo
+++ b/data/maps/evilspace.mapinfo
@@ -2,10 +2,10 @@ title Evilspace
description A dark space map
author Yves Allaire
has weapons
-type dm 30 20
-type tdm 50 20 2
-type lms 9 20
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type arena 10 10
+type ca 10 10
type rpg 0
cdtrack space_walk
diff --git a/data/maps/farewell.mapinfo b/data/maps/farewell.mapinfo
index d9a61b15..9b606199 100644
--- a/data/maps/farewell.mapinfo
+++ b/data/maps/farewell.mapinfo
@@ -2,11 +2,10 @@ title Farewell
description Small and very fast Tourney Map
author Henning Janssen
has weapons
-type dm 30 20
-type tdm 50 20 2
-type lms 9 20
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type arena 10 10
+type ca 10 10
type rpg 0
cdtrack quiet
-size -1536 -832 -576 896 1152 768
diff --git a/data/maps/gasolinepowered.mapinfo b/data/maps/gasolinepowered.mapinfo
index 65059f40..28cfb3ed 100644
--- 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 08ed930d..e7b25553 100644
--- 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 274d042a..50e4d8bb 100644
--- a/data/maps/reslimed.mapinfo
+++ b/data/maps/reslimed.mapinfo
@@ -2,12 +2,12 @@ title Slimepit Revisited
description An industrial arena with deadly slime
author Paul Evers, Mattrew Rye, Garth Hendy, Maik Merten
has weapons
-type dm 30 20
-type tdm 50 20 2
-type dom 200 20
-type lms 9 20
-type kh 1000 20 3
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type dom 200 10
+type kh 1000 15 3
+type arena 10 10
+type ca 10 10
type rpg 0
cdtrack echelon
diff --git a/data/maps/ruiner.mapinfo b/data/maps/ruiner.mapinfo
index 0d4e4832..5d0d2c73 100644
--- a/data/maps/ruiner.mapinfo
+++ b/data/maps/ruiner.mapinfo
@@ -2,12 +2,12 @@ title Ruiner
description Small rusty map
author Paul Evers
has weapons
-type dm 30 20
-type tdm 50 20 2
-type dom 200 20
-type lms 9 20
-type kh 1000 20 3
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type dom 200 10
+type kh 1000 15 3
+type arena 10 10
+type ca 10 10
type rpg 0
cdtrack contemplation
diff --git a/data/maps/skycastle.mapinfo b/data/maps/skycastle.mapinfo
index edd0e0a3..176606fa 100644
--- a/data/maps/skycastle.mapinfo
+++ b/data/maps/skycastle.mapinfo
@@ -2,10 +2,11 @@ title Skycastle
description A castle in the sky
author cortez
has weapons
-type dm 30 20
-type tdm 50 20 2
-type ctf 300 20
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type ctf 300 15
+type arena 10 10
+type ca 10 10
type rpg 0
cdtrack variable
diff --git a/data/maps/soylent.mapinfo b/data/maps/soylent.mapinfo
index 93299f45..3b98f39a 100644
--- a/data/maps/soylent.mapinfo
+++ b/data/maps/soylent.mapinfo
@@ -2,12 +2,12 @@ title Soylent Space
description Medium sized vertical level
author Paul Evers
has weapons
-type dm 30 20
-type tdm 50 20 2
-type dom 200 20
-type lms 9 20
-type kh 1000 20 3
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type dom 200 10
+type kh 1000 15 3
+type arena 10 10
+type ca 10 10
type rpg 0
cdtrack attack
diff --git a/data/maps/stormkeep2.mapinfo b/data/maps/stormkeep2.mapinfo
index 66c09f1d..4018b926 100644
--- 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
author Jakob Markstrom Grohn, Rasmus Eskola
has weapons
-type dm 30 20
-type tdm 50 20 2
-type dom 200 20
-type lms 9 20
-type arena 10 20
-type kh 1000 20 3
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type dom 200 10
+type arena 10 10
+type kh 1000 15 3
+type ca 10 10
type rpg 0
cdtrack boss_theme
diff --git a/data/maps/warfare.mapinfo b/data/maps/warfare.mapinfo
index f408d95a..f1718942 100644
--- 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
author Henning Janssen
has weapons
-type dm 30 20
-type tdm 50 20 2
-type dom 200 20
-type lms 9 20
-type kh 1000 20 3
-type arena 10 20
-type ca 10 20
+type dm 15 10
+type tdm 25 10 2
+type lms 10 10
+type dom 200 10
+type kh 1000 15 3
+type arena 10 10
+type ca 10 10
type rpg 0
cdtrack ninesix
diff --git a/data/qcsrc/common/mapinfo.qc b/data/qcsrc/common/mapinfo.qc
index 9c5c6bc8..d8481572 100644
--- 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");
if(MapInfo_Map_flags & MAPINFO_FLAG_FRUSTRATING)
fputs(fh, "frustrating\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH) fputs(fh, "type dm 30 20\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH) fputs(fh, "type tdm 50 20 2\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DOMINATION) fputs(fh, "type dom 200 20\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTF) fputs(fh, "type ctf 300 20 10\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_LMS) fputs(fh, "type lms 9 20\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ARENA) fputs(fh, "type arena 10 20\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CA) fputs(fh, "type ca 10 20\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_KEYHUNT) fputs(fh, "type kh 1000 20 3\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ASSAULT) fputs(fh, "type as 20\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE) fputs(fh, "type rc 20 5 7 15\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ONSLAUGHT) fputs(fh, "type ons 20\n");
- if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTS) fputs(fh, "type cts 20 -1\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH) fputs(fh, "type dm 15 10\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH) fputs(fh, "type tdm 25 10 2\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DOMINATION) fputs(fh, "type dom 200 10\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTF) fputs(fh, "type ctf 300 15 10\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_LMS) fputs(fh, "type lms 10 10\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ARENA) fputs(fh, "type arena 10 10\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CA) fputs(fh, "type ca 10 10\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_KEYHUNT) fputs(fh, "type kh 1000 15 3\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ASSAULT) fputs(fh, "type as 15\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RACE) fputs(fh, "type rc 15 5 7 15\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_ONSLAUGHT) fputs(fh, "type ons 15\n");
+ if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_CTS) fputs(fh, "type cts 15 -1\n");
if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_RPG) fputs(fh, "type rpg 0\n");
fh2 = fopen(strcat("scripts/", pFilename, ".arena"), FILE_READ);