diff --git a/Binaries.csv b/Binaries.csv index 7740903..8f23f35 100644 --- a/Binaries.csv +++ b/Binaries.csv @@ -15,7 +15,7 @@ Animations,UT3VH_Paladin_Anims.ukx,https://drive.google.com/uc?export=download&i Animations,UT3VH_Raptor_Anims.ukx,https://drive.google.com/uc?export=download&id=1GAGc8gKLVdO66snC_5j2LVyGBn9QxSTj,6294f557cb1f06e02c1973fbea67478b55242d3c95a61688c380178ad5ac43d1,--content-disposition Animations,UT3VH_Scorpion_Anims.ukx,https://drive.google.com/uc?export=download&id=1QSeKP6KxkT9vBNyptGE7ouPl76W1EL-C,b66bc22d1df53ae1335c21f5053c08fcb2af7c4554f829a64b3a2ea8618f6b2c,--content-disposition Animations,UT3VH_SPMA_Anims.ukx,https://drive.google.com/uc?export=download&id=1cDv2_FcH72_1rgIjBt5zdTU_pSRpkrqe,563c43204035a855062f92175c50f62807addd98c4e5a450fb4646918850f1ff,--content-disposition -Sounds,UT3A_Vehicle_Cicada.uax,https://cloud.greatemerald.eu/s/jCvuP6gYNwn7vAS/download,a9151ade565e513e84a6a4ff26104395db8edb5a4e494589859aa6134790caff, +Sounds,UT3A_Vehicle_Cicada.uax,https://drive.google.com/uc?export=download&id=1PNmOD4l6ABxcEcjMxXOJTBdQxtKde9kz,2ffb6cad35c71cfdc47f86fb24d5627060c41e3e83567f9791140ab6d6f41d2a,--content-disposition Sounds,UT3A_Vehicle_Goliath.uax,https://drive.google.com/uc?export=download&id=1uFWoDVvJpaGgDzxAYA8KkGT6Ija4CRKI,f2c9cafc34d60ec4321d1402cee7e8345a31265f86a3e85667e6e31d77bd8ed0,--content-disposition Sounds,UT3A_Vehicle_Hellbender.uax,https://drive.google.com/uc?export=download&id=1seZJkSMcgqS5aNgjNgqlj598RCad_DYV,b62cbd2a0bc4981ddb4af4363e17111a045d47d631748313d5fc7f219b423e84,--content-disposition Sounds,UT3A_Vehicle_Hoverboard.uax,https://cloud.greatemerald.eu/s/olW60iObnWHSNfy/download,9f9e661957030c21c481927acf415758cabc21bf73562a4146a528aae60971af, @@ -26,6 +26,8 @@ Sounds,UT3A_Vehicle_Paladin.uax,https://cloud.greatemerald.eu/s/TQFft9WzgaWtDq5/ Sounds,UT3A_Vehicle_Raptor.uax,https://cloud.greatemerald.eu/s/9GddwrLFitrqjlG/download,a78f2c2445e49c71376e673d8ba99768cbe60210d056233638678840d7c5a610, Sounds,UT3A_Vehicle_Scorpion.uax,https://drive.google.com/uc?export=download&id=1l7cC58tLhf-nAps3Dzk00FttPPchNaDP,5c7f09e1e1950cd992f73171104d34c8cc500e2971598d53a47484d0d43493c9,--content-disposition Sounds,UT3A_Vehicle_Viper.uax,https://cloud.greatemerald.eu/s/a9qqwONoqjIMdqD/download,14aa152500702836d0971df6b612ae6a9afd2143358868d609b924114ab70bef, +Sounds,UT3A_Weapon_BulletImpacts.uax,https://drive.google.com/uc?export=download&id=1vt-y6Dgykp68uFOPvbpfBZr7Vwy6IlTg,4ae8a24b0de2934f8a65fcc7686d5d7d3fa82a0c87be032240bd2f1a330cb954,--content-disposition +Sounds,UT3A_Weapon_RocketLauncher.uax,https://drive.google.com/uc?export=download&id=1HuzB1YW_n8zR3FMJIuwLcqD3H9Imi4Oz,5077294233d0ad4fb6c150f5c72517b47056163c36a157feb6990a6951cf0a1e,--content-disposition Sounds,UT3SPMA.uax,https://drive.google.com/uc?export=download&id=17UqS7l3-Jx-lbN34S0QrLVglb6WH2Gxh,1627d76b088cc756d58002fe1bee8f66e305f1df0e3c4605b9ebe41f737fabe5,--content-disposition Sounds,UT3Weapons2.uax,https://github.com/GreatEmerald/UT3Weapons/raw/master/Sounds/UT3Weapons2.uax,474ae417f521dff0345bfab93924953cc2e42640095f87f38a62b9a8a5eda32d, Sounds,UT3Weapons.uax,https://github.com/GreatEmerald/UT3Weapons/raw/master/Sounds/UT3Weapons.uax,14700fa3224be02dd5eec8a906a15b8b73549b85ed4843ce58d738d72a3d67dd, diff --git a/Classes/UT3Cicada.uc b/Classes/UT3Cicada.uc index 07f6ff9..3322b98 100644 --- a/Classes/UT3Cicada.uc +++ b/Classes/UT3Cicada.uc @@ -66,6 +66,7 @@ function AnimateVehicle() CurrentAnim = "Idle"; } } + simulated function DrivingStatusChanged() { @@ -90,6 +91,33 @@ simulated function DrivingStatusChanged() TrailEffects[i].SetRelativeRotation( TrailEffectRotation ); } } + if (StreamerEffect.Length == 0) + { + StreamerEffect.Length = StreamerEffectOffset.Length; + + for(i=0; i> Rotation) ); + StreamerEffect[i].SetBase(self); + } + } + } + else + { + if (Level.NetMode != NM_DedicatedServer) + { + for(i=0;i DecoyFlightSFXClass; // Class of the emitter to spawn for the effect +var class DecoyLaunchSFXClass; // Class of the emitter to spawn when launched +var emitter DecoyFlightSFX; // The actual effect +var float DecoyRange; // Much much range before the decoy says look at me + +var ONSDualAttackCraft ProtectedTarget; // Protect this vehicle + +simulated function PostBeginPlay() +{ + super.PostBeginPlay(); + Velocity = Speed * Vector(Rotation); +} + +simulated function PostNetBeginPlay() +{ + super.PostNetBeginPlay(); + + if ( EffectIsRelevant(Location, false) ) + Spawn(DecoyLaunchSFXClass,,,location,Rotation); + + if ( (Level.NetMode != NM_DedicatedServer) && (DecoyFlightSFXClass != None) ) + { + DecoyFlightSFX = spawn(DecoyFlightSFXClass); + if (DecoyFlightSFX!=None) + DecoyFlightSFX.SetBase(self); + } +} + +function bool CheckRange(actor Aggressor) +{ + return vsize(Aggressor.Location - location) <= DecoyRange; +} + +simulated event Destroyed() // Remove it from the Dual Attack craft's array +{ + local int i; + + super.Destroyed(); + + if (ProtectedTarget!=None) + { + for (i=0;i ProjClass, bool bAltFire) defaultproperties { + + Drawscale = 1.0 + FireInterval=0.25 AltFireInterval=0.5 ProjectileClass=class'UT3CicadaRocket' AltFireProjectileClass=class'UT3CicadaRocket' - LoadSound=sound'UT3A_Vehicle_Cicada.Sounds.A_Vehicle_Cicada_MissleLoad01' - FireSoundClass=Sound'UT3A_Vehicle_Cicada.SoundCues.A_Vehicle_Cicada_Fire' - AltFireSoundClass=Sound'UT3A_Vehicle_Cicada.Sounds.A_Vehicle_Cicada_MissleEject01' + LoadSound=sound'UT3A_Vehicle_Cicada.UT3CicadaMissileLoad.UT3CicadaMissileLoadCue' + FireSoundClass=Sound'UT3A_Vehicle_Cicada.UT3CicadaFire.UT3CicadaFireCue' + AltFireSoundClass=Sound'UT3A_Vehicle_Cicada.UT3CicadaMissileEject.UT3CicadaMissileEjectCue' + SoundVolume=255 Mesh = SkeletalMesh'UT3VH_Cicada_Anims.VH_Cicada_RightSideGun' RedSkin = Shader'UT3CicadaTex.CicadaSkin' BlueSkin = Shader'UT3CicadaTex.CicadaSkinBlue' diff --git a/Classes/UT3CicadaRocket.uc b/Classes/UT3CicadaRocket.uc index 7970b9c..fa34010 100644 --- a/Classes/UT3CicadaRocket.uc +++ b/Classes/UT3CicadaRocket.uc @@ -39,6 +39,8 @@ class UT3CicadaRocket extends ONSDualACRocket; +var(Sound) sound ExplosionSound; + simulated function Timer() //GE: Change the sound volume to something bearable { local float dist,travelTime; @@ -101,6 +103,23 @@ simulated function Timer() //GE: Change the sound volume to something bearable } } +simulated function Explode(vector HitLocation, vector HitNormal) +{ + local PlayerController PC; + + PlaySound(ExplosionSound,,2.5*TransientSoundVolume); + + if ( EffectIsRelevant(Location,false) ) + { + PC = Level.GetLocalPlayerController(); + if ( (PC.ViewTarget != None) && (VSize(PC.ViewTarget.Location - Location) < 8000) ) + Spawn(class'ONSDualMissileExplosion',,,HitLocation + HitNormal*20,rotator(HitNormal)); + } + + BlowUp(HitLocation); + Destroy(); +} + DefaultProperties { Speed=1000.000000 @@ -108,5 +127,6 @@ DefaultProperties MomentumTransfer=40000.000000 DamageRadius=220.000000 KillRange=2000.000000 - IgniteSound=Sound'UT3A_Vehicle_Cicada.Sounds.A_Vehicle_Cicada_MissleIgnite01' + IgniteSound=Sound'UT3A_Vehicle_Cicada.UT3CicadaMissileIgnite.UT3CicadaMissileIgniteCue' + ExplosionSound=SoundGroup'UT3A_Weapon_RocketLauncher.UT3RocketImpact.UT3RocketImpactCue' } diff --git a/Classes/UT3CicadaTurret.uc b/Classes/UT3CicadaTurret.uc index f697628..3e5efb6 100644 --- a/Classes/UT3CicadaTurret.uc +++ b/Classes/UT3CicadaTurret.uc @@ -41,10 +41,14 @@ class UT3CicadaTurret extends ONSDualACGatlingGun; DefaultProperties { + + Drawscale = 1.0 + BeamEffectClass(0) = class'UT3CicadaTurretFire' BeamEffectClass(1) = class'UT3CicadaTurretFire' + AltFireProjectileClass=class'UT3CicadaDecoy' - FireSoundClass = Sound'UT3A_Vehicle_Cicada.SoundCues.A_Vehicle_Cicada_TurretFire' + FireSoundClass = Sound'UT3A_Vehicle_Cicada.UT3CicadaTurretFire.UT3CicadaTurretFireCue' FireSoundVolume = 3.0 //GE: Again it's a FLOAT!! //FireForce="" @@ -54,4 +58,6 @@ DefaultProperties PitchBone = MainTurret_Pitch YawBone = MainTurret_Yaw WeaponFireAttachmentBone = MainTurret_Pitch + DualFireOffset=34 //15 + WeaponFireOffset=120 } diff --git a/Classes/UT3CicadaTurretFire.uc b/Classes/UT3CicadaTurretFire.uc index a886321..1ea1049 100644 --- a/Classes/UT3CicadaTurretFire.uc +++ b/Classes/UT3CicadaTurretFire.uc @@ -52,7 +52,7 @@ simulated function PostNetBeginPlay() DefaultProperties { - TurretFireSound=sound'UT3A_Vehicle_Cicada.SoundCues.A_Vehicle_Cicada_TurretFire' + TurretFireSound=sound'UT3A_Vehicle_Cicada.UT3CicadaTurretFire.UT3CicadaTurretFireCue' Begin Object Class=BeamEmitter Name=BeamEmitter0 BeamDistanceRange=(Min=512.000000,Max=512.000000) DetermineEndPointBy=PTEP_Distance