From ea4f33123eadb33fb486fcbd6020c9c30c0c860b Mon Sep 17 00:00:00 2001
From: teees <teees200@gmail.com>
Date: Wed, 20 Apr 2016 08:11:18 +0200
Subject: [PATCH] Use AttackOrderPower for EMP support power

---
 mods/ts/cursors.yaml              |  6 ++++++
 mods/ts/rules/shared-support.yaml | 15 +++++++++++++--
 mods/ts/sequences/misc.yaml       |  1 +
 mods/ts/weapons/superweapons.yaml |  4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/mods/ts/cursors.yaml b/mods/ts/cursors.yaml
index 31c884bf40..3bd577ab17 100644
--- a/mods/ts/cursors.yaml
+++ b/mods/ts/cursors.yaml
@@ -152,6 +152,12 @@ Cursors:
 		nuke:
 			Start: 319
 			Length: 9
+		emp:
+			Start: 357
+			Length: 19
+		emp-blocked:
+			Start: 377
+			Length: 1
 		sell:
 			Start: 129
 			Length: 10
diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml
index a11b01cb61..fc7aaea63f 100644
--- a/mods/ts/rules/shared-support.yaml
+++ b/mods/ts/rules/shared-support.yaml
@@ -3,8 +3,8 @@ NAPULS:
 	Valued:
 		Cost: 1000
 	Tooltip:
-		Name: EMP Cannon
-		Description: Disables vehicles.\nRequires power to operate.\n  Strong vs Vehicles\n  Weak vs Infantry, Aircraft
+		Name: E.M. Pulse Cannon
+		Description: Disables mechanical units in an area.\nRequires power to operate.
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 90
@@ -22,12 +22,15 @@ NAPULS:
 		Type: Heavy
 	RevealsShroud:
 		Range: 8c0
+	-AutoTarget:
 	Turreted:
 		TurnSpeed: 10
 		InitialFacing: 224
 	AttackTurreted:
 	Armament:
 		Weapon: EMPulseCannon
+		LocalOffset: 150,0,1250
+		LocalYaw: 0,100
 	WithSpriteTurret:
 		Sequence: turret
 	Power:
@@ -39,3 +42,11 @@ NAPULS:
 		FactionImages:
 			gdi: napuls.gdi
 			nod: napuls.nod
+	AttackOrderPower:
+		Cursor: emp
+		Icon: emp
+		ChargeTime: 135
+		Description: E.M. Pulse
+		LongDesc: Fires a pulse blast which disables\nall mechanical units in the area.
+		EndChargeSound: 00-i158.aud
+		SelectTargetSound: 00-i042.aud
diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml
index 9323b27762..324d14058c 100644
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -368,6 +368,7 @@ icon:
 	clustermissile: mltiicon
 	ioncannon: ioncicon
 	hunterseeker: detnicon
+	emp: pulsicon
 
 clustermissile:
 	up: null # TODO
diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml
index cd12202d69..cbbbb7edb0 100644
--- a/mods/ts/weapons/superweapons.yaml
+++ b/mods/ts/weapons/superweapons.yaml
@@ -79,7 +79,7 @@ IonCannon:
 
 EMPulseCannon:
 	ReloadDelay: 100
-	Range: 10c0
+	Range: 40c0
 	Report: plsecan2.aud
 	Projectile: Bullet
 		Speed: 425
@@ -90,7 +90,7 @@ EMPulseCannon:
 	Warhead@1Eff: CreateEffect
 		Explosions: pulse_explosion
 	Warhead@emp: GrantUpgrade
-		Range: 3c0
+		Range: 4c0
 		Duration: 250
 		Upgrades: empdisable, notmobile