Changeset 1978

Timestamp:

05/18/08 19:03:11 (8 months ago)

Author:

evil4zerggin

Message:

Trying out new script for Arm commander. Hopefully this will be more responsive.

Location:

trunk/mods/ca/scripts

Files:

• armcom.bos (modified) (28 diffs)
• armcom.cob (modified) (previous)

trunk/mods/ca/scripts/armcom.bos

@@ -8 +8 @@
        lthigh, rthigh, nanolath, biggun, rleg, lleg, ground;
 
-static-var  bMoving, bAiming, Static_Var_3, Static_Var_4;
+static-var  action, isMoving;
 
 // Signal definitions
-#define SIG_AIM                         2
-
-
-walk()
-{
-        if( bMoving )
+#define SIG_LASER                               2
+#define SIG_DGUN                                4
+
+#define ACT_DGUN                                4
+#define ACT_LASER                               2
+
+#define TORSO_SPEED_YAW                 <300>
+#define ARM_SPEED_PITCH                 <180>
+
+#define RESTORE_DELAY_DGUN              2000
+#define RESTORE_DELAY_LASER             2000
+
+WalkArms()
+{
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.700000] now;
@@ -25 +34 @@
                 turn torso to y-axis <4.219780> now;
                 turn ruparm to x-axis <-11.252747> now;
-                turn luparm to x-axis <11.252747> now;
-                turn nanolath to x-axis <-41.846154> now;
-                turn biggun to x-axis <-62.593407> now;
+                turn luparm to x-axis <11.252747> now;  
                 turn rleg to x-axis <39.384615> now;
                 turn lleg to x-axis <41.846154> now;
                 sleep 40;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 turn torso to y-axis <3.868132> now;
                 turn ruparm to x-axis <-13.362637> now;
                 turn luparm to x-axis <12.307692> now;
-                turn nanolath to x-axis <-41.840659> now;
-                sleep 40;
-        }
-        if( bMoving )
+                sleep 40;
+        }
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.550000] now;
@@ -49 +55 @@
                 turn ruparm to x-axis <-8.087912> now;
                 turn luparm to x-axis <6.329670> now;
-                turn nanolath to x-axis <-41.840659> now;
-                turn biggun to x-axis <-62.593407> now;
                 turn rleg to x-axis <51.686813> now;
                 turn lleg to x-axis <28.483516> now;
                 sleep 100;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.300000] now;
@@ -64 +68 @@
                 turn ruparm to x-axis <-3.159341> now;
                 turn luparm to x-axis <0.000000> now;
-                turn nanolath to x-axis <-41.840659> now;
-                turn biggun to x-axis <-62.593407> now;
                 turn rleg to x-axis <58.016484> now;
                 turn lleg to x-axis <16.175824> now;
                 sleep 90;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [0.000000] now;
@@ -79 +81 @@
                 turn ruparm to x-axis <3.164835> now;
                 turn luparm to x-axis <-6.329670> now;
-                turn nanolath to x-axis <-41.846154> now;
                 turn rleg to x-axis <44.307692> now;
                 turn lleg to x-axis <5.626374> now;
                 sleep 90;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.200000] now;
@@ -93 +94 @@
                 turn ruparm to x-axis <6.681319> now;
                 turn luparm to x-axis <-8.087912> now;
-                turn nanolath to x-axis <-41.840659> now;
-                turn biggun to x-axis <-62.593407> now;
                 turn rleg to x-axis <71.384615> now;
                 turn lleg to x-axis <20.043956> now;
                 sleep 80;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.300000] now;
@@ -110 +109 @@
                 sleep 70;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.400000] now;
@@ -119 +118 @@
                 turn ruparm to x-axis <10.197802> now;
                 turn luparm to x-axis <-10.197802> now;
-                turn nanolath to x-axis <-41.840659> now;
-                turn biggun to x-axis <-62.593407> now;
                 turn rleg to x-axis <34.461538> now;
                 turn lleg to x-axis <20.043956> now;
                 sleep 80;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.700000] now;
@@ -134 +131 @@
                 turn ruparm to x-axis <11.252747> now;
                 turn luparm to x-axis <-11.252747> now;
-                turn nanolath to x-axis <-41.840659> now;
-                turn biggun to x-axis <-62.593407> now;
                 turn rleg to x-axis <40.439560> now;
                 turn lleg to x-axis <30.587912> now;
                 sleep 40;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 turn ruparm to x-axis <13.362637> now;
                 turn luparm to x-axis <-12.307692> now;
-                turn nanolath to x-axis <-41.840659> now;
-                turn biggun to x-axis <-62.593407> now;
-                sleep 40;
-        }
-        if( bMoving )
+                sleep 40;
+        }
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.550000] now;
@@ -157 +150 @@
                 turn ruparm to x-axis <8.439560> now;
                 turn luparm to x-axis <-8.439560> now;
-                turn nanolath to x-axis <-41.846154> now;
-                turn biggun to x-axis <-62.236264> now;
                 turn lleg to x-axis <43.950549> now;
                 sleep 100;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.300000] now;
@@ -171 +162 @@
                 turn ruparm to x-axis <3.159341> now;
                 turn luparm to x-axis <-3.164835> now;
-                turn biggun to x-axis <-62.593407> now;
                 turn lleg to x-axis <54.500000> now;
                 sleep 90;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [0.000000] now;
@@ -184 +174 @@
                 turn ruparm to x-axis <-3.164835> now;
                 turn luparm to x-axis <3.868132> now;
-                turn nanolath to x-axis <-41.846154> now;
-                turn biggun to x-axis <-62.593407> now;
                 turn rleg to x-axis <8.082418> now;
                 turn lleg to x-axis <60.483516> now;
                 sleep 80;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.200000] now;
@@ -199 +187 @@
                 turn ruparm to x-axis <-6.675824> now;
                 turn luparm to x-axis <8.791209> now;
-                turn biggun to x-axis <-62.593407> now;
                 turn rleg to x-axis <26.021978> now;
                 turn lleg to x-axis <56.263736> now;
                 sleep 80;
         }
-        if( bMoving )
+        if( !action && isMoving )
         {
                 move pelvis to y-axis [-0.300000] now;
@@ -222 +209 @@
         turn ruparm to x-axis <-8.785714> now;
         turn luparm to x-axis <10.197802> now;
-        turn biggun to x-axis <-62.593407> now;
         turn lleg to x-axis <25.670330> now;
         sleep 80;
 }
 
-walklegs()
-{
-        if( bMoving )
+WalkNoArms()
+{
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.700000] now;
@@ -240 +226 @@
                 sleep 40;
         }
-        if( bMoving )
-        {
-                sleep 40;
-        }
-        if( bMoving )
+        if( action && isMoving )
+        {
+                sleep 40;
+        }
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.550000] now;
@@ -254 +240 @@
                 sleep 100;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.300000] now;
@@ -264 +250 @@
                 sleep 90;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [0.000000] now;
@@ -274 +260 @@
                 sleep 90;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.200000] now;
@@ -284 +270 @@
                 sleep 80;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.300000] now;
@@ -292 +278 @@
                 sleep 70;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.400000] now;
@@ -302 +288 @@
                 sleep 80;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.700000] now;
@@ -312 +298 @@
                 sleep 40;
         }
-        if( bMoving )
-        {
-                sleep 40;
-        }
-        if( bMoving )
+        if( action && isMoving )
+        {
+                sleep 40;
+        }
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.550000] now;
@@ -325 +311 @@
                 sleep 100;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.300000] now;
@@ -334 +320 @@
                 sleep 90;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [0.000000] now;
@@ -344 +330 @@
                 sleep 80;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.200000] now;
@@ -354 +340 @@
                 sleep 80;
         }
-        if( bMoving )
+        if( action && isMoving )
         {
                 move pelvis to y-axis [-0.300000] now;
@@ -370 +356 @@
 }
 
-MotionControl(moving, aiming, justmoved)
-{
-        justmoved = TRUE;
-        while( TRUE )
-        {
-                moving = bMoving;
-                aiming = bAiming;
-                if( moving )
-                {
-                        if( aiming )
-                        {
-                                Static_Var_3 = 1;
-                                call-script walklegs();
-                        }
-                        if( !aiming )
-                        {
-                                Static_Var_3 = 0;
-                                call-script walk();
-                        }
-                        justmoved = TRUE;
-                }
-                if( !moving )
-                {
-                        Static_Var_3 = 1;
-                        if( justmoved )
-                        {
-                                move pelvis to y-axis [0.000000] speed [1.000000];
-                                turn rthigh to x-axis <0.000000> speed <200.043956>;
-                                turn rleg to x-axis <0.000000> speed <200.043956>;
-                                turn lthigh to x-axis <0.000000> speed <200.043956>;
-                                turn lleg to x-axis <0.000000> speed <200.043956>;
-                                if( !aiming )
-                                {
-                                        turn torso to x-axis <0.000000> speed <90.021978>;
-                                }
-                                justmoved = FALSE;
-                        }
+RestoreLegs() {
+        move pelvis to y-axis [0.000000] speed [1.000000];
+        turn rthigh to x-axis <0.000000> speed <200.043956>;
+        turn rleg to x-axis <0.000000> speed <200.043956>;
+        turn lthigh to x-axis <0.000000> speed <200.043956>;
+        turn lleg to x-axis <0.000000> speed <200.043956>;
+}
+
+MotionControl()
+{
+        while( 1 ) {
+                if (isMoving) {
+                        if (action) call-script WalkNoArms();
+                        else call-script WalkArms();
+                } else {
+                        call-script RestoreLegs();
                         sleep 100;
                 }
@@ -418 +383 @@
         hide lfirept;
         hide nanospray;
-        bMoving = FALSE;
-        bAiming = FALSE;
-        Static_Var_3 = 1;
-        Static_Var_4 = 0;
+        action = 0;
+        isMoving = 0;
         start-script MotionControl();
         start-script AmphSpeed();
-        //sleep 2000;
-        //emit-sfx 1024 from ground;
-}
-
-StartMoving()
-{
-        bMoving = TRUE;
-}
-
-StopMoving()
-{
-        bMoving = FALSE;
-}
-
-SweetSpot(piecenum)
+}
+
+StartMoving() {
+        turn nanolath to x-axis <-40> speed ARM_SPEED_PITCH;
+        turn biggun to x-axis <-62.5> speed ARM_SPEED_PITCH;
+        isMoving = 1;
+}
+
+StopMoving() {
+        isMoving = 0;
+}
+
+AimFromWeapon1(piecenum)
 {
         piecenum = torso;
 }
 
-QueryNanoPiece(piecenum)
-{
-        piecenum = nanospray;
-}
-
-RestorePosition()
-{
-        Static_Var_4 = 0;
-        turn torso to y-axis <0.000000> speed <90.000000>;
-        turn ruparm to x-axis <0.000000> speed <45.000000>;
-        turn luparm to x-axis <0.000000> speed <45.000000>;
+QueryWeapon1(piecenum)
+{
+        piecenum = lfirept;
+}
+
+RestoreLaser(){
+        sleep RESTORE_DELAY_LASER;
+        turn luparm to x-axis 0 speed ARM_SPEED_PITCH;
+        if (!action) turn torso to y-axis 0 speed TORSO_SPEED_YAW;
+        wait-for-turn luparm around x-axis;
+        wait-for-turn torso around y-axis;
+        action = action & (~ACT_LASER);
+}
+
+AimWeapon1(heading, pitch)
+{
+        signal SIG_LASER;
+        set-signal-mask SIG_LASER;
+        action = action | ACT_LASER;
+        if (!(action & ACT_DGUN)) {
+                turn torso to y-axis heading speed TORSO_SPEED_YAW;
+        }
+        turn luparm to x-axis <0.000000> - pitch - <30> speed ARM_SPEED_PITCH;
+        wait-for-turn luparm around x-axis;
+        start-script RestoreLaser();
+        return (1);
+}
+
+AimFromWeapon3(piecenum)
+{
+        piecenum = torso;
+}
+
+QueryWeapon3(piecenum)
+{
+        piecenum = rbigflash;
+}
+
+RestoreDgun(){
+        sleep RESTORE_DELAY_DGUN;
+        turn ruparm to x-axis 0 speed ARM_SPEED_PITCH;
+        if (!action) turn torso to y-axis 0 speed TORSO_SPEED_YAW;
+        wait-for-turn ruparm around x-axis;
+        wait-for-turn torso around y-axis;
+        action = action & (~ACT_DGUN);
+}
+
+AimWeapon3(heading, pitch)
+{
+        signal SIG_DGUN;
+        set-signal-mask SIG_DGUN;
+        action = action | ACT_DGUN;
+        turn torso to y-axis heading speed TORSO_SPEED_YAW;
+        turn ruparm to x-axis <0.000000> - pitch - <30> speed ARM_SPEED_PITCH;
         wait-for-turn torso around y-axis;
         wait-for-turn ruparm around x-axis;
-        wait-for-turn luparm around x-axis;
-        bAiming = FALSE;
-}
-
-AimFromPrimary(piecenum)
+        start-script RestoreDgun();
+        return (1);
+}
+
+FireWeapon3() {
+        show rbigflash;
+        hide rbigflash;
+}
+
+StopBuilding(){
+        set INBUILDSTANCE to 0;
+        if (!(action & ACT_LASER)) turn luparm to x-axis 0 speed ARM_SPEED_PITCH;
+        if (!action) turn torso to y-axis 0 speed TORSO_SPEED_YAW;
+}
+
+StartBuilding(heading, pitch) {
+        if (!(action & ACT_LASER)) {
+                turn luparm to x-axis <0.000000> - pitch - <30> speed ARM_SPEED_PITCH;
+                if (!(action & ACT_DGUN)) turn torso to y-axis heading speed TORSO_SPEED_YAW;
+        }
+        set INBUILDSTANCE to 1;
+}
+
+QueryNanoPiece(piecenum)
+{
+        piecenum = nanospray;
+}
+
+SweetSpot(piecenum)
 {
         piecenum = torso;
 }
-
-QueryPrimary(piecenum)
-{
-        piecenum = lfirept;
-}
-
-AimPrimary(heading, pitch)
-{
-        if( Static_Var_4 == 1 )
-        {
-                return (0);
-        }
-        signal SIG_AIM;
-        set-signal-mask SIG_AIM;
-        bAiming = TRUE;
-        while( !Static_Var_3 )
-        {
-                sleep 100;
-        }
-        turn torso to y-axis heading speed <300.000000>;
-        turn luparm to x-axis <0.000000> - pitch - <30> speed <180>;
-        wait-for-turn torso around y-axis;
-        wait-for-turn luparm around x-axis;
-        return (1);
-}
-
-FirePrimary()
-{
-}
-
-AimFromTertiary(piecenum)
-{
-        piecenum = torso;
-}
-
-QueryTertiary(piecenum)
-{
-        piecenum = rbigflash;
-}
-
-AimTertiary(heading, pitch)
-{
-        signal SIG_AIM;
-        set-signal-mask SIG_AIM;
-        Static_Var_4 = 1;
-        bAiming = TRUE;
-        while( !Static_Var_3 )
-        {
-                sleep 100;
-        }
-        turn torso to y-axis heading speed <300.000000>;
-        turn ruparm to x-axis <0.000000> - pitch - <30> speed <250>;
-        wait-for-turn torso around y-axis;
-        wait-for-turn ruparm around x-axis;
-        return (1);
-}
-
-FireTertiary()
-{
-        show rbigflash;
-        sleep 100;
-        hide rbigflash;
-}
-
-StartBuilding(Func_Var_1, Func_Var_2)
-{
-        bAiming = TRUE;
-        while( !Static_Var_3 )
-        {
-                sleep 100;
-        }
-        turn torso to y-axis Func_Var_1 speed <300.071429>;
-        turn luparm to x-axis <0.000000> - Func_Var_2 - <30> speed <45.010989>;
-        wait-for-turn torso around y-axis;
-        wait-for-turn luparm around x-axis;
-        set INBUILDSTANCE to 1;
-}
-
-TargetCleared(Func_Var_1)
-{
-        signal SIG_AIM;
-        set-signal-mask SIG_AIM;
-        call-script RestorePosition();
-}
-
-StopBuilding()
-{
-        set INBUILDSTANCE to 0;
-        signal SIG_AIM;
-        set-signal-mask SIG_AIM;
-        call-script RestorePosition();
-}