Implement terror drone jumping into vehicles.

OpenRA · Jul 23, 2020 · 1df3b96 · 1df3b96
1 parent c9c2479
commit 1df3b96
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 6 deletions.
diff --git a/mods/ra2/rules/defaults.yaml b/mods/ra2/rules/defaults.yaml
@@ -564,6 +564,7 @@
 	Inherits@4: ^ChronoDisable
 	Inherits@5: ^CrateStatModifiers
 	Inherits@6: ^DamagedByRadiation
+	Inherits@7: ^AffectedByTerrorDrone
 	Health:
 	OwnerLostAction:
 		Action: Kill
@@ -649,6 +650,7 @@
 		Categories: Infantry
 
 ^Parachutable:
+	Inherits: ^ParachutableAffectedByTerrorDrone
 	WithSpriteBody@Parachute:
 		Name: parachute
 		Sequence: paradrop
@@ -682,6 +684,7 @@
 		Condition: parachute
 
 ^ParachutableVehicle:
+	Inherits: ^ParachutableAffectedByTerrorDrone
 	Parachutable:
 		FallRate: 26
 		KilledOnImpassableTerrain: true
@@ -701,6 +704,15 @@
 	Targetable@airborne:
 		TargetTypes: Air
 		RequiresCondition: parachute
+	Targetable@Parasiteable:
+		TargetTypes: DroneParasiteable
+		RequiresCondition: !parachute && !infected
+	Targetable@byTerrorDrone:
+		TargetTypes: ValidForTerrorDrone
+		RequiresCondition: !parachute
+	Targetable@InfectedByTerrorDrone:
+		TargetTypes: TerrorDroned
+		RequiresCondition: !parachute && infected
 	ExternalCondition@PARACHUTE:
 		Condition: parachute
 
@@ -821,6 +833,7 @@
 	Inherits@4: ^ChronoDisable
 	Inherits@5: ^CrateStatModifiers
 	Inherits@6: ^ParachutableVehicle
+	Inherits@7: ^AffectedByTerrorDrone
 	OwnerLostAction:
 		Action: Kill
 		DeathTypes: BulletDeath
@@ -1230,3 +1243,32 @@
 	MapEditorData:
 		Categories: System
 	Interactable:
+
+^AffectedByTerrorDrone:
+	Targetable@Parasiteable:
+		TargetTypes: DroneParasiteable
+		RequiresCondition: !infected
+	Targetable@byTerrorDrone:
+		TargetTypes: ValidForTerrorDrone
+	Targetable@InfectedByTerrorDrone:
+		TargetTypes: TerrorDroned
+		RequiresCondition: infected
+	Infectable:
+		RemoveInfectorDamageTypes: DropTerrorDrone
+		KillInfectorDamageTypes: KillTerrorDrone
+		BeingInfectedCondition: being-infected
+		InfectedCondition: infected
+	SpeedMultiplier@Infected:
+		Modifier: 0
+		RequiresCondition: being-infected
+
+^ParachutableAffectedByTerrorDrone:
+	Targetable@Parasiteable:
+		TargetTypes: DroneParasiteable
+		RequiresCondition: !parachute && !infected
+	Targetable@byTerrorDrone:
+		TargetTypes: ValidForTerrorDrone
+		RequiresCondition: !parachute
+	Targetable@InfectedByTerrorDrone:
+		TargetTypes: TerrorDroned
+		RequiresCondition: !parachute && infected
diff --git a/mods/ra2/rules/soviet-vehicles.yaml b/mods/ra2/rules/soviet-vehicles.yaml
@@ -132,17 +132,24 @@ dron:
 	-RenderVoxels:
 	WithInfantryBody:
 		StandSequences: stand
-		DefaultAttackSequence: shoot
+		DefaultAttackSequence: jump
+		RequiresCondition: !jumping
+	WithFacingSpriteBody:
+		Sequence: shoot
+		RequiresCondition: jumping
 	Armament:
 		Weapon: DroneJump
-		ReloadingCondition: attack-cooldown
-	AttackLeap:
+	AttackInfect:
 		Voice: Attack
-		PauseOnCondition: attacking || attack-cooldown
+		Damage: 25
+		DamageInterval: 20
+		DamageTypes: DefaultDeath, BulletDeath, DroneSurvive
+		SurviveHostDamageTypes: DroneSurvive
+		JumpRange: 1c768
 	AutoTarget:
 		InitialStance: AttackAnything
 	AutoTargetPriority@DEFAULT:
-		ValidTargets: Infantry
+		ValidTargets: DroneParasiteable
 	Voiced:
 		VoiceSet: TerrorDroneVoice
 	HitShape:

diff --git a/mods/ra2/weapons/melee.yaml b/mods/ra2/weapons/melee.yaml
@@ -23,8 +23,29 @@ DogJaw:
 		DamageTypes: BulletDeath
 
 DroneJump:
-	Inherits: DogJaw
+	ValidTargets: DroneParasiteable
+	ReloadDelay: 10
+	Range: 3c0
 	Report: vteratta.wav
+	Projectile: InstantHit
+	Warhead@1Dam: SpreadDamage
+		Spread: 64
+		Falloff: 100, 0
+		Damage: 10000
+		ValidTargets: ValidForTerrorDrone
+		Versus:
+			None: 100
+			Flak: 100
+			Plate: 100
+			Light: 0
+			Medium: 0
+			Heavy: 0
+			Wood: 0
+			Steel: 0
+			Concrete: 0
+			Drone: 0
+			Rocket: 0
+		DamageTypes: AltBulletDeath, DefaultDeath, DroneSurvive
 
 AlligatorBite:
 	ReloadDelay: 30