From c92b2298c38e7781689ced74bc6171cdf163643c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 10 Mar 2015 22:58:05 +0100 Subject: [PATCH] Remove missile TurboBoost --- OpenRA.Mods.Common/Effects/Missile.cs | 4 --- mods/ra/rules/ships.yaml | 4 +++ mods/ra/weapons/missiles.yaml | 43 +++++++++++++++++++++++++-- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.Common/Effects/Missile.cs b/OpenRA.Mods.Common/Effects/Missile.cs index 29a6055d8e..73f9989483 100644 --- a/OpenRA.Mods.Common/Effects/Missile.cs +++ b/OpenRA.Mods.Common/Effects/Missile.cs @@ -42,8 +42,6 @@ namespace OpenRA.Mods.Common.Effects [Desc("In n/256 per tick.")] public readonly int RateOfTurn = 5; public readonly int RangeLimit = 0; - [Desc("If fired at aircraft, increase speed by 50%.")] - public readonly bool TurboBoost = false; public readonly int TrailInterval = 2; public readonly int ContrailLength = 0; public readonly Color ContrailColor = Color.White; @@ -150,8 +148,6 @@ namespace OpenRA.Mods.Common.Effects facing = OpenRA.Traits.Util.TickFacing(facing, desiredFacing, info.RateOfTurn); var move = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(facing)) * info.Speed.Range / 1024; - if (targetPosition.Z > 0 && info.TurboBoost) - move = (move * 3) / 2; if (pos.Z != desiredAltitude) { diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 3c7b4b8f64..c7d0d07a9a 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -134,6 +134,10 @@ DD: Weapon: DepthCharge LocalOffset: 0,-100,0, 0,100,0 LocalYaw: 80, -80 + Armament@TERTIARY: + Weapon: StingerAA + LocalOffset: 0,-100,0, 0,100,0 + LocalYaw: 64, -64 AttackTurreted: Selectable: Bounds: 38,38 diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 9ab7044100..13a573052c 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -285,7 +285,7 @@ Stinger: Report: MISSILE6.AUD Burst: 2 BurstDelay: 0 - ValidTargets: Air, Ground, Water + ValidTargets: Ground, Water Projectile: Missile Arm: 3 Blockable: false @@ -293,7 +293,6 @@ Stinger: Image: DRAGON RateOfTurn: 20 RangeLimit: 50 - TurboBoost: true Speed: 170 Warhead@1Dam: SpreadDamage Spread: 128 @@ -320,6 +319,46 @@ Stinger: ImpactSound: splash9.aud ValidImpactTypes: Water +StingerAA: + ReloadDelay: 60 + Range: 9c0 + Report: MISSILE6.AUD + Burst: 2 + BurstDelay: 0 + ValidTargets: Air + Projectile: Missile + Arm: 3 + Blockable: false + ContrailLength: 10 + Image: DRAGON + RateOfTurn: 20 + RangeLimit: 50 + Speed: 255 + Warhead@1Dam: SpreadDamage + Spread: 128 + Damage: 30 + DeathType: 4 + ValidTargets: Air, Ground, Water + Versus: + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 + Warhead@2Smu: LeaveSmudge + SmudgeType: Crater + Warhead@3Eff: CreateEffect + Explosion: med_explosion + ImpactSound: kaboom25.aud + InvalidImpactTypes: Water, Air, AirHit + Warhead@5EffAir: CreateEffect + Explosion: med_explosion_air + ImpactSound: kaboom25.aud + ValidImpactTypes: Air, AirHit + Warhead@4EffWater: CreateEffect + Explosion: med_splash + ImpactSound: splash9.aud + ValidImpactTypes: Water + TorpTube: ReloadDelay: 100 Range: 9c0