r77 - trunk/basezym/progsqc

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Nov 3 17:10:44 EDT 2007


Author: Vermeulen
Date: 2007-11-03 17:10:43 -0400 (Sat, 03 Nov 2007)
New Revision: 77

Modified:
   trunk/basezym/progsqc/damage.qc
   trunk/basezym/progsqc/inventory.qc
   trunk/basezym/progsqc/player.qc
Log:


Modified: trunk/basezym/progsqc/damage.qc
===================================================================
--- trunk/basezym/progsqc/damage.qc	2007-10-25 11:40:54 UTC (rev 76)
+++ trunk/basezym/progsqc/damage.qc	2007-11-03 21:10:43 UTC (rev 77)
@@ -527,7 +527,7 @@
 void(string modelname, vector shotorg, vector shotvel, vector damage, float damagtype, float lifetime, float projectileflags, string firesound, string explodesound, string bouncesound, float tracer, string tracermodel, float modelscale, float projhealth, float projmass, vector projcolormod) weapon_fireprojectile =
 {
 	local float r; // templeofnoise
-
+	
  	newmis = spawn();
  	newmis.classname = "projectile";
  	newmis.solid = SOLID_BBOX;

Modified: trunk/basezym/progsqc/inventory.qc
===================================================================
--- trunk/basezym/progsqc/inventory.qc	2007-10-25 11:40:54 UTC (rev 76)
+++ trunk/basezym/progsqc/inventory.qc	2007-11-03 21:10:43 UTC (rev 77)
@@ -244,6 +244,7 @@
 		iteminfo_ammo1speeds = stov(cvar_string(wname,"_ammo1speeds"));
 		iteminfo_ammo1model = cvar_string(wname,"_ammo1model");
 		iteminfo_ammo1firesound = cvar_string(wname,"_ammo1firesound");
+		//iteminfo_ammo1explodesound = strzone(cvar_string(wname,"_ammo1explodesound")); // BAD
 		iteminfo_ammo1max = cvar(wname,"_ammo1max");
 		iteminfo_ammo1inventorymax = cvar(wname,"_ammo1max");
 		iteminfo_ammo1flags = cvar(wname,"_ammo1flags");
@@ -263,6 +264,7 @@
 		iteminfo_ammo2speeds = stov(cvar_string(wname,"_ammo2speeds"));
 		iteminfo_ammo2model = cvar_string(wname,"_ammo2model");
 		iteminfo_ammo2firesound = cvar_string(wname,"_ammo2firesound");
+		//iteminfo_ammo2explodesound = strzone(cvar_string(wname,"_ammo2explodesound")); // BAD
 		iteminfo_ammo2max = cvar(wname,"_ammo2max");
 		iteminfo_ammo2inventorymax = cvar(wname,"_ammo2max");
 		iteminfo_ammo2flags = cvar(wname,"_ammo2flags");
@@ -530,6 +532,17 @@
 		Inventory_SetItem(self, c, '0 0 0');
 };
 
+void Item_Respawn (void)
+{
+	self.solid = SOLID_TRIGGER;	// allow it to be touched again
+	sound (self, CHAN_VOICE, "misc/itemrespawn.wav", 1, ATTN_NORM);	// play respawn sound
+	setorigin (self, self.origin);
+	self.alpha = 1;
+
+	// LordHavoc: replaced respawn stardust effect with a custom te_wizspike
+	te_wizspike(self.origin + self.mins_z * '0 0 1' + '0 0 48');
+}
+
 void() Item_Think =
 {
 	self.nextthink = time;
@@ -555,7 +568,12 @@
 	sound(other, CHAN_AUTO, self.noise, 1, ATTN_NORM);
 	bprint(self.netname,"\n");
 	Inventory_AddFromInventory(other, self);
-	remove(self);
+	
+	self.solid = SOLID_NOT;
+	self.nextthink = time + 10;
+	self.think = Item_Respawn;
+	self.alpha = 0.1;
+	setorigin (self, self.origin);
 };
 
 .float ispointable;
@@ -571,7 +589,7 @@
 	newmis.movetype = MOVETYPE_TOSS;
 	newmis.velocity = vel;
 	newmis.angles = '0 360 0' * random();
-	newmis.nextthink = time + 0.5;
+	newmis.nextthink = time + 10;
 	newmis.think = Item_EnableOwner;
 	newmis.use = Item_Pickup;
 	if (cvar("g_itemtouchpickup"))

Modified: trunk/basezym/progsqc/player.qc
===================================================================
--- trunk/basezym/progsqc/player.qc	2007-10-25 11:40:54 UTC (rev 76)
+++ trunk/basezym/progsqc/player.qc	2007-11-03 21:10:43 UTC (rev 77)
@@ -316,7 +316,7 @@
 	self.fixangle = TRUE;
 	self.v_angle = self.angles_x * '-1 0 0' + self.angles_y * '0 1 0';
 	self.nextthink = 0;
-	self.team = 1;
+	self.team = cvar("g_playerteam");
 	classnum = cvar("g_startclass");
 	player_spawn(classnum);
 };
@@ -1046,7 +1046,7 @@
 			{
 				self.netname = "Mine Soldier";
 				self.team = 2;
-				player_spawn(ACTORTYPE_CLASS1);
+				player_spawn(ACTORTYPE_CLASS2);
 			}
 			if (impuls == 34)
 			{




More information about the zymotic-commits mailing list