r4467 - in trunk/data: . qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Sep 19 02:39:27 EDT 2008


Author: div0
Date: 2008-09-19 02:39:27 -0400 (Fri, 19 Sep 2008)
New Revision: 4467

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/g_damage.qc
   trunk/data/weapons.cfg
Log:
minor tunings: faster and weaker laser, less quad self-damage and self-force, less self-force for flag carriers; PLEASE TEST


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-09-17 08:39:29 UTC (rev 4466)
+++ trunk/data/defaultNexuiz.cfg	2008-09-19 06:39:27 UTC (rev 4467)
@@ -397,6 +397,8 @@
 set g_ctf_flagscore_pickup		1
 set g_ctf_flagscore_return		5
 set g_ctf_flagscore_return_rogue	10
+set g_ctf_flagcarrier_selfdamage 1
+set g_ctf_flagcarrier_selfforce 0.7
 
 // runematch
 set g_runematch						0
@@ -529,6 +531,8 @@
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 4
 set g_balance_powerup_strength_time 30
+set g_balance_powerup_strength_selfdamage 1.5
+set g_balance_powerup_strength_selfforce 1.5
 
 // weapon balance settings follow
 exec weapons.cfg

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-09-17 08:39:29 UTC (rev 4466)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-09-19 06:39:27 UTC (rev 4467)
@@ -605,14 +605,34 @@
 		// apply strength multiplier
 		if (attacker.items & IT_STRENGTH && !g_minstagib)
 		{
-			damage = damage * cvar("g_balance_powerup_strength_damage");
-			force = force * cvar("g_balance_powerup_strength_force");
+			if(targ == attacker)
+			{
+				damage = damage * cvar("g_balance_powerup_strength_selfdamage");
+				force = force * cvar("g_balance_powerup_strength_selfforce");
+			}
+			else
+			{
+				damage = damage * cvar("g_balance_powerup_strength_damage");
+				force = force * cvar("g_balance_powerup_strength_force");
+			}
 		}
+
 		// apply invincibility multiplier
 		if (targ.items & IT_INVINCIBLE && !g_minstagib)
 			damage = damage * cvar("g_balance_powerup_invincible_takedamage");
 
+		if (targ == attacker)
+			damage = damage * cvar("g_balance_selfdamagepercent");	// Partial damage if the attacker hits himself
 
+		// CTF: reduce damage/force
+		if(g_ctf)
+		if(targ == attacker)
+		if(targ.flagcarried)
+		{
+			damage = damage * cvar("g_ctf_flagcarrier_selfdamage");
+			force = force * cvar("g_ctf_flagcarrier_selfforce");
+		}
+
 		if(g_runematch)
 		{
 			// apply strength rune
@@ -782,8 +802,6 @@
 						if (targ.classname == "player")
 							center = targ.origin + targ.view_ofs;
 						force = normalize(center - blastorigin) * (finaldmg / coredamage) * forceintensity;
-						if (targ == attacker)
-							finaldmg = finaldmg * cvar("g_balance_selfdamagepercent");	// Partial damage if the attacker hits himself
 						// test line of sight to multiple positions on box,
 						// and do damage if any of them hit
 						local float c;

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2008-09-17 08:39:29 UTC (rev 4466)
+++ trunk/data/weapons.cfg	2008-09-19 06:39:27 UTC (rev 4467)
@@ -40,12 +40,12 @@
 set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
 
-set g_balance_laser_primary_damage 35
-set g_balance_laser_primary_edgedamage 10
-set g_balance_laser_primary_force 400
+set g_balance_laser_primary_damage 25
+set g_balance_laser_primary_edgedamage 8
+set g_balance_laser_primary_force 300
 set g_balance_laser_primary_radius 70
 set g_balance_laser_primary_speed 9000
-set g_balance_laser_primary_refire 0.7
+set g_balance_laser_primary_refire 0.55
 set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists




More information about the nexuiz-commits mailing list