r100 - trunk/progsqc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Feb 19 21:40:43 EST 2008
Author: vermeulen
Date: 2008-02-19 21:40:43 -0500 (Tue, 19 Feb 2008)
New Revision: 100
Modified:
trunk/progsqc/dpextensions.qc
trunk/progsqc/inventory.qc
trunk/progsqc/player.qc
Log:
Item changes
Modified: trunk/progsqc/dpextensions.qc
===================================================================
--- trunk/progsqc/dpextensions.qc 2008-02-06 12:08:06 UTC (rev 99)
+++ trunk/progsqc/dpextensions.qc 2008-02-20 02:40:43 UTC (rev 100)
@@ -767,7 +767,7 @@
//DP_SV_CLIENTCOLORS
//idea: LordHavoc
//darkplaces implementation: LordHavoc
-//.float clientcolors; // colors of the client (format: pants + shirt * 16)
+.float clientcolors; // colors of the client (format: pants + shirt * 16)
//description:
//allows qc to read and modify the client colors associated with a client entity (not particularly useful on other entities), and automatically sends out any appropriate network updates if changed
Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc 2008-02-06 12:08:06 UTC (rev 99)
+++ trunk/progsqc/inventory.qc 2008-02-20 02:40:43 UTC (rev 100)
@@ -716,58 +716,6 @@
Item_Spawn(ITEMTYPE_AMMO4,50,0,self.origin,'0 0 0',10,1,world);
}
-void() item_health1 =
-{
- newmis = spawn();
- newmis.health = 10;
- newmis.owner = world;
- newmis.respawntime = 5;
- newmis.classname = "Health";
- newmis.netname = "Health";
- newmis.ispointable = TRUE;
- newmis.solid = SOLID_TRIGGER;
- newmis.movetype = MOVETYPE_TOSS;
- newmis.velocity = '0 0 0';
- newmis.angles = '0 0 0';
- newmis.nextthink = time + 10;
- newmis.think = Item_Think;
- newmis.use = Item_Pickup;
- if (cvar("g_itemtouchpickup"))
- newmis.touch = Item_Pickup;
- newmis.noise = "pickuphealth";
- setorigin(newmis, self.origin);
- setmodel(newmis, "models/items/health1.md3");
- setsize(newmis, '-8 -8 -8', '8 8 8');
-
- newmis.effects = newmis.effects | EF_FULLBRIGHT;
-}
-
-void() item_health25 =
-{
- newmis = spawn();
- newmis.health = 25;
- newmis.owner = world;
- newmis.respawntime = 5;
- newmis.classname = "Health";
- newmis.netname = "Health";
- newmis.ispointable = TRUE;
- newmis.solid = SOLID_TRIGGER;
- newmis.movetype = MOVETYPE_TOSS;
- newmis.velocity = '0 0 0';
- newmis.angles = '0 0 0';
- newmis.nextthink = time + 10;
- newmis.think = Item_Think;
- newmis.use = Item_Pickup;
- if (cvar("g_itemtouchpickup"))
- newmis.touch = Item_Pickup;
- newmis.noise = "pickuphealth";
- setorigin(newmis, self.origin);
- setmodel(newmis, "models/items/health25.md3");
- setsize(newmis, '-8 -8 -8', '8 8 8');
-
- newmis.effects = newmis.effects | EF_FULLBRIGHT;
-}
-
void() item_armor1 =
{
newmis = spawn();
@@ -785,7 +733,7 @@
newmis.use = Item_Pickup;
if (cvar("g_itemtouchpickup"))
newmis.touch = Item_Pickup;
- newmis.noise = "pickuphealth";
+ //newmis.noise = "pickuphealth";
setorigin(newmis, self.origin);
setmodel(newmis, "models/items/armor1.md3");
setsize(newmis, '-8 -8 -8', '8 8 8');
@@ -810,7 +758,7 @@
newmis.use = Item_Pickup;
if (cvar("g_itemtouchpickup"))
newmis.touch = Item_Pickup;
- newmis.noise = "pickuphealth";
+ //newmis.noise = "pickuphealth";
setorigin(newmis, self.origin);
setmodel(newmis, "models/items/armor25.md3");
setsize(newmis, '-8 -8 -8', '8 8 8');
Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc 2008-02-06 12:08:06 UTC (rev 99)
+++ trunk/progsqc/player.qc 2008-02-20 02:40:43 UTC (rev 100)
@@ -374,6 +374,7 @@
stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
self.team = cvar("g_playerteam");
+ self.colormap = 1000;
//self.classnum = cvar("g_startclass");
if (!self.spawned)
@@ -493,12 +494,6 @@
actor_setviewmodeloffset(self.viewmodelchange);
}
- if ((self.hook) && (!self.button7))
- {
- if (self.hook.fireflag & FIREFLAG_HOOK)
- remove(self.hook);
- }
-
Inventory_GetItemInfo(self, self.itemselected);
Inventory_ModifyItem(self, self.itemselected, 0 + iteminfo_rechargerate, 0);
Inventory_GetItemInfo(self, self.weaponitem);
@@ -557,60 +552,68 @@
else
self.viewzoom = 1;
- if (self.button7 & self.invisactive)
+ if (self.button7)
{
- self.alpha = 0.4;
- self.actorpart_torso.alpha = 0.4;
- self.actorpart_head.alpha = 0.4;
- self.actorpart_weapon.alpha = 0.4;
- self.actorpart_viewweapon.alpha = 0.4;
+ if (self.invisactive)
+ {
+ self.alpha = 0.4;
+ self.actorpart_torso.alpha = 0.4;
+ self.actorpart_head.alpha = 0.4;
+ self.actorpart_weapon.alpha = 0.4;
+ self.actorpart_viewweapon.alpha = 0.4;
+ }
+ else if (self.shieldactive)
+ {
+ self.colormod = '5 0 0';
+ self.actorpart_torso.colormod = '5 0 0';
+ self.actorpart_head.colormod = '5 0 0';
+ self.actorpart_weapon.colormod = '5 0 0';
+ self.actorpart_viewweapon.colormod = '5 0 0';
+ }
+ else if (self.jetpackactive)
+ {
+ if ((self.jetpack_fuel > 10) && (self.actorpart_jetpacktrail.effects & EF_NODRAW))
+ self.actorpart_jetpacktrail.effects -= self.actorpart_jetpacktrail.effects & EF_NODRAW;
+ else if (self.jetpack_fuel < 10)
+ self.actorpart_jetpacktrail.effects = self.actorpart_jetpacktrail.effects | EF_NODRAW;
+ }
}
else
{
- self.invisactive = 0;
- self.alpha = 1;
- self.actorpart_torso.alpha = 1;
- self.actorpart_head.alpha = 1;
- self.actorpart_weapon.alpha = 1;
- self.actorpart_viewweapon.alpha = 1;
- }
-
- if (self.button7 & self.shieldactive)
- {
- self.colormod = '5 0 0';
- self.actorpart_torso.colormod = '5 0 0';
- self.actorpart_head.colormod = '5 0 0';
- self.actorpart_weapon.colormod = '5 0 0';
- self.actorpart_viewweapon.colormod = '5 0 0';
- }
- else
- {
- self.shieldactive = 0;
- self.colormod = '1 1 1';
- self.actorpart_torso.colormod = '1 1 1';
- self.actorpart_head.colormod = '1 1 1';
- self.actorpart_weapon.colormod = '1 1 1';
- self.actorpart_viewweapon.colormod = '1 1 1';
- }
-
- if (self.button7 & self.jetpackactive)
- {
- if ((self.jetpack_fuel > 10) && (self.actorpart_jetpacktrail.effects & EF_NODRAW))
- self.actorpart_jetpacktrail.effects -= self.actorpart_jetpacktrail.effects & EF_NODRAW;
- else if (self.jetpack_fuel < 10)
- self.actorpart_jetpacktrail.effects = self.actorpart_jetpacktrail.effects | EF_NODRAW;
- }
- else
- {
- if (self.jetpackactive)
+ if (self.invisactive)
+ {
+ self.invisactive = FALSE;
+ self.alpha = 1;
+ self.actorpart_torso.alpha = 1;
+ self.actorpart_head.alpha = 1;
+ self.actorpart_weapon.alpha = 1;
+ self.actorpart_viewweapon.alpha = 1;
+ }
+ if (self.shieldactive)
{
+ self.shieldactive = FALSE;
+ self.colormod = '1 1 1';
+ self.actorpart_torso.colormod = '1 1 1';
+ self.actorpart_head.colormod = '1 1 1';
+ self.actorpart_weapon.colormod = '1 1 1';
+ self.actorpart_viewweapon.colormod = '1 1 1';
+ }
+ if (self.jetpackactive)
+ {
+ self.jetpackactive = FALSE;
self.jetpackacc = cvar("g_jetpack_accbase");
sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/jetpackstop.wav"), 1, ATTN_NORM);
- self.jetpackactive = FALSE;
self.actorpart_jetpacktrail.effects = self.actorpart_jetpacktrail.effects | EF_NODRAW;
}
+ if (self.hook)
+ {
+ if (self.hook.fireflag & FIREFLAG_HOOK)
+ remove(self.hook);
+ }
}
}
+
+
self.oldvelocity = self.velocity;
if (!self.button2)
self.flags = self.flags | FL_JUMPRELEASED;
More information about the zymotic-commits
mailing list