epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Bullet Angle to LaunchAngle

Browse Source
This commit is contained in:
reaperrr
2016-09-09 16:10:33 +02:00
parent 8ba9afdb16
commit 20cd2aa4ab
16 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Projectiles/Bullet.cs
View File

@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Projectiles
public readonly WDist TargetExtraSearchRadius = new WDist(1536); public readonly WDist TargetExtraSearchRadius = new WDist(1536);
[Desc("Arc in WAngles, two values indicate variable arc.")] [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.")] [Desc("Interval in ticks between each spawned Trail animation.")]
public readonly int TrailInterval = 2; public readonly int TrailInterval = 2;
@@ -111,10 +111,10 @@ namespace OpenRA.Mods.Common.Projectiles
var world = args.SourceActor.World; var world = args.SourceActor.World;
if (info.Angle.Length > 1) if (info.LaunchAngle.Length > 1)
angle = new WAngle(world.SharedRandom.Next(info.Angle[0].Angle, info.Angle[1].Angle)); angle = new WAngle(world.SharedRandom.Next(info.LaunchAngle[0].Angle, info.LaunchAngle[1].Angle));
else else
angle = info.Angle[0]; angle = info.LaunchAngle[0];
if (info.Speed.Length > 1) if (info.Speed.Length > 1)
speed = new WDist(world.SharedRandom.Next(info.Speed[0].Length, info.Speed[1].Length)); speed = new WDist(world.SharedRandom.Next(info.Speed[0].Length, info.Speed[1].Length));

7
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -478,6 +478,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Key = "Duration"; 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); UpgradeWeaponRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
} }
} }

2
mods/cnc/weapons/largecaliber.yaml
View File

@@ -123,7 +123,7 @@ ArtilleryShell:
Projectile: Bullet Projectile: Bullet
Speed: 204 Speed: 204
Blockable: false Blockable: false
Angle: 56 LaunchAngle: 56
Inaccuracy: 1c256 Inaccuracy: 1c256
ContrailLength: 30 ContrailLength: 30
Image: 120MM Image: 120MM

4
mods/cnc/weapons/missiles.yaml
View File

@@ -182,7 +182,7 @@ MammothMissiles:
Blockable: false Blockable: false
Shadow: true Shadow: true
Inaccuracy: 853 Inaccuracy: 853
Angle: 62 LaunchAngle: 62
Image: DRAGON Image: DRAGON
RateOfTurn: 2 RateOfTurn: 2
ContrailLength: 10 ContrailLength: 10
@@ -349,7 +349,7 @@ HonestJohn:
TrailImage: smokey TrailImage: smokey
Speed: 187 Speed: 187
RangeLimit: 35 RangeLimit: 35
Angle: 88 LaunchAngle: 88
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 256 Spread: 256
Damage: 100 Damage: 100

2
mods/cnc/weapons/other.yaml
View File

@@ -81,7 +81,7 @@ Grenade:
Projectile: Bullet Projectile: Bullet
Speed: 140 Speed: 140
Blockable: false Blockable: false
Angle: 62 LaunchAngle: 62
Inaccuracy: 213 Inaccuracy: 213
Image: BOMB Image: BOMB
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage

8
mods/d2k/weapons/debris.yaml
View File

@@ -4,7 +4,7 @@ Debris:
Projectile: Bullet Projectile: Bullet
Speed: 32, 96 Speed: 32, 96
Blockable: false Blockable: false
Angle: 30, 90 LaunchAngle: 30, 90
Inaccuracy: 1c256 Inaccuracy: 1c256
Image: shrapnel Image: shrapnel
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
@@ -36,7 +36,7 @@ Debris2:
Projectile: Bullet Projectile: Bullet
Speed: 32, 96 Speed: 32, 96
Blockable: false Blockable: false
Angle: 30, 90 LaunchAngle: 30, 90
Inaccuracy: 1c256 Inaccuracy: 1c256
Image: shrapnel2 Image: shrapnel2
TrailImage: bazooka_trail TrailImage: bazooka_trail
@@ -71,7 +71,7 @@ Debris3:
Projectile: Bullet Projectile: Bullet
Speed: 32, 96 Speed: 32, 96
Blockable: false Blockable: false
Angle: 30, 90 LaunchAngle: 30, 90
Inaccuracy: 1c256 Inaccuracy: 1c256
Image: shrapnel3 Image: shrapnel3
TrailImage: large_trail TrailImage: large_trail
@@ -106,7 +106,7 @@ Debris4:
Projectile: Bullet Projectile: Bullet
Speed: 32, 96 Speed: 32, 96
Blockable: false Blockable: false
Angle: 30, 90 LaunchAngle: 30, 90
Inaccuracy: 1c256 Inaccuracy: 1c256
Image: shrapnel4 Image: shrapnel4
TrailImage: large_trail TrailImage: large_trail

2
mods/d2k/weapons/largeguns.yaml
View File

@@ -99,7 +99,7 @@ DevBullet:
Speed: 192 Speed: 192
Blockable: false Blockable: false
Shadow: yes Shadow: yes
Angle: 62 LaunchAngle: 62
Inaccuracy: 768 Inaccuracy: 768
ContrailLength: 20 ContrailLength: 20
Image: 155mm Image: 155mm

4
mods/d2k/weapons/other.yaml
View File

@@ -192,7 +192,7 @@ grenade:
Projectile: Bullet Projectile: Bullet
Speed: 256 Speed: 256
Blockable: false Blockable: false
Angle: 75 LaunchAngle: 75
Inaccuracy: 416 Inaccuracy: 416
Image: grenade Image: grenade
Shadow: true Shadow: true
@@ -261,7 +261,7 @@ SpiceExplosion:
Projectile: Bullet Projectile: Bullet
Speed: 50, 75 Speed: 50, 75
Blockable: false Blockable: false
Angle: 60, 90 LaunchAngle: 60, 90
TrailImage: large_trail TrailImage: large_trail
Image: 120mm Image: 120mm
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage

4
mods/ra/weapons/largecaliber.yaml
View File

@@ -146,7 +146,7 @@ TurretGun:
Projectile: Bullet Projectile: Bullet
Speed: 204 Speed: 204
Blockable: false Blockable: false
Angle: 62 LaunchAngle: 62
Inaccuracy: 1c682 Inaccuracy: 1c682
Image: 120MM Image: 120MM
ContrailLength: 30 ContrailLength: 30
@@ -180,7 +180,7 @@ TurretGun:
Projectile: Bullet Projectile: Bullet
Speed: 204 Speed: 204
Blockable: false Blockable: false
Angle: 62 LaunchAngle: 62
Inaccuracy: 2c938 Inaccuracy: 2c938
Image: 120MM Image: 120MM
ContrailLength: 30 ContrailLength: 30

4
mods/ra/weapons/missiles.yaml
View File

@@ -251,7 +251,7 @@ SubMissile:
Projectile: Bullet Projectile: Bullet
Speed: 162 Speed: 162
Blockable: false Blockable: false
Angle: 120 LaunchAngle: 120
Inaccuracy: 2c938 Inaccuracy: 2c938
Image: MISSILE Image: MISSILE
TrailImage: smokey TrailImage: smokey
@@ -422,7 +422,7 @@ SCUD:
TrailDelay: 5 TrailDelay: 5
Inaccuracy: 213 Inaccuracy: 213
Image: V2 Image: V2
Angle: 62 LaunchAngle: 62
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 341 Spread: 341
Damage: 45 Damage: 45

6
mods/ra/weapons/other.yaml
View File

@@ -36,7 +36,7 @@ Flamer:
Speed: 170 Speed: 170
TrailImage: fb4 TrailImage: fb4
Image: fb3 Image: fb3
Angle: 62 LaunchAngle: 62
Inaccuracy: 853 Inaccuracy: 853
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 341 Spread: 341
@@ -93,7 +93,7 @@ Grenade:
Projectile: Bullet Projectile: Bullet
Speed: 136 Speed: 136
Blockable: false Blockable: false
Angle: 62 LaunchAngle: 62
Inaccuracy: 554 Inaccuracy: 554
Image: BOMB Image: BOMB
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
@@ -125,7 +125,7 @@ DepthCharge:
Projectile: Bullet Projectile: Bullet
Speed: 85 Speed: 85
Image: BOMB Image: BOMB
Angle: 62 LaunchAngle: 62
Blockable: false Blockable: false
Inaccuracy: 128 Inaccuracy: 128
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage

4
mods/ts/weapons/bombsandgrenades.yaml
View File

@@ -5,7 +5,7 @@ Grenade:
Speed: 85 Speed: 85
Blockable: false Blockable: false
Shadow: true Shadow: true
Angle: 45 LaunchAngle: 45
Inaccuracy: 384 Inaccuracy: 384
Image: DISCUS Image: DISCUS
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
@@ -72,7 +72,7 @@ RPGTower:
Speed: 384 Speed: 384
Blockable: false Blockable: false
Shadow: true Shadow: true
Angle: 62 LaunchAngle: 62
Image: canister Image: canister
Palette: player Palette: player
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage

4
mods/ts/weapons/explosions.yaml
View File

@@ -61,7 +61,7 @@ SmallDebris:
Report: Report:
Projectile: Bullet Projectile: Bullet
Speed: 50, 125 Speed: 50, 125
Angle: 45, 135 LaunchAngle: 45, 135
Image: dbrissm Image: dbrissm
Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
Shadow: true Shadow: true
@@ -72,7 +72,7 @@ LargeDebris:
Report: Report:
Projectile: Bullet Projectile: Bullet
Speed: 50, 125 Speed: 50, 125
Angle: 45, 135 LaunchAngle: 45, 135
Image: dbrislg Image: dbrislg
Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
Shadow: true Shadow: true

6
mods/ts/weapons/largeguns.yaml
View File

@@ -6,7 +6,7 @@
Speed: 682 Speed: 682
Image: 120mm Image: 120mm
Shadow: true Shadow: true
Angle: 75 LaunchAngle: 75
Palette: ra Palette: ra
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 128 Spread: 128
@@ -70,7 +70,7 @@
Speed: 682 Speed: 682
Image: 120mm Image: 120mm
Shadow: true Shadow: true
Angle: 62 LaunchAngle: 62
Palette: ra Palette: ra
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 128 Spread: 128
@@ -102,7 +102,7 @@
Projectile: Bullet Projectile: Bullet
Speed: 170 Speed: 170
Image: 120mm Image: 120mm
Angle: 165 LaunchAngle: 165
Shadow: true Shadow: true
Blockable: false Blockable: false
Palette: ra Palette: ra

2
mods/ts/weapons/otherweapons.yaml
View File

@@ -32,7 +32,7 @@ FiendShard:
Image: CRYSTAL4 Image: CRYSTAL4
Inaccuracy: 512 Inaccuracy: 512
Shadow: true Shadow: true
Angle: 60 LaunchAngle: 60
Palette: greentiberium Palette: greentiberium
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Damage: 35 Damage: 35

2
mods/ts/weapons/superweapons.yaml
View File

@@ -97,7 +97,7 @@ EMPulseCannon:
Speed: 425 Speed: 425
Blockable: false Blockable: false
Shadow: true Shadow: true
Angle: 62 LaunchAngle: 62
Image: pulsball Image: pulsball
Warhead@1Eff: CreateEffect Warhead@1Eff: CreateEffect
Explosions: pulse_explosion Explosions: pulse_explosion