From fd717041aeb6e6a4c611c33546b5dc4bcc1be05c Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sat, 1 Apr 2017 16:30:20 +0200
Subject: [PATCH] Fix TS factory/barracks lights

In TS,
-GDI Factory lights were all idle and didn't have a damaged state
-GDI Barracks lights were all idle, and flag anim played more slowly
-Hand of Nod lights were all idle
-Nod Factory lights were idle
---
 mods/ts/rules/gdi-structures.yaml | 12 ++++++------
 mods/ts/rules/nod-structures.yaml |  8 ++++----
 mods/ts/sequences/structures.yaml | 30 +++++++++++-------------------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml
index 5a329160c9..59cf9c1ea4 100644
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -98,8 +98,8 @@ GAPILE:
 	PrimaryBuilding:
 		PrimaryCondition: primary
 	ProductionBar:
-	WithProductionOverlay@LIGHTS:
-		Sequence: production-lights
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
 	WithIdleOverlay@LIGHT:
 		Sequence: idle-light
 	WithIdleOverlay@FLAG:
@@ -159,10 +159,10 @@ GAWEAP:
 	WithIdleOverlay@ROOF:
 		Sequence: idle-roof
 	WithProductionDoorOverlay@DOOR:
-	WithProductionOverlay@WHITELIGHTS:
-		Sequence: production-lights-white
-	WithProductionOverlay@REDLIGHTS:
-		Sequence: production-lights-red
+	WithIdleOverlay@WHITELIGHTS:
+		Sequence: idle-lights-white
+	WithIdleOverlay@REDLIGHTS:
+		Sequence: idle-lights-red
 	WithIdleOverlay@TURBINES:
 		Sequence: idle-turbines
 	WithIdleOverlay@BIB:
diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml
index a5f3e5552f..6a494baf60 100644
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -116,8 +116,8 @@ NAHAND:
 	ProductionBar:
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
-	WithProductionOverlay@LIGHT:
-		Sequence: production-light
+	WithIdleOverlay@LIGHT:
+		Sequence: idle-light
 	Power:
 		Amount: -20
 	ProvidesPrerequisite@buildingname:
@@ -173,8 +173,8 @@ NAWEAP:
 	WithIdleOverlay@ROOF:
 		Sequence: idle-roof
 	WithProductionDoorOverlay@DOOR:
-	WithProductionOverlay@LIGHTS:
-		Sequence: production-lights
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
 	WithIdleOverlay@BIB:
 		Sequence: bib
 	Power:
diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml
index 12e96bda7b..72fca5807d 100644
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
@@ -128,11 +128,11 @@ gapile:
 		Start: 2
 		ShadowStart: 5
 		Tick: 400
-	production-lights: gtpile_a
+	idle-lights: gtpile_a
 		Length: 7
 		Tick: 200
 		ZOffset: 1023
-	damaged-production-lights: gtpile_a
+	damaged-idle-lights: gtpile_a
 		Start: 7
 		Length: 7
 		Tick: 200
@@ -146,9 +146,11 @@ gapile:
 		Tick: 200
 	idle-flag: gtpile_c
 		Length: 7
+		Tick: 100
 	damaged-idle-flag: gtpile_c
 		Start: 7
 		Length: 7
+		Tick: 100
 	make: gtpilemk
 		Length: 20
 		ShadowStart: 20
@@ -192,22 +194,12 @@ gaweap:
 		Start: 2
 		ShadowStart: 5
 		Tick: 400
-	production-lights-white: gtweap_a
-		Length: 8
+	idle-lights-white: gtweap_a
+		Length: 16
 		Tick: 100
 		ZOffset: 2048
-	damaged-production-lights-white: gtweap_a
-		Start: 8
+	idle-lights-red: gtweap_b
 		Length: 8
-		Tick: 100
-		ZOffset: 2048
-	production-lights-red: gtweap_b
-		Length: 4
-		Tick: 120
-		ZOffset: 2048
-	damaged-production-lights-red: gtweap_b
-		Start: 4
-		Length: 4
 		Tick: 120
 		ZOffset: 2048
 	idle-turbines: gtweap_c
@@ -350,11 +342,11 @@ nahand:
 		Start: 2
 		ShadowStart: 5
 		Tick: 400
-	production-light: nthand_a
+	idle-light: nthand_a
 		Length: 5
 		Tick: 100
 		ZOffset: 1023
-	damaged-production-light: nthand_a
+	damaged-idle-light: nthand_a
 		Start: 5
 		Length: 5
 		Tick: 100
@@ -411,11 +403,11 @@ naweap:
 		Start: 2
 		ShadowStart: 5
 		Tick: 400
-	production-lights: ntweap_a
+	idle-lights: ntweap_a
 		Length: 16
 		Tick: 100
 		ZOffset: 2048
-	damaged-production-lights: ntweap_a
+	damaged-idle-lights: ntweap_a
 		Start: 16
 		Length: 16
 		Tick: 100