2025-09-21 04:02:50

src/common/ai_equipment/vnr_DD_screens.txt

@@ -29,7 +29,7 @@ naval_screen = {
 				fixed_ship_battery_slot = ship_light_battery
 				fixed_ship_torpedo_slot = ship_torpedo
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_mast
+				fixed_ship_radar_slot = { any_of = { ship_sonar ship_mast } }
 				fixed_ship_anti_air_slot = ship_anti_air
 				fixed_ship_role_slot = ship_hull_light_role_dd
 				fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } }
@@ -40,6 +40,11 @@ naval_screen = {
 				rear_2_custom_slot = ship_light_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_sonar
+			ship_anti_air
+		}
 	}
 
 	screen_1924 = {
@@ -77,6 +82,11 @@ naval_screen = {
 				rear_2_custom_slot = ship_light_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_sonar
+			ship_anti_air
+		}
 	}
 
 	screen_1936 = {
@@ -99,8 +109,8 @@ naval_screen = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } }
 				fixed_ship_battery_slot = ship_light_battery_double
 				fixed_ship_torpedo_slot = ship_torpedo
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } }
 				fixed_ship_role_slot = ship_hull_light_role_dd
 				fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } }
@@ -111,6 +121,11 @@ naval_screen = {
 				rear_2_custom_slot = ship_light_battery_double
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_sonar
+			ship_anti_air
+		}
 	}
 
 	screen_1940 = {
@@ -133,8 +148,8 @@ naval_screen = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } }
 				fixed_ship_battery_slot = dp_light_battery
 				fixed_ship_torpedo_slot = ship_torpedo
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } }
 				fixed_ship_role_slot = ship_hull_light_role_dd
 				fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } }
@@ -145,6 +160,12 @@ naval_screen = {
 				rear_2_custom_slot = dp_light_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_depth_charge
+			ship_sonar
+			ship_anti_air
+		}
 	}
 
 	screen_1944 = {
@@ -167,8 +188,8 @@ naval_screen = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } }
 				fixed_ship_battery_slot = dp_light_battery
 				fixed_ship_torpedo_slot = ship_torpedo
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } }
 				fixed_ship_role_slot = ship_hull_light_role_dd
 				fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } }
@@ -179,6 +200,11 @@ naval_screen = {
 				rear_2_custom_slot = dp_light_battery
 			}
 		}
+		allowed_modules = {
+			ship_depth_charge
+			ship_sonar
+			ship_anti_air
+		}
 	}
 
 	screen_1949 = {
@@ -201,8 +227,8 @@ naval_screen = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } }
 				fixed_ship_battery_slot = dp_light_battery
 				fixed_ship_torpedo_slot = ship_torpedo
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_missile_aa } }
 				fixed_ship_role_slot = ship_hull_light_role_ddg
 				fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } }
@@ -213,6 +239,11 @@ naval_screen = {
 				rear_2_custom_slot = dp_light_battery
 			}
 		}
+		allowed_modules = {
+			ship_depth_charge
+			ship_sonar
+			ship_anti_air
+		}
 	}
 
 
@@ -238,8 +269,8 @@ naval_screen = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } }
 				fixed_ship_battery_slot = ship_light_battery_double
 				fixed_ship_torpedo_slot = ship_torpedo
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } }
 				fixed_ship_role_slot = ship_hull_light_role_dd
 				front_1_custom_slot = ship_light_battery_double
@@ -249,6 +280,11 @@ naval_screen = {
 				rear_2_custom_slot = ship_depth_charge
 			}
 		}
+		allowed_modules = {
+			ship_depth_charge
+			ship_sonar
+			ship_anti_air
+		}
 	}
 	screen_1940_expert = {
 		name = vnr_dd_1940_expert
@@ -270,8 +306,8 @@ naval_screen = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } }
 				fixed_ship_battery_slot = ship_light_battery_double
 				fixed_ship_torpedo_slot = ship_torpedo
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } }
 				fixed_ship_role_slot = ship_hull_light_role_dd
 				fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } }
@@ -282,6 +318,11 @@ naval_screen = {
 				rear_2_custom_slot = ship_depth_charge
 			}
 		}
+		allowed_modules = {
+			ship_depth_charge
+			ship_sonar
+			ship_anti_air
+		}
 	}
 	screen_1944_expert = {
 		name = vnr_dd_1944_expert
@@ -303,8 +344,8 @@ naval_screen = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } }
 				fixed_ship_battery_slot = ship_light_battery_double
 				fixed_ship_torpedo_slot = ship_torpedo
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } }
 				fixed_ship_role_slot = ship_hull_light_role_dd
 				front_1_custom_slot = ship_light_battery_double
@@ -314,6 +355,11 @@ naval_screen = {
 				rear_2_custom_slot = ship_depth_charge
 			}
 		}
+		allowed_modules = {
+			ship_depth_charge
+			ship_sonar
+			ship_anti_air
+		}
 	}
 	screen_1946_expert = {
 		name = vnr_dd_1946_expert
@@ -335,8 +381,8 @@ naval_screen = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } }
 				fixed_ship_battery_slot = ship_light_battery_double
 				fixed_ship_torpedo_slot = ship_torpedo
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_anti_air_slot = ship_missile_aa
 				fixed_ship_role_slot = ship_hull_light_role_dda
 				front_1_custom_slot = ship_light_battery_double
@@ -347,6 +393,11 @@ naval_screen = {
 				rear_2_custom_slot = ship_depth_charge
 			}
 		}
+		allowed_modules = {
+			ship_depth_charge
+			ship_sonar
+			ship_anti_air
+		}
 	}
 	screen_1949_expert = {
 		name = vnr_dd_1949_expert
@@ -369,8 +420,8 @@ naval_screen = {
 				fixed_ship_battery_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } }
 				fixed_ship_torpedo_slot = ship_torpedo
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_sonar
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_anti_air_slot = ship_missile_aa
+				fixed_ship_radar_slot = { module = ship_sonar upgrade > current }
 				fixed_ship_role_slot = ship_hull_light_role_ddg
 				fixed_ship_extra_secondaries_slot = ship_radar_jammer
 				front_1_custom_slot = ship_missile_aa
@@ -380,6 +431,11 @@ naval_screen = {
 				rear_2_custom_slot = ship_depth_charge
 			}
 		}
+		allowed_modules = {
+			ship_depth_charge
+			ship_sonar
+			ship_anti_air
+		}
 	}
 }
 

src/common/ai_equipment/vnr_battleships.txt

@@ -76,6 +76,10 @@ naval_capital_battleship = {
 				rear_1_custom_slot = ship_heavy_battery_triple
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_anti_air
+		}
 	}
 
 	capital_battleship_1940 = {
@@ -97,8 +101,8 @@ naval_capital_battleship = {
 			modules = {
 				fixed_ship_battery_slot = ship_heavy_battery_triple
 				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = { upgrade > current any_of = { ship_fire_control_system } }
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar } }
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
 				fixed_ship_armor_slot = { any_of = { ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
@@ -114,6 +118,9 @@ naval_capital_battleship = {
 				rear_2_custom_slot = ship_heavy_battery_triple
 			}
 		}
+		allowed_modules = {
+			ship_mast
+		}
 	}
 	capital_battleship_1944 = {
 		name = vnr_bb_1944
@@ -135,8 +142,8 @@ naval_capital_battleship = {
 			modules = {
 				fixed_ship_battery_slot = ship_heavy_battery_triple
 				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = { upgrade > current any_of = { ship_fire_control_system } }
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar } }
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
 				fixed_ship_armor_slot = { any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
@@ -173,8 +180,8 @@ naval_capital_battleship = {
 			modules = {
 				fixed_ship_battery_slot = ship_heavy_battery_triple
 				fixed_ship_anti_air_slot = ship_missile_aa
-				fixed_ship_fire_control_system_slot = { upgrade > current any_of = { ship_fire_control_system } }
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar } }
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_engine_slot = { any_of = { heavy_ship_engine_4_gas heavy_ship_engine_nuclear } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
 				fixed_ship_armor_slot = { any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
@@ -213,7 +220,7 @@ naval_capital_battleship = {
 				fixed_ship_battery_slot = ship_super_heavy_battery_triple
 				fixed_ship_anti_air_slot = ship_anti_air
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
-				fixed_ship_radar_slot = ship_mast
+				fixed_ship_radar_slot = { any_of = { ship_radar ship_mast } }
 				fixed_ship_engine_slot = { upgrade = current any_of = { super_heavy_ship_engine_3 super_heavy_ship_engine_2 super_heavy_ship_engine_1 } }
 				fixed_ship_secondaries_slot = ship_secondaries
 				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_shbb_2 ship_armor_shbb } }
@@ -228,6 +235,9 @@ naval_capital_battleship = {
 				rear_1_custom_slot = ship_super_heavy_battery_triple
 			}
 		}
+		allowed_modules = {
+			ship_mast
+		}
 	}
 
 
@@ -256,15 +266,20 @@ naval_capital_battleship = {
 				fixed_ship_radar_slot = { any_of = { ship_radar ship_mast } }
 				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
-				fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
+				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } }
+				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
+				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				front_1_custom_slot = ship_heavy_battery_triple
 				mid_1_custom_slot = ship_anti_air
 				mid_2_custom_slot = ship_anti_air
 				rear_1_custom_slot = ship_heavy_battery_triple
 			}
 		}
+		allowed_modules = {
+			ship_anti_air
+			ship_fire_control_system
+			ship_radar
+		}
 	}
 	capital_battleship_1940_expert = {
 		name = vnr_bb_1940_expert
@@ -285,13 +300,13 @@ naval_capital_battleship = {
 			modules = {
 				fixed_ship_battery_slot = ship_heavy_battery_triple
 				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
-				fixed_ship_engine_slot = { upgrade > current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
+				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
-				fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
+				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
+				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
+				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				front_1_custom_slot = ship_heavy_battery_triple
 				mid_1_custom_slot = ship_anti_air
 				mid_2_custom_slot = ship_anti_air
@@ -299,6 +314,11 @@ naval_capital_battleship = {
 				rear_2_custom_slot = ship_heavy_battery_triple
 			}
 		}
+		allowed_modules = {
+			ship_anti_air
+			ship_fire_control_system
+			ship_radar
+		}
 	}
 	capital_battleship_1944_expert = {
 		name = vnr_bb_1944_expert
@@ -320,13 +340,13 @@ naval_capital_battleship = {
 			modules = {
 				fixed_ship_battery_slot = ship_heavy_battery_triple
 				fixed_ship_anti_air_slot = ship_anti_air
-				fixed_ship_fire_control_system_slot = ship_fire_control_system
+				fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current }
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
-				fixed_ship_engine_slot = { upgrade > current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
+				fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
-				fixed_ship_armor_slot = { upgrade > current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
+				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } }
-				fixed_ship_armor_scheme_slot = { upgrade > current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
+				fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } }
-				fixed_ship_torpedo_defense_system_slot = { upgrade > current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
+				fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				fixed_ship_extra_secondaries_slot = ship_super_heavy_weight_shell
 				front_1_custom_slot = ship_heavy_battery_triple
 				mid_1_custom_slot = ship_anti_air
@@ -335,6 +355,11 @@ naval_capital_battleship = {
 				rear_2_custom_slot = ship_heavy_battery_triple
 			}
 		}
+		allowed_modules = {
+			ship_anti_air
+			ship_fire_control_system
+			ship_radar
+		}
 	}
 }
 

src/common/ai_equipment/vnr_carriers.txt

@@ -68,14 +68,18 @@ naval_carrier = {
 				fixed_ship_engine_slot = carrier_ship_engine_2
 				fixed_ship_armor_slot = ship_carrier_armor
 				fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } }
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = empty
-				fixed_ship_flight_deck_slot = carrier_wooden_deck
+				fixed_ship_flight_deck_slot = { any_of = { carrier_wooden_deck carrier_wooden_deck} }
 				fixed_ship_role_slot = ship_hull_carrier_role_cv
 				front_1_custom_slot = ship_deck_space_open
 			}
 		}
+		allowed_modules = {
+			ship_deck_space_open
+			ship_anti_air
+		}
 	}
 
 	carrier_1940 = {
@@ -101,10 +105,10 @@ naval_carrier = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
 				fixed_ship_armor_slot = ship_carrier_armor
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = empty
-				fixed_ship_flight_deck_slot = { any_of = { carrier_armor_deck carrier_wooden_deck } }
+				fixed_ship_flight_deck_slot = carrier_armor_deck
 				fixed_ship_role_slot = ship_hull_carrier_role_cv
 				front_1_custom_slot = ship_deck_space_open
 				front_2_custom_slot = carrier_side_lift
@@ -112,6 +116,10 @@ naval_carrier = {
 				mid_2_custom_slot = ship_dp_secondaries_bb
 			}
 		}
+		allowed_modules = {
+			ship_deck_space_open
+			ship_anti_air
+		}
 	}
 
 	carrier_1944 = {
@@ -137,7 +145,7 @@ naval_carrier = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
 				fixed_ship_armor_slot = ship_carrier_armor
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = empty
 				fixed_ship_flight_deck_slot = carrier_armor_deck
@@ -149,6 +157,10 @@ naval_carrier = {
 				rear_1_custom_slot = ship_dp_secondaries_bb
 			}
 		}
+		allowed_modules = {
+			ship_deck_space_armored
+			ship_anti_air
+		}
 	}
 
 	carrier_1945 = {
@@ -174,7 +186,7 @@ naval_carrier = {
 				fixed_ship_armor_slot = ship_carrier_armor_heavy
 				fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck
 				fixed_ship_flight_deck_slot = carrier_armor_deck
@@ -185,6 +197,10 @@ naval_carrier = {
 				rear_1_custom_slot = ship_anti_air
 			}
 		}
+		allowed_modules = {
+			ship_deck_space_big
+			ship_anti_air
+		}
 	}
 
 	carrier_1947 = {
@@ -210,7 +226,7 @@ naval_carrier = {
 				fixed_ship_armor_slot = ship_carrier_armor_heavy
 				fixed_ship_engine_slot = carrier_ship_engine_nuclear
 				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = { any_of = { economical_nuclear_reactor_carrier carrier_strength_deck } }
 				fixed_ship_flight_deck_slot = carrier_armor_deck
@@ -221,6 +237,10 @@ naval_carrier = {
 				rear_1_custom_slot = ship_missile_aa
 			}
 		}
+		allowed_modules = {
+			ship_deck_space_big
+			ship_anti_air
+		}
 	}
 
 
@@ -246,7 +266,7 @@ naval_carrier = {
 				fixed_ship_engine_slot = carrier_ship_engine_2
 				fixed_ship_armor_slot = ship_carrier_armor
 				fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = empty
 				fixed_ship_flight_deck_slot = carrier_wooden_deck
@@ -255,6 +275,10 @@ naval_carrier = {
 				mid_1_custom_slot = ship_deck_space_open
 			}
 		}
+		allowed_modules = {
+			ship_deck_space_open
+			ship_anti_air
+		}
 	}
 	carrier_1940_expert = {
 		name = vnr_cv_1940_expert
@@ -279,7 +303,7 @@ naval_carrier = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
 				fixed_ship_armor_slot = ship_carrier_armor
 				fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = empty
 				fixed_ship_flight_deck_slot = carrier_armor_deck
@@ -290,6 +314,10 @@ naval_carrier = {
 				mid_2_custom_slot = ship_deck_space_open
 			}
 		}
+		allowed_modules = {
+			ship_deck_space_open
+			ship_anti_air
+		}
 	}
 	carrier_1944_expert = {
 		name = vnr_cv_1944_expert
@@ -314,7 +342,7 @@ naval_carrier = {
 				fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
 				fixed_ship_armor_slot = ship_carrier_armor
 				fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck
 				fixed_ship_flight_deck_slot = carrier_armor_deck
@@ -327,6 +355,8 @@ naval_carrier = {
 		}
 
 		allowed_modules = {
+			ship_deck_space_armored
+			ship_anti_air
 			carrier_angled_deck
 		}
 	}
@@ -353,7 +383,7 @@ naval_carrier = {
 				fixed_ship_armor_slot = ship_carrier_armor_heavy
 				fixed_ship_engine_slot = { upgrade > current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } }
 				fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck
 				fixed_ship_flight_deck_slot = carrier_armor_deck
@@ -365,6 +395,8 @@ naval_carrier = {
 		}
 
 		allowed_modules = {
+			ship_deck_space_big
+			ship_anti_air
 			carrier_angled_deck
 		}
 	}
@@ -391,7 +423,7 @@ naval_carrier = {
 				fixed_ship_armor_slot = ship_carrier_armor_heavy
 				fixed_ship_engine_slot = carrier_ship_engine_nuclear
 				fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
-				fixed_ship_radar_slot = ship_radar
+				fixed_ship_radar_slot = { module = ship_radar upgrade > current }
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 				fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck
 				fixed_ship_flight_deck_slot = carrier_armor_deck
@@ -402,5 +434,10 @@ naval_carrier = {
 				rear_1_custom_slot = carrier_side_lift
 			}
 		}
+		allowed_modules = {
+			ship_deck_space_big
+			ship_anti_air
+			carrier_angled_deck
+		}
 	}
 }

src/common/ai_equipment/vnr_carriers_light.txt

@@ -115,6 +115,7 @@ naval_light_carrier = {
 				fixed_ship_anti_air_slot = empty
 				fixed_ship_radar_slot = ship_radar
 				fixed_ship_engine_slot = { upgrade = current any_of = { civilian_ship_engine_2 civilian_ship_engine_1 } }
+				fixed_ship_role_slot = ship_hull_carrier_role_cve
 			}
 		}
 	}

src/common/ai_equipment/vnr_cv_planes.txt

@@ -6,13 +6,13 @@ vnr_cv_fighter = {
         factor = 9999
         modifier = {
             factor = 0
-            has_game_rule = { rule = vnr_cv_air_ai option = BLOCKED }
+            expert_ai_plane = no
         }
     }
 
     basic_cv_fighter = {
         priority = {
-            factor = 1000
+            factor = 100
             modifier = { factor = 0.1 has_tech = improved_small_airframe }
         }
 
@@ -31,7 +31,7 @@ vnr_cv_fighter = {
 
     improved_cv_fighter = {
         priority = {
-            factor = 200
+            factor = 20
             modifier = {
                 factor = 10
                 has_tech = improved_small_airframe 
@@ -49,6 +49,7 @@ vnr_cv_fighter = {
                 engine_type_slot = engine_3_1x
                 fixed_main_weapon_slot = heavy_mg_4x
                 fixed_auxiliary_weapon_slot_1 = heavy_mg_4x
+                fixed_auxiliary_weapon_slot_2 = heavy_mg_4x
                 special_type_slot_1 = self_sealing_fuel_tanks_small
                 special_type_slot_2 = armor_plate_small
             }
@@ -57,7 +58,7 @@ vnr_cv_fighter = {
 
     advanced_cv_fighter = {
         priority = {
-            factor = 300
+            factor = 30
             modifier = {
                 factor = 10
                 has_tech = advanced_small_airframe
@@ -88,13 +89,13 @@ vnr_cv_naval_bomber = {
         factor = 9999
         modifier = {
             factor = 0
-            has_game_rule = { rule = vnr_cv_air_ai option = BLOCKED }
+            expert_ai_plane = no
         }
     }
 
     basic_cv_naval_bomber = {
         priority = {
-            factor = 1000
+            factor = 100
             modifier = { factor = 0.1 has_tech = improved_small_airframe }
         }
 
@@ -112,7 +113,7 @@ vnr_cv_naval_bomber = {
 
     improved_cv_naval_bomber = {
         priority = {
-            factor = 200
+            factor = 20
             modifier = {
                 factor = 10
                 has_tech = improved_small_airframe 
@@ -137,7 +138,7 @@ vnr_cv_naval_bomber = {
 
     advanced_cv_naval_bomber = {
         priority = {
-            factor = 300
+            factor = 30
             modifier = {
                 factor = 10
                 has_tech = advanced_small_airframe
@@ -166,13 +167,13 @@ vnr_cv_cas = {
         factor = 9999
         modifier = {
             factor = 0
-            has_game_rule = { rule = vnr_cv_air_ai option = BLOCKED }
+            expert_ai_plane = no
         }
     }
 
     basic_cv_cas = {
         priority = {
-            factor = 1000
+            factor = 100
             modifier = { factor = 0.1 has_tech = improved_small_airframe }
         }
 
@@ -184,15 +185,14 @@ vnr_cv_cas = {
                 fixed_main_weapon_slot = armor_piercing_bomb_locks
                 fixed_auxiliary_weapon_slot_1 = armor_piercing_bomb_locks
                 special_type_slot_1 = dive_brakes_small
-                special_type_slot_2 = self_sealing_fuel_tanks_small
+                special_type_slot_2 = armor_plate_small
-                special_type_slot_3 = armor_plate_small
             }
         }
     }
 
     improved_cv_cas = {
         priority = {
-            factor = 200
+            factor = 20
             modifier = {
                 factor = 10
                 has_tech = improved_small_airframe 
@@ -210,6 +210,7 @@ vnr_cv_cas = {
                 engine_type_slot = engine_3_2x
                 fixed_main_weapon_slot = armor_piercing_bomb_locks
                 fixed_auxiliary_weapon_slot_1 = armor_piercing_bomb_locks
+                fixed_auxiliary_weapon_slot_2 = armor_piercing_bomb_locks
                 special_type_slot_1 = dive_brakes_small
                 special_type_slot_2 = self_sealing_fuel_tanks_small
                 special_type_slot_3 = armor_plate_small
@@ -219,7 +220,7 @@ vnr_cv_cas = {
 
     advanced_cv_cas = {
         priority = {
-            factor = 300
+            factor = 30
             modifier = {
                 factor = 10
                 has_tech = advanced_small_airframe
@@ -234,6 +235,7 @@ vnr_cv_cas = {
                 fixed_main_weapon_slot = armor_piercing_bomb_locks
                 fixed_auxiliary_weapon_slot_1 = armor_piercing_bomb_locks
                 fixed_auxiliary_weapon_slot_2 = armor_piercing_bomb_locks
+                fixed_auxiliary_weapon_slot_3 = armor_piercing_bomb_locks
                 special_type_slot_1 = dive_brakes_small
                 special_type_slot_2 = self_sealing_fuel_tanks_small
                 special_type_slot_3 = armor_plate_small

src/common/ai_equipment/vnr_heavy_cruisers.txt

@@ -35,6 +35,12 @@ naval_cruiser_heavy = {
 				rear_1_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	capital_cruiser_1924 = {
@@ -71,6 +77,12 @@ naval_cruiser_heavy = {
 				rear_2_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	capital_cruiser_1932 = {
@@ -108,6 +120,12 @@ naval_cruiser_heavy = {
 				rear_2_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	capital_cruiser_1940 = {
@@ -144,6 +162,12 @@ naval_cruiser_heavy = {
 				rear_2_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	capital_cruiser_1944 = {
@@ -180,6 +204,12 @@ naval_cruiser_heavy = {
 				rear_2_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 }
 

src/common/ai_equipment/vnr_light_cruisers.txt

@@ -57,7 +57,7 @@ naval_cruiser_light = {
 				fixed_ship_anti_air_slot = ship_anti_air
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
 				fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_2 cruiser_ship_engine_1 } }
-				fixed_ship_radar_slot = { any_of = { ship_radar ship_sonar } }
+				fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar ship_sonar } }
 				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_cruiser_2 ship_armor_cruiser_1 } }
 				fixed_ship_secondaries_slot = ship_secondaries_light
 				fixed_ship_role_slot = ship_hull_cruiser_role_c
@@ -69,6 +69,13 @@ naval_cruiser_light = {
 				rear_2_custom_slot > ship_light_medium_battery_1
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_sonar
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	light_cruiser_1936 = {
@@ -91,7 +98,7 @@ naval_cruiser_light = {
 				fixed_ship_anti_air_slot = ship_anti_air
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
 				fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } }
-				fixed_ship_radar_slot = { any_of = { ship_radar ship_sonar } }
+				fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar ship_sonar } }
 				fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries
 				fixed_ship_role_slot = ship_hull_cruiser_role_c
@@ -104,6 +111,13 @@ naval_cruiser_light = {
 				rear_2_custom_slot > ship_light_medium_battery_1
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_sonar
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	light_cruiser_1940 = {
@@ -127,7 +141,7 @@ naval_cruiser_light = {
 				fixed_ship_anti_air_slot = ship_anti_air
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
 				fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } }
-				fixed_ship_radar_slot = { any_of = { ship_radar ship_sonar } }
+				fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar ship_sonar } }
 				fixed_ship_armor_slot = { any_of = { ship_armor_cruiser_4 ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries
 				fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_c  ship_hull_cruiser_role_aa } }
@@ -140,6 +154,13 @@ naval_cruiser_light = {
 				rear_2_custom_slot > ship_light_medium_battery_2
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_sonar
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	light_cruiser_1944 = {
@@ -163,7 +184,7 @@ naval_cruiser_light = {
 				fixed_ship_anti_air_slot = ship_anti_air
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
 				fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_5 cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } }
-				fixed_ship_radar_slot = { any_of = { ship_radar ship_sonar } }
+				fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar ship_sonar } }
 				fixed_ship_armor_slot = { any_of = { ship_armor_cruiser_4 ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries
 				fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_c  ship_hull_cruiser_role_aa } }
@@ -176,6 +197,13 @@ naval_cruiser_light = {
 				rear_2_custom_slot > ship_light_medium_battery_3
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_sonar
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	light_cruiser_1949 = {
@@ -199,7 +227,7 @@ naval_cruiser_light = {
 				fixed_ship_anti_air_slot = ship_anti_air
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
 				fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_5 cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } }
-				fixed_ship_radar_slot = { any_of = { ship_radar ship_sonar } }
+				fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar ship_sonar } }
 				fixed_ship_armor_slot = { any_of = { ship_armor_cruiser_4 ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } }
 				fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_c  ship_hull_cruiser_role_aa } }
 				fixed_ship_secondaries_slot = ship_dp_secondaries
@@ -214,6 +242,13 @@ naval_cruiser_light = {
 				rear_2_custom_slot = dp_ship_medium_1
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_sonar
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 
@@ -252,6 +287,13 @@ naval_cruiser_light = {
 				rear_2_custom_slot = ship_light_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_sonar
+			ship_radar
+			ship_anti_air
+		}
 	}
 	light_cruiser_1940_expert = {
 		name = vnr_cl_1940_expert
@@ -289,6 +331,13 @@ naval_cruiser_light = {
 				rear_2_custom_slot = ship_light_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_sonar
+			ship_radar
+			ship_anti_air
+		}
 	}
 	light_cruiser_1944_expert = {
 		name = vnr_cl_1944_expert
@@ -326,6 +375,13 @@ naval_cruiser_light = {
 				rear_2_custom_slot = ship_light_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_sonar
+			ship_radar
+			ship_anti_air
+		}
 	}
 }
 

src/common/ai_equipment/vnr_medium_cruiser.txt

@@ -38,6 +38,12 @@ naval_cruiser_medium = {
 				rear_2_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	medium_cruiser_1932 = {
@@ -74,6 +80,12 @@ naval_cruiser_medium = {
 				rear_2_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	medium_cruiser_1940 = {
@@ -109,6 +121,12 @@ naval_cruiser_medium = {
 				rear_2_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	medium_cruiser_1944 = {
@@ -145,6 +163,12 @@ naval_cruiser_medium = {
 				rear_2_custom_slot = ship_medium_battery
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 	medium_cruiser_1949 = {
@@ -183,6 +207,12 @@ naval_cruiser_medium = {
 				rear_2_custom_slot = ship_missile_aa
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 
 
@@ -220,6 +250,12 @@ naval_cruiser_medium = {
 				mid_3_custom_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } }
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 	medium_cruiser_1949_expert = {
 		name = vnr_cam_1949_expert
@@ -255,5 +291,11 @@ naval_cruiser_medium = {
 				rear_2_custom_slot = empty
 			}
 		}
+		allowed_modules = {
+			ship_mast
+			ship_fire_control_system
+			ship_radar
+			ship_anti_air
+		}
 	}
 }

src/common/ai_equipment/vnr_submarines.txt

@@ -25,6 +25,11 @@ naval_sub = {
 				rear_1_custom_slot = ship_torpedo_sub
 			}
 		}
+		allowed_modules = {
+			ship_torpedo_sub
+			sub_conning_tower
+			sub_ship_periscope
+		}
 	}
 
 	submarine_1922 = {
@@ -53,6 +58,11 @@ naval_sub = {
 				rear_1_custom_slot = ship_torpedo_sub
 			}
 		}
+		allowed_modules = {
+			ship_torpedo_sub
+			sub_conning_tower
+			sub_ship_periscope
+		}
 	}
 
 	submarine_1936 = {
@@ -81,6 +91,11 @@ naval_sub = {
 				rear_1_custom_slot = ship_torpedo_sub
 			}
 		}
+		allowed_modules = {
+			ship_torpedo_sub
+			sub_conning_tower
+			sub_ship_periscope
+		}
 	}
 
 	submarine_1940 = {
@@ -113,7 +128,10 @@ naval_sub = {
 		}
 
 		allowed_modules = {
+			ship_torpedo_sub
 			ship_sub_snorkel
+			sub_conning_tower
+			sub_ship_periscope
 		}
 	}
 
@@ -146,6 +164,12 @@ naval_sub = {
 				rear_1_custom_slot = ship_torpedo_sub
 			}
 		}
+		allowed_modules = {
+			ship_torpedo_sub
+			ship_sub_snorkel
+			sub_conning_tower
+			sub_ship_periscope
+		}
 	}
 
 	submarine_1947 = {
@@ -177,6 +201,12 @@ naval_sub = {
 				rear_1_custom_slot = ship_torpedo_sub
 			}
 		}
+		allowed_modules = {
+			ship_torpedo_sub
+			ship_sub_snorkel
+			sub_conning_tower
+			sub_ship_periscope
+		}
 	}
 
 
@@ -209,6 +239,12 @@ naval_sub = {
 				rear_1_custom_slot = ship_torpedo_sub
 			}
 		}
+		allowed_modules = {
+			ship_torpedo_sub
+			ship_sub_snorkel
+			sub_conning_tower
+			sub_ship_periscope
+		}
 	}
 	submarine_1940_expert = {
 		name = vnr_ss_1940_expert
@@ -240,7 +276,10 @@ naval_sub = {
 		}
 
 		allowed_modules = {
+			ship_torpedo_sub
 			ship_sub_snorkel
+			sub_conning_tower
+			sub_ship_periscope
 		}
 	}
 	submarine_1944_expert = {
@@ -272,6 +311,12 @@ naval_sub = {
 				rear_1_custom_slot = ship_torpedo_sub
 			}
 		}
+		allowed_modules = {
+			ship_torpedo_sub
+			ship_sub_snorkel
+			sub_conning_tower
+			sub_ship_periscope
+		}
 	}
 	submarine_1947_expert = {
 		name = vnr_ss_1947_expert
@@ -303,6 +348,12 @@ naval_sub = {
 				rear_2_custom_slot = ship_torpedo_sub
 			}
 		}
+		allowed_modules = {
+			ship_torpedo_sub
+			ship_sub_snorkel
+			sub_conning_tower
+			sub_ship_periscope
+		}
 	}
 }
 

src/common/ai_strategy/naval_production.txt

@@ -163,8 +163,6 @@ naval_unit_role_ratios_minors_coastal = {
 		}
 	}
 	enable = { 
-		num_of_naval_factories > 0 
-		num_of_naval_factories < 10
 		has_navy_size = { size < 50 }
 	}
 
@@ -197,8 +195,6 @@ naval_unit_role_ratios_minors_defensive = {
 		}
 	}
 	enable = { 
-		num_of_naval_factories > 9 
-		num_of_naval_factories < 20
 		has_navy_size = { size < 100 }
 	}
 
@@ -243,8 +239,6 @@ naval_unit_role_ratios_minors_offensive = {
 		}
 	}
 	enable = { 
-		num_of_naval_factories > 19 
-		num_of_naval_factories < 30
 		has_navy_size = { size < 200 }
 	}
 
@@ -294,8 +288,7 @@ naval_unit_role_ratios_minors_global = {
 			tag = SOV
 		}
 	}
-	enable = { 
+	enable = {
-		num_of_naval_factories > 29
 		has_navy_size = { size < 300 }
 	}
 
@@ -423,6 +416,11 @@ naval_unit_role_ratios_GER_prewar_late = {
 		id = vnr_naval_submarine
 		value = 1500
 	}
+
+	ai_strategy = {
+		type = dockyard_to_military_factory_ratio
+		value = 50
+	}
 }
 
 naval_unit_role_ratios_GER_atwar = {
@@ -459,6 +457,11 @@ naval_unit_role_ratios_GER_atwar = {
 		id = vnr_naval_capital_bb
 		value = 5
 	}
+
+	ai_strategy = {
+		type = dockyard_to_military_factory_ratio
+		value = 50
+	}
 }
 
 naval_unit_role_ratios_GER_atwar_many_shipyard = {
@@ -560,7 +563,7 @@ naval_unit_role_ratios_GER_atwar_knock_USA = {
 
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 50
+		value = 80
 	}
 }
 
@@ -723,7 +726,7 @@ naval_unit_role_ratios_ENG_prewar_early = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 50
+		value = 100
 	}
 }
 
@@ -748,7 +751,7 @@ naval_unit_role_ratios_ENG_prewar_late = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 30
+		value = 70
 	}
 
 	ai_strategy = {
@@ -763,12 +766,6 @@ naval_unit_role_ratios_ENG_prewar_late = {
 		value = 350
 	}
 
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_screen_leader
-		value = 10
-	}
-
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
@@ -783,7 +780,7 @@ naval_unit_role_ratios_ENG_prewar_late = {
 
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 120
+		value = 150
 	}
 }
 
@@ -806,7 +803,7 @@ naval_unit_role_ratios_ENG_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 35
+		value = 100
 	}
 
 	ai_strategy = {
@@ -829,7 +826,7 @@ naval_unit_role_ratios_ENG_atwar = {
 
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 150
+		value = 180
 	}
 }
 
@@ -1324,7 +1321,7 @@ naval_unit_role_ratios_JAP_prewar_enough_carrier = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 55
+		value = 80
 	}
 }
 
@@ -1374,7 +1371,7 @@ naval_unit_role_ratios_JAP_atwar = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 90
+		value = 150
 	}
 }
 
@@ -1458,7 +1455,7 @@ naval_unit_role_ratios_USA_great_depression = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 20
+		value = 80
 	}
 
 	ai_strategy = {
@@ -1511,7 +1508,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_screen
-		value = 320
+		value = 250
 	}
 	
 	ai_strategy = {
@@ -1535,12 +1532,12 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 60
+		value = 120
 	}
 	
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 130
+		value = 200
 	}
 }
 
@@ -1562,7 +1559,7 @@ naval_unit_role_ratios_USA_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_screen
-		value = 400
+		value = 350
 	}
 	ai_strategy = {
 		type = role_ratio
@@ -1584,12 +1581,12 @@ naval_unit_role_ratios_USA_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 90
+		value = 120
 	}
 	
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 200
+		value = 250
 	}
 }
 

src/common/ai_strategy/vnr_naval_strategy.txt

@@ -73,6 +73,10 @@ ENG_avoid_pacific = {
         has_war_with = JAP
 		has_war_with = ITA
 		ITA = { has_navy_size = { size > 99 } }
+		war_length_with = {
+			tag = JAP
+			months < 24
+		}
         enable_vnr_naval_ai = yes
     }
     abort_when_not_enabled = yes
@@ -100,6 +104,13 @@ ENG_reinforce_pacific = {
     }
     enable = {
         has_war_with = JAP
+		OR = {
+			war_length_with = {
+				tag = JAP
+				months > 23
+			}
+			NOT = { has_war_with = ITA }
+		}
 		OR = {
 			NOT = { has_war_with = ITA }
 			ITA = { has_navy_size = { size < 100 } }

src/common/decisions/naval_develop.txt

@@ -12,6 +12,9 @@ naval_develop_category = {
 		visible = {
 			has_navy_size = { size < 1 }
 			num_of_naval_factories > 0
+			NOT = {
+				is_in_array = { global.vnr_naval_powers = ROOT }
+			}
 		}
 
 		cancel_trigger = {
@@ -52,6 +55,9 @@ naval_develop_category = {
 		visible = {
 			has_navy_size = { size < 50 }
 			num_of_naval_factories > 0
+			NOT = {
+				is_in_array = { global.vnr_naval_powers = ROOT }
+			}
 		}
 
 		cost = 15
@@ -93,6 +99,9 @@ naval_develop_category = {
 				size < 15
 			}
 			num_of_naval_factories > 0
+			NOT = {
+				is_in_array = { global.vnr_naval_powers = ROOT }
+			}
 		}
 
 		cost = 30
@@ -132,6 +141,9 @@ naval_develop_category = {
 				size < 30
 			}
 			num_of_naval_factories > 1
+			NOT = {
+				is_in_array = { global.vnr_naval_powers = ROOT }
+			}
 		}
 
 		cost = 30
@@ -176,6 +188,9 @@ naval_develop_category = {
 				archetype = ship_hull_heavy
 			}
 			num_of_naval_factories > 1
+			NOT = {
+				is_in_array = { global.vnr_naval_powers = ROOT }
+			}
 		}
 
 		cost = 50
@@ -219,6 +234,9 @@ naval_develop_category = {
 				type = carrier
 			}
 			num_of_naval_factories > 1
+			NOT = {
+				is_in_array = { global.vnr_naval_powers = ROOT }
+			}
 		}
 
 		cost = 50
@@ -259,6 +277,9 @@ naval_develop_category = {
 				size < 10
 			}
 			num_of_naval_factories > 0
+			NOT = {
+				is_in_array = { global.vnr_naval_powers = ROOT }
+			}
 		}
 
 		cost = 15
@@ -306,8 +327,9 @@ naval_develop_category = {
 		}
 		ai_will_do = {
 			factor = 30
-			modifier = { factor = 0 expert_ai_style = yes }
+			modifier = { factor = 0 has_game_rule = { rule = allow_ai_tech_auto_unlock option = FREE } }
 			modifier = { factor = 0 has_political_power < 20 }
+			modifier = { factor = 0 has_navy_size = { size < 100 } }
 		}
 	}
 
@@ -382,6 +404,8 @@ naval_develop_category = {
     				        fixed_ship_deck_slot_1 = ship_deck_space_small
     				        fixed_ship_anti_air_slot = ship_anti_air_1
 							fixed_ship_engine_slot = civilian_ship_engine_1
+							fixed_ship_carrier_miscellaneous_slot_2 = carrier_civilian_material
+							fixed_ship_role_slot = ship_hull_carrier_role_cve
     				    }
     				}
 				}
@@ -444,6 +468,7 @@ naval_develop_category = {
     				        fixed_ship_deck_slot_2 = ship_deck_space_small
     				        fixed_ship_anti_air_slot = ship_anti_air_1
 							fixed_ship_engine_slot = civilian_ship_engine_1
+							fixed_ship_role_slot = ship_hull_carrier_role_cve
     				    }
     				}
 				}

src/common/decisions/stronger_ai.txt

@@ -80,4 +80,22 @@ navy_rework_category = {
 	        }
         }
     }
+    enable_ai_ship_design = {
+        icon = generic_civil_support
+        visible = {
+            has_game_rule = { rule = ai_ship_design_style option = HISTORICAL }
+        }
+        complete_effect = {
+            FROM = { country_event = vnr_ai.2 }
+        }
+    }
+    enable_ai_plane_design = {
+        icon = generic_civil_support
+        visible = {
+            has_game_rule = { rule = vnr_cv_air_ai option = BLOCKED }
+        }
+        complete_effect = {
+            FROM = { country_event = vnr_ai.3 }
+        }
+    }
 }

src/common/defines/VNR_naval_defines.lua

@@ -24,6 +24,11 @@ NDefines.NAI.VARIANT_CREATION_XP_RESERVE_NAVY = 40;
 NDefines.NAI.DEFAULT_MODULE_VARIANT_CREATION_XP_CUTOFF_AIR = 15;
 NDefines.NAI.VARIANT_CREATION_XP_RESERVE_AIR = 30;
 
+NDefines.NNavy.HIT_PROFILE_SPEED_FACTOR = 0.3;
+NDefines.NNavy.COMBAT_BASE_HIT_CHANCE = 0.08;
+NDefines.NNavy.COMBAT_BASE_CRITICAL_CHANCE = 0.3;
+NDefines.NNavy.CHANCE_TO_DAMAGE_PART_ON_CRITICAL_HIT = 0.9;
+NDefines.NNavy.CHANCE_TO_DAMAGE_PART_ON_CRITICAL_HIT_FROM_AIR = 1;
 NDefines.NNavy.MIN_SHIPS_FOR_HIGHER_SHIP_RATIO_PENALTY = 66;
 NDefines.NNavy.BEST_CAPITALS_TO_SCREENS_RATIO = 0.5;
 NDefines.NNavy.SCREEN_RATIO_FOR_FULL_SCREENING_FOR_CAPITALS = 2.0;
@@ -36,11 +41,11 @@ NDefines.NNavy.SPOTTING_SPEED_EFFECT_FOR_INITIAL_UNIT_TRANSFER_SPOTTING = 0.5;
 NDefines.NNavy.SPOTTING_SPEED_EFFECT_FOR_INITIAL_NAVAL_INVASION_SPOTTING = 0.5;
 NDefines.NNavy.CONVOY_EFFICIENCY_MIN_VALUE = 0;
 NDefines.NNavy.CONVOY_HIT_PROFILE = 95;
-NDefines.NNavy.NAVY_PIERCING_THRESHOLDS = { 2.0, 1.0, 0.85, 0.75, 0.6, 0.5, 0.3, 0.1, 0.0 }
+NDefines.NNavy.NAVY_PIERCING_THRESHOLDS = { 2.0, 1.0, 0.85, 0.75, 0.7, 0.65, 0.6, 0.55, 0.5, 0.3, 0.0 }
-NDefines.NNavy.NAVY_PIERCING_THRESHOLD_CRITICAL_VALUES = { 3.0, 1.0, 0.65, 0.55, 0.4, 0.3, 0.15, 0.1, 0.0 }
+NDefines.NNavy.NAVY_PIERCING_THRESHOLD_CRITICAL_VALUES = { 3.0, 1.25, 1.0, 0.65, 0.55, 0.3, 0.15, 0.1, 0.05, 0.01, 0.0 }
-NDefines.NNavy.NAVY_PIERCING_THRESHOLD_DAMAGE_VALUES = { 1.0, 1.0, 0.7, 0.6, 0.45, 0.35, 0.2, 0.1, 0.01 }
+NDefines.NNavy.NAVY_PIERCING_THRESHOLD_DAMAGE_VALUES = { 2.0, 1.0, 0.7, 0.6, 0.45, 0.35, 0.2, 0.1, 0.05, 0.02, 0.01 }
 NDefines.NNavy.CONVOY_DEFENSE_MAX_REGION_TO_TASKFORCE_RATIO	 = 2;
-NDefines.NNavy.COMBAT_TORPEDO_CRITICAL_CHANCE = 0.3;
+NDefines.NNavy.COMBAT_TORPEDO_CRITICAL_CHANCE = 0.6;
 NDefines.NNavy.CARRIER_STACK_PENALTY = 6;
 NDefines.NNavy.CARRIER_STACK_PENALTY_EFFECT = 0.1;
 NDefines.NNavy.COMBAT_MIN_DURATION = 20;
@@ -48,13 +53,12 @@ NDefines.NNavy.CAPITAL_ONLY_COMBAT_ACTIVATE_TIME = 22;
 NDefines.NNavy.ALL_SHIPS_ACTIVATE_TIME = 30;
 NDefines.NNavy.COMBAT_CHASE_RESIGNATION_HOURS = 1;
 NDefines.NNavy.SPEED_TO_ESCAPE_SPEED = 2;
-NDefines.NNavy.ANTI_AIR_TARGETING = 0.93;
 NDefines.NNavy.MAX_ANTI_AIR_REDUCTION_EFFECT_ON_INCOMING_AIR_DAMAGE = 0.6;
 NDefines.NNavy.NAVAL_COMBAT_AIR_LOW_AA_TARGET_SCORE = 1;
 NDefines.NNavy.ANTI_AIR_MULT_ON_INCOMING_AIR_DAMAGE = 0.12;
 NDefines.NNavy.TRAINING_MAX_DAILY_COUNTRY_EXP = 2;
 NDefines.NNavy.SUBMARINE_REVEAL_BASE_CHANCE = 15;
-NDefines.NNavy.SUBMARINE_BASE_TORPEDO_REVEAL_CHANCE = 0.15;
+NDefines.NNavy.SUBMARINE_BASE_TORPEDO_REVEAL_CHANCE = 0.1;
 NDefines.NNavy.WAR_SCORE_GAIN_FOR_SUNK_SHIP_MANPOWER_FACTOR = 0.01;
 NDefines.NNavy.WAR_SCORE_GAIN_FOR_SUNK_SHIP_PRODUCTION_COST_FACTOR = 0.04;
 NDefines.NNavy.SHORE_BOMBARDMENT_CAP = 0.5;
@@ -66,19 +70,16 @@ NDefines.NNavy.MAX_POSITIONING_PENALTY_FOR_NEWLY_JOINED_SHIPS = 0.2;
 NDefines.NNavy.HIGHER_SHIP_RATIO_POSITIONING_PENALTY_FACTOR = 0.3;
 NDefines.NNavy.MAX_POSITIONING_PENALTY_FROM_HIGHER_SHIP_RATIO = 3;
 NDefines.NNavy.MAX_CARRIER_RATIO_POSITIONING_PENALTY_FACTOR = 0.6;
-NDefines.NNavy.DAMAGE_PENALTY_ON_MINIMUM_POSITIONING = 0.5;
+NDefines.NNavy.DAMAGE_PENALTY_ON_MINIMUM_POSITIONING = 0.75;
 NDefines.NNavy.SCREENING_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 1;
 NDefines.NNavy.AA_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 0.5;
 NDefines.NNavy.MANPOWER_LOSS_RATIO_ON_STR_LOSS = 0.1;
 NDefines.NNavy.MANPOWER_LOSS_RATIO_ON_SUNK = 0.25;
 NDefines.NNavy.BASE_GUN_COOLDOWNS = { 1.0, 8.0, 1.0 };
-NDefines.NNavy.COMBAT_TORPEDO_CRITICAL_DAMAGE_MULT = 3.0;
 NDefines.NNavy.COMBAT_CRITICAL_DAMAGE_MULT = 8;
 NDefines.NNavy.PRIDE_OF_THE_FLEET_UNASSIGN_COST = 25;
 NDefines.NNavy.CONVOY_ATTACK_BASE_FACTOR = 0.3;
 NDefines.NNavy.EXPERIENCE_FACTOR_CONVOY_ATTACK = 0.1;
-NDefines.NNavy.EXPERIENCE_FACTOR_NON_CARRIER_GAIN = 0.1;
-NDefines.NNavy.EXPERIENCE_FACTOR_CARRIER_GAIN = 0.2;
 NDefines.NNavy.TRAINING_DAILY_COUNTRY_EXP_FACTOR = 0.005;
 NDefines.NNavy.TRAINING_MAX_DAILY_COUNTRY_EXP = 1.5;
 NDefines.NNavy.NAVAL_TRANSFER_BASE_SPEED = 4;
@@ -86,10 +87,11 @@ NDefines.NNavy.AMPHIBIOUS_INVADE_SPEED_BASE = 0.25;
 NDefines.NNavy.SUPREMACY_PER_SHIP_PER_MANPOWER = 0.001;
 NDefines.NNavy.SUPREMACY_PER_SHIP_PER_IC = 0.05;
 NDefines.NNavy.NAVAL_COMBAT_AIR_CARRIER_TARGET_SCORE = 1000;
-NDefines.NNavy.NAVAL_COMBAT_AIR_CAPITAL_TARGET_SCORE = 20;
+NDefines.NNavy.NAVAL_COMBAT_AIR_CAPITAL_TARGET_SCORE = 50;
-NDefines.NNavy.UNIT_EXPERIENCE_PER_COMBAT_HOUR = 0.5;
+NDefines.NNavy.UNIT_EXPERIENCE_PER_COMBAT_HOUR = 3;
-NDefines.NNavy.UNIT_EXPERIENCE_SCALE = 0.1;
+NDefines.NNavy.UNIT_EXPERIENCE_SCALE = 0.8;
 NDefines.NNavy.BASE_CARRIER_SORTIE_EFFICIENCY = 0.4;
+NDefines.NNavy.CHANCE_TO_DAMAGE_PART_ON_CRITICAL_HIT_FROM_AIR = 0.35
 NDefines.NNavy.AGGRESSION_SETTINGS_VALUES = {
 		0,		-- do not engage
 		1.0,	-- low
@@ -154,10 +156,10 @@ NDefines.NAI.MAX_MISSION_PER_TASKFORCE = {
 
 NDefines.NAir.COMBAT_DAMAGE_SCALE_CARRIER = 40;
 NDefines.NAir.NAVAL_STRIKE_CARRIER_MULTIPLIER = 12;
-NDefines.NAir.NAVAL_STRIKE_TARGETTING_TO_AMOUNT = 0.4;
+NDefines.NAir.CARRIER_HOURS_DELAY_AFTER_EACH_COMBAT = 3;
-NDefines.NAir.CARRIER_HOURS_DELAY_AFTER_EACH_COMBAT = 2;
-NDefines.NAir.REINFORCEMENT_DISABLING_DURATION_IN_LAND_CARRIER_TRANSFER = 24;
 NDefines.NAir.DISRUPTION_FACTOR_CARRIER = 25.0;
+NDefines.NAir.NAVAL_STRIKE_DAMAGE_TO_ORG = 0.25;
+NDefines.NAir.AIR_AGILITY_TO_NAVAL_STRIKE_AGILITY = 0.04;
 
 NDefines.NProduction.EQUIPMENT_MODULE_ADD_XP_COST = 2;
 NDefines.NProduction.EQUIPMENT_MODULE_REPLACE_XP_COST = 3;

src/common/ideas/vnr_ai.txt

@@ -16,9 +16,12 @@ ideas = {
                 navy_submarine_attack_factor = 0.3
                 navy_submarine_defence_factor = 0.3
                 naval_detection = 0.3
+                navy_org_factor = 0.3
                 naval_morale_factor = 0.3
                 naval_retreat_speed = 0.3
                 naval_torpedo_screen_penetration_factor = 0.3 
+                naval_light_gun_hit_chance_factor = 0.3
+                naval_heavy_gun_hit_chance_factor = 0.3
                 positioning = 0.3
                 screening_efficiency = 0.3
                 navy_carrier_air_agility_factor = 0.3
@@ -43,9 +46,12 @@ ideas = {
                 navy_submarine_attack_factor = 0.2
                 navy_submarine_defence_factor = 0.2
                 naval_detection = 0.2
+                navy_org_factor = 0.2
                 naval_morale_factor = 0.2
                 naval_retreat_speed = 0.2
                 naval_torpedo_screen_penetration_factor = 0.2 
+                naval_light_gun_hit_chance_factor = 0.2
+                naval_heavy_gun_hit_chance_factor = 0.2
                 positioning = 0.2
                 screening_efficiency = 0.2
                 navy_carrier_air_agility_factor = 0.2
@@ -70,9 +76,12 @@ ideas = {
                 navy_submarine_attack_factor = 0.1
                 navy_submarine_defence_factor = 0.1
                 naval_detection = 0.1
+                navy_org_factor = 0.1
                 naval_morale_factor = 0.1
                 naval_retreat_speed = 0.1
-                naval_torpedo_screen_penetration_factor = 0.1 
+                naval_torpedo_screen_penetration_factor = 0.1
+                naval_light_gun_hit_chance_factor = 0.1
+                naval_heavy_gun_hit_chance_factor = 0.1
                 positioning = 0.1
                 screening_efficiency = 0.1
                 navy_carrier_air_agility_factor = 0.1
@@ -89,6 +98,13 @@ ideas = {
 			picture = generic_navy_bonus
             modifier = {
                 industrial_capacity_dockyard = 1
+                production_speed_dockyard_factor = 1
+                repair_speed_factor = 1
+                ship_hull_carrier_design_cost_factor = -0.75
+                ship_hull_heavy_design_cost_factor = -0.75
+                ship_hull_cruiser_design_cost_factor = -0.75
+                ship_hull_light_design_cost_factor = -0.75
+                ship_hull_submarine_design_cost_factor = -0.75
             }
         }
         vnr_hard_production = {
@@ -98,6 +114,13 @@ ideas = {
 			picture = generic_navy_bonus
 			modifier = {
                 industrial_capacity_dockyard = 0.6
+                production_speed_dockyard_factor = 0.6
+                repair_speed_factor = 0.6
+                ship_hull_carrier_design_cost_factor = -0.6
+                ship_hull_heavy_design_cost_factor = -0.6
+                ship_hull_cruiser_design_cost_factor = -0.6
+                ship_hull_light_design_cost_factor = -0.6
+                ship_hull_submarine_design_cost_factor = -0.6
 			}
         }
         vnr_normal_production = {
@@ -107,6 +130,13 @@ ideas = {
 			picture = generic_navy_bonus
 			modifier = {
                 industrial_capacity_dockyard = 0.3
+                production_speed_dockyard_factor = 0.3
+                repair_speed_factor = 0.3
+                ship_hull_carrier_design_cost_factor = -0.3
+                ship_hull_heavy_design_cost_factor = -0.3
+                ship_hull_cruiser_design_cost_factor = -0.3
+                ship_hull_light_design_cost_factor = -0.3
+                ship_hull_submarine_design_cost_factor = -0.3
 			}
         }
 		
@@ -114,6 +144,8 @@ ideas = {
 			picture = liberty_ships_focus
 			modifier = {
 				consumer_goods_factor = 0.1
+                ai_focus_naval_factor = 0.5
+                ai_focus_naval_air_factor = 0.5
 			}
 			
 			research_bonus = {
@@ -135,6 +167,9 @@ ideas = {
             }
         }
         vnr_cv_plane_output_boost = {
+            cancel = {
+                is_ai = no
+            }
             equipment_bonus = {
                 cv_small_plane_airframe = {
 					build_cost_ic = -0.1 instant = yes
@@ -147,5 +182,29 @@ ideas = {
 				}
             }
         }
+        vnr_ai_dd_output_boost_1 = {
+            cancel = {
+                is_ai = no
+            }
+            # for historical mode
+            equipment_bonus = {
+				ship_hull_light = {
+					instant = yes
+					build_cost_ic = -0.25
+				}
+			}
+        }
+        vnr_ai_dd_output_boost_2 = {
+            cancel = {
+                is_ai = no
+            }
+            # for expert mode
+            equipment_bonus = {
+				ship_hull_light = {
+					instant = yes
+					build_cost_ic = -0.5
+				}
+			}
+        }
     }
 }

src/common/ideas/vnr_navy_spirits.txt

@@ -20,8 +20,7 @@ ideas = {
             ledger = navy
             visible = { original_tag = USA }
             modifier = {
-                naval_doctrine_cost_factor = -0.05
+                trait_blue_water_expert_xp_gain_factor = 0.15
-                navy_advisor_cost_factor = -0.33
                 trait_air_controller_xp_gain_factor = 0.25
                 trait_fleet_protector_xp_gain_factor = 0.25
             }
@@ -66,6 +65,57 @@ ideas = {
 				}
             }
         }
+        voroshilov_naval_academy = {
+            ledger = navy
+            visible = {
+                OR = {
+                    original_tag = SOV
+                    original_tag = RUS
+                }
+                has_global_flag = vnr_enabled
+                has_government = communism
+            }
+			cancel = {
+				NOT = { has_government = communism }
+			}
+            modifier = {
+                trait_arctic_water_expert_xp_gain_factor = 0.25
+                modifier_army_sub_unit_marine_attack_factor = 0.05
+                modifier_army_sub_unit_marine_defence_factor = 0.05
+            }
+            ai_will_do = {
+                factor = 1.5
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        nakhimov_naval_academy = {
+            ledger = navy
+            visible = {
+                OR = {
+                    original_tag = SOV
+                    original_tag = RUS
+                }
+                OR = {
+                    NOT = { has_global_flag = vnr_enabled }
+                    NOT = { has_government = communism }
+                }
+            }
+            modifier = {
+                trait_arctic_water_expert_xp_gain_factor = 0.25
+                modifier_army_sub_unit_marine_attack_factor = 0.05
+                modifier_army_sub_unit_marine_defence_factor = 0.05
+            }
+            ai_will_do = {
+                factor = 1.5
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
     }
 
     navy_spirit = {

src/common/modifiers/z_vnr_combat_modifiers.txt

@@ -7,6 +7,32 @@ night = { # On province. Multiplied by amount of darkness.
 	air_attack_factor = -0.50
     naval_light_gun_hit_chance_factor = -0.5
     naval_heavy_gun_hit_chance_factor = -0.25
-    naval_torpedo_hit_chance_factor = 0.25
+    naval_torpedo_hit_chance_factor = 0.15
     naval_torpedo_screen_penetration_factor = 0.35
+    naval_torpedo_enemy_critical_chance_factor = 0.2
+}
+
+ship_experience_bonus_max = {
+    naval_light_gun_hit_chance_factor = 0.1
+    naval_heavy_gun_hit_chance_factor = 0.1
+    naval_torpedo_hit_chance_factor = 0.1
+}
+
+ship_experience_malus_min = {
+    naval_light_gun_hit_chance_factor = -0.1
+    naval_heavy_gun_hit_chance_factor = -0.1
+    naval_torpedo_hit_chance_factor = -0.1
+}
+
+carrier_experience_bonus_max = {
+	navy_org_factor = 0.15
+}
+
+carrier_experience_malus_min = {
+	navy_org_factor = -0.1
+}
+
+capital_screening_bonus = {
+    naval_retreat_speed = 0.2
+    navy_anti_air_attack_factor = 0.15
 }

src/common/scripted_effects/_add_starting_tech.txt

@@ -26,6 +26,7 @@ add_starting_techs = {
             midget_submarines = 1
             improved_ship_torpedo_launcher = 1
             ger_11in_c34 = 1
+            ita_extra_armor = 1
 			popup = no
         }
     }
@@ -61,6 +62,7 @@ add_starting_techs = {
             cruiser_submarines = 1
             improved_ship_torpedo_launcher = 1
             improved_airplane_launcher = 1
+            sonar = 1
 
             basic_super_heavy_battery = 1
 			popup = no

src/common/scripted_effects/_vnr_ai.txt

@@ -152,6 +152,26 @@ ai_get_navy_experience = {
 	}
 }
 
+ai_get_mio_upgrade = {
+	every_military_industrial_organization = {
+		limit = {
+			OR = {
+				has_mio_equipment_type = mio_cat_eq_all_carrier
+				has_mio_equipment_type = mio_cat_eq_all_battleship
+				has_mio_equipment_type = mio_cat_eq_all_cruiser
+				has_mio_equipment_type = mio_cat_eq_all_destroyer
+			}
+		}
+		if = {
+			limit = { expert_ai_style = yes }
+			add_mio_size = 2
+		}
+		else = {
+			add_mio_size = 1
+		}
+	}
+}
+
 set_shipyard_output_boost = {
 	if = {
 		limit = {
@@ -190,4 +210,20 @@ set_shipyard_output_boost = {
 			add_ideas = vnr_shipyard_output_boost_half
 		}
 	}
+
+	if = {
+		limit = {
+			expert_ai_style = no
+		}
+		every_country = {
+			limit = { is_ai_naval_major = yes }
+			add_ideas = vnr_ai_dd_output_boost_1
+		}
+	}
+	else = {
+		every_country = {
+			limit = { is_ai_naval_major = yes }
+			add_ideas = vnr_ai_dd_output_boost_2
+		}
+	}
 }

src/common/scripted_effects/_vnr_naval_treaty.txt

@@ -73,6 +73,9 @@ add_starting_navy_spirits = {
 	ENG = {
 		add_ideas = dartmouth_naval_academy
 	}
+	SOV = {
+		add_ideas = voroshilov_naval_academy
+	}
 }
 
 sign_naval_treaty = {

src/common/scripted_triggers/_vnr_scripted_triggers.txt

@@ -9,7 +9,26 @@ has_naval_treaty_trigger = {
 }
 
 expert_ai_style = {
-	has_game_rule = { rule = ai_ship_design_style option = EXPERT }
+	OR = {
+		has_game_rule = { rule = ai_ship_design_style option = EXPERT }
+		has_global_flag = manual_enable_expert_ship
+	}
+	OR = {
+		tag = ENG
+		tag = FRA
+		tag = GER
+		tag = ITA
+		tag = JAP
+		tag = SOV
+		tag = USA
+	}
+}
+
+expert_ai_plane = {
+	OR = {
+		has_game_rule = { rule = vnr_cv_air_ai option = FREE }
+		has_global_flag = manual_enable_expert_plane
+	}
 	OR = {
 		tag = ENG
 		tag = FRA
@@ -24,4 +43,17 @@ expert_ai_style = {
 enable_vnr_naval_ai = {
 	has_global_flag = vnr_enabled
 	has_game_rule = { rule = vnr_ai_naval_management option = FREE }
+}
+
+is_ai_naval_major = {
+	OR = {
+		tag = ENG
+		tag = FRA
+		tag = GER
+		tag = ITA
+		tag = JAP
+		tag = SOV
+		tag = USA
+	}
+	is_ai = yes
 }

src/common/technologies/MTG_naval.txt

@@ -23,6 +23,9 @@ technologies = {
 ### ###  ##  #  #  #	##  #  # ### #	##
 
 	early_ship_hull_light = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_8_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_light_1
@@ -75,6 +78,9 @@ technologies = {
 	}
 
 	basic_ship_hull_light = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_0_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_light_2
@@ -131,6 +137,9 @@ technologies = {
 	}
 
 	interwar_ship_hull_light = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_0_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_light_3
@@ -183,6 +192,9 @@ technologies = {
 	}
 
 	improved_ship_hull_light = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_5_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_light_4
@@ -236,6 +248,9 @@ technologies = {
 	}
 
 	advanced_ship_hull_light = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_5_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_light_5
@@ -289,6 +304,10 @@ technologies = {
 	}
 
 	modern_ship_hull_light = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_7_tt
+		}
+		
 		enable_equipments = {
 			vnr_ship_hull_light_6
 		}
@@ -388,6 +407,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = depth_charges_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_1_tt
+		}
 
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -427,6 +449,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = depth_charges_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_1_tt
+		}
 
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -469,6 +494,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = depth_charges_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_1_tt
+		}
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
@@ -511,6 +539,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = depth_charges_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_1_tt
+		}
 
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -552,6 +583,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = depth_charges_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_2_tt
+		}
 
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -593,6 +627,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = sonar_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_3_tt
+		}
 
 		research_cost = 0.8
 
@@ -629,6 +666,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = sonar_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_3_tt
+		}
 		research_cost = 0.8
 
 		start_year = 1940
@@ -668,6 +708,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = sonar_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_4_tt
+		}
 		path = {
 			leads_to_tech = sound_surveillance_system
 			research_cost_coeff = 1
@@ -710,6 +753,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = sonar_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_4_tt
+		}
 		research_cost = 0.8
 
 		start_year = 1949
@@ -742,6 +788,9 @@ technologies = {
 	}
 
 	sound_surveillance_system = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_4_tt
+		}
 		research_cost = 1.25
 
 		navy_submarine_detection_factor = 0.2
@@ -802,6 +851,9 @@ technologies = {
 	}
 
 	large_destroyer_trend = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_6_tt
+		}
 		research_cost = 0.8
 		enable_equipment_modules = {
 			ship_hull_light_role_dl
@@ -833,6 +885,9 @@ technologies = {
 	}
 
 	escort_destroyer_trend = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_8_tt
+		}
 		research_cost = 0.7
 		enable_equipment_modules = {
 			ship_hull_light_role_de
@@ -891,6 +946,9 @@ technologies = {
 	}
 
 	destroyer_missile_upgrade = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_9_tt
+		}
 		research_cost = 1
 		start_year = 1946
 
@@ -924,6 +982,9 @@ technologies = {
 	}
 
 	destroyer_guided_missile_upgrade = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_10_tt
+		}
 		research_cost = 1.25
 		start_year = 1950
 
@@ -961,6 +1022,9 @@ technologies = {
 	}
 
 	destroyer_hull_improvement = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_7_tt
+		}
 		research_cost = 1
 		start_year = 1954
 
@@ -987,6 +1051,9 @@ technologies = {
 	}
 
 	close_in_area_air_defense = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_9_tt
+		}
 		research_cost = 0.8
 		start_year = 1952
 
@@ -1050,6 +1117,9 @@ technologies = {
  ##  #  #  ##  ### ##  ### #  # ##
 
 	early_ship_hull_cruiser = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_1_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_cruiser_1
@@ -1111,6 +1181,9 @@ technologies = {
 	}
 
 	basic_ship_hull_cruiser = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_3_tt
+		}
 		enable_equipments = {
 			vnr_ship_hull_cruiser_2
 		}
@@ -1167,6 +1240,9 @@ technologies = {
 	}
 
 	interwar_ship_hull_cruiser = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_0_1_tt
+		}
 		enable_equipments = {
 			vnr_ship_hull_cruiser_3
 		}
@@ -1225,6 +1301,9 @@ technologies = {
 	}
 
 	improved_ship_hull_cruiser = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_4_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_cruiser_4
@@ -1274,6 +1353,9 @@ technologies = {
 	}
 
 	advanced_ship_hull_cruiser = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_5_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_cruiser_5
@@ -1326,6 +1408,9 @@ technologies = {
 	}
 
 	modern_ship_hull_cruiser = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_2_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_cruiser_6
@@ -1383,6 +1468,9 @@ technologies = {
 	}
 
 	phased_array_radar = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_5_tt
+		}
 		is_special_project_tech = yes
 		allow = {
 			ROOT = {
@@ -1415,6 +1503,9 @@ technologies = {
 		}
 	}
 	new_ship_materials = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_2_tt
+		}
 		enable_equipment_modules = {
 			structural_aluminum
 		}
@@ -1451,6 +1542,9 @@ technologies = {
 		}
 	}
 	full_missile_ship = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_2_tt
+		}
 		enable_equipment_modules = {
 			full_missile_upgrade
 		}
@@ -1562,6 +1656,9 @@ technologies = {
 		}
 	}
 	nuclear_engine_research = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_4_tt
+		}
 		research_cost = 1.25
 		is_special_project_tech = yes
 		allow = {
@@ -1603,6 +1700,9 @@ technologies = {
 	}
 
 	nuclear_reactor_cost_reduction = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_4_tt
+		}
 		research_cost = 2
 		enable_equipment_modules = {
 			economical_nuclear_reactor_cruiser
@@ -1635,6 +1735,9 @@ technologies = {
 	}
 
 	colony_cruiser = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_6_tt
+		}
 
 		enable_equipment_modules = {
 			ship_hull_cruiser_role_clc
@@ -1672,6 +1775,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = airplane_launcher_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_3_tt
+		}
 
 		research_cost = 0.6
 
@@ -1995,6 +2101,9 @@ technologies = {
 	}
 
 	cruiser_gun_upgrade = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_4_tt
+		}
 		start_year = 1934
 		research_cost = 0.75
 
@@ -2028,6 +2137,9 @@ technologies = {
 		}
 	}
 	cruiser_aa_upgrade = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_6_tt
+		}
 		start_year = 1936
 		research_cost = 0.3
 
@@ -2065,6 +2177,9 @@ technologies = {
 	}
 
 	destroyer_cruiser_trend = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_4_tt
+		}
 		start_year = 1932
 		research_cost = 1
 
@@ -2092,6 +2207,9 @@ technologies = {
 	}
 
 	cruiser_radar_sentry = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_0_2_tt
+		}
 		research_cost = 1.25
 		start_year = 1944
 
@@ -2150,6 +2268,9 @@ technologies = {
 	}
 
 	cruiser_missile_upgrade = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_7_tt
+		}
 		research_cost = 1
 		start_year = 1946
 		enable_equipment_modules = {
@@ -2186,6 +2307,9 @@ technologies = {
 	}
 
 	helipad = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_11_tt
+		}
 		research_cost = 0.75
 		start_year = 1945
 		is_special_project_tech = yes
@@ -2228,6 +2352,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = heavy_armor_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_9_tt
+		}
 		path = {
 			leads_to_tech = mixed_armor_scheme
 			research_cost_coeff = 1
@@ -2273,6 +2400,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = heavy_armor_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_9_tt
+		}
 		path = {
 			leads_to_tech = all_or_nothing_armor_scheme
 			research_cost_coeff = 1
@@ -2315,6 +2445,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = heavy_armor_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_9_tt
+		}
 		path = {
 			leads_to_tech = all_or_nothing_armor_box_armor_scheme
 			research_cost_coeff = 1
@@ -2357,6 +2490,9 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = heavy_armor_advice_tt
 		}
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_9_tt
+		}
 
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -2397,6 +2533,9 @@ technologies = {
 	}
 
 	harvey_steel = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_10_tt
+		}
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
@@ -2444,6 +2583,9 @@ technologies = {
 	}
 
 	krupp_steel = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_10_tt
+		}
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
@@ -2491,6 +2633,9 @@ technologies = {
 	}
 
 	krupp_cemented_steel = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_10_tt
+		}
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
@@ -2542,6 +2687,9 @@ technologies = {
 	}
 
 	ducol_steel = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_10_tt
+		}
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
@@ -2578,6 +2726,9 @@ technologies = {
 	}
 
 	homogeneous_krupp_steel = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_10_tt
+		}
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
@@ -2612,6 +2763,9 @@ technologies = {
 #  # ### #  #   #	#	##  #  # ### #	##
 
 	early_ship_hull_heavy = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_1_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_heavy_1
@@ -2674,6 +2828,9 @@ technologies = {
 	}
 
 	basic_ship_hull_heavy = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_6_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_heavy_2
@@ -2736,6 +2893,9 @@ technologies = {
 		}
 	}
 	ship_hull_super_heavy = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_8_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_super_heavy_1
@@ -2775,6 +2935,9 @@ technologies = {
 	}
 
 	interwar_ship_hull_heavy = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_7_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_heavy_3
@@ -2832,6 +2995,9 @@ technologies = {
 	}
 
 	improved_ship_hull_heavy = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_0_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_heavy_4
@@ -2893,6 +3059,9 @@ technologies = {
 	}
 
 	advanced_ship_hull_heavy = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_0_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_heavy_5
@@ -3232,6 +3401,9 @@ technologies = {
 	}
 
 	improved_conning_tower = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_6_tt
+		}
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.25
@@ -3308,6 +3480,9 @@ technologies = {
 	}
 
 	heavy_ship_refit_reduction = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_3_tt
+		}
 
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -3336,6 +3511,9 @@ technologies = {
 	}
 
 	enhanced_horizontal_defense = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_10_tt
+		}
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
@@ -3581,6 +3759,9 @@ technologies = {
 	}
 
 	combat_information_center = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_4_tt
+		}
 		research_cost = 1.5
 		enable_equipment_modules = {
 			ship_fire_control_system_4
@@ -3614,6 +3795,9 @@ technologies = {
 	}
 
 	naval_tactical_data_system = {
+		on_research_complete = {
+			custom_effect_tooltip = bb_tech_4_tt
+		}
 		research_cost = 1.5
 		naval_coordination = 0.1
 		positioning = 0.1
@@ -3701,6 +3885,9 @@ technologies = {
 	}
 
 	memory_expansion = {
+		on_research_complete = {
+			custom_effect_tooltip = cw_tech_2_tt
+		}
 		research_cost = 1.5
 		naval_hit_chance = 0.05
 		naval_critical_score_chance_factor = 0.05
@@ -3731,6 +3918,9 @@ technologies = {
 		}
 	}
 	integrated_combat_system = {
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_4_tt
+		}
 		is_special_project_tech = yes
 		allow = {
 			ROOT = {
@@ -3768,6 +3958,9 @@ technologies = {
 		}
 	}
 	tactical_data_link = {
+		on_research_complete = {
+			custom_effect_tooltip = cw_tech_1_tt
+		}
 		research_cost = 1.5
 		start_year = 1955
 
@@ -3980,6 +4173,9 @@ technologies = {
 	}
 
 	early_ship_hull_carrier = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_9_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_carrier_conversion_bb
@@ -4045,6 +4241,9 @@ technologies = {
 	}
 
 	basic_ship_hull_carrier = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_0_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_carrier_1
@@ -4109,6 +4308,9 @@ technologies = {
 	}
 
 	improved_ship_hull_carrier = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_1_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_carrier_2
@@ -4182,6 +4384,9 @@ technologies = {
 	}
 
 	advanced_ship_hull_carrier = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_7_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_carrier_3
@@ -4241,6 +4446,9 @@ technologies = {
 	}
 
 	arresting_gear = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_2_tt
+		}
 		research_cost = 0.75
 		start_year = 1925
 
@@ -4260,7 +4468,7 @@ technologies = {
 			factor = 1
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4269,6 +4477,9 @@ technologies = {
 	}
 
 	landing_aid_system = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_2_tt
+		}
 		research_cost = 0.75
 		start_year = 1925
 
@@ -4294,7 +4505,7 @@ technologies = {
 			factor = 2
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4322,7 +4533,7 @@ technologies = {
 			factor = 1
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4381,7 +4592,7 @@ technologies = {
 			}
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4389,6 +4600,9 @@ technologies = {
 	}
 
 	dive_bomber_study = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_1_tt
+		}
 		research_cost = 1.25
 		start_year = 1938
 
@@ -4419,7 +4633,7 @@ technologies = {
 			}
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4428,6 +4642,9 @@ technologies = {
 	}
 
 	carrier_damage_control = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_5_tt
+		}
 		research_cost = 1.25
 		start_year = 1941
 
@@ -4565,6 +4782,9 @@ technologies = {
 		}
 	}
 	folding_wing = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_7_tt
+		}
 		research_cost = 1.5
 		start_year = 1942
 
@@ -4595,7 +4815,7 @@ technologies = {
 			}
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4604,6 +4824,9 @@ technologies = {
 	}
 
 	carrier_steam_catapult = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_4_tt
+		}
 		research_cost = 1
 		start_year = 1944
 
@@ -4631,7 +4854,7 @@ technologies = {
 			}
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4718,6 +4941,9 @@ technologies = {
 	}
 
 	tactical_air_navigation_system = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_3_tt
+		}
 		research_cost = 1
 		start_year = 1948
 
@@ -4736,7 +4962,7 @@ technologies = {
 			factor = 1
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4746,6 +4972,9 @@ technologies = {
 		}
 	}
 	airborne_early_warning = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_3_tt
+		}
 		research_cost = 1.5
 		start_year = 1951
 
@@ -4762,7 +4991,7 @@ technologies = {
 			factor = 1
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4786,7 +5015,7 @@ technologies = {
 			factor = 1
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4810,7 +5039,7 @@ technologies = {
 			factor = 1
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4818,6 +5047,9 @@ technologies = {
 		}
 	}
 	luneburg_lens = {
+		on_research_complete = {
+			custom_effect_tooltip = cw_tech_2_tt
+		}
 		research_cost = 1.2
 		start_year = 1952
 
@@ -4838,7 +5070,7 @@ technologies = {
 			factor = 3
 		}
 
-		special_project_specialization = { specialization_naval }
+		special_project_specialization = { specialization_naval specialization_air }
 		categories = {
 			naval_equipment
 			cv_tech
@@ -4855,6 +5087,9 @@ technologies = {
 #(_)-(_)	##   ##  ###  #   # #  # #  # ### #  # ### ##
 
 	early_ship_hull_submarine = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_1_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_submarine_1
@@ -4918,6 +5153,9 @@ technologies = {
 	}
 
 	basic_ship_hull_submarine = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_2_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_submarine_2
@@ -4977,6 +5215,9 @@ technologies = {
 	}
 
 	improved_ship_hull_submarine = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_5_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_submarine_3
@@ -5036,6 +5277,9 @@ technologies = {
 	}
 
 	advanced_ship_hull_submarine = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_0_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_submarine_4
@@ -5093,6 +5337,9 @@ technologies = {
 	}
 
 	modern_ship_hull_submarine = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_6_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_submarine_5
@@ -5507,6 +5754,9 @@ technologies = {
 	}
 
 	basic_periscope = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_3_tt
+		}
 
 		enable_equipment_modules = {
 			sub_ship_periscope_1
@@ -5537,6 +5787,9 @@ technologies = {
 		}
 	}
 	improved_periscope = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_3_tt
+		}
 
 		enable_equipment_modules = {
 			sub_ship_periscope_2
@@ -5571,6 +5824,9 @@ technologies = {
 		}
 	}
 	advanced_periscope = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_3_tt
+		}
 
 		enable_equipment_modules = {
 			sub_ship_periscope_3
@@ -5651,6 +5907,9 @@ technologies = {
 	}
 
 	modern_periscope = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_4_tt
+		}
 		research_cost = 0.75
 		enable_equipment_modules = {
 			sub_ship_periscope_4
@@ -5859,6 +6118,9 @@ technologies = {
 		}
 	}
 	cruiser_submarines = {
+		on_research_complete = {
+			custom_effect_tooltip = ss_tech_1_tt
+		}
 
 		enable_equipments = {
 			vnr_ship_hull_cruiser_submarine
@@ -5904,9 +6166,15 @@ technologies = {
 		}
 	}
 	escort_carriers_ship = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_6_tt
+		}
 		enable_equipments = {
 			vnr_ship_hull_escort_carrier
 		}
+		enable_equipment_modules = {
+			ship_hull_carrier_role_cve
+		}
 		research_cost = 0.4
 		start_year = 1940
 
@@ -5921,6 +6189,9 @@ technologies = {
 		}
 	}
 	super_carriers = {
+		on_research_complete = {
+			custom_effect_tooltip = cv_tech_8_tt
+		}
 		enable_equipments = {
 			vnr_ship_hull_super_carrier
 		}
@@ -6012,6 +6283,9 @@ technologies = {
 	}
 
 	ship_to_ship_missile = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_8_tt
+		}
 		research_cost = 1.5
 		start_year = 1945
 		is_special_project_tech = yes
@@ -6050,6 +6324,9 @@ technologies = {
 	}
 
 	advanced_missile_system = {
+		on_research_complete = {
+			custom_effect_tooltip = ca_tech_9_tt
+		}
 		research_cost = 2
 		start_year = 1949
 

src/common/terrain/00_terrain.txt

@@ -34,6 +34,10 @@ categories =  {
 		ai_terrain_importance_factor = 5.0
 		match_value = 5
 		sound_type = forest
+		buildings_max_level = {
+			bunker = 4
+			coastal_bunker = 6
+		}
 
 		units = {
 			attack = -0.15
@@ -56,6 +60,10 @@ categories =  {
 		ai_terrain_importance_factor = 3.0
 		match_value = 2
 		sound_type = desert
+		buildings_max_level = {
+			bunker = 5
+			coastal_bunker = 6
+		}
 
 		units = {
 			attack = -0.25
@@ -78,6 +86,10 @@ categories =  {
 		ai_terrain_importance_factor = 10.0
 		match_value = 10
 		sound_type = desert
+		buildings_max_level = {
+			bunker = 4
+			coastal_bunker = 6
+		}
 
 		units = {
 			attack = -0.5
@@ -99,6 +111,10 @@ categories =  {
 		combat_support_width = 35
 		match_value = 0.5
 		sound_type = plains
+		buildings_max_level = {
+			bunker = 5
+			coastal_bunker = 6
+		}
 	}
 	
 	urban = {
@@ -109,6 +125,10 @@ categories =  {
 		combat_support_width = 40
 		match_value = 4
 		sound_type = plains
+		buildings_max_level = {
+			bunker = 5
+			coastal_bunker = 6
+		}
 
 		units = {
 			attack = -0.3
@@ -131,6 +151,10 @@ categories =  {
 		ai_terrain_importance_factor = 6.0
 		match_value = 6
 		sound_type = forest
+		buildings_max_level = {
+			bunker = 3
+			coastal_bunker = 6
+		}
 
 		units = {
 			attack = -0.3
@@ -156,6 +180,10 @@ categories =  {
 		ai_terrain_importance_factor = 8.0
 		match_value = 8
 		sound_type = forest
+		buildings_max_level = {
+			bunker = 3
+			coastal_bunker = 6
+		}
 
 		units = {
 			attack = -0.4
@@ -178,6 +206,10 @@ categories =  {
 		ai_terrain_importance_factor = 8.0
 		match_value = 8
 		sound_type = desert
+		buildings_max_level = {
+			bunker = 4
+			coastal_bunker = 6
+		}
 		
 		sickness_chance = 1.0
 		
@@ -201,6 +233,14 @@ categories =  {
 			}
 			navy_fuel_consumption_factor = 0.2
 		}
+		SH_battleship = {
+			units = {
+				attack = -0.2
+				movement = -0.2
+				defence = -0.2
+			}
+			navy_fuel_consumption_factor = 0.2
+		}
 		battleship = {
 			units = {
 				attack = -0.2
@@ -209,7 +249,7 @@ categories =  {
 			}
 			navy_fuel_consumption_factor = 0.2
 		}
-        SH_battleship = {
+		battlecarrier = {
 			units = {
 				attack = -0.2
 				movement = -0.2
@@ -217,6 +257,14 @@ categories =  {
 			}
 			navy_fuel_consumption_factor = 0.2
 		}
+		##! armored_cruiser = {
+		##! 	units = {
+		##! 		attack = -0.2
+		##! 		movement = -0.2
+		##! 		defence = -0.2
+		##! 	}
+		##! 	navy_fuel_consumption_factor = 0.2
+		##! }
 		heavy_cruiser = {
 			units = {
 				attack = -0.2
@@ -225,7 +273,7 @@ categories =  {
 			}
 			navy_fuel_consumption_factor = 0.2
 		}
-        medium_cruiser = {
+		medium_cruiser = {
 			units = {
 				attack = -0.2
 				movement = -0.2
@@ -333,4 +381,4 @@ terrain = {
 	jungle_blend_18				= { type = mountain			color = { 	27	 } texture = 7 }
 	desert_mountain_tops		= { type = mountain			color = { 	31	 } texture = 15 }
 	
-}
+}

src/common/units/battlecruiser.txt

@@ -15,12 +15,12 @@ sub_units = {
 			}
 		}
 
-		max_organisation = 50
+		max_organisation = 40
 
 		supply_consumption = 0.33
 		
 		critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire }
-		critical_part_damage_chance_mult = 1.25
+		critical_part_damage_chance_mult = 1.0
 		
 		hit_profile_mult = 1.0
 	}

src/common/units/critical_parts/00_critical_parts.txt

@@ -152,14 +152,14 @@ critical_parts = {
         icon = "GFX_default_critical_damage_icons"
 		frame = 6
         stat_penalties = {
-            carrier_size = -0.2
+            carrier_size = -0.4
         }
 		modifier = {
 			navy_org_factor = -0.3
 		}
 		chance = 0.75
-        org_damage_multiplier = 1
+        org_damage_multiplier = 1.25
-        str_damage_multiplier = 1
+        str_damage_multiplier = 1.25
 		base_damage_instance = 1
 		damage_instance_per_added_module = 1
 		max_damage_instance = 1
@@ -168,14 +168,14 @@ critical_parts = {
         icon = "GFX_default_critical_damage_icons"
 		frame = 6
         stat_penalties = {
-            carrier_size = -0.1
+            carrier_size = -0.2
         }
 		modifier = {
 			navy_org_factor = -0.15
 		}
         chance = 0.5
-        org_damage_multiplier = 0.75
+        org_damage_multiplier = 1
-        str_damage_multiplier = 0.75
+        str_damage_multiplier = 1
 		base_damage_instance = 1
 		damage_instance_per_added_module = 1
 		max_damage_instance = 1
@@ -187,8 +187,8 @@ critical_parts = {
             navy_org_factor = -0.9
 			naval_morale_factor = -1
         }
-        chance = 0.1
+        chance = 0.05
-        org_damage_multiplier = 3
+        org_damage_multiplier = 10
-        str_damage_multiplier = 3
+        str_damage_multiplier = 10
     }
 }

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

@@ -41,7 +41,6 @@ equipment_modules = {
 		add_stats = {
 			carrier_size = 2
 			build_cost_ic = 1300
-			reliability = 0.025
 			max_strength = 40
 			anti_air_attack = 2.5
 			surface_detection = 4
@@ -72,6 +71,7 @@ equipment_modules = {
 			max_strength = 30
 			anti_air_attack = 1.5
 			supply_consumption = 0.015
+			reliability = -0.025
 		}
 		manpower = 200 #outside the add_stats section for code reasons
 		multiply_stats = {
@@ -115,6 +115,7 @@ equipment_modules = {
 			build_cost_ic = 2000
 			max_organisation = -0.05
 			surface_detection = 5
+			reliability = -0.05
 			max_strength = 55
 			anti_air_attack = 3
 			supply_consumption = 0.025
@@ -161,6 +162,7 @@ equipment_modules = {
 			build_cost_ic = 2000
 			surface_detection = 8
 			max_strength = 80
+			reliability = -0.1
 			anti_air_attack = 3
 			supply_consumption = 0.03
 		}
@@ -183,6 +185,7 @@ equipment_modules = {
 			build_cost_ic = 2000
 			surface_detection = 4
 			max_strength = 30
+			reliability = -0.025
 			anti_air_attack = 1.5
 			supply_consumption = 0.015
 		}
@@ -356,10 +359,11 @@ equipment_modules = {
 		category = carrier_unit
 		add_stats = {
 			reliability = 0.1
+			max_organisation = 0.1
 		}
 		multiply_stats = {
 			max_strength = 0.05
-			build_cost_ic = 0.05
+			build_cost_ic = 0.075
 		}
 	}
 	carrier_scouting_unit = {
@@ -416,13 +420,13 @@ equipment_modules = {
 		category = carrier_island
 		gui_category = carrier_miscellaneous
 		add_stats = {
-			max_organisation = 0.1
+			max_organisation = 0.05
 			reliability = -0.05
 			build_cost_ic = 200
 		}
 		multiply_stats = {
 			surface_detection = 0.01
-			naval_speed = -0.025
+			naval_speed = -0.05
 			naval_torpedo_damage_reduction_factor = 0.01
 		}
 	}
@@ -456,7 +460,7 @@ equipment_modules = {
 		multiply_stats = {
 			naval_speed = -0.025
 			armor_value = 0.1
-			build_cost_ic = 0.1
+			build_cost_ic = 0.15
 		}
 	}
 	carrier_tracing_unit = {

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

@@ -17,10 +17,14 @@ equipment_modules = {
 			build_cost_ic = 70
 			surface_detection = 1
 		}
+		forbid_module_categories = {
+			ship_radar
+		}
 	}
 	ship_radar_1 = {
 		abbreviation = "sbj"
 		category = ship_radar
+		parent = ship_mast_1
 		sfx = sfx_ui_sd_module_sonar
 
 		multiply_stats = {

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

@@ -23,7 +23,7 @@ equipment_modules = {
 			naval_speed = -0.001
 		}
 		add_average_stats = {
-			lg_armor_piercing = 1
+			lg_armor_piercing = 3
 		}
 		dismantle_cost_ic = 2
 
@@ -46,7 +46,7 @@ equipment_modules = {
 			naval_speed = -0.005
 		}
 		add_average_stats = {
-			lg_armor_piercing = 4
+			lg_armor_piercing = 4.5
 		}
 		dismantle_cost_ic = 4
 		
@@ -112,7 +112,7 @@ equipment_modules = {
 			naval_speed = -0.001
 		}
 		add_average_stats = {
-			lg_armor_piercing = 1
+			lg_armor_piercing = 3
 		}
 		dismantle_cost_ic = 4
 
@@ -135,7 +135,7 @@ equipment_modules = {
 			naval_speed = -0.005
 		}
 		add_average_stats = {
-			lg_armor_piercing = 4
+			lg_armor_piercing = 4.5
 		}
 		dismantle_cost_ic = 8
 		
@@ -202,7 +202,7 @@ equipment_modules = {
 		}
 		
 		add_average_stats = {
-			lg_armor_piercing = 0.5
+			lg_armor_piercing = 2.5
 		}
 		dismantle_cost_ic = 10
 		
@@ -226,7 +226,7 @@ equipment_modules = {
 		}
 		
 		add_average_stats = {
-			lg_armor_piercing = 3
+			lg_armor_piercing = 4
 		}
 		dismantle_cost_ic = 20
 
@@ -297,7 +297,7 @@ equipment_modules = {
 			naval_speed = -0.02
 		}
 		add_average_stats = {
-			lg_armor_piercing = 14
+			lg_armor_piercing = 10
 		}
 		dismantle_cost_ic = 28
 		
@@ -319,7 +319,7 @@ equipment_modules = {
 		}
 		
 		add_average_stats = {
-			lg_armor_piercing = 0.5
+			lg_armor_piercing = 2.5
 		}
 		dismantle_cost_ic = 5
 
@@ -342,7 +342,7 @@ equipment_modules = {
 		}
 		
 		add_average_stats = {
-			lg_armor_piercing = 3
+			lg_armor_piercing = 4
 		}
 		dismantle_cost_ic = 10
 
@@ -411,7 +411,7 @@ equipment_modules = {
 			naval_speed = -0.015
 		}
 		add_average_stats = {
-			lg_armor_piercing = 14
+			lg_armor_piercing = 10
 		}
 		dismantle_cost_ic = 20
 		

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

@@ -264,7 +264,7 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 5
-			build_cost_ic = 90
+			build_cost_ic = 50
 		}
 		
 		multiply_stats = {
@@ -289,7 +289,7 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 7
-			build_cost_ic = 120
+			build_cost_ic = 80
 		}
 		
 		multiply_stats = {
@@ -317,7 +317,7 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 9
-			build_cost_ic = 150
+			build_cost_ic = 120
 		}
 		
 		multiply_stats = {
@@ -345,7 +345,7 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 11
-			build_cost_ic = 170
+			build_cost_ic = 150
 		}
 		
 		multiply_stats = {
@@ -372,8 +372,8 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 15
-			build_cost_ic = 1500
+			build_cost_ic = 750
-			reliability = -0.3
+			reliability = -0.2
 		}
 		
 		multiply_stats = {
@@ -383,7 +383,7 @@ equipment_modules = {
 		}
 		can_convert_from = {
 			module_category = sub_ship_engine
-			convert_cost_ic = 450
+			convert_cost_ic = 900
 		}
 	}
 	sub_ship_engine_nuclear = {
@@ -393,7 +393,7 @@ equipment_modules = {
 
 		add_stats = {
 			#naval_speed = 5
-			build_cost_ic = 4000
+			build_cost_ic = 3000
 			naval_range = 50000
 			reliability = -0.3
 		}

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

@@ -967,7 +967,7 @@ equipment_modules = {
 			armor_value = 30
 			naval_torpedo_enemy_critical_chance_factor = -0.1
 			naval_torpedo_damage_reduction_factor = 0.15
-			reliability = 0.15
+			reliability = 0.05
 		}
 		dismantle_cost_ic = 4500
 		can_convert_from = {
@@ -1216,10 +1216,8 @@ equipment_modules = {
     pressure_hull_1 = {
 		category = pressure_hull
 
-		add_stats = {
-			build_cost_ic = 100
-		}
 		multiply_stats = {
+			build_cost_ic = 0.05
 			max_strength = 0.05
 		}
 		can_convert_from = {
@@ -1231,10 +1229,8 @@ equipment_modules = {
 		category = pressure_hull
 		parent = pressure_hull_1
 
-		add_stats = {
-			build_cost_ic = 150
-		}
 		multiply_stats = {
+			build_cost_ic = 0.075
 			max_strength = 0.1
 			sub_visibility = -0.025
 		}
@@ -1248,10 +1244,8 @@ equipment_modules = {
 		category = pressure_hull
 		parent = pressure_hull_2
 
-		add_stats = {
-			build_cost_ic = 200
-		}
 		multiply_stats = {
+			build_cost_ic = 0.1
 			max_strength = 0.15
 			sub_visibility = -0.05
 		}
@@ -1264,10 +1258,8 @@ equipment_modules = {
 		category = pressure_hull
 		parent = pressure_hull_3
 
-		add_stats = {
-			build_cost_ic = 300
-		}
 		multiply_stats = {
+			build_cost_ic = 0.125
 			max_strength = 0.2
 			sub_visibility = -0.075
 		}
@@ -1280,10 +1272,8 @@ equipment_modules = {
 		category = pressure_hull
 		parent = pressure_hull_4
 
-		add_stats = {
-			build_cost_ic = 600
-		}
 		multiply_stats = {
+			build_cost_ic = 0.15
 			max_strength = 0.3
 			sub_visibility = -0.085
 			naval_speed = 0.1
@@ -1325,7 +1315,7 @@ equipment_modules = {
 			ship_light_medium_battery_double
 		}
 	}
-	ship_cruiser_camo_2 = {
+	ship_cruiser_camo_2 = {	# civilian ship disguise, merchant raider/auxiliary cruiser
 		category = raider_kit
 		
 		multiply_stats = {
@@ -1336,6 +1326,7 @@ equipment_modules = {
 			anti_air_attack = -0.5
 			torpedo_attack = -0.8
 			surface_visibility = -0.2
+			max_strength = -0.25
 			build_cost_ic = 0.02
 		}
 		

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

@@ -41,11 +41,12 @@ equipment_modules = {
     	category = dd_role
     	multiply_stats = {
 	        lg_attack = -0.1
-    	    max_strength = -0.05
+    	    max_strength = -0.15
 			naval_speed = -0.3
         	sub_detection = 0.1
 			torpedo_attack = -0.6
 			surface_visibility = -0.05
+			naval_range = -0.1
         	build_cost_ic = -0.2
     	}
 		dismantle_cost_ic = 3000
@@ -63,7 +64,7 @@ equipment_modules = {
 	        lg_attack = -0.15
 			lg_armor_piercing = -0.1
 			anti_air_attack = -0.15
-    	    max_strength = -0.1
+    	    max_strength = -0.25
 			naval_speed = -0.4
         	surface_visibility = -0.1
 			torpedo_attack = -0.8
@@ -168,6 +169,10 @@ equipment_modules = {
 	ship_hull_cruiser_role_ca = {
 		category = c_role
 		add_equipment_type = capital_ship
+		add_stats = {
+			naval_heavy_gun_hit_chance_factor = 0.05
+			naval_light_gun_hit_chance_factor = 0.05
+		}
 		forbid_module_categories = {
 			ship_medium_heavy_battery_triple
 			ship_medium_heavy_battery_double
@@ -200,6 +205,10 @@ equipment_modules = {
 			ship_light_medium_battery
 			ship_light_medium_battery_double
 			ship_light_medium_battery_single
+			ship_light_battery
+			ship_light_battery_double
+			dp_light_battery
+			dp_light_battery_single
 			ship_missile
 			ship_missile_aa
 			raider_kit
@@ -345,6 +354,10 @@ equipment_modules = {
 			naval_range = 0.5
 		}
 		dismantle_cost_ic = 3000
+		forbid_module_categories = {
+			ship_medium_heavy_battery_double
+			ship_medium_heavy_battery_triple
+		}
 	}
 	ship_hull_cruiser_role_cd = {
 		category = cds_role
@@ -355,6 +368,8 @@ equipment_modules = {
 		dismantle_cost_ic = 3000
 		forbid_module_categories = {
 			ship_cruiser_heavy_armor
+			ship_medium_heavy_battery_double
+			ship_medium_heavy_battery_triple
 		}
 	}
 	ship_hull_cruiser_role_mo = {
@@ -368,6 +383,10 @@ equipment_modules = {
 			build_cost_ic = 0.1
 			naval_range = 0.5
 		}
+		forbid_module_categories = {
+			ship_medium_heavy_battery_double
+			ship_medium_heavy_battery_triple
+		}
 	}
 
 
@@ -442,6 +461,19 @@ equipment_modules = {
 			ship_deck_space_mega
 		}
 	}
+	ship_hull_carrier_role_cve = {
+		category = cve_role
+		gui_category = cv_role
+		multiply_stats = {
+			anti_air_attack = -0.1
+			max_organisation = -0.2
+		}
+		dismantle_cost_ic = 100000
+		forbid_module_categories = {
+			ship_deck_space
+			ship_deck_space_mega
+		}
+	}
 
 
 ######################

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

@@ -423,7 +423,7 @@ equipment_modules = {
 		
 		add_stats = {
 			torpedo_attack = 14
-			build_cost_ic = 80
+			build_cost_ic = 50
 			naval_torpedo_hit_chance_factor = 0.01
 		}
 
@@ -447,7 +447,7 @@ equipment_modules = {
 
 		add_stats = {
 			torpedo_attack = 18
-			build_cost_ic = 100
+			build_cost_ic = 70
 			naval_torpedo_hit_chance_factor = 0.02
 		}
 
@@ -475,7 +475,7 @@ equipment_modules = {
 
 		add_stats = {
 			torpedo_attack = 22
-			build_cost_ic = 120
+			build_cost_ic = 90
 			naval_torpedo_hit_chance_factor = 0.03
 		}
 
@@ -500,7 +500,7 @@ equipment_modules = {
 
 		add_stats = {
 			torpedo_attack = 26
-			build_cost_ic = 140
+			build_cost_ic = 110
 			naval_torpedo_hit_chance_factor = 0.04
 		}
 
@@ -525,7 +525,7 @@ equipment_modules = {
 		add_stats = {
 			torpedo_attack = 30
 			sub_attack = 8
-			build_cost_ic = 180
+			build_cost_ic = 150
 			naval_torpedo_hit_chance_factor = 0.05
 		}
 
@@ -823,9 +823,11 @@ equipment_modules = {
 			sub_detection = 2
 			sub_attack = 1.5
 			build_cost_ic = 150
+			surface_visibility = 0.5
 		}
 		multiply_stats = {
 			naval_speed = -0.003
+			surface_visibility = 0.025
 		}
 	}
 	ship_airplane_launcher_2 = {
@@ -838,6 +840,7 @@ equipment_modules = {
 			sub_detection = 3.5
 			sub_attack = 2.5
 			build_cost_ic = 250
+			surface_visibility = 1
 		}
 		can_convert_from = {
 			module_category = ship_airplane_launcher
@@ -845,6 +848,7 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			naval_speed = -0.004
+			surface_visibility = 0.05
 		}
 	}
 	ship_helipad = {
@@ -855,6 +859,7 @@ equipment_modules = {
 			sub_detection = 4.5
 			sub_attack = 6
 			build_cost_ic = 200
+			surface_visibility = 0.025
 		}
 		multiply_stats = {
 			naval_speed = -0.005
@@ -863,7 +868,7 @@ equipment_modules = {
     recon_drone_1 = {
 		category = ship_airplane_launcher
 		add_stats = {
-			surface_detection = 2
+			surface_detection = 1
 			sub_detection = 3
 			build_cost_ic = 10
 		}
@@ -889,10 +894,12 @@ equipment_modules = {
 		add_stats = {
 			surface_detection = 2
 			naval_torpedo_hit_chance_factor = 0.01
+			reliability = -0.05
 			build_cost_ic = 150
 		}
 		multiply_stats = {
 			naval_speed = -0.003
+			sub_visibility = 0.05
 		}
 	}
 	sub_airplane_launcher_2 = {
@@ -903,6 +910,7 @@ equipment_modules = {
 			naval_torpedo_hit_chance_factor = 0.02
 			hg_attack = 2
 			lg_attack = 1
+			reliability = -0.05
 			build_cost_ic = 250
 		}
 		can_convert_from = {
@@ -911,6 +919,7 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			naval_speed = -0.004
+			sub_visibility = 0.05
 		}
 	}
 
@@ -1376,7 +1385,7 @@ equipment_modules = {
 		gfx = ship_cruiser_armor
 		
 		multiply_stats = {
-			build_cost_ic = 0.025
+			build_cost_ic = 0.1
 			naval_speed = -0.02
 		}
 		dismantle_cost_ic = 1000

src/common/units/equipment/ship_hull_carrier.txt

@@ -40,7 +40,7 @@ equipments = {
 			}
 			fixed_ship_radar_slot = {
 				required = no
-				allowed_module_categories = { carrier_mast ship_radar }
+				allowed_module_categories = { ship_radar }
 			}
 			fixed_ship_engine_slot = {
 				required = yes
@@ -257,7 +257,7 @@ equipments = {
 			mid_1_custom_slot = empty
 		}
 		naval_range = 4000
-		reliability = 0.65
+		reliability = 0.7
 		max_strength = 110
 		naval_speed = 26.5
 		surface_visibility = 33
@@ -297,7 +297,7 @@ equipments = {
 			}
 			fixed_ship_radar_slot = {
 				required = no
-				allowed_module_categories = { carrier_mast ship_radar }
+				allowed_module_categories = { ship_radar }
 			}
 			fixed_ship_engine_slot = {
 				required = yes
@@ -569,6 +569,10 @@ equipments = {
 				allowed_module_categories = { carrier_miscellaneous carrier_island }
 			}
 			fixed_ship_flight_deck_slot = inherit
+			fixed_ship_role_slot = {
+				required = yes
+				allowed_module_categories = { cve_role }
+			}
 		}
 
 		default_modules = {
@@ -620,6 +624,14 @@ equipments = {
 				allowed_module_categories = { civilian_ship_engine }
 			}
 			fixed_ship_flight_deck_slot = inherit
+			fixed_ship_carrier_miscellaneous_slot_2 = {
+				required = yes
+				allowed_module_categories = { carrier_miscellaneous }
+			}
+			fixed_ship_role_slot = {
+				required = yes
+				allowed_module_categories = { cve_role }
+			}
 		}
 
 		default_modules = {
@@ -627,17 +639,18 @@ equipments = {
 			fixed_ship_anti_air_slot = empty
 			fixed_ship_radar_slot = empty
 			fixed_ship_engine_slot = civilian_ship_engine_1
+			fixed_ship_carrier_miscellaneous_slot_2 = carrier_civilian_material
 		}
 		naval_range = 2000
 
-		max_strength = 15
+		max_strength = 25
 		fuel_consumption = 23
 
 		reliability = 0.5
-		naval_speed = 18
+		naval_speed = 20
 		sub_detection = 4
 		surface_visibility = 16
-		build_cost_ic = 180
+		build_cost_ic = 220
 		resources = {
 			steel = 1
 		}
@@ -646,6 +659,10 @@ equipments = {
 			module = carrier_secondary_island
 			count < 1
 		}
+		module_count_limit = {
+			module = carrier_civilian_material
+			count > 0
+		}
 	}
 
 	vnr_ship_hull_super_carrier = {
@@ -738,7 +755,7 @@ equipments = {
 		}
 
 		naval_range = 6000
-		reliability = 1.5
+		reliability = 1.2
 		max_strength = 150
 		naval_speed = 29
 		surface_visibility = 30
@@ -841,7 +858,7 @@ equipments = {
 		}
 
 		naval_range = 6000
-		reliability = 1.3
+		reliability = 1.2
 		max_strength = 170
 		naval_speed = 28
 		surface_visibility = 32

src/common/units/equipment/ship_hull_submarine.txt

@@ -195,7 +195,7 @@ equipments = {
 
 
 
-		build_cost_ic = 180
+		build_cost_ic = 150
 		resources = {
 			#oil = 1
 			steel = 2
@@ -254,7 +254,7 @@ equipments = {
 
 
 
-		build_cost_ic = 250
+		build_cost_ic = 200
 		resources = {
 			steel = 2
 		}
@@ -306,7 +306,7 @@ equipments = {
 
 
 
-		build_cost_ic = 350
+		build_cost_ic = 275
 		resources = {
 			steel = 3
 			chromium = 1
@@ -364,7 +364,7 @@ equipments = {
 
 		max_strength = 50
 
-		build_cost_ic = 500
+		build_cost_ic = 400
 		resources = {
 			steel = 3
 			chromium = 1
@@ -452,7 +452,7 @@ equipments = {
 
 
 
-		build_cost_ic = 320
+		build_cost_ic = 250
 		resources = {
 			steel = 2
 		}
@@ -507,7 +507,7 @@ equipments = {
 		manpower = 50
 
 
-		build_cost_ic = 100
+		build_cost_ic = 80
 		resources = {
 			steel = 1
 		}

src/common/units/equipment/x_plane_airframes.txt

@@ -101,13 +101,6 @@ duplicate_archetypes = {
 		air_map_icon_frame = 8
 		interface_overview_category_index = 3
 	}
-	medium_plane_naval_bomber_airframe = {
-		archetype = medium_plane_airframe
-		type = naval_bomber
-		picture = archetype_heavy_fighter_equipment
-		air_map_icon_frame = 3
-		interface_overview_category_index = 2
-	}
 
 	medium_plane_scout_plane_airframe = {
 		archetype = medium_plane_airframe

src/common/units/x_cv_plane.txt

@@ -0,0 +1,38 @@
+sub_units = {
+	# Small airframe
+	cv_fighter = {
+		sprite = light_plane
+		priority = 1
+		active = yes
+		type = fighter
+		need = { cv_small_plane_airframe = 1 }
+		categories = { category_fighter }
+		carrier_air_wing_size = 10
+		land_air_wing_size = 10
+		mega_carrier_air_wing_size = 10
+	}
+
+	cv_cas = {
+		sprite = light_plane
+		priority = 2
+		active = yes
+		type = cas
+		need = { cv_small_plane_cas_airframe = 1 }
+		categories = { category_cas }
+		carrier_air_wing_size = 10
+		land_air_wing_size = 10
+		mega_carrier_air_wing_size = 10
+	}
+
+	cv_nav_bomber = {
+		sprite = light_plane
+		priority = 3
+		active = yes
+		type = naval_bomber
+		need = { cv_small_plane_naval_bomber_airframe = 1 }
+		categories = { category_nav_bomber }
+		carrier_air_wing_size = 10
+		land_air_wing_size = 10
+		mega_carrier_air_wing_size = 10
+	}
+}

src/descriptor.mod

@@ -1,4 +1,4 @@
-version="v2.3 - Eastern Solomons"
+version="v2.4 - Ironbottom Sound"
 tags={
 	"Military"
 	"Translation"

src/documentation/Guide.md

@@ -27,7 +27,11 @@ Carrier, on the other hand, is very different from all kinds of firepower mentio
 
 Protection varies on different hulls. For example, destroyer has close to zero protection, cruiser has armor plates, while battleship possesses armor plates, armor schemes and torpedo defense systems.
 
-When HP gets reduced to 0, the ship will be sunk. Typically, there are two ways to avoid it. Having more HP brings obvious benefits to the ship, and allows it to take more damage before sunk. Armor improves survivability with a different approach by reducing damage received each time it's hit. Based on the formula listed in intro panel, if armor piercing of a gun is lower than half of the armor, its damage is reduced to 20% of its original value. In a scenario where battleships fight toe-to-toe combat, armor is extremely useful against guns.
+When HP gets reduced to 0, the ship will be sunk. Typically, there are two ways to avoid it.
+
+Having more HP brings obvious benefits to the ship, and allows it to take more damage before sunk. HP comes from many things, such as armor plates and advanced hulls, and more importantly, turrets. Except for light guns, all turrets have HP bonus to simulate a linear relation between tonnage and survivability, which is crucial on cruiser and heavy hulls in terms of protection.
+
+Armor improves survivability with a different approach by reducing damage received each time it's hit. Based on the formula listed in intro panel, if armor piercing of a gun is lower than half of the armor, its damage is reduced to 20% of its original value. In a scenario where battleships fight toe-to-toe combat, armor is extremely useful against guns.
 
 However, armor is not invincible if you take other types of firepower into consideration. For example, torpedo completely ignores armor, and it can do so much damage that even torpedo defense system is not effective enough to save the ship when it's hit. Luckily, with a good escort force, torpedo will have a hard time penetrating the screen line to get your capital ships.
 
@@ -55,15 +59,15 @@ If you can fully understand the six dimensions, now it's time to design your fir
 
 **Carrier**
 
-Carrier serves as the main source of damage in battle, and it heavily relies on its aircrafts. Despite CV plane templates, the most important thing about a carrier is its capacity, which requires you to mount as many hangars as possible. However, having too many hangars will certainly degrade speed and other metrics, especially that organisation and HP will impact sortie efficiency. Thus you should keep the degradation under control, and take caution in the usage of large open hangar which harms these stats to a large extent.
+Carrier serves as the main source of damage in battle, and it heavily relies on its aircrafts. Despite CV plane templates, the most important thing about a carrier is its capacity, which requires you to mount as many hangars as possible. However, having too many hangars will certainly degrade speed and other metrics, especially that organisation and HP will impact sortie efficiency. You should keep the degradation under control, and take caution in the usage of large open hangar which harms these stats to a large extent. The logic behind this is, without organisation, planes won't take off, thus rendering your effort on capacity completely useless.
 
 **Heavy Ship**
 
-You can't skip heavy ships in your fleet, such as battleships and battlecruisers. While screen ships escort capital ships, these heavy ships will escort carriers and boost their survivability by drawing attacks from aircrafts.  It's hard to summarize the key to this type of ship because it literally needs every aspect to be perfectly balanced. Among them, firepower could be the most irrelevant factor in battleship designs since their maximum HP is almost immortal compared to guns' heavy attack, but armor and AA are definitely needed to protect itself and other ships, especially carriers. In that case, a historical battleship is more than sufficient to fit in any taskforce in the mod.
+You can't skip heavy ships in your fleet, such as battleships and battlecruisers. While screen ships escort capital ships, these heavy ships will escort carriers and boost their survivability by drawing attacks from aircrafts. If one has to summarize the design of battleships, that will be "paradoxical". Let's take 3 factors into consideration, HP, cost, and strength. Since HP is deeply bounded with HP, a battleship needs as many guns as possible to boost its survivability and protect the fleet. However, that has raised another question, is it worthy in exchange for lower speed and incredible cost. As a result, I strongly recommend historical design with adequate guns and AAs for all your heavy ships.
 
-On the contrary, battlecruiser is not a good option despite its advantage of speed. Except a higher chance to receive critical hits, battlecruiser in 1936 is starting to show marginal utilities (positive effect from speed gradually reduces as you keep investing in it).
+On the contrary, battlecruiser is not a good option despite its advantage of speed. Except a higher chance to receive critical hits (50% more than battleship regardless of armor). In 1936, it has started to show marginal utilities (positive effect from speed gradually reduces as you keep investing in it).
 
-As for super heavy battleships, you can mount one gun on it to fully utilize its high HP, but normally it's not recommended.
+As for super heavy battleships, the notion of generic battleship still applies here. The only problem is always the cost.
 
 **Cruiser**
 
@@ -71,10 +75,14 @@ Unlike vanilla, the traditional definition of light or heavy cruiser has been re
 - Heavy capital cruiser is the same as heavy cruiser in basegame with a capital ship related role.
 - Heavy fleet cruiser is a screen ship version of heavy cruiser with medium guns and a screen ship related role.
 - Light cruiser is the same as its origin in basegame with light medium guns and a screen ship related role.
+and it prompts to 3 types of cruiser guns:
+- Heavy medium gun: for large cruiser exclusively, heavy attack oriented, firepower slightly inferior to WWI dreadnoughts
+- Medium gun: balanced between heavy and light attack, universal but not very effective to heavy ships (half penetration)
+- Light medium gun: light attack oriented, unable to pierce heavy armor, almost useless towards heavy ships (it can hit but only leave scratches)
 
 In VNR, heavy cruiser can play role of either cruiser killer (heavy fleet cruiser) or economical capital ship (heavy capital cruiser), it's more flexible and can perform actions in both capital line and screen line based on the role you give it.
 
-While light medium guns are similar to their origins, medium guns have bonus on HP and armor to simulate a linear relation between survivability and tonnage. As mentioned above, cruisers use light attack to eliminate screen ships and crush enemy's screen efficiency, creating a more favorable situation for your fleet to fire on the enemy. To achieve that, you need to pursue a fast and light-gun-centric design in order to keep up with destroyers and wipe out enemy's screen line as fast as you can.
+As mentioned above, cruisers use light attack to eliminate screen ships and crush enemy's screen efficiency, creating a more favorable situation for your fleet to fire on the enemy. To achieve that, you need to pursue a fast and light-gun-centric design in order to keep up with destroyers and wipe out enemy's screen line as fast as you can.
 
 Cruiser is not only used for attacking, but also some supporting jobs, such as reconnaissance, and sometimes it can be a luxurious option for anti-submarine and mine warfare. That's where the role system gonna help you fully dig out the potential. Radar picket cruiser is perfect for spotting enemy fleet. Colonial cruiser is cheaper, good supplement to colonial empire like UK and also a second best choice for minor countries. Then you have large cruiser and missile cruiser if there are sufficient IC power within your nation. The list goes on, but one thing for sure is that cruiser offers the most possibilities in all kinds of ships.
 
@@ -156,7 +164,7 @@ Battleship branch is actually quite flexible because you can drop it from anywhe
 
 **Carrier Branch**
 
-I can't stress more about the dominating power of carrier in reality and mod. Except for some early sub-techs which only offer little bonus, most carrier techs are extremely useful and will definitely give you an upper hand in the battle. My suggestion is to skip techs before 1932, and get all of them after that.
+I can't stress more about the dominating power of carrier in reality and mod. Most carrier techs are extremely useful or even mandatory, and will definitely give you an upper hand in the battle. My suggestion is to skip techs before 1932, and get all of them after that.
 
 **Submarine Branch**
 
@@ -210,11 +218,19 @@ Above all, the supremacy weight of each ship is calculated by a formula between
 
 To simulate carrier's capability to send over the horizon strikes, the duration of combat is made longer in the mod, but I still kept it under control so that other ships still hold a place in navy. Carrier can send air strikes every 2-3 hour (based on your sortie efficiency) in different squadron size (based on carrier traffic and some other factors). 20 hours after the battle begins, fleet will have a chance to retreat both automatically and manually. Only 22 hours into the battle, battleship gets to fire its first salvo, while light ships still have to wait to the 30th hour to fire.
 
+### Night Combat ###
+
+VNR expands experience of night combat by providing exclusive bonus or debuff at night. Torpedoes will turn the table at night with a 25% bonus on hit chance and 35% on penetration.
+
+### Retreat Process ###
+
+Retreating is made faster in VNR to simulate the quick disengagement in real naval war, leading to more frequent but indecisive battles. Of course, you can still have Midway kind of victory because of luck.
+
 ### Positioning ###
 
 Positioning is typically used to measure how successful the fleet formation is in real life, which is a very important element in the era of ship of line. In the game, it is a factor applied to screen efficiency. Bad positioning may lead to degradation of screen efficiency. In that case, the preferred screen ratio is no longer 1:1:2, you will need more ships to achieve max screen efficiency.
 
-Positioning is affected by several factors including relative size of fleet, speed, detection, etc. To achieve good positioning, make sure to have fast ships with good detection, and avoid maneuvering a super massive fleet around.
+Positioning is affected by several factors including relative size of fleet, speed, detection, etc. To achieve good positioning, make sure to have fast ships with good detection, and avoid maneuvering a super massive fleet around. Any fleets with more than 65 ships have a chance to get penalized for high relative size, which is -30% positioning with every doubling of ships than the other side, capped to -150%.
 
 ### Supply Consumption ###
 

src/events/00_navy_rework.txt

@@ -419,4 +419,74 @@ country_event = {
 		set_variable = { vnr_ai_production = 0 }
 		update_ai_production_bonus = yes
 	}
+}
+country_event = {
+	id = vnr_ai.2
+	title = vnr_ai.2.t
+	desc = vnr_ai.2.d
+	is_triggered_only = yes
+
+	option = {
+		#exprt
+		trigger = {
+			NOT = { has_global_flag = manual_enable_expert_ship }
+		}
+		name = vnr_ai.2.1
+		set_global_flag = manual_enable_expert_ship
+		hidden_effect = {
+			every_country = {
+				limit = { is_ai_naval_major = yes }
+				remove_ideas = vnr_ai_dd_output_boost_1
+				remove_ideas = vnr_ai_dd_output_boost_2
+				add_ideas = vnr_ai_dd_output_boost_2
+				navy_experience = 200
+			}
+		}
+	}
+	option = {
+		#historical
+		name = vnr_ai.2.2
+		clr_global_flag = manual_enable_expert_ship
+		hidden_effect = {
+			every_country = {
+				limit = { is_ai_naval_major = yes }
+				remove_ideas = vnr_ai_dd_output_boost_1
+				remove_ideas = vnr_ai_dd_output_boost_2
+				add_ideas = vnr_ai_dd_output_boost_1
+			}
+		}
+	}
+}
+country_event = {
+	id = vnr_ai.3
+	title = vnr_ai.3.t
+	desc = vnr_ai.3.d
+	is_triggered_only = yes
+
+	option = {
+		#exprt
+		trigger = {
+			NOT = { has_global_flag = manual_enable_expert_plane }
+		}
+		name = vnr_ai.3.1
+		set_global_flag = manual_enable_expert_plane
+		hidden_effect = {
+			every_country = {
+				limit = { is_ai_naval_major = yes }
+				add_ideas = vnr_cv_plane_output_boost
+				air_experience = 150
+			}
+		}
+	}
+	option = {
+		#historical
+		name = vnr_ai.3.2
+		clr_global_flag = manual_enable_expert_plane
+		hidden_effect = {
+			every_country = {
+				limit = { is_ai_naval_major = yes }
+				remove_ideas = vnr_cv_plane_output_boost
+			}
+		}
+	}
 }

src/events/ai_ships.txt

@@ -286,7 +286,37 @@ country_event = {
 	hidden = yes
 	fire_only_once = yes
 	trigger = {
-		date > 1939.1.1
+		OR = {
+			date > 1939.1.1
+			OR = {
+				AND = {
+					expert_ai_style = no
+					any_country = {
+						is_ai = no
+						count_triggers = {
+							amount = 2
+							has_tech = improved_ship_hull_heavy
+							has_tech = improved_ship_hull_light
+							has_tech = improved_ship_hull_cruiser
+							has_tech = improved_ship_hull_submarine
+						}
+					}
+				}
+				AND = {
+					expert_ai_style = yes
+					any_country = {
+						is_ai = no
+						count_triggers = {
+							amount = 1
+							has_tech = improved_ship_hull_heavy
+							has_tech = improved_ship_hull_light
+							has_tech = improved_ship_hull_cruiser
+							has_tech = improved_ship_hull_submarine
+						}
+					}
+				}
+			}
+		}
 		NOT = { has_global_flag = naval_tech_1940 }
 		has_game_rule = { rule = allow_ai_tech_auto_unlock option = FREE }
 	}
@@ -341,6 +371,7 @@ country_event = {
 					improved_ballast_tank = 1
 				}
 				ai_get_navy_experience = yes
+				ai_get_mio_upgrade = yes
 			}
 		}
 		set_global_flag = naval_tech_1940
@@ -353,7 +384,40 @@ country_event = {
 	hidden = yes
 	fire_only_once = yes
 	trigger = {
-		date > 1943.1.1
+		OR = {
+			date > 1943.1.1
+			OR = {
+				AND = {
+					expert_ai_style = no
+					any_country = {
+						is_ai = no
+						count_triggers = {
+							amount = 2
+							has_tech = advanced_ship_hull_carrier
+							has_tech = advanced_ship_hull_heavy
+							has_tech = advanced_ship_hull_cruiser
+							has_tech = advanced_ship_hull_light
+							has_tech = advanced_ship_hull_submarine
+						}
+					}
+				}
+				AND = {
+					expert_ai_style = yes
+					any_country = {
+						is_ai = no
+						count_triggers = {
+							amount = 1
+							has_tech = advanced_ship_hull_carrier
+							has_tech = advanced_ship_hull_heavy
+							has_tech = advanced_ship_hull_cruiser
+							has_tech = advanced_ship_hull_light
+							has_tech = advanced_ship_hull_submarine
+						}
+					}
+				}
+			}
+		}
+		
 		NOT = { has_global_flag = naval_tech_1943 }
 		has_game_rule = { rule = allow_ai_tech_auto_unlock option = FREE }
 	}
@@ -396,6 +460,7 @@ country_event = {
 					fire_control_methods_3 = 1
 				}
 				ai_get_navy_experience = yes
+				ai_get_mio_upgrade = yes
 			}
 		}
 		set_global_flag = naval_tech_1943
@@ -408,7 +473,14 @@ country_event = {
 	hidden = yes
 	fire_only_once = yes
 	trigger = {
-		date > 1944.6.1
+		OR = {
+			has_global_flag = {
+				flag = naval_tech_1943
+				value > 0
+				days > 545
+			}
+			has_global_flag = naval_tech_1949
+		}
 		NOT = { has_global_flag = naval_tech_1944 }
 		has_game_rule = { rule = allow_ai_tech_auto_unlock option = FREE }
 	}
@@ -428,6 +500,7 @@ country_event = {
 					full_armored_carrier = 1
 				}
 				ai_get_navy_experience = yes
+				ai_get_mio_upgrade = yes
 			}
 		}
 		set_global_flag = naval_tech_1944
@@ -440,7 +513,10 @@ country_event = {
 	hidden = yes
 	fire_only_once = yes
 	trigger = {
-		date > 1946.1.1
+		OR = {
+			date > 1946.1.1
+			has_global_flag = naval_tech_1949
+		}
 		NOT = { has_global_flag = naval_tech_1945 }
 		has_game_rule = { rule = allow_ai_tech_auto_unlock option = FREE }
 	}
@@ -462,6 +538,7 @@ country_event = {
 					carrier_angled_deck = 1
 				}
 				ai_get_navy_experience = yes
+				ai_get_mio_upgrade = yes
 			}
 		}
 		set_global_flag = naval_tech_1945
@@ -474,7 +551,37 @@ country_event = {
 	hidden = yes
 	fire_only_once = yes
 	trigger = {
-		date > 1949.1.1
+		OR = {
+			date > 1949.1.1
+			OR = {
+				AND = {
+					expert_ai_style = no
+					any_country = {
+						is_ai = no
+						count_triggers = {
+							amount = 2
+							has_tech = modern_ship_hull_light
+							has_tech = modern_ship_hull_cruiser
+							has_tech = modern_ship_hull_submarine
+							has_tech = super_carriers
+						}
+					}
+				}
+				AND = {
+					expert_ai_style = yes
+					any_country = {
+						is_ai = no
+						count_triggers = {
+							amount = 1
+							has_tech = modern_ship_hull_light
+							has_tech = modern_ship_hull_cruiser
+							has_tech = modern_ship_hull_submarine
+							has_tech = super_carriers
+						}
+					}
+				}
+			}
+		}
 		NOT = { has_global_flag = naval_tech_1949 }
 		has_game_rule = { rule = allow_ai_tech_auto_unlock option = FREE }
 	}
@@ -502,6 +609,7 @@ country_event = {
 					super_carriers = 1
 				}
 				ai_get_navy_experience = yes
+				ai_get_mio_upgrade = yes
 			}
 		}
 		set_global_flag = naval_tech_1949
@@ -514,7 +622,11 @@ country_event = {
 	hidden = yes
 	fire_only_once = yes
 	trigger = {
-		date > 1952.1.1
+		has_global_flag = {
+			flag = naval_tech_1949
+			value > 1
+			days > 1095
+		}
 		NOT = { has_global_flag = naval_tech_1952 }
 		has_game_rule = { rule = allow_ai_tech_auto_unlock option = FREE }
 	}
@@ -548,6 +660,7 @@ country_event = {
 					advanced_missile_system = 1
 				}
 				ai_get_navy_experience = yes
+				ai_get_mio_upgrade = yes
 			}
 		}
 		set_global_flag = naval_tech_1952
@@ -562,7 +675,7 @@ country_event = {
 	trigger = {
 		date > 1936.1.1
 		NOT = { has_global_flag = cv_air_tech_1936 }
-		has_game_rule = { rule = vnr_cv_air_ai option = FREE }
+		expert_ai_plane = yes
 	}
 	immediate = {
 		for_each_scope_loop = {
@@ -589,7 +702,7 @@ country_event = {
 	trigger = {
 		date > 1939.1.1
 		NOT = { has_global_flag = cv_air_tech_1939 }
-		has_game_rule = { rule = vnr_cv_air_ai option = FREE }
+		expert_ai_plane = yes
 	}
 	immediate = {
 		for_each_scope_loop = {
@@ -618,7 +731,7 @@ country_event = {
 	trigger = {
 		date > 1944.1.1
 		NOT = { has_global_flag = cv_air_tech_1944 }
-		has_game_rule = { rule = vnr_cv_air_ai option = FREE }
+		expert_ai_plane = yes
 	}
 	immediate = {
 		for_each_scope_loop = {
@@ -643,7 +756,15 @@ country_event = {
 	hidden = yes
 	fire_only_once = yes
 	trigger = {
-		date > 1940.6.1
+		OR = {
+			has_global_flag = {
+				flag = naval_tech_1940
+				value > 0
+				days > 545
+			}
+			has_global_flag = naval_tech_1943
+		}
+		
 		NOT = { has_global_flag = naval_tech_1941 }
 		has_game_rule = { rule = allow_ai_tech_auto_unlock option = FREE }
 	}
@@ -666,6 +787,7 @@ country_event = {
 					escort_carriers_ship = 1
 				}
 				ai_get_navy_experience = yes
+				ai_get_mio_upgrade = yes
 			}
 		}
 		set_global_flag = naval_tech_1941

src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt

@@ -283,6 +283,7 @@ ENG = {
             icons = {
                 "gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -302,6 +303,7 @@ ENG = {
 				GFX_ENG_vnr_ship_hull_heavy_1_medium
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -319,10 +321,11 @@ ENG = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
             }
         }
 
@@ -340,11 +343,12 @@ ENG = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
             }
         }
 
@@ -362,12 +366,13 @@ ENG = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
-				GFX_ENG_vnr_ship_hull_heavy_4_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
+				GFX_ENG_vnr_ship_hull_heavy_4_medium
             }
         }
 
@@ -899,6 +904,7 @@ CAN = {
             icons = {
                 "gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -918,6 +924,7 @@ CAN = {
 				GFX_ENG_vnr_ship_hull_heavy_1_medium
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -935,10 +942,11 @@ CAN = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
             }
         }
 
@@ -956,11 +964,12 @@ CAN = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
             }
         }
 
@@ -978,12 +987,13 @@ CAN = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
-				GFX_ENG_vnr_ship_hull_heavy_4_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
+				GFX_ENG_vnr_ship_hull_heavy_4_medium
             }
         }
 
@@ -1229,7 +1239,6 @@ CAN = {
 
 }
 
-
 RAJ = {
 
     vnr_ship_hull_light_1 = {
@@ -1515,6 +1524,7 @@ RAJ = {
             icons = {
                 "gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -1534,6 +1544,7 @@ RAJ = {
 				GFX_ENG_vnr_ship_hull_heavy_1_medium
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -1551,10 +1562,11 @@ RAJ = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
             }
         }
 
@@ -1572,11 +1584,12 @@ RAJ = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
             }
         }
 
@@ -1594,12 +1607,13 @@ RAJ = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
-				GFX_ENG_vnr_ship_hull_heavy_4_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
+				GFX_ENG_vnr_ship_hull_heavy_4_medium
             }
         }
 
@@ -1845,7 +1859,6 @@ RAJ = {
 
 }
 
-
 SAF = {
 
     vnr_ship_hull_light_1 = {
@@ -2131,6 +2144,7 @@ SAF = {
             icons = {
                 "gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -2150,6 +2164,7 @@ SAF = {
 				GFX_ENG_vnr_ship_hull_heavy_1_medium
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -2167,10 +2182,11 @@ SAF = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
             }
         }
 
@@ -2188,11 +2204,12 @@ SAF = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
             }
         }
 
@@ -2210,12 +2227,13 @@ SAF = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
-				GFX_ENG_vnr_ship_hull_heavy_4_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
+				GFX_ENG_vnr_ship_hull_heavy_4_medium
             }
         }
 
@@ -2461,7 +2479,6 @@ SAF = {
 
 }
 
-
 AST = {
 
     vnr_ship_hull_light_1 = {
@@ -2747,6 +2764,7 @@ AST = {
             icons = {
                 "gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -2766,6 +2784,7 @@ AST = {
 				GFX_ENG_vnr_ship_hull_heavy_1_medium
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -2783,10 +2802,11 @@ AST = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
             }
         }
 
@@ -2804,11 +2824,12 @@ AST = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
             }
         }
 
@@ -2826,12 +2847,13 @@ AST = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
-				GFX_ENG_vnr_ship_hull_heavy_4_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
+				GFX_ENG_vnr_ship_hull_heavy_4_medium
             }
         }
 
@@ -3077,7 +3099,6 @@ AST = {
 
 }
 
-
 NZL = {
 
     vnr_ship_hull_light_1 = {
@@ -3363,6 +3384,7 @@ NZL = {
             icons = {
                 "gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -3382,6 +3404,7 @@ NZL = {
 				GFX_ENG_vnr_ship_hull_heavy_1_medium
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -3399,10 +3422,11 @@ NZL = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
             }
         }
 
@@ -3420,11 +3444,12 @@ NZL = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
             }
         }
 
@@ -3442,12 +3467,13 @@ NZL = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
-				GFX_ENG_vnr_ship_hull_heavy_4_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
+				GFX_ENG_vnr_ship_hull_heavy_4_medium
             }
         }
 
@@ -3693,7 +3719,6 @@ NZL = {
 
 }
 
-
 MAL = {
 
     vnr_ship_hull_light_1 = {
@@ -3979,6 +4004,7 @@ MAL = {
             icons = {
                 "gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -3998,6 +4024,7 @@ MAL = {
 				GFX_ENG_vnr_ship_hull_heavy_1_medium
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
             }
         }
 
@@ -4015,10 +4042,11 @@ MAL = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
             }
         }
 
@@ -4036,11 +4064,12 @@ MAL = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
             }
         }
 
@@ -4058,12 +4087,13 @@ MAL = {
             icons = {
                 GFX_ENG_vnr_ship_hull_super_heavy_1_medium
                 GFX_ENG_vnr_ship_hull_heavy_1_medium
-				GFX_ENG_vnr_ship_hull_heavy_2_medium
-				GFX_ENG_vnr_ship_hull_heavy_3_medium
-				GFX_ENG_vnr_ship_hull_heavy_4_medium
 				"gfx/interface/technologies/England/ENG_battleship_Admiral.png"
 				"gfx/interface/technologies/England/ENG_battleship_Renown.png"
 				"gfx/interface/technologies/England/ENG_battleship_Revenge.png"
+				"gfx/interface/technologies/extra/ENG_battleship_Queen.png"
+				GFX_ENG_vnr_ship_hull_heavy_2_medium
+				GFX_ENG_vnr_ship_hull_heavy_3_medium
+				GFX_ENG_vnr_ship_hull_heavy_4_medium
             }
         }
 

src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt

@@ -10,6 +10,13 @@ GER = {
             }
         }
 
+        pool = {
+            icons = {
+                "gfx/interface/technologies/Fun/GER_destroyer_G7.png"
+                "gfx/interface/technologies/Fun/GER_destroyer_V25.png"
+            }
+        }
+
     }
 
     vnr_ship_hull_light_2 = {
@@ -22,6 +29,8 @@ GER = {
 
         pool = {
             icons = {
+                "gfx/interface/technologies/Fun/GER_destroyer_G7.png"
+                "gfx/interface/technologies/Fun/GER_destroyer_V25.png"
                 GFX_GER_vnr_ship_hull_light_1_medium
             }
         }
@@ -38,6 +47,8 @@ GER = {
 
         pool = {
             icons = {
+                "gfx/interface/technologies/Fun/GER_destroyer_G7.png"
+                "gfx/interface/technologies/Fun/GER_destroyer_V25.png"
                 GFX_GER_vnr_ship_hull_light_1_medium
 				GFX_GER_vnr_ship_hull_light_2_medium
             }
@@ -55,6 +66,8 @@ GER = {
 
         pool = {
             icons = {
+                "gfx/interface/technologies/Fun/GER_destroyer_G7.png"
+                "gfx/interface/technologies/Fun/GER_destroyer_V25.png"
                 GFX_GER_vnr_ship_hull_light_1_medium
 				GFX_GER_vnr_ship_hull_light_2_medium
 				GFX_GER_vnr_ship_hull_light_3_medium
@@ -73,6 +86,8 @@ GER = {
 
         pool = {
             icons = {
+                "gfx/interface/technologies/Fun/GER_destroyer_G7.png"
+                "gfx/interface/technologies/Fun/GER_destroyer_V25.png"
                 GFX_GER_vnr_ship_hull_light_1_medium
 				GFX_GER_vnr_ship_hull_light_2_medium
 				GFX_GER_vnr_ship_hull_light_3_medium
@@ -92,6 +107,8 @@ GER = {
 
         pool = {
             icons = {
+                "gfx/interface/technologies/Fun/GER_destroyer_G7.png"
+                "gfx/interface/technologies/Fun/GER_destroyer_V25.png"
                 GFX_GER_vnr_ship_hull_light_1_medium
 				GFX_GER_vnr_ship_hull_light_2_medium
 				GFX_GER_vnr_ship_hull_light_3_medium

src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt

@@ -407,6 +407,7 @@ JAP = {
 				"gfx/interface/technologies/Japan/JAP_battleship_Ise.png"
 				"gfx/interface/technologies/Japan/JAP_battleship_Kongo.png"
 				"gfx/interface/technologies/extra/JAP_battleship_A140.png"
+				"gfx/interface/technologies/extra/JAP_battleship_Yamato_1965.png"
             }
         }
 
@@ -430,6 +431,12 @@ JAP = {
             }
         }
 
+		pool = {
+			icons = {
+				"gfx/interface/technologies/extra/JAP_battleship_Yamato_1965.png"
+			}
+		}
+
     }
 
     vnr_ship_hull_carrier_conversion_ca = {

src/gfx/interface/equipmentdesigner/graphic_db/02_south_europe_ship_icons.txt

@@ -300,6 +300,7 @@ ITA = {
 
         pool = {
             icons = {
+				"gfx/interface/technologies/Italy/ITA_battleship_Andrea_1926.png"
                 "gfx/interface/technologies/Italy/ITA_battleship_Andrea.png"
             }
         }
@@ -318,6 +319,7 @@ ITA = {
             icons = {
                 GFX_ITA_vnr_ship_hull_super_heavy_1_medium
                 GFX_ITA_vnr_ship_hull_heavy_1_medium
+				"gfx/interface/technologies/Italy/ITA_battleship_Andrea_1926.png"
 				"gfx/interface/technologies/Italy/ITA_battleship_Andrea.png"
             }
         }
@@ -336,8 +338,9 @@ ITA = {
             icons = {
                 GFX_ITA_vnr_ship_hull_super_heavy_1_medium
                 GFX_ITA_vnr_ship_hull_heavy_1_medium
-				GFX_ITA_vnr_ship_hull_heavy_2_medium
+				"gfx/interface/technologies/Italy/ITA_battleship_Andrea_1926.png"
 				"gfx/interface/technologies/Italy/ITA_battleship_Andrea.png"
+				GFX_ITA_vnr_ship_hull_heavy_2_medium
             }
         }
 
@@ -355,9 +358,10 @@ ITA = {
             icons = {
                 GFX_ITA_vnr_ship_hull_super_heavy_1_medium
                 GFX_ITA_vnr_ship_hull_heavy_1_medium
+				"gfx/interface/technologies/Italy/ITA_battleship_Andrea_1926.png"
+				"gfx/interface/technologies/Italy/ITA_battleship_Andrea.png"
 				GFX_ITA_vnr_ship_hull_heavy_2_medium
 				GFX_ITA_vnr_ship_hull_heavy_3_medium
-				"gfx/interface/technologies/Italy/ITA_battleship_Andrea.png"
             }
         }
 
@@ -375,10 +379,11 @@ ITA = {
             icons = {
                 GFX_ITA_vnr_ship_hull_super_heavy_1_medium
                 GFX_ITA_vnr_ship_hull_heavy_1_medium
+				"gfx/interface/technologies/Italy/ITA_battleship_Andrea_1926.png"
+				"gfx/interface/technologies/Italy/ITA_battleship_Andrea.png"
 				GFX_ITA_vnr_ship_hull_heavy_2_medium
 				GFX_ITA_vnr_ship_hull_heavy_3_medium
 				GFX_ITA_vnr_ship_hull_heavy_4_medium
-				"gfx/interface/technologies/Italy/ITA_battleship_Andrea.png"
             }
         }
 

src/gfx/interface/equipmentdesigner/graphic_db/02_west_europe_ship_icons.txt

@@ -240,6 +240,7 @@ FRA = {
 				"gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png"
 				"gfx/interface/technologies/France/FRA_light_cruiser_Jeanne.png"
 				"gfx/interface/technologies/France/FRA_light_cruiser_Pluton.png"
+				"gfx/interface/technologies/extra/FRA_light_cruiser_Colbert.png"
             }
         }