Merge pull request #3389 from ScottNZ/infil

Infiltration code cleanup

mods/ra/maps/allies-04/map.yaml

@@ -1817,6 +1817,8 @@ Rules:
 		AutoTargetIgnore:
 		Allies04TransformOnLabInfiltrate:
 			ToActor: MISS
+		Infiltratable:
+			Type: Lab
 	LST.Unselectable:
 		Inherits: LST
 		Buildable:
@@ -1836,23 +1838,22 @@ Rules:
 		Buildable:
 			Owner: None
 		SpyToolTip:
-			Icon: SPY
+			Icon: spyicon
 		RenderSpy:
 			Image: SPY
 		Health:
 			HP: 100
-		DontDestroyWhenInfiltrating:
 		RevealsShroud:
 			Range: 6
 		Spy:
 		Infiltrates:
-			InfiltrateTypes: MissionObjective
+			Types: Lab, Truck
 	DOG.Patrol:
 		Inherits: DOG
 		Buildable:
 			Owner: None
 		Tooltip:
-			Icon: DOG
+			Icon: dogicon
 		Mobile:
 			Speed: 4
 		RenderInfantry:
@@ -1866,6 +1867,8 @@ Rules:
 			MaxWeight: 5
 			PipCount: 5
 		AutoTargetIgnore:
+		Infiltratable:
+			Type: Truck
 		Allies04Hijackable:
 		Allies04RenderHijacked:
 			Image: TRUK
@@ -1875,7 +1878,7 @@ Rules:
 		-RenderUnit:
 		Selectable:
 			Voice: SpyVoice
-		RevealsShroud:	
+		RevealsShroud:
 			Range: 6
 	BARL:
 		Allies04TrivialBuilding:

mods/ra/rules/infantry.yaml

@@ -204,7 +204,7 @@ SPY:
 	TakeCover:
 	Spy:
 	Infiltrates:
-		InfiltrateTypes: Cash, SupportPower, Exploration
+		Types: Cash, SupportPower, Exploration
 	-AutoTarget:
 	AttackMove:
 		JustMove: true

mods/ra/rules/structures.yaml

@@ -71,6 +71,8 @@ GAP:
 
 SPEN:
 	Inherits: ^Building
+	Infiltratable:
+		Type: SupportPower
 	InfiltrateForSupportPower:
 		Proxy: powerproxy.sonarpulse
 	Valued:
@@ -126,6 +128,8 @@ SPEN:
 
 SYRD:
 	Inherits: ^Building
+	Infiltratable:
+		Type: SupportPower
 	InfiltrateForSupportPower:
 		Proxy: powerproxy.sonarpulse
 	Buildable:
@@ -369,6 +373,8 @@ DOME:
 	Bib:
 	ProvidesRadar:
 	IronCurtainable:
+	Infiltratable:
+		Type: Exploration
 	InfiltrateForExploration:
 
 PBOX:
@@ -972,6 +978,8 @@ PROC:
 		InitialActivity: FindResources
 		SpawnOffset: 1,2
 		Facing: 64
+	Infiltratable:
+		Type: Cash
 	InfiltrateForCash:
 		Percentage: 50
 		Minimum: 500