diff --git a/OpenRA.Mods.Common/Projectiles/Bullet.cs b/OpenRA.Mods.Common/Projectiles/Bullet.cs index 3d4685a9b9..f06bf68004 100644 --- a/OpenRA.Mods.Common/Projectiles/Bullet.cs +++ b/OpenRA.Mods.Common/Projectiles/Bullet.cs @@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Projectiles public readonly WDist TargetExtraSearchRadius = new WDist(1536); [Desc("Arc in WAngles, two values indicate variable arc.")] - public readonly WAngle[] Angle = { WAngle.Zero }; + public readonly WAngle[] LaunchAngle = { WAngle.Zero }; [Desc("Interval in ticks between each spawned Trail animation.")] public readonly int TrailInterval = 2; @@ -111,10 +111,10 @@ namespace OpenRA.Mods.Common.Projectiles var world = args.SourceActor.World; - if (info.Angle.Length > 1) - angle = new WAngle(world.SharedRandom.Next(info.Angle[0].Angle, info.Angle[1].Angle)); + if (info.LaunchAngle.Length > 1) + angle = new WAngle(world.SharedRandom.Next(info.LaunchAngle[0].Angle, info.LaunchAngle[1].Angle)); else - angle = info.Angle[0]; + angle = info.LaunchAngle[0]; if (info.Speed.Length > 1) speed = new WDist(world.SharedRandom.Next(info.Speed[0].Length, info.Speed[1].Length)); diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index d931a65507..2c29a270f0 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -478,6 +478,13 @@ namespace OpenRA.Mods.Common.UtilityCommands node.Key = "Duration"; } + // Rename Bullet Angle to LaunchAngle + if (engineVersion < 20161016) + { + if (node.Key == "Angle") + node.Key = "LaunchAngle"; + } + UpgradeWeaponRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/mods/cnc/weapons/largecaliber.yaml b/mods/cnc/weapons/largecaliber.yaml index 1dcaf70d0f..9640081dba 100644 --- a/mods/cnc/weapons/largecaliber.yaml +++ b/mods/cnc/weapons/largecaliber.yaml @@ -123,7 +123,7 @@ ArtilleryShell: Projectile: Bullet Speed: 204 Blockable: false - Angle: 56 + LaunchAngle: 56 Inaccuracy: 1c256 ContrailLength: 30 Image: 120MM diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml index d180e19281..8427920041 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -182,7 +182,7 @@ MammothMissiles: Blockable: false Shadow: true Inaccuracy: 853 - Angle: 62 + LaunchAngle: 62 Image: DRAGON RateOfTurn: 2 ContrailLength: 10 @@ -349,7 +349,7 @@ HonestJohn: TrailImage: smokey Speed: 187 RangeLimit: 35 - Angle: 88 + LaunchAngle: 88 Warhead@1Dam: SpreadDamage Spread: 256 Damage: 100 diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index 6ae400d624..1b98b624ff 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -81,7 +81,7 @@ Grenade: Projectile: Bullet Speed: 140 Blockable: false - Angle: 62 + LaunchAngle: 62 Inaccuracy: 213 Image: BOMB Warhead@1Dam: SpreadDamage diff --git a/mods/d2k/weapons/debris.yaml b/mods/d2k/weapons/debris.yaml index 7f52a09c79..5d1dbe5833 100644 --- a/mods/d2k/weapons/debris.yaml +++ b/mods/d2k/weapons/debris.yaml @@ -4,7 +4,7 @@ Debris: Projectile: Bullet Speed: 32, 96 Blockable: false - Angle: 30, 90 + LaunchAngle: 30, 90 Inaccuracy: 1c256 Image: shrapnel Warhead@1Dam: SpreadDamage @@ -36,7 +36,7 @@ Debris2: Projectile: Bullet Speed: 32, 96 Blockable: false - Angle: 30, 90 + LaunchAngle: 30, 90 Inaccuracy: 1c256 Image: shrapnel2 TrailImage: bazooka_trail @@ -71,7 +71,7 @@ Debris3: Projectile: Bullet Speed: 32, 96 Blockable: false - Angle: 30, 90 + LaunchAngle: 30, 90 Inaccuracy: 1c256 Image: shrapnel3 TrailImage: large_trail @@ -106,7 +106,7 @@ Debris4: Projectile: Bullet Speed: 32, 96 Blockable: false - Angle: 30, 90 + LaunchAngle: 30, 90 Inaccuracy: 1c256 Image: shrapnel4 TrailImage: large_trail diff --git a/mods/d2k/weapons/largeguns.yaml b/mods/d2k/weapons/largeguns.yaml index eb375e449c..34ba5fd164 100644 --- a/mods/d2k/weapons/largeguns.yaml +++ b/mods/d2k/weapons/largeguns.yaml @@ -99,7 +99,7 @@ DevBullet: Speed: 192 Blockable: false Shadow: yes - Angle: 62 + LaunchAngle: 62 Inaccuracy: 768 ContrailLength: 20 Image: 155mm diff --git a/mods/d2k/weapons/other.yaml b/mods/d2k/weapons/other.yaml index 4864fca353..5d000c5ca3 100644 --- a/mods/d2k/weapons/other.yaml +++ b/mods/d2k/weapons/other.yaml @@ -192,7 +192,7 @@ grenade: Projectile: Bullet Speed: 256 Blockable: false - Angle: 75 + LaunchAngle: 75 Inaccuracy: 416 Image: grenade Shadow: true @@ -261,7 +261,7 @@ SpiceExplosion: Projectile: Bullet Speed: 50, 75 Blockable: false - Angle: 60, 90 + LaunchAngle: 60, 90 TrailImage: large_trail Image: 120mm Warhead@1Dam: SpreadDamage diff --git a/mods/ra/weapons/largecaliber.yaml b/mods/ra/weapons/largecaliber.yaml index 8fc6d68f20..cf692d8287 100644 --- a/mods/ra/weapons/largecaliber.yaml +++ b/mods/ra/weapons/largecaliber.yaml @@ -146,7 +146,7 @@ TurretGun: Projectile: Bullet Speed: 204 Blockable: false - Angle: 62 + LaunchAngle: 62 Inaccuracy: 1c682 Image: 120MM ContrailLength: 30 @@ -180,7 +180,7 @@ TurretGun: Projectile: Bullet Speed: 204 Blockable: false - Angle: 62 + LaunchAngle: 62 Inaccuracy: 2c938 Image: 120MM ContrailLength: 30 diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index dff2748e9d..28e40cbd1c 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -251,7 +251,7 @@ SubMissile: Projectile: Bullet Speed: 162 Blockable: false - Angle: 120 + LaunchAngle: 120 Inaccuracy: 2c938 Image: MISSILE TrailImage: smokey @@ -422,7 +422,7 @@ SCUD: TrailDelay: 5 Inaccuracy: 213 Image: V2 - Angle: 62 + LaunchAngle: 62 Warhead@1Dam: SpreadDamage Spread: 341 Damage: 45 diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index bb425b28dc..d776ab5294 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -36,7 +36,7 @@ Flamer: Speed: 170 TrailImage: fb4 Image: fb3 - Angle: 62 + LaunchAngle: 62 Inaccuracy: 853 Warhead@1Dam: SpreadDamage Spread: 341 @@ -93,7 +93,7 @@ Grenade: Projectile: Bullet Speed: 136 Blockable: false - Angle: 62 + LaunchAngle: 62 Inaccuracy: 554 Image: BOMB Warhead@1Dam: SpreadDamage @@ -125,7 +125,7 @@ DepthCharge: Projectile: Bullet Speed: 85 Image: BOMB - Angle: 62 + LaunchAngle: 62 Blockable: false Inaccuracy: 128 Warhead@1Dam: SpreadDamage diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml index d9d8bff90d..5072aa08d4 100644 --- a/mods/ts/weapons/bombsandgrenades.yaml +++ b/mods/ts/weapons/bombsandgrenades.yaml @@ -5,7 +5,7 @@ Grenade: Speed: 85 Blockable: false Shadow: true - Angle: 45 + LaunchAngle: 45 Inaccuracy: 384 Image: DISCUS Warhead@1Dam: SpreadDamage @@ -72,7 +72,7 @@ RPGTower: Speed: 384 Blockable: false Shadow: true - Angle: 62 + LaunchAngle: 62 Image: canister Palette: player Warhead@1Dam: SpreadDamage diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml index b950dc267e..321aa00799 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/mods/ts/weapons/explosions.yaml @@ -61,7 +61,7 @@ SmallDebris: Report: Projectile: Bullet Speed: 50, 125 - Angle: 45, 135 + LaunchAngle: 45, 135 Image: dbrissm Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 Shadow: true @@ -72,7 +72,7 @@ LargeDebris: Report: Projectile: Bullet Speed: 50, 125 - Angle: 45, 135 + LaunchAngle: 45, 135 Image: dbrislg Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 Shadow: true diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml index 95d277f1e8..da5995b52a 100644 --- a/mods/ts/weapons/largeguns.yaml +++ b/mods/ts/weapons/largeguns.yaml @@ -6,7 +6,7 @@ Speed: 682 Image: 120mm Shadow: true - Angle: 75 + LaunchAngle: 75 Palette: ra Warhead@1Dam: SpreadDamage Spread: 128 @@ -70,7 +70,7 @@ Speed: 682 Image: 120mm Shadow: true - Angle: 62 + LaunchAngle: 62 Palette: ra Warhead@1Dam: SpreadDamage Spread: 128 @@ -102,7 +102,7 @@ Projectile: Bullet Speed: 170 Image: 120mm - Angle: 165 + LaunchAngle: 165 Shadow: true Blockable: false Palette: ra diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index b06dfae0af..e2edaacea2 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -32,7 +32,7 @@ FiendShard: Image: CRYSTAL4 Inaccuracy: 512 Shadow: true - Angle: 60 + LaunchAngle: 60 Palette: greentiberium Warhead@1Dam: SpreadDamage Damage: 35 diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index 3eeaad1e23..0356f1e233 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -97,7 +97,7 @@ EMPulseCannon: Speed: 425 Blockable: false Shadow: true - Angle: 62 + LaunchAngle: 62 Image: pulsball Warhead@1Eff: CreateEffect Explosions: pulse_explosion