[nexuiz-commits] r8296 - in trunk/data: . qcsrc/server sound/weapons
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Nov 19 13:36:37 EST 2009
Author: fruitiex
Date: 2009-11-19 13:36:36 -0500 (Thu, 19 Nov 2009)
New Revision: 8296
Added:
trunk/data/sound/weapons/gauntlet_fire.ogg
Modified:
trunk/data/balance.cfg
trunk/data/balance25.cfg
trunk/data/balanceHavoc.cfg
trunk/data/balanceNexrun.cfg
trunk/data/balanceSamual.cfg
trunk/data/effectinfo.txt
trunk/data/qcsrc/server/w_laser.qc
Log:
experimental gauntlet, use it in nexrun, do a small lg tweak for the nexrun balance
Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg 2009-11-18 19:03:01 UTC (rev 8295)
+++ trunk/data/balance.cfg 2009-11-19 18:36:36 UTC (rev 8296)
@@ -236,6 +236,7 @@
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_gauntlet 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
Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg 2009-11-18 19:03:01 UTC (rev 8295)
+++ trunk/data/balance25.cfg 2009-11-19 18:36:36 UTC (rev 8296)
@@ -236,6 +236,7 @@
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_gauntlet 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
Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg 2009-11-18 19:03:01 UTC (rev 8295)
+++ trunk/data/balanceHavoc.cfg 2009-11-19 18:36:36 UTC (rev 8296)
@@ -236,6 +236,7 @@
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_gauntlet 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
Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg 2009-11-18 19:03:01 UTC (rev 8295)
+++ trunk/data/balanceNexrun.cfg 2009-11-19 18:36:36 UTC (rev 8296)
@@ -228,16 +228,17 @@
// {{{ laser
set g_balance_laser_primary_damage 22
set g_balance_laser_primary_edgedamage 0
-set g_balance_laser_primary_force 75
-set g_balance_laser_primary_radius 3
-set g_balance_laser_primary_speed 1500
+set g_balance_laser_primary_force 200
+set g_balance_laser_primary_radius 52
+set g_balance_laser_primary_speed 0
set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_refire 0
+set g_balance_laser_primary_refire 0.1
set g_balance_laser_primary_animtime 0.1
-set g_balance_laser_primary_lifetime 0.066
+set g_balance_laser_primary_lifetime 0
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_gauntlet 1
+set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
set g_balance_laser_secondary_damage 30
set g_balance_laser_secondary_edgedamage 0
set g_balance_laser_secondary_force 100
@@ -374,8 +375,8 @@
set g_balance_crylink_secondary_spread 0.02
set g_balance_crylink_secondary_shots 3
set g_balance_crylink_secondary_bounces 0
-set g_balance_crylink_secondary_refire 0.050
-set g_balance_crylink_secondary_animtime 0.050
+set g_balance_crylink_secondary_refire 0.066
+set g_balance_crylink_secondary_animtime 0.066
set g_balance_crylink_secondary_ammo 0.66
set g_balance_crylink_secondary_bouncedamagefactor 0.5
Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg 2009-11-18 19:03:01 UTC (rev 8295)
+++ trunk/data/balanceSamual.cfg 2009-11-19 18:36:36 UTC (rev 8296)
@@ -237,6 +237,7 @@
set g_balance_laser_primary_lifetime 30
set g_balance_laser_primary_shotangle 0
set g_balance_laser_primary_delay 0.03
+set g_balance_laser_gauntlet 0
set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
set g_balance_laser_secondary_damage 25
set g_balance_laser_secondary_edgedamage 10
Modified: trunk/data/effectinfo.txt
===================================================================
--- trunk/data/effectinfo.txt 2009-11-18 19:03:01 UTC (rev 8295)
+++ trunk/data/effectinfo.txt 2009-11-19 18:36:36 UTC (rev 8296)
@@ -2303,6 +2303,16 @@
velocityjitter 64 64 64
velocitymultiplier 100
+// used nowhere in code
+effect crylinklightning
+countabsolute 1
+type beam
+tex 60 60
+size 0.5 0.5
+alpha 256 256 64
+color 0xff0000 0xff0000
+sizeincrease 1.1
+velocitymultiplier 1.3
@@ -4500,3 +4510,20 @@
velocityoffset 0 0 80
velocityjitter 256 256 256
velocitymultiplier -0.1
+
+
+// gauntlet laser
+// based off morphed's cl_gentle
+// used in qcsrc/server/w_laser.qc
+effect laser_gauntlet
+tex 43 43
+count 3
+type spark
+color 0xff00ff 0xff0000
+size 4 8
+sizeincrease 34
+alpha 128 128 292
+gravity 0
+airfriction 5
+liquidfriction 10
+velocityjitter 50 50 50
Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc 2009-11-18 19:03:01 UTC (rev 8295)
+++ trunk/data/qcsrc/server/w_laser.qc 2009-11-19 18:36:36 UTC (rev 8296)
@@ -97,6 +97,18 @@
}
}
+void W_Laser_Attack2 (void) // gauntlet
+{
+ W_SetupShot (self, TRUE, 0, "weapons/gauntlet_fire.wav", cvar("g_balance_laser_primary_damage"));
+
+ traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_laser_primary_radius"), FALSE, self, self.ping * 0.001);
+
+ pointparticles(particleeffectnum("laser_gauntlet"), w_shotorg + w_shotdir * cvar("g_balance_laser_primary_radius"), '0 0 0', 1);
+
+ if (trace_fraction < 1)
+ Damage(trace_ent, self, self, cvar("g_balance_laser_primary_damage"), WEP_LASER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_laser_primary_force") * w_shotdir);
+}
+
void spawnfunc_weapon_laser (void)
{
weapon_defaultspawnfunc(WEP_LASER);
@@ -125,7 +137,10 @@
if (self.BUTTON_ATCK)
if (weapon_prepareattack(0, cvar("g_balance_laser_primary_refire")))
{
- W_Laser_Attack(0);
+ if(cvar("g_balance_laser_gauntlet"))
+ W_Laser_Attack2();
+ else
+ W_Laser_Attack(0);
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_primary_animtime"), w_ready);
}
if (self.BUTTON_ATCK2)
Added: trunk/data/sound/weapons/gauntlet_fire.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/gauntlet_fire.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the nexuiz-commits
mailing list