2024-08-15 16:35:22

src/common/units/equipment/modules/00_ship_modules_electronics.txt

@@ -257,33 +257,150 @@ equipment_modules = {
 		}
 		critical_parts = { damaged_fire_control }
 	}
-	ship_sub_torpedo_computer = {
+	ship_sub_torpedo_computer_1 = {
 		category = sub_fire_control_system
 		gui_category = ship_fire_control_system
 		sfx = sfx_ui_sd_module_sonar
 		
 		add_stats = {
-			build_cost_ic = 250
-			naval_torpedo_hit_chance_factor = 0.05
+			build_cost_ic = 200
+			naval_torpedo_hit_chance_factor = 0.075
+		}
+		can_convert_from = {
+			module_category = sub_fire_control_system
+			convert_cost_ic = 140
 		}
 	}
-	ship_torpedo_fire_control = {
-		category = ship_fire_control_system
-		multiply_stats = {
-			naval_torpedo_hit_chance_factor = 0.03
-		}
+	ship_sub_torpedo_computer_2 = {
+		category = sub_fire_control_system
+		parent = ship_sub_torpedo_computer_1
+		gui_category = ship_fire_control_system
+		sfx = sfx_ui_sd_module_sonar
+		
 		add_stats = {
-			build_cost_ic = 150
+			build_cost_ic = 250
+			naval_torpedo_hit_chance_factor = 0.1
+		}
+		can_convert_from = {
+			module = sub_fire_control_system_1
+			convert_cost_ic = 150
+		}
+		can_convert_from = {
+			module_category = sub_fire_control_system
+			convert_cost_ic = 180
+		}
+	}
+	ship_sub_torpedo_computer_3 = {
+		category = sub_fire_control_system
+		parent = ship_sub_torpedo_computer_2
+		gui_category = ship_fire_control_system
+		sfx = sfx_ui_sd_module_sonar
+		
+		add_stats = {
+			build_cost_ic = 300
+			naval_torpedo_hit_chance_factor = 0.125
+			fuel_consumption = 3
+		}
+		can_convert_from = {
+			module = sub_fire_control_system_2
+			convert_cost_ic = 200
+		}
+		can_convert_from = {
+			module_category = sub_fire_control_system
+			convert_cost_ic = 220
+		}
+	}
+	ship_torpedo_fire_control_1 = {
+		category = ship_fire_control_system
+		add_stats = {
+			build_cost_ic = 120
+			naval_torpedo_hit_chance_factor = 0.05
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_2
+			convert_cost_ic = 100
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_3
+			convert_cost_ic = 80
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_4
+			convert_cost_ic = 60
+		}
+	}
+	ship_torpedo_fire_control_2 = {
+		category = ship_fire_control_system
+		parent = ship_torpedo_fire_control_1
+		gfx = ship_sub_torpedo_computer_1
+		add_stats = {
+			build_cost_ic = 160
+			naval_torpedo_hit_chance_factor = 0.075
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_1
+			convert_cost_ic = 120
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_3
+			convert_cost_ic = 100
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_4
+			convert_cost_ic = 80
+		}
+	}
+	ship_torpedo_fire_control_3 = {
+		category = ship_fire_control_system
+		parent = ship_torpedo_fire_control_2
+		gfx = ship_sub_torpedo_computer_2
+		add_stats = {
+			build_cost_ic = 200
+			naval_torpedo_hit_chance_factor = 0.1
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_1
+			convert_cost_ic = 180
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_2
+			convert_cost_ic = 120
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_4
+			convert_cost_ic = 100
+		}
+	}
+	ship_torpedo_fire_control_4 = {
+		category = ship_fire_control_system
+		parent = ship_torpedo_fire_control_3
+		gfx = ship_sub_torpedo_computer_3
+		add_stats = {
+			build_cost_ic = 250
+			naval_torpedo_hit_chance_factor = 0.125
+			fuel_consumption = 3
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_1
+			convert_cost_ic = 230
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_2
+			convert_cost_ic = 180
+		}
+		can_convert_from = {
+			module = ship_torpedo_fire_control_3
+			convert_cost_ic = 150
 		}
 	}
 	ship_aa_fire_control = {
 		category = generic_miscellaneous
 		gui_category = ship_miscellaneous
 		multiply_stats = {
-			anti_air_attack = 0.05
+			anti_air_attack = 0.25
 		}
 		add_stats = {
-			build_cost_ic = 100
+			build_cost_ic = 250
 		}
 	}
 }

src/common/units/equipment/modules/00_ship_modules_gun.txt

@@ -1861,7 +1861,7 @@ equipment_modules = {
 			reliability = -0.12
 		}
 		multiply_stats = {
-			naval_speed = -0.08
+			naval_speed = -0.065
 			max_strength = 0.15
 		}
 		add_average_stats = {
@@ -1885,7 +1885,7 @@ equipment_modules = {
 			reliability = -0.12
 		}
 		multiply_stats = {
-			naval_speed = -0.09
+			naval_speed = -0.075
 			max_strength = 0.16
 		}
 		add_average_stats = {
@@ -1910,7 +1910,7 @@ equipment_modules = {
 			naval_heavy_gun_hit_chance_factor = -0.015
 		}
 		multiply_stats = {
-			naval_speed = -0.1
+			naval_speed = -0.105
 			max_strength = 0.17
 		}
 		add_average_stats = {
@@ -2092,6 +2092,97 @@ equipment_modules = {
 		critical_parts = { damaged_secondaries }
 	}
 
+	dp_ship_secondaries_1_bb = {
+		category = ship_dp_secondaries_bb
+		gui_category = ship_secondaries
+		gfx = dp_ship_secondaries_1
+		sfx = sfx_ui_sd_module_turret
+		add_stats = {
+			lg_attack = 2
+			anti_air_attack = 1.5
+			build_cost_ic = 180
+		}
+		add_average_stats = {
+			lg_armor_piercing = 5
+		}
+
+		multiply_stats = {
+			naval_speed = -0.01
+		}
+		
+		dismantle_cost_ic = 36
+		critical_parts = { damaged_secondaries }
+	}
+
+	dp_ship_secondaries_2_bb = {
+		category = ship_dp_secondaries_bb
+		gui_category = ship_secondaries
+		parent = dp_ship_secondaries_1
+		gfx = dp_ship_secondaries_2
+		sfx = sfx_ui_sd_module_turret
+		add_stats = {
+			lg_attack = 3
+			anti_air_attack = 2.5
+			build_cost_ic = 200
+		}
+
+		multiply_stats = {
+			naval_speed = -0.01
+		}
+		add_average_stats = {
+			lg_armor_piercing = 7.5
+		}
+		
+		dismantle_cost_ic = 40
+		critical_parts = { damaged_secondaries }
+	}
+
+	dp_ship_secondaries_3_bb = {
+		category = ship_dp_secondaries_bb
+		gui_category = ship_secondaries
+		parent = dp_ship_secondaries_2
+		gfx = dp_ship_secondaries_3
+		sfx = sfx_ui_sd_module_turret
+		add_stats = {
+			lg_attack = 4
+			anti_air_attack = 3
+			build_cost_ic = 240
+		}
+
+		multiply_stats = {
+			naval_speed = -0.02
+		}
+		add_average_stats = {
+			lg_armor_piercing = 9
+		}
+		
+		dismantle_cost_ic = 48
+		critical_parts = { damaged_secondaries }
+	}
+
+	dp_ship_secondaries_4_bb = {
+		category = ship_dp_secondaries_bb
+		gui_category = ship_secondaries
+		parent = dp_ship_secondaries_3
+		gfx = dp_ship_secondaries_4
+		sfx = sfx_ui_sd_module_turret
+		add_stats = {
+			lg_attack = 5
+			anti_air_attack = 3.5
+			build_cost_ic = 290
+		}
+
+		multiply_stats = {
+			naval_speed = -0.03
+		}
+		add_average_stats = {
+			lg_armor_piercing = 11
+		}
+		
+		dismantle_cost_ic = 58
+		critical_parts = { damaged_secondaries }
+	}
+
 
 ################
 ##  MISSILES  ##
@@ -2100,7 +2191,7 @@ equipment_modules = {
 		category = ship_missile
 
 		add_stats = {
-			build_cost_ic = 2000
+			build_cost_ic = 1000
 			hg_attack = 30
 			lg_attack = 20
 			naval_heavy_gun_hit_chance_factor = 0.05
@@ -2116,13 +2207,13 @@ equipment_modules = {
 			naval_speed = -0.1
 			surface_visibility = -0.025
 		}
-		dismantle_cost_ic = 1800
+		dismantle_cost_ic = 800
 	}
 	ship_cruise_missile_1 = {
 		category = ship_missile
 
 		add_stats = {
-			build_cost_ic = 1400
+			build_cost_ic = 800
 			hg_attack = 25
 			naval_heavy_gun_hit_chance_factor = -0.8
 			reliability = -0.1
@@ -2130,7 +2221,7 @@ equipment_modules = {
 		multiply_stats = {
 			naval_speed = -0.1
 		}
-		dismantle_cost_ic = 1100
+		dismantle_cost_ic = 600
 	}
 	ship_cruise_missile_sub_1 = {
 		category = ship_sub_missile

src/common/units/equipment/modules/00_ship_modules_protection.txt

@@ -32,7 +32,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 2000
+		dismantle_cost_ic = 3500
 	}
 	ship_armor_bc_1 = {
 		abbreviation = "sdf"
@@ -58,7 +58,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 1500
+		dismantle_cost_ic = 2500
 	}
 	ship_armor_bb_2 = {
 		abbreviation = "sdg"
@@ -93,7 +93,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 2800
+		dismantle_cost_ic = 4000
 	}
 	ship_armor_bc_2 = {
 		abbreviation = "sdh"
@@ -127,7 +127,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 2200
+		dismantle_cost_ic = 3000
 	}
 	ship_armor_bb_3 = {
 		abbreviation = "sdi"
@@ -163,7 +163,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 3500
+		dismantle_cost_ic = 4500
 	}
 	ship_armor_bc_3 = {
 		abbreviation = "sdj"
@@ -199,7 +199,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 3000
+		dismantle_cost_ic = 3500
 	}
 	ship_armor_bb_4 = {
 		abbreviation = "sdj1"
@@ -234,7 +234,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 4000
+		dismantle_cost_ic = 5000
 	}
 	ship_armor_bc_4 = {
 		abbreviation = "sdj2"
@@ -269,7 +269,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 3500
+		dismantle_cost_ic = 4000
 	}
 	ship_armor_shbb = {
 		abbreviation = "sk"
@@ -306,7 +306,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 4800
+		dismantle_cost_ic = 5000
 	}
 	ship_armor_shbb_2 = {
 		category = ship_super_heavy_armor
@@ -350,7 +350,7 @@ equipment_modules = {
 				steel = 1
 			}
 		}
-		dismantle_cost_ic = 5400
+		dismantle_cost_ic = 6000
 	}
 
 
@@ -366,7 +366,7 @@ equipment_modules = {
 			build_cost_ic = 0.05
 			naval_speed = -0.05
 		}
-		dismantle_cost_ic = 1250
+		dismantle_cost_ic = 1500
 
 		add_stats = {
 			armor_value = 8
@@ -386,7 +386,7 @@ equipment_modules = {
 			naval_speed = -0.075
 			max_strength = 0.05
 		}
-		dismantle_cost_ic = 1500
+		dismantle_cost_ic = 1750
 		
 		add_stats = {
 			armor_value = 10
@@ -414,7 +414,7 @@ equipment_modules = {
 			naval_speed = -0.1
 			max_strength = 0.1
 		}
-		dismantle_cost_ic = 1750
+		dismantle_cost_ic = 2000
 		
 		add_stats = {
 			armor_value = 12
@@ -442,7 +442,7 @@ equipment_modules = {
 			naval_speed = -0.125
 			max_strength = 0.15
 		}
-		dismantle_cost_ic = 2000
+		dismantle_cost_ic = 2250
 		
 		add_stats = {
 			armor_value = 14
@@ -477,7 +477,7 @@ equipment_modules = {
 		add_stats = {
 			armor_value = 10
 		}
-		dismantle_cost_ic = 1200
+		dismantle_cost_ic = 1500
 		can_convert_from = {
 			module_category = ship_cruiser_heavy_armor
 			convert_cost_ic = 1500
@@ -502,7 +502,7 @@ equipment_modules = {
 			naval_torpedo_damage_reduction_factor = 0.05
 			reliability = 0.05
 		}
-		dismantle_cost_ic = 1600
+		dismantle_cost_ic = 2000
 		can_convert_from = {
 			module_category = ship_cruiser_heavy_armor
 			convert_cost_ic = 2000
@@ -532,7 +532,7 @@ equipment_modules = {
 			naval_torpedo_damage_reduction_factor = 0.05
 			reliability = 0.05
 		}
-		dismantle_cost_ic = 2000
+		dismantle_cost_ic = 2500
 		can_convert_from = {
 			module_category = ship_cruiser_heavy_armor
 			convert_cost_ic = 2500
@@ -562,7 +562,7 @@ equipment_modules = {
 			naval_torpedo_damage_reduction_factor = 0.05
 			reliability = 0.05
 		}
-		dismantle_cost_ic = 2400
+		dismantle_cost_ic = 3000
 		can_convert_from = {
 			module_category = ship_cruiser_heavy_armor
 			convert_cost_ic = 3000

src/common/units/equipment/modules/00_ship_modules_role.txt

@@ -95,25 +95,27 @@ equipment_modules = {
 		}
 	}
 	ship_hull_light_role_dda = {
-    	category = dd_role
+    	category = dd_role_missile
+		gui_category = dd_role
 		add_stats = {
 			reliability = 0.1
 		}
     	multiply_stats = {
-        	build_cost_ic = 0.1
+        	build_cost_ic = 0.15
     	}
 		forbid_module_categories = {
 			ship_missile
 		}
 	}
 	ship_hull_light_role_ddg = {
-		category = dd_role
+		category = dd_role_missile
+		gui_category = dd_role
 		add_stats = {
 			reliability = 0.2
 		}
 		multiply_stats = {
 			naval_speed = 0.05
-			build_cost_ic = 0.1
+			build_cost_ic = 0.25
 		}
 	}
 
@@ -252,11 +254,12 @@ equipment_modules = {
 		}
 	}
 	ship_hull_cruiser_role_cg = {
-		category = c_role
+		category = c_role_missile
+		gui_category = c_role
 		add_equipment_type = capital_ship
 		multiply_stats = {
 			anti_air_attack = 0.1
-			build_cost_ic = 0.1
+			build_cost_ic = 0.25
 		}
 		add_stats = {
 			max_strength = 200

src/common/units/equipment/modules/00_ship_modules_support.txt

@@ -797,14 +797,14 @@ equipment_modules = {
 			surface_detection = 7
 			sub_detection = 3.5
 			sub_attack = 2.5
-			build_cost_ic = 200
+			build_cost_ic = 250
 		}
 		can_convert_from = {
 			module_category = ship_airplane_launcher
 			convert_cost_ic = 80
 		}
 		multiply_stats = {
-			naval_speed = -0.003
+			naval_speed = -0.004
 		}
 	}
 	ship_helipad = {
@@ -866,6 +866,7 @@ equipment_modules = {
 		gfx = ship_extra_fuel_tank
 		add_stats = {
 			naval_range = 2000
+			build_cost_ic = 250
 		}
 		multiply_stats = {
 			naval_speed = -0.05
@@ -876,6 +877,7 @@ equipment_modules = {
 		category = ship_auxiliary
 		add_stats = {
 			naval_range = 1000
+			build_cost_ic = 100
 		}
 		multiply_stats = {
 			reliability = 0.05
@@ -887,6 +889,9 @@ equipment_modules = {
 			naval_range = 0.2
 			naval_speed = -0.05
 		}
+		add_stats = {
+			build_cost_ic = 350
+		}
 	}
 
 
@@ -1043,19 +1048,19 @@ equipment_modules = {
 		category = heavy_miscellaneous
 		gui_category = ship_miscellaneous
 		add_stats = {
-			reliability = -0.05
+			reliability = -0.1
 		}
 		multiply_stats = {
-			anti_air_attack = 0.02
-			build_cost_ic = 0.01
+			anti_air_attack = 0.2
+			build_cost_ic = 0.05
 		}
 	}
 	ship_vt_shell = {
 		category = generic_miscellaneous
 		gui_category = ship_miscellaneous
 		multiply_stats = {
-			anti_air_attack = 0.04
-			build_cost_ic = 0.02
+			anti_air_attack = 0.25
+			build_cost_ic = 0.08
 		}
 	}
     crewed_torpedo = {
@@ -1196,4 +1201,15 @@ equipment_modules = {
 			steel = -3
 		}
 	}
+	ship_anti_air_circle = {
+		category = heavy_miscellaneous
+		gui_category = ship_anti_air
+		multiply_stats = {
+			anti_air_attack = 0.35
+			build_cost_ic = 0.15
+		}
+		build_cost_resources = {
+			steel = 1
+		}
+	}
 }

src/common/units/equipment/ship_hull_carrier.txt

@@ -48,7 +48,7 @@ equipments = {
 			}
 			fixed_ship_secondaries_slot = {
 				required = no
-				allowed_module_categories = { ship_secondaries ship_dp_secondaries }
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb }
 			}
 			fixed_ship_armor_slot = {
 				required = no
@@ -72,9 +72,8 @@ equipments = {
 				allowed_module_categories = {
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 				}
 			}
 		}
@@ -102,7 +101,7 @@ equipments = {
 		hg_attack = 0
 
 		torpedo_attack = 0
-		sub_attack = 3
+		sub_attack = 1.5
 
 		anti_air_attack = 0
 
@@ -171,7 +170,7 @@ equipments = {
 			fixed_ship_engine_slot = cruiser_ship_engine_1
 			fixed_ship_secondaries_slot = empty
 		}
-		naval_range = 4000
+		naval_range = 3000
 
 		max_strength = 125
 
@@ -204,7 +203,7 @@ equipments = {
 			}
 			fixed_ship_secondaries_slot = {
 				required = no
-				allowed_module_categories = { ship_secondaries ship_dp_secondaries ship_medium_battery_single ship_secondaries_special }
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb ship_medium_battery_single ship_secondaries_special }
 			}
 			fixed_ship_armor_slot = inherit
 			fixed_ship_carrier_miscellaneous_slot_1 = inherit
@@ -214,10 +213,9 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 				}
 			}
 			mid_2_custom_slot = {
@@ -226,7 +224,6 @@ equipments = {
 					ship_secondaries
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 				}
 			}
 		}
@@ -237,9 +234,9 @@ equipments = {
 		}
 		naval_range = 4000
 		reliability = 0.65
-		max_strength = 250
+		max_strength = 220
 		naval_speed = 26.5
-		surface_visibility = 30
+		surface_visibility = 33
 
 
 		build_cost_ic = 2800
@@ -284,7 +281,7 @@ equipments = {
 			}
 			fixed_ship_secondaries_slot = {
 				required = no
-				allowed_module_categories = { ship_secondaries ship_dp_secondaries }
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb }
 			}
 			fixed_ship_armor_slot = inherit
 			fixed_ship_carrier_miscellaneous_slot_1 = inherit
@@ -296,9 +293,8 @@ equipments = {
 				allowed_module_categories = {
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 				}
 			}
 			mid_1_custom_slot = {
@@ -306,9 +302,8 @@ equipments = {
 				allowed_module_categories = {
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 				}
 			}
 		}
@@ -344,7 +339,6 @@ equipments = {
 					ship_anti_air
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 				}
 			}
 			front_2_custom_slot = {
@@ -359,10 +353,9 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 				}
 			}
 			mid_2_custom_slot = {
@@ -372,7 +365,7 @@ equipments = {
 					carrier_side_lift
 					carrier_angled_deck
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_deck_space
 					ship_deck_space_small
 				}
@@ -431,7 +424,6 @@ equipments = {
 					ship_anti_air
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 				}
 			}
 			front_2_custom_slot = {
@@ -446,10 +438,9 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 					steam_catapult
 					carrier_side_lift
 					carrier_angled_deck
@@ -459,10 +450,9 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_deck_space
 					ship_deck_space_small
-					ship_carrier_armor
 					steam_catapult
 					carrier_side_lift
 					carrier_angled_deck
@@ -472,7 +462,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_anti_air
 					carrier_side_lift
 				}
@@ -585,7 +575,7 @@ equipments = {
 			}
 			fixed_ship_secondaries_slot = {
 				required = no
-				allowed_module_categories = { ship_secondaries ship_dp_secondaries }
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb }
 			}
 			fixed_ship_armor_slot = {
 				required = yes
@@ -614,7 +604,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_deck_space
 					ship_deck_space_big
 					steam_catapult
@@ -627,7 +617,7 @@ equipments = {
 				required = no
 				allowed_module_categories = {
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_anti_air
 					ship_missile_aa
 					carrier_side_lift

src/common/units/equipment/ship_hull_cruiser.txt

@@ -165,6 +165,18 @@ equipments = {
 			category = seaplane_hangar
 			count < 3
 		}
+		module_count_limit = {
+			module = full_missile_upgrade
+			count < 2
+		}
+		module_count_limit = {
+			module = economical_nuclear_reactor_cruiser
+			count < 2
+		}
+		module_count_limit = {
+			module = ship_display_system
+			count < 2
+		}
 
 		default_modules = {
 			fixed_ship_battery_slot = empty
@@ -731,7 +743,10 @@ equipments = {
 			fixed_ship_secondaries_slot = inherit
 			fixed_ship_armor_slot = inherit
 			fixed_ship_airplane_launcher_slot = inherit
-			fixed_ship_role_slot = inherit
+			fixed_ship_role_slot = {
+				required = yes
+				allowed_module_categories = { c_role c_role_missile }
+			}
 			fixed_ship_extra_secondaries_slot = inherit
 			front_1_custom_slot = {
 				required = no
@@ -863,7 +878,10 @@ equipments = {
 			fixed_ship_secondaries_slot = inherit
 			fixed_ship_armor_slot = inherit
 			fixed_ship_airplane_launcher_slot = inherit
-			fixed_ship_role_slot = inherit
+			fixed_ship_role_slot = {
+				required = yes
+				allowed_module_categories = { c_role c_role_missile }
+			}
 			fixed_ship_extra_secondaries_slot = inherit
 			fixed_ship_extra_missile_slot = fixed_ship_extra_secondaries_slot
 			front_1_custom_slot = {
@@ -953,18 +971,6 @@ equipments = {
 			category = ship_missile_aa
 			count < 8
 		}
-		module_count_limit = {
-			module = full_missile_upgrade
-			count < 2
-		}
-		module_count_limit = {
-			module = economical_nuclear_reactor_cruiser
-			count < 2
-		}
-		module_count_limit = {
-			module = ship_display_system
-			count < 2
-		}
 		default_modules = {
 			fixed_ship_engine_slot = cruiser_ship_engine_5
 		}

src/common/units/equipment/ship_hull_heavy.txt

@@ -43,7 +43,7 @@ equipments = {
 			}
 			fixed_ship_secondaries_slot = {
 				required = no
-				allowed_module_categories = { ship_secondaries ship_dp_secondaries ship_torpedo_bb }
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb ship_torpedo_bb }
 			}
 			fixed_ship_armor_slot = {
 				required = yes
@@ -100,7 +100,7 @@ equipments = {
 					ship_heavy_battery_quad
 					ship_anti_air
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_airplane_launcher
 				}
 			}
@@ -117,7 +117,7 @@ equipments = {
 					ship_heavy_battery_triple
 					ship_heavy_battery_quad
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_airplane_launcher
 					ship_deck_space_bb
 				}
@@ -169,7 +169,7 @@ equipments = {
 
 		surface_detection = 20
 		sub_detection = 1
-		surface_visibility = 26
+		surface_visibility = 36
 		naval_speed = 30
 		reliability = 0.80
 
@@ -203,16 +203,50 @@ equipments = {
 		can_convert_from = { vnr_ship_hull_pre_dreadnought }
 		visual_level = 0
 		module_slots = {
-			fixed_ship_battery_slot = inherit
-			fixed_ship_anti_air_slot = inherit
-			fixed_ship_fire_control_system_slot = inherit
-			fixed_ship_radar_slot = inherit
-			fixed_ship_engine_slot = inherit
-			fixed_ship_secondaries_slot = inherit
-			fixed_ship_armor_slot = inherit
-			fixed_ship_airplane_launcher_slot = inherit
-			fixed_ship_extra_secondaries_slot = inherit
-			fixed_ship_armor_scheme_slot = inherit
+			fixed_ship_battery_slot = {
+				required = yes
+				allowed_module_categories = { ship_heavy_battery }
+			}
+			fixed_ship_anti_air_slot = {
+				required = no
+				allowed_module_categories = { ship_anti_air }
+			}
+			fixed_ship_fire_control_system_slot = {
+				required = no
+				allowed_module_categories = { ship_fire_control_system }
+			}
+			fixed_ship_radar_slot = {
+				required = no
+				allowed_module_categories = { ship_radar ship_mast }
+			}
+			fixed_ship_engine_slot = {
+				required = yes
+				allowed_module_categories = { heavy_ship_engine }
+			}
+			fixed_ship_secondaries_slot = {
+				required = no
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb ship_torpedo_bb }
+			}
+			fixed_ship_armor_slot = {
+				required = yes
+				allowed_module_categories = { ship_heavy_armor }
+			}
+			fixed_ship_airplane_launcher_slot = {
+				required = no
+				allowed_module_categories = { ship_airplane_launcher generic_miscellaneous }
+			}
+			fixed_ship_extra_secondaries_slot = {
+				required = no
+				allowed_module_categories = { heavy_miscellaneous generic_miscellaneous }
+			}
+			fixed_ship_armor_scheme_slot = { 
+				required = yes
+				allowed_module_categories = { armor_scheme }
+			}
+			fixed_ship_torpedo_defense_system_slot = {
+				required = no
+				allowed_module_categories = { torpedo_defense_system }
+			}
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -225,7 +259,7 @@ equipments = {
 					ship_torpedo
 					ship_anti_air
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_airplane_launcher
 				}
 			}
@@ -235,8 +269,6 @@ equipments = {
 					ship_anti_air
 					ship_airplane_launcher
 					ship_heavy_battery
-					ship_heavy_battery_triple
-					ship_heavy_battery_quad
 				}
 			}
 		}
@@ -247,7 +279,7 @@ equipments = {
 			mid_1_custom_slot = empty
 			rear_1_custom_slot = empty
 		}
-		naval_range = 2250
+		naval_range = 2000
 
 		max_strength = 180
 		naval_speed = 21
@@ -293,7 +325,7 @@ equipments = {
 			}
 			fixed_ship_secondaries_slot = {
 				required = no
-				allowed_module_categories = { ship_secondaries ship_dp_secondaries ship_torpedo_bb }
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb ship_torpedo_bb }
 			}
 			fixed_ship_armor_slot = {
 				required = yes
@@ -350,7 +382,7 @@ equipments = {
 					ship_heavy_battery_quad
 					ship_anti_air
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_airplane_launcher
 				}
 			}
@@ -367,7 +399,7 @@ equipments = {
 					ship_heavy_battery_triple
 					ship_heavy_battery_quad
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_airplane_launcher
 					ship_deck_space_bb
 				}
@@ -395,6 +427,7 @@ equipments = {
 		reliability = 0.70
 		naval_speed = 27
 		fuel_consumption = 63
+		surface_visibility = 38
 		build_cost_ic = 2200
 	}
 
@@ -429,6 +462,7 @@ equipments = {
 		reliability = 0.75
 		naval_speed = 27.5
 		fuel_consumption = 67
+		surface_visibility = 36
 		build_cost_ic = 2600
 		manpower = 2200
 	}
@@ -456,6 +490,7 @@ equipments = {
 		reliability = 0.85
 		fuel_consumption = 67
 		naval_speed = 32
+		surface_visibility = 31
 		build_cost_ic = 2700
 
 		manpower = 2500
@@ -484,7 +519,7 @@ equipments = {
 		max_strength = 320
 		reliability = 0.9
 		fuel_consumption = 67
-
+		surface_visibility = 29
 		build_cost_ic = 3000
 
 		manpower = 2800
@@ -550,7 +585,7 @@ equipments = {
 					ship_heavy_battery_quad
 					ship_anti_air
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_airplane_launcher
 					ship_missile
 					ship_missile_aa
@@ -569,7 +604,7 @@ equipments = {
 					ship_heavy_battery_triple
 					ship_heavy_battery_quad
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_airplane_launcher
 					ship_missile
 					ship_missile_aa
@@ -590,6 +625,7 @@ equipments = {
 		max_strength = 350
 		naval_speed = 30.5
 		fuel_consumption = 67
+		surface_visibility = 27
 		reliability = 0.95
 		build_cost_ic = 3300
 
@@ -629,7 +665,7 @@ equipments = {
 			}
 			fixed_ship_secondaries_slot = {
 				required = no
-				allowed_module_categories = { ship_secondaries ship_dp_secondaries ship_torpedo_bb }
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb ship_torpedo_bb }
 			}
 			fixed_ship_armor_slot = {
 				required = yes
@@ -671,7 +707,7 @@ equipments = {
 				allowed_module_categories = {
 					ship_anti_air
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_heavy_battery 
 					ship_heavy_battery_triple 
 					ship_heavy_battery_quad
@@ -689,7 +725,7 @@ equipments = {
 				allowed_module_categories = {
 					ship_anti_air
 					ship_secondaries
-					ship_dp_secondaries
+					ship_dp_secondaries_bb
 					ship_heavy_battery 
 					ship_heavy_battery_triple 
 					ship_heavy_battery_quad
@@ -715,10 +751,10 @@ equipments = {
 		}
 		naval_range = 4500
 		naval_speed = 26.5
-		max_strength = 330
+		max_strength = 350
 		fuel_consumption = 75
 		reliability = 0.9
-		surface_visibility = 35
+		surface_visibility = 42
 		build_cost_ic = 3800
 		resources = {
 			steel = 4

src/common/units/equipment/ship_hull_light.txt

@@ -132,7 +132,10 @@ equipments = {
 			category = ship_sonar
 			count < 2
 		}
-
+		module_count_limit = {
+			category = ship_missile
+			count < 3
+		}
 		module_count_limit = {
 			category = ship_missile_aa
 			count < 3
@@ -318,7 +321,10 @@ equipments = {
 			fixed_ship_radar_slot = inherit
 			fixed_ship_torpedo_slot = inherit
 			fixed_ship_engine_slot = inherit
-			fixed_ship_role_slot = inherit
+			fixed_ship_role_slot = {
+				required = yes
+				allowed_module_categories = { dd_role dd_role_missile }
+			}
 			fixed_ship_extra_secondaries_slot = inherit
 			front_1_custom_slot = {
 				required = no
@@ -403,7 +409,10 @@ equipments = {
 			fixed_ship_radar_slot = inherit
 			fixed_ship_torpedo_slot = inherit
 			fixed_ship_engine_slot = inherit
-			fixed_ship_role_slot = inherit
+			fixed_ship_role_slot = {
+				required = yes
+				allowed_module_categories = { dd_role dd_role_missile }
+			}
 			fixed_ship_extra_secondaries_slot = inherit
 			front_1_custom_slot = {
 				required = no
@@ -484,14 +493,6 @@ equipments = {
 		manpower = 600
 		naval_speed = 36.5
 
-		module_count_limit = {
-			category = ship_missile
-			count < 3
-		}
-		module_count_limit = {
-			category = ship_missile_aa
-			count < 3
-		}
 		module_count_limit = {
 			category = ship_anti_air
 			count < 5