Module dpmod: Change committed

[havoc at icculus.org]

Commiter   : havoc
CVSROOT    : /cvs/cvsroot/twilight
Module     : dpmod
Commit time: 2003-03-11 19:25:58 UTC

Log message:

smaller blast radius

Modified files:
     qc/w_grenade.qc

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

Index: dpmod/qc/w_grenade.qc
diff -u dpmod/qc/w_grenade.qc:1.5 dpmod/qc/w_grenade.qc:1.6
--- dpmod/qc/w_grenade.qc:1.5	Fri Feb 28 00:15:12 2003
+++ dpmod/qc/w_grenade.qc	Tue Mar 11 14:25:48 2003
@@ -56,7 +56,7 @@
 	self.currentammo = self.ammo_rockets = self.ammo_rockets - 1;
 	w_muzzleflash(shotorg, 3);
 	//LaunchGrenade(shotorg, shotdir * 1000 + v_up * 200 + self.velocity, self, 150 * damagescale, 200, GRENADE_IMPACT | GRENADE_IMMUNETODAMAGE, 25, "GRENADE", Obituary_Grenade);
-	LaunchGrenade(shotorg, shotdir * 1000 + v_up * 200, self, 150 * damagescale, 200, GRENADE_IMPACT | GRENADE_IMMUNETODAMAGE, 25, "GRENADE", Obituary_Grenade);
+	LaunchGrenade(shotorg, shotdir * 1000 + v_up * 200, self, 150 * damagescale, 120, GRENADE_IMPACT | GRENADE_IMMUNETODAMAGE, 25, "GRENADE", Obituary_Grenade);
 };
 
 /*
@@ -74,7 +74,7 @@
 	self.wfiretime = time;
 	self.currentammo = self.ammo_rockets = self.ammo_rockets - 1;
 	w_muzzleflash(shotorg, 3);
-	LaunchMine(shotorg, shotdir * 1000 + v_up * 200, self, 120 * damagescale, 200, 50 * damagescale, 20 * damagescale, MINE_DETONATABLE, 60, "STICKYGRENADE", Obituary_Grenade);
+	LaunchMine(shotorg, shotdir * 1000 + v_up * 200, self, 120 * damagescale, 120, 50 * damagescale, 20 * damagescale, MINE_DETONATABLE, 60, "STICKYGRENADE", Obituary_Grenade);
 };
 
 .float activemines;
@@ -113,19 +113,14 @@
 		}
 		else if (self.button0)
 		{
-			if (self.grenademode == 0)
+			if (self.ammo_rockets >= 1)
 			{
-				if (self.ammo_rockets >= 1)
-					W_GenericSlowFireCode("weapons/grenade.wav", 0.5, W_GrenadeFireImpact);
-				else
-					self.switchweapon = W_BestWeapon(TRUE);
-			}
-			else if (self.grenademode == 1)
-			{
-				if (self.ammo_rockets >= 1)
+				if (self.grenademode == 0)
+					W_GenericSlowFireCode("weapons/grenade.wav", 0.6, W_GrenadeFireImpact);
+				else if (self.grenademode == 1)
 				{
 					if (self.activemines < 20)
-						W_GenericSlowFireCode("weapons/grenade.wav", 0.5, W_GrenadeFireSticky);
+						W_GenericSlowFireCode("weapons/grenade.wav", 0.8, W_GrenadeFireSticky);
 					else
 					{
 						if (time > self.attack_finished)
@@ -135,9 +130,9 @@
 						}
 					}
 				}
-				else
-					self.switchweapon = W_BestWeapon(TRUE);
 			}
+			else
+				self.switchweapon = W_BestWeapon(TRUE);
 		}
 	}
 	self.oldbutton3 = self.button3;