fix V3 and heavy tank not buildable, ecm tank nerf, hoteky commander …

…specialization -> V
patrickwieth · Jan 7, 2024 · acb949f · acb949f
1 parent 0ffa227
commit acb949f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/mods/ca/hotkeys.yaml b/mods/ca/hotkeys.yaml
@@ -22,7 +22,7 @@ ProductionTypeNaval: I
 	Description: Naval Tab
 	Types: Production, Player
 
-ProductionTypeCommanderTree: C
+ProductionTypeCommanderTree: V
 	Description: Commander Tree
 	Types: Production, Player
 

diff --git a/mods/ca/rules/china/vehicles.yaml b/mods/ca/rules/china/vehicles.yaml
@@ -1041,7 +1041,7 @@ choutpost.Bunker.Reflector:
 		Name: Bunker Outpost (Reflector)
 
 checm:
-	Inherits: ^Tank
+	Inherits: ^Vehicle
 	Inherits: ^TDVehicleSprite
 	Inherits: ^BiologicalDriver
 	Inherits: ^PrioEnergyWeapon
@@ -1097,6 +1097,8 @@ checm:
 checm.pulse:
 	Inherits: checm
 	Inherits: ^PrioEnergyAntiHeavy
+	Valued:
+		Cost: 1000
 	Tooltip:
 		Name: Plasma Pulse Tank
 	Buildable:
@@ -1113,6 +1115,8 @@ checm.pulse:
 checm.focus:
 	Inherits: checm
 	Inherits: ^PrioEnergyAntiHeavy
+	Valued:
+		Cost: 1000
 	Tooltip:
 		Name: Plasma Focus Tank
 	Buildable:
@@ -1127,6 +1131,8 @@ checm.focus:
 
 checm.chain:
 	Inherits: checm
+	Valued:
+		Cost: 1000
 	Tooltip:
 		Name: Plasma Chain Tank
 	Buildable:

diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml
@@ -932,7 +932,7 @@ commander_tree.Heavy_Tank.AP:
 		Queue: Commander_Tree
 		BuildPaletteOrder: 109
 		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.3tnk, techcenter, ~!vehicles.iraq, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.reflector
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!vehicles.iraq, ~!commander_tree.heavy_tank.pld, ~!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
@@ -945,7 +945,7 @@ commander_tree.Heavy_Tank.PLD:
 		Queue: Commander_Tree
 		BuildPaletteOrder: 110
 		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.3tnk, techcenter, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector
+		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
@@ -958,7 +958,7 @@ commander_tree.Heavy_Tank.Reflector:
 		Queue: Commander_Tree
 		BuildPaletteOrder: 110
 		ForceIconLocation: true
-		Prerequisites: prerequisite.has_points, ~vehicles.3tnk, techcenter, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pld
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, techcenter, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pld
 		Description: Equips the Heavy Tank with Reflector Armor. \n Very resistent vs. Energy Weapons.
 	ProvidesPrerequisite@filler:
 		Prerequisite: filler.3tnk
@@ -967,19 +967,19 @@ hack.cameo_filler.106:
 	Inherits: ^default.cameo_filler
 	Buildable:
 		BuildPaletteOrder: 112
-		Prerequisites: prerequisite.has_points, ~vehicles.3tnk, ~vehicles.iraq, disabled
+		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.3tnk, ~!vehicles.iraq, ~filler.3tnk, disabled
+		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.3tnk, ~filler.3tnk, disabled
+		Prerequisites: prerequisite.has_points, ~vehicles.soviet, ~filler.3tnk, disabled
 
 commander_tree.V3_Launcher:
 	Inherits: ^default.commander_tree_item

diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
@@ -309,7 +309,7 @@ GTNK.squad:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: vehicles.any, ~vehicles.3tnk, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector, ~!commander_tree.yuri
+		Prerequisites: vehicles.any, ~vehicles.soviet, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector, ~!commander_tree.yuri
 		Description: Soviet main battle tank with dual cannons.\n  Strong vs Vehicles\n  Weak vs Infantry, Aircraft
 	Valued:
 		Cost: 1100
@@ -359,7 +359,7 @@ GTNK.squad:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: vehicles.any, ~vehicles.3tnk, ~commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector, ~!commander_tree.yuri
+		Prerequisites: vehicles.any, ~vehicles.soviet, ~commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector, ~!commander_tree.yuri
 		Description: Soviet main battle tank with dual cannons.\n  Has Point Laser Defense.  \n  Strong vs Vehicles\n  Weak vs Infantry, Aircraft, Energy Weapons
 	Valued:
 		Cost: 1650
@@ -378,7 +378,7 @@ GTNK.squad:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: vehicles.any, ~vehicles.3tnk, ~commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.reflector, ~!commander_tree.yuri
+		Prerequisites: vehicles.any, ~vehicles.soviet, ~commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.reflector, ~!commander_tree.yuri
 		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
 	Valued:
 		Cost: 1300
@@ -400,7 +400,7 @@ GTNK.squad:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: vehicles.any, ~vehicles.3tnk, ~commander_tree.heavy_tank.reflector, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.yuri
+		Prerequisites: vehicles.any, ~vehicles.soviet, ~commander_tree.heavy_tank.reflector, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.yuri
 		Description: Soviet main battle tank with dual cannons.\n  Has Reflector Armor, which is very good vs. Energy Weapons. \n  Strong vs Vehicles\n  Weak vs Infantry, Aircraft
 	Tooltip:
 		Name: Heavy Tank (Reflector)
@@ -416,7 +416,7 @@ GTNK.squad:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 91
-		Prerequisites: ~commander_tree.yuri, ~vehicles.3tnk, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector
+		Prerequisites: ~commander_tree.yuri, ~vehicles.soviet, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector
 		Description: Heavy tank with infantry crushing improvements.\n  Strong vs Vehicles\n  Weak vs Defenses, Aircraft
 	Tooltip:
 		Name: Lasher Tank
@@ -455,7 +455,7 @@ GTNK.squad:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: vehicles.any, ~vehicles.3tnk, ~commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector, ~commander_tree.yuri
+		Prerequisites: vehicles.any, ~vehicles.soviet, ~commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.reflector, ~commander_tree.yuri
 		Description: Heavy tank with infantry crushing improvements.\n  Has Point Laser Defense.  \n  Strong vs Vehicles\n  Weak vs Infantry, Aircraft, Energy Weapons
 	Valued:
 		Cost: 1650
@@ -471,7 +471,7 @@ GTNK.squad:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: vehicles.any, ~vehicles.3tnk, ~commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.reflector, ~commander_tree.yuri
+		Prerequisites: vehicles.any, ~vehicles.soviet, ~commander_tree.heavy_tank.ap, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.reflector, ~commander_tree.yuri
 		Description: Heavy tank with infantry crushing improvements.\n  Has armor piercing shells.  \n  Strong vs Vehicles\n  Weak vs Infantry, Aircraft, Point Laser Defense
 	Valued:
 		Cost: 1300
@@ -490,7 +490,7 @@ GTNK.squad:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: vehicles.any, ~vehicles.3tnk, ~commander_tree.heavy_tank.reflector, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~commander_tree.yuri
+		Prerequisites: vehicles.any, ~vehicles.soviet, ~commander_tree.heavy_tank.reflector, ~!commander_tree.heavy_tank.pld, ~!commander_tree.heavy_tank.ap, ~commander_tree.yuri
 		Description: Heavy tank with infantry crushing improvements.\n  Has Reflector Armor, which is very good vs. Energy Weapons. \n  Strong vs Vehicles\n  Weak vs Infantry, Aircraft
 	Tooltip:
 		Name: Lasher Tank (Reflector)
@@ -3892,7 +3892,7 @@ V3RL:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 160
-		Prerequisites: techcenter, ~vehicles.v3rl, ~commander_tree.v3_launcher
+		Prerequisites: techcenter, ~vehicles.soviet, radar, ~!vehicles.iraq, ~commander_tree.v3_launcher
 		Description: Extreme long-range rocket artillery.\n  Rockets can be shot down by anti-air.\n  Strong vs Buildings, Infantry\n  Weak vs Tanks, Aircraft
 	Valued:
 		Cost: 1200
@@ -3940,7 +3940,7 @@ V3RL:
 V3BRL:
 	Inherits: V3RL
 	Buildable:
-		Prerequisites: techcenter, ~vehicles.v3rl, ~commander_tree.v3_launcher, ~disabled
+		Prerequisites: techcenter, ~vehicles.soviet, radar, ~!vehicles.iraq, ~commander_tree.v3_launcher, ~disabled
 		Description: Extreme long-range rocket artillery.\n  Rockets can be shot down by anti-air.\n  Strong vs Buildings, Infantry\n  Weak vs Tanks, Aircraft
 	Tooltip:
 		Name: V3 Launcher
@@ -3950,7 +3950,7 @@ V3BRL:
 V4RL:
 	Inherits: V3RL
 	Buildable:
-		Prerequisites: techcenter, ~vehicles.v3rl, ~commander_tree.v3_launcher, ~disabled
+		Prerequisites: techcenter,  ~vehicles.soviet, radar, ~!vehicles.iraq, ~commander_tree.v3_launcher, ~disabled
 		Description: Extreme long-range rocket artillery.\n  Rockets can be shot down by anti-air.\n  Strong vs Buildings, Infantry\n  Weak vs Tanks, Aircraft
 	Tooltip:
 		Name: V4 Launcher