From 3c2fe1e1a7a0c7d8683296439958a42950c7f13a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 29 Dec 2016 00:56:38 +0100 Subject: [PATCH 1/3] RA missile warhead naming fixes To make inheritance easier later on. --- mods/ra/weapons/missiles.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index a407f5e279..6b5775d3ad 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -177,7 +177,7 @@ MammothTusk: Warhead@2Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees - Warhead@3EffGround: CreateEffect + Warhead@3Eff: CreateEffect Explosions: med_explosion ImpactSounds: kaboom12.aud InvalidImpactTypes: Water, Air, AirHit @@ -401,11 +401,11 @@ TorpTube: Explosions: large_explosion ImpactSounds: kaboom15.aud InvalidImpactTypes: Water, WaterHit - Warhead@4EffWaterHit: CreateEffect + Warhead@5EffWaterHit: CreateEffect Explosions: artillery_explosion ImpactSounds: kaboom15.aud ValidImpactTypes: WaterHit - Warhead@5EffWater: CreateEffect + Warhead@4EffWater: CreateEffect Explosions: large_splash ImpactSounds: splash9.aud ValidImpactTypes: Water From 319d53990a68b85351b18a47262eaa424834a942 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 29 Dec 2016 00:57:43 +0100 Subject: [PATCH 2/3] Move SubMissiles down in RA missiles.yaml --- mods/ra/weapons/missiles.yaml | 94 +++++++++++++++++------------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 6b5775d3ad..0ef726b732 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -244,53 +244,6 @@ RedEye: Explosions: med_explosion_air ImpactSounds: kaboom25.aud -SubMissile: - ReloadDelay: 300 - Range: 16c0 - Burst: 2 - Report: missile6.aud - Projectile: Bullet - Speed: 162 - Blockable: false - LaunchAngle: 120 - Inaccuracy: 2c938 - Image: MISSILE - TrailImage: smokey - ContrailLength: 30 - Warhead@1Dam: SpreadDamage - Spread: 426 - Damage: 25 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - Versus: - None: 40 - Light: 30 - Heavy: 30 - DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Smu: LeaveSmudge - SmudgeType: Crater - InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees - Warhead@3Eff: CreateEffect - Explosions: artillery_explosion - ImpactSounds: kaboom15.aud - InvalidImpactTypes: Water - Warhead@4EffWater: CreateEffect - Explosions: large_splash - ImpactSounds: splash9.aud - ValidImpactTypes: Water - -SubMissileAA: - Inherits: SubMissile - Range: 8c0 - ValidTargets: Air - Projectile: Missile - Speed: 234 - Inaccuracy: 0c614 - HorizontalRateOfTurn: 15 - RangeLimit: 9c0 - Warhead@1Dam: SpreadDamage - Damage: 15 - ValidTargets: Air, Ground, Water - Stinger: ReloadDelay: 60 Range: 9c0 @@ -410,6 +363,53 @@ TorpTube: ImpactSounds: splash9.aud ValidImpactTypes: Water +SubMissile: + ReloadDelay: 300 + Range: 16c0 + Burst: 2 + Report: missile6.aud + Projectile: Bullet + Speed: 162 + Blockable: false + LaunchAngle: 120 + Inaccuracy: 2c938 + Image: MISSILE + TrailImage: smokey + ContrailLength: 30 + Warhead@1Dam: SpreadDamage + Spread: 426 + Damage: 25 + Falloff: 1000, 368, 135, 50, 18, 7, 0 + Versus: + None: 40 + Light: 30 + Heavy: 30 + DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath + Warhead@2Smu: LeaveSmudge + SmudgeType: Crater + InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees + Warhead@3Eff: CreateEffect + Explosions: artillery_explosion + ImpactSounds: kaboom15.aud + InvalidImpactTypes: Water + Warhead@4EffWater: CreateEffect + Explosions: large_splash + ImpactSounds: splash9.aud + ValidImpactTypes: Water + +SubMissileAA: + Inherits: SubMissile + Range: 8c0 + ValidTargets: Air + Projectile: Missile + Speed: 234 + Inaccuracy: 0c614 + HorizontalRateOfTurn: 15 + RangeLimit: 9c0 + Warhead@1Dam: SpreadDamage + Damage: 15 + ValidTargets: Air, Ground, Water + SCUD: ReloadDelay: 240 Range: 10c0 From ce41a037ee2686f1f13b87ab71071d2bccd9376f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 29 Dec 2016 00:59:12 +0100 Subject: [PATCH 3/3] Move APTusk up in RA missiles.yaml --- mods/ra/weapons/missiles.yaml | 74 +++++++++++++++++------------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 0ef726b732..a91bb0768e 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -324,6 +324,43 @@ StingerAA: ImpactSounds: splash9.aud ValidImpactTypes: Water +APTusk: + ReloadDelay: 60 + Range: 6c0 + Report: missile6.aud + ValidTargets: Ground, Water + Projectile: Missile + Speed: 298 + Arm: 2 + Blockable: false + TrailImage: smokey + ContrailLength: 10 + Inaccuracy: 128 + Image: DRAGON + HorizontalRateOfTurn: 10 + RangeLimit: 7c204 + Warhead@1Dam: SpreadDamage + Spread: 128 + Damage: 30 + ValidTargets: Ground, Water + Versus: + None: 25 + Wood: 75 + Light: 75 + Concrete: 50 + DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath + Warhead@2Smu: LeaveSmudge + SmudgeType: Crater + InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees + Warhead@3Eff: CreateEffect + Explosions: med_explosion + ImpactSounds: kaboom25.aud + InvalidImpactTypes: Water + Warhead@4EffWater: CreateEffect + Explosions: med_splash + ImpactSounds: splash9.aud + ValidImpactTypes: Water + TorpTube: ReloadDelay: 100 Range: 9c0 @@ -446,40 +483,3 @@ SCUD: Explosions: large_splash ImpactSounds: splash9.aud ValidImpactTypes: Water - -APTusk: - ReloadDelay: 60 - Range: 6c0 - Report: missile6.aud - ValidTargets: Ground, Water - Projectile: Missile - Speed: 298 - Arm: 2 - Blockable: false - TrailImage: smokey - ContrailLength: 10 - Inaccuracy: 128 - Image: DRAGON - HorizontalRateOfTurn: 10 - RangeLimit: 7c204 - Warhead@1Dam: SpreadDamage - Spread: 128 - Damage: 30 - ValidTargets: Ground, Water - Versus: - None: 25 - Wood: 75 - Light: 75 - Concrete: 50 - DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath - Warhead@2Smu: LeaveSmudge - SmudgeType: Crater - InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees - Warhead@3Eff: CreateEffect - Explosions: med_explosion - ImpactSounds: kaboom25.aud - InvalidImpactTypes: Water - Warhead@4EffWater: CreateEffect - Explosions: med_splash - ImpactSounds: splash9.aud - ValidImpactTypes: Water