From 61559286788cfa7ab7ad298f1dc49d4a0d60d7f9 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 17 Feb 2015 00:47:57 +0100 Subject: [PATCH 1/3] Don't display beacons in the air --- OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs | 2 +- OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs index 69c6af5492..f75d831fa3 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs +++ 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, diff --git a/OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs index 7951cf67e3..580c6e1d43 100644 --- a/OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs +++ b/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, From c70edc65fe7ae9f7255acdc6bc6d1f09e538148b Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 17 Feb 2015 00:48:23 +0100 Subject: [PATCH 2/3] Change cruise altitudes and fall rates --- mods/ra/rules/aircraft.yaml | 10 ++++++++++ mods/ra/rules/defaults.yaml | 3 +++ mods/ra/weapons.yaml | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 762f747cbb..2128a90ce6 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/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: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 2ded9840f8..02a4884017 100644 --- a/mods/ra/rules/defaults.yaml +++ b/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 @@ -706,6 +708,7 @@ Types: Crate BodyOrientation: Parachutable: + FallRate: 26 KilledOnImpassableTerrain: false ParachuteSequence: parach Passenger: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 96b63eaf59..0f50b078ec 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1106,7 +1106,7 @@ ParaBomb: Report: CHUTE1.AUD Projectile: GravityBomb Image: PARABOMB - Velocity: 43 + Velocity: 86 Acceleration: 0 Warhead@1Dam: SpreadDamage Spread: 768 From adffd33f4d9a3d480cce203b0d8e2e8999200c82 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 18 Feb 2015 22:06:10 +0100 Subject: [PATCH 3/3] Don't repulse actors flying with another altitude --- OpenRA.Mods.Common/Traits/Air/Aircraft.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs index 28e4a2411f..3cb03d2d7e 100644 --- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs +++ b/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()) + .Where(a => !a.IsDead && a.HasTrait() && a.Info.Traits.Get().CruiseAltitude == info.CruiseAltitude) .Select(GetRepulsionForce) .Aggregate(WVec.Zero, (a, b) => a + b); }