From 761cc4951af75a8f49084c61bd16d3a76f70d864 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 8 Feb 2010 20:46:32 +1300
Subject: [PATCH] switched omni-fire base defenses to use this

---
 mods/cnc/structures.yaml |  3 +--
 mods/ra/rules.yaml       | 13 ++++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/mods/cnc/structures.yaml b/mods/cnc/structures.yaml
index 0c9d813bb0..862f5b1ed7 100644
--- a/mods/cnc/structures.yaml
+++ b/mods/cnc/structures.yaml
@@ -343,10 +343,9 @@ OBLI:
 		Armor: light
 		Crewed: no
 		Sight: 5
-	Turreted:
 	RenderBuildingCharge:
 		ChargeAudio: obelpowr.aud
-	AttackTurreted:
+	AttackOmni:
 		PrimaryWeapon: Laser
 		FireDelay: 8
 	AutoTarget:
diff --git a/mods/ra/rules.yaml b/mods/ra/rules.yaml
index 6ccd281a36..f81d178270 100644
--- a/mods/ra/rules.yaml
+++ b/mods/ra/rules.yaml
@@ -459,9 +459,8 @@ TSLA:
 		Armor: heavy
 		Crewed: yes
 		Sight: 8
-	Turreted:
 	RenderBuildingCharge:
-	AttackTurreted:
+	AttackOmni:
 		PrimaryWeapon: TeslaZap
 		FireDelay: 8
 	AutoTarget:
@@ -1168,8 +1167,7 @@ PBOX:
 		Armor: wood
 		Crewed: yes
 		Sight: 5
-	Turreted:
-	AttackTurreted:
+	AttackOmni:
 		PrimaryWeapon: Vulcan
 	AutoTarget:
 	IronCurtainable:
@@ -1189,8 +1187,7 @@ HBOX:
 		Armor: wood
 		Crewed: yes
 		Sight: 5
-	Turreted:
-	AttackTurreted:
+	AttackOmni:
 		PrimaryWeapon: Vulcan
 	AutoTarget:
 	IronCurtainable:
@@ -1229,15 +1226,13 @@ FTUR:
 		Cost: 600
 		Description: Flame Turret
 		LongDesc: Anti-Infantry base defense.\n  Strong vs Infantry\n  Weak vs Aircraft
-	Turreted:
-		ROT: 10
 	Building:
 		Power: -20
 		HP: 400
 		Armor: heavy
 		Crewed: yes
 		Sight: 6
-	AttackTurreted:
+	AttackOmni:
 		PrimaryWeapon: FireballLauncher
 		PrimaryOffset: 0,0,12,8
 	AutoTarget: