r5934 - in trunk/data: qcsrc/server textures
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Feb 23 10:28:03 EST 2009
Author: morphed
Date: 2009-02-23 10:28:00 -0500 (Mon, 23 Feb 2009)
New Revision: 5934
Modified:
trunk/data/qcsrc/server/w_campingrifle.qc
trunk/data/qcsrc/server/w_crylink.qc
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_grenadelauncher.qc
trunk/data/qcsrc/server/w_hagar.qc
trunk/data/qcsrc/server/w_hlac.qc
trunk/data/qcsrc/server/w_hook.qc
trunk/data/qcsrc/server/w_laser.qc
trunk/data/qcsrc/server/w_nex.qc
trunk/data/qcsrc/server/w_rocketlauncher.qc
trunk/data/qcsrc/server/w_shotgun.qc
trunk/data/qcsrc/server/w_uzi.qc
trunk/data/textures/f_shotgun.jpg
Log:
lots of weapon content changes, new models, new animations etc.. (shot origins)
Modified: trunk/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- trunk/data/qcsrc/server/w_campingrifle.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_campingrifle.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -51,7 +51,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_nails -= pAmmo;
- W_SetupShot (self, '32 8 -8', FALSE, 2, "weapons/campingrifle_fire.wav");
+ W_SetupShot (self, '41 7 -10.5', FALSE, 2, "weapons/campingrifle_fire.wav");
pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1);
if(self.BUTTON_ZOOM) // if zoomed, shoot from the eye
Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_crylink.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -66,7 +66,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_primary_ammo");
- W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/crylink_fire.wav");
+ W_SetupShot (self, '23 8 -10', FALSE, 2, "weapons/crylink_fire.wav");
forward = v_forward;
right = v_right;
up = v_up;
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_electro.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -72,7 +72,7 @@
{
local entity proj;
- W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/electro_fire.wav");
+ W_SetupShot (self, '24 8 -9.5', FALSE, 2, "weapons/electro_fire.wav");
pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -77,8 +77,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_primary_ammo");
- W_SetupShot (self, '25 6 -8', FALSE, 4, "weapons/grenade_fire.wav");
- //W_SetupShot (self, '25 8 -8', FALSE, 4, "weapons/grenade_fire.wav"); // TODO: move model to the right a little
+ W_SetupShot (self, '24 8 -10', FALSE, 4, "weapons/grenade_fire.wav");
pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
Modified: trunk/data/qcsrc/server/w_hagar.qc
===================================================================
--- trunk/data/qcsrc/server/w_hagar.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_hagar.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -51,8 +51,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_hagar_primary_ammo");
- W_SetupShot (self, '25 5 -8', FALSE, 2, "weapons/hagar_fire.wav");
- //W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/hagar_fire.wav"); // TODO: move model a little to the right
+ W_SetupShot (self, '22 8 -10', FALSE, 2, "weapons/hagar_fire.wav");
pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
Modified: trunk/data/qcsrc/server/w_hlac.qc
===================================================================
--- trunk/data/qcsrc/server/w_hlac.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_hlac.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -36,7 +36,7 @@
if(self.crouch)
spread = spread * cvar("g_balance_hlac_primary_spread_crouchmod");
- W_SetupShot (self, '25 8 -8', FALSE, 3, "weapons/lasergun_fire.wav");
+ W_SetupShot (self, '24 8 -11', FALSE, 3, "weapons/lasergun_fire.wav");
pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
if (!g_norecoil)
{
Modified: trunk/data/qcsrc/server/w_hook.qc
===================================================================
--- trunk/data/qcsrc/server/w_hook.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_hook.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -60,7 +60,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_cells = self.ammo_cells - cvar("g_balance_hook_secondary_ammo");
- W_SetupShot (self, '25 6 -8', FALSE, 4, "weapons/hookbomb_fire.wav");
+ W_SetupShot (self, '21 8 -9.5', FALSE, 4, "weapons/hookbomb_fire.wav");
gren = spawn ();
gren.owner = self;
Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_laser.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -17,7 +17,7 @@
{
local entity missile;
- W_SetupShot (self, '25 8 -8', FALSE, 3, "weapons/lasergun_fire.wav");
+ W_SetupShot (self, '21 8 -9', FALSE, 3, "weapons/lasergun_fire.wav");
pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
missile = spawn ();
Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_nex.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -15,7 +15,7 @@
float flying;
flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
- W_SetupShot (self, '25 4 -4', TRUE, 5, "weapons/nexfire.wav");
+ W_SetupShot (self, '30 8 -10', TRUE, 5, "weapons/nexfire.wav");
yoda = 0;
FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, cvar("g_balance_nex_damage"), cvar("g_balance_nex_force"), WEP_NEX);
Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -198,8 +198,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_rocketlauncher_ammo");
- W_SetupShot (self, '34.0 8.5 -11.0', FALSE, 5, "weapons/rocket_fire.wav");
- //W_SetupShot (self, '25 8 -8', FALSE, 5, "weapons/rocket_fire.wav"); // TODO: move model to the right a little
+ W_SetupShot (self, '27.0 8 -10.0', FALSE, 5, "weapons/rocket_fire.wav");
pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
missile = spawn ();
@@ -241,15 +240,14 @@
// muzzle flash for 1st person view
flash = spawn ();
- flash.scale = 1.2;
- flash.angles_z = 180;
+ flash.angles_z = flash.v_angle_z + random() * 180;
flash.owner = self;
flash.viewmodelforclient = self;
flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
- setorigin (flash, '35 8 0');
+ setorigin (flash, '5 0 0');
setmodel (flash, "models/flash.md3"); // precision set below
- setattachment(flash, self.weaponentity, "bone01");
- SUB_SetFade (flash, time, 0.4);
+ setattachment(flash, self.weaponentity, "bone02");
+ SUB_SetFade (flash, time, 0.1);
// muzzle flash for 3rd person view
flash2 = spawn ();
Modified: trunk/data/qcsrc/server/w_shotgun.qc
===================================================================
--- trunk/data/qcsrc/server/w_shotgun.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_shotgun.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -17,7 +17,7 @@
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");
+ W_SetupShot (self, '28 8 -10', TRUE, 5, "weapons/shotgun_fire.wav");
for (sc = 0;sc < bullets;sc = sc + 1)
fireBallisticBullet(w_shotorg, w_shotdir, spread, bulletspeed, 5, d, 0, f, WEP_SHOTGUN, 0, 1, bulletconstant);
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
@@ -31,13 +31,12 @@
// muzzle flash for 1st person view
flash = spawn();
- setorigin(flash, '53 5 0');
+ setorigin(flash, '5 0 0');
setmodel(flash, "models/uziflash.md3"); // precision set below
- setattachment(flash, self.weaponentity, "bone01");
+ setattachment(flash, self.weaponentity, "bone02");
flash.owner = self;
flash.viewmodelforclient = self;
flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
- flash.scale = 1.2;
flash.think = SUB_Remove;
flash.nextthink = time + 0.06;
flash.angles_z = flash.v_angle_z + random() * 180;
Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc 2009-02-23 15:27:32 UTC (rev 5933)
+++ trunk/data/qcsrc/server/w_uzi.qc 2009-02-23 15:28:00 UTC (rev 5934)
@@ -22,8 +22,7 @@
else
self.ammo_nails = self.ammo_nails - cvar("g_balance_uzi_sustained_ammo");
}
- W_SetupShot (self, '25 5.5 -8', TRUE, 0, "weapons/uzi_fire.wav");
- //W_SetupShot (self, '25 8 -8', TRUE, 0, "weapons/uzi_fire.wav"); // TODO: move model to the right a little
+ W_SetupShot (self, '23 8 -9.5', TRUE, 0, "weapons/uzi_fire.wav");
if (!g_norecoil)
{
self.punchangle_x = random () - 0.5;
@@ -42,13 +41,12 @@
// muzzle flash for 1st person view
flash = spawn();
- setorigin(flash, '53 5 0');
+ setorigin(flash, '5 0 0');
setmodel(flash, "models/uziflash.md3"); // precision set below
- setattachment(flash, self.weaponentity, "bone01");
+ setattachment(flash, self.weaponentity, "bone02");
flash.owner = self;
flash.viewmodelforclient = self;
flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
- flash.scale = 1.2;
//SUB_SetFade(flash, time + 0.06, 0);
flash.think = W_Uzi_Flash_Go;
flash.nextthink = time + 0.02;
Modified: trunk/data/textures/f_shotgun.jpg
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list