[nexuiz-commits] r8154 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Oct 19 04:34:27 EDT 2009
Author: div0
Date: 2009-10-19 04:34:10 -0400 (Mon, 19 Oct 2009)
New Revision: 8154
Modified:
trunk/data/balance.cfg
trunk/data/balance25.cfg
trunk/data/balanceHavoc.cfg
trunk/data/balanceNexrun.cfg
trunk/data/balanceSamual.cfg
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/w_laser.qc
Log:
laser projectile delay (STUUUUUPID)
Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg 2009-10-19 07:27:47 UTC (rev 8153)
+++ trunk/data/balance.cfg 2009-10-19 08:34:10 UTC (rev 8154)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -224,6 +224,7 @@
set g_balance_laser_primary_animtime 0.3
set g_balance_laser_primary_lifetime 30
set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0.05
set g_balance_laser_secondary 1 // when 1, a secondary laser mode exists
set g_balance_laser_secondary_damage 25
set g_balance_laser_secondary_edgedamage 10
@@ -234,6 +235,7 @@
set g_balance_laser_secondary_animtime 0.3
set g_balance_laser_secondary_lifetime 30
set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_delay 0
// }}}
// {{{ shotgun
set g_balance_shotgun_primary_bullets 15
Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg 2009-10-19 07:27:47 UTC (rev 8153)
+++ trunk/data/balance25.cfg 2009-10-19 08:34:10 UTC (rev 8154)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -224,6 +224,7 @@
set g_balance_laser_primary_animtime 0.3
set g_balance_laser_primary_lifetime 30
set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0
set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
set g_balance_laser_secondary_damage 35
set g_balance_laser_secondary_edgedamage 10
@@ -234,6 +235,7 @@
set g_balance_laser_secondary_animtime 0.3
set g_balance_laser_secondary_lifetime 30
set g_balance_laser_secondary_shotangle 0
+set g_balance_laser_secondary_delay 0
// }}}
// {{{ shotgun
set g_balance_shotgun_primary_bullets 6
Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg 2009-10-19 07:27:47 UTC (rev 8153)
+++ trunk/data/balanceHavoc.cfg 2009-10-19 08:34:10 UTC (rev 8154)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -224,6 +224,7 @@
set g_balance_laser_primary_animtime 0.3
set g_balance_laser_primary_lifetime 30
set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0
set g_balance_laser_secondary 1 // when 1, a secondary laser mode exists
set g_balance_laser_secondary_damage 25
set g_balance_laser_secondary_edgedamage 10
@@ -234,6 +235,7 @@
set g_balance_laser_secondary_animtime 0.3
set g_balance_laser_secondary_lifetime 30
set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_delay 0
// }}}
// {{{ shotgun
set g_balance_shotgun_primary_bullets 15
Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg 2009-10-19 07:27:47 UTC (rev 8153)
+++ trunk/data/balanceNexrun.cfg 2009-10-19 08:34:10 UTC (rev 8154)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -225,6 +225,7 @@
set g_balance_laser_primary_animtime 0.1
set g_balance_laser_primary_lifetime 0.066
set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0
set g_balance_laser_secondary 1 // when 1, a secondary laser mode exists
set g_balance_laser_secondary_damage 50
set g_balance_laser_secondary_edgedamage 1
@@ -235,6 +236,7 @@
set g_balance_laser_secondary_animtime 0.15
set g_balance_laser_secondary_lifetime 0.066
set g_balance_laser_secondary_shotangle 0
+set g_balance_laser_secondary_delay 0
// }}}
// {{{ shotgun
set g_balance_shotgun_primary_bullets 15
Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg 2009-10-19 07:27:47 UTC (rev 8153)
+++ trunk/data/balanceSamual.cfg 2009-10-19 08:34:10 UTC (rev 8154)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -225,6 +225,7 @@
set g_balance_laser_primary_animtime 0.3
set g_balance_laser_primary_lifetime 30
set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0.05
set g_balance_laser_secondary 1 // when 1, a secondary laser mode exists
set g_balance_laser_secondary_damage 25
set g_balance_laser_secondary_edgedamage 10
@@ -235,6 +236,7 @@
set g_balance_laser_secondary_animtime 0.3
set g_balance_laser_secondary_lifetime 30
set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_delay 0
// }}}
// {{{ shotgun
set g_balance_shotgun_primary_bullets 6
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-10-19 07:27:47 UTC (rev 8153)
+++ trunk/data/qcsrc/server/constants.qh 2009-10-19 08:34:10 UTC (rev 8154)
@@ -1,5 +1,5 @@
string CVAR_CHECK_DEFAULT = "5d48426c72cdfbf78480870c75601f89";
-string CVAR_CHECK_BALANCE = "7f0cddd65617fa39bd3efb7942dceea9";
+string CVAR_CHECK_BALANCE = "1904952fd0d915f79ab4e6f0622abdb6";
float FALSE = 0;
float TRUE = 1;
Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc 2009-10-19 07:27:47 UTC (rev 8153)
+++ trunk/data/qcsrc/server/w_laser.qc 2009-10-19 08:34:10 UTC (rev 8154)
@@ -13,6 +13,17 @@
remove (self);
}
+void W_Laser_Think()
+{
+ self.movetype = MOVETYPE_FLY;
+ self.think = SUB_Remove;
+ if (self.dmg)
+ self.nextthink = time + cvar("g_balance_laser_secondary_lifetime");
+ else
+ self.nextthink = time + cvar("g_balance_laser_primary_lifetime");
+ CSQCProjectile(self, TRUE, PROJECTILE_LASER, TRUE);
+}
+
void W_Laser_Attack (float issecondary)
{
local entity missile;
@@ -52,7 +63,6 @@
missile.bot_dodgerating = cvar("g_balance_laser_primary_damage");
}
- missile.movetype = MOVETYPE_FLY;
PROJECTILE_MAKETRIGGER(missile);
missile.projectiledeathtype = WEP_LASER;
if(issecondary == 1)
@@ -70,15 +80,22 @@
//missile.glow_color = 250; // 244, 250
//missile.glow_size = 120;
missile.touch = W_Laser_Touch;
- missile.think = SUB_Remove;
- if (issecondary == 1)
- missile.nextthink = time + cvar("g_balance_laser_secondary_lifetime");
- else
- missile.nextthink = time + cvar("g_balance_laser_primary_lifetime");
missile.flags = FL_PROJECTILE;
- CSQCProjectile(missile, TRUE, PROJECTILE_LASER, TRUE);
+ missile.think = W_Laser_Think;
+ if (issecondary == 1)
+ missile.nextthink = time + cvar("g_balance_laser_secondary_delay");
+ else
+ missile.nextthink = time + cvar("g_balance_laser_primary_delay");
+ if(time >= missile.nextthink)
+ {
+ entity oldself;
+ oldself = self;
+ self = missile;
+ self.think();
+ self = oldself;
+ }
}
void spawnfunc_weapon_laser (void)
More information about the nexuiz-commits
mailing list