From d750db26b71473bf11f627f24322a0e6a2e1298e Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 22 Jan 2019 23:52:49 +0000 Subject: [PATCH] Replace AttackSuicides with AttackFrontal and conditions in RA. --- mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml | 6 +++++- mods/ra/maps/drop-zone/rules.yaml | 6 +++++- mods/ra/rules/vehicles.yaml | 11 +++++++++-- mods/ra/weapons/other.yaml | 7 +++++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml index cbd5ee7972..076be08587 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml @@ -48,9 +48,13 @@ HARV: Health: HP: 10000 Explodes: + -RequiresCondition: Weapon: CrateNuke EmptyWeapon: CrateNuke - AttackSuicides: + GrantConditionOnDeploy: + DeployedCondition: triggered + KillsSelf: + RequiresCondition: triggered Buildable: Description: Explodes like a damn nuke! diff --git a/mods/ra/maps/drop-zone/rules.yaml b/mods/ra/maps/drop-zone/rules.yaml index cbd5ee7972..076be08587 100644 --- a/mods/ra/maps/drop-zone/rules.yaml +++ b/mods/ra/maps/drop-zone/rules.yaml @@ -48,9 +48,13 @@ HARV: Health: HP: 10000 Explodes: + -RequiresCondition: Weapon: CrateNuke EmptyWeapon: CrateNuke - AttackSuicides: + GrantConditionOnDeploy: + DeployedCondition: triggered + KillsSelf: + RequiresCondition: triggered Buildable: Description: Explodes like a damn nuke! diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 569ad5c729..47aa6a2f9b 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -723,10 +723,17 @@ DTRK: Weapon: MiniNuke EmptyWeapon: MiniNuke DamageSource: Killer - AttackSuicides: + AttackFrontal: + FacingTolerance: 128 + Armament@PRIMARY: + Weapon: DemoTruckTargeting + GrantConditionOnAttack: + Condition: triggered + GrantConditionOnDeploy: + DeployedCondition: triggered -DamageMultiplier@IRONCURTAIN: KillsSelf: - RequiresCondition: invulnerability + RequiresCondition: invulnerability || triggered Chronoshiftable: ExplodeInstead: yes diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index b9e67ac755..efa2e5c678 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -208,6 +208,13 @@ AntFireball: Heavy: 20 Concrete: 15 +DemoTruckTargeting: + ValidTargets: DetonateAttack + Range: 2c0 + Projectile: InstantHit + Warhead@1Dam: TargetDamage + ValidTargets: DetonateAttack + MADTankThump: InvalidTargets: MADTank, Infantry Warhead@1Dam: HealthPercentageDamage