From e21f94f36a5dc75cbe24ff6c834610c866ef410c Mon Sep 17 00:00:00 2001
From: Gustas <37534529+PunkPun@users.noreply.github.com>
Date: Thu, 1 Dec 2022 16:21:11 +0200
Subject: [PATCH] Guarantee 1 riflemen on sell in mods

And engineer on RA and D2K construction yards
---
 mods/cnc/rules/defaults.yaml   | 1 +
 mods/d2k/rules/defaults.yaml   | 1 +
 mods/d2k/rules/structures.yaml | 3 ++-
 mods/ra/rules/defaults.yaml    | 1 +
 mods/ra/rules/structures.yaml  | 3 ++-
 mods/ts/rules/defaults.yaml    | 2 ++
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index d31bc77a8c..eaae1036ed 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -744,6 +744,7 @@
 		AreaTypes: building
 	SpawnActorsOnSell:
 		ActorTypes: e6,e1,e1,e1
+		GuaranteedActorTypes: e1
 	EngineerRepairable:
 	Demolishable:
 		Condition: being-demolished
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index 338104935d..0d0a5ef63e 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -454,6 +454,7 @@
 		RepairingNotification: Repairing
 	SpawnActorsOnSell:
 		ActorTypes: light_inf
+		GuaranteedActorTypes: light_inf
 	MustBeDestroyed:
 		RequiredForShortGame: true
 	FrozenUnderFog:
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 9d4fa692b3..fb1fac24a7 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -93,7 +93,8 @@ construction_yard:
 	CustomSellValue:
 		Value: 2000
 	SpawnActorsOnSell:
-		ActorTypes: light_inf, light_inf, engineer
+		ActorTypes: light_inf
+		GuaranteedActorTypes: light_inf, engineer
 	BaseBuilding:
 	ProductionBar:
 		ProductionType: Building
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index ba6dde4942..618011d0fd 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -716,6 +716,7 @@
 	CapturableProgressBlink:
 	SpawnActorsOnSell:
 		ActorTypes: e1,e1,e1,tecn,tecn2
+		GuaranteedActorTypes: e1
 	MustBeDestroyed:
 		RequiredForShortGame: true
 	GpsDot:
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index c4dc2ff271..157082395f 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -1191,7 +1191,8 @@ FACT:
 	Tooltip:
 		Name: Construction Yard
 	SpawnActorsOnSell:
-		ActorTypes: e1,e1,e1,tecn,tecn2,e6
+		ActorTypes: e1,e1,e1,tecn,tecn2
+		GuaranteedActorTypes: e1, e6
 	BaseBuilding:
 	Transforms:
 		RequiresCondition: factundeploy
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index e20cd2969f..69394b1839 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -379,9 +379,11 @@
 		UseDeathTypeSuffix: false
 	SpawnActorsOnSell@gdi:
 		ActorTypes: e1, e1, e2, medic
+		GuaranteedActorTypes: e1
 		Factions: gdi
 	SpawnActorsOnSell@nod:
 		ActorTypes: e1, e1, e1, e3, e3
+		GuaranteedActorTypes: e1
 		Factions: nod
 	MustBeDestroyed:
 		RequiredForShortGame: true