Merge pull request #8106 from reaperrr/cnc-fixes

Several TD mod fixes
2015-05-17 17:39:33 +03:00
parent d718a5a5ca 89845272e0
commit d978fff982
11 changed files with 15 additions and 6 deletions
--- a/mods/cnc/audio/voices.yaml
+++ b/mods/cnc/audio/voices.yaml
@@ -41,14 +41,14 @@ CommandoVoice:
 	Voices:
 		Select: yeah1,yes1,yo1
 		Move: cmon1,onit1,gotit1
-		Attack: onit1,gotit1
+		Attack: onit1,gotit1,noprblm1
 		Demolish: bombit1
 		Die: ramyell1
 		Burned: ramyell1
 		Zapped: ramyell1
 		Poisoned: ramyell1
 		Build: rokroll1
-		Kill: keepem1,laugh1,lefty1
+		Kill: keepem1,laugh1,lefty1,tuffguy1

 DinoVoice:
 	Voices:
--- a/mods/cnc/bits/afld.shp
+++ b/mods/cnc/bits/afld.shp
--- a/mods/cnc/bits/afld_d.shp
+++ b/mods/cnc/bits/afld_d.shp
--- a/mods/cnc/bits/levelup.shp
+++ b/mods/cnc/bits/levelup.shp
--- a/mods/cnc/bits/rank.shp
+++ b/mods/cnc/bits/rank.shp
--- a/mods/cnc/maps/break_of_day.oramap
+++ b/mods/cnc/maps/break_of_day.oramap
--- a/mods/cnc/maps/chokepoint.oramap
+++ b/mods/cnc/maps/chokepoint.oramap
--- a/mods/cnc/maps/necessary_illusions.oramap
+++ b/mods/cnc/maps/necessary_illusions.oramap
--- a/mods/cnc/maps/rogue_states.oramap
+++ b/mods/cnc/maps/rogue_states.oramap
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -323,6 +323,8 @@ AFLD:
 	RevealsShroud:
 		Range: 7c0
 	Bib:
+	WithIdleOverlay@DISH:
+		Sequence: idle-dish
 	RallyPoint:
 		RallyPoint: 4,2
 	Exit@1:
--- a/mods/cnc/sequences/structures.yaml
+++ b/mods/cnc/sequences/structures.yaml
@@ -162,19 +162,26 @@ afld:
 	idle:
 		Tick: 120
 		ZOffset: -1023
-	active:
-		Length: 16
-		Tick: 120
-		ZOffset: -1023
 	damaged-idle:
 		Start: 16
 		Tick: 120
 		ZOffset: -1023
+	active:
+		Length: 16
+		Tick: 120
+		ZOffset: -1023
 	damaged-active:
 		Start: 16
 		Length: 16
 		Tick: 120
 		ZOffset: -1023
+	idle-dish: afld_d
+		Length: 16
+		Tick: 160
+	damaged-idle-dish: afld_d
+		Start: 16
+		Length: 16
+		Tick: 160
 	dead:
 		Start: 32
 		ZOffset: -1023