Introduce a Targetable trait; Subs can attack bridges; May introduce subtle bugs due to previous stupid assumption that !selectable == !attackable.

mods/cnc/civilian.yaml

@@ -165,8 +165,6 @@ BRIDGE1:
 	Building:
 		Footprint: ____ ____ ____ ____
 		Dimensions: 4,4
-#	Selectable:
-#		Bounds: 96,96
 
 BRIDGE2:
 	Inherits: ^Bridge
@@ -176,8 +174,6 @@ BRIDGE2:
 	Building:
 		Footprint: _____ _____ _____ _____ _____
 		Dimensions: 5,5
-#	Selectable:
-#		Bounds: 120,120
 
 BRIDGE3:
 	Inherits: ^Bridge
@@ -187,8 +183,6 @@ BRIDGE3:
 	Building:
 		Footprint: ______ ______ ______ ______ ______
 		Dimensions: 6,5
-#	Selectable:
-#		Bounds: 144,120
 
 BRIDGE4:
 	Inherits: ^Bridge
@@ -198,5 +192,3 @@ BRIDGE4:
 	Building:
 		Footprint: ______ ______ ______ ______
 		Dimensions: 6,4
-#	Selectable:
-#		Bounds: 144,96

mods/cnc/defaults.yaml

@@ -7,6 +7,8 @@
 		TerrainSpeeds: 60%, 40%, 100%, 0%, 0%, 0%, 0%, 50%, 40%, 0%
 	Selectable: 
 		Voice: VehicleVoice
+	Targetable:
+		TargetTypes: Ground
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
@@ -26,6 +28,8 @@
 		TerrainSpeeds: 80%, 70%, 100%, 0%, 0%, 0%, 0%, 70%, 70%, 0%
 	Selectable: 
 		Voice: VehicleVoice
+	Targetable:
+		TargetTypes: Ground
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
@@ -38,7 +42,8 @@
 ^Helicopter:
 	Category: Plane
 	Unit:
-		TargetType: Air
+	Targetable:
+		TargetTypes: Air
 	Selectable:
 		Voice: VehicleVoice
 	HiddenUnderFog:
@@ -60,6 +65,8 @@
 		TerrainSpeeds: 90%, 80%, 100%, 0%, 0%, 0%, 0%, 90%, 80%, 0%
 	Selectable:
 		Voice: GenericVoice
+	Targetable:
+		TargetTypes: Ground
 	RenderInfantry:
 	AutoTarget:
 	Passenger:
@@ -73,9 +80,10 @@
 ^Plane:
 	Category: Plane
 	Unit:
-		TargetType: Air
 	Selectable:
 		Voice: GenericVoice
+	Targetable:
+		TargetTypes: Air
 	HiddenUnderFog:
 	GainsExperience:
 	GivesExperience:
@@ -85,6 +93,8 @@
 	Category: Building
 	Selectable:
 		Priority: 3
+	Targetable:
+		TargetTypes: Ground
 	Building:
 		Dimensions: 1,1
 		Footprint: x
@@ -186,11 +196,10 @@
 	Category: Building
 	Valued:
 		Description: Bridge
-	Selectable:
-		Bounds: 96,96
+	Targetable:
+		TargetTypes: Ground, Water
 	BelowUnits:
 	Building:
-		TargetType: Ground, Water
 		DamagedSound: xplos.aud
 		DestroyedSound: xplobig4.aud
 		Footprint: ______ ______ ______ ______

mods/cnc/vehicles.yaml

@@ -463,7 +463,6 @@ C17:
 		LZRange: 1
 	Inherits: ^Plane
 	Unit:
-		TargetType: Special
 		HP: 25
 		Armor: light
 		ROT: 5
@@ -475,6 +474,7 @@ C17:
 		Passengers: 10
 	Invulnerable:
 	-Selectable:
+	-Targetable:
 	-GainsExperience:
 
 A10: