2025-12-22 04:02:10

2025-12-22 04:02:10 +00:00
parent 7fb4a0ce42
commit 9fd43ac081
19 changed files with 686 additions and 672 deletions
--- a/src/common/ai_equipment/vnr_battleships.txt
+++ b/src/common/ai_equipment/vnr_battleships.txt
@@ -10,7 +10,7 @@ naval_capital_battleship = {
 		role_icon_index = 3

 		priority = {
-			base = 10
+			base = 0
 			modifier = { factor = 0.1 has_tech = interwar_ship_hull_heavy }
 			modifier = { factor = 0 expert_ai_style = yes }
 		}
--- a/src/common/ai_navy/taskforce/ENG_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/ENG_taskforce_templates.txt
@@ -3,7 +3,7 @@ ENG_StrikeForce_1 = {
 		original_tag = HUJ 
 	}
 	ai_will_do = {
-		factor = 1
+		factor = 20
 	}	
 	mission = { naval_strike }
 	min_composition = {
@@ -17,16 +17,16 @@ ENG_StrikeForce_1 = {
 	
 	optimal_composition = {
 		carrier = {
-			amount = 6
+			amount = 4
 		}
 		battleship = {
-			amount = 8
+			amount = 6
 		}
 		light_cruiser = {
-			amount = 14
+			amount = 10
 		}
 		destroyer = {
-			amount = 24
+			amount = 16
 		}
 	}
 }
@@ -88,7 +88,7 @@ ENG_PatrolDominanceForce_2 = {
 		original_tag = HUJ
 	}
 	ai_will_do = {
-		factor = 5
+		factor = 3
 	}	
 	mission = { naval_patrol }
 	min_composition = {
@@ -107,10 +107,10 @@ ENG_PatrolDominanceForce_2 = {
 			amount = 2
 		}
 		light_cruiser = {
-			amount = 3
+			amount = 2
 		}
 		destroyer = {
-			amount = 10
+			amount = 8
 		}
 	}
 }
@@ -142,7 +142,7 @@ ENG_PatrolDominanceForce_3 = {
 			amount = 3
 		}
 		destroyer = {
-			amount = 10
+			amount = 8
 		}
 	}
 }
@@ -152,7 +152,7 @@ ENG_ConvoyRaiding_1 = {
 		original_tag = HUJ
 	}
 	ai_will_do = {
-		factor = 1
+		factor = 5
 	}	
 	mission = { convoy_raiding }
 	min_composition = {
@@ -184,7 +184,7 @@ ENG_ConvoyEscort_1 = {
 	
 	optimal_composition = {
 		destroyer = {
-			amount = 10
+			amount = 8
 		}
 	}
 }
--- a/src/common/ai_navy/taskforce/FRA_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/FRA_taskforce_templates.txt
@@ -26,7 +26,7 @@ FRA_StrikeForce_1 = {
 			amount = 10
 		}
 		destroyer = {
-			amount = 22
+			amount = 15

 		}
 	}
@@ -80,7 +80,7 @@ FRA_PatrolDominanceForce_1 = {
 			amount = 4
 		}
 		destroyer = {
-			amount = 12
+			amount = 8
 		}
 	}
 }
@@ -113,7 +113,7 @@ FRA_PatrolDominanceForce_2 = {
 			amount = 4
 		}
 		destroyer = {
-			amount = 12
+			amount = 8
 		}
 	}
 }
--- a/src/common/ai_navy/taskforce/GER_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/GER_taskforce_templates.txt
@@ -3,7 +3,7 @@ GER_StrikeForce_1 = {
 		original_tag = TIX
 	}
 	ai_will_do = {
-		factor = 1
+		factor = 5
 	}	
 	mission = { naval_strike }
 	min_composition = {
@@ -26,7 +26,7 @@ GER_StrikeForce_1 = {
 			amount = 4
 		}
 		destroyer = {
-			amount = 22
+			amount = 14
 		}
 	}
 }
@@ -56,7 +56,7 @@ GER_StrikeForceCarrier_1 = {
 			amount = 10
 		}
 		destroyer = {
-			amount = 20
+			amount = 14
 		}
 	}
 }
@@ -169,7 +169,7 @@ GER_ConvoyEscort_1 = {
 	
 	optimal_composition = {
 		destroyer = {
-			amount = 10
+			amount = 6
 		}
 	}
 }
--- a/src/common/ai_navy/taskforce/ITA_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/ITA_taskforce_templates.txt
@@ -23,7 +23,7 @@ ITA_StrikeForce_1 = {
 			amount = 4
 		}
 		destroyer = {
-			amount = 28
+			amount = 15
 		}
 	}
 }
@@ -52,7 +52,7 @@ ITA_StrikeForceCarrier_1 = {
 			amount = 10
 		}
 		destroyer = {
-			amount = 20
+			amount = 14
 		}
 	}
 }
@@ -105,7 +105,7 @@ ITA_PatrolDominanceForce_1 = {
 			amount = 4
 		}
 		destroyer = {
-			amount = 12
+			amount = 8
 		}
 	}
 }
@@ -167,7 +167,7 @@ ITA_ConvoyEscort_1 = {
 	
 	optimal_composition = {
 		destroyer = {
-			amount = 10
+			amount = 6
 		}
 	}
 }
--- a/src/common/ai_navy/taskforce/JAP_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/JAP_taskforce_templates.txt
@@ -17,16 +17,16 @@ JAP_StrikeForce_1 = {
 	
 	optimal_composition = {
 		carrier = {
-			amount = 6
+			amount = 4
 		}
 		battleship = {
-			amount = 8
+			amount = 6
 		}
 		light_cruiser = {
-			amount = 14
+			amount = 10
 		}
 		destroyer = {
-			amount = 25
+			amount = 16
 		}
 	}
 }
@@ -112,7 +112,7 @@ JAP_PatrolDominanceForce_2 = {
 			amount = 2
 		}
 		destroyer = {
-			amount = 10
+			amount = 8
 		}
 	}
 }
@@ -144,6 +144,46 @@ JAP_PatrolDominanceForce_3 = {
 		light_cruiser = {
 			amount = 4
 		}
+		destroyer = {
+			amount = 8
+		}
+	}
+}
+
+JAP_PatrolDominanceForce_4 = {
+	allowed = {
+		original_tag = CHY
+	}
+	ai_will_do = {
+		factor = 0
+		modifier = {
+			add = 3
+			has_navy_size = {
+				unit = SH_battleship
+				size > 0
+			}
+		}
+	}
+	mission = { naval_patrol }
+	min_composition = {
+		light_cruiser = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 6
+		}
+	}
+
+	optimal_composition = {
+		SH_battleship = {
+			amount = 2
+		}
+		medium_cruiser = {
+			amount = 2
+		}
+		light_cruiser = {
+			amount = 4
+		}
 		destroyer = {
 			amount = 10
 		}
@@ -187,7 +227,7 @@ JAP_ConvoyEscort_1 = {
 	
 	optimal_composition = {
 		destroyer = {
-			amount = 10
+			amount = 8
 		}
 	}
 }
--- a/src/common/ai_navy/taskforce/SOV_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/SOV_taskforce_templates.txt
@@ -15,6 +15,36 @@ SOV_StrikeForce_1 = {
 		}
 	}
 	
+	optimal_composition = {
+		battleship = {
+			amount = 4
+		}
+		light_cruiser = {
+			amount = 10
+		}
+		destroyer = {
+			amount = 16
+		}
+	}
+}
+
+SOV_StrikeForceCarrier_1 = {
+	allowed = {
+		original_tag = BFL
+	}
+	ai_will_do = {
+		factor = 1
+	}	
+	mission = { naval_strike }
+	min_composition = {
+		battleship = {
+			amount = 2
+		}
+		destroyer = {
+			amount = 8
+		}
+	}
+	
 	optimal_composition = {
 		carrier = {
 			amount = 4
@@ -26,8 +56,7 @@ SOV_StrikeForce_1 = {
 			amount = 10
 		}
 		destroyer = {
-			amount = 25
-
+			amount = 16
 		}
 	}
 }
@@ -88,6 +117,13 @@ SOV_PatrolDominanceForce_2 = {
 	}
 	ai_will_do = {
 		factor = 3
+		modifier = {
+			factor = 0
+			has_navy_size = {
+				unit = heavy_cruiser
+				size < 1
+			}
+		}
 	}	
 	mission = { naval_patrol }
 	min_composition = {
--- a/src/common/ai_navy/taskforce/USA_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/USA_taskforce_templates.txt
@@ -17,16 +17,16 @@ USA_StrikeForce_1 = {
 	
 	optimal_composition = {
 		carrier = {
-			amount = 6
+			amount = 4
 		}
 		battleship = {
-			amount = 8
+			amount = 6
 		}
 		light_cruiser = {
-			amount = 14
+			amount = 10
 		}
 		destroyer = {
-			amount = 20
+			amount = 18
 		}
 	}
 }
@@ -112,7 +112,7 @@ USA_PatrolDominanceForce_2 = {
 			amount = 4
 		}
 		destroyer = {
-			amount = 10
+			amount = 8
 		}
 	}
 }
--- a/src/common/ai_navy/taskforce/generic_taskforce_templates.txt
+++ b/src/common/ai_navy/taskforce/generic_taskforce_templates.txt
@@ -34,7 +34,7 @@ StrikeForce_1 = {
 			amount = 4
 		}
 		destroyer = {
-			amount = 28
+			amount = 15
 		}
 	}
 }
--- a/src/common/ai_strategy/naval_production.txt
+++ b/src/common/ai_strategy/naval_production.txt
@@ -3,7 +3,6 @@
 #You don't have to set all roles, not setting role == 0 or <0 value
 # naval_unit_role_ratios_XXX = {
 # 	allowed = {
-# 		has_dlc = "Man the Guns"
 # 		tag = XXX
 # 	}

@@ -77,7 +76,6 @@
 ##### MTG strategies ####
 no_old_navy_production = {
 	enable = {
-		has_dlc = "Man the Guns"
 		has_navy_size = { size > 0 }
 	}
 	abort_when_not_enabled = yes
@@ -151,7 +149,6 @@ no_old_navy_production = {
 ### Minors ###
 naval_unit_role_ratios_minors_coastal = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		NOT = {
 			tag = HUJ
 			tag = CHY
@@ -183,7 +180,6 @@ naval_unit_role_ratios_minors_coastal = {

 naval_unit_role_ratios_minors_defensive = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		NOT = {
 			tag = HUJ
 			tag = CHY
@@ -227,7 +223,6 @@ naval_unit_role_ratios_minors_defensive = {

 naval_unit_role_ratios_minors_offensive = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		NOT = {
 			tag = HUJ
 			tag = CHY
@@ -277,7 +272,6 @@ naval_unit_role_ratios_minors_offensive = {

 naval_unit_role_ratios_minors_global = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		NOT = {
 			tag = HUJ
 			tag = CHY
@@ -335,7 +329,6 @@ naval_unit_role_ratios_minors_global = {

 naval_unit_role_ratios_GER_prewar_early = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = TIX
 	}
 	enable = {
@@ -383,7 +376,6 @@ naval_unit_role_ratios_GER_prewar_early = {

 naval_unit_role_ratios_GER_prewar_late = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = TIX
 	}
 	enable = {
@@ -432,7 +424,6 @@ naval_unit_role_ratios_GER_prewar_late = {

 naval_unit_role_ratios_GER_atwar = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = TIX
 	}
 	enable = {
@@ -474,7 +465,6 @@ naval_unit_role_ratios_GER_atwar = {

 naval_unit_role_ratios_GER_atwar_many_shipyard = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = TIX
 	}
 	enable = {
@@ -522,7 +512,6 @@ naval_unit_role_ratios_GER_atwar_many_shipyard = {

 naval_unit_role_ratios_GER_atwar_knock_USA = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = TIX
 	}
 	enable = {
@@ -577,7 +566,6 @@ naval_unit_role_ratios_GER_atwar_knock_USA = {

 naval_unit_role_ratios_GER_atwar_No_Naval_Competitor = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = TIX
 	}
 	enable = {
@@ -633,7 +621,6 @@ naval_unit_role_ratios_GER_atwar_No_Naval_Competitor = {

 naval_unit_role_ratios_GER_late_peace = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = TIX
 	}
 	enable = {
@@ -688,7 +675,6 @@ naval_unit_role_ratios_GER_late_peace = {

 naval_unit_role_ratios_ENG_prewar_early = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = HUJ
 	}
 	enable = {
@@ -717,7 +703,7 @@ naval_unit_role_ratios_ENG_prewar_early = {

 	ai_strategy = {
 		type = role_ratio
-		id = vnr_naval_screen_leader
+		id = vnr_naval_capital_bb
 		value = 10
 	}

@@ -740,7 +726,6 @@ naval_unit_role_ratios_ENG_prewar_early = {

 naval_unit_role_ratios_ENG_prewar_late = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = HUJ
 	}
 	enable = {
@@ -753,7 +738,7 @@ naval_unit_role_ratios_ENG_prewar_late = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_capital_bb
-		value = 100
+		value = 80
 	}

 	ai_strategy = {
@@ -771,7 +756,7 @@ naval_unit_role_ratios_ENG_prewar_late = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_screen
-		value = 250
+		value = 350
 	}

 	ai_strategy = {
@@ -794,7 +779,6 @@ naval_unit_role_ratios_ENG_prewar_late = {

 naval_unit_role_ratios_ENG_atwar = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = HUJ
 	}
 	enable = {
@@ -817,7 +801,7 @@ naval_unit_role_ratios_ENG_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_screen
-		value = 300
+		value = 450
 	}

 	ai_strategy = {
@@ -846,7 +830,6 @@ naval_unit_role_ratios_ENG_atwar = {

 naval_unit_role_ratios_ENG_late_peace = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = HUJ
 	}
 	enable = {
@@ -884,7 +867,6 @@ naval_unit_role_ratios_ENG_late_peace = {

 naval_unit_role_ratios_FRA_prewar = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = YUW
 	}
 	enable = {
@@ -927,7 +909,6 @@ naval_unit_role_ratios_FRA_prewar = {

 naval_unit_role_ratios_FRA_atwar = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = YUW
 	}
 	enable = {
@@ -969,7 +950,6 @@ naval_unit_role_ratios_FRA_atwar = {

 naval_unit_role_ratios_FRA_atwar_without_germany = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = YUW
 	}
 	enable = {
@@ -1012,7 +992,6 @@ naval_unit_role_ratios_FRA_atwar_without_germany = {

 naval_unit_role_ratios_FRA_late_peace = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = YUW
 	}
 	enable = {
@@ -1063,7 +1042,6 @@ naval_unit_role_ratios_FRA_late_peace = {

 naval_unit_role_ratios_SOV_need_to_watch_germany_peace = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = BFL
 	}
 	enable = {
@@ -1097,7 +1075,6 @@ naval_unit_role_ratios_SOV_need_to_watch_germany_peace = {

 naval_unit_role_ratios_SOV_no_need_to_watch_germany_peace = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = BFL
 	}
 	enable = {
@@ -1148,7 +1125,6 @@ naval_unit_role_ratios_SOV_no_need_to_watch_germany_peace = {

 naval_unit_role_ratios_SOV_atwar_with_Germany = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = BFL
 	}
 	enable = {
@@ -1190,7 +1166,6 @@ naval_unit_role_ratios_SOV_atwar_with_Germany = {

 naval_unit_role_ratios_SOV_atwar_with_major = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = BFL
 	}
 	enable = {
@@ -1239,7 +1214,6 @@ naval_unit_role_ratios_SOV_atwar_with_major = {

 naval_unit_role_ratios_JAP_prewar_naval_treaty = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = CHY
 	}
 	enable = {
@@ -1288,7 +1262,6 @@ naval_unit_role_ratios_JAP_prewar_naval_treaty = {

 naval_unit_role_ratios_JAP_prewar_enough_carrier = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = CHY
 	}
 	enable = {
@@ -1341,7 +1314,6 @@ naval_unit_role_ratios_JAP_prewar_enough_carrier = {

 naval_unit_role_ratios_JAP_atwar = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = CHY
 	}
 	enable = {
@@ -1391,7 +1363,6 @@ naval_unit_role_ratios_JAP_atwar = {

 naval_unit_role_ratios_JAP_late_peace = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = CHY
 	}
 	enable = {
@@ -1451,7 +1422,6 @@ naval_unit_role_ratios_JAP_late_peace = {

 naval_unit_role_ratios_USA_great_depression = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = BYG
 	}
 	enable = {
@@ -1499,7 +1469,6 @@ naval_unit_role_ratios_USA_great_depression = {

 naval_unit_role_ratios_USA_go_to_war = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = BYG
 	}
 	enable = {
@@ -1516,7 +1485,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_screen
-		value = 250
+		value = 300
 	}
 	
 	ai_strategy = {
@@ -1546,7 +1515,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = building_target
 		id = dockyard
-		value = 50
+		value = 75
 	}
 	ai_strategy = {
 		type = building_target
@@ -1557,7 +1526,6 @@ naval_unit_role_ratios_USA_go_to_war = {

 naval_unit_role_ratios_USA_atwar = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = BYG
 	}
 	enable = {
@@ -1573,12 +1541,12 @@ naval_unit_role_ratios_USA_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_screen
-		value = 350
+		value = 600
 	}
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
-		value = 200
+		value = 250
 	}
 	ai_strategy = {
 		type = role_ratio
@@ -1601,18 +1569,37 @@ naval_unit_role_ratios_USA_atwar = {
 	ai_strategy = {
 		type = building_target
 		id = dockyard
-		value = 100
+		value = 125
 	}
 	ai_strategy = {
 		type = building_target
 		id = arms_factory
 		value = 300
 	}
+	ai_strategy = {
+		type = build_ship
+		id = capital_ship
+		value = 100
+	}
+	ai_strategy = {
+		type = build_ship
+		id = carrier
+		value = 100
+	}
+	ai_strategy = {
+		type = build_ship
+		id = submarine
+		value = 100
+	}
+	ai_strategy = {
+		type = build_ship
+		id = screen_ship
+		value = 100
+	}
 }

 naval_unit_role_ratios_ITA_prewar_build_battleships = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = SAD
 	}
 	enable = {
@@ -1657,7 +1644,6 @@ naval_unit_role_ratios_ITA_prewar_build_battleships = {

 naval_unit_role_ratios_ITA_prewar_enough_battleships = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = SAD
 	}
 	enable = {
@@ -1707,7 +1693,6 @@ naval_unit_role_ratios_ITA_prewar_enough_battleships = {

 naval_unit_role_ratios_ITA_atwar_with_England = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = SAD
 	}
 	enable = {
@@ -1754,7 +1739,6 @@ naval_unit_role_ratios_ITA_atwar_with_England = {

 naval_unit_role_ratios_ITA_atwar_with_major = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = SAD
 	}
 	enable = {
@@ -1811,7 +1795,6 @@ naval_unit_role_ratios_ITA_atwar_with_major = {

 naval_unit_role_ratios_ITA_late_peace = {
 	allowed = {
-		has_dlc = "Man the Guns"
 		tag = SAD
 	}
 	enable = {
@@ -1860,7 +1843,6 @@ naval_unit_role_ratios_ITA_late_peace = {

 # naval_unit_role_ratios_majors_lategame = {
 	# allowed = {
-		# has_dlc = "Man the Guns"
 		# OR = {
 			# tag = TIX
 			# tag = YUW
@@ -1902,7 +1884,6 @@ naval_unit_role_ratios_ITA_late_peace = {

 # high_convoy_threat = {
 	# allowed = {
-		# has_dlc = "Man the Guns"
 		# OR = {
 			# tag = TIX
 			# tag = YUW
@@ -1971,7 +1952,6 @@ naval_unit_role_ratios_ITA_late_peace = {

 # high_mine_threat_1 = {
 	# allowed = {
-		# has_dlc = "Man the Guns"
 		# OR = {
 			# tag = TIX
 			# tag = HUJ
@@ -2000,7 +1980,6 @@ naval_unit_role_ratios_ITA_late_peace = {

 # high_mine_threat_2 = {
 	# allowed = {
-		# has_dlc = "Man the Guns"
 		# OR = {
 			# tag = TIX
 			# tag = HUJ
--- a/src/common/ai_strategy/vnr_naval_strategy.txt
+++ b/src/common/ai_strategy/vnr_naval_strategy.txt
@@ -12,30 +12,55 @@ ENG_protect_home_waters = {
    }
    abort_when_not_enabled = yes
    ai_strategy = {
-        type = naval_dominance
-        id = 18
-        value = 100
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 16
-        value = 100
-    }
+		type = naval_dominance
+		id = vnr_eng_home_waters
+		value = 100
+	}
+	ai_strategy = {
+		type = coast_defense
+		id = 18
+		value = 100
+	}
+	ai_strategy = {
+		type = coast_defense
+		id = 16
+		value = 100
+	}
 	ai_strategy = {
        type = naval_avoid_region
        id = 18
        value = -1000
    }
+}
+
+ENG_avoid_baltic = {
+	allowed = {
+        original_tag = HUJ
+    }
+    enable = {
+        has_war_with = TIX
+        TIX = {
+            has_navy_size = { size > 30 }
+        }
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+
 	ai_strategy = {
 		type = naval_avoid_region
 		id = 173
-		value = 100
+		value = 500
 	}
 	ai_strategy = {
 		type = naval_avoid_region
 		id = 207
 		value = 500
 	}
+	ai_strategy = {
+		type = naval_dominance
+		id = vnr_ger_baltic
+		value = 0
+	}
 }

 ENG_secure_mediterranean = {
@@ -55,18 +80,8 @@ ENG_secure_mediterranean = {
    abort_when_not_enabled = yes
    ai_strategy = {
        type = naval_dominance
-        id = 29
-        value = 100
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 68
-        value = 60
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 69
-        value = 100
+        id = vnr_eng_med_zones
+        value = 80
    }
 	ai_strategy = {
 		type = naval_avoid_region
@@ -107,6 +122,11 @@ ENG_avoid_mediterranean = {
 		id = 168
 		value = 1000
 	}
+	ai_strategy = {
+        type = naval_dominance
+        id = vnr_eng_med_zones
+        value = 0
+    }
 }

 ENG_avoid_pacific = {
@@ -142,6 +162,11 @@ ENG_avoid_pacific = {
        id = 73
        value = 200
    }
+	ai_strategy = {
+		type = naval_dominance
+		id = vnr_eng_south_china_sea
+		value = 0
+	}
 }

 ENG_reinforce_pacific = {
@@ -171,35 +196,20 @@ ENG_reinforce_pacific = {
    }
    abort_when_not_enabled = yes
    ai_strategy = {
-        type = naval_dominance
-        id = 72
-        value = 100
-    }
+		type = naval_dominance
+		id = vnr_eng_south_china_sea
+		value = 65
+	}
 	ai_strategy = {
-        type = naval_dominance
-        id = 91
-        value = 10
-    }
+		type = naval_dominance
+		id = vnr_eng_pacific_zone
+		value = 20
+	}
 	ai_strategy = {
-        type = naval_dominance
-        id = 92
-        value = 10
-    }
-	ai_strategy = {
-        type = naval_dominance
-        id = 93
-        value = 10
-    }
-	ai_strategy = {
-        type = naval_dominance
-        id = 84
-        value = 50
-    }
-	ai_strategy = {
-        type = naval_dominance
-        id = 83
-        value = 50
-    }
+		type = naval_dominance
+		id = vnr_pacific_2
+		value = 45
+	}
 }

 ### CHY ###
@@ -215,38 +225,9 @@ JAP_destroy_china_navy_quick = {
    abort_when_not_enabled = yes
    ai_strategy = {
        type = naval_dominance
-        id = 75
+        id = vnr_chi_coast
        value = 100
    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 76
-        value = 100
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 77
-        value = 100
-    }
-	ai_strategy = {
-        type = naval_blockade
-		target_country = CHI
-        id = 75
-        value = 100
-    }
-    ai_strategy = {
-        type = naval_blockade
-		target_country = CHI
-        id = 76
-        value = 100
-    }
-    ai_strategy = {
-        type = naval_blockade
-		target_country = CHI
-        id = 77
-        value = 100
-    }
-
 	ai_strategy = {
        type = convoy_raiding_target
        id = CHI
@@ -268,29 +249,29 @@ JAP_pacific_war_naval_stage_one = {
    }
    abort_when_not_enabled = yes
    ai_strategy = {
-        type = naval_dominance
-        id = 75
-        value = 100
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 78
-        value = 80
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 94
-        value = 50
-    }
+		type = naval_dominance
+		id = vnr_pacific_3
+		value = 80
+	}
 	ai_strategy = {
-        type = naval_dominance
-        id = 84
-        value = 100
-    }
+		type = naval_dominance
+		id = vnr_pacific_4
+		value = 100
+	}
 	ai_strategy = {
-		type = naval_mission_threshold
-		id = MISSION_STRIKE_FORCE
-		value = -500
+		type = invade
+		id = AST
+		value = 100
+	}
+	ai_strategy = {
+		type = invade
+		id = PHI
+		value = 1000
+	}
+	ai_strategy = {
+		type = invade
+		id = MAL
+		value = 1000
 	}
 }

@@ -301,62 +282,48 @@ JAP_pacific_war_naval_stage_two = {
    enable = {
        has_war_with = BYG
 		OR = {
-			naval_strength_ratio = {
-				tag = BYG
-				ratio = 0.5
-			}
 			naval_strength_ratio = {
 				tag = BYG
 				ratio > 0.5
 			}
+			AND = {
+				PHI = { has_capitulated = yes }
+				MAL = { has_capitulated = yes }
+			}
 		}
        enable_vnr_naval_ai = yes
    }
    abort_when_not_enabled = yes
    ai_strategy = {
-        type = naval_dominance
-        id = 75
-        value = 50
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 78
-        value = 50
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 94
-        value = 50
-    }
+		type = naval_dominance
+		id = vnr_pacific_2
+		value = 100
+	}
 	ai_strategy = {
-        type = naval_dominance
-        id = 84
-        value = 50
-    }
+		type = naval_dominance
+		id = vnr_pacific_1
+		value = 85
+	}
 	ai_strategy = {
-        type = naval_dominance
-        id = 95
-        value = 100
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 97
-        value = 100
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 180
-        value = 75
-    }
+		type = invade
+		id = USA
+		value = 1000
+	}
 	ai_strategy = {
-        type = naval_dominance
-        id = 83
-        value = 85
-    }
+		type = invade
+		id = AST
+		value = 500
+	}
 	ai_strategy = {
-		type = naval_mission_threshold
-		id = MISSION_STRIKE_FORCE
-		value = -500
+		type = invade
+		id = INS
+		value = 500
+	}
+	ai_strategy = {
+		type = front_control
+		area = pacific
+		ordertype = invasion
+    	execute_order = yes
 	}
 }

@@ -441,23 +408,18 @@ USA_pacific_war_naval_avoid_first = {
 	
 	ai_strategy = {
 		type = naval_dominance
-		id = 95
+		id = vnr_pacific_1
 		value = 100
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 97
-		value = 60
+		id = vnr_pacific_3
+		value = 0
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 105
-		value = 100
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 180
-		value = 100
+		id = vnr_pacific_4
+		value = 0
 	}
 }

@@ -473,17 +435,17 @@ USA_do_not_waste_fleet_in_north_pacific = {
 	ai_strategy = {
 		type = naval_dominance
 		id = 87
-		value = 0
+		value = -100
 	}
 	ai_strategy = {
 		type = naval_dominance
 		id = 88
-		value = 0
+		value = -100
 	}
 	ai_strategy = {
 		type = naval_dominance
 		id = 96
-		value = 0
+		value = -100
 	}
 	ai_strategy = {
 		type = naval_dominance
@@ -500,6 +462,16 @@ USA_do_not_waste_fleet_in_north_pacific = {
 		id = 171
 		value = 0
 	}
+	ai_strategy = {
+		type = coast_defense
+		id = 88
+		value = 0
+	}
+	ai_strategy = {
+		type = naval_dominance
+		id = us_west_coast
+		value = -100
+	}
 }

 USA_pacific_war_naval_counterattack_1 = {
@@ -580,33 +552,23 @@ USA_pacific_war_naval_counterattack_1 = {
 	
 	ai_strategy = {
 		type = naval_dominance
-		id = 83
+		id = vnr_pacific_2
 		value = 100
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 84
-		value = 100
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 95
-		value = 100
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 97
-		value = 100
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 105
+		id = vnr_pacific_1
 		value = 80
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 180
-		value = 80
+		id = vnr_pacific_3
+		value = 0
+	}
+	ai_strategy = {
+		type = naval_dominance
+		id = vnr_pacific_4
+		value = 0
 	}
 	ai_strategy = {
 		type = invade
@@ -617,7 +579,6 @@ USA_pacific_war_naval_counterattack_1 = {
 		type = naval_invasion_focus
 		value = 1000
 	}
-	
 	ai_strategy = {
 		type = convoy_raiding_target
 		id = JAP
@@ -641,12 +602,6 @@ USA_pacific_war_naval_counterattack_1 = {
 		ordertype = invasion
    	execute_order = yes
 	}
-
-	ai_strategy = {
-		type = naval_mission_threshold
-		id = MISSION_STRIKE_FORCE
-		value = -500
-	}
 }

 USA_pacific_war_naval_counterattack_2 = {
@@ -708,28 +663,18 @@ USA_pacific_war_naval_counterattack_2 = {
 	
 	ai_strategy = {
 		type = naval_dominance
-		id = 84
+		id = vnr_pacific_3
 		value = 100
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 95
-		value = 100
+		id = vnr_pacific_2
+		value = 40
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 97
-		value = 70
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 94
-		value = 100
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 78
-		value = 100
+		id = vnr_pacific_1
+		value = 10
 	}
 	ai_strategy = {
 		type = invade
@@ -766,12 +711,6 @@ USA_pacific_war_naval_counterattack_2 = {
 		ordertype = invasion
    	execute_order = yes
 	}
-
-	ai_strategy = {
-		type = naval_mission_threshold
-		id = MISSION_STRIKE_FORCE
-		value = -500
-	}
 }

 USA_pacific_war_naval_counterattack_3 = {
@@ -806,28 +745,23 @@ USA_pacific_war_naval_counterattack_3 = {
 	
 	ai_strategy = {
 		type = naval_dominance
-		id = 75
-		value = 80
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 80
-		value = 80
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 76
+		id = vnr_pacific_4
 		value = 100
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 94
-		value = 100
+		id = vnr_pacific_3
+		value = 75
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 78
-		value = 100
+		id = vnr_pacific_2
+		value = 10
+	}
+	ai_strategy = {
+		type = naval_dominance
+		id = vnr_pacific_1
+		value = 0
 	}
 	ai_strategy = {
 		type = invade
@@ -864,12 +798,6 @@ USA_pacific_war_naval_counterattack_3 = {
 		ordertype = invasion
    	execute_order = yes
 	}
-
-	ai_strategy = {
-		type = naval_mission_threshold
-		id = MISSION_STRIKE_FORCE
-		value = -500
-	}
 }

 ### SAD ###
@@ -887,54 +815,25 @@ ITA_avoid_mediterranean = {
    }
    abort_when_not_enabled = yes
    ai_strategy = {
-        type = naval_dominance
-        id = 29
-        value = 50
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 68
-        value = 0
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 69
-        value = 0
-    }
-
-	ai_strategy = {
 		type = naval_dominance
-		id = 168
+		id = vnr_ita_med_zones
 		value = 100
 	}
 	ai_strategy = {
-		type = naval_dominance
-		id = 169
+		type = naval_convoy_raid_region
+		id = 29
 		value = 100
 	}
 	ai_strategy = {
-		type = naval_blockade
-		target_country = ENG
+		type = naval_convoy_raid_region
 		id = 68
 		value = 100
 	}
 	ai_strategy = {
-		type = naval_blockade
-		target_country = ENG
+		type = naval_convoy_raid_region
 		id = 69
 		value = 100
 	}
-	ai_strategy = {
-		type = naval_blockade
-		target_country = ENG
-		id = 29
-		value = 60
-	}
-	ai_strategy = {
-		type = convoy_raiding_target
-		id = ENG
-		value = 50
-	}
 }

 ### TIX ###
@@ -952,15 +851,10 @@ GER_forget_sealion = {
    }
    abort_when_not_enabled = yes
    ai_strategy = {
-        type = naval_dominance
-        id = 18
-        value = 0
-    }
-    ai_strategy = {
-        type = naval_dominance
-        id = 16
-        value = 10
-    }
+		type = naval_dominance
+		id = vnr_eng_home_waters
+		value = 0
+	}
 	ai_strategy = {
 		type = invade
 		tag = HUJ
@@ -978,61 +872,29 @@ GER_unrestricted_submarine_warfare = {
            tag = HUJ
            ratio < 0.7
        }
-		FRA = { has_capitulated = yes }
        enable_vnr_naval_ai = yes
    }
    abort_when_not_enabled = yes
    ai_strategy = {
-        type = naval_blockade
-		target_country = ENG
+        type = naval_convoy_raid_region
        id = 47
-        value = 70
+        value = 200
    }
    ai_strategy = {
-        type = naval_blockade
-		target_country = ENG
+        type = naval_convoy_raid_region
        id = 49
-        value = 70
+        value = 500
    }
    ai_strategy = {
-        type = naval_blockade
-		target_country = ENG
+        type = naval_convoy_raid_region
        id = 44
-        value = 70
+        value = 150
    }
    ai_strategy = {
-        type = naval_blockade
-		target_country = ENG
+        type = naval_convoy_raid_region
        id = 50
-        value = 70
+        value = 30
    }
-	ai_strategy = {
-        type = naval_blockade
-		target_country = ENG
-        id = 42
-        value = 70
-    }
-	ai_strategy = {
-		type = convoy_raiding_target
-		id = ENG
-		value = 100
-	}
-
-	ai_strategy = {
-		type = naval_dominance
-		id = 173
-		value = 100
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 207
-		value = 100
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 9
-		value = 50
-	}
 }

 GER_avoid_mediterranean = {
@@ -1048,27 +910,12 @@ GER_avoid_mediterranean = {

 	ai_strategy = {
 		type = naval_dominance
-		id = 29
+		id = vnr_eng_med_zones
 		value = 0
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 68
-		value = 0
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 69
-		value = 0
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 168
-		value = 0
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 169
+		id = vnr_ita_med_zones
 		value = 0
 	}
 }
@@ -1097,12 +944,7 @@ GER_invade_norway = {
 	}
 	ai_strategy = {
 		type = naval_dominance
-		id = 173
-		value = 50
-	}
-	ai_strategy = {
-		type = naval_dominance
-		id = 207
+		id = vnr_ger_baltic
 		value = 100
 	}
 }
@@ -1129,27 +971,4 @@ major_train_fleet_strategy = {
 		id = MISSION_TRAINING
 		value = -500
 	}
-}
-
-major_dont_hold_fleet = {
-	allowed = {
-		OR = {
-			original_tag = CHY
-			original_tag = BYG
-			original_tag = HUJ
-			original_tag = SAD
-			original_tag = YUW
-			original_tag = TIX
-		}
-	}
-	enable = {
-		has_war = yes
-	}
-	abort_when_not_enabled = yes
-
-	ai_strategy = {
-		type = naval_mission_threshold
-		id = MISSION_HOLD
-		value = 1000
-	}
 }
--- a/src/common/decisions/MTG_naval_treaty.txt
+++ b/src/common/decisions/MTG_naval_treaty.txt
@@ -21,6 +21,7 @@ MTG_naval_treaties = {
 				has_government = democratic
 				has_government = neutrality
 			}
+			NOT = { tag = CHY }
 		}
 	
 		complete_effect = {
@@ -137,6 +138,7 @@ MTG_naval_treaties = {
 			OR = {
 				has_government = fascism
 				has_government = communism
+				tag = CHY
 			}
 		}
 	
@@ -232,6 +234,7 @@ MTG_naval_treaties = {
 			OR = {
 				has_government = fascism
 				has_government = communism
+				tag = CHY
 			}
 		}
 	
--- a/src/common/doctrines/subdoctrines/sea/navy_capital_subdoctrines.txt
+++ b/src/common/doctrines/subdoctrines/sea/navy_capital_subdoctrines.txt
@@ -17,7 +17,6 @@ fast_battleship_primacy = {
            factor = 75
            OR = {
                original_tag = HUJ
-                original_tag = BYG
                original_tag = CHY
                original_tag = SAD
                original_tag = BFL
@@ -27,6 +26,7 @@ fast_battleship_primacy = {

    # EFFECTS
 	strike_force_movement_org_loss = -0.1
+    naval_enemy_retreat_chance = -0.1

    rewards = {
        fast_squad = {
@@ -124,11 +124,19 @@ battlecruiser_supremacy = {
    }

    # EFFECTS
-	navy_max_range_factor = 0.1
+	equipment_bonus = {
+        capital_ship = {
+            naval_range = 0.1
+            instant = yes
+        }
+    }
    strike_force_movement_org_loss = -0.05

    rewards = {
        scouting_fleet = {
+            SH_battleship = {
+                max_organisation = 5
+            }
            battleship = {
                max_organisation = 10
            }
@@ -143,6 +151,9 @@ battlecruiser_supremacy = {
 			}
        }
        coordinated_communication = {
+            SH_battleship = {
+                naval_heavy_gun_hit_chance_factor = 0.05
+            }
 			battleship = {
                naval_heavy_gun_hit_chance_factor = 0.05
            }
@@ -179,6 +190,9 @@ battlecruiser_supremacy = {
            }
        }
        decoy_tactics = {
+            SH_battleship = {
+                max_organisation = 5
+            }
            battleship = {
                max_organisation = 10
            }
@@ -224,30 +238,31 @@ armored_raiders = {

    # EFFECTS
 	screening_without_screens = 0.10
-    navy_max_range_factor = 0.05
+    ships_at_battle_start = -0.1

    rewards = {
        expert_reconnaissance = {
            battle_cruiser = {
+                naval_range = 0.1
                surface_detection = 0.05
            }
 			battleship = {
+                naval_range = 0.1
 				surface_detection = 0.05
 			}
            heavy_cruiser = {
+                naval_range = 0.1
                surface_detection = 0.05
            }
            medium_cruiser = {
+                naval_range = 0.1
                surface_detection = 0.05
            }
        }
        speed_trials = {
-            equipment_bonus = {
-                capital_ship = {
-                    naval_range = 0.10
-                    instant = yes
-                }
-            }
+            naval_retreat_chance = 0.1
+            naval_retreat_speed = 0.05
+            positioning = 0.05
        }
        modernized_officer_education = {
            battle_cruiser= {
@@ -275,12 +290,12 @@ armored_raiders = {
 				surface_detection = 0.1
 			}
 			heavy_cruiser = {
-				max_organisation = 5
+				max_organisation = 10
                convoy_raiding_coordination = 0.15
                surface_detection = 0.1
 			}
            medium_cruiser = {
-				max_organisation = 5
+				max_organisation = 10
                convoy_raiding_coordination = 0.15
                surface_detection = 0.1
 			}
@@ -315,7 +330,9 @@ coastal_defence_fleet = {
    xp_cost = 50
    xp_type = navy

-    ai_will_do = { }
+    ai_will_do = {
+        factor = 0.5
+    }

 	naval_supply_consumption_factor = -0.15
 	navy_max_range_factor = -0.25
@@ -356,11 +373,13 @@ coastal_defence_fleet = {
            modifier = {
 				mines_planting_by_fleets_factor = 0.1
                screening_without_screens = 0.05
+                navy_max_range_factor = -0.1
 			}
        }
        spare_part_logistics = {
            modifier = {
 				refit_ic_cost = -0.15
+                repair_speed_factor = 0.1
 			}
        }
    }
@@ -372,14 +391,19 @@ naval_gunfire_support = {
    description = SUBDOCTRINE_NAVAL_GUNFIRE_SUPPORT_DESC
    icon = GFX_doctrine_naval_gunfire_support_medium 

-    xp_cost = 100
+    xp_cost = 75
    xp_type = navy

    available = {
        always = yes
    }
+    visible = {
+        has_dlc = "No Compromise, No Surrender"
+    }

-    ai_will_do = { }
+    ai_will_do = {
+        factor = 0
+    }

 	shore_bombardment_bonus = 0.25
    navy_capital_ship_attack_factor = -0.1
@@ -419,7 +443,7 @@ naval_gunfire_support = {
                max_organisation = 5
            }
            modifier = {
-    			convoy_escort_efficiency = 0.1
+    			shore_bombardment_collateral_damage_factor = 0.15
        	}
        }

@@ -452,11 +476,16 @@ battleship_antiair_screen = {
        always = yes
    }

-    visible = {
-    	has_dlc = "No Compromise, No Surrender"
+    ai_will_do = {
+        factor = 1
+        modifier = {
+            factor = 100
+            original_tag = BYG
+        }
    }

    navy_anti_air_attack_factor = 0.1
+    naval_retreat_chance_after_initial_combat = 0.1

    rewards = {

--- a/src/common/doctrines/subdoctrines/sea/navy_carrier_doctrines.txt
+++ b/src/common/doctrines/subdoctrines/sea/navy_carrier_doctrines.txt
@@ -4,7 +4,7 @@ carrier_battlegroups = {
    description = SUBDOCTRINE_CARRIER_BATTLEGROUPS_DESC
    icon = GFX_doctrine_carrier_battlegroups_medium

-    xp_cost = 100
+    xp_cost = 125
    xp_type = navy

    ai_will_do = { 
@@ -17,30 +17,43 @@ carrier_battlegroups = {

    available = {
        has_tech = aviation_dawn
+        has_navy_size = {
+            unit = carrier
+            size > 4
+        }
+        NOT = {
+            has_doctrine = coastal_defence_fleet
+            has_doctrine = naval_gunfire_support
+        }
    }

-    ai_will_do = { }
-
    # EFFECTS
 	port_strike = 0.20
-    strike_force_movement_org_loss = -0.1
+    carrier_capacity_penalty_reduction = -0.1

    rewards = {
 		long_distance_logistics = {
            carrier = {
                max_organisation = 10
+            }
+            equipment_bonus = {
+                carrier = {
+                    naval_range = 0.1
+                    instant = yes
+                }
            }
 			modifier = {
-                navy_max_range_factor = 0.1
                navy_fuel_consumption_factor = -0.05
            }
 		}
        bomber_scouting = {
 			carrier = {
                carrier_surface_detection = 0.15
+                carrier_sub_detection = 0.05
            }
            modifier = {
                navy_carrier_air_agility_factor = 0.1
+				naval_strike_agility_factor = 0.1
            }
 		}
 		professional_deck_management = {
@@ -49,7 +62,6 @@ carrier_battlegroups = {
 			}
            modifier = {
                sortie_efficiency = 0.1
-                carrier_capacity_penalty_reduction = -0.1
            }
 		}
 		fleet_antiair = {
@@ -65,7 +77,7 @@ carrier_battlegroups = {
 		alpha_strike = {
            modifier = {
                sortie_efficiency = 0.1
-                navy_carrier_air_targetting_factor = 0.1
+                naval_strike_targetting_factor = 0.15
                carrier_capacity_penalty_reduction = -0.1
            }
 		}
@@ -83,6 +95,14 @@ floating_airfields = {

    available = {
        has_tech = aviation_dawn
+        has_navy_size = {
+            unit = carrier
+            size > 4
+        }
+        NOT = {
+            has_doctrine = coastal_defence_fleet
+            has_doctrine = naval_gunfire_support
+        }
    }

    ai_will_do = { 
@@ -105,6 +125,10 @@ floating_airfields = {
    }

    # EFFECTS
+    carrier = {
+        carrier_surface_detection = 0.05
+        carrier_sub_detection = 0.05
+    }
 	navy_anti_air_attack_factor = 0.10
 	
    rewards = {
@@ -130,7 +154,7 @@ floating_airfields = {
                anti_air_attack = 0.05
            }
 	   }
-	   rough_weather_procedures = {
+	   all_weather_combat = {
            sortie_efficiency = 0.1
 			equipment_bonus = {
                carrier = {
@@ -147,14 +171,29 @@ subsidiary_carrier_support = {
    description = SUBDOCTRINE_SUBSIDIARY_CARRIER_SUPPORT_DESC
    icon = GFX_doctrine_escort_carriers_medium

-    xp_cost = 100
+    xp_cost = 75
    xp_type = navy

    available = {
        has_tech = early_ship_hull_carrier
+        has_navy_size = {
+            unit = carrier
+            size > 0
+        }
+    }
+    ai_will_do = {
+        factor = 1
+        modifier = {
+            is_major = no
+            factor = 100
+        }
    }
    
-    convoy_escort_efficiency = 0.2
+    carrier = {
+        carrier_surface_detection = 0.1
+        surface_visibility = -0.1
+    }
+    sortie_efficiency = -0.1

    rewards = {
    	evasive_convoy_maneuvers = {
@@ -191,7 +230,7 @@ carrier_concentration = {
    description = SUBDOCTRINE_CARRIER_CONCENTRATION_DESC
    icon = GFX_doctrine_carrier_primacy_medium

-    xp_cost = 100
+    xp_cost = 125
    xp_type = navy

    ai_will_do = { 
@@ -203,24 +242,38 @@ carrier_concentration = {
    }
    available = {
        has_tech = aviation_dawn
+        has_navy_size = {
+            unit = carrier
+            size > 5
+        }
+        NOT = {
+            has_doctrine = coastal_defence_fleet
+            has_doctrine = naval_gunfire_support
+        }
    }

    sortie_efficiency = 0.1
-    strike_force_movement_org_loss = -0.05
+    naval_strike_attack_factor = 0.05

    rewards = {
    	deep_operative_support = {
    		carrier = {
-    			reliability = 0.05
-    			naval_range = 0.2
+    			reliability = 0.1
+                supply_consumption = -0.05
    		}
+            equipment_bonus = {
+                carrier = {
+                    naval_range = 0.2
+                    instant = yes
+                }
+            }
    	}
    	mobile_force = {
    		carrier = {
                max_organisation = 15
            }
            modifier = {
-                navy_carrier_air_targetting_factor = 0.1
+                naval_strike_targetting_factor = 0.1
            }
    	}
    	improved_mission_oriented = {
@@ -236,12 +289,15 @@ carrier_concentration = {
    			supply_consumption = -0.15
    			fuel_consumption = -0.1
    		}
+            modifier = {
+                naval_strike_agility_factor = 0.1
+            }
    	}
    	massed_air_raid = {
    		modifier = {
                sortie_efficiency = 0.1
                carrier_capacity_penalty_reduction = -0.1
-                navy_carrier_air_attack_factor = 0.1
+                naval_strike_attack_factor = 0.1
            }
    	}
    }
@@ -258,7 +314,7 @@ naval_airfoce = {
    xp_type = navy

    ai_will_do = { 
-        base = 1
+        base = 0
    }
    available = {
        has_tech = early_ship_hull_carrier
@@ -275,16 +331,15 @@ naval_airfoce = {
    	}
    	land_based_support = {
    		category_nav_bomber = {
-                air_range = 0.2
+                air_range = 0.25
            }
    	}
    	air_raiders = {
-    		carrier = {
-                max_organisation = 10
+    		category_nav_bomber = {
+                air_defence = 0.1
            }
            modifier = {
-                sortie_efficiency = 0.05
-                navy_carrier_air_targetting_factor = 0.05
+                naval_strike_targetting_factor = 0.1
            }
    	}
    	evasive_engagements_focus = {
@@ -298,5 +353,12 @@ naval_airfoce = {
            naval_strike_agility_factor = 0.1
    	}
    }
-
+    mastery = {
+        equipment = {
+            carrier
+        }
+        categories = {
+            category_nav_bomber
+        }
+    }
 }
--- a/src/common/doctrines/subdoctrines/sea/navy_screen_doctrines.txt
+++ b/src/common/doctrines/subdoctrines/sea/navy_screen_doctrines.txt
@@ -42,11 +42,17 @@ convoy_escort = {
 			convoy_escort_efficiency = 0.05
 		}
 		sweeping_duty = {
+			light_cruiser = {
+				mines_sweeping = 0.25
+			}
+			destroyer = {
+				mines_sweeping = 0.25
+			}
 			mines_sweeping_by_fleets_factor = 0.15
 		}
 		creeping_attack = {
 			destroyer = {
-				sub_detection = 0.10
+				surface_detection = 0.05
 				lg_attack = 0.05
 			}
 			light_cruiser = {
@@ -55,12 +61,14 @@ convoy_escort = {
 		}
 		as_below_so_above = {
 			destroyer = {
-				anti_air_attack = 0.15
+				max_organisation = 5
+				anti_air_attack = 0.1
 			}
 			light_cruiser = {
-				anti_air_attack = 0.15
+				max_organisation = 5
+				anti_air_attack = 0.1
 			}
-			convoy_escort_efficiency = 0.05
+			convoy_escort_efficiency = 0.1
 		}
    }
 }
@@ -92,15 +100,21 @@ support_integrated_operations = {

    # EFFECTS
 	screening_efficiency = 0.05
+	equipment_bonus = {
+		screen_ship = {
+			naval_range = 0.1
+			instant = yes
+		}
+	}
 	
    rewards = {
        first_line_of_defense = {
 			destroyer = {
-				max_organisation = 5
+				max_organisation = 10
 				anti_air_attack = 0.1
 			}
 			modifier = {
-				convoy_retreat_speed = 0.1
+				naval_retreat_speed = 0.1
 			}
 		}
 		first_line_of_attack = {
@@ -166,17 +180,18 @@ hunter_killers = {
    }

    # EFFECTS
-	naval_coordination = 0.10 
+	naval_coordination = 0.10
+	naval_torpedo_enemy_critical_chance_factor = -0.1
 	
    rewards = {
 		search_and_destroy = {
 			destroyer = {
-				sub_detection = 0.1
+				sub_detection = 0.15
 			}
 		}
 		flotilla_leader = {
 			light_cruiser = {
-				sub_detection = 0.1
+				sub_detection = 0.15
 			}
 		}
 		group_operations = {
@@ -221,7 +236,7 @@ torpedo_primacy = {
    xp_type = navy

    ai_will_do = { 
-        base = 0
+        base = 1
        modifier = {
            factor = 95
            original_tag = CHY
@@ -231,7 +246,7 @@ torpedo_primacy = {
   		always = yes
    }
    naval_torpedo_hit_chance_factor = 0.1
-	convoy_raiding_efficiency_factor = 0.05
+	naval_torpedo_cooldown_factor = -0.125

    rewards = {

@@ -243,6 +258,7 @@ torpedo_primacy = {
    	coordinated_fire_patterns = {
    		destroyer = {
    			max_organisation = 10
+				naval_torpedo_hit_chance_factor = 0.05
    		}
    	}	
    	dedicated_torpedo_task_forces = {
@@ -253,7 +269,7 @@ torpedo_primacy = {
    	}
    	torpedo_rearming = {
    		modifier = {
-				naval_torpedo_cooldown_factor = -0.25
+				naval_torpedo_cooldown_factor = -0.125
 			}
    	}
    	night_combat_training = {
@@ -281,12 +297,16 @@ jeune_ecole = {
    	#TODO: special project
   		always = yes
    }
+	ai_will_do = {
+		factor = 1
+	}

-    convoy_raiding_efficiency_factor = 0.1
 	destroyer = {
+		convoy_raiding_coordination = 0.1
 		torpedo_attack = 0.1
 	}
 	light_cruiser = {
+		convoy_raiding_coordination = 0.1
 		torpedo_attack = 0.1
 	}

@@ -312,11 +332,13 @@ jeune_ecole = {
    	convoy_escort = {
    		modifier = {
 				convoy_escort_efficiency = 0.1
+				convoy_retreat_speed = 0.1
 			}
    	}
    	coastal_patrol = {
    		modifier = {
 				mines_planting_by_fleets_factor = 0.2
+				naval_mines_damage_factor = 0.1
 				naval_enemy_fleet_size_ratio_penalty_factor = 0.1
 			}
    	}
--- a/src/common/doctrines/subdoctrines/sea/navy_submarine_doctrines.txt
+++ b/src/common/doctrines/subdoctrines/sea/navy_submarine_doctrines.txt
@@ -24,11 +24,12 @@ wolfpacks = {
 		max_organisation = 10
        torpedo_attack = 0.05
 	}
+    sub_retreat_speed = 0.05

    rewards = {
 		predictive_expertise = {
 			submarine = {
-                torpedo_attack = 0.05
+                torpedo_attack = 0.1
 				naval_torpedo_hit_chance_factor = 0.05
 			}
            modifier = {
@@ -57,7 +58,7 @@ wolfpacks = {
 		}
 		wolfpack_coordination = {
 			submarine = {
-                max_organisation = 5
+                max_organisation = 10
 				surface_detection = 0.1
 				convoy_raiding_coordination = 0.15
 			}
@@ -99,14 +100,19 @@ submarine_fleet_operations = {
    }

    # EFFECTS
-    navy_submarine_attack_factor = 0.05
+    submarine = {
+        naval_torpedo_hit_chance_factor = 0.1
+    }
 	naval_torpedo_screen_penetration_factor = 0.05

    rewards = {
 		long_range_patrol_schedule = {
-			submarine = {
-				naval_range = 0.1 #TODO: does this work?
-			}
+			equipment_bonus = {
+                submarine = {
+                    naval_range = 0.15
+                    instant = yes
+                }
+            }
 		}
 		sustained_operations = {
 			submarine = {
@@ -153,15 +159,17 @@ capital_hunters = {
    }

    naval_torpedo_reveal_chance_factor = -0.1
+    naval_torpedo_screen_penetration_factor = 0.05

    rewards = {
    	fire_protocol_drills = {
    		submarine = {
-    			naval_torpedo_hit_chance_factor = 0.1
+                torpedo_attack = 0.1
+    			naval_torpedo_hit_chance_factor = 0.05
    		}
    	}
    	battle_line_priority = {
-    		naval_torpedo_screen_penetration_factor = 0.05
+    		naval_torpedo_screen_penetration_factor = 0.1
    	}
    	quick_reload_procedures = {
    		naval_torpedo_cooldown_factor = -0.125
@@ -169,8 +177,13 @@ capital_hunters = {
    	battleship_chase = {
    		submarine = {
    			fuel_consumption = -0.1
-    			naval_range = 0.1
    		}
+            equipment_bonus = {
+                submarine = {
+                    naval_range = 0.1
+                    instant = yes
+                }
+            }
    	}
    	escape_when_empty = {
    		modifier = {
@@ -186,8 +199,11 @@ submarine_coastal_defense = {
    description = SUBDOCTRINE_SUBMARINE_COASTAL_DEFENSE_DESC
    icon = GFX_doctrine_undersea_blockade_medium

-    xp_cost = 100
+    xp_cost = 50
    xp_type = navy
+    ai_will_do = {
+        base = 1
+    }

    available = {
        has_tech = midget_submarines
@@ -196,6 +212,12 @@ submarine_coastal_defense = {
    submarine = {
        supply_consumption = -0.02
    }
+    equipment_bonus = {
+        submarine = {
+            naval_range = -0.25
+            instant = yes
+        }
+    }

    rewards = {

@@ -212,6 +234,12 @@ submarine_coastal_defense = {
    			max_organisation = 5
    			surface_detection = 0.1
    		}
+            equipment_bonus ={
+                submarine = {
+                    naval_range = -0.1
+                    instant = yes
+                }
+            }
    	}
    	maneuever_fire = {
            modifier = {
@@ -221,13 +249,83 @@ submarine_coastal_defense = {
    	locals_knowledge = {
    		submarine = {
                max_organisation = 5
-                convoy_raiding_coordination = 0.05
+                convoy_raiding_coordination = 0.1
+            }
+            equipment_bonus ={
+                submarine = {
+                    naval_range = -0.1
+                    instant = yes
+                }
            }
    	}
    	high_explosive_torpedo = {
    		submarine = {
    			torpedo_attack = 0.1
+                naval_torpedo_hit_chance_factor = 0.05
    		}
    	}
    }
 }
+
+submarine_area_denial = {
+    track = submarines
+    name = SUBDOCTRINE_SUBMARINE_AREA_DENIAL
+    description = SUBDOCTRINE_SUBMARINE_AREA_DENIAL_DESC
+    icon = GFX_doctrine_submarine_area_denial_medium
+
+    xp_cost = 100
+    xp_type = navy
+    ai_will_do = {
+        factor = 0
+    }
+
+    equipment_bonus = {
+		submarine = {
+			naval_range = -0.2
+			instant = yes
+		}
+	}
+    mines_planting_by_fleets_factor = 0.1
+
+    rewards = {
+        silent_sailing = {
+            submarine = {
+                sub_visibility = -0.05
+            }
+            equipment_bonus = {
+                submarine = {
+                    naval_speed = -0.15
+                    instant = yes
+                }
+            }
+        }
+        fortress_seas = {
+            modifier = {
+                mines_planting_by_fleets_factor = 0.15
+                naval_mine_hit_chance = -0.1
+                naval_mines_damage_factor = 0.1
+            }
+        }
+        low_echo_hull = {
+            submarine = {
+                sub_visibility = -0.1
+                max_organisation = -20
+            }
+        }
+        slow_electric_torpedo = {
+            modifier = {
+                naval_torpedo_hit_chance_factor = -0.15
+                naval_torpedo_reveal_chance_factor = -0.15
+            }
+        }
+        simplified_launching_protocal = {
+            submarine = {
+                sub_visibility = -0.05
+            }
+            modifier = {
+                sub_retreat_speed = 0.3
+                navy_submarine_attack_factor = -0.15
+            }
+        }
+    }
+}
--- a/src/common/ideas/navy_spirits.txt
+++ b/src/common/ideas/navy_spirits.txt
@@ -178,10 +178,6 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Compromise, No Surrender" }
 				}
-				modifier = {
-					factor = 2
-					has_doctrine = screen_support_focus
-				}
 			}
 		}
        etajima_naval_academy = {
@@ -339,13 +335,6 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Step Back" }
 				}
-				modifier = {
-					factor = 2
-					OR = { 
-					has_doctrine = jeune_ecole
-					has_doctrine = patrol_boats
-					}
-				}
 			}
 		}
 		flexible_contracts_spirit = {
@@ -359,19 +348,10 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Step Back" }
 				}
-				modifier = {
-					factor = 2
-					OR = { 
-					has_doctrine = coastal_defence_fleet
-					has_doctrine = screen_support_focus
-					}
-				}
 			}
 		}
 		integrated_designers_spirit = {
 			ledger = navy
-			available = { has_doctrine = new_convoy_raiding }
-			visible = { has_dlc = "Man the Guns" }
 			research_bonus = {
 				ship_modules_tech = 0.20
 			}
@@ -381,14 +361,6 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Step Back" }
 				}
-				modifier = {
-					factor = 2
-					OR = {
-					has_doctrine = anti_aircraft_cruisers
-					has_doctrine = battlecruiser_supremacy
-					has_doctrine = escort_carrier_support
-					}
-				}
 			}
 		}
 		naval_reform_spirit = {
@@ -403,21 +375,13 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Step Back" }
 				}
-				modifier = {
-					factor = 2
-					OR = {
-					has_doctrine = submarine_fleet_operations
-					has_doctrine = massed_carrier_fleet
-					has_doctrine = hunter_killers
-					}
-				}
 			}
 		}
 		naval_refit_yards_spirit = {
 			ledger = navy
 			modifier = {
-				refit_speed = 0.15
-				repair_speed_factor = 0.15
+				refit_speed = 0.1
+				repair_speed_factor = 0.1
 			}
 			ai_will_do = {
 				factor = 1
@@ -425,14 +389,6 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Step Back" }
 				}
-				modifier = {
-					factor = 2
-					OR = {
-					has_doctrine = naval_gunfire_support
-					has_doctrine = broad_naval_support
-					has_doctrine = screen_support_focus
-					}
-				}
 			}
 		}
 		
@@ -504,7 +460,7 @@ ideas = {
            available = {
                has_navy_size = {
                    archetype = ship_hull_civilian
-                    size > 30
+                    size > 29
                }
            }
            modifier = {
@@ -584,12 +540,8 @@ ideas = {
 					NOT = { has_dlc = "No Step Back" }
 				}
 				modifier = {
-					factor = 2
-					OR = {
-					has_doctrine = wolfpacks
-					has_doctrine = torpedo_primacy
-					has_doctrine = floating_airfields
-					}
+					factor = 100
+					tag = CHY
 				}
 			}
 		}
@@ -608,14 +560,6 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Step Back" }
 				}
-				modifier = {
-					factor = 2
-					OR = {
-					has_doctrine = wolfpacks
-					has_doctrine = battlecruiser_supremacy
-					has_doctrine = massed_carrier_fleet
-					}	
-				}			
 			}
 		}
 		efficient_communications_spirit = {
@@ -659,7 +603,7 @@ ideas = {
 				naval_retreat_chance = -0.1
 				naval_retreat_speed = -0.1
 				naval_torpedo_hit_chance_factor = 0.1
-				naval_hit_chance = 0.1
+				naval_hit_chance = 0.05
 			}
 			ai_will_do = {
 				factor = 1.5
@@ -697,14 +641,6 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Step Back" }
 				}
-				modifier = {
-					factor = 2
-					OR = {
-					has_doctrine = line_of_battle
-					has_doctrine = capital_hunters
-					has_doctrine = convoy_escort
-					}
-				}
 			}
 		} 
 		bureau_of_ordnance_spirit = {
@@ -720,7 +656,6 @@ ideas = {

 		naval_tripwire_navy_spirit = {
 			ledger = navy
-			visible = { has_dlc = "No Compromise, No Surrender" }
 			available = { 
 				OR = {
 					has_doctrine = new_convoy_raiding
@@ -737,10 +672,6 @@ ideas = {
 					factor = 0
 					NOT = { has_dlc = "No Compromise, No Surrender" }
 				}
-				modifier = {
-					factor = 2
-					has_doctrine = coastal_defence_fleet
-				}
 			}
 		}
 		
@@ -794,7 +725,7 @@ ideas = {
        inflexible_headquarter = {
            ledger = navy
            modifier = {
-                political_power_factor = 0.05
+                political_power_gain = 0.05
                navy_advisor_cost_factor = 0.25
                navy_leader_cost_factor = 0.25
                navy_intel_to_others = 20
@@ -838,6 +769,9 @@ ideas = {
                ship_hull_heavy_design_cost_factor = 0.2
                production_speed_dockyard_factor = -0.25
            }
+			ai_will_do = {
+				factor = 0
+			}
        }
 	}
 }
--- a/src/common/technologies/MTG_naval.txt
+++ b/src/common/technologies/MTG_naval.txt
@@ -631,7 +631,7 @@ technologies = {
 			custom_effect_tooltip = dd_tech_3_tt
 		}

-		research_cost = 0.8
+		research_cost = 0.6

 		start_year = 1930

@@ -791,7 +791,7 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = dd_tech_4_tt
 		}
-		research_cost = 1.25
+		research_cost = 1

 		navy_submarine_detection_factor = 0.2

@@ -854,7 +854,7 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = dd_tech_6_tt
 		}
-		research_cost = 0.8
+		research_cost = 0.65
 		enable_equipment_modules = {
 			ship_hull_light_role_dl
 		}
@@ -888,7 +888,7 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = dd_tech_8_tt
 		}
-		research_cost = 0.7
+		research_cost = 0.5
 		enable_equipment_modules = {
 			ship_hull_light_role_de
 		}
@@ -1581,7 +1581,7 @@ technologies = {
 			ship_decoy_launcher
 		}

-		research_cost = 0.4
+		research_cost = 0.25
 		start_year = 1951

 		folder = {
@@ -1607,7 +1607,7 @@ technologies = {
 	signal_control = {
 		navy_visibility = -0.1

-		research_cost = 0.8
+		research_cost = 0.75
 		start_year = 1951

 		folder = {
@@ -1636,9 +1636,9 @@ technologies = {
 		enable_equipment_modules = {
 			ship_radar_finder
 		}
-		naval_enemy_fleet_size_ratio_penalty_factor = 0.2
+		naval_enemy_fleet_size_ratio_penalty_factor = 0.1

-		research_cost = 1
+		research_cost = 0.6
 		start_year = 1954

 		folder = {
@@ -1784,7 +1784,7 @@ technologies = {
 			custom_effect_tooltip = ca_tech_3_tt
 		}

-		research_cost = 0.6
+		research_cost = 0.5

 		start_year = 1932

@@ -2156,7 +2156,7 @@ technologies = {

 	cruiser_gun_upgrade = {
 		on_research_complete = {
-			custom_effect_tooltip = ca_tech_4_tt
+			custom_effect_tooltip = ca_tech_12_tt
 		}
 		start_year = 1934
 		research_cost = 0.75
@@ -2190,7 +2190,7 @@ technologies = {
 	}
 	cruiser_aa_upgrade = {
 		on_research_complete = {
-			custom_effect_tooltip = ca_tech_6_tt
+			custom_effect_tooltip = dd_tech_10_tt
 		}
 		start_year = 1936
 		research_cost = 0.3
@@ -2262,7 +2262,7 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = ca_tech_0_2_tt
 		}
-		research_cost = 1.25
+		research_cost = 1
 		start_year = 1944

 		heavy_cruiser = {
@@ -2278,6 +2278,10 @@ technologies = {
 			ship_hull_cruiser_role_csr
 		}

+		dependencies = {
+			cavity_magnatron = 1
+		}
+
 		folder = {
 			name = mtgnavalfolder
 			position = { x = -2 y = @1940_module }
@@ -2297,7 +2301,7 @@ technologies = {
 	}

 	fighter_directional_system = {
-		research_cost = 1
+		research_cost = 0.8
 		start_year = 1945

 		navy_anti_air_attack_factor = 0.1
@@ -2696,7 +2700,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 1
+		research_cost = 0.85

 		start_year = 1932

@@ -2750,7 +2754,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 0.8
+		research_cost = 0.65

 		start_year = 1932

@@ -2794,7 +2798,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 1.25
+		research_cost = 1

 		start_year = 1941

@@ -3362,7 +3366,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.25
-		research_cost = 0.75
+		research_cost = 0.65

 		start_year = 1932

@@ -3395,7 +3399,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.25
-		research_cost = 1
+		research_cost = 0.8

 		start_year = 1942

@@ -3428,7 +3432,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.25
-		research_cost = 0.75
+		research_cost = 0.6

 		repair_speed_factor = 0.1

@@ -3466,7 +3470,22 @@ technologies = {
 		xp_research_bonus = 1.25
 		research_cost = 0.5

-		strike_force_movement_org_loss = -0.1
+		battleship = {
+			patrol_coordination = 0.1
+			surface_detection = 0.05
+		}
+		battle_cruiser = {
+			patrol_coordination = 0.1
+			surface_detection = 0.05
+		}
+		SH_battleship = {
+			patrol_coordination = 0.1
+			surface_detection = 0.05
+		}
+		battlecarrier = {
+			patrol_coordination = 0.1
+			surface_detection = 0.05
+		}

 		start_year = 1924

@@ -3574,7 +3593,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 0.5
+		research_cost = 0.25

 		critical_receive_chance = -0.05

@@ -3634,14 +3653,8 @@ technologies = {

 		start_year = 1943

-		battleship = {
-			anti_air_attack = 0.1
-		}
-		battle_cruiser = {
-			anti_air_attack = 0.1
-		}
-		SH_battleship = {
-			anti_air_attack = 0.1
+		on_research_complete = {
+			custom_effect_tooltip = dd_tech_10_tt
 		}

 		enable_equipment_modules = {
@@ -3681,40 +3694,9 @@ technologies = {
 		research_cost = 0.75
 		start_year = 1940

-		naval_retreat_speed_after_initial_combat = 0.25
-		SH_battleship = {
-			water_fjords = {
-				movement = 0.05
-			}
-			water_shallow_sea = {
-				movement = 0.05
-			}
-			water_deep_ocean = {
-				movement = 0.05
-			}
-		}
-		battleship = {
-			water_fjords = {
-				movement = 0.05
-			}
-			water_shallow_sea = {
-				movement = 0.05
-			}
-			water_deep_ocean = {
-				movement = 0.05
-			}
-		}
-		battle_cruiser = {
-			water_fjords = {
-				movement = 0.05
-			}
-			water_shallow_sea = {
-				movement = 0.05
-			}
-			water_deep_ocean = {
-				movement = 0.05
-			}
-		}
+		naval_retreat_speed_after_initial_combat = 0.1
+		naval_retreat_chance_after_initial_combat = 0.1
+		naval_torpedo_enemy_critical_chance_factor = -0.05

 		folder = {
 			name = mtgnavalfolder
@@ -3738,7 +3720,18 @@ technologies = {
 		research_cost = 0.5
 		start_year = 1944

-		navy_max_range_factor = 0.1
+		battleship = {
+			naval_range = 0.15
+		}
+		battle_cruiser = {
+			naval_range = 0.15
+		}
+		SH_battleship = {
+			naval_range = 0.15
+		}
+		battlecarrier = {
+			naval_range = 0.15
+		}

 		folder = {
 			name = mtgnavalfolder
@@ -3759,10 +3752,9 @@ technologies = {
 	}

 	radar_jammer = {
-		research_cost = 1
+		research_cost = 0.75
 		start_year = 1945

-		navy_visibility = -0.05
 		enable_equipment_modules = {
 			ship_radar_jammer
 		}
@@ -3883,7 +3875,7 @@ technologies = {
 	}

 	cryptography_revolution = {
-		research_cost = 0.8
+		research_cost = 0.65
 		start_year = 1950

 		army_intel_to_others = -25
@@ -3899,7 +3891,7 @@ technologies = {
 		}

 		ai_will_do = {
-			factor = 1
+			factor = 0.25
 		}
 		allow_branch = {
 			has_dlc = "La Resistance"
@@ -3917,7 +3909,7 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = cw_tech_2_tt
 		}
-		research_cost = 1.5
+		research_cost = 0.5
 		naval_hit_chance = 0.05
 		naval_critical_score_chance_factor = 0.05

@@ -4061,7 +4053,7 @@ technologies = {
 		}
 	}
 	recon_drones = {
-		research_cost = 1
+		research_cost = 0.5
 		enable_equipment_modules = {
 			recon_drone_1
 		}
@@ -4090,7 +4082,7 @@ technologies = {
 		}
 	}
 	electromagnetic_signature_study = {
-		research_cost = 2
+		research_cost = 1.25
 		navy_visibility = -0.1
 		naval_mines_effect_reduction = 0.1

@@ -4176,7 +4168,7 @@ technologies = {
 			leads_to_tech = early_ship_hull_carrier
 			research_cost_coeff = 1
 		}
-		research_cost = 0.5
+		research_cost = 0.8

 		start_year = 1920

@@ -4577,7 +4569,7 @@ technologies = {
 		start_year = 1932

 		xp_research_type = navy
-		xp_boost_cost = 10
+		xp_boost_cost = 50
 		xp_research_bonus = 2.5

 		experience_gain_carrier_training_factor = 0.1
@@ -4719,7 +4711,7 @@ technologies = {
 		}
 	}
 	air_fuel_storage = {
-		research_cost = 1.25
+		research_cost = 1
 		start_year = 1942

 		xp_research_type = navy
@@ -4737,9 +4729,6 @@ technologies = {
 		cv_nav_bomber = {
 			air_range = 0.2
 		}
-		carrier = {
-			surface_detection = 0.1
-		}
 		enable_equipment_modules = {
 			carrier_fuel_storage
 		}
@@ -4769,7 +4758,7 @@ technologies = {
 	}

 	carrier_mass_production = {
-		research_cost = 1.75
+		research_cost = 1.5
 		start_year = 1942

 		xp_research_type = navy
@@ -4814,7 +4803,7 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = cv_tech_7_tt
 		}
-		research_cost = 1.5
+		research_cost = 1.25
 		start_year = 1942

 		xp_research_type = navy
@@ -4892,7 +4881,7 @@ technologies = {
 	}

 	full_armored_carrier = {
-		research_cost = 0.7
+		research_cost = 1
 		start_year = 1944

 		carrier = {
@@ -4934,7 +4923,7 @@ technologies = {
 	}

 	carrier_angled_deck = {
-		research_cost = 0.5
+		research_cost = 0.75
 		start_year = 1944

 		enable_equipment_modules = {
@@ -4973,7 +4962,7 @@ technologies = {
 		on_research_complete = {
 			custom_effect_tooltip = cv_tech_3_tt
 		}
-		research_cost = 1
+		research_cost = 0.75
 		start_year = 1948

 		navy_carrier_air_targetting_factor = 0.1
@@ -5030,7 +5019,7 @@ technologies = {
 		}
 	}
 	iff_device = {
-		research_cost = 1
+		research_cost = 0.75
 		start_year = 1951

 		air_accidents_factor = -0.1
@@ -5056,7 +5045,7 @@ technologies = {
 		research_cost = 1
 		start_year = 1951

-		air_carrier_night_penalty_reduction_factor = -0.1
+		air_carrier_night_penalty_reduction_factor = 0.1
 		carrier_night_traffic = 0.1

 		folder = {
@@ -5541,7 +5530,7 @@ technologies = {
 	}

 	acoustic_signature = {
-		research_cost = 1
+		research_cost = 0.6

 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -5768,7 +5757,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 20
 		xp_research_bonus = 1.50
-		research_cost = 1.5
+		research_cost = 1.25

 		start_year = 1944

@@ -6229,6 +6218,10 @@ technologies = {
 	super_carriers = {
 		on_research_complete = {
 			custom_effect_tooltip = cv_tech_8_tt
+			if = {
+				limit = { original_tag = BYG }
+				custom_effect_tooltip = topgun_spirit_tt
+			}
 		}
 		enable_equipments = {
 			vnr_ship_hull_super_carrier
--- a/src/common/technologies/MTG_naval_Support.txt
+++ b/src/common/technologies/MTG_naval_Support.txt
@@ -2993,8 +2993,8 @@ technologies = {
 			position = { x = 2 y = 12 }
 		}

-		repair_speed_naval_base_factor = 0.1
-		repair_speed_dockyard_factor = 0.1
+		repair_speed_naval_base_factor = 0.2
+		repair_speed_dockyard_factor = 0.2
 		special_project_specialization = { specialization_naval }
 		categories = {
 			naval_equipment
@@ -3148,7 +3148,6 @@ technologies = {
 		auxiliary_ship = {
 			max_strength = 0.1
 		}
-		navy_submarine_detection_factor = 0.05

 		enable_equipment_modules = {
 			ship_cruiser_camo_2
@@ -3392,7 +3391,7 @@ technologies = {
 		}
 	}
 	hospital_ship = {
-		research_cost = 0.35
+		research_cost = 0.15
 		start_year = 1918

 		ai_will_do = {
@@ -3509,7 +3508,7 @@ technologies = {
 		}
 	}
 	retardant_silo = {
-		research_cost = 0.75
+		research_cost = 0.4
 		start_year = 1936

 		ai_will_do = {
@@ -3527,7 +3526,7 @@ technologies = {
 		}
 	}
 	integrated_fuel_base = {
-		research_cost = 1
+		research_cost = 0.5
 		start_year = 1938

 		ai_will_do = {