diff --git a/mods/ra2/rules/aircraft.yaml b/mods/ra2/rules/aircraft.yaml index 6cc026154..429132ab3 100644 --- a/mods/ra2/rules/aircraft.yaml +++ b/mods/ra2/rules/aircraft.yaml @@ -335,3 +335,71 @@ hornethusk: RenderVoxels: Image: hornet NormalsPalette: ts-normals + +asw: + Inherits: ^Plane + Inherits@EXPERIENCE: ^GainsExperience + -GivesExperience: + Valued: + Cost: 50 + GainsExperience: + ExperienceModifier: 500 + Tooltip: + Name: Osprey + Health: + HP: 135 + Armor: + Type: Light + RevealsShroud: + Range: 2c0 + Type: CenterPosition + Armament: + Weapon: ASWBomb + PauseOnCondition: !ammo + RequiresCondition: !rank-elite + Armament@Elite: + Weapon: ASWBombE + PauseOnCondition: !ammo + RequiresCondition: rank-elite + AttackAircraft: + FacingTolerance: 20 + RequiresCondition: ammo + Aircraft: + AltitudeVelocity: 240 + InitialFacing: 192 + TurnSpeed: 8 + Speed: 180 + RepulsionSpeed: 40 + TakeoffSounds: vospstaa.wav + LandingSounds: vosplana.wav + AmmoPool: + Ammo: 5 + AmmoCondition: ammo + RejectsOrders: + SpawnActorOnDeath: + Actor: aswhusk + -Selectable: + -ActorLostNotification: + CarrierChild: + LandingDistance: 8c0 + HitShape: + Interactable: + RenderVoxels: + NormalsPalette: ts-normals + RenderSprites: + Rearmable: + RearmActors: dest, cdest + +aswhusk: + Inherits: ^PlaneHusk + Tooltip: + Name: Osprey + Tooltip@NoRow: + Name: Osprey + Aircraft: + TurnSpeed: 5 + Speed: 180 + AltitudeVelocity: 240 + RenderVoxels: + Image: asw + NormalsPalette: ts-normals diff --git a/mods/ra2/rules/allied-naval.yaml b/mods/ra2/rules/allied-naval.yaml index 17601d521..a489b6312 100644 --- a/mods/ra2/rules/allied-naval.yaml +++ b/mods/ra2/rules/allied-naval.yaml @@ -76,8 +76,24 @@ dest: LocalOffset: 1152,0,800 MuzzleSequence: muzzle-2 RequiresCondition: rank-elite + Armament@asw: + Name: asw + Weapon: ASWLauncher + CarrierParent: + Actors: asw + RespawnTicks: 300 + ArmamentNames: asw + LoadedCondition: loaded + Exit: + SpawnOffset: 768,0,0 AttackFrontal: Voice: Attack + Armaments: primary + PauseOnCondition: chronodisable + AttackFrontal@Spawner: + Voice: Attack + Armaments: asw + FacingTolerance: 128 WithMuzzleOverlay: DetectCloaked: CloakTypes: Underwater @@ -86,7 +102,11 @@ dest: Explodes: Weapon: UnitExplode EmptyWeapon: UnitExplode - WithVoxelBody: + WithVoxelBody@FULL: + RequiresCondition: loaded + WithVoxelBody@EMPTY: + Sequence: empty + RequiresCondition: !loaded RenderSprites: Voiced: VoiceSet: AlliedNavalVoice diff --git a/mods/ra2/sequences/voxels.yaml b/mods/ra2/sequences/voxels.yaml index 0f19c7c42..ff7037b51 100644 --- a/mods/ra2/sequences/voxels.yaml +++ b/mods/ra2/sequences/voxels.yaml @@ -24,7 +24,7 @@ carrier: cdest: idle: -#Needs without weapon image cdestwo + empty: cdestwo cona: idle: @@ -44,7 +44,7 @@ cruise: dest: idle: -#Needs without weapon image destwo + empty: destwo #dmisl: #Dreadnought Missile needs voxel projectiles # idle: diff --git a/mods/ra2/weapons/bullets.yaml b/mods/ra2/weapons/bullets.yaml index 7a4960e67..940ec113f 100644 --- a/mods/ra2/weapons/bullets.yaml +++ b/mods/ra2/weapons/bullets.yaml @@ -268,6 +268,7 @@ MirageGunE: ReloadDelay: 110 Range: 8c0 Report: vdesatta.wav, vrdesattb.wav + InvalidTargets: Underwater Projectile: Bullet Blockable: false Speed: 682 diff --git a/mods/ra2/weapons/misc.yaml b/mods/ra2/weapons/misc.yaml index a422ec4c7..b889244ac 100644 --- a/mods/ra2/weapons/misc.yaml +++ b/mods/ra2/weapons/misc.yaml @@ -97,3 +97,11 @@ HornetLauncher: Projectile: InstantHit Warhead@1Dam: TargetDamage ValidTargets: Ground, Water + +ASWLauncher: + ReloadDelay: 150 + Range: 8c0 + ValidTargets: Underwater + Projectile: InstantHit + Warhead@1Dam: TargetDamage + ValidTargets: Underwater diff --git a/mods/ra2/weapons/missiles.yaml b/mods/ra2/weapons/missiles.yaml index 23f7ecda4..a749be492 100644 --- a/mods/ra2/weapons/missiles.yaml +++ b/mods/ra2/weapons/missiles.yaml @@ -236,3 +236,36 @@ HornetBombE: ValidTargets: Ground Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater, MediumScorch + +ASWBomb: + Inherits: HornetBomb + Range: 3c0 + ValidTargets: Underwater + Projectile: Missile + BoundToTerrainType: Water + Warhead@1Dam: SpreadDamage + Damage: 50 + Spread: 426 + ValidTargets: Water, Underwater + Versus: + None: 25 + Flak: 25 + Plate: 25 + Light: 75 + Medium: 100 + Heavy: 100 + Wood: 65 + Steel: 85 + Concrete: 60 + Drone: 25 + Warhead@2Eff: CreateEffect + Explosions: small_grey_explosion + ExplosionPalette: effect + -Warhead@4Smu: + +ASWBombE: + Inherits: ASWBomb + Projectile: Missile + ContrailColor: EA0000 + Warhead@1Dam: SpreadDamage + Damage: 80