r108 - in trunk: client progsqc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Mar 13 09:13:25 EDT 2008
Author: vermeulen
Date: 2008-03-13 09:13:23 -0400 (Thu, 13 Mar 2008)
New Revision: 108
Modified:
trunk/client/cl_sbar.qc
trunk/client/progs.src
trunk/progsqc/damage.qc
trunk/progsqc/inventory.qc
trunk/progsqc/player.qc
Log:
Added item amount to hud
modelcolormod option
Added sounds to damage.qc
Modified: trunk/client/cl_sbar.qc
===================================================================
--- trunk/client/cl_sbar.qc 2008-03-08 13:32:46 UTC (rev 107)
+++ trunk/client/cl_sbar.qc 2008-03-13 13:13:23 UTC (rev 108)
@@ -28,19 +28,19 @@
void DrawBars(void)
{
local vector fillsize;
- local float ammo1, ammo2;
+ local float ammo1, ammo2, itemammo;
fillsize_y = GetStat_FLOAT_TRUNCATED(STAT_ARMOR) * 2;
fillsize_x = 15;
pos_armor_x = 5;
pos_armor_y = vid_height - (20 + fillsize_y);
- drawfill(pos_armor, fillsize, '0.5 0.5 2', 0.6, 0);
+ drawfill(pos_armor, fillsize, '0 0 0.5', 0.6, 0);
fillsize_y = GetStat_FLOAT_TRUNCATED(STAT_HEALTH) * 2;
fillsize_x = 15;
pos_health_x = 20;
pos_health_y = vid_height - (20 + fillsize_y);
- drawfill(pos_health, fillsize, '2 0.5 0.5', 0.6, 0);
+ drawfill(pos_health, fillsize, '0.5 0 0', 0.6, 0);
ammo1 = GetStat_FLOAT_TRUNCATED(STAT_AMMO) * 2;
ammo2 = GetStat_FLOAT_TRUNCATED(STAT_SHELLS) * 2;
@@ -48,11 +48,18 @@
fillsize_x = 15;
pos_ammo_x = vid_width - 50;
pos_ammo_y = vid_height - (20 + fillsize_y);
- drawfill(pos_ammo, fillsize, '0 1 1', 0.6, 0);
+ drawfill(pos_ammo, fillsize, '0 0.5 0.5', 0.6, 0);
fillsize_y = ammo1;
pos_ammo_y = vid_height - (20 + fillsize_y + ammo2);
- drawfill(pos_ammo, fillsize, '0 0.8 0.8', 0.6, 0);
+ drawfill(pos_ammo, fillsize, '0 0.2 0.2', 0.6, 0);
+
+ itemammo = GetStat_FLOAT_TRUNCATED(STAT_NAILS) / 2;
+ fillsize_y = itemammo;
+ fillsize_x = 15;
+ pos_ammo_x = 50;
+ pos_ammo_y = vid_height - (55 + fillsize_y);
+ drawfill(pos_ammo, fillsize, '0 0.5 0', 0.6, 0);
}
//-----------------------------------------------------------------------------
@@ -69,9 +76,9 @@
f = GetStat_FLOAT_TRUNCATED(STAT_CELLS);
pos_item_x = 40;
- pos_item_y = vid_height - 65;
+ pos_item_y = vid_height - 50;
- itemsize = '50 50 0';
+ itemsize = '40 40 0';
if (f==1)
drawpic(pos_item, "gfx/item1", itemsize, '1 1 1', 1, 0);
Modified: trunk/client/progs.src
===================================================================
--- trunk/client/progs.src 2008-03-08 13:32:46 UTC (rev 107)
+++ trunk/client/progs.src 2008-03-13 13:13:23 UTC (rev 108)
@@ -1,4 +1,4 @@
-../csprogs.dat
+../../csprogs.dat
cl_defs.qc
cl_constants.qc
Modified: trunk/progsqc/damage.qc
===================================================================
--- trunk/progsqc/damage.qc 2008-03-08 13:32:46 UTC (rev 107)
+++ trunk/progsqc/damage.qc 2008-03-13 13:13:23 UTC (rev 108)
@@ -236,26 +236,32 @@
WriteCoord (MSG_BROADCAST, self.origin_x);
WriteCoord (MSG_BROADCAST, self.origin_y);
WriteCoord (MSG_BROADCAST, self.origin_z);
+
+ sound (self, CHAN_BODY, "weapons/explode_large.wav", 1, ATTN_NORM);
remove(self);
}
else if (self.explflag & EXPLFLAG_NEX)
{
+ sound (self, CHAN_BODY, "weapons/explode_nex.ogg", 1, ATTN_NORM);
pointparticles(particleeffectnum("nex_explode"), self.origin, '0 0 0', 1);
remove(self);
}
else if (self.explflag & EXPLFLAG_EXPLODE)
{
+ sound (self, CHAN_BODY, "weapons/explode_medium.wav", 1, ATTN_NORM);
te_explosion(self.origin);
remove(self);
}
else if (self.explflag & EXPLFLAG_SNIPERRAIL)
{
+ sound (self, CHAN_BODY, "weapons/hit_rail.wav", 1, ATTN_NORM);
te_plasmaburn(self.origin);
remove(self);
}
else if (self.explflag & EXPLFLAG_ELECTRICITY)
{
+ sound (self, CHAN_BODY, "weapons/explode_electricity.wav", 1, ATTN_NORM);
WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
WriteByte (MSG_BROADCAST, 79);
WriteCoord (MSG_BROADCAST, self.origin_x);
@@ -269,6 +275,7 @@
}
else if (self.explflag & EXPLFLAG_PLASMA)
{
+ sound (self, CHAN_BODY, "weapons/explode_plasma.wav", 1, ATTN_NORM);
te_knightspike(self.origin);
remove(self);
}
Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc 2008-03-08 13:32:46 UTC (rev 107)
+++ trunk/progsqc/inventory.qc 2008-03-13 13:13:23 UTC (rev 108)
@@ -74,6 +74,7 @@
float iteminfo_ammoinventorymax;
float iteminfo_ammotype;
float iteminfo_modelscale;
+vector iteminfo_modelcolormod;
float iteminfo_ammo1minimumtofire;
float iteminfo_ammo2minimumtofire;
@@ -169,6 +170,7 @@
iteminfo_ammoinventory = 0;
iteminfo_model = "";
+ iteminfo_modelcolormod = '1 1 1';
iteminfo_pickupmodel = "";
iteminfo_viewmodeloffset = '0 0 0';
iteminfo_name = "unknown";
@@ -342,6 +344,7 @@
iteminfo_pickupsound = cvar_string(wname,"_pickupsound");
iteminfo_pickupmodel = cvar_string(wname,"_pickupmodel");
iteminfo_quantitymax = cvar(wname,"_quantitymax");
+ iteminfo_modelcolormod = stov(cvar_string(wname,"_modelcolormod"));
}
else
bprint(ftos(itemtype)," Inventory_GetItemInfo: unknown itemtype\n");
@@ -445,6 +448,7 @@
precache_sound ("weapons/minigun_bulletfire4.wav"); // templeofnoise: old style precache for additional sounds
precache_sound ("weapons/minigun_whirlstart.wav"); // templeofnoise: old style precache for additional sounds
precache_sound ("weapons/minigun_whirlend.wav"); // templeofnoise: old style precache for additional sounds
+ precache_sound ("weapons/bullet_ric1.wav"); // templeofnoise
precache_sound ("weapons/bullet_ric2.wav"); // templeofnoise
precache_sound ("weapons/bullet_ric3.wav"); // templeofnoise
precache_sound ("weapons/bullet_ric4.wav"); // templeofnoise
@@ -664,6 +668,7 @@
setmodel(newmis, iteminfo_pickupmodel);
setsize(newmis, '-25 -25 -25', '8 8 8');
Inventory_ModifyItem(newmis, itemtype, quantity, ammo1);
+ newmis.colormod = iteminfo_modelcolormod;
//newmis.effects = newmis.effects | EF_FULLBRIGHT;
newmis.scale = modelscale;
Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc 2008-03-08 13:32:46 UTC (rev 107)
+++ trunk/progsqc/player.qc 2008-03-13 13:13:23 UTC (rev 108)
@@ -43,7 +43,6 @@
precache_sound(strcat(e.sounddir, "/landing.wav"));
precache_sound(strcat(e.sounddir, "/jump.wav"));
precache_sound(strcat(e.sounddir, "/voice/pain.wav"));
- precache_sound(strcat(e.sounddir, "/shieldregen.wav"));
return e;
};
More information about the zymotic-commits
mailing list