Add an upgrade rule and update the default mods

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -1688,23 +1688,41 @@ namespace OpenRA.Mods.Common.UtilityCommands
 				}
 
 				// SpawnViceroid was replaced by LeavesHusk
-				if (engineVersion < 20150719)
+				if (engineVersion < 20150809)
 				{
 					if (node.Key == "SpawnViceroid")
 					{
 						node.Key = "LeavesHusk";
 
+						// The default value of ViceroidActor was vice
 						var actor = node.Value.Nodes.FirstOrDefault(n => n.Key == "ViceroidActor");
 						if (actor != null)
 							actor.Key = "HuskActor";
-						// The default value of ViceroidActor was "vice"
 						else
 							node.Value.Nodes.Add(new MiniYamlNode("HuskActor", "vice"));
 
-						var probability = node.Value.Nodes.FirstOrDefault(n => n.Key == "Probability");
 						// The default value of Probability was 10
+						var probability = node.Value.Nodes.FirstOrDefault(n => n.Key == "Probability");
 						if (probability == null)
 							node.Value.Nodes.Add(new MiniYamlNode("Probability", "10"));
+
+						// The default value of Owner was Creeps
+						var owner = node.Value.Nodes.FirstOrDefault(n => n.Key == "Owner");
+						if (owner != null)
+						{
+							node.Value.Nodes.Add(new MiniYamlNode("OwnerType", "InternalName"));
+							owner.Key = "InternalOwner";
+						}
+						else
+						{
+							node.Value.Nodes.Add(new MiniYamlNode("OwnerType", "InternalName"));
+							node.Value.Nodes.Add(new MiniYamlNode("InternalOwner", "Creeps"));
+						}
+
+						// The default value of DeathType was TiberiumDeath
+						var deathType = node.Value.Nodes.FirstOrDefault(n => n.Key == "DeathType");
+						if (deathType == null)
+							node.Value.Nodes.Add(new MiniYamlNode("DeathType", "TiberiumDeath"));
 					}
 				}
 

mods/cnc/maps/gdi05a/map.yaml

@@ -817,8 +817,7 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
+		-LeavesHusk:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false

mods/cnc/maps/gdi05b/map.yaml

@@ -662,8 +662,7 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
+		-LeavesHusk:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false

mods/cnc/rules/defaults.yaml

@@ -190,8 +190,12 @@
 	HiddenUnderFog:
 	PoisonedByTiberium:
 	ActorLostNotification:
-	SpawnViceroid:
+	LeavesHusk:
 		Probability: 10
+		HuskActor: vice
+		OwnerType: InternalName
+		InternalOwner: Creeps
+		DeathType: TiberiumDeath
 	Crushable:
 		WarnProbability: 67
 		CrushSound: squish2.aud

mods/ts/rules/defaults.yaml

@@ -256,8 +256,11 @@
 	Crushable:
 		CrushSound: squish6.aud
 	PoisonedByTiberium:
-	SpawnViceroid:
+	LeavesHusk:
-		ViceroidActor: vissml
+		HuskActor: vissml
+		Probability: 10
+		OwnerType: InternalName
+		InternalOwner: Creeps
 		DeathType: EnergyDeath # TODO: FIX ME! (Tiberium currently uses the wrong damage type!)
 	Guard:
 		Voice: Move

mods/ts/rules/nod-infantry.yaml

@@ -79,7 +79,7 @@ CYC2:
 	Mobile:
 		Speed: 56
 	Health:
-		HP: 500	
+		HP: 500
 	Passenger:
 	RevealsShroud:
 		Range: 7c0