Remove Selectable boolean from Selectable trait

Add work-around for ta/td bridge huts since they need actor Bounds to be targetable by C4/engineer repair.
2015-06-05 16:36:54 +02:00
parent 2afa3cfa3a
commit c23ee1be2e
15 changed files with 73 additions and 51 deletions
--- a/mods/cnc/maps/nod04b/map.yaml
+++ b/mods/cnc/maps/nod04b/map.yaml
@@ -545,8 +545,7 @@ Rules:
 			ShowOwnerRow: false
 	TRAN:
 		RejectsOrders:
-		Selectable:
-			Selectable: false
+		-Selectable:
 		RevealsShroud:
 			Range: 5c0

--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -370,10 +370,8 @@ BRIDGEHUT:
 	Building:
 		Footprint: __ __
 		Dimensions: 2,2
-	Selectable:
-		Selectable: false
-		Bounds: 48,48
-		Priority: 2
+	CustomSelectionSize:
+		CustomBounds: 48,48
 	BridgeHut:
 	TargetableBuilding:
 		TargetTypes: BridgeHut, C4
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -672,9 +672,4 @@
 		Image: crate
 	WithCrateBody:
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
-	Selectable:
-		Selectable: false
-		Bounds: 15,15,-1,-1
-	SelectionDecorations:
-		VisualBounds: 15,15,-1,-1

--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -109,12 +109,7 @@ crate:
 	RenderSprites:
 		Palette: effect
 	WithCrateBody:
-	Selectable:
-		Selectable: false
-		Bounds: 15,15,-1,-1
 	Passenger:
-	SelectionDecorations:
-		VisualBounds: 15,15,-1,-1

 mpspawn:
 	Immobile:
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -490,10 +490,8 @@ BRIDGEHUT:
 	Building:
 		Footprint: __ __
 		Dimensions: 2,2
-	Selectable:
-		Selectable: false
-		Bounds: 48,48
-		Priority: 2
+	CustomSelectionSize:
+		CustomBounds: 48,48
 	BridgeHut:
 	TargetableBuilding:
 		TargetTypes: BridgeHut, C4
@@ -502,10 +500,8 @@ BRIDGEHUT.small:
 	Building:
 		Footprint: _
 		Dimensions: 1,1
-	Selectable:
-		Selectable: false
-		Bounds: 24,24
-		Priority: 2
+	CustomSelectionSize:
+		CustomBounds: 24,24
 	BridgeHut:
 	TargetableBuilding:
 		TargetTypes: BridgeHut, C4
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -665,9 +665,6 @@
 		Image: scrate
 	WithCrateBody:
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
-	Selectable:
-		Selectable: false
-		Bounds: 15,15,-1,-1
 	Parachutable:
 		KilledOnImpassableTerrain: false
 		ParachuteSequence: parach
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -217,9 +217,6 @@ FLARE:
 	Tooltip:
 		Name: Flare
 		ShowOwnerRow: false
-	Selectable:
-		Selectable: false
-		Bounds: 25,25
 	BodyOrientation:

 MINE:
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -136,11 +136,6 @@
 		Palette: terrain
 	WithCrateBody:
 		Images: crate
-	Selectable:
-		Selectable: false
-		Bounds: 25,25,-1,-1
-	SelectionDecorations:
-		VisualBounds: 25,25,-1,-1

 ^Wall:
 	AppearsOnRadar: