From 198d6b2e9edb8fd5a52209d18831d6cb4c99a64b Mon Sep 17 00:00:00 2001 From: Scott_NZ Date: Fri, 10 May 2013 02:21:03 +1200 Subject: [PATCH 1/4] Buff mammoth tank cannons and missile launchers --- mods/ra/weapons.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 93e6161006..3307e52b74 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -462,7 +462,7 @@ Grenade: WaterExplosion: small_splash InfDeath: 4 SmudgeType: Crater - Damage: 50 + Damage: 60 TurretGun: ROF: 30 @@ -491,7 +491,7 @@ MammothTusk: Burst: 2 ValidTargets: Ground, Air Projectile: Missile - Speed: 30 + Speed: 40 Arm: 2 High: true Shadow: false @@ -500,7 +500,7 @@ MammothTusk: ContrailLength: 10 Inaccuracy: 3 Image: DRAGON - ROT: 10 + ROT: 15 RangeLimit: 40 Warhead: Spread: 6 @@ -756,7 +756,7 @@ SubMissile: Warhead: Spread: 10 Versus: - None: 40%, + None: 40% Light: 30% Heavy: 30% Explosion: large_explosion From 57d66ed60d12903d346438087c180d9265579f08 Mon Sep 17 00:00:00 2001 From: Scott_NZ Date: Fri, 10 May 2013 02:21:57 +1200 Subject: [PATCH 2/4] Increase CA ROT and speed. Increase its damage spread and accuracy. --- mods/ra/rules/ships.yaml | 4 ++-- mods/ra/weapons.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 76d2c3d7db..198d7ea72b 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -164,8 +164,8 @@ CA: Armor: Type: Heavy Mobile: - ROT: 2 - Speed: 2 + ROT: 3 + Speed: 3 RevealsShroud: Range: 7 Turreted@PRIMARY: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 3307e52b74..912222d05c 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -721,11 +721,11 @@ RedEye: Speed: 12 High: true Angle: .1 - Inaccuracy: 80 + Inaccuracy: 70 Image: 120MM ContrailLength: 30 Warhead: - Spread: 3 + Spread: 5 Versus: None: 60% Wood: 75% From 8fe7f3f8746c35f2fcd7a7db76c61b2971ec5a55 Mon Sep 17 00:00:00 2001 From: Scott_NZ Date: Fri, 10 May 2013 02:22:13 +1200 Subject: [PATCH 3/4] Increase badr and badr.bomber healths --- mods/ra/rules/aircraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index d810f29d74..f60e6fe694 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -3,7 +3,7 @@ BADR: LZRange: 4 Inherits: ^Plane Health: - HP: 60 + HP: 300 Armor: Type: Light Plane: @@ -42,7 +42,7 @@ BADR.bomber: Weapon: ParaBomb Inherits: ^Plane Health: - HP: 60 + HP: 300 Armor: Type: Light Plane: From 48010197f41210d84b04951a485f46237b8df159 Mon Sep 17 00:00:00 2001 From: Scott_NZ Date: Fri, 10 May 2013 13:05:49 +1200 Subject: [PATCH 4/4] Make mines targetable and removable. Let AP mines do damage against vehicles. Let all mines do damage against friendly units. --- OpenRA.Mods.RA/Mine.cs | 6 ++---- mods/ra/rules/system.yaml | 28 +++++++++++++++++++--------- mods/ra/weapons.yaml | 6 +++--- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/OpenRA.Mods.RA/Mine.cs b/OpenRA.Mods.RA/Mine.cs index ab91a66ece..8d57909240 100644 --- a/OpenRA.Mods.RA/Mine.cs +++ b/OpenRA.Mods.RA/Mine.cs @@ -20,7 +20,6 @@ namespace OpenRA.Mods.RA class MineInfo : ITraitInfo { public readonly string[] CrushClasses = { }; - [WeaponReference] public readonly string Weapon = "ATMine"; public readonly bool AvoidFriendly = true; public readonly string[] DetonateClasses = { }; @@ -44,15 +43,14 @@ namespace OpenRA.Mods.RA public void OnCrush(Actor crusher) { - if (crusher.HasTrait() || self.Owner.Stances[crusher.Owner] == Stance.Ally) + if (crusher.HasTrait() || (self.Owner.Stances[crusher.Owner] == Stance.Ally && info.AvoidFriendly)) return; var mobile = crusher.TraitOrDefault(); if (mobile != null && !info.DetonateClasses.Intersect(mobile.Info.Crushes).Any()) return; - Combat.DoExplosion(self, info.Weapon, crusher.CenterLocation, 0); - self.QueueActivity(new RemoveSelf()); + self.Kill(crusher); } public bool CrushableBy(string[] crushClasses, Player owner) diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml index 811112857c..57566ce5dc 100644 --- a/mods/ra/rules/system.yaml +++ b/mods/ra/rules/system.yaml @@ -651,12 +651,15 @@ World: MINP: Mine: - Weapon: APMine CrushClasses: apmine,atmine - DetonateClasses: apmine - AvoidFriendly: yes + DetonateClasses: apmine,atmine + AvoidFriendly: no + Explodes: + Weapon: APMine Health: - HP: 1 + HP: 50 + Armor: + Type: Light RenderSimple: BelowUnits: Cloak: @@ -667,16 +670,21 @@ MINP: Name: Anti-Personnel Mine Icon: jmin ProximityCaptor: - Types:Mine + Types: Mine + TargetableUnit: + TargetTypes: Ground MINV: Mine: - Weapon: ATMine CrushClasses: atmine,apmine DetonateClasses: atmine - AvoidFriendly: yes + AvoidFriendly: no + Explodes: + Weapon: ATMine Health: - HP: 1 + HP: 50 + Armor: + Type: Light RenderSimple: BelowUnits: Cloak: @@ -687,7 +695,9 @@ MINV: Name: Anti-Tank Mine Icon: jmin ProximityCaptor: - Types:Mine + Types: Mine + TargetableUnit: + TargetTypes: Ground CRATE: Tooltip: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 912222d05c..1058e4b757 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1161,11 +1161,11 @@ ATMine: APMine: Warhead: - Damage: 700 + Damage: 500 Versus: Wood: 0% - Light: 0% - Heavy: 0% + Light: 10% + Heavy: 10% Concrete: 0% ImpactSound: mine1 InfDeath: 3