Module dpmod: Change committed

[havoc at icculus.org]

Commiter   : havoc
CVSROOT    : /cvs/cvsroot/twilight
Module     : dpmod
Commit time: 2003-07-18 19:08:49 UTC

Log message:

Fury (potentially eternal) reverted to Quad (30 second)

Modified files:
     qc/client.qc qc/fireball.qc qc/item_artifacts.qc qc/regen.qc
     qc/t_damage.qc

------=MIME.b7409bf3729a60f3e062a42a785c9968
Content-Type: text/plain; name="dpmod.20030718.190849.havoc.diff"
Content-Disposition: attachment; filename="dpmod.20030718.190849.havoc.diff"
Content-Transfer-Encoding: 8bit

Index: dpmod/qc/client.qc
diff -u dpmod/qc/client.qc:1.9 dpmod/qc/client.qc:1.10
--- dpmod/qc/client.qc:1.9	Sat Jul 12 07:40:40 2003
+++ dpmod/qc/client.qc	Fri Jul 18 15:08:39 2003
@@ -1232,7 +1232,7 @@
 	}
 
 	self.effects = self.effects - (self.effects & (EF_BLUE + EF_RED + EF_DIMLIGHT + EF_ADDITIVE/* + EF_REFLECTIVE*/));
-	self.items = self.items - (self.items & (IT_INVISIBILITY + IT_INVULNERABILITY + /*IT_QUAD + */IT_SUIT));
+	self.items = self.items - (self.items & (IT_INVISIBILITY + IT_INVULNERABILITY + IT_QUAD + IT_SUIT));
 
 	// invisibility
 	if (self.invisible_finished)
@@ -1303,10 +1303,7 @@
 			self.invincible_finished = 0;
 		}
 	}
-	if (self.invincible_finished > time)
-		self.effects = self.effects | (EF_RED/* + EF_REFLECTIVE*/);
 
-	/*
 	// super damage
 	if (self.super_damage_finished)
 	{
@@ -1338,9 +1335,6 @@
 			self.super_time = 0;
 		}
 	}
-	*/
-	if (self.items & IT_QUAD)
-		self.effects = self.effects | (EF_BLUE/* + EF_REFLECTIVE*/);
 
 	// suit
 	if (self.radsuit_finished)
@@ -1380,6 +1374,10 @@
 // 'glow' armor
 	if (self.armortype == 1.0)
 		self.effects = self.effects | EF_DIMLIGHT;
+	if (self.items & IT_INVULNERABILITY)
+		self.effects = self.effects | (EF_RED/* + EF_REFLECTIVE*/);
+	if (self.items & IT_QUAD)
+		self.effects = self.effects | (EF_BLUE/* + EF_REFLECTIVE*/);
 };
 
 void() havoc_laywaypoints;
Index: dpmod/qc/fireball.qc
diff -u dpmod/qc/fireball.qc:1.1.1.1 dpmod/qc/fireball.qc:1.2
--- dpmod/qc/fireball.qc:1.1.1.1	Thu Sep 19 15:08:08 2002
+++ dpmod/qc/fireball.qc	Fri Jul 18 15:08:39 2003
@@ -28,10 +28,10 @@
 	if (own.items & IT_QUAD)
 	{
 		newmis.dmg = newmis.dmg * 4;
-		newmis.effects = EF_RED | EF_BLUE | EF_FULLBRIGHT;
+		newmis.effects = newmis.effects | EF_BLUE;
 	}
 
 	setmodel (newmis, "progs/lavaball.mdl");
-	setsize (newmis, '0 0 0', '0 0 0');    
+	setsize (newmis, '0 0 0', '0 0 0');
 	setorigin (newmis, org);
 };
Index: dpmod/qc/item_artifacts.qc
diff -u dpmod/qc/item_artifacts.qc:1.3 dpmod/qc/item_artifacts.qc:1.4
--- dpmod/qc/item_artifacts.qc:1.3	Tue Nov 19 02:49:52 2002
+++ dpmod/qc/item_artifacts.qc	Fri Jul 18 15:08:39 2003
@@ -60,13 +60,13 @@
 
 	if (self.items & IT_QUAD)
 	{
-		/*
 		other.super_time = 1;
 		other.super_damage_finished = time + 30;
-		*/
+		/*
 		other.rotthink = time + 1;
 		if (other.health < HEALTHMEGAMAX)
 			other.health = min(other.health + 100, HEALTHMEGAMAX);
+		*/
 	}
 
 	activator = other;
@@ -138,8 +138,8 @@
 	precache_sound ("items/damage3.wav");
 	self.noise = "items/damage.wav";
 	setmodel (self, "progs/quaddama.mdl");
-	//self.netname = "You got the Quad Damage!\n";
-	self.netname = "You got the Fury!\n";
+	self.netname = "You got the Quad Damage!\n";
+	//self.netname = "You got the Fury!\n";
 	self.items = IT_QUAD;
 	setsize (self, '-16 -16 -24', '16 16 32');
 
Index: dpmod/qc/regen.qc
diff -u dpmod/qc/regen.qc:1.2 dpmod/qc/regen.qc:1.3
--- dpmod/qc/regen.qc:1.2	Tue Nov 19 02:49:52 2002
+++ dpmod/qc/regen.qc	Fri Jul 18 15:08:39 2003
@@ -10,6 +10,7 @@
 		if (time > self.rotthink)
 		{
 			// rot health
+			/*
 			if (self.items & IT_QUAD) // Fury drains health very quickly
 			{
 				self.rotthink = time + 0.2;
@@ -26,6 +27,7 @@
 				}
 			}
 			else
+			*/
 			{
 				self.rotthink = time + 1;
 				if (self.health > self.max_health)
@@ -51,7 +53,7 @@
 				self.regenthink = time + 0.1;
 			else
 				self.regenthink = time + 0.25;
-			if (!(self.items & IT_QUAD)) // no healing with Fury
+			//if (!(self.items & IT_QUAD)) // no healing with Fury
 			{
 				if (self.health < self.max_health)
 				{
Index: dpmod/qc/t_damage.qc
diff -u dpmod/qc/t_damage.qc:1.6 dpmod/qc/t_damage.qc:1.7
--- dpmod/qc/t_damage.qc:1.6	Wed Jul 16 08:16:45 2003
+++ dpmod/qc/t_damage.qc	Fri Jul 18 15:08:39 2003
@@ -306,6 +306,7 @@
 		if (targ.flags & FL_GODMODE)
 			return;
 
+		/*
 		if (attacker.items & IT_QUAD) // Fury is vampiric
 		if (attacker.classname == "player")
 		if (targ.iscreature)
@@ -319,6 +320,7 @@
 			f = min(f, HEALTHMEGAMAX);
 			attacker.health = max(f, attacker.health);
 		}
+		*/
 
 		// do the damage
 		targ.health = targ.health - htake;