2025-03-25 04:03:57

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

@@ -235,7 +235,7 @@ equipment_modules = {
 		multiply_stats = {
 			naval_speed = -0.05
 			anti_air_attack = 0.06
-			build_cost_ic = 0.1
+			build_cost_ic = 0.15
 		}
 		dismantle_cost_ic = 2000
 
@@ -320,28 +320,6 @@ equipment_modules = {
 
 		dismantle_cost_ic = 1250
 	}
-	ship_carrier_armor_heavy = {
-		category = ship_carrier_armor_heavy
-		gfx = ship_heavy_armor
-		
-		multiply_stats = {
-			build_cost_ic = 0.2
-		}
-		build_cost_resources = {
-			steel = 1
-		}
-		multiply_stats = {
-			naval_speed = -0.1
-			max_strength = 0.3
-		}
-		add_stats = {
-			armor_value = 20
-			naval_torpedo_damage_reduction_factor = 0.2
-			naval_torpedo_enemy_critical_chance_factor = -0.15
-			reliability = 0.15
-		}
-		dismantle_cost_ic = 4500
-	}
 
 
 

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

@@ -2187,7 +2187,30 @@ equipment_modules = {
 		category = ship_missile
 
 		add_stats = {
-			build_cost_ic = 1000
+			build_cost_ic = 800
+			hg_attack = 22
+			lg_attack = 16
+			naval_heavy_gun_hit_chance_factor = 0.025
+			naval_light_gun_hit_chance_factor = 0.025
+			reliability = -0.1
+			max_strength = 25
+		}
+		add_average_stats = {
+			hg_armor_piercing = 50
+			lg_armor_piercing = 24
+		}
+		multiply_stats = {
+			naval_speed = -0.08
+			surface_visibility = -0.02
+		}
+		dismantle_cost_ic = 600
+	}
+	ship_missile_2 = {
+		category = ship_missile
+		parent = ship_missile_1
+
+		add_stats = {
+			build_cost_ic = 1300
 			hg_attack = 30
 			lg_attack = 20
 			naval_heavy_gun_hit_chance_factor = 0.05
@@ -2203,7 +2226,7 @@ equipment_modules = {
 			naval_speed = -0.1
 			surface_visibility = -0.025
 		}
-		dismantle_cost_ic = 800
+		dismantle_cost_ic = 950
 	}
 	ship_cruise_missile_1 = {
 		category = ship_missile

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

@@ -402,7 +402,7 @@ equipment_modules = {
 		
 		multiply_stats = {
 			naval_speed = 0.3
-			sub_visibility = -0.2
+			sub_visibility = -0.1
 			max_strength = -0.1
 			fuel_consumption = -1
 		}

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

@@ -572,6 +572,462 @@ equipment_modules = {
 	}
 
 
+#####################
+##  CARRIER ARMOR  ##
+#####################
+	ship_armor_carrier_1 = {
+		category = ship_carrier_armor
+		gfx = ship_armor_thin_1
+		
+		multiply_stats = {
+			build_cost_ic = 0.05
+			naval_speed = -0.05
+		}
+		dismantle_cost_ic = 1500
+
+		add_stats = {
+			armor_value = 8
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 600
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 800
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor 
+			convert_cost_ic = 2500
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 3000
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 800
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 1000
+		}
+	}
+	ship_armor_carrier_2 = {
+		category = ship_carrier_armor
+		gfx = ship_armor_thin_2
+		parent = ship_armor_carrier_1
+		multiply_stats = {
+			build_cost_ic = 0.08
+			naval_speed = -0.075
+			max_strength = 0.05
+		}
+		dismantle_cost_ic = 1750
+		
+		add_stats = {
+			armor_value = 10
+		}
+		build_cost_resources = {
+			steel = 1
+		}
+
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 1000
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 1200
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 3000
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 3500
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 1300
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 1500
+		}
+		can_convert_from = {
+			module = ship_armor_carrier_1
+			convert_cost_ic = 500
+		}
+	}
+	ship_armor_carrier_3 = {
+		category = ship_carrier_armor
+		gfx = ship_armor_thin_3
+		parent = ship_armor_carrier_2
+		multiply_stats = {
+			build_cost_ic = 0.12
+			naval_speed = -0.1
+			max_strength = 0.1
+		}
+		dismantle_cost_ic = 2000
+		
+		add_stats = {
+			armor_value = 12
+		}
+		build_cost_resources = {
+			steel = 1
+			chromium = 1
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 1500
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 1700
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 3500
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 4000
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 1900
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 2100
+		}
+		can_convert_from = {
+			module = ship_armor_carrier_2
+			convert_cost_ic = 750
+		}
+	}
+	ship_armor_carrier_4 = {
+		category = ship_carrier_armor
+		gfx = ship_armor_thin_4
+		parent = ship_armor_carrier_3
+		multiply_stats = {
+			build_cost_ic = 0.15
+			naval_speed = -0.125
+			max_strength = 0.15
+		}
+		dismantle_cost_ic = 2250
+		
+		add_stats = {
+			armor_value = 14
+		}
+		build_cost_resources = {
+			steel = 2
+			chromium = 1
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 2000
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 2200
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor
+			convert_cost_ic = 4000
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 4500
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 2500
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 2700
+		}
+		can_convert_from = {
+			module = ship_armor_carrier_3
+			convert_cost_ic = 1000
+		}
+	}
+	ship_armor_carrier_heavy_1 = {
+		category = ship_carrier_armor_heavy
+		gfx = ship_armor_1
+		add_equipment_type = capital_ship
+		
+		multiply_stats = {
+			build_cost_ic = 0.08
+			naval_speed = -0.07
+			max_strength = 0.05
+		}
+		build_cost_resources = {
+			steel = 1
+		}
+
+		add_stats = {
+			armor_value = 10
+		}
+		dismantle_cost_ic = 1500
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 1800
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 1500
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor 
+			convert_cost_ic = 1000
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 1500
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 1600
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 1800
+		}
+	}
+	ship_armor_carrier_heavy_2 = {
+		category = ship_carrier_armor_heavy
+		gfx = ship_armor_2
+		add_equipment_type = capital_ship
+		parent = ship_armor_cruiser_heavy_1
+		multiply_stats = {
+			build_cost_ic = 0.12
+			naval_speed = -0.1
+			max_strength = 0.1
+		}
+		build_cost_resources = {
+			steel = 1
+		}
+		add_stats = {
+			armor_value = 15
+			naval_torpedo_enemy_critical_chance_factor = -0.05
+			naval_torpedo_damage_reduction_factor = 0.05
+			reliability = 0.05
+		}
+		dismantle_cost_ic = 2000
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 2400
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 2000
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor 
+			convert_cost_ic = 2000
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 2500
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 2000
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 2200
+		}
+		can_convert_from = {
+			module = ship_armor_carrier_heavy_1
+			convert_cost_ic = 1200
+		}
+	}
+	ship_armor_carrier_heavy_3 = {
+		category = ship_carrier_armor_heavy
+		gfx = ship_armor_3
+		add_equipment_type = capital_ship
+		parent = ship_armor_cruiser_heavy_2
+		multiply_stats = {
+			build_cost_ic = 0.15
+			naval_speed = -0.125
+			max_strength = 0.15
+		}
+		build_cost_resources = {
+			steel = 1
+			chromium = 1
+		}
+		add_stats = {
+			armor_value = 20
+			naval_torpedo_enemy_critical_chance_factor = -0.05
+			naval_torpedo_damage_reduction_factor = 0.05
+			reliability = 0.05
+		}
+		dismantle_cost_ic = 2500
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 2800
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 2500
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor 
+			convert_cost_ic = 2500
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 3000
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 2600
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 3000
+		}
+		can_convert_from = {
+			module = ship_armor_carrier_heavy_2
+			convert_cost_ic = 1800
+		}
+	}
+	ship_armor_carrier_heavy_4 = {
+		category = ship_carrier_armor_heavy
+		gfx = ship_armor_bc_4
+		add_equipment_type = capital_ship
+		parent = ship_armor_cruiser_heavy_3
+		multiply_stats = {
+			build_cost_ic = 0.18
+			naval_speed = -0.15
+			max_strength = 0.2
+		}
+		build_cost_resources = {
+			steel = 2
+			chromium = 1
+		}
+		add_stats = {
+			armor_value = 25
+			naval_torpedo_enemy_critical_chance_factor = -0.05
+			naval_torpedo_damage_reduction_factor = 0.05
+			reliability = 0.05
+		}
+		dismantle_cost_ic = 3000
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 3300
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 3000
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor 
+			convert_cost_ic = 3000
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 3500
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 3000
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 3400
+		}
+		can_convert_from = {
+			module = ship_armor_carrier_heavy_3
+			convert_cost_ic = 2300
+		}
+	}
+	ship_armor_carrier_heavy_5 = {
+		category = ship_carrier_armor_heavy
+		gfx = ship_heavy_armor
+		
+		multiply_stats = {
+			build_cost_ic = 0.2
+		}
+		build_cost_resources = {
+			steel = 2
+			chromium = 1
+		}
+		multiply_stats = {
+			naval_speed = -0.18
+			max_strength = 0.3
+		}
+		add_stats = {
+			armor_value = 30
+			naval_torpedo_enemy_critical_chance_factor = -0.1
+			naval_torpedo_damage_reduction_factor = 0.15
+			reliability = 0.15
+		}
+		dismantle_cost_ic = 4500
+		can_convert_from = {
+			module_category = ship_carrier_armor
+			convert_cost_ic = 4200
+		}
+		can_convert_from = {
+			module_category = ship_carrier_armor_heavy
+			convert_cost_ic = 4000
+		}
+		can_convert_from = {
+			module_category = ship_heavy_armor 
+			convert_cost_ic = 4000
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 4500
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_armor
+			convert_cost_ic = 4000
+		}
+		can_convert_from = {
+			module_category = ship_cruiser_heavy_armor
+			convert_cost_ic = 4500
+		}
+		can_convert_from = {
+			module = ship_armor_carrier_heavy_4
+			convert_cost_ic = 3000
+		}
+	}
+	ship_armor_carrier_shbb = {
+		category = ship_carrier_armor_shbb
+		gui_category = ship_carrier_armor_heavy
+		gfx = ship_heavy_armor
+		
+		multiply_stats = {
+			build_cost_ic = 0.2
+			naval_speed = -0.2
+			max_strength = 0.15
+		}
+		build_cost_resources = {
+			steel = 2
+			chromium = 1
+		}
+		add_stats = {
+			armor_value = 35
+			naval_torpedo_enemy_critical_chance_factor = -0.1
+			naval_torpedo_damage_reduction_factor = 0.1
+		}
+		dismantle_cost_ic = 5500
+		can_convert_from = {
+			module_category = ship_heavy_armor 
+			convert_cost_ic = 5000
+		}
+		can_convert_from = {
+			module_category = ship_super_heavy_armor
+			convert_cost_ic = 4000
+		}
+	}
+
+
 ####################
 ##  ARMOR SCHEME  ##
 ####################
@@ -818,6 +1274,23 @@ equipment_modules = {
 			convert_cost_ic = 240
 		}
 	}
+	pressure_hull_5 = {
+		category = pressure_hull
+		parent = pressure_hull_4
+
+		add_stats = {
+			build_cost_ic = 600
+		}
+		multiply_stats = {
+			max_strength = 0.3
+			sub_visibility = -0.085
+			naval_speed = 0.1
+		}
+		can_convert_from = {
+			module_category = pressure_hull
+			convert_cost_ic = 400
+		}
+	}
 	anechoic_tile_1 = {
 		category = sub_ship_stealth
 		add_stats = {

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

@@ -336,7 +336,7 @@ equipment_modules = {
 		}
 		dismantle_cost_ic = 100000
 		forbid_module_categories = {
-			ship_super_heavy_armor
+			ship_carrier_armor_shbb
 			ship_deck_space_converted
 		}
 	}
@@ -351,7 +351,7 @@ equipment_modules = {
 		}
 		dismantle_cost_ic = 100000
 		forbid_module_categories = {
-			ship_super_heavy_armor
+			ship_carrier_armor_shbb
 			ship_deck_space_converted
 		}
 	}
@@ -370,4 +370,33 @@ equipment_modules = {
 			chromium = 1
 		}
 	}
+
+######################
+##  Auxiliary Role  ##
+######################
+	ship_hull_civilian_role_ap = {
+		category = ap_role
+		forbid_module_categories = {
+			seaplane_hangar
+		}
+	}
+	ship_hull_civilian_role_ao = {
+		category = ap_role
+		multiply_stats = {
+			build_cost_ic = 0.15
+			naval_range = 0.5
+			fuel_consumption = 0.1
+		}
+		forbid_module_categories = {
+			seaplane_hangar
+		}
+	}
+	ship_hull_civilian_role_av = {
+		category = ap_role
+		multiply_stats = {
+			build_cost_ic = 0.15
+			surface_detection = 0.1
+			sub_detection = 0.1
+		}
+	}
 }

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

@@ -133,6 +133,27 @@ equipment_modules = {
 		category = ship_missile_aa
 		gui_category = ship_missile
 
+		add_stats = {
+			build_cost_ic = 700
+			hg_attack = 3
+			lg_attack = 3
+			anti_air_attack = 8
+			naval_heavy_gun_hit_chance_factor = 0.015
+			naval_light_gun_hit_chance_factor = 0.015
+			reliability = -0.05
+			max_strength = 3
+		}
+		multiply_stats = {
+			naval_speed = -0.03
+			surface_visibility = -0.01
+		}
+		dismantle_cost_ic = 400
+	}
+	ship_missile_aa_2 = {
+		category = ship_missile_aa
+		gui_category = ship_missile
+		parent = ship_missile_aa_1
+
 		add_stats = {
 			build_cost_ic = 1000
 			hg_attack = 5
@@ -402,6 +423,7 @@ equipment_modules = {
 		add_stats = {
 			torpedo_attack = 14
 			build_cost_ic = 80
+			naval_torpedo_hit_chance_factor = 0.01
 		}
 
 		multiply_stats = {
@@ -425,7 +447,7 @@ equipment_modules = {
 		add_stats = {
 			torpedo_attack = 18
 			build_cost_ic = 100
-			naval_torpedo_hit_chance_factor = 0.01
+			naval_torpedo_hit_chance_factor = 0.02
 		}
 
 		multiply_stats = {
@@ -453,7 +475,7 @@ equipment_modules = {
 		add_stats = {
 			torpedo_attack = 22
 			build_cost_ic = 120
-			naval_torpedo_hit_chance_factor = 0.015
+			naval_torpedo_hit_chance_factor = 0.03
 		}
 
 		multiply_stats = {
@@ -478,7 +500,7 @@ equipment_modules = {
 		add_stats = {
 			torpedo_attack = 26
 			build_cost_ic = 140
-			naval_torpedo_hit_chance_factor = 0.02
+			naval_torpedo_hit_chance_factor = 0.04
 		}
 
 		multiply_stats = {
@@ -503,7 +525,7 @@ equipment_modules = {
 			torpedo_attack = 30
 			sub_attack = 5
 			build_cost_ic = 180
-			naval_torpedo_hit_chance_factor = 0.025
+			naval_torpedo_hit_chance_factor = 0.05
 		}
 
 		multiply_stats = {
@@ -737,6 +759,16 @@ equipment_modules = {
 			reliability = -0.15
 		}
 	}
+	sub_bow_sonar = {
+		category = submarine_miscellaneous
+		add_stats = {
+			sub_detection = 13
+			surface_detection = 5
+			reliability = -0.05
+			build_cost_ic = 150
+		}
+		dismantle_cost_ic = 600
+	}
 
 
 ###############
@@ -801,7 +833,7 @@ equipment_modules = {
 		gfx = ship_airplane_launcher_2
 		parent = ship_airplane_launcher_1
 		add_stats = {
-			surface_detection = 5
+			surface_detection = 4
 			sub_detection = 3.5
 			sub_attack = 2.5
 			build_cost_ic = 250
@@ -816,9 +848,9 @@ equipment_modules = {
 	}
 	ship_helipad = {
 		category = ship_airplane_launcher
-		parent = ship_airplane_launcher_2
+		gui_category = carrier_helipad
 		add_stats = {
-			surface_detection = 3.5
+			surface_detection = 3
 			sub_detection = 4.5
 			sub_attack = 6
 			build_cost_ic = 200
@@ -830,7 +862,7 @@ equipment_modules = {
     recon_drone_1 = {
 		category = ship_airplane_launcher
 		add_stats = {
-			surface_detection = 2.5
+			surface_detection = 2
 			sub_detection = 3
 			build_cost_ic = 10
 		}
@@ -839,8 +871,8 @@ equipment_modules = {
 		category = seaplane_hangar
 		gui_category = ship_airplane_launcher
 		multiply_stats = {
-			surface_detection = 0.15
-			sub_detection = 0.15
+			surface_detection = 0.25
+			sub_detection = 0.25
 			naval_speed = -0.05
 			fuel_consumption = 0.05
 		}
@@ -866,7 +898,7 @@ equipment_modules = {
 		category = sub_airplane_launcher
 		parent = sub_airplane_launcher_1
 		add_stats = {
-			surface_detection = 4.5
+			surface_detection = 3.5
 			naval_torpedo_hit_chance_factor = 0.02
 			hg_attack = 2
 			lg_attack = 1
@@ -932,6 +964,42 @@ equipment_modules = {
 	}
 
 
+#####################
+##  CONNING TOWER  ##
+#####################
+	sub_conning_tower_0 = {
+		category = sub_conning_tower
+		add_stats = {
+			build_cost_ic = 50
+		}
+		dismantle_cost_ic = 100
+		forbid_module_categories = {
+			ship_radar
+			ship_sonar
+		}
+	}
+	sub_conning_tower_1 = {
+		category = sub_conning_tower
+		parent = sub_conning_tower_0
+		add_stats = {
+			build_cost_ic = 150
+		}
+		dismantle_cost_ic = 200
+	}
+	sub_conning_tower_2 = {
+		category = sub_conning_tower
+		parent = sub_conning_tower_1
+		add_stats = {
+			build_cost_ic = 250
+			reliability = 0.05
+		}
+		multiply_stats = {
+			naval_speed = 0.03
+		}
+		dismantle_cost_ic = 300
+	}
+
+
 #################
 ##  PERISCOPE  ##
 #################
@@ -941,7 +1009,7 @@ equipment_modules = {
 			sub_visibility = 0.06
 		}
 		add_stats = {
-			surface_detection = 8
+			surface_detection = 3
 			build_cost_ic = 10
 		}
 		can_convert_from = {
@@ -956,7 +1024,7 @@ equipment_modules = {
 			sub_visibility = 0.05
 		}
 		add_stats = {
-			surface_detection = 10
+			surface_detection = 5
 			build_cost_ic = 30
 		}
 		can_convert_from = {
@@ -971,7 +1039,7 @@ equipment_modules = {
 			sub_visibility = 0.025
 		}
 		add_stats = {
-			surface_detection = 12
+			surface_detection = 8
 			build_cost_ic = 50
 		}
 		can_convert_from = {
@@ -986,7 +1054,7 @@ equipment_modules = {
 			sub_visibility = 0.01
 		}
 		add_stats = {
-			surface_detection = 14
+			surface_detection = 11
 			build_cost_ic = 70
 		}
 		can_convert_from = {
@@ -994,6 +1062,21 @@ equipment_modules = {
 			convert_cost_ic = 56
 		}
 	}
+	sub_ship_periscope_4 = {
+		category = sub_ship_periscope
+		parent = sub_ship_periscope_3
+		multiply_stats = {
+			sub_visibility = 0.01
+		}
+		add_stats = {
+			surface_detection = 14
+			build_cost_ic = 120
+		}
+		can_convert_from = {
+			module_category = sub_ship_periscope
+			convert_cost_ic = 75
+		}
+	}
 
 
 

src/common/units/equipment/modules/Special_modules.txt

@@ -73,7 +73,7 @@ equipment_modules = {
 			surface_visibility = 0.5
 		}
 		multiply_stats = {
-			naval_speed = -0.05
+			naval_speed = -0.02
 		}
 		add_average_stats = {
 			hg_armor_piercing = 22

src/common/units/equipment/ship_hull_carrier.txt

@@ -52,7 +52,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = no
-				allowed_module_categories = { ship_cruiser_armor ship_cruiser_heavy_armor }
+				allowed_module_categories = { ship_carrier_armor }
 			}
 			fixed_ship_carrier_miscellaneous_slot_1 = { 
 				required = no
@@ -207,7 +207,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = no
-				allowed_module_categories = { ship_super_heavy_armor ship_heavy_armor ship_cruiser_armor ship_cruiser_heavy_armor }
+				allowed_module_categories = { ship_carrier_armor ship_carrier_armor_heavy ship_armor_carrier_shbb }
 			}
 			fixed_ship_carrier_miscellaneous_slot_1 = inherit
 			fixed_ship_carrier_miscellaneous_slot_2 = inherit
@@ -299,7 +299,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = no
-				allowed_module_categories = { ship_cruiser_armor ship_cruiser_heavy_armor }
+				allowed_module_categories = { ship_carrier_armor ship_carrier_armor_heavy }
 			}
 			fixed_ship_carrier_miscellaneous_slot_1 = inherit
 			fixed_ship_carrier_miscellaneous_slot_2 = inherit
@@ -645,7 +645,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = yes
-				allowed_module_categories = { ship_carrier_armor_heavy }
+				allowed_module_categories = { ship_carrier_armor ship_carrier_armor_heavy }
 			}
 			fixed_ship_carrier_miscellaneous_slot_1 = { 
 				required = no
@@ -696,7 +696,7 @@ equipments = {
 		}
 		default_modules = {
 			fixed_ship_engine_slot = carrier_ship_engine_4
-			fixed_ship_armor_slot = ship_carrier_armor_heavy
+			fixed_ship_armor_slot = ship_armor_carrier_heavy_5
 		}
 
 		naval_range = 6000
@@ -749,7 +749,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = yes
-				allowed_module_categories = { ship_carrier_armor_heavy }
+				allowed_module_categories = { ship_carrier_armor ship_carrier_armor_heavy }
 			}
 			fixed_ship_carrier_miscellaneous_slot_1 = { 
 				required = no
@@ -799,7 +799,7 @@ equipments = {
 		}
 		default_modules = {
 			fixed_ship_engine_slot = carrier_ship_engine_4
-			fixed_ship_armor_slot = ship_carrier_armor_heavy
+			fixed_ship_armor_slot = ship_armor_carrier_heavy_5
 		}
 
 		naval_range = 6000

src/common/units/equipment/ship_hull_civilian.txt

@@ -28,26 +28,35 @@ equipments = {
                 required = yes
                 allowed_module_categories = { civilian_ship_engine }
             }
+            fixed_ship_airplane_launcher_slot = {
+                required = no
+                allowed_module_categories = { ship_airplane_launcher seaplane_hangar carrier_helipad }
+            }
+            fixed_ship_role_slot = {
+                required = yes
+                allowed_module_categories = { ap_role }
+            }
             front_1_custom_slot = {
                 required = no
                 allowed_module_categories = { civilian_ship_weapons ship_auxiliary }
             }
             mid_1_custom_slot = {
                 required = no
-                allowed_module_categories = { ship_auxiliary ship_airplane_launcher }
+                allowed_module_categories = { ship_auxiliary ship_airplane_launcher seaplane_hangar carrier_helipad }
             }
             mid_2_custom_slot = {
                 required = no
-                allowed_module_categories = { ship_auxiliary ship_airplane_launcher }
+                allowed_module_categories = { ship_auxiliary ship_airplane_launcher seaplane_hangar carrier_helipad }
             }
             rear_1_custom_slot = {
                 required = no
-                allowed_module_categories = { ship_auxiliary ship_airplane_launcher civilian_ship_weapons }
+                allowed_module_categories = { ship_auxiliary ship_airplane_launcher seaplane_hangar carrier_helipad civilian_ship_weapons }
             }
         }
 
         default_modules = {
             fixed_ship_engine_slot = empty
+            fixed_ship_role_slot = ship_hull_civilian_role_ap
         }
 
         lg_armor_piercing = 0
@@ -86,6 +95,10 @@ equipments = {
             module = ship_rocket_launcher
             count < 2
         }
+        module_count_limit = {
+            category = ship_airplane_launcher
+            count < 4
+        }
 
         manpower = 600
         naval_supremacy_factor = 0.2
@@ -124,17 +137,25 @@ equipments = {
                 required = yes
                 allowed_module_categories = { civilian_ship_engine }
             }
+            fixed_ship_airplane_launcher_slot = {
+                required = no
+                allowed_module_categories = { ship_airplane_launcher seaplane_hangar carrier_helipad }
+            }
+            fixed_ship_role_slot = {
+                required = yes
+                allowed_module_categories = { ap_role }
+            }
             front_1_custom_slot = {
                 required = no
                 allowed_module_categories = { civilian_ship_weapons ship_auxiliary }
             }
             mid_1_custom_slot = {
                 required = no
-                allowed_module_categories = { ship_auxiliary ship_airplane_launcher }
+                allowed_module_categories = { ship_auxiliary ship_airplane_launcher seaplane_hangar carrier_helipad }
             }
             rear_1_custom_slot = {
                 required = no
-                allowed_module_categories = { ship_auxiliary ship_airplane_launcher civilian_ship_weapons }
+                allowed_module_categories = { ship_auxiliary ship_airplane_launcher seaplane_hangar carrier_helipad civilian_ship_weapons }
             }
         }
 
@@ -159,10 +180,12 @@ equipments = {
             fixed_ship_secondaries_slot = inherit
             fixed_ship_anti_air_slot = inherit
             fixed_ship_engine_slot = inherit
+            fixed_ship_airplane_launcher_slot = inherit
             fixed_ship_armor_slot = {
                 required = no
                 allowed_module_categories = { ship_cruiser_armor }
             }
+            fixed_ship_role_slot = inherit
             front_1_custom_slot = inherit
             mid_1_custom_slot = inherit
             mid_2_custom_slot = inherit

src/common/units/equipment/ship_hull_cruiser.txt

@@ -185,6 +185,14 @@ equipments = {
 			module = ship_radar_jammer
 			count < 2
 		}
+		module_count_limit = {
+			module = structural_aluminum
+			count < 2
+		}
+		module_count_limit = {
+			module = ship_bulbous_bow
+			count < 2
+		}
 
 		default_modules = {
 			fixed_ship_battery_slot = empty

src/common/units/equipment/ship_hull_heavy.txt

@@ -145,6 +145,10 @@ equipments = {
 			module = ship_radar_jammer
 			count < 2
 		}
+		module_count_limit = {
+			module = structural_aluminum
+			count < 2
+		}
 
 		default_modules = {
 			fixed_ship_battery_slot = empty

src/common/units/equipment/ship_hull_light.txt

@@ -153,6 +153,14 @@ equipments = {
 			module = ship_radar_jammer
 			count < 2
 		}
+		module_count_limit = {
+			module = structural_aluminum
+			count < 2
+		}
+		module_count_limit = {
+			module = ship_bulbous_bow
+			count < 2
+		}
 
 		default_modules = {
 			fixed_ship_battery_slot = empty

src/common/units/equipment/ship_hull_submarine.txt

@@ -35,12 +35,16 @@ equipments = {
 				required = no
 				allowed_module_categories = { pressure_hull }
 			}
+			fixed_ship_conning_tower_slot = {
+				required = yes
+				allowed_module_categories = { sub_conning_tower }
+			}
 			fixed_ship_extra_secondaries_slot = {
 				required = no
 				allowed_module_categories = { submarine_miscellaneous }
 			}
 			mid_1_custom_slot = {
-				required = no
+				required = yes
 				allowed_module_categories = {
 					sub_ship_periscope
 				}
@@ -86,6 +90,7 @@ equipments = {
 
 		default_modules = {
 			fixed_ship_torpedo_slot = empty
+			fixed_ship_conning_tower_slot = sub_conning_tower_0
 			fixed_ship_engine_slot = sub_ship_engine_1
 			fixed_ship_armor_slot = pressure_hull_1
 			mid_1_custom_slot = sub_ship_periscope_0
@@ -160,6 +165,7 @@ equipments = {
 			fixed_ship_torpedo_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_armor_slot = inherit
+			fixed_ship_conning_tower_slot = inherit
 			fixed_ship_fire_control_system_slot = {
 				required = no
 				allowed_module_categories = { sub_fire_control_system ship_sonar }
@@ -209,6 +215,7 @@ equipments = {
 			fixed_ship_torpedo_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_armor_slot = inherit
+			fixed_ship_conning_tower_slot = inherit
 			fixed_ship_fire_control_system_slot = inherit
 			fixed_ship_radar_slot = inherit
 			fixed_ship_extra_secondaries_slot = inherit
@@ -265,6 +272,7 @@ equipments = {
 			fixed_ship_torpedo_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_armor_slot = inherit
+			fixed_ship_conning_tower_slot = inherit
 			fixed_ship_fire_control_system_slot = inherit
 			fixed_ship_radar_slot = inherit
 			fixed_ship_extra_secondaries_slot = inherit
@@ -319,6 +327,7 @@ equipments = {
 			}
 			fixed_ship_engine_slot = inherit
 			fixed_ship_armor_slot = inherit
+			fixed_ship_conning_tower_slot = inherit
 			fixed_ship_fire_control_system_slot = inherit
 			fixed_ship_radar_slot = inherit
 			fixed_ship_extra_secondaries_slot = inherit
@@ -378,6 +387,7 @@ equipments = {
 			}
 			fixed_ship_engine_slot = inherit
 			fixed_ship_armor_slot = inherit
+			fixed_ship_conning_tower_slot = inherit
 			fixed_ship_fire_control_system_slot = {
 				required = no
 				allowed_module_categories = { sub_fire_control_system ship_sonar }
@@ -397,7 +407,7 @@ equipments = {
 				}
 			}
 			mid_1_custom_slot = {
-				required = no
+				required = yes
 				allowed_module_categories = {
 					sub_ship_periscope
 				}
@@ -459,9 +469,10 @@ equipments = {
 			fixed_ship_torpedo_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_armor_slot = inherit
+			fixed_ship_conning_tower_slot = inherit
 			fixed_ship_extra_secondaries_slot = inherit
 			mid_1_custom_slot = {
-				required = no
+				required = yes
 				allowed_module_categories = {
 					sub_ship_periscope
 				}