Merge pull request #3063 from pchote/repairable-bridges

Repairable bridges, closes #2619

mods/cnc/rules/civilian.yaml

@@ -302,6 +302,12 @@ BRIDGE1:
 	Building:
 		Footprint: ____ ____ ____ ____
 		Dimensions: 4,4
+	FreeActor@north:
+		Actor: bridgehut
+		SpawnOffset: 2,0
+	FreeActor@south:
+		Actor: bridgehut
+		SpawnOffset: 0,2
 
 BRIDGE2:
 	Inherits: ^Bridge
@@ -311,6 +317,12 @@ BRIDGE2:
 	Building:
 		Footprint: _____ _____ _____ _____ _____
 		Dimensions: 5,5
+	FreeActor@north:
+		Actor: bridgehut
+		SpawnOffset: 0,0
+	FreeActor@south:
+		Actor: bridgehut
+		SpawnOffset: 2,2
 
 BRIDGE3:
 	Inherits: ^Bridge
@@ -320,6 +332,12 @@ BRIDGE3:
 	Building:
 		Footprint: ______ ______ ______ ______ ______
 		Dimensions: 6,5
+	FreeActor@north:
+		Actor: bridgehut
+		SpawnOffset: 3,0
+	FreeActor@south:
+		Actor: bridgehut
+		SpawnOffset: 1,2
 
 BRIDGE4:
 	Inherits: ^Bridge
@@ -329,6 +347,23 @@ BRIDGE4:
 	Building:
 		Footprint: ______ ______ ______ ______
 		Dimensions: 6,4
+	FreeActor@north:
+		Actor: bridgehut
+		SpawnOffset: 1,0
+	FreeActor@south:
+		Actor: bridgehut
+		SpawnOffset: 3,2
+
+BRIDGEHUT:
+	Building:
+		Footprint: __ __
+		Dimensions: 2,2
+	Selectable:
+		Selectable: false
+		Bounds: 48,48
+	BridgeHut:
+	TargetableBuilding:
+		TargetTypes: BridgeHut
 
 C1:
 	Inherits: ^CivInfantry

mods/cnc/rules/defaults.yaml

@@ -225,7 +225,7 @@
 	Selectable:
 		Priority: 3
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Armor:
 		Type: Wood
 	RepairableBuilding:
@@ -267,7 +267,6 @@
 	Sellable:
 	Capturable:
 	CapturableBar:
-	C4Demolishable:
 	DebugMuzzlePositions:
 
 ^CivBuilding:
@@ -339,7 +338,7 @@
 		Adjacent: 7
 		TerrainTypes: Clear,Road
 	TargetableBuilding:
-		TargetTypes: Ground
+		TargetTypes: Ground, C4
 	Wall:
 		CrushClasses: wall
 		CrushSound: sandbag2.aud
@@ -356,7 +355,6 @@
 		RelativeToTopLeft: yes
 	AutoTargetIgnore:
 	Sellable:
-	C4Demolishable:
 
 ^Tree:
 	Tooltip:
@@ -419,10 +417,7 @@
 		TargetTypes: Ground, Water
 	BelowUnits:
 	Health:
-#		HP: 500
+		HP: 500
 	SoundOnDamageTransition:
 		DamagedSound: xplos.aud
 		DestroyedSound: xplobig4.aud
-	Building:
-		Footprint: ______ ______ ______ ______
-		Dimensions: 6,4

mods/cnc/rules/infantry.yaml

@@ -166,6 +166,7 @@ E6:
 	Passenger:
 		PipType: Yellow
 	EngineerRepair:
+	RepairsBridges:
 	Captures:
 		CaptureTypes: building, husk
 	-AutoTarget: