From 82cd2b9520f6485123c3f13988535821a508f0cf Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 6 Mar 2014 20:30:24 +0100
Subject: [PATCH] Adapts Tesla Coil and Obelisk to AttackTesla -> AttackCharge
 changes.

Fine-tunes Obelisk charge delay, adds changelog entry.
---
 CHANGELOG                          | 1 +
 mods/cnc/rules/structures.yaml     | 6 +++---
 mods/cnc/sequences/structures.yaml | 4 ++--
 mods/ra/rules/structures.yaml      | 4 +++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 30ea69af2f..ff18f77711 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -71,6 +71,7 @@ NEW:
 		Decreased Visceroid health by 25% and removed their ability to gain experience.
 		Increased the chance of Tiberium or chemical deaths spawning a Visceroid from 2% to 10%.
 		Increased Obelisk of Light laser damage from 200 to 360.
+		Fixed Obelisk of Light charge animation and sound not playing.
 	Engine:
 		Converted Aircraft CruiseAltitude to world coordinates.
 		Converted Health Radius to world coordinates.
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index e4c0363784..55539ffffd 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -599,10 +599,10 @@ OBLI:
 	Armament:
 		Weapon: Laser
 		LocalOffset: 0,0,725
-		FireDelay: 8
-	AttackTesla:
-		MaxCharge: 1
+		FireDelay: 25
+	AttackCharge:
 		ReloadTime: 90
+		InitialChargeDelay: 25
 	AutoTarget:
 	-RenderBuilding:
 	RenderRangeCircle:
diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml
index 8fd3f8184c..1e45d3af21 100644
--- a/mods/cnc/sequences/structures.yaml
+++ b/mods/cnc/sequences/structures.yaml
@@ -340,11 +340,11 @@ obli:
 	active:
 		Start: 0
 		Length: 4
-		Tick: 400
+		Tick: 680
 	damaged-active:
 		Start: 4
 		Length: 4
-		Tick: 400
+		Tick: 680
 	dead:
 		Start: 8
 	make: oblimake
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index d9224ee343..131db9ed7f 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -303,10 +303,12 @@ TSLA:
 	RevealsShroud:
 		Range: 8c0
 	RenderBuildingCharge:
+		ChargeAudio: tslachg2.aud
 	Armament:
 		Weapon: TeslaZap
 		LocalOffset: 0,0,427
-	AttackTesla:
+	AttackCharge:
+		MaxCharges: 3
 		ReloadTime: 120
 	AutoTarget:
 	IronCurtainable: