Merge pull request #4803 from reaperrr/obelisk-fix2

Building charge improvements
2014-03-07 18:54:17 +01:00
parent e2a33dbc10 2293453b8f
commit fd4aa222f7
9 changed files with 152 additions and 112 deletions
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -600,10 +600,10 @@ OBLI:
 	Armament:
 		Weapon: Laser
 		LocalOffset: 0,0,725
-		FireDelay: 8
-	AttackTesla:
-		MaxCharge: 1
+		FireDelay: 25
+	AttackCharge:
 		ReloadTime: 90
+		InitialChargeDelay: 25
 	AutoTarget:
 	-RenderBuilding:
 	RenderRangeCircle:
--- 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
--- 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: