2025-06-29 04:02:46

src/common/ai_equipment/vnr_battleships.txt

@@ -59,22 +59,21 @@ naval_capital_battleship = {
 
 			type = vnr_ship_hull_heavy_3
 			modules = {
-				fixed_ship_battery_slot = ship_heavy_battery
+				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_radar_slot = ship_mast
+				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_secondaries
+				fixed_ship_secondaries_slot = ship_dp_secondaries_bb
 				fixed_ship_armor_slot = { upgrade = current any_of = { 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_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } }
 				fixed_ship_airplane_launcher_slot = ship_airplane_launcher
 				fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = ship_heavy_battery
+				front_1_custom_slot = ship_heavy_battery_triple
-				mid_1_custom_slot = ship_secondaries
+				mid_1_custom_slot = ship_dp_secondaries_bb
 				mid_2_custom_slot = ship_anti_air
-				rear_1_custom_slot = ship_heavy_battery
+				rear_1_custom_slot = ship_heavy_battery_triple
-				rear_2_custom_slot = ship_heavy_battery
 			}
 		}
 	}
@@ -96,7 +95,7 @@ naval_capital_battleship = {
 
 			type = vnr_ship_hull_heavy_4
 			modules = {
-				fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				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_radar_slot = ship_radar
@@ -107,12 +106,12 @@ naval_capital_battleship = {
 				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_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				front_1_custom_slot = ship_heavy_battery_triple
 				mid_1_custom_slot = ship_secondaries
 				mid_2_custom_slot = ship_anti_air
 				mid_3_custom_slot = ship_dp_secondaries_bb
-				rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				rear_1_custom_slot = ship_heavy_battery_triple
-				rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				rear_2_custom_slot = ship_heavy_battery_triple
 			}
 		}
 	}
@@ -134,7 +133,7 @@ naval_capital_battleship = {
 
 			type = vnr_ship_hull_heavy_5
 			modules = {
-				fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				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_radar_slot = ship_radar
@@ -145,12 +144,12 @@ naval_capital_battleship = {
 				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_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				front_1_custom_slot = ship_heavy_battery_triple
 				mid_1_custom_slot = ship_dp_secondaries_bb
 				mid_2_custom_slot = ship_anti_air
 				mid_3_custom_slot = ship_dp_secondaries_bb
-				rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				rear_1_custom_slot = ship_heavy_battery_triple
-				rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				rear_2_custom_slot = ship_heavy_battery_triple
 			}
 		}
 	}
@@ -172,7 +171,7 @@ naval_capital_battleship = {
 
 			type = vnr_ship_hull_heavy_5
 			modules = {
-				fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				fixed_ship_battery_slot = ship_heavy_battery_triple
 				fixed_ship_anti_air_slot = ship_missile_aa
 				fixed_ship_fire_control_system_slot = ship_fire_control_system
 				fixed_ship_radar_slot = ship_radar
@@ -183,11 +182,11 @@ naval_capital_battleship = {
 				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_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } }
-				front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				front_1_custom_slot = ship_heavy_battery_triple
 				mid_1_custom_slot = ship_dp_secondaries_bb
 				mid_2_custom_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } }
 				mid_3_custom_slot = ship_dp_secondaries_bb
-				rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } }
+				rear_1_custom_slot = ship_heavy_battery_triple
 				rear_2_custom_slot = ship_missile_aa
 			}
 		}
@@ -200,7 +199,7 @@ naval_capital_battleship = {
 		priority = {
 			base = 0
 			modifier = { add = 50 tag = JAP }
-			modifier = { factor = 0 has_navy_size = { unit = SH_battleship size > 4 } }
+			modifier = { factor = 0 has_navy_size = { unit = SH_battleship size > 3 } }
 			modifier = { factor = 0 expert_ai_style = yes }
 		}
 

src/common/ai_equipment/vnr_cv_planes.txt

@@ -141,11 +141,7 @@ vnr_cv_cas = {
     roles = { air_cv_cas }
 
     priority = {
-        factor = 9999
+        factor = 0
-        modifier = {
-            factor = 0
-            has_game_rule = { rule = RULE_AI_AIR_DESIGN option = BLOCKED }
-        }
     }
 
     1936_cv_cas = {

src/common/ai_strategy/naval_production.txt

@@ -2244,7 +2244,7 @@ we_need_cv_planes_1 = {
 	ai_strategy = {
 		type = unit_ratio
 		id = cv_cas
-		value = 10
+		value = 1
 	}
 	
 	ai_strategy = {
@@ -2256,13 +2256,13 @@ we_need_cv_planes_1 = {
 	ai_strategy = {
 		type = equipment_production_factor
 		id = cv_naval_bomber
-		value = 20
+		value = 50
 	}
 	
 	ai_strategy = {
 		type = equipment_production_factor
 		id = cv_cas
-		value = 20
+		value = 1
 	}
 
 	ai_strategy = {
@@ -2309,31 +2309,31 @@ we_need_cv_planes_2 = {
 	ai_strategy = {
 		type = unit_ratio
 		id = cv_naval_bomber
-		value = 25
+		value = 45
 	}
 	
 	ai_strategy = {
 		type = unit_ratio
 		id = cv_cas
-		value = 20
+		value = 1
 	}
 	
 	ai_strategy = {
 		type = equipment_production_factor
 		id = cv_fighter
-		value = 50
+		value = 35
 	}
 
 	ai_strategy = {
 		type = equipment_production_factor
 		id = cv_naval_bomber
-		value = 40
+		value = 50
 	}
 	
 	ai_strategy = {
 		type = equipment_production_factor
 		id = cv_cas
-		value = 40
+		value = 1
 	}
 
 	ai_strategy = {
@@ -2351,7 +2351,7 @@ we_need_cv_planes_2 = {
 	ai_strategy = {
 		type = equipment_production_min_factories
 		id = cv_cas
-		value = 5
+		value = 1
 	}
 
 	ai_strategy = {
@@ -2373,37 +2373,37 @@ we_need_cv_planes_3 = {
 	ai_strategy = {
 		type = unit_ratio
 		id = cv_fighter
-		value = 50
+		value = 45
 	}
 
 	ai_strategy = {
 		type = unit_ratio
 		id = cv_naval_bomber
-		value = 40
+		value = 60
 	}
 	
 	ai_strategy = {
 		type = unit_ratio
 		id = cv_cas
-		value = 35
+		value = 1
 	}
 	
 	ai_strategy = {
 		type = equipment_production_factor
 		id = cv_fighter
-		value = 80
+		value = 60
 	}
 
 	ai_strategy = {
 		type = equipment_production_factor
 		id = cv_naval_bomber
-		value = 60
+		value = 100
 	}
 	
 	ai_strategy = {
 		type = equipment_production_factor
 		id = cv_cas
-		value = 60
+		value = 1
 	}
 
 	ai_strategy = {
@@ -2421,7 +2421,7 @@ we_need_cv_planes_3 = {
 	ai_strategy = {
 		type = equipment_production_min_factories
 		id = cv_cas
-		value = 8
+		value = 1
 	}
 
 	ai_strategy = {

src/common/ai_strategy/vnr_naval_strategy.txt

@@ -245,16 +245,36 @@ USA_pacific_war_naval_avoid_first = {
 		id = 77
 		value = 100
 	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 78
+		value = 100
+	}
 	ai_strategy = {
 		type = naval_avoid_region
 		id = 79
 		value = 100
 	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 84
+		value = 50
+	}
 	ai_strategy = {
 		type = naval_avoid_region
 		id = 90
 		value = 100
 	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 94
+		value = 100
+	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 97
+		value = 100
+	}
 	ai_strategy = {
 		type = naval_avoid_region
 		id = 177

src/common/scripted_effects/_add_starting_tech.txt

@@ -425,6 +425,7 @@ makeup_starting_techs = {
             mixed_armor_scheme = 1
 			basic_heavy_armor = 1
 			krupp_steel = 1
+            fuel_oil_boiler = 1
 			popup = no
 		}
 	}

src/common/scripted_guis/00_navy_rework_welcome_splash_gui.txt

@@ -10,6 +10,12 @@ scripted_gui = {
 			has_global_flag = navy_rework_splash_show
 		}
 
+		properties = {
+			naval_rework_logo = {
+				image = "[get_naval_rework_logo]"
+			}
+		}
+
 		triggers = {
 
 			tab_1_click_enabled = { NOT = { check_variable = { navy_rework_welcome_splash_variable = 1 } } }

src/common/scripted_localisation/vnr_scripted_gfx.txt

@@ -0,0 +1,9 @@
+defined_text = {
+    name = get_naval_rework_logo
+    text = {
+        random_list = {
+            50 = { localization_key = GFX_navy_splash_intro }
+            10 = { localization_key = GFX_navy_splash_intro_1 }
+        }
+    }
+}

src/common/special_projects/projects/naval_projects.txt

@@ -472,7 +472,7 @@ sp_naval_underway_replenishment = {
 				
 				iteration_output = {
 					country_effects = { 
-						custom_effect_tooltip = sp_naval_underway_replenishment_pick_a_tt
+						custom_effect_tooltip = tech_effect|sp_naval_underway_replenishment_pick_a
 						hidden_effect = {
 							set_technology = {
 								sp_naval_underway_replenishment_pick_a = 1
@@ -499,7 +499,7 @@ sp_naval_underway_replenishment = {
 				
 				iteration_output = {
 					country_effects = { 
-						custom_effect_tooltip = sp_naval_underway_replenishment_pick_b_tt
+						custom_effect_tooltip = tech_effect|sp_naval_underway_replenishment_pick_b
 						hidden_effect = {
 							set_technology = {
 								sp_naval_underway_replenishment_pick_b = 1

src/common/technologies/MTG_naval.txt

@@ -503,6 +503,7 @@ technologies = {
 
 		enable_equipment_modules = {
 			ship_depth_charge_4
+			ship_asw_battery_1
 		}
 		on_research_complete = {
 			custom_effect_tooltip = depth_charges_advice_tt
@@ -3639,7 +3640,7 @@ technologies = {
 			research_cost_coeff = 1
 		}
 		path = {
-			leads_to_tech = symmetric_key_algorithm
+			leads_to_tech = cryptography_revolution
 			research_cost_coeff = 1
 		}
 
@@ -3659,11 +3660,13 @@ technologies = {
 		}
 	}
 
-	symmetric_key_algorithm = {
+	cryptography_revolution = {
 		research_cost = 0.8
 		start_year = 1950
 
-		navy_intel_to_others = -20
+		army_intel_to_others = -25
+		navy_intel_to_others = -25
+		airforce_intel_to_others = -25
 
 		folder = {
 			name = mtgnavalfolder
@@ -4326,7 +4329,10 @@ technologies = {
 			}
 		}
 		on_research_complete = {
-			add_political_power = -20
+			if = {
+				limit = { NOT = { has_tech = aviation_dawn } }
+				add_political_power = -20
+			}
 		}
 
 		folder = {
@@ -4365,7 +4371,7 @@ technologies = {
 		xp_research_bonus = 1.25
 
 		cv_cas = {
-			naval_strike_attack = 0.3
+			naval_strike_attack = 0.2
 			naval_strike_targetting = 0.15
 			air_agility = 0.15
 			maximum_speed = 0.1

src/common/technologies/MTG_naval_Support.txt

@@ -1389,6 +1389,8 @@ technologies = {
 		enable_equipment_modules = {
 			dp_light_battery_5
 			dp_light_battery_5_single
+			dp_ship_secondaries_5
+			dp_ship_secondaries_5_bb
 		}
 
 		folder = {

src/common/units/battlecruiser.txt

@@ -17,7 +17,7 @@ sub_units = {
 
 		max_organisation = 50
 
-		supply_consumption = 0.4
+		supply_consumption = 0.33
 		
 		critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire }
 		critical_part_damage_chance_mult = 1.25

src/common/units/battleship.txt

@@ -9,7 +9,7 @@ sub_units = {
 		
 		max_organisation = 50
 
-		supply_consumption = 0.45
+		supply_consumption = 0.35
 		
 		critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire }
 		critical_part_damage_chance_mult = 1 

src/common/units/carrier.txt

@@ -10,7 +10,7 @@ sub_units = {
 		}
 		need = { ship_hull_carrier = 1 }
 
-		supply_consumption = 0.4
+		supply_consumption = 0.3
 
 		max_organisation = 40
 

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

@@ -347,9 +347,9 @@ equipment_modules = {
 	carrier_scouting_unit = {
 		category = carrier_unit
 		add_stats = {
-			surface_detection = 8
+			surface_detection = 5
-			sub_detection = 5
+			sub_detection = 4
-			build_cost_ic = 400
+			build_cost_ic = 350
 		}
 	}
 	carrier_spared_squad = {
@@ -442,10 +442,8 @@ equipment_modules = {
 		category = carrier_unit
 		add_stats = {
 			build_cost_ic = 800
-		}
+			surface_detection = 10
-		multiply_stats = {
+			sub_detection = 8
-			surface_detection = 0.3
-			sub_detection = 0.2
 		}
 	}
 	coldwar_upgrade_cv = {

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

@@ -894,6 +894,7 @@ equipment_modules = {
 			build_cost_ic = 400
 			naval_light_gun_hit_chance_factor = 0.006
 			max_strength = 19
+			reliability = -0.03
 		}
 		multiply_stats = {
 			naval_speed = -0.04
@@ -917,9 +918,10 @@ equipment_modules = {
 			build_cost_ic = 450
 			naval_light_gun_hit_chance_factor = 0.007
 			max_strength = 24.5
+			reliability = -0.04
 		}
 		multiply_stats = {
-			naval_speed = -0.05
+			naval_speed = -0.06
 		}
 		add_average_stats = {
 			lg_armor_piercing = 13
@@ -939,9 +941,10 @@ equipment_modules = {
 			build_cost_ic = 500
 			naval_light_gun_hit_chance_factor = 0.008
 			max_strength = 30
+			reliability = -0.05
 		}
 		multiply_stats = {
-			naval_speed = -0.06
+			naval_speed = -0.08
 		}
 		add_average_stats = {
 			lg_armor_piercing = 15
@@ -987,6 +990,7 @@ equipment_modules = {
 			build_cost_ic = 325
 			naval_light_gun_hit_chance_factor = 0.006
 			max_strength = 15
+			reliability = -0.02
 		}
 		multiply_stats = {
 			naval_speed = -0.035
@@ -1010,9 +1014,10 @@ equipment_modules = {
 			build_cost_ic = 375
 			naval_light_gun_hit_chance_factor = 0.007
 			max_strength = 20
+			reliability = -0.03
 		}
 		multiply_stats = {
-			naval_speed = -0.045
+			naval_speed = -0.05
 		}
 		add_average_stats = {
 			lg_armor_piercing = 13
@@ -1032,9 +1037,10 @@ equipment_modules = {
 			build_cost_ic = 400
 			naval_light_gun_hit_chance_factor = 0.008
 			max_strength = 24
+			reliability = -0.04
 		}
 		multiply_stats = {
-			naval_speed = -0.055
+			naval_speed = -0.065
 		}
 		add_average_stats = {
 			lg_armor_piercing = 15
@@ -1080,6 +1086,7 @@ equipment_modules = {
 			build_cost_ic = 250
 			naval_light_gun_hit_chance_factor = 0.002
 			max_strength = 11.5
+			reliability = -0.01
 		}
 		multiply_stats = {
 			naval_speed = -0.035
@@ -1103,6 +1110,7 @@ equipment_modules = {
 			build_cost_ic = 275
 			naval_light_gun_hit_chance_factor = 0.003
 			max_strength = 15
+			reliability = -0.02
 		}
 		multiply_stats = {
 			naval_speed = -0.045
@@ -1125,6 +1133,7 @@ equipment_modules = {
 			build_cost_ic = 325
 			naval_light_gun_hit_chance_factor = 0.004
 			max_strength = 18
+			reliability = -0.03
 		}
 		multiply_stats = {
 			naval_speed = -0.055
@@ -1149,10 +1158,11 @@ equipment_modules = {
 			build_cost_ic = 400
 			naval_light_gun_hit_chance_factor = 0.007
 			max_strength = 28
+			reliability = -0.045
 		}
 
 		multiply_stats = {
-			naval_speed = -0.055
+			naval_speed = -0.065
 		}
 		
 		add_average_stats = {
@@ -1854,7 +1864,7 @@ equipment_modules = {
 			surface_visibility = 1
 			hg_attack = 18
 			build_cost_ic = 1650
-			reliability = -0.12
+			reliability = -0.08
 		}
 		multiply_stats = {
 			naval_speed = -0.065
@@ -2133,6 +2143,26 @@ equipment_modules = {
 		critical_parts = { damaged_secondaries }
 	}
 
+	dp_ship_secondaries_5 = {
+		category = ship_dp_secondaries
+		gui_category = ship_secondaries
+		parent = dp_ship_secondaries_4
+		sfx = sfx_ui_sd_module_turret
+		add_stats = {
+			lg_attack = 5
+			anti_air_attack = 4
+			naval_light_gun_hit_chance_factor = 0.005
+			build_cost_ic = 330
+		}
+
+		multiply_stats = {
+			naval_speed = -0.035
+		}
+		
+		dismantle_cost_ic = 75
+		critical_parts = { damaged_secondaries }
+	}
+
 	dp_ship_secondaries_1_bb = {
 		category = ship_dp_secondaries_bb
 		gui_category = ship_secondaries
@@ -2158,7 +2188,7 @@ equipment_modules = {
 	dp_ship_secondaries_2_bb = {
 		category = ship_dp_secondaries_bb
 		gui_category = ship_secondaries
-		parent = dp_ship_secondaries_1
+		parent = dp_ship_secondaries_1_bb
 		gfx = dp_ship_secondaries_2
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -2181,7 +2211,7 @@ equipment_modules = {
 	dp_ship_secondaries_3_bb = {
 		category = ship_dp_secondaries_bb
 		gui_category = ship_secondaries
-		parent = dp_ship_secondaries_2
+		parent = dp_ship_secondaries_2_bb
 		gfx = dp_ship_secondaries_3
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -2204,7 +2234,7 @@ equipment_modules = {
 	dp_ship_secondaries_4_bb = {
 		category = ship_dp_secondaries_bb
 		gui_category = ship_secondaries
-		parent = dp_ship_secondaries_3
+		parent = dp_ship_secondaries_3_bb
 		gfx = dp_ship_secondaries_4
 		sfx = sfx_ui_sd_module_turret
 		add_stats = {
@@ -2224,6 +2254,30 @@ equipment_modules = {
 		critical_parts = { damaged_secondaries }
 	}
 
+	dp_ship_secondaries_5_bb = {
+		category = ship_dp_secondaries_bb
+		gui_category = ship_secondaries
+		parent = dp_ship_secondaries_4_bb
+		gfx = dp_ship_secondaries_5
+		sfx = sfx_ui_sd_module_turret
+		add_stats = {
+			lg_attack = 5
+			anti_air_attack = 4
+			naval_light_gun_hit_chance_factor = 0.005
+			build_cost_ic = 330
+		}
+
+		multiply_stats = {
+			naval_speed = -0.035
+		}
+		add_average_stats = {
+			lg_armor_piercing = 13
+		}
+		
+		dismantle_cost_ic = 75
+		critical_parts = { damaged_secondaries }
+	}
+
 
 ################
 ##  MISSILES  ##
@@ -2438,4 +2492,28 @@ equipment_modules = {
 		}
 		dismantle_cost_ic = 1800 
 	}
+
+###################
+##  ASW Battery  ##
+###################
+	ship_asw_battery_1 = {
+		category = ship_light_battery
+		gui_category = ship_light_battery_all
+		sfx = sfx_ui_sd_module_turret
+
+		add_stats = {
+			lg_attack = 1.5
+			sub_attack = 6
+			build_cost_ic = 120
+		}
+		multiply_stats = {
+			naval_speed = -0.015
+		}
+		add_average_stats = {
+			lg_armor_piercing = 6
+		}
+		dismantle_cost_ic = 10
+		
+		critical_parts = { damaged_light_guns }
+	}
 }

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

@@ -179,12 +179,12 @@ equipment_modules = {
 			#naval_speed = 5
 			fuel_consumption = 5
 			build_cost_ic = 200
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.17
-			naval_range = 0.3
+			naval_range = 0.6
 		}
 		
 		can_convert_from = {
@@ -203,12 +203,12 @@ equipment_modules = {
 			#naval_speed = 5
 			fuel_consumption = 7
 			build_cost_ic = 250
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.22
-			naval_range = 0.4
+			naval_range = 0.7
 		}
 		
 		can_convert_from = {
@@ -231,12 +231,12 @@ equipment_modules = {
 			#naval_speed = 5
 			fuel_consumption = 9
 			build_cost_ic = 300
-			reliability = -0.05
+			reliability = 0.05
 		}
 
 		multiply_stats = {
 			naval_speed = 0.27
-			naval_range = 0.5
+			naval_range = 0.8
 		}
 		
 		can_convert_from = {
@@ -591,12 +591,12 @@ equipment_modules = {
 			#naval_speed = 6
 			fuel_consumption = 12
 			build_cost_ic = 600
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.25
-			naval_range = 0.4
+			naval_range = 0.6
 		}
 		
 		can_convert_from = {
@@ -615,12 +615,12 @@ equipment_modules = {
 			#naval_speed = 7
 			fuel_consumption = 16
 			build_cost_ic = 660
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.3
-			naval_range = 0.5
+			naval_range = 0.7
 		}
 		
 		can_convert_from = {
@@ -643,12 +643,12 @@ equipment_modules = {
 			#naval_speed = 7
 			fuel_consumption = 20
 			build_cost_ic = 750
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.35
-			naval_range = 0.6
+			naval_range = 0.8
 		}
 		
 		can_convert_from = {
@@ -828,12 +828,12 @@ equipment_modules = {
 			#naval_speed = 10
 			fuel_consumption = 20
 			build_cost_ic = 2200
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.35
-			naval_range = 0.3
+			naval_range = 0.6
 		}
 		
 		can_convert_from = {
@@ -856,12 +856,12 @@ equipment_modules = {
 			#naval_speed = 11
 			fuel_consumption = 25
 			build_cost_ic = 2600
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.4
-			naval_range = 0.4
+			naval_range = 0.7
 		}
 		
 		can_convert_from = {
@@ -887,12 +887,12 @@ equipment_modules = {
 			#naval_speed = 12
 			fuel_consumption = 30
 			build_cost_ic = 3500
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.5
-			naval_range = 0.5
+			naval_range = 0.8
 		}
 		
 		can_convert_from = {
@@ -1201,12 +1201,12 @@ equipment_modules = {
 			#naval_speed = 5
 			fuel_consumption = 12
 			build_cost_ic = 2500
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.35
-			naval_range = 0.3
+			naval_range = 0.6
 		}
 		
 		can_convert_from = {
@@ -1229,12 +1229,12 @@ equipment_modules = {
 			#naval_speed = 5
 			fuel_consumption = 16
 			build_cost_ic = 3000
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.45
-			naval_range = 0.4
+			naval_range = 0.7
 		}
 		
 		can_convert_from = {
@@ -1260,12 +1260,12 @@ equipment_modules = {
 			#naval_speed = 5
 			fuel_consumption = 20
 			build_cost_ic = 3500
-			reliability = -0.05
+			reliability = 0.05
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.5
-			naval_range = 0.5
+			naval_range = 0.8
 		}
 		
 		can_convert_from = {
@@ -1296,6 +1296,8 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			naval_speed = 0.1
+			surface_visibility = 0.15
+			naval_range = 0.2
 		}
 		can_convert_from = {
 			module_category = civilian_ship_engine
@@ -1313,6 +1315,8 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			naval_speed = 0.3
+			surface_visibility = 0.1
+			naval_range = 0.4
 		}
 
 		can_convert_from = {

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

@@ -172,7 +172,7 @@ equipment_modules = {
 		parent = ship_armor_bc_2
 		multiply_stats = {
 			build_cost_ic = 0.15
-			naval_speed = -0.15
+			naval_speed = -0.2
 			max_strength = 0.12
 		}
 		build_cost_resources = {
@@ -242,7 +242,7 @@ equipment_modules = {
 		parent = ship_armor_bc_3
 		multiply_stats = {
 			build_cost_ic = 0.17
-			naval_speed = -0.2
+			naval_speed = -0.27
 			max_strength = 0.16
 		}
 		build_cost_resources = {
@@ -801,7 +801,7 @@ equipment_modules = {
 		category = ship_carrier_armor_heavy
 		gfx = ship_armor_2
 		add_equipment_type = capital_ship
-		parent = ship_armor_cruiser_heavy_1
+		parent = ship_armor_carrier_heavy_1
 		multiply_stats = {
 			build_cost_ic = 0.12
 			naval_speed = -0.1
@@ -850,7 +850,7 @@ equipment_modules = {
 		category = ship_carrier_armor_heavy
 		gfx = ship_armor_3
 		add_equipment_type = capital_ship
-		parent = ship_armor_cruiser_heavy_2
+		parent = ship_armor_carrier_heavy_2
 		multiply_stats = {
 			build_cost_ic = 0.15
 			naval_speed = -0.125
@@ -900,7 +900,7 @@ equipment_modules = {
 		category = ship_carrier_armor_heavy
 		gfx = ship_armor_bc_4
 		add_equipment_type = capital_ship
-		parent = ship_armor_cruiser_heavy_3
+		parent = ship_armor_carrier_heavy_3
 		multiply_stats = {
 			build_cost_ic = 0.18
 			naval_speed = -0.15
@@ -950,7 +950,7 @@ equipment_modules = {
 		category = ship_carrier_armor_heavy
 		gfx = ship_heavy_armor
 		add_equipment_type = capital_ship
-		parent = ship_armor_cruiser_heavy_4
+		parent = ship_armor_carrier_heavy_4
 		
 		multiply_stats = {
 			build_cost_ic = 0.2
@@ -1302,6 +1302,9 @@ equipment_modules = {
 			sub_visibility = -0.1
 			build_cost_ic = 0.2
 		}
+		build_cost_resources = {
+			rubber = 1
+		}
 		dismantle_cost_ic = 750
 	}
 

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

@@ -281,7 +281,7 @@ equipment_modules = {
 
 		
 		add_stats = {
-			torpedo_attack = 18
+			torpedo_attack = 15
 			build_cost_ic = 90
 		}
 		multiply_stats = {
@@ -301,7 +301,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			torpedo_attack = 24
+			torpedo_attack = 20
 			naval_torpedo_hit_chance_factor = 0.01
 			build_cost_ic = 120
 		}
@@ -332,7 +332,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			torpedo_attack = 30
+			torpedo_attack = 25
 			build_cost_ic = 150
 			naval_torpedo_hit_chance_factor = 0.015
 		}
@@ -356,7 +356,7 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			torpedo_attack = 36
+			torpedo_attack = 30
 			build_cost_ic = 180
 			naval_torpedo_hit_chance_factor = 0.02
 		}
@@ -379,7 +379,8 @@ equipment_modules = {
 		sfx = sfx_ui_sd_module_turret
 
 		add_stats = {
-			torpedo_attack = 40
+			torpedo_attack = 35
+			sub_attack = 12
 			build_cost_ic = 220
 			naval_torpedo_hit_chance_factor = 0.025
 		}
@@ -523,7 +524,7 @@ equipment_modules = {
 
 		add_stats = {
 			torpedo_attack = 30
-			sub_attack = 2.5
+			sub_attack = 8
 			build_cost_ic = 180
 			naval_torpedo_hit_chance_factor = 0.05
 		}
@@ -1321,7 +1322,7 @@ equipment_modules = {
 		gui_category = cold_war_miscellaneous
 		multiply_stats = {
 			reliability = -0.1
-			armor_value = -0.3
+			armor_value = -1
 			max_strength = -0.3
 			naval_speed = 0.3
 			build_cost_ic = 0.2
@@ -1330,6 +1331,10 @@ equipment_modules = {
 			aluminium = 2
 			steel = -3
 		}
+		forbid_module_categories = {
+			ship_cruiser_armor
+			ship_cruiser_heavy_armor
+		}
 	}
 	ship_anti_air_circle = {
 		category = heavy_miscellaneous

src/common/units/equipment/ship_hull_carrier.txt

@@ -391,6 +391,7 @@ equipments = {
 					ship_dp_secondaries_bb
 					ship_deck_space
 					ship_deck_space_small
+					carrier_miscellaneous
 				}
 			}
 		}
@@ -487,6 +488,7 @@ equipments = {
 					carrier_side_lift
 					carrier_angled_deck
 					carrier_helipad
+					carrier_miscellaneous
 				}
 			}
 			rear_1_custom_slot = {
@@ -690,6 +692,7 @@ equipments = {
 					carrier_side_lift
 					carrier_angled_deck
 					carrier_helipad
+					carrier_miscellaneous
 				}
 			}
 			mid_2_custom_slot = mid_1_custom_slot

src/common/units/equipment/ship_hull_cruiser.txt

@@ -68,6 +68,10 @@ equipments = {
 				required = no
 				allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous }
 			}
+			fixed_ship_extra_electronics_slot = {
+				required = no
+				allowed_module_categories = { ship_radar ship_sonar ship_fire_control_system }
+			}
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -149,6 +153,10 @@ equipments = {
 			category = ship_sonar
 			count < 2
 		}
+		module_count_limit = {
+			category = ship_fire_control_system
+			count < 2
+		}
 		module_count_limit = {
 			category = ship_missile
 			count < 3
@@ -628,6 +636,10 @@ equipments = {
 				required = no
 				allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous }
 			}
+			fixed_ship_extra_electronics_slot = {
+				required = no
+				allowed_module_categories = { ship_radar ship_sonar ship_fire_control_system }
+			}
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -831,6 +843,7 @@ equipments = {
 				allowed_module_categories = { c_role c_role_missile }
 			}
 			fixed_ship_extra_secondaries_slot = inherit
+			fixed_ship_extra_electronics_slot = inherit
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {
@@ -961,11 +974,11 @@ equipments = {
 			}
 			fixed_ship_secondaries_slot = inherit
 			fixed_ship_armor_slot = inherit
-			fixed_ship_airplane_launcher_slot = inherit
 			fixed_ship_role_slot = {
 				required = yes
 				allowed_module_categories = { c_role c_role_missile }
 			}
+			fixed_ship_extra_electronics_slot = inherit
 			fixed_ship_extra_secondaries_slot = inherit
 			fixed_ship_extra_missile_slot = fixed_ship_extra_secondaries_slot
 			front_1_custom_slot = {
@@ -1090,6 +1103,7 @@ equipments = {
 			fixed_ship_airplane_launcher_slot = inherit
 			fixed_ship_role_slot = inherit
 			fixed_ship_extra_secondaries_slot = inherit
+			fixed_ship_extra_electronics_slot = inherit
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {

src/common/units/equipment/ship_hull_light.txt

@@ -46,6 +46,10 @@ equipments = {
 				required = no
 				allowed_module_categories = { ship_radar ship_sonar ship_mast }
 			}
+			fixed_ship_extra_electronics_slot = {
+				required = no
+				allowed_module_categories = { ship_radar ship_sonar ship_fire_control_system }
+			}
 			fixed_ship_torpedo_slot = {
 				required = no
 				allowed_module_categories = { ship_torpedo }
@@ -127,7 +131,10 @@ equipments = {
 			category = ship_radar
 			count < 2
 		}
-
+		module_count_limit = {
+			category = ship_fire_control_system
+			count < 2
+		}
 		module_count_limit = {
 			category = ship_sonar
 			count < 2
@@ -335,6 +342,7 @@ equipments = {
 			}
 			fixed_ship_fire_control_system_slot = inherit
 			fixed_ship_radar_slot = inherit
+			fixed_ship_extra_electronics_slot = inherit
 			fixed_ship_torpedo_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_role_slot = {
@@ -437,6 +445,7 @@ equipments = {
 			}
 			fixed_ship_fire_control_system_slot = inherit
 			fixed_ship_radar_slot = inherit
+			fixed_ship_extra_electronics_slot = inherit
 			fixed_ship_torpedo_slot = inherit
 			fixed_ship_engine_slot = inherit
 			fixed_ship_role_slot = {

src/descriptor.mod

@@ -1,4 +1,4 @@
-version="v2.1 - Coral Sea"
+version="v2.2 - Midway"
 tags={
 	"Military"
 	"Translation"

src/events/ai_ships.txt

@@ -606,6 +606,7 @@ country_event = {
 					aa_hmg = 1
 					air_torpedoe_2 = 1
 				}
+				air_experience = 80
 			}
 		}
 		set_global_flag = cv_air_tech_1939
@@ -631,6 +632,7 @@ country_event = {
 					advanced_small_airframe = 1
 					air_torpedoe_3 = 1
 				}
+				air_experience = 80
 			}
 		}
 		set_global_flag = cv_air_tech_1944

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

@@ -450,6 +450,7 @@ GER = {
         pool = {
             icons = {
                 "gfx/interface/technologies/Germany/GER_submarine_TypeI.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_IX.png"
 				GFX_GER_vnr_ship_hull_submarine_1_medium
 				GFX_GER_vnr_ship_hull_cruiser_submarine_medium
             }
@@ -471,6 +472,8 @@ GER = {
 				GFX_GER_vnr_ship_hull_submarine_2_medium
 				GFX_GER_vnr_ship_hull_cruiser_submarine_medium
 				"gfx/interface/technologies/Germany/GER_submarine_TypeI.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_IX.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_X.png"
             }
         }
 
@@ -491,6 +494,8 @@ GER = {
 				GFX_GER_vnr_ship_hull_submarine_3_medium
 				GFX_GER_vnr_ship_hull_cruiser_submarine_medium
 				"gfx/interface/technologies/Germany/GER_submarine_TypeI.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_IX.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_X.png"
             }
         }
 
@@ -512,6 +517,8 @@ GER = {
 				GFX_GER_vnr_ship_hull_submarine_4_medium
 				GFX_GER_vnr_ship_hull_cruiser_submarine_medium
 				"gfx/interface/technologies/Germany/GER_submarine_TypeI.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_IX.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_X.png"
             }
         }
 
@@ -532,6 +539,8 @@ GER = {
 				GFX_GER_vnr_ship_hull_submarine_3_medium
 				GFX_GER_vnr_ship_hull_cruiser_submarine_medium
 				"gfx/interface/technologies/Germany/GER_submarine_TypeI.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_IX.png"
+				"gfx/interface/technologies/extra/GER_submarine_Type_X.png"
             }
         }
 

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

@@ -499,6 +499,7 @@ USA = {
 				"gfx/interface/technologies/extra/USA_carrier_Enterprise.png"
 				"gfx/interface/technologies/extra/USA_carrier_Forrestal.png"
                 "gfx/interface/technologies/extra/USA_carrier_Oriskany.png"
+				"gfx/interface/technologies/extra/USA_carrier_Midway.png"
             }
         }
 
@@ -599,6 +600,7 @@ USA = {
 				GFX_USA_vnr_ship_hull_submarine_3_medium
 				GFX_USA_vnr_ship_hull_submarine_4_medium
 				GFX_USA_vnr_ship_hull_cruiser_submarine_medium
+				"gfx/interface/technologies/extra/USA_submarine_Nautilus.png"
             }
         }
 

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

@@ -1054,6 +1054,8 @@ SOV = {
 				GFX_SOV_vnr_ship_hull_submarine_3_medium
 				GFX_SOV_vnr_ship_hull_submarine_4_medium
 				GFX_SOV_vnr_ship_hull_cruiser_submarine_medium
+				"gfx/interface/technologies/extra/SOV_submarine_Zulu.png"
+				"gfx/interface/technologies/extra/SOV_submarine_Hotel.png"
             }
         }