Adjustment to the Cicada booster effect to match UT3

Also a fix for a few more log warnings Signed-off-by: GreatEmerald <[email protected]>
GreatEmerald · Jul 18, 2014 · cd2467d · cd2467d
1 parent 8d2954b
commit cd2467d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/Classes/UT3Cicada.uc b/Classes/UT3Cicada.uc
@@ -41,6 +41,7 @@
 class UT3Cicada extends ONSDualAttackCraft;
 
 var(Sound) sound TargetLockSound;
+var() rotator TrailEffectRotation;
 
 //=======================
 // @100GPing100
@@ -66,14 +67,48 @@ function AnimateVehicle()
 }
 simulated function DrivingStatusChanged()
 {
+
+    local vector RotX, RotY, RotZ;
+    local int i;
+
+    super(ONSChopperCraft).DrivingStatusChanged();
+
+    if (bDriving && Level.NetMode != NM_DedicatedServer && !bDropDetail)
+    {
+        GetAxes(Rotation,RotX,RotY,RotZ);
+
+        if (TrailEffects.Length == 0)
+        {
+            TrailEffects.Length = TrailEffectPositions.Length;
+
+            for(i=0;i<TrailEffects.Length;i++)
+                if (TrailEffects[i] == None)
+                {
+                    TrailEffects[i] = spawn(TrailEffectClass, self,, Location + (TrailEffectPositions[i] >> Rotation) );
+                    TrailEffects[i].SetBase(self);
+                    TrailEffects[i].SetRelativeRotation( TrailEffectRotation );
+                }
+        }
+    }
+    else
+    {
+        if (Level.NetMode != NM_DedicatedServer)
+        {
+            for(i=0;i<TrailEffects.Length;i++)
+               TrailEffects[i].Destroy();
+
+            TrailEffects.Length = 0;
+        }
+    }
+
     /* Animations list:
     ActiveStill [2]
     GetIn [90]
     GetOut [51]
     Idle [201]
     InActiveStill [2]
     */
-    Super.DrivingStatusChanged();
+
     if (Driver == None)
     {
         PlayAnim('GetOut', 1.0, 0.2);
@@ -218,4 +253,7 @@ defaultproperties
     ImpactDamageSounds=()
     ImpactDamageSounds(0)=Sound'UT3A_Vehicle_Cicada.SoundCues.A_Vehicle_Cicada_Collide'
     //PassengerWeapons(0)=(WeaponPawnClass=Class'UT3CicadaTurretPawn',WeaponBone="GatlingGunAttach")
+    TrailEffectRotation=(Yaw=32768)
+    TrailEffectPositions(0)=(X=-53,Y=-33,Z=63)
+    TrailEffectPositions(1)=(X=-53,Y=33,Z=63)
 }
diff --git a/Classes/UT3LeviathanTurret.uc b/Classes/UT3LeviathanTurret.uc
@@ -180,11 +180,12 @@ function bool KDriverLeave(bool bForceLeave)
     return bResult;
 }
 
-simulated function PostBeginPlay()
+/*simulated function PostBeginPlay()
 {
-    PlayAnim('InActiveStill', 1.0, 0.0);
+    // GEm: The following puts the weapons too close to the base vehicle...
+    UT3LeviathanTurretWeapon(Gun).PlayAnim('InActiveStill', 1.0, 0.0);
     super.PostBeginPlay();
-}
+}*/
 
 simulated function vector GetCameraLocationStart()
 {