Merge pull request #11382 from reaperrr/projectile-streamlining

Moved projectiles to their own namespace and streamlined property names
2016-06-04 15:00:08 +02:00
parent fa3264affc e423f965cf
commit 916f2ea2ea
19 changed files with 82 additions and 56 deletions
--- a/mods/cnc/weapons/missiles.yaml
+++ b/mods/cnc/weapons/missiles.yaml
@@ -184,7 +184,7 @@ MammothMissiles:
 		Image: DRAGON
 		RateOfTurn: 2
 		ContrailLength: 10
-		Trail: smokey
+		TrailImage: smokey
 		Speed: 341
 	Warhead@1Dam: SpreadDamage
 		Spread: 683
@@ -342,7 +342,7 @@ HonestJohn:
 		Shadow: true
 		Inaccuracy: 213
 		Image: patriot
-		Trail: smokey
+		TrailImage: smokey
 		Speed: 187
 		RangeLimit: 35
 		Angle: 88
--- a/mods/d2k/weapons/debris.yaml
+++ b/mods/d2k/weapons/debris.yaml
@@ -38,7 +38,7 @@ Debris2:
 		Angle: 30, 90
 		Inaccuracy: 1c256
 		Image: shrapnel2
-		Trail: bazooka_trail
+		TrailImage: bazooka_trail
 		TrailPalette: effect75alpha
 		TrailInterval: 2
 	Warhead@1Dam: SpreadDamage
@@ -72,7 +72,7 @@ Debris3:
 		Angle: 30, 90
 		Inaccuracy: 1c256
 		Image: shrapnel3
-		Trail: large_trail
+		TrailImage: large_trail
 		TrailPalette: effect75alpha
 		TrailInterval: 1
 	Warhead@1Dam: SpreadDamage
@@ -106,7 +106,7 @@ Debris4:
 		Angle: 30, 90
 		Inaccuracy: 1c256
 		Image: shrapnel4
-		Trail: large_trail
+		TrailImage: large_trail
 		TrailPalette: effect75alpha
 		TrailInterval: 1
 	Warhead@1Dam: SpreadDamage
--- a/mods/d2k/weapons/other.yaml
+++ b/mods/d2k/weapons/other.yaml
@@ -265,7 +265,7 @@ SpiceExplosion:
 		Speed: 50, 75
 		Blockable: false
 		Angle: 60, 90
-		Trail: large_trail
+		TrailImage: large_trail
 		Image: 120mm
 	Warhead@1Dam: SpreadDamage
 		Spread: 320
--- a/mods/ra/maps/drop-zone-w/weapons.yaml
+++ b/mods/ra/maps/drop-zone-w/weapons.yaml
@@ -41,7 +41,7 @@ SubMissile:
 		Angle: 62
 		Inaccuracy: 2c938
 		Image: MISSILE
-		Trail: smokey
+		TrailImage: smokey
 		ContrailLength: 30
 	Warhead: SpreadDamage
 		Spread: 426
--- a/mods/ra/maps/soviet-07/weapons.yaml
+++ b/mods/ra/maps/soviet-07/weapons.yaml
@@ -27,7 +27,7 @@ FireballLauncherInterior:
 	BurstDelay: 20
 	Projectile: Bullet
 		Speed: 204
-		Trail: fb2
+		TrailImage: fb2
 		Image: FB1
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
--- a/mods/ra/weapons/missiles.yaml
+++ b/mods/ra/weapons/missiles.yaml
@@ -256,7 +256,7 @@ SubMissile:
 		Angle: 165
 		Inaccuracy: 2c938
 		Image: MISSILE
-		Trail: smokey
+		TrailImage: smokey
 		ContrailLength: 30
 	Warhead@1Dam: SpreadDamage
 		Spread: 426
@@ -409,7 +409,7 @@ SCUD:
 		Speed: 170
 		Blockable: false
 		Shadow: false
-		Trail: smokey
+		TrailImage: smokey
 		TrailDelay: 5
 		Inaccuracy: 213
 		Image: V2
--- a/mods/ra/weapons/other.yaml
+++ b/mods/ra/weapons/other.yaml
@@ -6,7 +6,7 @@ FireballLauncher:
 	BurstDelay: 20
 	Projectile: Bullet
 		Speed: 204
-		Trail: fb2
+		TrailImage: fb2
 		Image: FB1
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
@@ -33,7 +33,7 @@ Flamer:
 	BurstDelay: 1
 	Projectile: Bullet
 		Speed: 170
-		Trail: fb4
+		TrailImage: fb4
 		Image: fb3
 		Angle: 62
 		Inaccuracy: 853
--- a/mods/ra/weapons/superweapons.yaml
+++ b/mods/ra/weapons/superweapons.yaml
@@ -5,7 +5,7 @@ ParaBomb:
 	Projectile: GravityBomb
 		Image: PARABOMB
 		OpenSequence: open
-		Velocity: 86
+		Speed: 86
 		Acceleration: 0
 	Warhead@1Dam: SpreadDamage
 		Spread: 768