r5809 - in trunk/data: . qcsrc/server qcsrc/server/tturrets/units
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Feb 9 08:41:24 EST 2009
Author: div0
Date: 2009-02-09 08:41:24 -0500 (Mon, 09 Feb 2009)
New Revision: 5809
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
trunk/data/qcsrc/server/w_common.qc
trunk/data/qcsrc/server/w_shotgun.qc
trunk/data/qcsrc/server/w_uzi.qc
trunk/data/weapons.cfg
trunk/data/weaponsHavoc.cfg
Log:
death to fireBullet
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/defaultNexuiz.cfg 2009-02-09 13:41:24 UTC (rev 5809)
@@ -27,7 +27,7 @@
seta g_configversion 0
// default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 65294e556aa95d3532ac684f43cdde41
+set cvar_check_default 9351678ef3ad9cea04f929f91bca7684
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -1382,12 +1382,6 @@
// .3 winchester magnum:
// caliber .3, 150 grains, bullet constant 137.7220774221867
-set g_ballistics_force 0 "1: make all bullets use the ballistics code instead of hitscan"
-set g_ballistics_force_uzi_speed 18000 "speed of uzi bullets if g_ballistics_force is 1"
-set g_ballistics_force_uzi_bulletconstant 115 "13.1qu"
-set g_ballistics_force_shotgun_speed 12000 "speed of shotgun bullets if g_ballistics_force is 1"
-set g_ballistics_force_shotgun_bulletconstant 75 "3.8qu"
-
set cl_stripcolorcodes 0 "experimental feature (notes: strips ALL color codes from messages!)"
sv_status_show_qcstatus 1 // Nexuiz uses this field instead of frags
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/qcsrc/server/constants.qh 2009-02-09 13:41:24 UTC (rev 5809)
@@ -1,5 +1,6 @@
-string CVAR_CHECK_DEFAULT = "65294e556aa95d3532ac684f43cdde41";
-string CVAR_CHECK_WEAPONS = "2a35f7139825257d468d22354209cf54";
+string CVAR_CHECK_DEFAULT = "9351678ef3ad9cea04f929f91bca7684";
+string CVAR_CHECK_WEAPONS = "4cd91ef6c8a9627168a5e85f581e1e0f";
+
float FALSE = 0;
float TRUE = 1;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-02-09 13:41:24 UTC (rev 5809)
@@ -8,7 +8,7 @@
entity flash;
sound (self, CHAN_WEAPON, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM);
- fireBullet (self.tur_shotorg_updated, self.tur_shotdir_updated,self.shot_spread, self.shot_dmg, self.shot_force, DEATH_TURRET, FALSE);
+ fireBallisticBullet (self.tur_shotorg_updated, self.tur_shotdir_updated,self.shot_spread, cvar("g_balance_uzi_speed"), 5, self.shot_dmg, 0, self.shot_force, DEATH_TURRET, 0, 1, cvar("g_balance_uzi_bulletconstant"));
te_smallflash(self.tur_shotorg_updated);
trailparticles(self,particleeffectnum("EF_MGTURRETTRAIL"),self.tur_shotorg_updated,trace_endpos);
Modified: trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-02-09 13:41:24 UTC (rev 5809)
@@ -588,9 +588,7 @@
sound (self, CHAN_WEAPON, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM);
-
- fireBullet (self.tur_shotorg_updated, self.tur_shotdir_updated,self.shot_spread, self.shot_dmg, self.shot_force, DEATH_TURRET, FALSE);
-
+ fireBallisticBullet (self.tur_shotorg_updated, self.tur_shotdir_updated,self.shot_spread, cvar("g_balance_uzi_speed"), 5, self.shot_dmg, 0, self.shot_force, DEATH_TURRET, 0, 1, cvar("g_balance_uzi_bulletconstant"));
te_smallflash(self.tur_shotorg_updated);
if (!(self.uzi_bulletcounter & 3))
Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/qcsrc/server/w_common.qc 2009-02-09 13:41:24 UTC (rev 5809)
@@ -295,6 +295,8 @@
CSQCProjectile(proj, TRUE, PROJECTILE_BULLET, TRUE);
}
+/*
+ * not used any more
void fireBullet (vector start, vector dir, float spread, float damage, float force, float dtype, float tracer)
{
vector end;
@@ -339,6 +341,7 @@
Damage (trace_ent, self, self, damage, dtype, trace_endpos, dir * force);
}
}
+*/
void W_PrepareExplosionByDamage(entity attacker, void() explode)
{
Modified: trunk/data/qcsrc/server/w_shotgun.qc
===================================================================
--- trunk/data/qcsrc/server/w_shotgun.qc 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/qcsrc/server/w_shotgun.qc 2009-02-09 13:41:24 UTC (rev 5809)
@@ -6,16 +6,20 @@
float d;
float f;
float spread;
+ float bulletspeed;
+ float bulletconstant;
local entity flash;
bullets = cvar("g_balance_shotgun_primary_bullets");
d = cvar("g_balance_shotgun_primary_damage");
f = cvar("g_balance_shotgun_primary_force");
spread = cvar("g_balance_shotgun_primary_spread");
+ bulletspeed = cvar("g_balance_shotgun_primary_speed");
+ bulletconstant = cvar("g_balance_shotgun_primary_bulletconstant");
W_SetupShot (self, '25 8 -8', TRUE, 5, "weapons/shotgun_fire.wav");
for (sc = 0;sc < bullets;sc = sc + 1)
- fireBullet (w_shotorg, w_shotdir, spread, d, f, WEP_SHOTGUN, sc < 3);
+ fireBallisticBullet(w_shotorg, w_shotdir, spread, bulletspeed, 5, d, 0, f, WEP_SHOTGUN, 0, 1, bulletconstant);
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_shells = self.ammo_shells - cvar("g_balance_shotgun_primary_ammo");
@@ -49,16 +53,20 @@
float d;
float f;
float spread;
+ float bulletspeed;
+ float bulletconstant;
local entity flash;
bullets = cvar("g_balance_shotgun_secondary_bullets");
d = cvar("g_balance_shotgun_secondary_damage");
f = cvar("g_balance_shotgun_secondary_force");
spread = cvar("g_balance_shotgun_secondary_spread");
+ bulletspeed = cvar("g_balance_shotgun_secondary_speed");
+ bulletconstant = cvar("g_balance_shotgun_secondary_bulletconstant");
W_SetupShot (self, '25 8 -8', TRUE, 5, "weapons/shotgun_fire.wav");
for (sc = 0;sc < bullets;sc = sc + 1)
- fireBullet (w_shotorg, w_shotdir, spread, d, f, WEP_SHOTGUN | HITTYPE_SECONDARY, sc < 3);
+ fireBallisticBullet(w_shotorg, w_shotdir, spread, bulletspeed, 5, d, 0, f, WEP_SHOTGUN | HITTYPE_SECONDARY, 0, 1, bulletconstant);
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_shells = self.ammo_shells - cvar("g_balance_shotgun_secondary_ammo");
Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/qcsrc/server/w_uzi.qc 2009-02-09 13:41:24 UTC (rev 5809)
@@ -34,9 +34,9 @@
ATTACK_FINISHED(self) = time + cvar("g_balance_uzi_first_refire");
if (self.uzi_bulletcounter == 1)
- fireBullet (w_shotorg, w_shotdir, cvar("g_balance_uzi_first_spread"), cvar("g_balance_uzi_first_damage"), cvar("g_balance_uzi_first_force"), deathtype, TRUE);
+ fireBallisticBullet(w_shotorg, w_shotdir, cvar("g_balance_uzi_first_spread"), cvar("g_balance_uzi_speed"), 5, cvar("g_balance_uzi_first_damage"), 0, cvar("g_balance_uzi_first_force"), deathtype, 0, 1, cvar("g_balance_uzi_bulletconstant"));
else
- fireBullet (w_shotorg, w_shotdir, cvar("g_balance_uzi_sustained_spread"), cvar("g_balance_uzi_sustained_damage"), cvar("g_balance_uzi_sustained_force"), deathtype, (self.uzi_bulletcounter & 3) == 0);
+ fireBallisticBullet(w_shotorg, w_shotdir, cvar("g_balance_uzi_sustained_spread"), cvar("g_balance_uzi_speed"), 5, cvar("g_balance_uzi_sustained_damage"), 0, cvar("g_balance_uzi_sustained_force"), deathtype, 0, 1, cvar("g_balance_uzi_bulletconstant"));
pointparticles(particleeffectnum("uzi_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/weapons.cfg 2009-02-09 13:41:24 UTC (rev 5809)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit weaponsPro.cfg too.
-set cvar_check_weapons 2a35f7139825257d468d22354209cf54
+set cvar_check_weapons 4cd91ef6c8a9627168a5e85f581e1e0f
set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default"
set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default"
@@ -78,6 +78,8 @@
set g_balance_shotgun_primary_refire 0.5
set g_balance_shotgun_primary_animtime 0.2
set g_balance_shotgun_primary_ammo 1
+set g_balance_shotgun_primary_speed 12000
+set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
set g_balance_shotgun_secondary_bullets 5
set g_balance_shotgun_secondary_damage 12
set g_balance_shotgun_secondary_force 60
@@ -85,6 +87,8 @@
set g_balance_shotgun_secondary_refire 1.35
set g_balance_shotgun_secondary_animtime 0.2
set g_balance_shotgun_secondary_ammo 1
+set g_balance_shotgun_secondary_speed 12000
+set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
set g_balance_uzi_first_damage 30
set g_balance_uzi_first_force 50
@@ -96,6 +100,8 @@
set g_balance_uzi_sustained_spread 0.05
set g_balance_uzi_sustained_refire 0.1
set g_balance_uzi_sustained_ammo 1
+set g_balance_uzi_speed 18000
+set g_balance_uzi_bulletconstant 115 // 13.1qu
set g_balance_grenadelauncher_primary_damage 65
set g_balance_grenadelauncher_primary_edgedamage 35
Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg 2009-02-09 13:06:22 UTC (rev 5808)
+++ trunk/data/weaponsHavoc.cfg 2009-02-09 13:41:24 UTC (rev 5809)
@@ -1,4 +1,4 @@
-set cvar_check_weapons 2a35f7139825257d468d22354209cf54
+set cvar_check_weapons 4cd91ef6c8a9627168a5e85f581e1e0f
set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default"
set g_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default"
@@ -73,6 +73,8 @@
set g_balance_shotgun_primary_refire 0.3
set g_balance_shotgun_primary_animtime 0.2
set g_balance_shotgun_primary_ammo 1
+set g_balance_shotgun_primary_speed 12000
+set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
set g_balance_shotgun_secondary_bullets 4
set g_balance_shotgun_secondary_damage 6
set g_balance_shotgun_secondary_force 0
@@ -80,6 +82,8 @@
set g_balance_shotgun_secondary_refire 1
set g_balance_shotgun_secondary_animtime 0.2
set g_balance_shotgun_secondary_ammo 1
+set g_balance_shotgun_secondary_speed 12000
+set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
set g_balance_uzi_first_damage 30
set g_balance_uzi_first_force 0
@@ -91,6 +95,8 @@
set g_balance_uzi_sustained_spread 0.03
set g_balance_uzi_sustained_refire 0.1
set g_balance_uzi_sustained_ammo 1
+set g_balance_uzi_speed 18000
+set g_balance_uzi_bulletconstant 115 // 13.1qu
set g_balance_grenadelauncher_primary_damage 60
set g_balance_grenadelauncher_primary_edgedamage 20
More information about the nexuiz-commits
mailing list