fix suk.conc crash

patrickwieth · Jul 27, 2024 · 25c6490 · 25c6490
1 parent 220a2ae
commit 25c6490
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/mods/ca/rules/ai/brutal.yaml b/mods/ca/rules/ai/brutal.yaml
@@ -390,7 +390,7 @@ Player:
 			yak: Building, Infantry
 			mig: Aircraft, Vehicle, Defense
 			suk: Vehicle, Defense
-			suk.upg: Building
+			suk.conc: Building
 			kiro: Building
 			orca: Aircraft, Vehicle
 			orca_bomber: Vehicle, Defense

diff --git a/mods/ca/rules/ai/hard.yaml b/mods/ca/rules/ai/hard.yaml
@@ -382,7 +382,7 @@ Player:
 			yak: Building, Infantry
 			mig: Aircraft, Vehicle, Defense
 			suk: Vehicle, Defense
-			suk.upg: Building
+			suk.conc: Building
 			kiro: Building
 			orca: Aircraft, Vehicle
 			orca_bomber: Vehicle, Defense

diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml
@@ -1078,7 +1078,7 @@ hack.cameo_filler.117:
 commander_tree.Sukhoi:
 	Inherits: ^default.commander_tree_item
 	Tooltip:
-		Name: Sukhoi
+		Name: SU-27 Flanker
 	Buildable:
 		Queue: Commander_Tree
 		BuildPaletteOrder: 137
@@ -1089,7 +1089,7 @@ commander_tree.Sukhoi:
 commander_tree.Sukhoi_Concussion:
 	Inherits: ^default.commander_tree_item
 	Tooltip:
-		Name: Sukhoi Concussion Bombs
+		Name: SU-27 Concussion Bombs
 	Buildable:
 		Queue: Commander_Tree
 		IconPalette: chrometd

diff --git a/mods/ca/rules/soviet/aircraft.yaml b/mods/ca/rules/soviet/aircraft.yaml
@@ -55,6 +55,9 @@ SUK:
 	Inherits: ^VoxelJet
 	RenderVoxels:
 		Scale: 0.6
+		Image: suk
+	RenderSprites:
+		Image: suk
 	Inherits: ^FightingPlane
 	Inherits: ^BiologicalPilot
 	Inherits: ^PrioAntiLight
@@ -63,7 +66,6 @@ SUK:
 		Queue: Aircraft
 		BuildAtProductionType: Plane
 		BuildPaletteOrder: 51
-		IconPalette: chrome
 		Prerequisites: ~afld, stek, ~commander_tree.sukhoi, ~!commander_tree.sukhoi_concussion
 		Description: Fast ground attack aircraft armed\nwith powerful explosive missiles.\n  Strong vs Tanks, Defenses\n  Weak vs Aircraft
 	Valued:
@@ -100,11 +102,12 @@ SUK.Conc:
 		Queue: Aircraft
 		BuildAtProductionType: Plane
 		BuildPaletteOrder: 51
-		IconPalette: chrometd
 		Prerequisites: ~afld, stek, ~commander_tree.sukhoi_concussion,
 		Description: Fast ground attack aircraft armed\nwith powerful explosive missiles.\n  Missiles cause concussion on units\n  Strong vs Tanks, Defenses\n  Weak vs Aircraft
+	WithProductionIconOverlay@Dynamite:
+		Types: Dynamite
 	Tooltip:
-		Name: Sukhoi Attack Plane (Concussion)
+		Name: SU-27 Flanker (Concussion)
 	Armament@primary:
 		Weapon: MaverickSU.Concussion
 

diff --git a/mods/ca/sequences/aircraft.yaml b/mods/ca/sequences/aircraft.yaml
@@ -370,10 +370,6 @@ suk:
 		Facings: 8
 	icon: sukicon
 
-suk.conc:
-	Inherits: suk
-	icon: sukhoiconcussionicon
-
 orcaca:
 	Inherits: ^VehicleOverlays
 	idle: invisibleitem