diff --git a/bitmaps/loadpictures/loadscreen2.jpg b/bitmaps/loadpictures/loadscreen2.jpg index c4ab0383..ef13f48f 100644 Binary files a/bitmaps/loadpictures/loadscreen2.jpg and b/bitmaps/loadpictures/loadscreen2.jpg differ diff --git a/changelog.nfo b/changelog.nfo index 1b5a06c2..924dad4c 100644 --- a/changelog.nfo +++ b/changelog.nfo @@ -1,3 +1,11 @@ +2023/11/05 ------------------ NOTES v2.33 ---------------------- + +--- Balance / Mechanics + +- Commanders moving in and out of deep water get a consistent 1 second aiming restriction when changing weapons +(a visual effect was also added for the transition) + + 2023/11/02 ------------------ NOTES v2.32 ---------------------- --- New commander morph forms diff --git a/gamedata/explosions/nanosequence.tdf b/gamedata/explosions/nanosequence.tdf index bda7b10d..d4e5080e 100644 --- a/gamedata/explosions/nanosequence.tdf +++ b/gamedata/explosions/nanosequence.tdf @@ -506,6 +506,40 @@ } } + + +[WEAPONCHANGE] +{ + [nanoparticles] + { + class=CExpGenSpawner; + [properties] + { + pos=-8 r16,0,-8 r6; + explosionGenerator=custom:DRONEBUILDNANO; + } + air=1; + water=1; + ground=1; + underwater=1; + count=1; + } + [glow1] + { + class=CExpGenSpawner; + [properties] + { + pos=0,0,0; + explosionGenerator=custom:BUILDGLOW; + } + air=1; + water=1; + ground=1; + underwater=1; + count=1; + } +} + [AUTOBUILD] { [nanoparticles] diff --git a/gamedata/sidedata.tdf b/gamedata/sidedata.tdf index 9291d1b0..a11288f1 100644 --- a/gamedata/sidedata.tdf +++ b/gamedata/sidedata.tdf @@ -882,6 +882,45 @@ canbuild35=aven_nano_tower; canbuild36=aven_long_range_rocket_platform; } + [aven_u7commander] + { + canbuild1=aven_metal_extractor; + canbuild2=aven_solar_collector; + canbuild3=aven_bio_dome; + canbuild4=aven_wind_generator; + canbuild5=aven_energy_storage; + canbuild6=aven_metal_storage; + canbuild7=aven_power_node; + canbuild8=aven_scout_pad; + canbuild9=aven_light_plant; + canbuild10=aven_aircraft_plant; + canbuild11=aven_shipyard; + canbuild12=aven_light_laser_tower; + canbuild13=aven_pelter; + canbuild14=aven_radar_tower; + canbuild15=aven_adv_kbot_lab; + canbuild16=aven_geothermal_powerplant; + canbuild17=aven_sentinel; + canbuild18=aven_stasis; + canbuild19=aven_defender; + canbuild20=aven_dragons_teeth; + canbuild21=aven_fortification_wall; + canbuild22=aven_large_fortification_wall; + canbuild23=aven_fortification_gate; + canbuild24=aven_gunner; + canbuild25=aven_comsat_station; + canbuild26=aven_sonar_station; + canbuild27=aven_tidal_generator; + canbuild28=aven_torpedo_launcher; + canbuild29=aven_hovercraft_platform; + canbuild30=aven_adv_vehicle_plant; + canbuild31=aven_adv_aircraft_plant; + canbuild32=aven_adv_shipyard; + canbuild33=aven_commander_respawner; + canbuild34=aven_upgrade_center; + canbuild35=aven_nano_tower; + canbuild36=aven_long_range_rocket_platform; + } [aven_construction_ship] { canbuild1=aven_metal_extractor; diff --git a/scripts/aven_commander.bos b/scripts/aven_commander.bos index d85f1687..79dd78ef 100644 --- a/scripts/aven_commander.bos +++ b/scripts/aven_commander.bos @@ -157,7 +157,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -179,39 +179,65 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide emg stuff hide lemg; - - //TODO show weapon morph stuff - sleep 10; + + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lemg; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to y-axis [0.000000] now; show torpgun; show torpedo; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } - - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide torpedo; hide torpgun; move torpedo to y-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } //show emg stuff show lemg; + + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lemg; + i=i+1; + sleep 100; + } - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; } } @@ -608,6 +634,11 @@ QueryTertiary(piecenum) AimTertiary(heading, pitch) { bAiming = TRUE; + if( bBuilding || !canAim1) + { + sleep 100; + return (0); + } // if it's not going to be able to fire on the next ~2s, don't try to aim if ((get WEAPON_RELOADSTATE(3)) > (get GAME_FRAME) + 40)) { return(0); } diff --git a/scripts/aven_commander.cob b/scripts/aven_commander.cob index 5d2307aa..19ca2f92 100644 Binary files a/scripts/aven_commander.cob and b/scripts/aven_commander.cob differ diff --git a/scripts/aven_u1commander.bos b/scripts/aven_u1commander.bos index 4b6d2fdb..66513f80 100644 --- a/scripts/aven_u1commander.bos +++ b/scripts/aven_u1commander.bos @@ -159,7 +159,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -181,41 +181,69 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; + //hide emg stuff hide lemg; hide lc2; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lemg; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to y-axis [0.000000] now; show torpgun; show torpedo; - - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide torpedo; hide torpgun; move torpedo to y-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } //show emg stuff show lemg; show lc2; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lemg; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } @@ -613,7 +641,11 @@ QueryTertiary(piecenum) AimTertiary(heading, pitch) { bAiming = TRUE; - + if( bBuilding || !canAim1) + { + sleep 100; + return (0); + } // if it's not going to be able to fire on the next ~2s, don't try to aim if ((get WEAPON_RELOADSTATE(3)) > (get GAME_FRAME) + 40)) { return(0); } diff --git a/scripts/aven_u1commander.cob b/scripts/aven_u1commander.cob index bd859392..480bbb20 100644 Binary files a/scripts/aven_u1commander.cob and b/scripts/aven_u1commander.cob differ diff --git a/scripts/aven_u2commander.bos b/scripts/aven_u2commander.bos index 03616238..3df9006f 100644 --- a/scripts/aven_u2commander.bos +++ b/scripts/aven_u2commander.bos @@ -158,7 +158,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -180,41 +180,71 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; + //hide emg stuff hide launcher; hide launcher2; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from launcher; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to y-axis [0.000000] now; show torpgun; show torpedo; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide torpedo; hide torpgun; move torpedo to y-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } //show emg stuff show launcher; show launcher2; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from launcher; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; + } } @@ -638,7 +668,12 @@ QueryTertiary(piecenum) AimTertiary(heading, pitch) { bAiming = TRUE; - + if( bBuilding || !canAim1) + { + sleep 100; + return (0); + } + // if it's not going to be able to fire on the next ~2s, don't try to aim if ((get WEAPON_RELOADSTATE(3)) > (get GAME_FRAME) + 40)) { return(0); } diff --git a/scripts/aven_u2commander.cob b/scripts/aven_u2commander.cob index e29b26bd..f9172761 100644 Binary files a/scripts/aven_u2commander.cob and b/scripts/aven_u2commander.cob differ diff --git a/scripts/aven_u3commander.bos b/scripts/aven_u3commander.bos index 3edcaebe..4a0a61bc 100644 --- a/scripts/aven_u3commander.bos +++ b/scripts/aven_u3commander.bos @@ -160,7 +160,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -182,12 +182,22 @@ checkUnderwater() { if(bUnderwater) { - //hide emg stuff + canAim1 = FALSE; + + // hide land weapon stuff hide lgun; hide rgun; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lgun; + emit-sfx 1024+8 from rgun; + i=i+1; + sleep 100; + } + //show torpedo stuff move ltorpedo to y-axis [0.000000] now; @@ -198,12 +208,22 @@ checkUnderwater() show rtorpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide ltorpedo; hide ltorpgun; @@ -212,17 +232,31 @@ checkUnderwater() hide rtorpgun; move rtorpedo to y-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } //show emg stuff show lgun; show rgun; + + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lgun; + emit-sfx 1024+8 from rgun; + i=i+1; + sleep 100; + } - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/aven_u3commander.cob b/scripts/aven_u3commander.cob index 7e3ebe85..fb4de75d 100644 Binary files a/scripts/aven_u3commander.cob and b/scripts/aven_u3commander.cob differ diff --git a/scripts/aven_u4commander.bos b/scripts/aven_u4commander.bos index 5f4adc44..a7ed078d 100644 --- a/scripts/aven_u4commander.bos +++ b/scripts/aven_u4commander.bos @@ -157,7 +157,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -179,39 +179,71 @@ checkUnderwater() { if(bUnderwater) { - //hide emg stuff + canAim1 = FALSE; + + //hide land weapon stuff hide lemg; + hide las1; + hide las2; - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+6 from lemg; + i=i+1; + sleep 100; + } + //show torpedo stuff move torpedo to y-axis [0.000000] now; show torpgun; show torpedo; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+6 from torpgun; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide torpedo; hide torpgun; move torpedo to y-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+6 from torpgun; + i=i+1; + sleep 100; + } //show emg stuff show lemg; + show las1; + show las2; + + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+6 from lemg; + i=i+1; + sleep 100; + } - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/aven_u4commander.cob b/scripts/aven_u4commander.cob index 25e67c52..7f4f7a78 100644 Binary files a/scripts/aven_u4commander.cob and b/scripts/aven_u4commander.cob differ diff --git a/scripts/aven_u5commander.bos b/scripts/aven_u5commander.bos index 8432eca7..3875c1e7 100644 --- a/scripts/aven_u5commander.bos +++ b/scripts/aven_u5commander.bos @@ -175,7 +175,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -197,39 +197,70 @@ checkUnderwater() { if(bUnderwater) { - //hide emg stuff + canAim1 = FALSE; + + //hide land weapon stuff hide lemg; - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lemg; + i=i+1; + sleep 100; + } + //show torpedo stuff move torpedo to y-axis [0.000000] now; show torpgun; show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } + + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide torpedo; hide torpgun; move torpedo to y-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } //show emg stuff show lemg; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lemg; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } @@ -813,6 +844,11 @@ QueryTertiary(piecenum) AimTertiary(heading, pitch) { bAiming = TRUE; + if( bBuilding || !canAim1) + { + sleep 100; + return (0); + } call-script updateAimHelper1(heading,pitch + <90.000000>,<500>,<400>,HEADING_TOLERANCE,PITCH_TOLERANCE); signal SIG_AIM; diff --git a/scripts/aven_u5commander.cob b/scripts/aven_u5commander.cob index be47dd3f..0f1f8b75 100644 Binary files a/scripts/aven_u5commander.cob and b/scripts/aven_u5commander.cob differ diff --git a/scripts/aven_u6commander.bos b/scripts/aven_u6commander.bos index 0d9b0b29..8f0e3d4f 100644 --- a/scripts/aven_u6commander.bos +++ b/scripts/aven_u6commander.bos @@ -158,7 +158,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -180,13 +180,21 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; + //hide laser stuff hide rgun; hide rg2; hide rg3; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from rgun; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to y-axis [0.000000] now; @@ -194,29 +202,50 @@ checkUnderwater() show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from torpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide torpgun; move torpedo to y-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from torpgun; + i=i+1; + sleep 100; + } //show laser stuff show rgun; show rg2; show rg3; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from rgun; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/aven_u6commander.cob b/scripts/aven_u6commander.cob index 1ea2deda..e0b7ba15 100644 Binary files a/scripts/aven_u6commander.cob and b/scripts/aven_u6commander.cob differ diff --git a/scripts/aven_u7commander.bos b/scripts/aven_u7commander.bos index 76cac320..801c33b0 100644 --- a/scripts/aven_u7commander.bos +++ b/scripts/aven_u7commander.bos @@ -146,7 +146,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState,i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -168,14 +168,22 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide weapon stuff hide lgun; hide lbar; hide rgun; hide rbar; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lgun; + emit-sfx 1024+8 from rgun; + i=i+1; + sleep 100; + } //show torpedo stuff move ltorpedo to y-axis [0.000000] now; @@ -184,14 +192,22 @@ checkUnderwater() move rtorpedo to y-axis [0.000000] now; show rtorpgun; show rtorpedo; - - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide ltorpedo; hide ltorpgun; @@ -200,9 +216,15 @@ checkUnderwater() hide rtorpgun; move rtorpedo to y-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } //show weapon stuff show lgun; @@ -210,10 +232,17 @@ checkUnderwater() show rgun; show rbar; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lgun; + emit-sfx 1024+8 from rgun; + i=i+1; + sleep 100; + } - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/aven_u7commander.cob b/scripts/aven_u7commander.cob index 752f2937..ab4d401c 100644 Binary files a/scripts/aven_u7commander.cob and b/scripts/aven_u7commander.cob differ diff --git a/scripts/claw_commander.bos b/scripts/claw_commander.bos index e1e0bcd5..f9a3f889 100644 --- a/scripts/claw_commander.bos +++ b/scripts/claw_commander.bos @@ -150,7 +150,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -172,43 +172,73 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide laser stuff hide lg1; hide lg2; hide rg1; hide rg2; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lg1; + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } //show torpedo stuff show ltorpgun; show rtorpgun; - - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide ltorpgun; hide rtorpgun; - - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + //show laser stuff show lg1; show lg2; show rg1; show rg2; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lg1; + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/claw_commander.cob b/scripts/claw_commander.cob index 458f0557..c619b262 100644 Binary files a/scripts/claw_commander.cob and b/scripts/claw_commander.cob differ diff --git a/scripts/claw_u1commander.bos b/scripts/claw_u1commander.bos index d30c3b3e..719ff6da 100644 --- a/scripts/claw_u1commander.bos +++ b/scripts/claw_u1commander.bos @@ -150,7 +150,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -172,43 +172,73 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide laser stuff hide lg1; hide lg2; hide rg1; hide rg2; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lg1; + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } //show torpedo stuff show ltorpgun; show rtorpgun; - - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide ltorpgun; hide rtorpgun; - - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + //show laser stuff show lg1; show lg2; show rg1; show rg2; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lg1; + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/claw_u1commander.cob b/scripts/claw_u1commander.cob index 4a56897b..13b74d80 100644 Binary files a/scripts/claw_u1commander.cob and b/scripts/claw_u1commander.cob differ diff --git a/scripts/claw_u2commander.bos b/scripts/claw_u2commander.bos index 36e9b07a..28e2673f 100644 --- a/scripts/claw_u2commander.bos +++ b/scripts/claw_u2commander.bos @@ -150,7 +150,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -172,39 +172,68 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide laser stuff hide lmispad; hide rmispad; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lmispad; + emit-sfx 1024+8 from rmispad; + i=i+1; + sleep 100; + } //show torpedo stuff show ltorpgun; show rtorpgun; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide ltorpgun; hide rtorpgun; - - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + //show laser stuff show lmispad; show rmispad; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lmispad; + emit-sfx 1024+8 from rmispad; + i=i+1; + sleep 100; + } canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/claw_u2commander.cob b/scripts/claw_u2commander.cob index ef9309c1..137f8f72 100644 Binary files a/scripts/claw_u2commander.cob and b/scripts/claw_u2commander.cob differ diff --git a/scripts/claw_u3commander.bos b/scripts/claw_u3commander.bos index a3ecf6b1..6d6c576c 100644 --- a/scripts/claw_u3commander.bos +++ b/scripts/claw_u3commander.bos @@ -151,7 +151,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -173,35 +173,59 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide laser stuff hide rg1; - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } //show torpedo stuff show rtorpgun; - - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide rtorpgun; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } //show laser stuff show rg1; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/claw_u3commander.cob b/scripts/claw_u3commander.cob index 49d3c208..8c8675ec 100644 Binary files a/scripts/claw_u3commander.cob and b/scripts/claw_u3commander.cob differ diff --git a/scripts/claw_u4commander.bos b/scripts/claw_u4commander.bos index 9a8b26af..53cb80b1 100644 --- a/scripts/claw_u4commander.bos +++ b/scripts/claw_u4commander.bos @@ -151,7 +151,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -173,43 +173,72 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide laser stuff hide lg1; hide lg2; hide rg1; hide rg2; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lg1; + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } //show torpedo stuff show ltorpgun; show rtorpgun; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide ltorpgun; hide rtorpgun; - - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + //show laser stuff show lg1; show lg2; show rg1; show rg2; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lg1; + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/claw_u4commander.cob b/scripts/claw_u4commander.cob index 77a1fba6..1ae64fe8 100644 Binary files a/scripts/claw_u4commander.cob and b/scripts/claw_u4commander.cob differ diff --git a/scripts/claw_u5commander.bos b/scripts/claw_u5commander.bos index 77eeb022..ac66c547 100644 --- a/scripts/claw_u5commander.bos +++ b/scripts/claw_u5commander.bos @@ -148,7 +148,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -170,6 +170,8 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; + //hide minigun stuff hide rg1; hide barrelbase; @@ -179,26 +181,44 @@ checkUnderwater() hide barrel4; hide bcover; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } //show torpedo stuff show rtorpgun; - - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide rtorpgun; - - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + //show minigun stuff show rg1; show barrelbase; @@ -208,9 +228,15 @@ checkUnderwater() show barrel4; show bcover; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/claw_u5commander.cob b/scripts/claw_u5commander.cob index bc11c871..d1dfeba0 100644 Binary files a/scripts/claw_u5commander.cob and b/scripts/claw_u5commander.cob differ diff --git a/scripts/claw_u6commander.bos b/scripts/claw_u6commander.bos index 832088dd..57b2e32e 100644 --- a/scripts/claw_u6commander.bos +++ b/scripts/claw_u6commander.bos @@ -151,7 +151,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -173,38 +173,69 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide laser stuff hide lg1; hide rg1; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lg1; + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } //show torpedo stuff show ltorpgun; show rtorpgun; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from ltorpgun; + emit-sfx 1024+7 from rtorpgun; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide ltorpgun; hide rtorpgun; - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from ltorpgun; + emit-sfx 1024+7 from rtorpgun; + i=i+1; + sleep 100; + } + //show laser stuff show lg1; show rg1; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from lg1; + emit-sfx 1024+7 from rg1; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/claw_u6commander.cob b/scripts/claw_u6commander.cob index e5cc5a56..b40e0f12 100644 Binary files a/scripts/claw_u6commander.cob and b/scripts/claw_u6commander.cob differ diff --git a/scripts/claw_u7commander.bos b/scripts/claw_u7commander.bos index a495db5e..7bd254e1 100644 --- a/scripts/claw_u7commander.bos +++ b/scripts/claw_u7commander.bos @@ -156,7 +156,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -178,6 +178,7 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide weapon stuff hide rg1; hide barrelbase; @@ -186,26 +187,44 @@ checkUnderwater() hide right; hide top; - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } + //show torpedo stuff show rtorpgun; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide rtorpgun; - - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + //show minigun stuff show rg1; show barrelbase; @@ -214,10 +233,16 @@ checkUnderwater() show right; show top; - - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rg1; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/claw_u7commander.cob b/scripts/claw_u7commander.cob index c790ed1d..2562b0ae 100644 Binary files a/scripts/claw_u7commander.cob and b/scripts/claw_u7commander.cob differ diff --git a/scripts/gear_commander.bos b/scripts/gear_commander.bos index da6b7e3a..14affed4 100644 --- a/scripts/gear_commander.bos +++ b/scripts/gear_commander.bos @@ -161,7 +161,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -183,39 +183,67 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; + //hide laser stuff - hide laser; - - //TODO show weapon morph stuff - sleep 10; + hide laser; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from laser; + i=i+1; + sleep 100; + } + //show torpedo stuff move torpedo to z-axis [0.000000] now; show torpgun; show torpedo; - - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide torpedo; hide torpgun; move torpedo to z-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } //show laser stuff show laser; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from laser; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } @@ -598,6 +626,11 @@ QueryTertiary(piecenum) AimTertiary(heading, pitch) { + if( bBuilding || !canAim1) + { + return (0); + } + // if it's not going to be able to fire on the next ~2s, don't try to aim if ((get WEAPON_RELOADSTATE(3)) > (get GAME_FRAME) + 40)) { return(0); } diff --git a/scripts/gear_commander.cob b/scripts/gear_commander.cob index f2778fc0..d16c7069 100644 Binary files a/scripts/gear_commander.cob and b/scripts/gear_commander.cob differ diff --git a/scripts/gear_u1commander.bos b/scripts/gear_u1commander.bos index db0cf6c7..52a88a6a 100644 --- a/scripts/gear_u1commander.bos +++ b/scripts/gear_u1commander.bos @@ -128,7 +128,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -150,13 +150,21 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide flamer stuff hide lflamer; hide rflamer; - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lflamer; + emit-sfx 1024+8 from rflamer; + i=i+1; + sleep 100; + } + //show torpedo stuff move ltorpedo to z-axis [0.000000] now; show ltorpgun; @@ -164,14 +172,23 @@ checkUnderwater() move rtorpedo to z-axis [0.000000] now; show rtorpgun; show rtorpedo; - - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide ltorpedo; hide ltorpgun; @@ -180,17 +197,31 @@ checkUnderwater() hide rtorpgun; move rtorpedo to z-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltorpgun; + emit-sfx 1024+8 from rtorpgun; + i=i+1; + sleep 100; + } //show flamer stuff show lflamer; show rflamer; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lflamer; + emit-sfx 1024+8 from rflamer; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } @@ -622,8 +653,12 @@ QueryTertiary(piecenum) AimTertiary(heading, pitch) { + if( bBuilding || !canAim1) + { + return (0); + } + bAiming = TRUE; - //bDgunning = TRUE; return (1); } diff --git a/scripts/gear_u1commander.cob b/scripts/gear_u1commander.cob index a4f4c84a..7e279416 100644 Binary files a/scripts/gear_u1commander.cob and b/scripts/gear_u1commander.cob differ diff --git a/scripts/gear_u2commander.bos b/scripts/gear_u2commander.bos index ace40eb4..a2faac52 100644 --- a/scripts/gear_u2commander.bos +++ b/scripts/gear_u2commander.bos @@ -161,7 +161,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -183,40 +183,70 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; + //hide gun stuff hide lbarrel; hide rbarrel; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from lbarrel; + emit-sfx 1024+7 from rbarrel; + i=i+1; + sleep 100; + } //show torpedo stuff show ltbarrel; show rtbarrel; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from ltbarrel; + emit-sfx 1024+7 from rtbarrel; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide ltbarrel; hide rtbarrel; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from ltbarrel; + emit-sfx 1024+7 from rtbarrel; + i=i+1; + sleep 100; + } //show gun stuff show lbarrel; show rbarrel; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from lbarrel; + emit-sfx 1024+7 from rbarrel; + i=i+1; + sleep 100; + } canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/gear_u2commander.cob b/scripts/gear_u2commander.cob index e3e048ac..e2b1feff 100644 Binary files a/scripts/gear_u2commander.cob and b/scripts/gear_u2commander.cob differ diff --git a/scripts/gear_u3commander.bos b/scripts/gear_u3commander.bos index b48b147d..5d7e6f8b 100644 --- a/scripts/gear_u3commander.bos +++ b/scripts/gear_u3commander.bos @@ -127,7 +127,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -149,43 +149,70 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide laser stuff hide lbarrels; hide lb1; hide lb2; hide lb3; - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lbarrels; + i=i+1; + sleep 100; + } + //show torpedo stuff move torpedo to z-axis [0.000000] now; show torpedo; show torpgun; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; move torpedo to z-axis [0.000000] now; hide torpgun; - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } + //show laser stuff show lbarrels; show lb1; show lb2; show lb3; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lbarrels; + i=i+1; + sleep 100; + } canAim1 = TRUE; - canAim2 = FALSE; } } @@ -590,6 +617,11 @@ QueryTertiary(piecenum) AimTertiary(heading, pitch) { + if( bBuilding || !canAim1) + { + return (0); + } + // if it's not going to be able to fire on the next ~2s, don't try to aim if ((get WEAPON_RELOADSTATE(3)) > (get GAME_FRAME) + 40)) { return(0); } diff --git a/scripts/gear_u3commander.cob b/scripts/gear_u3commander.cob index 4c190ffe..b24471ea 100644 Binary files a/scripts/gear_u3commander.cob and b/scripts/gear_u3commander.cob differ diff --git a/scripts/gear_u4commander.bos b/scripts/gear_u4commander.bos index 2804ea8f..a8d397ff 100644 --- a/scripts/gear_u4commander.bos +++ b/scripts/gear_u4commander.bos @@ -158,7 +158,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -180,11 +180,19 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide laser stuff hide laser; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from laser; + i=i+1; + sleep 100; + } + //show torpedo stuff move torpedo to z-axis [0.000000] now; @@ -192,27 +200,46 @@ checkUnderwater() show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide torpgun; move torpedo to z-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 10; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from torpgun; + i=i+1; + sleep 100; + } + //show laser stuff show laser; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from laser; + i=i+1; + sleep 100; + } canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/gear_u4commander.cob b/scripts/gear_u4commander.cob index 13b53a15..2be3a88b 100644 Binary files a/scripts/gear_u4commander.cob and b/scripts/gear_u4commander.cob differ diff --git a/scripts/gear_u5commander.bos b/scripts/gear_u5commander.bos index cf5230fe..c5596087 100644 --- a/scripts/gear_u5commander.bos +++ b/scripts/gear_u5commander.bos @@ -160,7 +160,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -182,12 +182,20 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide cannon stuff hide lbg3; hide rbg3; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from lbg3; + emit-sfx 1024+7 from rbg3; + i=i+1; + sleep 100; + } //show torpedo stuff move ltorpedo to z-axis [0.000000] now; @@ -197,12 +205,21 @@ checkUnderwater() show rtorpedo; show rtorpgun; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from ltorpgun; + emit-sfx 1024+7 from rtorpgun; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff move ltorpedo to z-axis [0.000000] now; hide ltorpedo; @@ -210,19 +227,32 @@ checkUnderwater() move rtorpedo to z-axis [0.000000] now; hide rtorpedo; hide rtorpgun; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from ltorpgun; + emit-sfx 1024+7 from rtorpgun; + i=i+1; + sleep 100; + } //show cannon stuff show lbg3; show rbg3; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+7 from lbg3; + emit-sfx 1024+7 from rbg3; + i=i+1; + sleep 100; + } - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/gear_u5commander.cob b/scripts/gear_u5commander.cob index ad975d53..e746dba4 100644 Binary files a/scripts/gear_u5commander.cob and b/scripts/gear_u5commander.cob differ diff --git a/scripts/gear_u6commander.bos b/scripts/gear_u6commander.bos index 1084271d..558641b3 100644 --- a/scripts/gear_u6commander.bos +++ b/scripts/gear_u6commander.bos @@ -160,7 +160,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -182,6 +182,7 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide gun stuff hide lbarrel; hide lb2; @@ -194,27 +195,49 @@ checkUnderwater() hide rfront; hide rf2; - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from lbarrel; + emit-sfx 1024+10 from rbarrel; + i=i+1; + sleep 100; + } //show torpedo stuff show ltbarrel; show rtbarrel; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from ltbarrel; + emit-sfx 1024+10 from rtbarrel; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide ltbarrel; hide rtbarrel; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from ltbarrel; + emit-sfx 1024+10 from rtbarrel; + i=i+1; + sleep 100; + } //show gun stuff show lbarrel; @@ -228,9 +251,17 @@ checkUnderwater() show rfront; show rf2; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from lbarrel; + emit-sfx 1024+10 from rbarrel; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } diff --git a/scripts/gear_u6commander.cob b/scripts/gear_u6commander.cob index bf62c5c7..366914ef 100644 Binary files a/scripts/gear_u6commander.cob and b/scripts/gear_u6commander.cob differ diff --git a/scripts/gear_u7commander.bos b/scripts/gear_u7commander.bos index 711ec45f..b4a7504a 100644 --- a/scripts/gear_u7commander.bos +++ b/scripts/gear_u7commander.bos @@ -163,7 +163,7 @@ Build() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -185,40 +185,71 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; + //hide gun stuff hide lbarrel; hide rbarrel; - - //TODO show weapon morph stuff - sleep 10; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from lbarrel; + emit-sfx 1024+10 from rbarrel; + i=i+1; + sleep 100; + } //show torpedo stuff show ltbarrel; show rtbarrel; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltbarrel; + emit-sfx 1024+8 from rtbarrel; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide ltbarrel; hide rtbarrel; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from ltbarrel; + emit-sfx 1024+8 from rtbarrel; + i=i+1; + sleep 100; + } - //TODO show weapon morph stuff - sleep 10; //show gun stuff show lbarrel; show rbarrel; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from lbarrel; + emit-sfx 1024+8 from rbarrel; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; } } @@ -686,10 +717,11 @@ QueryTertiary(piecenum) AimTertiary(heading, pitch) { - if( bDgunning || bBuilding) + if( bDgunning || bBuilding || !canAim1) { return (0); } + call-script updateAimHelper2(heading,pitch,<500>,<500>,HEADING_TOLERANCE,PITCH_TOLERANCE); signal SIG_AIM2; set-signal-mask SIG_AIM2; @@ -743,10 +775,11 @@ FireWeapon4() AimWeapon4(heading, pitch) { - if( bBuilding) + if( bBuilding || !canAim1) { return (0); } + return (1); } diff --git a/scripts/gear_u7commander.cob b/scripts/gear_u7commander.cob index 9c2d5bdf..fd3e6623 100644 Binary files a/scripts/gear_u7commander.cob and b/scripts/gear_u7commander.cob differ diff --git a/scripts/sphere_commander.bos b/scripts/sphere_commander.bos index 87903b67..ce3442d0 100644 --- a/scripts/sphere_commander.bos +++ b/scripts/sphere_commander.bos @@ -101,7 +101,7 @@ MotionSpeedControl(minSpeed, maxSpeed,currentSpeed) checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -123,11 +123,17 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //no beam stuff to hide - //TODO show weapon morph stuff - sleep 1000; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to z-axis [0.000000] now; @@ -136,12 +142,19 @@ checkUnderwater() show weapon2; show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide weapon2; @@ -149,15 +162,18 @@ checkUnderwater() hide arc22; move torpedo to z-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 10) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //no beam stuff to show - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; - } } @@ -415,7 +431,7 @@ FirePrimary() AimPrimary(heading, pitch, dh, dp) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); @@ -458,7 +474,7 @@ FireSecondary() AimSecondary(heading, pitch) { - if( !bUnderwater || bBuilding) + if( !canAim2 || bBuilding) { sleep 100; return (0); diff --git a/scripts/sphere_commander.cob b/scripts/sphere_commander.cob index c76f28f8..1242ca66 100644 Binary files a/scripts/sphere_commander.cob and b/scripts/sphere_commander.cob differ diff --git a/scripts/sphere_u1commander.bos b/scripts/sphere_u1commander.bos index 0d5edc53..b4f4fb41 100644 --- a/scripts/sphere_u1commander.bos +++ b/scripts/sphere_u1commander.bos @@ -99,7 +99,7 @@ StopMoving() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -121,11 +121,17 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //no beam stuff to hide - //TODO show weapon morph stuff - sleep 1000; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to z-axis [0.000000] now; @@ -134,12 +140,21 @@ checkUnderwater() show weapon2; show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; + //hide torpedo stuff hide torpedo; hide weapon2; @@ -147,15 +162,18 @@ checkUnderwater() hide arc22; move torpedo to z-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 10) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //no beam stuff to show - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; - } } @@ -422,7 +440,7 @@ FirePrimary() AimPrimary(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); @@ -465,7 +483,7 @@ FireSecondary() AimSecondary(heading, pitch) { - if( !bUnderwater || bBuilding) + if( !canAim2 || bBuilding) { sleep 100; return (0); @@ -583,7 +601,7 @@ FireWeapon4() AimWeapon4(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); diff --git a/scripts/sphere_u1commander.cob b/scripts/sphere_u1commander.cob index 91783de3..552dfca5 100644 Binary files a/scripts/sphere_u1commander.cob and b/scripts/sphere_u1commander.cob differ diff --git a/scripts/sphere_u2commander.bos b/scripts/sphere_u2commander.bos index 5c0575de..0b402d8a 100644 --- a/scripts/sphere_u2commander.bos +++ b/scripts/sphere_u2commander.bos @@ -97,7 +97,7 @@ StopMoving() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -119,11 +119,17 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //no beam stuff to hide - //TODO show weapon morph stuff - sleep 1000; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to z-axis [0.000000] now; @@ -132,12 +138,20 @@ checkUnderwater() show weapon2; show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide weapon2; @@ -145,15 +159,18 @@ checkUnderwater() hide arc22; move torpedo to z-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 10) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //no beam stuff to show - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; - } } @@ -400,7 +417,7 @@ FirePrimary() AimPrimary(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); @@ -443,7 +460,7 @@ FireSecondary() AimSecondary(heading, pitch) { - if( !bUnderwater || bBuilding) + if( !canAim2 || bBuilding) { sleep 100; return (0); diff --git a/scripts/sphere_u2commander.cob b/scripts/sphere_u2commander.cob index 7ee5f291..d580671d 100644 Binary files a/scripts/sphere_u2commander.cob and b/scripts/sphere_u2commander.cob differ diff --git a/scripts/sphere_u3commander.bos b/scripts/sphere_u3commander.bos index 60e4330c..40cd3e61 100644 --- a/scripts/sphere_u3commander.bos +++ b/scripts/sphere_u3commander.bos @@ -99,7 +99,7 @@ StopMoving() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -121,11 +121,17 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //no beam stuff to hide - //TODO show weapon morph stuff - sleep 1000; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to z-axis [0.000000] now; @@ -134,12 +140,20 @@ checkUnderwater() show weapon2; show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide weapon2; @@ -147,15 +161,19 @@ checkUnderwater() hide arc22; move torpedo to z-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 10) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //no beam stuff to show sleep 200; canAim1 = TRUE; - canAim2 = FALSE; - } } @@ -400,7 +418,7 @@ FirePrimary() AimPrimary(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); @@ -443,7 +461,7 @@ FireSecondary() AimSecondary(heading, pitch) { - if( !bUnderwater || bBuilding) + if( !canAim2 || bBuilding) { sleep 100; return (0); diff --git a/scripts/sphere_u3commander.cob b/scripts/sphere_u3commander.cob index e05ef1c8..c0c459c8 100644 Binary files a/scripts/sphere_u3commander.cob and b/scripts/sphere_u3commander.cob differ diff --git a/scripts/sphere_u4commander.bos b/scripts/sphere_u4commander.bos index 093e2c4a..f7481055 100644 --- a/scripts/sphere_u4commander.bos +++ b/scripts/sphere_u4commander.bos @@ -97,7 +97,7 @@ StopMoving() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -119,10 +119,17 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //no beam stuff to hide - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //show torpedo stuff @@ -132,12 +139,20 @@ checkUnderwater() show weapon2; show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide weapon2; @@ -145,15 +160,18 @@ checkUnderwater() hide arc22; move torpedo to z-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 10) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //no beam stuff to show - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; - } } @@ -399,7 +417,7 @@ FirePrimary() AimPrimary(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); @@ -442,7 +460,7 @@ FireSecondary() AimSecondary(heading, pitch) { - if( !bUnderwater || bBuilding) + if( !canAim2 || bBuilding) { sleep 100; return (0); diff --git a/scripts/sphere_u4commander.cob b/scripts/sphere_u4commander.cob index ccb78f23..7d21cffc 100644 Binary files a/scripts/sphere_u4commander.cob and b/scripts/sphere_u4commander.cob differ diff --git a/scripts/sphere_u5commander.bos b/scripts/sphere_u5commander.bos index f99d8c47..fa05c869 100644 --- a/scripts/sphere_u5commander.bos +++ b/scripts/sphere_u5commander.bos @@ -98,7 +98,7 @@ StopMoving() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -120,6 +120,8 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; + //hide beam stuff hide front; hide bw2; @@ -128,9 +130,14 @@ checkUnderwater() hide front3; hide front5; - //TODO show weapon morph stuff - sleep 1000; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from front3; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to z-axis [0.000000] now; @@ -139,12 +146,20 @@ checkUnderwater() show weapon2; show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from weapon2; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide weapon2; @@ -152,8 +167,14 @@ checkUnderwater() hide arc22; move torpedo to z-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from weapon2; + i=i+1; + sleep 100; + } //show beam stuff show front; @@ -163,10 +184,16 @@ checkUnderwater() show front3; show front5; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+10 from front3; + i=i+1; + sleep 100; + } + canAim1 = TRUE; - canAim2 = FALSE; - } } @@ -447,7 +474,7 @@ FirePrimary() AimPrimary(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); @@ -489,7 +516,7 @@ FireSecondary() AimSecondary(heading, pitch) { - if( !bUnderwater || bBuilding) + if( !canAim2 || bBuilding) { sleep 100; return (0); @@ -607,7 +634,7 @@ FireWeapon4() AimWeapon4(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); diff --git a/scripts/sphere_u5commander.cob b/scripts/sphere_u5commander.cob index a35d1fb5..4f5e24b2 100644 Binary files a/scripts/sphere_u5commander.cob and b/scripts/sphere_u5commander.cob differ diff --git a/scripts/sphere_u6commander.bos b/scripts/sphere_u6commander.bos index 463ce1b1..5510ebfa 100644 --- a/scripts/sphere_u6commander.bos +++ b/scripts/sphere_u6commander.bos @@ -97,7 +97,7 @@ StopMoving() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -119,6 +119,7 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide beam stuff hide front; hide arc12; @@ -126,9 +127,14 @@ checkUnderwater() hide front3; hide front1; - //TODO show weapon morph stuff - sleep 1000; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from front3; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to z-axis [0.000000] now; @@ -137,12 +143,20 @@ checkUnderwater() show weapon2; show torpedo; - sleep 200; - canAim1 = FALSE; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } + canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide weapon2; @@ -150,8 +164,14 @@ checkUnderwater() hide arc22; move torpedo to z-axis [0.000000] now; - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } //show beam stuff show front; @@ -160,11 +180,16 @@ checkUnderwater() show front3; show front1; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from front3; + i=i+1; + sleep 100; + } - sleep 200; canAim1 = TRUE; - canAim2 = FALSE; - } } @@ -416,7 +441,7 @@ FirePrimary() AimPrimary(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); @@ -458,7 +483,7 @@ FireSecondary() AimSecondary(heading, pitch) { - if( !bUnderwater || bBuilding) + if( !canAim2 || bBuilding) { sleep 100; return (0); diff --git a/scripts/sphere_u6commander.cob b/scripts/sphere_u6commander.cob index bc2a6334..130905a7 100644 Binary files a/scripts/sphere_u6commander.cob and b/scripts/sphere_u6commander.cob differ diff --git a/scripts/sphere_u7commander.bos b/scripts/sphere_u7commander.bos index 95dfc4ca..48142bea 100644 --- a/scripts/sphere_u7commander.bos +++ b/scripts/sphere_u7commander.bos @@ -97,7 +97,7 @@ StopMoving() checkUnderwater() { - var currentHeight, oldState; + var currentHeight, oldState, i; while(TRUE) { currentHeight = GET GROUND_WATER_HEIGHT(GET UNIT_XZ); @@ -119,6 +119,7 @@ checkUnderwater() { if(bUnderwater) { + canAim1 = FALSE; //hide land weapon stuff hide arc1; hide arc12; @@ -129,9 +130,14 @@ checkUnderwater() hide barrel13; hide r2; - //TODO show weapon morph stuff - sleep 1000; - + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rotator; + i=i+1; + sleep 100; + } //show torpedo stuff move torpedo to z-axis [0.000000] now; @@ -139,23 +145,37 @@ checkUnderwater() show arc22; show weapon2; show torpedo; + + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } - sleep 200; - canAim1 = FALSE; canAim2 = TRUE; } if(!bUnderwater) { + canAim2 = FALSE; //hide torpedo stuff hide torpedo; hide weapon2; hide arc2; hide arc22; move torpedo to z-axis [0.000000] now; - - //TODO show weapon morph stuff - sleep 1000; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from weapon2; + i=i+1; + sleep 100; + } + //show land weapon stuff show arc1; show arc12; @@ -166,10 +186,15 @@ checkUnderwater() show barrel13; show r2; - sleep 200; + // effects + i=0; + while(i < 5) + { + emit-sfx 1024+8 from rotator; + i=i+1; + sleep 100; + } canAim1 = TRUE; - canAim2 = FALSE; - } } @@ -459,7 +484,7 @@ FirePrimary() AimPrimary(heading, pitch) { - if( bUnderwater || bBuilding) + if( !canAim1 || bBuilding) { sleep 100; return (0); @@ -503,7 +528,7 @@ FireSecondary() AimSecondary(heading, pitch) { - if( !bUnderwater || bBuilding) + if( !canAim2 || bBuilding) { sleep 100; return (0); diff --git a/scripts/sphere_u7commander.cob b/scripts/sphere_u7commander.cob index 2571bbe7..fab44192 100644 Binary files a/scripts/sphere_u7commander.cob and b/scripts/sphere_u7commander.cob differ diff --git a/units/aven_commander.fbi b/units/aven_commander.fbi index 0c17adae..0f92c4e8 100644 --- a/units/aven_commander.fbi +++ b/units/aven_commander.fbi @@ -172,6 +172,7 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/aven_u1commander.fbi b/units/aven_u1commander.fbi index aadbf650..30bcb1df 100644 --- a/units/aven_u1commander.fbi +++ b/units/aven_u1commander.fbi @@ -166,6 +166,7 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/aven_u2commander.fbi b/units/aven_u2commander.fbi index b53083ec..ef52084d 100644 --- a/units/aven_u2commander.fbi +++ b/units/aven_u2commander.fbi @@ -164,6 +164,7 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/aven_u3commander.fbi b/units/aven_u3commander.fbi index fc6beeb0..75d3ac9a 100644 --- a/units/aven_u3commander.fbi +++ b/units/aven_u3commander.fbi @@ -163,6 +163,7 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/aven_u4commander.fbi b/units/aven_u4commander.fbi index f1174285..e49e02b2 100644 --- a/units/aven_u4commander.fbi +++ b/units/aven_u4commander.fbi @@ -162,6 +162,7 @@ explosionGenerator3=custom:JUMPASC2; explosionGenerator4=custom:JUMPDESC; explosionGenerator5=custom:JUMPDESC2; + explosionGenerator6=custom:WEAPONCHANGE; } } diff --git a/units/aven_u5commander.fbi b/units/aven_u5commander.fbi index 0647111b..bd24b8df 100644 --- a/units/aven_u5commander.fbi +++ b/units/aven_u5commander.fbi @@ -157,6 +157,7 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/aven_u6commander.fbi b/units/aven_u6commander.fbi index b9c6ee61..2dc7ffb7 100644 --- a/units/aven_u6commander.fbi +++ b/units/aven_u6commander.fbi @@ -160,6 +160,7 @@ explosionGenerator4=custom:JUMPASC2; explosionGenerator5=custom:JUMPDESC; explosionGenerator6=custom:JUMPDESC2; + explosionGenerator7=custom:WEAPONCHANGE; } } diff --git a/units/aven_u7commander.fbi b/units/aven_u7commander.fbi index 947174c8..b8919119 100644 --- a/units/aven_u7commander.fbi +++ b/units/aven_u7commander.fbi @@ -144,6 +144,7 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/claw_commander.fbi b/units/claw_commander.fbi index cad0cae1..0c619a7a 100644 --- a/units/claw_commander.fbi +++ b/units/claw_commander.fbi @@ -166,5 +166,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/claw_u1commander.fbi b/units/claw_u1commander.fbi index 142b20fb..08ba1a1a 100644 --- a/units/claw_u1commander.fbi +++ b/units/claw_u1commander.fbi @@ -167,5 +167,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/claw_u2commander.fbi b/units/claw_u2commander.fbi index 56bc2013..9cdf637c 100644 --- a/units/claw_u2commander.fbi +++ b/units/claw_u2commander.fbi @@ -164,5 +164,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/claw_u3commander.fbi b/units/claw_u3commander.fbi index 7ce696ca..65e3cc5e 100644 --- a/units/claw_u3commander.fbi +++ b/units/claw_u3commander.fbi @@ -165,5 +165,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/claw_u4commander.fbi b/units/claw_u4commander.fbi index cf44c342..cc7e74b1 100644 --- a/units/claw_u4commander.fbi +++ b/units/claw_u4commander.fbi @@ -166,5 +166,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/claw_u5commander.fbi b/units/claw_u5commander.fbi index 6f54d172..6db65971 100644 --- a/units/claw_u5commander.fbi +++ b/units/claw_u5commander.fbi @@ -164,5 +164,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/claw_u6commander.fbi b/units/claw_u6commander.fbi index 7c450fd8..2ae28655 100644 --- a/units/claw_u6commander.fbi +++ b/units/claw_u6commander.fbi @@ -166,5 +166,6 @@ explosionGenerator4=custom:JUMPASC2; explosionGenerator5=custom:JUMPDESC; explosionGenerator6=custom:JUMPDESC2; + explosionGenerator7=custom:WEAPONCHANGE; } } diff --git a/units/claw_u7commander.fbi b/units/claw_u7commander.fbi index d1f1c476..f17310da 100644 --- a/units/claw_u7commander.fbi +++ b/units/claw_u7commander.fbi @@ -150,5 +150,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/gear_commander.fbi b/units/gear_commander.fbi index a175a07a..8c0cbe90 100644 --- a/units/gear_commander.fbi +++ b/units/gear_commander.fbi @@ -166,5 +166,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/gear_u1commander.fbi b/units/gear_u1commander.fbi index 04672003..66eb86b7 100644 --- a/units/gear_u1commander.fbi +++ b/units/gear_u1commander.fbi @@ -167,5 +167,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/gear_u2commander.fbi b/units/gear_u2commander.fbi index 5e322834..fa747b27 100644 --- a/units/gear_u2commander.fbi +++ b/units/gear_u2commander.fbi @@ -162,5 +162,6 @@ explosionGenerator4=custom:JUMPASC2; explosionGenerator5=custom:JUMPDESC; explosionGenerator6=custom:JUMPDESC2; + explosionGenerator7=custom:WEAPONCHANGE; } } diff --git a/units/gear_u3commander.fbi b/units/gear_u3commander.fbi index 5d1bf60d..5082b8de 100644 --- a/units/gear_u3commander.fbi +++ b/units/gear_u3commander.fbi @@ -165,5 +165,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/gear_u4commander.fbi b/units/gear_u4commander.fbi index c93f0835..20024a1e 100644 --- a/units/gear_u4commander.fbi +++ b/units/gear_u4commander.fbi @@ -164,5 +164,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/gear_u5commander.fbi b/units/gear_u5commander.fbi index e95f0221..f51f0fbc 100644 --- a/units/gear_u5commander.fbi +++ b/units/gear_u5commander.fbi @@ -161,5 +161,6 @@ explosionGenerator4=custom:JUMPASC2; explosionGenerator5=custom:JUMPDESC; explosionGenerator6=custom:JUMPDESC2; + explosionGenerator7=custom:WEAPONCHANGE; } } diff --git a/units/gear_u6commander.fbi b/units/gear_u6commander.fbi index 3df0b033..ee7fd45f 100644 --- a/units/gear_u6commander.fbi +++ b/units/gear_u6commander.fbi @@ -165,5 +165,6 @@ explosionGenerator7=custom:JUMPASC2; explosionGenerator8=custom:JUMPDESC; explosionGenerator9=custom:JUMPDESC2; + explosionGenerator10=custom:WEAPONCHANGE; } } diff --git a/units/gear_u7commander.fbi b/units/gear_u7commander.fbi index 70e602f5..228383ee 100644 --- a/units/gear_u7commander.fbi +++ b/units/gear_u7commander.fbi @@ -151,5 +151,6 @@ explosionGenerator5=custom:JUMPDESC; explosionGenerator6=custom:JUMPDESC2; explosionGenerator7=custom:glowsml; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/sphere_commander.fbi b/units/sphere_commander.fbi index b2e8c3e1..7d950f06 100644 --- a/units/sphere_commander.fbi +++ b/units/sphere_commander.fbi @@ -132,5 +132,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/sphere_contender.fbi b/units/sphere_contender.fbi index 10e53049..8881f495 100644 --- a/units/sphere_contender.fbi +++ b/units/sphere_contender.fbi @@ -4,7 +4,7 @@ side=Sphere; Name=Contender; Description=Amphibious Skirmisher Tank; - iconType=amphibiousheavyfs; + iconType=amphibheavyfs; // ------------------- categories Category=SPHERE LEVEL2 WEAPON NOTAIR NOTSUB; diff --git a/units/sphere_u1commander.fbi b/units/sphere_u1commander.fbi index 54f9e622..07b8217e 100644 --- a/units/sphere_u1commander.fbi +++ b/units/sphere_u1commander.fbi @@ -135,5 +135,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/sphere_u2commander.fbi b/units/sphere_u2commander.fbi index 35fc6d3a..b05f21f5 100644 --- a/units/sphere_u2commander.fbi +++ b/units/sphere_u2commander.fbi @@ -133,5 +133,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/sphere_u3commander.fbi b/units/sphere_u3commander.fbi index 667cf50c..0e51904a 100644 --- a/units/sphere_u3commander.fbi +++ b/units/sphere_u3commander.fbi @@ -133,5 +133,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/sphere_u4commander.fbi b/units/sphere_u4commander.fbi index a8171d00..56cd6b16 100644 --- a/units/sphere_u4commander.fbi +++ b/units/sphere_u4commander.fbi @@ -133,5 +133,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/sphere_u5commander.fbi b/units/sphere_u5commander.fbi index 3749c7dc..ebc911b8 100644 --- a/units/sphere_u5commander.fbi +++ b/units/sphere_u5commander.fbi @@ -135,5 +135,6 @@ explosionGenerator7=custom:JUMPASC2; explosionGenerator8=custom:JUMPDESC; explosionGenerator9=custom:JUMPDESC2; + explosionGenerator10=custom:WEAPONCHANGE; } } diff --git a/units/sphere_u6commander.fbi b/units/sphere_u6commander.fbi index a30270bb..9b8420dc 100644 --- a/units/sphere_u6commander.fbi +++ b/units/sphere_u6commander.fbi @@ -134,5 +134,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } } diff --git a/units/sphere_u7commander.fbi b/units/sphere_u7commander.fbi index 35d0963c..401cc2e7 100644 --- a/units/sphere_u7commander.fbi +++ b/units/sphere_u7commander.fbi @@ -113,5 +113,6 @@ explosionGenerator5=custom:JUMPASC2; explosionGenerator6=custom:JUMPDESC; explosionGenerator7=custom:JUMPDESC2; + explosionGenerator8=custom:WEAPONCHANGE; } }