[nexuiz-commits] r7876 - in branches/nexuiz-2.0: . data data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-23 06:01:54 -0400 (Wed, 23 Sep 2009)
New Revision: 7876

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
   branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
Log:
r7836 | div0 | 2009-09-19 16:34:14 -0400 (Sat, 19 Sep 2009) | 2 lines
impulse trigger multiplier cvars
r7837 | div0 | 2009-09-19 16:35:16 -0400 (Sat, 19 Sep 2009) | 2 lines
also commit the CODE :P
r7838 | div0 | 2009-09-19 16:36:16 -0400 (Sat, 19 Sep 2009) | 2 lines
checksums...


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-23 09:47:43 UTC (rev 7875)
+++ branches/nexuiz-2.0/.patchsets	2009-09-23 10:01:54 UTC (rev 7876)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775,7778-7778,7781-7788,7795-7816,7818-7834
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775,7778-7778,7781-7788,7795-7816,7818-7834,7836-7838

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-09-23 09:47:43 UTC (rev 7875)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-09-23 10:01:54 UTC (rev 7876)
@@ -26,7 +26,7 @@
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 834f8769909c6e05af99c3f32ecd82fd
+set cvar_check_default 23bb243e7dbb87bbdfac5c6d68afd196
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -1377,6 +1377,7 @@
 // ticrate
 // engine default is too CPU intensive on 16p servers, so let's go back
 sys_ticrate 0.05
+sv_gameplayfix_q2airaccelerate 1
 
 // delay for "kill" to prevent abuse
 set g_balance_kill_delay 5
@@ -1711,3 +1712,8 @@
 alias _gunalign_update "_gunalign_$v_flipped$menu_cl_gunalign"
 
 set _menu_alpha "" // will be set by menu QC to the current fading of the menu, can be used by CSQC to fade items
+
+set g_triggerimpulse_accel_power 1 "trigger_impulse accelerator power (applied BEFORE the multiplier)"
+set g_triggerimpulse_accel_multiplier 1 "trigger_impulse accelerator multiplier (applied AFTER the power)"
+set g_triggerimpulse_directional_multiplier 1 "trigger_impulse directional field multiplier"
+set g_triggerimpulse_radial_multiplier 1 "trigger_impulse radial field multiplier"

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-09-23 09:47:43 UTC (rev 7875)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-09-23 10:01:54 UTC (rev 7876)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "834f8769909c6e05af99c3f32ecd82fd";
+string CVAR_CHECK_DEFAULT = "23bb243e7dbb87bbdfac5c6d68afd196";
 string CVAR_CHECK_WEAPONS = "c55b862a83b1579ec2996cb2f92b819d";
 
 float	FALSE					= 0;

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2009-09-23 09:47:43 UTC (rev 7875)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2009-09-23 10:01:54 UTC (rev 7876)
@@ -1247,7 +1247,7 @@
 	EXACTTRIGGER_INIT;
     if(self.radius)
     {
-        if(!self.strength) self.strength = 2000;
+        if(!self.strength) self.strength = 2000 * cvar("g_triggerimpulse_radial_multiplier");
         setorigin(self, self.origin);
         setsize(self, '-1 -1 -1' * self.radius,'1 1 1' * self.radius);
         self.touch = trigger_impulse_touch3;
@@ -1256,12 +1256,13 @@
     {
         if(self.target)
         {
-            if(!self.strength) self.strength = 950;
+            if(!self.strength) self.strength = 950 * cvar("g_triggerimpulse_directional_multiplier");
             self.touch = trigger_impulse_touch1;
         }
         else
         {
             if(!self.strength) self.strength = 0.9;
+			self.strength = pow(self.strength, cvar("g_triggerimpulse_accel_power")) * cvar("g_triggerimpulse_accel_multiplier");
             self.touch = trigger_impulse_touch2;
         }
     }