From 5a5b412901c577fbeb0bdb2befdcbd245df9689f Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 7 Mar 2010 23:41:28 +1300
Subject: [PATCH] fixed explosions; put dual-fire missiles back on BIKE

---
 mods/cnc/sequences.xml | 23 +++++++----------------
 mods/cnc/vehicles.yaml |  4 +++-
 mods/cnc/weapons.ini   |  6 +++++-
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/mods/cnc/sequences.xml b/mods/cnc/sequences.xml
index e4838a68f9..52d17eaa9e 100644
--- a/mods/cnc/sequences.xml
+++ b/mods/cnc/sequences.xml
@@ -48,30 +48,21 @@
   <unit name="120mm">
     <sequence name="idle" start="0" length="1" />
   </unit>
-
-<!-- Notes on explosions:
-these are mostly broken now that we don't depend on RA
-cnc mixen also include the following sets of explosions that we are not using all of: 
-	frag1, frag3 : medium explosions
-	napalm1, napalm2, napalm3 : small, medium, large fire
-	veh-hit1, veh-hit2, veh-hit3
--->
-
   <unit name="explosion">
     <sequence name="1" start="0" length="4" src="piff" />
     <sequence name="2" start="0" length="8" src="piffpiff" />
     <sequence name="3" start="0" length="14" src="napalm2" />
     <sequence name="4" start="0" length="14" src="veh-hit3" />
     <sequence name="5" start="0" length="22" src="veh-hit2" />
-    <sequence name="6w" start="0" length="27" src="atomsfx" />
-    <sequence name="1w" start="0" length="10" src="h2o_exp3" />
-    <sequence name="5w" start="0" length="10" src="h2o_exp1" />
-    <sequence name="3w" start="0" length="14" src="napalm2" />
     <sequence name="6" start="0" length="27" src="atomsfx" />
-    <sequence name="4w" start="0" length="10" src="h2o_exp2" />
-    <sequence name="2w" start="0" length="10" src="h2o_exp3" />
-    <sequence name="7" start="0" length="18" src="fball1" />
+    <sequence name="6w" start="0" length="27" src="atomsfx" />
+    <sequence name="1w" start="0" length="4" src="piff" />
+    <sequence name="2w" start="0" length="8" src="piffpiff" />
+    <sequence name="3w" start="0" length="14" src="napalm2" />
+    <sequence name="4w" start="0" length="14" src="veh-hit3" />
+    <sequence name="5w" start="0" length="22" src="veh-hit2" />
     <sequence name="8" start="0" length="22" src="art-exp1" />
+    <sequence name="7" start="0" length="18" src="fball1" />
   </unit>
   <unit name="pips">
     <sequence name="ready" start="3" length="1" src="hpips" />
diff --git a/mods/cnc/vehicles.yaml b/mods/cnc/vehicles.yaml
index b004a16524..3ab479e78f 100644
--- a/mods/cnc/vehicles.yaml
+++ b/mods/cnc/vehicles.yaml
@@ -173,7 +173,9 @@ BIKE:
 	AttackBase:
 		PrimaryWeapon: Rockets
 		PrimaryOffset: 0,0,0,-2
-		PrimaryLocalOffset: -4,0,25,4,0,-25
+		PrimaryLocalOffset: -4,0,25
+		SecondaryWeapon: Rockets
+		SecondaryLocalOffset: 4,0,-25
 	RenderUnit:
 	AutoTarget:
 	
diff --git a/mods/cnc/weapons.ini b/mods/cnc/weapons.ini
index ca4b5d71be..fea005dd36 100644
--- a/mods/cnc/weapons.ini
+++ b/mods/cnc/weapons.ini
@@ -387,7 +387,7 @@ Super
 [UnitExplodeWarhead]
 Spread=10
 Verses=90%,75%,60%,25%,100%
-;Explosion=8
+Explosion=8
 InfDeath=3
 ImpactSound=xplos
 
@@ -396,6 +396,7 @@ ImpactSound=xplos
 Spread=3
 Verses=100%,50%,50%,25%,25%
 InfDeath=1
+Explosion=1
 
 ; high explosive (shrapnel)
 [HE]
@@ -404,6 +405,7 @@ Wall=yes
 Wood=yes
 Verses=90%,75%,60%,25%,100%
 InfDeath=2
+Explosion=5
 
 ; armor piercing (discarding sabot, narrow effect)
 [AP]
@@ -412,6 +414,7 @@ Wall=yes
 Wood=yes
 Verses=30%,75%,75%,100%,50%
 InfDeath=3
+Explosion=4
 
 ; napalm and fire in general
 [Fire]
@@ -419,6 +422,7 @@ Spread=8
 Wood=yes
 Verses=90%,100%,60%,25%,50%
 InfDeath=4
+Explosion=3
 
 ; anti-infantry rifle bullet (single shot -- very effective verses infantry)
 [HollowPoint]