[nexuiz-commits] r7755 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-12 09:29:27 -0400 (Sat, 12 Sep 2009)
New Revision: 7755

Modified:
   trunk/data/default25.cfg
   trunk/data/defaultHavoc.cfg
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/g_damage.qc
Log:
(2.6) change: damage through floor be 30%, force through floor be 70%. May be good, will tune it later.


Modified: trunk/data/default25.cfg
===================================================================
--- trunk/data/default25.cfg	2009-09-12 13:26:20 UTC (rev 7754)
+++ trunk/data/default25.cfg	2009-09-12 13:29:27 UTC (rev 7755)
@@ -13,5 +13,7 @@
 g_balance_pause_armor_rot_spawn 10
 g_balance_pause_health_rot_spawn 10
 g_jetpack_maxspeed_side 1500
+g_throughfloor_damage 1
+g_throughfloor_force 1
 exec physics25.cfg
 exec weapons25.cfg

Modified: trunk/data/defaultHavoc.cfg
===================================================================
--- trunk/data/defaultHavoc.cfg	2009-09-12 13:26:20 UTC (rev 7754)
+++ trunk/data/defaultHavoc.cfg	2009-09-12 13:29:27 UTC (rev 7755)
@@ -24,7 +24,8 @@
 gl_polyblend 0.2
 hostname "Nexuiz Havoc $g_nexuizversion Server"
 set g_norecoil 1
-set g_throughfloor 0
+set g_throughfloor_damage 0
+set g_throughfloor_force 0
 set g_balance_health_rotlinear 3
 set g_balance_armor_rotlinear 3
 set g_balance_weaponswitchdelay 0

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-09-12 13:26:20 UTC (rev 7754)
+++ trunk/data/defaultNexuiz.cfg	2009-09-12 13:29:27 UTC (rev 7755)
@@ -465,7 +465,8 @@
 set g_fullbrightitems 0 "brightens up items"
 set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: shotgun and machine gun casings) are sent to the client"
 set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"
-set g_throughfloor 1 "set to 0 to disable damage through floor"
+set g_throughfloor_damage 0.3
+set g_throughfloor_force 0.7
 set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"
 seta g_maplist_mostrecent_count 3	"number of most recent maps that are blocked from being played again"
 seta g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky cyberparcour01 darkzone desertfactory dieselpower downer eggandbacon evilspace farewell final_rage nr_piece-o-cake ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep2 strength toxic warfare"

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-09-12 13:26:20 UTC (rev 7754)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-09-12 13:29:27 UTC (rev 7755)
@@ -1017,8 +1017,8 @@
 
 	RadiusDamage_running = 1;
 
-	tfloordmg = cvar("g_throughfloor");
-	tfloorforce = cvar("g_throughfloor");
+	tfloordmg = cvar("g_throughfloor_damage");
+	tfloorforce = cvar("g_throughfloor_force");
 
 	blastorigin = (inflictor.origin + (inflictor.mins + inflictor.maxs) * 0.5);
 	total_damage_to_creatures = 0;