[nexuiz-commits] r7957 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Sep 27 13:32:53 EDT 2009
Author: div0
Date: 2009-09-27 13:32:53 -0400 (Sun, 27 Sep 2009)
New Revision: 7957
Modified:
trunk/data/balance.cfg
trunk/data/balance25.cfg
trunk/data/balanceHavoc.cfg
trunk/data/balanceSamual.cfg
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_fireball.qc
Log:
refire2 for electro and fireball;
fireball rebalanced
Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg 2009-09-27 17:17:32 UTC (rev 7956)
+++ trunk/data/balance.cfg 2009-09-27 17:32:53 UTC (rev 7957)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 80b343d239a1d214d86d1ffcefef0bef
+set cvar_check_balance 3ec2d034ac400bba7e93eef2c720669a
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -308,6 +308,7 @@
set g_balance_electro_secondary_speed_up 200
set g_balance_electro_secondary_lifetime 1
set g_balance_electro_secondary_refire 0.3
+set g_balance_electro_secondary_refire2 0
set g_balance_electro_secondary_animtime 0.3
set g_balance_electro_secondary_ammo 1
set g_balance_electro_secondary_health 5
@@ -521,7 +522,7 @@
// {{{ fireball
set g_balance_fireball_primary_ammo 5
set g_balance_fireball_primary_animtime 0.3
-set g_balance_fireball_primary_damage 35
+set g_balance_fireball_primary_damage 40
set g_balance_fireball_primary_damageforcescale 4
set g_balance_fireball_primary_damagetime 3
set g_balance_fireball_primary_force 100
@@ -529,8 +530,8 @@
set g_balance_fireball_primary_laserdamage 30
set g_balance_fireball_primary_laseredgedamage 20
set g_balance_fireball_primary_laserradius 100
-set g_balance_fireball_primary_lifetime 7
-set g_balance_fireball_primary_refire 1
+set g_balance_fireball_primary_lifetime 4.5
+set g_balance_fireball_primary_refire 1.5
set g_balance_fireball_primary_speed 700
set g_balance_fireball_primary_speed_up 100
set g_balance_fireball_secondary_ammo 15
@@ -549,6 +550,7 @@
set g_balance_fireball_secondary_laserradius 200
set g_balance_fireball_secondary_lifetime 15
set g_balance_fireball_secondary_radius 200
-set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_refire 3
+set g_balance_fireball_secondary_refire2 6
set g_balance_fireball_secondary_speed 650
// }}}
Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg 2009-09-27 17:17:32 UTC (rev 7956)
+++ trunk/data/balance25.cfg 2009-09-27 17:32:53 UTC (rev 7957)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 80b343d239a1d214d86d1ffcefef0bef
+set cvar_check_balance 3ec2d034ac400bba7e93eef2c720669a
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -308,6 +308,7 @@
set g_balance_electro_secondary_speed_up 200
set g_balance_electro_secondary_lifetime 5
set g_balance_electro_secondary_refire 0.3
+set g_balance_electro_secondary_refire2 0
set g_balance_electro_secondary_animtime 0.3
set g_balance_electro_secondary_ammo 2
set g_balance_electro_secondary_health 5
@@ -550,5 +551,6 @@
set g_balance_fireball_secondary_lifetime 15
set g_balance_fireball_secondary_radius 200
set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_refire2 0
set g_balance_fireball_secondary_speed 650
// }}}
Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg 2009-09-27 17:17:32 UTC (rev 7956)
+++ trunk/data/balanceHavoc.cfg 2009-09-27 17:32:53 UTC (rev 7957)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 80b343d239a1d214d86d1ffcefef0bef
+set cvar_check_balance 3ec2d034ac400bba7e93eef2c720669a
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -308,6 +308,7 @@
set g_balance_electro_secondary_speed_up 200
set g_balance_electro_secondary_lifetime 1
set g_balance_electro_secondary_refire 0.3
+set g_balance_electro_secondary_refire2 0
set g_balance_electro_secondary_animtime 0.3
set g_balance_electro_secondary_ammo 1
set g_balance_electro_secondary_health 5
@@ -521,7 +522,7 @@
// {{{ fireball
set g_balance_fireball_primary_ammo 5
set g_balance_fireball_primary_animtime 0.3
-set g_balance_fireball_primary_damage 35
+set g_balance_fireball_primary_damage 40
set g_balance_fireball_primary_damageforcescale 4
set g_balance_fireball_primary_damagetime 3
set g_balance_fireball_primary_force 100
@@ -529,8 +530,8 @@
set g_balance_fireball_primary_laserdamage 30
set g_balance_fireball_primary_laseredgedamage 20
set g_balance_fireball_primary_laserradius 100
-set g_balance_fireball_primary_lifetime 7
-set g_balance_fireball_primary_refire 1
+set g_balance_fireball_primary_lifetime 4.5
+set g_balance_fireball_primary_refire 1.5
set g_balance_fireball_primary_speed 700
set g_balance_fireball_primary_speed_up 100
set g_balance_fireball_secondary_ammo 15
@@ -549,6 +550,7 @@
set g_balance_fireball_secondary_laserradius 200
set g_balance_fireball_secondary_lifetime 15
set g_balance_fireball_secondary_radius 200
-set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_refire 3
+set g_balance_fireball_secondary_refire2 6
set g_balance_fireball_secondary_speed 650
// }}}
Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg 2009-09-27 17:17:32 UTC (rev 7956)
+++ trunk/data/balanceSamual.cfg 2009-09-27 17:32:53 UTC (rev 7957)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 80b343d239a1d214d86d1ffcefef0bef
+set cvar_check_balance 3ec2d034ac400bba7e93eef2c720669a
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -308,6 +308,7 @@
set g_balance_electro_secondary_speed_up 200
set g_balance_electro_secondary_lifetime 2.5
set g_balance_electro_secondary_refire 0.75
+set g_balance_electro_secondary_refire2 0
set g_balance_electro_secondary_animtime 0.2
set g_balance_electro_secondary_ammo 2
set g_balance_electro_secondary_health 5
@@ -550,5 +551,6 @@
set g_balance_fireball_secondary_lifetime 15
set g_balance_fireball_secondary_radius 200
set g_balance_fireball_secondary_refire 2
+set g_balance_fireball_secondary_refire2 0
set g_balance_fireball_secondary_speed 650
// }}}
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-09-27 17:17:32 UTC (rev 7956)
+++ trunk/data/qcsrc/server/constants.qh 2009-09-27 17:32:53 UTC (rev 7957)
@@ -1,5 +1,5 @@
string CVAR_CHECK_DEFAULT = "4bb48bd2d43bd891aa49d542abb24bf8";
-string CVAR_CHECK_BALANCE = "80b343d239a1d214d86d1ffcefef0bef";
+string CVAR_CHECK_BALANCE = "3ec2d034ac400bba7e93eef2c720669a";
float FALSE = 0;
float TRUE = 1;
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2009-09-27 17:17:32 UTC (rev 7956)
+++ trunk/data/qcsrc/server/w_electro.qc 2009-09-27 17:32:53 UTC (rev 7957)
@@ -1,4 +1,5 @@
.float electro_count;
+.float electro_secondarytime;
void W_Plasma_Explode_Combo (void);
@@ -241,11 +242,13 @@
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_primary_animtime"), w_ready);
}
if (self.BUTTON_ATCK2)
+ if (time >= self.electro_secondarytime)
if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire")))
{
W_Electro_Attack2();
self.electro_count = cvar("g_balance_electro_secondary_count");
weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_electro_secondary_animtime"), w_electro_checkattack);
+ self.electro_secondarytime = time + cvar("g_balance_electro_secondary_refire2");
}
}
else if (req == WR_PRECACHE)
Modified: trunk/data/qcsrc/server/w_fireball.qc
===================================================================
--- trunk/data/qcsrc/server/w_fireball.qc 2009-09-27 17:17:32 UTC (rev 7956)
+++ trunk/data/qcsrc/server/w_fireball.qc 2009-09-27 17:32:53 UTC (rev 7957)
@@ -1,5 +1,6 @@
.float bot_secondary_fireballmooth; // whatever a mooth is
.vector fireball_impactvec;
+.float fireball_secondarytime;
void W_Fireball_Explode (void)
{
@@ -323,9 +324,11 @@
weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_fireball_primary_animtime"), w_ready);
}
if (self.BUTTON_ATCK2)
+ if (time >= self.fireball_secondarytime)
if (weapon_prepareattack(1, cvar("g_balance_fireball_secondary_refire")))
{
W_Fireball_Attack2_Frame0();
+ self.fireball_secondarytime = time + cvar("g_balance_fireball_secondary_refire2");
}
}
else if (req == WR_PRECACHE)
More information about the nexuiz-commits
mailing list