2024-10-03 16:35:54

src/common/ai_strategy/naval_production.txt

@@ -475,7 +475,7 @@ naval_unit_role_ratios_GER_atwar_many_shipyard = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 80
+		value = 180
 	}
 
 	ai_strategy = {
@@ -525,7 +525,7 @@ naval_unit_role_ratios_GER_atwar_knock_USA = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 80
+		value = 120
 	}
 
 	ai_strategy = {
@@ -766,7 +766,7 @@ naval_unit_role_ratios_ENG_prewar_late = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_screen_leader
-		value = 20
+		value = 10
 	}
 
 	ai_strategy = {
@@ -800,13 +800,13 @@ naval_unit_role_ratios_ENG_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_capital_bb
-		value = 20
+		value = 30
 	}
 
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 25
+		value = 35
 	}
 
 	ai_strategy = {
@@ -1334,12 +1334,10 @@ naval_unit_role_ratios_JAP_atwar = {
 		tag = JAP
 	}
 	enable = {
-		OR = {
-			date > 1939.5.31
-			any_enemy_country = {
-				is_literally_china = no
-				is_major = yes
-			}
+		date > 1939.5.31
+		any_enemy_country = {
+			is_literally_china = no
+			is_major = yes
 		}
 	}
 	abort_when_not_enabled = yes
@@ -1347,7 +1345,7 @@ naval_unit_role_ratios_JAP_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 20
+		value = 90
 	}
 	ai_strategy = {
 		type = role_ratio
@@ -1376,7 +1374,7 @@ naval_unit_role_ratios_JAP_atwar = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 70
+		value = 60
 	}
 }
 
@@ -1386,40 +1384,51 @@ naval_unit_role_ratios_JAP_late_peace = {
 		tag = JAP
 	}
 	enable = {
-		date > 1942.1.1
-		has_war_with_major = no
+		date > 1939.5.31
+		OR = {
+			has_war_with_major = no
+			any_enemy_country = {
+				is_literally_china = yes
+				is_major = yes
+			}
+		}
 	}
 	abort_when_not_enabled = yes
 
 	ai_strategy = {
 		type = role_ratio
-		id = vnr_naval_screen
-		value = 200
+		id = vnr_naval_submarine
+		value = 60
 	}
 	ai_strategy = {
 		type = role_ratio
-		id = vnr_naval_screen_cruiser
-		value = 10
+		id = vnr_naval_screen
+		value = 250
 	}
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
+		value = 65
+	}
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_cruiser_medium
 		value = 30
 	}
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_large
-		value = 30
-	}
-	ai_strategy = {
-		type = role_ratio
-		id = vnr_naval_capital_bb
 		value = 10
 	}
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_capital_bb
+		value = 15
+	}
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 20
+		value = 25
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
@@ -1455,7 +1464,7 @@ naval_unit_role_ratios_USA_great_depression = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 25
+		value = 45
 	}
 
 	ai_strategy = {
@@ -1497,7 +1506,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 40
+		value = 55
 	}
 	ai_strategy = {
 		type = role_ratio
@@ -1525,7 +1534,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_capital_bb
-		value = 40
+		value = 30
 	}
 
 	ai_strategy = {
@@ -1574,13 +1583,13 @@ naval_unit_role_ratios_USA_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_capital_bb
-		value = 50
+		value = 40
 	}
 
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_carrier
-		value = 60
+		value = 50
 	}
 	
 	ai_strategy = {
@@ -1597,7 +1606,7 @@ naval_unit_role_ratios_ITA_prewar_build_battleships = {
 	enable = {
 		date < 1941.1.1
 		has_war_with_major = no
-		has_navy_size = { size < 6 type = capital_ship archetype = ship_hull_heavy }
+		has_navy_size = { size < 8 type = capital_ship archetype = ship_hull_heavy }
 	}
 	abort_when_not_enabled = yes
 	
@@ -1642,14 +1651,14 @@ naval_unit_role_ratios_ITA_prewar_enough_battleships = {
 	enable = {
 		date < 1941.1.1
 		has_war_with_major = no
-		has_navy_size = { size > 5 type = capital_ship archetype = ship_hull_heavy }
+		has_navy_size = { size > 7 type = capital_ship archetype = ship_hull_heavy }
 	}
 	abort_when_not_enabled = yes
 	
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 40
+		value = 140
 	}
 	ai_strategy = {
 		type = role_ratio
@@ -1745,7 +1754,7 @@ naval_unit_role_ratios_ITA_atwar_with_major = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 40
+		value = 70
 	}
 	ai_strategy = {
 		type = role_ratio
@@ -1777,6 +1786,11 @@ naval_unit_role_ratios_ITA_atwar_with_major = {
 		id = vnr_naval_capital_bb
 		value = 15
 	}
+	ai_strategy = {
+		type = role_ratio
+		id = vnr_naval_carrier
+		value = 10
+	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
 		value = 50
@@ -2250,6 +2264,30 @@ we_need_cv_planes_1 = {
 		id = cv_cas
 		value = 20
 	}
+
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_fighter
+		value = 1
+	}
+
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_naval_bomber
+		value = 1
+	}
+	
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_cas
+		value = 1
+	}
+
+	ai_strategy = {
+		type = equipment_variant_production_factor
+		id = cv_small_plane_airframe
+		value = 20
+	}
 }
 
 we_need_cv_planes_2 = {
@@ -2297,6 +2335,30 @@ we_need_cv_planes_2 = {
 		id = cv_cas
 		value = 40
 	}
+
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_fighter
+		value = 2
+	}
+
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_naval_bomber
+		value = 2
+	}
+	
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_cas
+		value = 2
+	}
+
+	ai_strategy = {
+		type = equipment_variant_production_factor
+		id = cv_small_plane_airframe
+		value = 40
+	}
 }
 
 we_need_cv_planes_3 = {
@@ -2343,6 +2405,30 @@ we_need_cv_planes_3 = {
 		id = cv_cas
 		value = 60
 	}
+
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_fighter
+		value = 3
+	}
+
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_naval_bomber
+		value = 3
+	}
+	
+	ai_strategy = {
+		type = equipment_production_min_factories
+		id = cv_cas
+		value = 3
+	}
+
+	ai_strategy = {
+		type = equipment_variant_production_factor
+		id = cv_small_plane_airframe
+		value = 50
+	}
 }
 
 

src/common/ai_strategy/vnr_naval_strategy.txt

@@ -0,0 +1,434 @@
+### ENG ###
+ENG_protect_home_waters = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = ENG
+    }
+    enable = {
+        has_war_with = GER
+        GER = {
+            has_navy_size = { size > 30 }
+        }
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 18
+        value = 800
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 16
+        value = 100
+    }
+	ai_strategy = {
+        type = naval_avoid_region
+        id = 18
+        value = -300
+    }
+}
+
+ENG_secure_mediterranean = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = ENG
+    }
+    enable = {
+        has_war_with = ITA
+        ITA = {
+            has_navy_size = { size > 30 }
+        }
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 29
+        value = 100
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 68
+        value = 20
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 69
+        value = 200
+    }
+}
+
+ENG_avoid_pacific = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = ENG
+    }
+    enable = {
+        has_war_with = JAP
+		has_war_with = GER
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = naval_avoid_region
+        id = 75
+        value = 100
+    }
+    ai_strategy = {
+        type = naval_avoid_region
+        id = 72
+        value = 20
+    }
+    ai_strategy = {
+        type = naval_avoid_region
+        id = 73
+        value = 200
+    }
+}
+
+### JAP ###
+JAP_destroy_china_navy_quick = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = JAP
+    }
+    enable = {
+        has_war_with = CHI
+        NOT = { has_war_with = USA }
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 75
+        value = 10
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 76
+        value = 200
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 77
+        value = 200
+    }
+}
+
+JAP_pacific_war_naval_stage_one = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = JAP
+    }
+    enable = {
+        has_war_with = USA
+		naval_strength_ratio = {
+			tag = USA
+			ratio < 0.5
+		}
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 75
+        value = 200
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 78
+        value = 200
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 94
+        value = 50
+    }
+	ai_strategy = {
+        type = strike_force_home_base
+        id = 84
+        value = 130
+    }
+}
+
+JAP_pacific_war_naval_stage_two = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = JAP
+    }
+    enable = {
+        has_war_with = USA
+		OR = {
+			naval_strength_ratio = {
+				tag = USA
+				ratio = 0.5
+			}
+			naval_strength_ratio = {
+				tag = USA
+				ratio > 0.5
+			}
+		}
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 75
+        value = 50
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 78
+        value = 50
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 94
+        value = 50
+    }
+	ai_strategy = {
+        type = strike_force_home_base
+        id = 84
+        value = 50
+    }
+	ai_strategy = {
+        type = strike_force_home_base
+        id = 95
+        value = 200
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 97
+        value = 200
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 180
+        value = 100
+    }
+	ai_strategy = {
+        type = strike_force_home_base
+        id = 83
+        value = 130
+    }
+}
+
+### USA ###
+USA_pacific_war_naval_avoid_first = {
+	allowed = {
+        has_dlc = "Man the Guns"
+		original_tag = USA
+	}
+	enable = {
+		has_war_with = JAP
+		date < 1943.1.1
+		naval_strength_ratio = {
+			tag = JAP
+			ratio < 5
+		}
+        enable_vnr_naval_ai = yes
+	}
+	abort_when_not_enabled = yes
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 75
+		value = 100
+	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 76
+		value = 100
+	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 77
+		value = 100
+	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 79
+		value = 100
+	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 90
+		value = 100
+	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 177
+		value = 100
+	}
+	ai_strategy = {
+		type = naval_avoid_region
+		id = 94
+		value = 100
+	}
+}
+
+USA_pacific_war_naval_counterattack = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = USA
+    }
+    enable = {
+        has_war_with = JAP
+		OR = {
+			date > 1942.12.31
+			naval_strength_ratio = {
+				tag = JAP
+				ratio > 5
+			}
+		}
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 75
+        value = 50
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 78
+        value = 50
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 94
+        value = 50
+    }
+	ai_strategy = {
+        type = strike_force_home_base
+        id = 84
+        value = 150
+    }
+	ai_strategy = {
+        type = strike_force_home_base
+        id = 95
+        value = 200
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 97
+        value = 200
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 180
+        value = 100
+    }
+	ai_strategy = {
+        type = strike_force_home_base
+        id = 83
+        value = 130
+    }
+}
+
+### ITA ###
+ITA_avoid_mediterranean = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = ITA
+    }
+    enable = {
+        has_war_with = ENG
+        has_navy_size = { size < 100 }
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 29
+        value = -100
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 68
+        value = -100
+    }
+    ai_strategy = {
+        type = strike_force_home_base
+        id = 69
+        value = -100
+    }
+    ai_strategy = {
+        type = naval_avoid_region
+        id = 29
+        value = 100
+    }
+    ai_strategy = {
+        type = naval_avoid_region
+        id = 68
+        value = 100
+    }
+    ai_strategy = {
+        type = naval_avoid_region
+        id = 69
+        value = 100
+    }
+}
+
+### GER ###
+GER_forget_sealion = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = GER
+    }
+    enable = {
+        has_war_with = ENG
+        naval_strength_ratio = {
+            tag = ENG
+            ratio < 0.7
+        }
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = naval_avoid_region
+        id = 18
+        value = 800
+    }
+    ai_strategy = {
+        type = naval_avoid_region
+        id = 16
+        value = 200
+    }
+}
+
+GER_unrestricted_submarine_warfare = {
+    allowed = {
+        has_dlc = "Man the Guns"
+        original_tag = GER
+    }
+    enable = {
+        has_war_with = ENG
+        naval_strength_ratio = {
+            tag = ENG
+            ratio < 0.7
+        }
+        enable_vnr_naval_ai = yes
+    }
+    abort_when_not_enabled = yes
+    ai_strategy = {
+        type = naval_convoy_raid_region
+        id = 47
+        value = 200
+    }
+    ai_strategy = {
+        type = naval_convoy_raid_region
+        id = 49
+        value = 500
+    }
+    ai_strategy = {
+        type = naval_convoy_raid_region
+        id = 44
+        value = 150
+    }
+    ai_strategy = {
+        type = naval_convoy_raid_region
+        id = 50
+        value = 30
+    }
+}

src/common/defines/VNR_naval_defines.lua

@@ -19,7 +19,7 @@ NDefines.NNavy.NAVAL_INVASION_SPOTTING_SPEED_MULT = 30;
 NDefines.NNavy.SPOTTING_SPEED_EFFECT_FOR_INITIAL_UNIT_TRANSFER_SPOTTING = 0.5;
 NDefines.NNavy.SPOTTING_SPEED_EFFECT_FOR_INITIAL_NAVAL_INVASION_SPOTTING = 0.5;
 NDefines.NNavy.CONVOY_EFFICIENCY_MIN_VALUE = 0;
-NDefines.NNavy.CONVOY_HIT_PROFILE = 100;
+NDefines.NNavy.CONVOY_HIT_PROFILE = 120;
 NDefines.NNavy.NAVY_PIERCING_THRESHOLDS = { 2.0, 1.0, 0.85, 0.75, 0.6, 0.5, 0.3, 0.1, 0.0 }
 NDefines.NNavy.NAVY_PIERCING_THRESHOLD_CRITICAL_VALUES = { 3.0, 1.0, 0.65, 0.55, 0.4, 0.3, 0.15, 0.1, 0.0 }
 NDefines.NNavy.NAVY_PIERCING_THRESHOLD_DAMAGE_VALUES = { 1.0, 1.0, 0.7, 0.6, 0.45, 0.35, 0.2, 0.1, 0.01 }
@@ -60,6 +60,10 @@ NDefines.NNavy.EXPERIENCE_FACTOR_NON_CARRIER_GAIN = 0.1
 NDefines.NNavy.EXPERIENCE_FACTOR_CARRIER_GAIN = 0.2
 NDefines.NNavy.TRAINING_DAILY_COUNTRY_EXP_FACTOR = 0.005
 NDefines.NNavy.TRAINING_MAX_DAILY_COUNTRY_EXP = 7
+NDefines.NNavy.NAVAL_TRANSFER_BASE_SPEED = 2
+NDefines.NNavy.AMPHIBIOUS_INVADE_SPEED_BASE = 0.25
+NDefines.NNavy.SUPREMACY_PER_SHIP_PER_MANPOWER = 0.001
+NDefines.NNavy.SUPREMACY_PER_SHIP_PER_IC = 0.05
 NDefines.NNavy.AGGRESSION_SETTINGS_VALUES = {
 		0,		-- do not engage
 		1.0,	-- low

src/common/game_rules/000_naval_rework_rules.txt

@@ -80,4 +80,22 @@ shipyard_output_boost = {
 		desc = RULE_SHIPYARD_OUTPUT_BOOST_BLOCKED_DESC
 		allow_achievements = yes
 	}
+}
+
+vnr_ai_naval_management = {
+	name = RULE_AI_NAVAL_MANAGEMENT
+	group = RULE_GROUP_NAVY_REWORK
+
+	default = {
+		name = FREE
+		text = RULE_OPTION_FREE
+		desc = RULE_AI_NAVAL_MANAGEMENT_FREE_DESC
+		allow_achievements = yes
+	}
+	option = {
+		name = BLOCKED
+		text = RULE_OPTION_BLOCKED
+		desc = RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC
+		allow_achievements = yes
+	}
 }

src/common/scripted_effects/_add_ai_variants.txt

@@ -1096,4 +1096,268 @@ ITA_AI_variants_1943 = {
       rear_2_custom_slot = ship_light_battery_4_double
     }
   }
+}
+SOV_AI_variants_1940 = {
+  create_equipment_variant = {
+    name = "苏联级"  # Sovetsky Soyuz Class
+    role_icon_index = 1
+    type = vnr_ship_hull_super_heavy_1
+    parent_version = 0
+    name_group = SOV_STATES
+    modules = {
+      fixed_ship_battery_slot = ship_heavy_battery_3_triple
+      fixed_ship_anti_air_slot = ship_anti_air_3_h
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_2
+      fixed_ship_engine_slot = super_heavy_ship_engine_2
+      fixed_ship_secondaries_slot = ship_secondaries_2
+      fixed_ship_armor_slot = ship_armor_shbb
+      fixed_ship_armor_scheme_slot = ship_scheme_mixed
+      fixed_ship_torpedo_defense_system_slot = pugliese_system
+      fixed_ship_airplane_launcher_slot = ship_airplane_launcher
+      fixed_ship_extra_secondaries_slot = ship_high_velocity_shell
+      front_1_custom_slot = empty
+      front_2_custom_slot = ship_heavy_battery_3_triple
+      mid_1_custom_slot = dp_ship_secondaries_2
+      mid_2_custom_slot = ship_secondaries_2
+      mid_3_custom_slot = dp_ship_secondaries_2
+      rear_1_custom_slot = ship_heavy_battery_3_triple
+    }
+  }
+  create_equipment_variant = {
+    name = "71工程级"  # Object 71 Class
+    role_icon_index = 11
+    type = vnr_ship_hull_carrier_conversion_ca
+    parent_version = 0
+    name_group = SOV_CV_HISTORICAL
+    modules = {
+      fixed_ship_deck_slot_1 = ship_deck_space
+      fixed_ship_deck_slot_2 = ship_deck_space_small
+      fixed_ship_anti_air_slot = ship_anti_air_3
+      fixed_ship_engine_slot = carrier_ship_engine_3
+      fixed_ship_secondaries_slot = dp_ship_secondaries_2
+      fixed_ship_armor_slot = ship_armor_cruiser_2
+    }
+  }
+  create_equipment_variant = {
+    name = "喀琅施塔得级"  # Kronshtadt Class
+    role_icon_index = 21
+    type = vnr_ship_hull_heavy_3
+    parent_version = 0
+    name_group = SOV_BC_HISTORICAL
+    modules = {
+      fixed_ship_battery_slot = ship_heavy_battery_1_triple
+      fixed_ship_anti_air_slot = ship_anti_air_3
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_1
+      fixed_ship_engine_slot = heavy_ship_engine_3
+      fixed_ship_secondaries_slot = dp_ship_secondaries_2
+      fixed_ship_armor_slot = ship_armor_bc_3
+      front_1_custom_slot = empty
+      front_2_custom_slot = ship_heavy_battery_1_triple
+      mid_1_custom_slot = ship_secondaries_2
+      mid_2_custom_slot = empty
+      mid_3_custom_slot = ship_anti_air_3
+      rear_1_custom_slot = ship_heavy_battery_1_triple
+    }
+  }
+  create_equipment_variant = {
+    name = "恰巴耶夫级"  # Chapayev Class
+    role_icon_index = 25
+    type = vnr_ship_hull_cruiser_4
+    parent_version = 0
+    name_group = SOV_CL_HISTORICAL
+    modules = {
+      fixed_ship_battery_slot = ship_light_medium_battery_3
+      fixed_ship_anti_air_slot = ship_anti_air_3
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_1
+      fixed_ship_engine_slot = cruiser_ship_engine_4
+      fixed_ship_armor_slot = ship_armor_cruiser_3
+      fixed_ship_secondaries_slot = dp_ship_secondaries_2
+      front_1_custom_slot = empty
+      front_2_custom_slot = ship_light_medium_battery_3
+      mid_1_custom_slot = ship_anti_air_3
+      mid_2_custom_slot = ship_torpedo_3
+      mid_3_custom_slot = dp_ship_secondaries_2
+      rear_1_custom_slot = ship_light_medium_battery_3
+      rear_2_custom_slot = ship_light_medium_battery_3
+    }
+  }
+  create_equipment_variant = {
+    name = "奥格涅沃伊级"  # Ognevoy Class
+    role_icon_index = 31
+    type = vnr_ship_hull_light_4
+    parent_version = 0
+    name_group = SOV_ADJECTIVES_NAVY
+    modules = {
+      fixed_ship_battery_slot = ship_light_battery_3_double
+      fixed_ship_anti_air_slot = ship_anti_air_3
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_1
+      fixed_ship_engine_slot = light_ship_engine_4
+      front_1_custom_slot = empty
+      front_2_custom_slot = ship_anti_air_3
+      mid_1_custom_slot = ship_torpedo_2
+      mid_2_custom_slot = ship_torpedo_2
+      rear_1_custom_slot = ship_light_battery_3_double
+      rear_2_custom_slot = ship_depth_charge_2
+    }
+  }
+  create_equipment_variant = {
+    name = "塔什干级"  # Tashkent Class
+    role_icon_index = 33
+    type = vnr_ship_hull_light_4
+    parent_version = 0
+    name_group = SOV_CITIES_NAVY
+    modules = {
+      fixed_ship_battery_slot = ship_light_battery_3_double
+      fixed_ship_anti_air_slot = ship_anti_air_3
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_1
+      fixed_ship_engine_slot = light_ship_engine_6
+      fixed_ship_torpedo_slot = ship_torpedo_3
+      fixed_ship_role_slot = ship_hull_light_role_dl
+      front_1_custom_slot = ship_light_battery_3_double
+      front_2_custom_slot = empty
+      mid_1_custom_slot = ship_torpedo_3
+      mid_2_custom_slot = ship_mine_layer_1
+      rear_1_custom_slot = ship_light_battery_3_double
+      rear_2_custom_slot = ship_depth_charge_1
+    }
+  }
+}
+SOV_AI_variants_1943 = {
+  create_equipment_variant = {
+    name = "24工程级"  # Object 24 Class
+    role_icon_index = 1
+    type = vnr_ship_hull_heavy_5
+    parent_version = 0
+    name_group = SOV_BB_HISTORICAL
+    modules = {
+      fixed_ship_battery_slot = ship_heavy_battery_4_triple
+      fixed_ship_anti_air_slot = ship_anti_air_4
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_3
+      fixed_ship_radar_slot = ship_radar_4
+      fixed_ship_engine_slot = heavy_ship_engine_5
+      fixed_ship_secondaries_slot = dp_ship_secondaries_4
+      fixed_ship_armor_slot = ship_armor_shbb_2
+      fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box
+      fixed_ship_torpedo_defense_system_slot = torpedo_belt_enhanced
+      fixed_ship_extra_secondaries_slot = ship_high_velocity_shell
+      front_1_custom_slot = ship_anti_air_4
+      front_2_custom_slot = ship_heavy_battery_4_triple
+      mid_1_custom_slot = dp_ship_secondaries_4
+      mid_2_custom_slot = ship_anti_air_4
+      mid_3_custom_slot = dp_ship_secondaries_4
+      rear_1_custom_slot = ship_heavy_battery_4_triple
+      rear_2_custom_slot = ship_airplane_launcher_2
+    }
+  }
+  create_equipment_variant = {
+    name = "72工程级"  # Object 72 Class
+    role_icon_index = 9
+    type = vnr_ship_hull_carrier_3
+    parent_version = 0
+    name_group = SOV_CV_HISTORICAL
+    modules = {
+      fixed_ship_deck_slot_1 = ship_deck_space
+      fixed_ship_deck_slot_2 = ship_deck_space
+      fixed_ship_anti_air_slot = ship_anti_air_3
+      fixed_ship_radar_slot = ship_radar_3
+      fixed_ship_engine_slot = carrier_ship_engine_4
+      fixed_ship_secondaries_slot = dp_ship_secondaries_3
+      fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
+      front_1_custom_slot = ship_anti_air_3
+      mid_1_custom_slot = ship_deck_space
+      mid_2_custom_slot = dp_ship_secondaries_3
+      rear_1_custom_slot = ship_anti_air_3
+    }
+  }
+  create_equipment_variant = {
+    name = "斯大林格勒级"  # Stalingrad Class
+    role_icon_index = 21
+    type = vnr_ship_hull_cruiser_5
+    parent_version = 0
+    name_group = SOV_CITIES_NAVY
+    modules = {
+      fixed_ship_battery_slot = ship_medium_heavy_battery_2
+      fixed_ship_anti_air_slot = ship_anti_air_4
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_3
+      fixed_ship_radar_slot = ship_radar_4
+      fixed_ship_engine_slot = cruiser_ship_engine_5
+      fixed_ship_secondaries_slot = dp_ship_secondaries_4
+      fixed_ship_armor_slot = ship_armor_cruiser_heavy_4
+      fixed_ship_role_slot = ship_hull_cruiser_role_cb
+      fixed_ship_extra_secondaries_slot = ship_high_velocity_shell
+      front_1_custom_slot = ship_anti_air_4
+      front_2_custom_slot = ship_medium_heavy_battery_2
+      mid_1_custom_slot = dp_ship_secondaries_4
+      mid_2_custom_slot = dp_ship_secondaries_4
+      mid_3_custom_slot = ship_anti_air_4
+      rear_1_custom_slot = ship_medium_heavy_battery_2
+    }
+  }
+  create_equipment_variant = {
+    name = "莫斯科级"  # Moskow Class
+    role_icon_index = 27
+    type = vnr_ship_hull_cruiser_5
+    parent_version = 0
+    name_group = SOV_CITIES_NAVY
+    modules = {
+      fixed_ship_battery_slot = ship_medium_battery_4
+      fixed_ship_anti_air_slot = ship_anti_air_4
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_3
+      fixed_ship_radar_slot = ship_radar_4
+      fixed_ship_engine_slot = cruiser_ship_engine_5
+      fixed_ship_secondaries_slot = dp_ship_secondaries_4
+      fixed_ship_armor_slot = ship_armor_cruiser_4
+      fixed_ship_role_slot = ship_hull_cruiser_role_ca
+      fixed_ship_extra_secondaries_slot = ship_high_velocity_shell
+      front_1_custom_slot = ship_anti_air_4
+      front_2_custom_slot = ship_medium_battery_4
+      mid_1_custom_slot = dp_ship_secondaries_4
+      mid_2_custom_slot = dp_ship_secondaries_4
+      mid_3_custom_slot = ship_anti_air_4
+      rear_1_custom_slot = ship_medium_battery_4
+    }
+  }
+  create_equipment_variant = {
+    name = "斯维尔德洛夫级"  # Sverdlov Class
+    role_icon_index = 25
+    type = vnr_ship_hull_cruiser_5
+    parent_version = 0
+    name_group = SOV_CL_HISTORICAL
+    modules = {
+      fixed_ship_battery_slot = ship_light_medium_battery_4
+      fixed_ship_anti_air_slot = ship_anti_air_3
+      fixed_ship_fire_control_system_slot = ship_fire_control_system_3
+      fixed_ship_engine_slot = cruiser_ship_engine_5
+      fixed_ship_armor_slot = ship_armor_cruiser_4
+      fixed_ship_secondaries_slot = dp_ship_secondaries_4
+      front_1_custom_slot = empty
+      front_2_custom_slot = ship_light_medium_battery_4
+      mid_1_custom_slot = ship_anti_air_3
+      mid_2_custom_slot = ship_torpedo_3
+      mid_3_custom_slot = dp_ship_secondaries_4
+      rear_1_custom_slot = ship_light_medium_battery_4
+      rear_2_custom_slot = ship_light_medium_battery_4
+    }
+  }
+  create_equipment_variant = {
+    name = "41工程级/56工程级"  # Object 41/56 Class
+    role_icon_index = 31
+    type = vnr_ship_hull_light_5
+    parent_version = 0
+    name_group = SOV_ADJECTIVES_NAVY
+    modules = {
+      fixed_ship_battery_slot = dp_light_battery_4
+      fixed_ship_anti_air_slot = ship_anti_air_4
+      fixed_ship_fire_control_system_slot = ship_sonar_2
+      fixed_ship_radar_slot = ship_radar_3
+      fixed_ship_engine_slot = light_ship_engine_5
+      fixed_ship_extra_secondaries_slot = ship_bulbous_bow
+      front_1_custom_slot = empty
+      front_2_custom_slot = empty
+      mid_1_custom_slot = ship_torpedo_4
+      mid_2_custom_slot = ship_anti_air_4
+      rear_1_custom_slot = ship_depth_charge_4
+      rear_2_custom_slot = dp_light_battery_4
+    }
+  }
 }

src/common/scripted_effects/_add_naval_variants.txt

@@ -153,6 +153,7 @@ ENG_start_naval_variants = {
     name = "复仇级"  # Revenge Class
     parent_version = 0
     role_icon_index = 3
+    icon = "gfx/interface/technologies/England/ENG_battleship_Revenge.png"
     type = vnr_ship_hull_heavy_1
     name_group = ENG_BB_HISTORICAL
     modules = {
@@ -768,7 +769,7 @@ GER_start_naval_variants = {
     name = "希佩尔海军上将级"  # Admiral Hipper Class
     parent_version = 0
     role_icon_index = 27
-    icon = "gfx/interface/technologies/Germany/GER_heavy_cruiser2.png"
+    icon = "gfx/interface/technologies/Germany/GER_heavy_cruiser3.png"
     type = vnr_ship_hull_cruiser_3
     name_group = GER_CA_HISTORICAL
     modules = {
@@ -852,6 +853,7 @@ GER_start_naval_variants = {
     name = "Type 1936级"  # Type 1936 Class
     parent_version = 0
     role_icon_index = 31
+    icon = "gfx/interface/technologies/Germany/GER_destroyer2.png"
     type = vnr_ship_hull_light_3
     name_group = GER_DD_HISTORICAL
     modules = {
@@ -872,6 +874,7 @@ GER_start_naval_variants = {
     name = "Type 1934A级"  # Type 1934A Class
     parent_version = 0
     role_icon_index = 31
+    icon = "gfx/interface/technologies/Germany/GER_destroyer2.png"
     type = vnr_ship_hull_light_3
     name_group = GER_DD_HISTORICAL
     modules = {
@@ -892,6 +895,7 @@ GER_start_naval_variants = {
     name = "Type 1934级"  # Type 1934 Class
     parent_version = 0
     role_icon_index = 31
+    icon = "gfx/interface/technologies/Germany/GER_destroyer2.png"
     type = vnr_ship_hull_light_3
     name_group = GER_DD_HISTORICAL
     modules = {
@@ -3385,6 +3389,7 @@ SOV_start_naval_variants = {
     name = "AG级"  # AG Class
     parent_version = 0
     role_icon_index = 37
+    icon = "gfx/interface/technologies/Soviet/SOV_submarine_AG.png"
     type = vnr_ship_hull_submarine_1
     name_group = SOV_SS_LENINETS
     modules = {
@@ -4039,6 +4044,7 @@ ARG_start_naval_variants = {
     name = "朱赛佩·加里波第级"  # Garibaldi Class
     parent_version = 0
     role_icon_index = 17
+    icon = "gfx/interface/technologies/Italy/ITA_heavy_cruiser_Garibaldi.png"
     type = vnr_ship_hull_cruiser_coastal_defense_ship
     name_group = ARG_CA_HISTORICAL
     modules = {
@@ -4563,6 +4569,7 @@ CHL_start_naval_variants = {
     name = "查卡布科级"  # Chacabuco Class
     parent_version = 0
     role_icon_index = 23
+    icon = "gfx/interface/technologies/South_America/CHL_light_cruiser_Chacabuco.png"
     type = vnr_ship_hull_cruiser_coastal_defense_ship
     name_group = CHL_CA_HISTORICAL
     modules = {

src/common/scripted_effects/_delete_starting_naval.txt

@@ -0,0 +1,10 @@
+delete_starting_naval_oob = {
+    every_country = {
+        limit = { has_navy_size = { size > 0 } }
+        destroy_ships = { type = ship_hull_light count = all }
+        destroy_ships = { type = ship_hull_cruiser count = all }
+        destroy_ships = { type = ship_hull_heavy count = all }
+        destroy_ships = { type = ship_hull_carrier count = all }
+        destroy_ships = { type = ship_hull_submarine count = all }
+    }
+}

src/common/scripted_triggers/_vnr_scripted_triggers.txt

@@ -19,4 +19,9 @@ expert_ai_style = {
 		tag = SOV
 		tag = USA
 	}
+}
+
+enable_vnr_naval_ai = {
+	has_global_flag = vnr_enabled
+	has_game_rule = { rule = vnr_ai_naval_management option = FREE }
 }

src/common/units/a_auxiliary.txt

@@ -8,7 +8,7 @@ sub_units = {
 		need_equipment = { ship_hull_civilian = 1 }
 		max_organisation = 60
 
-		supply_consumption = 0.01
+		supply_consumption = 0.02
 		
 		critical_parts = { rudder_jammed broken_propeller on_fire }
 		critical_part_damage_chance_mult = 1 

src/common/units/a_battlecarrier.txt

@@ -4,7 +4,7 @@ sub_units = {
 		map_icon_category = ship
 		priority = 9
 		active = yes
-		type = { capital_ship carrier }
+		type = { carrier }
 		need_equipment = { ship_hull_heavy = 1 }
 		need_equipment_modules = {
 			any = {
@@ -13,7 +13,7 @@ sub_units = {
 		}
 		max_organisation = 60
 
-		supply_consumption = 0.3
+		supply_consumption = 0.42
 		
 		critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire }
 		critical_part_damage_chance_mult = 1.3

src/common/units/a_medium_cruiser.txt

@@ -25,7 +25,7 @@ sub_units = {
 
 		max_organisation = 40
 		
-		supply_consumption = 0.13
+		supply_consumption = 0.15
 		critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire }
 		critical_part_damage_chance_mult = 1
 		

src/common/units/a_super_heavy_battleship.txt

@@ -14,7 +14,7 @@ sub_units = {
 		}
 		max_organisation = 40
 
-		supply_consumption = 0.4
+		supply_consumption = 0.5
 		
 		critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire }
 		critical_part_damage_chance_mult = 1 

src/common/units/battlecruiser.txt

@@ -17,7 +17,7 @@ sub_units = {
 
 		max_organisation = 50
 
-		supply_consumption = 0.33
+		supply_consumption = 0.4
 		
 		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.37
+		supply_consumption = 0.45
 		
 		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.3
+		supply_consumption = 0.4
 
 		max_organisation = 40
 

src/common/units/destroyer.txt

@@ -9,7 +9,7 @@ sub_units = {
 
 		max_organisation = 40
 
-		supply_consumption = 0.025
+		supply_consumption = 0.03
 
 		critical_parts = { destroyed_ammo_storage broken_propeller on_fire rudder_jammed}
 		critical_part_damage_chance_mult = 1

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

@@ -19,6 +19,7 @@ equipment_modules = {
 			reliability = -0.1
 			max_organisation = -0.1
 			surface_detection = 5
+			supply_consumption = 0.02
 		}
 		manpower = 300 #outside the add_stats section for code reasons
 		multiply_stats = {
@@ -42,6 +43,7 @@ equipment_modules = {
 			build_cost_ic = 1300
 			reliability = 0.025
 			surface_detection = 4
+			supply_consumption = 0.015
 		}
 		manpower = 200 #outside the add_stats section for code reasons
 		multiply_stats = {
@@ -65,6 +67,7 @@ equipment_modules = {
 			carrier_size = 2
 			build_cost_ic = 1000
 			surface_detection = 4
+			supply_consumption = 0.015
 		}
 		manpower = 200 #outside the add_stats section for code reasons
 		multiply_stats = {
@@ -86,6 +89,7 @@ equipment_modules = {
 			carrier_size = 1
 			build_cost_ic = 500
 			surface_detection = 2
+			supply_consumption = 0.01
 		}
 		multiply_stats = {
 			naval_speed = -0.025
@@ -104,6 +108,7 @@ equipment_modules = {
 			build_cost_ic = 2000
 			max_organisation = -0.05
 			surface_detection = 5
+			supply_consumption = 0.025
 		}
 		manpower = 300
 		multiply_stats = {
@@ -126,6 +131,7 @@ equipment_modules = {
 			reliability = -0.1
 			max_organisation = -0.1
 			surface_detection = 2
+			supply_consumption = 0.015
 		}
 		manpower = 125
 		multiply_stats = {

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

@@ -185,7 +185,7 @@ equipment_modules = {
 		}
 		
 		multiply_stats = {
-			naval_speed = 0.20
+			naval_speed = 0.17
 			naval_range = 0.3
 		}
 		
@@ -209,7 +209,7 @@ equipment_modules = {
 		}
 		
 		multiply_stats = {
-			naval_speed = 0.25
+			naval_speed = 0.22
 			naval_range = 0.4
 		}
 		
@@ -237,7 +237,7 @@ equipment_modules = {
 		}
 
 		multiply_stats = {
-			naval_speed = 0.3
+			naval_speed = 0.27
 			naval_range = 0.5
 		}
 		

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

@@ -287,7 +287,6 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 45
-			surface_visibility = 10
 			naval_torpedo_enemy_critical_chance_factor = -0.05
 			naval_torpedo_damage_reduction_factor = 0.1
 			reliability = 0.2
@@ -324,7 +323,6 @@ equipment_modules = {
 		}
 		add_stats = {
 			armor_value = 50
-			surface_visibility = 12
 			naval_torpedo_enemy_critical_chance_factor = -0.1
 			naval_torpedo_damage_reduction_factor = 0.15
 			reliability = 0.25

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

@@ -192,7 +192,7 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			anti_air_attack = 0.1
-			build_cost_ic = 0.1
+			build_cost_ic = 0.05
 		}
 		forbid_module_categories = {
 			ship_medium_heavy_battery_triple

src/common/units/equipment/ship_hull_carrier.txt

@@ -199,7 +199,7 @@ equipments = {
 			fixed_ship_radar_slot = inherit
 			fixed_ship_engine_slot = {
 				required = yes
-				allowed_module_categories = { super_heavy_ship_engine heavy_ship_engine carrier_ship_engine }
+				allowed_module_categories = { heavy_ship_engine carrier_ship_engine }
 			}
 			fixed_ship_secondaries_slot = {
 				required = no

src/common/units/equipment/ship_hull_cruiser.txt

@@ -472,7 +472,17 @@ equipments = {
 					seaplane_hangar
 				}
 			}
-			rear_2_custom_slot = rear_1_custom_slot
+			rear_2_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_anti_air
+					ship_airplane_launcher
+					ship_torpedo
+					ship_medium_heavy_battery_triple
+					ship_medium_heavy_battery_double
+					seaplane_hangar
+				}
+			}
 		}
 
 		default_modules = {

src/common/units/equipment/ship_hull_heavy.txt

@@ -758,7 +758,7 @@ equipments = {
 		max_strength = 350
 		fuel_consumption = 75
 		reliability = 0.9
-		surface_visibility = 42
+		surface_visibility = 46
 		build_cost_ic = 3800
 		resources = {
 			steel = 4

src/common/units/heavy_cruiser.txt

@@ -9,7 +9,7 @@ sub_units = {
 
 		max_organisation = 40
 		
-		supply_consumption = 0.13
+		supply_consumption = 0.15
 		critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire }
 		critical_part_damage_chance_mult = 1