set rl detonatedelay to 9999, make electro an LG instead of HLAC
authorfruitiex <fruitiex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Thu, 25 Feb 2010 00:31:01 +0000 (00:31 +0000)
committerfruitiex <fruitiex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Thu, 25 Feb 2010 00:31:01 +0000 (00:31 +0000)
git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8670 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

data/balance.cfg
data/balance25.cfg
data/balanceHavoc.cfg
data/balanceNexrun.cfg
data/balanceSamual.cfg
data/qcsrc/server/w_electro.qc
data/qcsrc/server/w_hlac.qc

index 3e8dc07..6651d70 100644 (file)
@@ -310,6 +310,7 @@ set g_balance_grenadelauncher_secondary_health 70
 set g_balance_grenadelauncher_secondary_damageforcescale 4
 // }}}
 // {{{ electro
+set g_balance_electro_lightning 0
 set g_balance_electro_primary_damage 65
 set g_balance_electro_primary_edgedamage 0
 set g_balance_electro_primary_force 200
@@ -476,8 +477,6 @@ set g_balance_hook_secondary_power 3 // effect behaves like a square function
 set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
 // }}}
 // {{{ hlac
-set g_balance_hlac_primary_lightning 0
-
 set g_balance_hlac_primary_spread_min 0.01
 set g_balance_hlac_primary_spread_max 0.25
 set g_balance_hlac_primary_spread_add 0.0045
index 850b4ef..9563df9 100644 (file)
@@ -309,6 +309,7 @@ set g_balance_grenadelauncher_secondary_health 10
 set g_balance_grenadelauncher_secondary_damageforcescale 4
 // }}}
 // {{{ electro
+set g_balance_electro_lightning 0
 set g_balance_electro_primary_damage 65
 set g_balance_electro_primary_edgedamage 0
 set g_balance_electro_primary_force 200
@@ -475,8 +476,6 @@ set g_balance_hook_secondary_power 3 // effect behaves like a square function
 set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
 // }}}
 // {{{ hlac
-set g_balance_hlac_primary_lightning 0
-
 set g_balance_hlac_primary_spread_min 0.01
 set g_balance_hlac_primary_spread_max 0.25
 set g_balance_hlac_primary_spread_add 0.0045
index 695d42a..36ccc96 100644 (file)
@@ -309,6 +309,7 @@ set g_balance_grenadelauncher_secondary_health 10
 set g_balance_grenadelauncher_secondary_damageforcescale 4
 // }}}
 // {{{ electro
+set g_balance_electro_lightning 0
 set g_balance_electro_primary_damage 70
 set g_balance_electro_primary_edgedamage 5
 set g_balance_electro_primary_force 200
@@ -475,8 +476,6 @@ set g_balance_hook_secondary_power 3 // effect behaves like a square function
 set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
 // }}}
 // {{{ hlac
-set g_balance_hlac_primary_lightning 0
-
 set g_balance_hlac_primary_spread_min 0.0
 set g_balance_hlac_primary_spread_max 0.03
 set g_balance_hlac_primary_spread_add 0.03
index 84101fc..34519bd 100644 (file)
@@ -310,17 +310,18 @@ set g_balance_grenadelauncher_secondary_health 0
 set g_balance_grenadelauncher_secondary_damageforcescale 0
 // }}}
 // {{{ electro
-set g_balance_electro_primary_damage 70
-set g_balance_electro_primary_edgedamage 5
-set g_balance_electro_primary_force 150
-set g_balance_electro_primary_radius 80
-set g_balance_electro_primary_comboradius 150
-set g_balance_electro_primary_speed 2000
+set g_balance_electro_lightning 1
+set g_balance_electro_primary_damage 6
+set g_balance_electro_primary_edgedamage 0
+set g_balance_electro_primary_force 60 // todo: probaby needs movement nerfing code when hit?
+set g_balance_electro_primary_radius 850
+set g_balance_electro_primary_comboradius 0
+set g_balance_electro_primary_speed 0
 set g_balance_electro_primary_spread 0
-set g_balance_electro_primary_lifetime 5
-set g_balance_electro_primary_refire 0.7
-set g_balance_electro_primary_animtime 0.5
-set g_balance_electro_primary_ammo 2
+set g_balance_electro_primary_lifetime 0
+set g_balance_electro_primary_refire 0.066
+set g_balance_electro_primary_animtime 0.066
+set g_balance_electro_primary_ammo 0.066
 set g_balance_electro_secondary_damage 45
 set g_balance_electro_secondary_spread 0.10
 set g_balance_electro_secondary_edgedamage 10
@@ -435,7 +436,7 @@ set g_balance_rocketlauncher_animtime 0.7
 set g_balance_rocketlauncher_ammo 3
 set g_balance_rocketlauncher_health 0
 set g_balance_rocketlauncher_damageforcescale 0
-set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+set g_balance_rocketlauncher_detonatedelay 9999 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
 set g_balance_rocketlauncher_guiderate 0 // max degrees per second
 set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
@@ -476,9 +477,6 @@ set g_balance_hook_secondary_power 3 // effect behaves like a square function
 set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
 // }}}
 // {{{ hlac
-
-set g_balance_hlac_primary_lightning 1
-
 set g_balance_hlac_primary_spread_min 0.01
 set g_balance_hlac_primary_spread_max 0.03
 set g_balance_hlac_primary_spread_add 0.002
index 68c608d..2a42a52 100644 (file)
@@ -310,6 +310,7 @@ set g_balance_grenadelauncher_secondary_health 70
 set g_balance_grenadelauncher_secondary_damageforcescale 4
 // }}}
 // {{{ electro
+set g_balance_electro_lightning 0
 set g_balance_electro_primary_damage 65
 set g_balance_electro_primary_edgedamage 0
 set g_balance_electro_primary_force 200
@@ -476,8 +477,6 @@ set g_balance_hook_secondary_power 3 // effect behaves like a square function
 set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
 // }}}
 // {{{ hlac
-set g_balance_hlac_primary_lightning 0
-
 set g_balance_hlac_primary_spread_min 0.01
 set g_balance_hlac_primary_spread_max 0.25
 set g_balance_hlac_primary_spread_add 0.0045
index b8f5b28..c5355a1 100644 (file)
@@ -188,6 +188,21 @@ void W_Electro_Attack2()
        CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, FALSE); // no culling, it has sound
 }
 
+// experimental lightning gun
+void W_Electro_Attack3 (void)
+{
+       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+               self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_primary_ammo");
+       W_SetupShot (self, TRUE, 0, "weapons/crylink_fire2.wav", cvar("g_balance_electro_primary_damage"));
+
+       traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_electro_primary_radius"), FALSE, self, ANTILAG_LATENCY(self));
+
+       te_lightning1(self, w_shotorg, trace_endpos);
+
+       if (trace_fraction < 1)
+               Damage(trace_ent, self, self, cvar("g_balance_electro_primary_damage"), WEP_ELECTRO | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_electro_primary_force") * w_shotdir);
+}
+
 void spawnfunc_weapon_electro (void)
 {
        weapon_defaultspawnfunc(WEP_ELECTRO);
@@ -239,10 +254,13 @@ float w_electro(float req)
                if (self.BUTTON_ATCK)
                if (weapon_prepareattack(0, cvar("g_balance_electro_primary_refire")))
                {
-                       W_Electro_Attack();
+                       if(cvar("g_balance_electro_lightning"))
+                               W_Electro_Attack3();
+                       else
+                               W_Electro_Attack();
                        weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_primary_animtime"), w_ready);
                }
-               if (self.BUTTON_ATCK2)
+               if (self.BUTTON_ATCK2 && !cvar("g_balance_electro_lightning"))
                if (time >= self.electro_secondarytime)
                if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire")))
                {
index ddd929f..f182ed3 100644 (file)
@@ -136,21 +136,6 @@ void W_HLAC_Attack2 (void)
        }
 }
 
-// experimental lightning gun
-void W_HLAC_Attack3 (void)
-{
-       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-               self.ammo_cells = self.ammo_cells - cvar("g_balance_hlac_primary_ammo");
-       W_SetupShot (self, TRUE, 0, "weapons/crylink_fire2.wav", cvar("g_balance_hlac_primary_damage"));
-
-       traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_hlac_primary_radius"), FALSE, self, ANTILAG_LATENCY(self));
-
-       te_lightning1(self, w_shotorg, trace_endpos);
-
-       if (trace_fraction < 1)
-               Damage(trace_ent, self, self, cvar("g_balance_hlac_primary_damage"), WEP_HLAC | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_hlac_primary_force") * w_shotdir);
-}
-
 // weapon frames
 void HLAC_fire1_02()
 {
@@ -195,10 +180,7 @@ float w_hlac(float req)
                if (weapon_prepareattack(0, cvar("g_balance_hlac_primary_refire")))
                {
                        self.HLAC_bulletcounter = 0;
-                       if(cvar("g_balance_hlac_primary_lightning"))
-                               W_HLAC_Attack3();
-                       else
-                               W_HLAC_Attack();
+                       W_HLAC_Attack();
                        weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hlac_primary_refire"), HLAC_fire1_02);
                }