Module dpmod: Change committed

[havoc at icculus.org]

Commiter   : havoc
CVSROOT    : /cvs/cvsroot/twilight
Module     : dpmod
Commit time: 2002-09-28 08:25:55 UTC

Log message:

changed back to triple barrel spiral rocket launcher...  toned down spiral damage a bit however (120 for main rocket, 80 for the extra two, 280 total)

Modified files:
     qc/w_rocket.qc

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

Index: dpmod/qc/w_rocket.qc
diff -u dpmod/qc/w_rocket.qc:1.3 dpmod/qc/w_rocket.qc:1.4
--- dpmod/qc/w_rocket.qc:1.3	Sat Sep 28 02:59:40 2002
+++ dpmod/qc/w_rocket.qc	Sat Sep 28 04:25:44 2002
@@ -101,12 +101,12 @@
 	if (self.wload)
 	{
 		w_muzzleflash(shotorg + v_right * 6, 10);
-		LaunchMissile(shotorg + v_right * 6, shotdir, self, 150, 200, "ROCKET", Obituary_Rocket);
+		LaunchMissile(shotorg + v_right * 6, shotdir, self, 120, 200, "ROCKET", Obituary_Rocket);
 	}
 	else
 	{
 		w_muzzleflash(shotorg - v_right * 6, 10);
-		LaunchMissile(shotorg - v_right * 6, shotdir, self, 150, 200, "ROCKET", Obituary_Rocket);
+		LaunchMissile(shotorg - v_right * 6, shotdir, self, 120, 200, "ROCKET", Obituary_Rocket);
 	}
 	self.wload = !self.wload;
 };
@@ -141,9 +141,17 @@
 		return;
 	w_muzzleflash(shotorg - v_right * 8, 10);
 	LaunchMissile(shotorg - v_right * 8, shotdir - v_right * 0.025, self, 150, 200, "ROCKET", Obituary_Rocket);
-	self.wload = !self.wload;
 };
 
+void() W_RocketFireSingle =
+{
+	self.wfiretime = time;
+	self.flags = self.flags - (self.flags & FL_ONGROUND);
+	self.currentammo = self.ammo_rockets = self.ammo_rockets - 1;
+	w_muzzleflash(shotorg, 10);
+	LaunchMissile(shotorg, shotdir, self, 120, 200, "ROCKET", Obituary_Rocket);
+};
+
 void() W_RocketFireTripleSpiral =
 {
 	self.wfiretime = time;
@@ -151,17 +159,16 @@
 	self.velocity = self.velocity - shotdir * 450;
 	self.currentammo = self.ammo_rockets = self.ammo_rockets - 1;
 	w_muzzleflash(shotorg, 10);
-	LaunchMissile(shotorg, shotdir, self, 150, 200, "ROCKET", Obituary_Rocket);
+	LaunchMissile(shotorg, shotdir, self, 120, 200, "ROCKET", Obituary_Rocket);
 	spiralmissile_orbitentity = newmis;
 	if (self.ammo_rockets < 1)
 		return;
 	w_muzzleflash(shotorg + v_right * 8, 10);
-	LaunchSpiralMissile(shotorg, shotdir, self, 150, 200, "ROCKET", Obituary_Rocket, -4);
+	LaunchSpiralMissile(shotorg, shotdir, self, 80, 200, "ROCKET", Obituary_Rocket, -12);
 	if (self.ammo_rockets < 1)
 		return;
 	w_muzzleflash(shotorg - v_right * 8, 10);
-	LaunchSpiralMissile(shotorg, shotdir, self, 150, 200, "ROCKET", Obituary_Rocket, 4);
-	self.wload = !self.wload;
+	LaunchSpiralMissile(shotorg, shotdir, self, 80, 200, "ROCKET", Obituary_Rocket, 12);
 };
 
 void() w_rocketdrop1;
@@ -174,8 +181,8 @@
 		return;
 
 	if (self.button3)
-		W_GenericSlowFireCode("weapons/sgun1.wav", 1.2, W_RocketFireDual);
-	//	W_GenericSlowFireCode("weapons/sgun1.wav", 1.2, W_RocketFireTripleSpiral);
+	//	W_GenericSlowFireCode("weapons/sgun1.wav", 1.2, W_RocketFireDual);
+		W_GenericSlowFireCode("weapons/sgun1.wav", 1.2, W_RocketFireTripleSpiral);
 	/*
 	{
 		if (self.button0)
@@ -190,7 +197,8 @@
 	}
 	*/
 	else if (self.button0)
-		W_GenericSlowFireCode("weapons/sgun1.wav", 0.5, W_RocketFire);
+	//	W_GenericSlowFireCode("weapons/sgun1.wav", 0.5, W_RocketFire);
+		W_GenericSlowFireCode("weapons/sgun1.wav", 0.5, W_RocketFireSingle);
 
 	if (self.wfiretime)
 	{