2025-09-22 04:02:43

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_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 = BFL
 		}
 	}
-	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 = CHY
 		has_war_with = SAD
 		ITA = { has_navy_size = { size > 99 } }
+		war_length_with = {
+			tag = CHY
+			months < 24
+		}
         enable_vnr_naval_ai = yes
     }
     abort_when_not_enabled = yes
@@ -100,6 +104,13 @@ ENG_reinforce_pacific = {
     }
     enable = {
         has_war_with = CHY
+		OR = {
+			war_length_with = {
+				tag = CHY
+				months > 23
+			}
+			NOT = { has_war_with = SAD }
+		}
 		OR = {
 			NOT = { has_war_with = SAD }
 			ITA = { has_navy_size = { size < 100 } }

src/common/ideas/vnr_navy_spirits.txt

@@ -20,8 +20,7 @@ ideas = {
             ledger = navy
             visible = { original_tag = BYG }
             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 = BFL
+                    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 = BFL
+                    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/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_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 = HUJ
+		tag = YUW
+		tag = TIX
+		tag = SAD
+		tag = CHY
+		tag = BFL
+		tag = BYG
+	}
+}
+
+expert_ai_plane = {
+	OR = {
+		has_game_rule = { rule = vnr_cv_air_ai option = FREE }
+		has_global_flag = manual_enable_expert_plane
+	}
 	OR = {
 		tag = HUJ
 		tag = YUW
@@ -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 = HUJ
+		tag = YUW
+		tag = TIX
+		tag = SAD
+		tag = CHY
+		tag = BFL
+		tag = BYG
+	}
+	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/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