r4689 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-09 07:29:03 -0400 (Thu, 09 Oct 2008)
New Revision: 4689

Modified:
   trunk/data/qcsrc/server/portals.qc
   trunk/data/weapons.cfg
Log:
make portal health/lifetime cvars


Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc	2008-10-09 11:26:45 UTC (rev 4688)
+++ trunk/data/qcsrc/server/portals.qc	2008-10-09 11:29:03 UTC (rev 4689)
@@ -199,9 +199,9 @@
 
 	// reset fade counter
 	teleporter.portal_wants_to_vanish = 0;
-	teleporter.fade_time = time + 15;
-	teleporter.health = 200;
-	teleporter.enemy.health = 200;
+	teleporter.fade_time = time + cvar("g_balance_portal_lifetime");
+	teleporter.health = cvar("g_balance_portal_health");
+	teleporter.enemy.health = cvar("g_balance_portal_health");
 
 	return 1;
 }
@@ -593,10 +593,11 @@
 	portal.angles = ang;
 	portal.think = Portal_Think;
 	portal.nextthink = 0;
-	portal.fade_time = time + 15;
-	portal.portal_activatetime = time + 0.1;
+	portal.portal_activatetime = time + 1.1;
 	portal.event_damage = Portal_Damage;
 	portal.health = 200;
+	portal.fade_time = time + cvar("g_balance_portal_lifetime");
+	portal.health = cvar("g_balance_portal_health");
 	setmodel(portal, "models/portal.md3");
 	portal.modelindex_lod0 = portal.modelindex;
 	portal.customizeentityforclient = Portal_Customize;

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2008-10-09 11:26:45 UTC (rev 4688)
+++ trunk/data/weapons.cfg	2008-10-09 11:29:03 UTC (rev 4689)
@@ -223,3 +223,5 @@
 set g_balance_porto_primary_speed 2000
 set g_balance_porto_primary_lifetime 30
 set g_balance_porto_primary_ammo 25
+set g_balance_portal_health 200 // these get recharged whenever the portal is used
+set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used