Make TS aircraft crash when EMP'd mid-air

And refuse move orders if EMP'd while landed.
Matches original behaviour.

mods/ts/rules/aircraft.yaml

@@ -67,10 +67,9 @@ DSHP:
 		Actor: DSHP.Husk
 
 ORCA:
-	Inherits: ^Aircraft
+	Inherits: ^EMPableAircraft
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	Inherits@EMPDISABLE: ^EmpDisable
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -121,10 +120,9 @@ ORCA:
 		RearmActors: gahpad, nahpad
 
 ORCAB:
-	Inherits: ^Aircraft
+	Inherits: ^EMPableAircraft
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	Inherits@EMPDISABLE: ^EmpDisable
 	Valued:
 		Cost: 1600
 	Tooltip:
@@ -179,8 +177,7 @@ ORCAB:
 		RearmActors: gahpad, nahpad
 
 ORCATRAN:
-	Inherits: ^Aircraft
-	Inherits@EMPDISABLE: ^EmpDisable
+	Inherits: ^EMPableAircraft
 	Valued:
 		Cost: 1200
 	Tooltip:
@@ -217,10 +214,13 @@ ORCATRAN:
 		AfterUnloadDelay: 40
 	SpawnActorOnDeath:
 		Actor: ORCATRAN.Husk
+		RequiresCondition: !empdisable
+	SpawnActorOnDeath@EMP:
+		Actor: ORCATRAN.Husk.EMP
+		RequiresCondition: empdisable
 
 TRNSPORT:
-	Inherits: ^Aircraft
-	Inherits@EMPDISABLE: ^EmpDisable
+	Inherits: ^EMPableAircraft
 	Valued:
 		Cost: 750
 	Tooltip:
@@ -255,12 +255,15 @@ TRNSPORT:
 		Bounds: 44,32,0,-8
 	SpawnActorOnDeath:
 		Actor: TRNSPORT.Husk
+		RequiresCondition: !empdisable
+	SpawnActorOnDeath@EMP:
+		Actor: TRNSPORT.Husk.EMP
+		RequiresCondition: empdisable
 
 SCRIN:
-	Inherits: ^Aircraft
+	Inherits: ^EMPableAircraft
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	Inherits@EMPDISABLE: ^EmpDisable
 	Valued:
 		Cost: 1500
 	Tooltip:
@@ -280,7 +283,6 @@ SCRIN:
 		CruiseAltitude: 5c0
 		TurnSpeed: 3
 		Speed: 168
-		AirborneCondition: airborne
 		TakeoffSounds: dropup1.aud
 		LandingSounds: dropdwn1.aud
 		CanHover: false
@@ -315,10 +317,9 @@ SCRIN:
 		RearmActors: gahpad, nahpad
 
 APACHE:
-	Inherits: ^Aircraft
+	Inherits: ^EMPableAircraft
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	Inherits@EMPDISABLE: ^EmpDisable
 	Valued:
 		Cost: 1000
 	Tooltip:

mods/ts/rules/defaults.yaml

@@ -100,16 +100,21 @@
 	ExternalCondition@CRATE-SPEED:
 		Condition: crate-speed
 
+^EmpVisualEffects:
+	WithColoredOverlay@EMPDISABLE:
+		Palette: disabled
+	WithIdleOverlay@EMPDISABLE:
+		Sequence: emp-overlay
+		Palette: effect
+
 ^EmpDisable:
+	Inherits: ^EmpVisualEffects
 	WithColoredOverlay@EMPDISABLE:
 		RequiresCondition: empdisable
-		Palette: disabled
 	TimedConditionBar@EMPDISABLE:
 		Condition: empdisable
 		Color: FFFFFF
 	WithIdleOverlay@EMPDISABLE:
-		Sequence: emp-overlay
-		Palette: effect
 		RequiresCondition: empdisable
 	PowerMultiplier@EMPDISABLE:
 		RequiresCondition: empdisable
@@ -912,6 +917,14 @@
 		BobDistance: -64
 		InitialHeight: 64
 
+^EMPableAircraft:
+	Inherits: ^Aircraft
+	Inherits@EMP: ^EmpDisable
+	Aircraft:
+		PauseOnCondition: empdisable
+	KillsSelf:
+		RequiresCondition: airborne && empdisable
+
 ^AircraftHusk:
 	RenderVoxels:
 	RenderSprites:
@@ -934,7 +947,7 @@
 	FallsToEarth:
 		Spins: true
 		Moves: true
-		Velocity: 86
+		Velocity: 112
 	HitShape:
 
 ^Visceroid:

mods/ts/weapons/superweapons.yaml

@@ -119,14 +119,14 @@ EMPulseCannon:
 		Speed: 425
 		Blockable: false
 		Shadow: true
-		LaunchAngle: 62
+		LaunchAngle: 96
 		Image: pulsball
 	Warhead@1Eff: CreateEffect
 		Explosions: pulse_explosion
 		ExplosionPalette: effect-ignore-lighting-alpha75
 		ImpactActors: false
 	Warhead@emp: GrantExternalCondition
-		Range: 4c0
+		Range: 6c0
 		Duration: 250
 		Condition: empdisable
-		ValidTargets: Ground, Water, Underground
+		ValidTargets: Ground, Water, Air, Underground