update prism vehicles icons

patrickwieth · Nov 22, 2024 · ef6a73b · ef6a73b
1 parent a310a13
commit ef6a73b
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 65 deletions.
diff --git a/mods/ca/bits/allies/prismblastericon.shp b/mods/ca/bits/allies/prismblastericon.shp
diff --git a/mods/ca/bits/allies/prismcannonicon.shp b/mods/ca/bits/allies/prismcannonicon.shp
diff --git a/mods/ca/bits/allies/prismtankicon.shp b/mods/ca/bits/allies/prismtankicon.shp
diff --git a/mods/ca/rules/allies/commander-tree.yaml b/mods/ca/rules/allies/commander-tree.yaml
@@ -1,3 +1,57 @@
+# vehicles
+
+commander_tree.Prism_Tank:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Prism Tank
+	RenderSprites:
+		Image: prismtank
+	Buildable:
+		BuildPaletteOrder: 9
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_blaster, ~!vehicles.england
+		Description: Enables to build the Prism Tank, an energy based weapon with high range.\n  Srong versus light vehicles and infantry.
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.prism
+
+commander_tree.Prism_Cannon:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Prism Cannon
+	RenderSprites:
+		Image: prismcannon
+	Buildable:
+		BuildPaletteOrder: 10
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_blaster, ~!commander_tree.prism_tank, ~!vehicles.france
+		Description: Enables to build the Prism Cannon. \n  Has higher range and more damage than the Prism Tank, but does not split its beam. \n  It is stronger vs. base defenses and single units but less effective against large armies.
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.prism
+
+commander_tree.Prism_Blaster:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Prism Blaster
+	RenderSprites:
+		Image: prismblaster
+	Buildable:
+		BuildPaletteOrder: 11
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_tank, ~!vehicles.germany
+		Description: Enables to build the Prism Blaster. \n  Has less range than the Prism Tank, but does split its beam to more targets. \n  It is stronger vs. large armies and less effective against base defenses and single targets.
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.prism
+
+hack.cameo_filler.prism:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 12
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled
+
+hack.cameo_filler.prism2:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 12
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled, ~filler.prism
+
+
 # Aircraft
 
 commander_tree.Eurofighter:

diff --git a/mods/ca/rules/allies/vehicles.yaml b/mods/ca/rules/allies/vehicles.yaml
@@ -12,7 +12,6 @@ Prismtank:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 135
-		IconPalette: chrome
 		Prerequisites: radar, ~commander_tree.prism_tank
 		Description: Long-range artillery with Prism Tower derived weapon.\n  Strong vs Buildings, Infantry, Light Armor\n  Weak vs Tanks, Aircraft
 	Valued:
@@ -53,7 +52,6 @@ PBLASTER:
 	Tooltip:
 		Name: Prism Blaster
 	Buildable:
-		IconPalette: chrometd
 		Prerequisites: radar, ~commander_tree.prism_blaster
 		Description: Prism Tower derived weapon hitting many targets on impact.\n  Strong vs Buildings, Infantry, Light Armor\n  Weak vs Tanks, Aircraft
 	Health:
@@ -70,7 +68,6 @@ PCAN:
 	Inherits: ^PrioAntiHeavy
 	Inherits: ^FightingVehicle
 	Buildable:
-		IconPalette: chrome
 		Prerequisites: radar, ~commander_tree.prism_cannon
 		Description: A prototype long range artillery that fires highly focused beams of light.\n  Strong vs Buildings, Vehicles, Infantry\n  Weak vs Tanks, Aircraft
 	Valued:

diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml
@@ -152,56 +152,6 @@ commander_tree.Spec_Ops:
 		Prerequisites: prerequisite.has_points, ~infantry.allies, commander_tree.advanced_infantry_training, techcenter
 		Description: Marks Vehicles and Buildings with a laser allowing rocket infantry to shoot at these from great distance.\n Can detect other stealthed units.
 
-commander_tree.Prism_Tank:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Prism Tank
-	Buildable:
-		BuildPaletteOrder: 9
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_blaster, ~!vehicles.england
-		Description: Enables to build the Prism Tank, an energy based weapon with high range.\n  Srong versus light vehicles and infantry.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.prism
-
-commander_tree.Prism_Cannon:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Prism Cannon
-	Buildable:
-
-		BuildPaletteOrder: 10
-
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_blaster, ~!commander_tree.prism_tank, ~!vehicles.france
-		Description: Enables to build the Prism Cannon. \n  Has higher range and more damage than the Prism Tank, but does not split its beam. \n  It is stronger vs. base defenses and single units but less effective against large armies.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.prism
-
-commander_tree.Prism_Blaster:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Prism Blaster
-	Buildable:
-
-		IconPalette: chrometd
-		BuildPaletteOrder: 11
-
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_tank, ~!vehicles.germany
-		Description: Enables to build the Prism Blaster. \n  Has less range than the Prism Tank, but does split its beam to more targets. \n  It is stronger vs. large armies and less effective against base defenses and single targets.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.prism
-
-hack.cameo_filler.5:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 12
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled
-
-hack.cameo_filler.6:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 12
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled, ~filler.prism
-
 commander_tree.Scout_Tank_PDL:
 	Inherits: ^default.commander_tree_item
 	Tooltip:

diff --git a/mods/ca/sequences/allies.yaml b/mods/ca/sequences/allies.yaml
@@ -241,24 +241,18 @@ prismtank:
 	icon: prismtankicon
 
 prismtank.destroyed:
-	Inherits: ^VehicleOverlays
-	idle: invisibleitem
-	icon: prismtankicon
+	Inherits: prismtank
 
-pblaster:
+prismblaster:
 	Inherits: prismtank
-	muzzle: lightbluelasermuzzle
-		Length: 3
 	icon: prismblastericon
 
-pblaster.destroyed:
-	Inherits: prismtank.destroyed
+prismblaster.destroyed:
+	Inherits: prismblaster
 
-pcan:
+prismcannon:
 	Inherits: prismtank
-	muzzle: lightbluelasermuzzle
-		Length: 3
-	icon: pcanicnh
+	icon: prismcannonicon
 
 # aircraft