Updated armcir and armferret (#2800)

- Chainsaw and Ferret now aim up.
- s3o files have been standardized and improved, along with major model improvements for chainsaw
- Improved animation scripts for both

scripts/Units/armcir.bos

@@ -3,7 +3,7 @@
 #include "sfxtype.h"
 #include "exptype.h"
 
-piece  flare1, flare6, flare5, flare4, flare3, flare2, base, turret, spindle;
+piece  flare1, flare6, flare5, flare4, flare3, flare2, base, turret, ring, spindle, aimy1, aimx1;
 
 static-var  gun_1, last_fire, firstaim;
 
@@ -22,7 +22,9 @@ ExecuteRestoreAfterDelay()
         return (1);
     }
     firstaim = 1;
-	spin turret around y-axis speed <22.0>;
+	spin aimy1 around y-axis speed <22.0>;
+	turn aimx1 to x-axis <-15> speed <22.0>;
+	turn spindle to z-axis <0> speed <60>;
 }
 SetStunned(State)
 {
@@ -58,14 +60,17 @@ AimPrimary(heading, pitch)
 {
     signal SIG_AIM;
 	set-signal-mask SIG_AIM;
-	turn turret to y-axis heading speed <250>;
-	wait-for-turn turret around y-axis;
+	turn aimy1 to y-axis heading speed <250>;
+	turn aimx1 to x-axis 0 - pitch speed <250>;
+	wait-for-turn aimy1 around y-axis;
 	start-script RestoreAfterDelay();
 	return (1);
 }
 
 FirePrimary()
 {
+	spin spindle around z-axis speed <-240>;
+
 	if( gun_1 == 0 )
 	{
 		wait-for-turn spindle around z-axis;
@@ -107,7 +112,7 @@ QueryPrimary(piecenum)
 
 AimFromPrimary(piecenum)
 {
-	piecenum = turret;
+	piecenum = spindle;
 }
 
 SweetSpot(piecenum)

scripts/Units/armferret.bos

@@ -3,7 +3,7 @@
 #include "sfxtype.h"
 #include "exptype.h"
 
-piece  base, turret, sleeve, barrel1, barrel2, flare1, flare2, aimpoint;
+piece  base, turret, sleeve, barrel1, barrel2, flare1, flare2, aimpoint, hat, aimy1, aimx1;
 
 static-var  Static_Var_1, Static_Var_2, restore_delay, Static_Var_4, statechg_DesiredState,
             statechg_StateChanging;
@@ -14,19 +14,23 @@ static-var  Static_Var_1, Static_Var_2, restore_delay, Static_Var_4, statechg_De
 
 Activatescr()
 {
-	move turret to y-axis [0] speed [40];
-	wait-for-move turret along y-axis;
+	move aimy1 to y-axis [0] speed [40];
+	wait-for-move aimy1 along y-axis;
 	move barrel2 to z-axis [0] speed [28];
 	move barrel1 to z-axis [0] speed [28];
 	sleep 200;
 }
 
 Deactivatescr()
 {
-	move turret to y-axis [-7] speed [40];
-	wait-for-move turret along y-axis;
-	move barrel2 to z-axis [-7] speed [28];
 	move barrel1 to z-axis [-7] speed [28];
+	move barrel2 to z-axis [-7] speed [28];
+	wait-for-move barrel2 along z-axis;
+
+	move aimy1 to y-axis [-7] speed [40];
+	turn aimy1 to y-axis <0> speed <120>;
+	turn aimx1 to x-axis <0> speed <120>;
+	turn hat to x-axis <0> speed <60>;
 	sleep 200;
 }
 
@@ -134,7 +138,9 @@ AimPrimary(heading, pitch)
 	{
 		sleep 250;
 	}
-	turn sleeve to y-axis heading speed <900.000000>;
+	turn aimy1 to y-axis heading speed <200.000000>;
+	turn aimx1 to x-axis 0 - pitch speed <200.000000>;
+	turn hat to x-axis 0 - pitch / 2 speed <100.000000>;
 	wait-for-turn turret around y-axis;
 	start-script RestoreAfterDelay();
 	return (1);