merge

patrickwieth · Jun 30, 2024 · 40de265 · 40de265
2 parents 2d8922c + b9806ec
commit 40de265
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 90 deletions.
diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml
@@ -853,63 +853,6 @@ hack.cameo_filler.104:
 		BuildPaletteOrder: 108
 		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~!vehicles.russia, disabled
 
-commander_tree.Heavy_Tank.AP:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Heavy Tank Armor Piercing Shells
-	Buildable:
-		Queue: Commander_Tree
-		BuildPaletteOrder: 109
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!vehicles.iraq, ~!commander_tree.heavy_tank.pdl, ~!commander_tree.heavy_tank.reflector
-		Description: Upgrades the Heavy Tank with Armor Piercing Shells. \n  This makes it much stronger vs. Heavy Tanks.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.3tnk
-
-commander_tree.Heavy_Tank.PDL:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Heavy Tank Point Laser Defense
-	Buildable:
-		Queue: Commander_Tree
-		BuildPaletteOrder: 110
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector
-		Description: Upgrades the Heavy Tank with a Point Laser Defense System. \n  This makes it more effective vs. projectile based weapons.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.3tnk
-
-commander_tree.Heavy_Tank.Reflector:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Heavy Tank Reflector Armor
-	Buildable:
-		Queue: Commander_Tree
-		BuildPaletteOrder: 110
-		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pdl
-		Description: Equips the Heavy Tank with Reflector Armor. \n Very resistent vs. Energy Weapons.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.3tnk
-
-hack.cameo_filler.106:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 112
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~vehicles.iraq, disabled
-
-hack.cameo_filler.107:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 113
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~!vehicles.iraq, ~filler.3tnk, disabled
-
-hack.cameo_filler.107a:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 113
-		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~filler.3tnk, disabled
-
 commander_tree.V3_Launcher:
 	Inherits: ^default.commander_tree_item
 	Tooltip:

diff --git a/mods/ca/rules/soviet/commander-tree.yaml b/mods/ca/rules/soviet/commander-tree.yaml
@@ -1,3 +1,72 @@
+commander_tree.Heavy_Tank.AP:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Heavy Tank Armor Piercing Shells
+	RenderSprites:
+		Image: 3tnk
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 109
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!vehicles.iraq, ~!commander_tree.heavy_tank.pdl, ~!commander_tree.heavy_tank.reflector
+		Description: Upgrades the Heavy Tank with Armor Piercing Shells. \n  This makes it much stronger vs. Heavy Tanks.
+	WithProductionIconOverlay@Shell:
+		Types: Shell
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.3tnk
+
+commander_tree.Heavy_Tank.PDL:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Heavy Tank Point Laser Defense
+	RenderSprites:
+		Image: 3tnk
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 110
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector
+		Description: Upgrades the Heavy Tank with a Point Laser Defense System. \n  This makes it more effective vs. projectile based weapons.
+	WithProductionIconOverlay@PDL:
+		Types: PDL
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.3tnk
+
+commander_tree.Heavy_Tank.Reflector:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Heavy Tank Reflector Armor
+	RenderSprites:
+		Image: 3tnk
+	Buildable:
+		Queue: Commander_Tree
+		BuildPaletteOrder: 110
+		ForceIconLocation: true
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pdl
+		Description: Equips the Heavy Tank with Reflector Armor. \n Very resistent vs. Energy Weapons.
+	WithProductionIconOverlay@Reflector:
+		Types: Reflector
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.3tnk
+
+hack.cameo_filler.106:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 112
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~vehicles.iraq, disabled
+
+hack.cameo_filler.107:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 113
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~!vehicles.iraq, ~filler.3tnk, disabled
+
+hack.cameo_filler.107a:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 113
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~filler.3tnk, disabled
+
 commander_tree.War_Miners:
 	Inherits: ^default.commander_tree_item
 	Tooltip:

diff --git a/mods/ca/rules/soviet/husks.yaml b/mods/ca/rules/soviet/husks.yaml
@@ -6,6 +6,8 @@
 	RenderVoxels:
 		Scale: 0.66
 		Image: heavytank
+	RenderSprites:
+		Image: 3tnk
 	Tooltip:
 		Name: Husk (Heavy Tank)
 	ThrowsParticle@turret:

diff --git a/mods/ca/rules/soviet/vehicles.yaml b/mods/ca/rules/soviet/vehicles.yaml
@@ -57,6 +57,8 @@
 		BuildPaletteOrder: 100
 		Prerequisites: vehicles.any, ~vehicles.soviet, ~commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pdl, ~!commander_tree.heavy_tank.reflector
 		Description: Soviet main battle tank with dual cannons.\n  Has armor piercing shells.  \n  Strong vs Vehicles\n  Weak vs Infantry, Aircraft, Point Laser Defense
+	WithProductionIconOverlay@Shell:
+		Types: Shell
 	Valued:
 		Cost: 1300
 	Tooltip:

diff --git a/mods/ca/sequences/commander-tree.yaml b/mods/ca/sequences/commander-tree.yaml
@@ -190,15 +190,6 @@ commander_tree.flak_track:
 commander_tree.flak_track.barrage:
 	icon: flaktrackbarrageicon
 
-commander_tree.heavy_tank.ap:
-	icon: 3tnkapicon
-
-commander_tree.heavy_tank.pdl:
-	icon: 3tnkpdlicon
-
-commander_tree.heavy_tank.reflector:
-	icon: 3tnkreflectoricon
-
 commander_tree.v3_launcher:
 	icon: v3rlicon
 

diff --git a/mods/ca/sequences/soviet.yaml b/mods/ca/sequences/soviet.yaml
@@ -369,30 +369,6 @@ ivan:
 		Length: 5
 	icon: 3tnkicon
 
-3tnk.ap:
-	Inherits: 3tnk
-	icon: 3tnkapicon
-
-3tnk.pdl:
-	Inherits: 3tnk
-	icon: 3tnkpdlicon
-
-3tnk.reflector:
-	Inherits: 3tnk
-	icon: 3tnkreflectoricon
-
-3tnk.destroyed:
-	Inherits: ^VehicleOverlays
-	idle: 3tnk
-		Facings: 32
-		UseClassicFacings: True
-		ZOffset: -512
-	turret: 3tnk
-		Start: 32
-		Facings: 32
-		UseClassicFacings: True
-		ZOffset: -512
-
 sovietminer:
 	Inherits: ^VehicleOverlays
 	idle: invisibleitem