2025-04-14 04:00:59

2025-04-14 04:00:59 +00:00
parent 15f70910b8
commit bc6cbd5fe9
35 changed files with 18315 additions and 7528 deletions
--- a/src/common/ai_equipment/BFL_tank.txt
+++ b/src/common/ai_equipment/BFL_tank.txt
@@ -832,4 +832,676 @@ BFL_medium_tank_anti_air = {
 			easy_maintenance
 		}
 	}
+}
+
+BFL_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { BFL }
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 0
+	}
+	
+	basic_heavy_tank_default = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 0
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	improved_heavy_tank_default = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	advanced_heavy_tank_default = { #SARL42
+		priority = {
+			factor = 0
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+}
+
+BFL_heavy_tank_destroyers = {
+	category = land
+	blocked_for = {}
+	available_for = { BFL }
+	roles = {
+		land_heavy_tank_destroyer
+	}
+	priority = {
+		factor = 0
+	}
+	heavy_tank_destroyer_1 = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_2 = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_3 = { #SARL42
+		priority = {
+			factor = 0
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+}
+
+BFL_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {BFL}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+BFL_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {BFL}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 1
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
 }
--- a/src/common/ai_equipment/BYG_tank.txt
+++ b/src/common/ai_equipment/BYG_tank.txt
@@ -1225,3 +1225,674 @@ BYG_medium_tank_artillery = {
 	}
 }

+BYG_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { BYG }
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 0
+	}
+	
+	basic_heavy_tank_default = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 0
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	improved_heavy_tank_default = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	advanced_heavy_tank_default = { #SARL42
+		priority = {
+			factor = 0
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+}
+
+BYG_heavy_tank_destroyers = {
+	category = land
+	blocked_for = {}
+	available_for = { BYG }
+	roles = {
+		land_heavy_tank_destroyer
+	}
+	priority = {
+		factor = 0
+	}
+	heavy_tank_destroyer_1 = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_2 = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_3 = { #SARL42
+		priority = {
+			factor = 0
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+}
+
+BYG_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {BYG}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+BYG_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {BYG}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 1
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+}
--- a/src/common/ai_equipment/CHY_tank.txt
+++ b/src/common/ai_equipment/CHY_tank.txt
@@ -1887,3 +1887,674 @@ CHY_medium_tank_amphibious = {
 	}
 }

+CHY_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { CHY }
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 0
+	}
+	
+	basic_heavy_tank_default = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 0
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	improved_heavy_tank_default = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	advanced_heavy_tank_default = { #SARL42
+		priority = {
+			factor = 0
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+}
+
+CHY_heavy_tank_destroyers = {
+	category = land
+	blocked_for = {}
+	available_for = { CHY }
+	roles = {
+		land_heavy_tank_destroyer
+	}
+	priority = {
+		factor = 0
+	}
+	heavy_tank_destroyer_1 = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_2 = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_3 = { #SARL42
+		priority = {
+			factor = 0
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+}
+
+CHY_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {CHY}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+CHY_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {CHY}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 1
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+}
--- a/src/common/ai_equipment/DOH_tank.txt
+++ b/src/common/ai_equipment/DOH_tank.txt
@@ -844,3 +844,675 @@ DOH_medium_tank_anti_air = {
 		}
 	}
 }
+
+DOH_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { DOH }
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 0
+	}
+	
+	basic_heavy_tank_default = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 0
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	improved_heavy_tank_default = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	advanced_heavy_tank_default = { #SARL42
+		priority = {
+			factor = 0
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+}
+
+DOH_heavy_tank_destroyers = {
+	category = land
+	blocked_for = {}
+	available_for = { DOH }
+	roles = {
+		land_heavy_tank_destroyer
+	}
+	priority = {
+		factor = 0
+	}
+	heavy_tank_destroyer_1 = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_2 = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_3 = { #SARL42
+		priority = {
+			factor = 0
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+}
+
+DOH_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {DOH}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+DOH_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {DOH}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 1
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+}
--- a/src/common/ai_equipment/HUJ_tank.txt
+++ b/src/common/ai_equipment/HUJ_tank.txt
@@ -1053,4 +1053,676 @@ HUJ_medium_tank_amphibious = {
 			easy_maintenance
 		}
 	}
+}
+
+HUJ_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { HUJ }
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 0
+	}
+	
+	basic_heavy_tank_default = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 0
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	improved_heavy_tank_default = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	advanced_heavy_tank_default = { #SARL42
+		priority = {
+			factor = 0
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+}
+
+HUJ_heavy_tank_destroyers = {
+	category = land
+	blocked_for = {}
+	available_for = { HUJ }
+	roles = {
+		land_heavy_tank_destroyer
+	}
+	priority = {
+		factor = 0
+	}
+	heavy_tank_destroyer_1 = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_2 = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_3 = { #SARL42
+		priority = {
+			factor = 0
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+}
+
+HUJ_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HUJ}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+HUJ_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {HUJ}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 1
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
 }
--- a/src/common/ai_equipment/SAD_tank.txt
+++ b/src/common/ai_equipment/SAD_tank.txt
@@ -1229,3 +1229,675 @@ SAD_medium_tank_anti_air = {
 		}
 	}
 }
+
+SAD_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { SAD }
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 0
+	}
+	
+	basic_heavy_tank_default = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 0
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	improved_heavy_tank_default = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	advanced_heavy_tank_default = { #SARL42
+		priority = {
+			factor = 0
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+}
+
+SAD_heavy_tank_destroyers = {
+	category = land
+	blocked_for = {}
+	available_for = { SAD }
+	roles = {
+		land_heavy_tank_destroyer
+	}
+	priority = {
+		factor = 0
+	}
+	heavy_tank_destroyer_1 = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_2 = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_3 = { #SARL42
+		priority = {
+			factor = 0
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+}
+
+SAD_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {SAD}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+SAD_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {SAD}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 1
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+}
--- a/src/common/ai_equipment/TIX_tank.txt
+++ b/src/common/ai_equipment/TIX_tank.txt
@@ -848,3 +848,674 @@ TIX_medium_tank_anti_air = {
 	}
 }

+TIX_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { TIX }
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 0
+	}
+	
+	basic_heavy_tank_default = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 0
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	improved_heavy_tank_default = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	advanced_heavy_tank_default = { #SARL42
+		priority = {
+			factor = 0
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+}
+
+TIX_heavy_tank_destroyers = {
+	category = land
+	blocked_for = {}
+	available_for = { TIX }
+	roles = {
+		land_heavy_tank_destroyer
+	}
+	priority = {
+		factor = 0
+	}
+	heavy_tank_destroyer_1 = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_2 = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_3 = { #SARL42
+		priority = {
+			factor = 0
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+}
+
+TIX_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {TIX}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+TIX_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {TIX}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 1
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+}
--- a/src/common/ai_equipment/YUW_tank.txt
+++ b/src/common/ai_equipment/YUW_tank.txt
@@ -863,4 +863,676 @@ YUW_medium_tank_anti_air = {
 			dozer_blade
 		}
 	}
+}
+
+YUW_heavy_tanks = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = { YUW }
+
+	roles = {
+		land_heavy_tank
+	}
+
+	priority = {
+		factor = 0
+	}
+	
+	basic_heavy_tank_default = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_torsion_bar_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 0
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_torsion_bar_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	improved_heavy_tank_default = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+
+	advanced_heavy_tank_default = { #SARL42
+		priority = {
+			factor = 0
+		}
+
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_heavy_three_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = {
+					any_of = { 
+					tank_radio_3
+					tank_radio_2
+					tank_radio_1
+					}
+				}
+				special_type_slot_2 = secondary_turret_small_cannon
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = secondary_turret_small_cannon
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = 4
+			}
+		}
+
+		allowed_modules = {
+		    tank_heavy_cannon_3
+		    tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_close_support_gun
+			tank_heavy_three_man_tank_turret
+			tank_bogie_suspension
+			tank_welded_armor
+			tank_diesel_engine
+			tank_radio_3
+			tank_radio_2
+			tank_radio_1
+			secondary_turret_small_cannon
+			easy_maintenance
+		}
+	}
+}
+
+YUW_heavy_tank_destroyers = {
+	category = land
+	blocked_for = {}
+	available_for = { YUW }
+	roles = {
+		land_heavy_tank_destroyer
+	}
+	priority = {
+		factor = 0
+	}
+	heavy_tank_destroyer_1 = { #Somua S35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = improved_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_1
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 14
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_2 = {#AMC 35
+		priority = {
+			factor = 0
+			modifier = { 
+				has_tech = advanced_heavy_tank_chassis
+				factor = 0 #let's not waste XP here
+			}
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_2
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+	heavy_tank_destroyer_3 = { #SARL42
+		priority = {
+			factor = 0
+		}
+		
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_destroyer_chassis_3
+			modules = {
+				main_armament_slot = { 
+					any_of = { 
+					    tank_heavy_cannon_3
+			            tank_heavy_cannon_2
+					    tank_heavy_cannon
+					    tank_medium_cannon_2
+				    	tank_medium_cannon
+				    	tank_high_velocity_cannon_3
+				    	tank_high_velocity_cannon_2
+				    	tank_high_velocity_cannon
+					} 
+				}
+				turret_type_slot = tank_medium_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_cast_armor
+				engine_type_slot = tank_diesel_engine
+				special_type_slot_1 = armor_skirts
+				special_type_slot_2 = sloped_armor
+				special_type_slot_3 = easy_maintenance
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 12
+				tank_nsb_armor_upgrade = 20
+			}
+		}
+		allowed_modules = {
+			tank_heavy_cannon_3
+			tank_heavy_cannon_2
+			tank_heavy_cannon
+			tank_high_velocity_cannon_3
+			tank_high_velocity_cannon_2
+			tank_high_velocity_cannon
+			tank_medium_fixed_superstructure_turret
+			tank_bogie_suspension
+		    tank_cast_armor
+			tank_diesel_engine
+			armor_skirts
+			sloped_armor
+			easy_maintenance
+		}
+	}
+}
+
+YUW_heavy_tank_artillery = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {YUW}
+
+	roles = {
+		land_heavy_tank_artillery
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_artillery_1 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_artillery_chassis_1
+			modules = {
+				main_armament_slot = tank_medium_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_artillery_2 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+				has_tech = interwar_artillery
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_artillery_chassis_2
+			modules = {
+				main_armament_slot = tank_medium_howitzer_2
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 4
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_medium_howitzer_2
+			tank_heavy_fixed_superstructure_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+
+	heavy_tank_artillery_3 = {
+		priority = {
+			factor = 0
+			
+		}
+		enable = {
+			has_tech = artillery5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2000
+			type = heavy_tank_artillery_chassis_3
+			modules = {
+				main_armament_slot = tank_heavy_howitzer
+				turret_type_slot = tank_heavy_fixed_superstructure_turret
+				suspension_type_slot = tank_interleaved_suspension
+				armor_type_slot = tank_welded_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = extra_ammo_storage
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 6
+				tank_nsb_armor_upgrade = {
+					base = 8
+					modifier = {
+						add = 4
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_heavy_howitzer
+			tank_heavy_fixed_superstructure_turret
+			tank_interleaved_suspension
+			tank_welded_armor
+			tank_gasoline_engine
+			extra_ammo_storage
+		}
+	}
+}
+
+YUW_heavy_tank_anti_air = {
+	category = land
+
+	blocked_for = {}
+
+	available_for = {YUW}
+
+	roles = {
+		land_heavy_tank_anti_air
+	}
+
+	priority = {
+		factor = 0
+	}
+	heavy_tank_anti_air_1 = {
+		priority = {
+			factor = 1
+			
+		}
+		enable = {
+			has_tech = interwar_antiair
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1000
+			type = heavy_tank_aa_chassis_1
+			modules = {
+				main_armament_slot = tank_anti_air_cannon
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+	heavy_tank_anti_air_2 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair2
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 1500
+			type = heavy_tank_aa_chassis_2
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_2
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 4
+				tank_nsb_armor_upgrade = {
+					base = 2
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_2
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
+
+	heavy_tank_anti_air_3 = {
+		priority = {
+			factor = 0
+		}
+		enable = {
+			has_tech = antiair5
+		}
+
+		history = yes
+		target_variant = {
+			match_value = 2500
+			type = heavy_tank_aa_chassis_3
+			modules = {
+				main_armament_slot = tank_anti_air_cannon_3
+				turret_type_slot = tank_heavy_two_man_tank_turret
+				suspension_type_slot = tank_bogie_suspension
+				armor_type_slot = tank_riveted_armor
+				engine_type_slot = tank_gasoline_engine
+				special_type_slot_1 = empty
+				special_type_slot_2 = empty
+				special_type_slot_3 = empty
+				special_type_slot_4 = empty
+			}
+			upgrades = {
+				tank_nsb_engine_upgrade = 5
+				tank_nsb_armor_upgrade = {
+					base = 3
+					modifier = {
+						add = 1
+						has_war = yes
+					}
+				}
+			}
+		}
+
+		allowed_modules = {
+			tank_anti_air_cannon_3
+			tank_heavy_two_man_tank_turret
+			tank_bogie_suspension
+			tank_riveted_armor
+			tank_gasoline_engine
+		}
+	}
 }
--- a/src/common/game_rules/00_game_rules.txt
+++ b/src/common/game_rules/00_game_rules.txt
@@ -113,6 +113,8 @@ allow_release_nations = {
 	}
 }

+
+
 allow_licensing = {
 	name = "RULE_ALLOW_LICENSING"
 	group = "RULE_GROUP_GENERAL_FOREIGN_POLICY"
--- a/src/common/ideas/tix.txt
+++ b/src/common/ideas/tix.txt
@@ -340,7 +340,7 @@ ideas = {
 			}
 		}
 		TIX_zjh = {
-			picture = idea_generic_coastal_navy
+			picture = generic_coastal_navy

 			allowed_civil_war = {
 				always = yes
--- a/src/common/scripted_triggers/diplomacy_scripted_triggers.txt
+++ b/src/common/scripted_triggers/diplomacy_scripted_triggers.txt