fix n3 crash

patrickwieth · Apr 8, 2024 · 79c10be · 79c10be
1 parent 1b3749f
commit 79c10be
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 15 deletions.
diff --git a/mods/ca/rules/ai/brutal.yaml b/mods/ca/rules/ai/brutal.yaml
@@ -221,7 +221,8 @@ Player:
 			adept: 65
 			mercenary: 65
 			n2: 25
-			n3: 40
+			rocket_mercenary: 40
+			rocket_trooper: 40
 			n4: 15
 			n5: 15
 			n6: 5

diff --git a/mods/ca/rules/ai/easy.yaml b/mods/ca/rules/ai/easy.yaml
@@ -205,7 +205,8 @@ Player:
 			adept: 65
 			mercenary: 65
 			n2: 25
-			n3: 40
+			rocket_mercenary: 40
+			rocket_trooper: 40
 			n4: 15
 			n5: 15
 			n6: 5

diff --git a/mods/ca/rules/ai/hard.yaml b/mods/ca/rules/ai/hard.yaml
@@ -214,7 +214,8 @@ Player:
 			adept: 65
 			mercenary: 65
 			n2: 25
-			n3: 40
+			rocket_mercenary: 40
+			rocket_trooper: 40
 			n4: 15
 			n5: 15
 			n6: 5

diff --git a/mods/ca/rules/ai/naval.yaml b/mods/ca/rules/ai/naval.yaml
@@ -163,7 +163,8 @@ Player:
 			adept: 65
 			mercenary: 65
 			n2: 25
-			n3: 40
+			rocket_mercenary: 40
+			rocket_trooper: 40
 			n4: 15
 			n5: 15
 			stormtrooper: 65

diff --git a/mods/ca/rules/ai/normal.yaml b/mods/ca/rules/ai/normal.yaml
@@ -206,7 +206,8 @@ Player:
 			adept: 65
 			mercenary: 65
 			n2: 25
-			n3: 40
+			rocket_mercenary: 40
+			rocket_trooper: 40
 			n4: 15
 			n5: 15
 			n6: 5

diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
@@ -4135,7 +4135,8 @@ PROC.Dummy:
 			adept: loaded
 			mercenary: loaded
 			n2: loaded
-			n3: loaded-air
+			rocket_mercenary: loaded-air
+			rocket_trooper: loaded-air
 			n4: loaded
 			n5: loaded
 			rmbo: loaded

diff --git a/mods/ca/rules/gdi/defaults.yaml b/mods/ca/rules/gdi/defaults.yaml
@@ -34,15 +34,15 @@
 		ClassName: Light Support
 		Factions: gdi, talon, zocom, eagle
 		BaseActor: amcv
-		SupportActors: n1,n1,n1,n3,n3
+		SupportActors: n1,n1,n1,rocket_mercenary,rocket_mercenary
 		InnerSupportRadius: 3
 		OuterSupportRadius: 5
 	StartingUnits@heavygdia:
 		Class: heavy
 		ClassName: Heavy Support
 		Factions: gdi, talon, zocom, eagle
 		BaseActor: amcv
-		SupportActors: n1,n1,n1,n3,n3,mtnk,mtnk
+		SupportActors: n1,n1,n1,rocket_mercenary,rocket_mercenary,mtnk,mtnk
 		InnerSupportRadius: 3
 		OuterSupportRadius: 5
 

diff --git a/mods/ca/rules/misc.yaml b/mods/ca/rules/misc.yaml
@@ -139,11 +139,11 @@ CRATE:
 		ValidFactions: allies, england, france, germany, soviet, russia, nkorea, iraq
 	GiveUnitCrateAction@squadlightGDI:
 		SelectionShares: 7
-		Units: mercenary,mercenary,mercenary,n3,n3
+		Units: mercenary,mercenary,mercenary,rocket_mercenary,rocket_mercenary
 		ValidFactions: gdi, talon, zocom, eagle
 	GiveUnitCrateAction@squadlightNOD:
 		SelectionShares: 7
-		Units: adept,adept,adept,n3,n3
+		Units: adept,adept,adept,rocket_trooper,rocket_trooper
 		ValidFactions: nod, blackh, marked, legion
 	GiveUnitCrateAction@squadheavyallies:
 		SelectionShares: 7
@@ -157,12 +157,12 @@ CRATE:
 		TimeDelay: 4500
 	GiveUnitCrateAction@squadheavynod:
 		SelectionShares: 7
-		Units: adept,adept,adept,adept,n3,n3,n4,n4
+		Units: adept,adept,adept,adept,rocket_trooper,rocket_trooper,n4,n4
 		ValidFactions: nod, blackh, marked, legion
 		TimeDelay: 4500
 	GiveUnitCrateAction@squadheavygdi:
 		SelectionShares: 7
-		Units: mercenary,mercenary,mercenary,mercenary,n3,n3,n2,n2
+		Units: mercenary,mercenary,mercenary,mercenary,rocket_mercenary,rocket_mercenary,n2,n2
 		ValidFactions: gdi, talon, zocom, eagle
 		TimeDelay: 4500
 	GrantExternalConditionCrateAction@invuln:

diff --git a/mods/ca/rules/nod/defaults.yaml b/mods/ca/rules/nod/defaults.yaml
@@ -34,14 +34,14 @@
 		ClassName: Light Support
 		Factions: nod, blackh, marked, legion
 		BaseActor: amcv
-		SupportActors: adept,adept,adept,n3,n3
+		SupportActors: adept,adept,adept,rocket_trooper,rocket_trooper
 		InnerSupportRadius: 3
 		OuterSupportRadius: 5
 	StartingUnits@heavynoda:
 		Class: heavy
 		ClassName: Heavy Support
 		Factions: nod, blackh, marked, legion
 		BaseActor: amcv
-		SupportActors: adept,adept,adept,n3,n3,mtnk,mtnk
+		SupportActors: adept,adept,adept,rocket_trooper,rocket_trooper,mtnk,mtnk
 		InnerSupportRadius: 3
 		OuterSupportRadius: 5
diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
@@ -3174,7 +3174,7 @@ IFV:
 			mercenary: gunturr
 			stormtrooper: gunturr
 			n2: fragturr
-			n3: samturr
+			rocket_trooper: samturr
 			rocket_cyborg: samturr
 			n4: flamturr
 			n5: chemturr