Add AttackCharges trait for TD and TS obelisks.

2017-02-09 20:29:00 +00:00
parent f219d40aa1
commit a52ea71c62
9 changed files with 224 additions and 14 deletions
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -758,15 +758,17 @@ OBLI:
 		Range: 8c0
 	Bib:
 		HasMinibib: Yes
-	WithTeslaChargeAnimation:
+	WithChargeAnimation:
 	Armament:
 		Weapon: Laser
 		LocalOffset: 0,-85,1280
-		FireDelay: 0
-	AttackTesla:
-		ChargeAudio: obelpowr.aud
-		ReloadDelay: 40
-		InitialChargeDelay: 50
+	AttackCharges:
+		ChargeLevel: 50
+		ChargingCondition: charging
+	AmbientSound:
+		RequiresCondition: charging
+		SoundFile: obelpowr.aud
+		Interval: 30, 40
 	-EmitInfantryOnSell:
 	DetectCloaked:
 		Range: 5c0
--- a/mods/cnc/weapons/other.yaml
+++ b/mods/cnc/weapons/other.yaml
@@ -80,7 +80,7 @@ Napalm:
 		Explosions: med_napalm

 Laser:
-	ReloadDelay: 1
+	ReloadDelay: 40
 	Range: 7c512
 	Report: obelray1.aud
 	Projectile: LaserZap