Merge pull request #7487 from abcdefg30/changealtitude

Change the plane altitude in ra

OpenRA.Mods.Common/Traits/Air/Aircraft.cs

@@ -95,7 +95,7 @@ namespace OpenRA.Mods.Common.Traits
 				return WVec.Zero;
 
 			return self.World.FindActorsInCircle(self.CenterPosition, info.IdealSeparation)
-				.Where(a => !a.IsDead && a.HasTrait<Aircraft>())
+				.Where(a => !a.IsDead && a.HasTrait<Aircraft>() && a.Info.Traits.Get<AircraftInfo>().CruiseAltitude == info.CruiseAltitude)
 				.Select(GetRepulsionForce)
 				.Aggregate(WVec.Zero, (a, b) => a + b);
 		}

OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs

@@ -168,7 +168,7 @@ namespace OpenRA.Mods.Common.Traits
 
 					beacon = new Beacon(
 						self.Owner,
-						target,
+						target - new WVec(0, 0, altitude),
 						Info.BeaconPalettePrefix,
 						Info.BeaconPoster,
 						Info.BeaconPosterPalette,

OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs

@@ -198,7 +198,7 @@ namespace OpenRA.Mods.RA.Traits
 
 					beacon = new Beacon(
 						self.Owner,
-						target,
+						target - new WVec(0, 0, altitude),
 						Info.BeaconPalettePrefix,
 						Info.BeaconPoster,
 						Info.BeaconPosterPalette,

mods/ra/rules/aircraft.yaml

@@ -7,9 +7,11 @@ BADR:
 	Armor:
 		Type: Light
 	Plane:
+		CruiseAltitude: 2560
 		ROT: 5
 		Speed: 149
 		Repulsable: False
+		MaximumPitch: 56
 	RenderUnit:
 	Cargo:
 		MaxWeight: 10
@@ -43,9 +45,11 @@ BADR.Bomber:
 	Armor:
 		Type: Light
 	Plane:
+		CruiseAltitude: 2560
 		ROT: 5
 		Speed: 149
 		Repulsable: False
+		MaximumPitch: 56
 	LimitedAmmo:
 		Ammo: 7
 	RenderUnit:
@@ -95,11 +99,13 @@ MIG:
 	AttackPlane:
 		FacingTolerance: 20
 	Plane:
+		CruiseAltitude: 2560
 		InitialFacing: 192
 		ROT: 4
 		Speed: 223
 		RearmBuildings: afld
 		RepulsionSpeed: 40
+		MaximumPitch: 56
 	AutoTarget:
 		TargetWhenIdle: false
 		TargetWhenDamaged: false
@@ -151,11 +157,13 @@ YAK:
 	AttackPlane:
 		FacingTolerance: 20
 	Plane:
+		CruiseAltitude: 2560
 		RearmBuildings: afld
 		InitialFacing: 192
 		ROT: 4
 		Speed: 178
 		RepulsionSpeed: 40
+		MaximumPitch: 56
 	AutoTarget:
 		TargetWhenIdle: false
 		TargetWhenDamaged: false
@@ -322,9 +330,11 @@ U2:
 	Armor:
 		Type: Heavy
 	Plane:
+		CruiseAltitude: 2560
 		ROT: 7
 		Speed: 373
 		Repulsable: False
+		MaximumPitch: 56
 	RenderUnit:
 	AttackBomber:
 	-Selectable:

mods/ra/rules/defaults.yaml

@@ -148,6 +148,7 @@
 		Upgrade: invulnerability
 	MustBeDestroyed:
 	Parachutable:
+		FallRate: 26
 		ParachuteOffset: 0,0,200
 		KilledOnImpassableTerrain: true
 		ParachuteSequence: parach
@@ -227,6 +228,7 @@
 		DeathSound: Zapped
 		DeathTypes: 6
 	Parachutable:
+		FallRate: 26
 		ParachuteOffset: 0,0,427
 		KilledOnImpassableTerrain: true
 		ParachuteSequence: parach
@@ -705,6 +707,7 @@
 		Types: Crate
 	BodyOrientation:
 	Parachutable:
+		FallRate: 26
 		KilledOnImpassableTerrain: false
 		ParachuteSequence: parach
 	Passenger:

mods/ra/weapons.yaml

@@ -1093,7 +1093,7 @@ ParaBomb:
 	Report: CHUTE1.AUD
 	Projectile: GravityBomb
 		Image: PARABOMB
-		Velocity: 43
+		Velocity: 86
 		Acceleration: 0
 	Warhead@1Dam: SpreadDamage
 		Spread: 768