Replace AttackSuicides with AttackFrontal and conditions in RA.

2019-01-22 23:52:49 +00:00
parent 0464a0db58
commit d750db26b7
4 changed files with 26 additions and 4 deletions
--- 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!

--- 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!

--- 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

--- 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