2024-11-28 20:01:21

src/common/ai_equipment/vnr_submarines.txt

@@ -232,7 +232,7 @@ naval_sub = {
 				mid_1_custom_slot = sub_ship_periscope
 				mid_2_custom_slot = ship_sub_snorkel
 				mid_3_custom_slot = sub_ship_stealth
-				fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_4 sub_ship_engine_3 sub_ship_engine_2 sub_ship_engine_1 } }
+				fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_5 sub_ship_engine_4 sub_ship_engine_3 sub_ship_engine_2 sub_ship_engine_1 } }
 				fixed_ship_torpedo_slot = ship_torpedo_sub
 				fixed_ship_armor_slot = pressure_hull
 				fixed_ship_fire_control_system_slot = sub_fire_control_system
@@ -260,7 +260,7 @@ naval_sub = {
 				mid_1_custom_slot = sub_ship_periscope
 				mid_2_custom_slot = ship_sub_snorkel
 				mid_3_custom_slot = sub_ship_stealth
-				fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_4 sub_ship_engine_3 sub_ship_engine_2 sub_ship_engine_1 } }
+				fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_5 sub_ship_engine_4 sub_ship_engine_3 sub_ship_engine_2 sub_ship_engine_1 } }
 				fixed_ship_torpedo_slot = ship_torpedo_sub
 				fixed_ship_armor_slot = pressure_hull
 				fixed_ship_fire_control_system_slot = sub_fire_control_system

src/common/defines/VNR_naval_defines.lua

@@ -61,7 +61,7 @@ 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.NAVAL_TRANSFER_BASE_SPEED = 4
 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

src/common/scripted_effects/_add_naval_variants.txt

@@ -735,10 +735,10 @@ GER_start_naval_variants = {
       fixed_ship_battery_slot = ger_11in_c34_triple
       fixed_ship_anti_air_slot = ship_anti_air_1_h
       fixed_ship_fire_control_system_slot = ship_fire_control_system_1
-      fixed_ship_engine_slot = heavy_ship_engine_1
+      fixed_ship_engine_slot = heavy_ship_engine_2
       fixed_ship_secondaries_slot = ship_secondaries_2
       fixed_ship_armor_scheme_slot = ship_scheme_incremental_post_jutland
-      fixed_ship_armor_slot = ship_armor_bc_2
+      fixed_ship_armor_slot = ship_armor_bb_2
       fixed_ship_torpedo_defense_system_slot = torpedo_belt
       fixed_ship_extra_secondaries_slot = ship_light_weight_shell
       front_1_custom_slot = ship_anti_air_1
@@ -3649,7 +3649,7 @@ USA_start_naval_variants = {
       fixed_ship_armor_slot = ship_armor_bb_1
       fixed_ship_torpedo_defense_system_slot = torpedo_bulge
       mid_1_custom_slot = empty
-      mid_2_custom_slot = empty
+      mid_2_custom_slot = ship_heavy_battery_small_1
       mid_3_custom_slot = ship_heavy_battery_small_1
       rear_1_custom_slot = ship_heavy_battery_small_1
       rear_2_custom_slot = ship_heavy_battery_small_1

src/common/scripted_effects/_delete_starting_naval.txt

@@ -7,4 +7,20 @@ delete_starting_naval_oob = {
         destroy_ships = { type = ship_hull_carrier count = all }
         destroy_ships = { type = ship_hull_submarine count = all }
     }
+	special_project_workaround = yes
+}
+
+special_project_workaround = {
+	USA = {
+		complete_special_project = {
+			project = sp:sp_naval_fleet_submarine
+			popup = no
+		}
+	}
+	JAP = {
+		complete_special_project = {
+			project = sp:sp_naval_super_heavy_battleship
+			popup = no
+		}
+	}
 }

src/common/special_projects/projects/_overwrite.txt

@@ -0,0 +1,79 @@
+sp_naval_fleet_submarine = {
+	specialization = specialization_naval
+	
+
+	project_tags = sp_tag_submarine
+
+	allowed = {
+		#FREE PROJECT
+	}
+	visible = {
+		always = no
+	}
+
+	complexity = sp_complexity.medium
+	prototype_time = sp_time.prototype.long
+
+	breakthrough_cost = {
+		specialization_naval = 1
+	}
+
+	project_output = {
+				
+	}
+	
+}
+
+sp_naval_cruiser_submarine = {
+	specialization = specialization_naval 
+
+	project_tags = sp_tag_submarine
+	
+	complexity = sp_complexity.medium
+	prototype_time = sp_time.prototype.medium 
+	allowed = {
+		#FREE PROJECT
+	}
+	visible = {
+		always = no
+	}
+
+	special_project_parent = {
+		
+	}
+
+
+	breakthrough_cost = {
+		specialization_naval = 1
+	}
+
+	
+	project_output = {
+
+	}
+	
+}
+
+sp_naval_super_heavy_battleship = {
+	specialization = specialization_naval
+ 
+
+	project_tags = sp_tag_surface_ship
+
+	allowed = {
+		#FREE
+	}
+
+	visible = {
+		always = no
+	}
+	complexity = sp_complexity.medium
+	prototype_time = sp_time.prototype.medium
+
+	breakthrough_cost = {
+		specialization_naval = 1
+	}
+	project_output = {
+
+	}
+}

src/common/special_projects/projects/naval_projects.txt

@@ -14,6 +14,11 @@ sp_battlecarrier = {
 			}
 		}
     }
+	resource_cost = {
+		resources = { 
+			steel = 5
+		}
+	}
     breakthrough_cost = {
 		specialization_naval = 1
 	}
@@ -27,6 +32,39 @@ sp_battlecarrier = {
             ship_deck_space_bb
         }
     }
+
+	unique_prototype_rewards = {
+		sp_battlecarrier_unique_reward_a = {
+			fire_only_once = yes
+			threshold = {
+				min = 25
+				max = 75
+			}
+			weight = { base = 100 }
+			option = {
+				token = sp_battlecarrier_perference_a
+				iteration_output = {
+					sub_unit_bonus = {
+						battlecarrier = {
+							anti_air_attack = 0.1
+							armor_value = 0.1
+							max_strength = 0.1
+						}
+					}
+				}
+			}
+			option = {
+				token = sp_battlecarrier_perference_b
+				iteration_output = {
+					sub_unit_bonus = {
+						battlecarrier = {
+							max_organisation = 15
+						}
+					}
+				}
+			}
+		}
+	}
 	
 	generic_prototype_rewards = {
 		sp_naval_generic_reward_scientist_xp_1
@@ -59,6 +97,11 @@ sp_subcarrier = {
     breakthrough_cost = {
 		specialization_naval = 1
 	}
+	resource_cost = {
+		resources = { 
+			steel = 3
+		}
+	}
     prototype_time = sp_time.prototype.short
 
 	complexity = sp_complexity.small
@@ -83,11 +126,49 @@ sp_subcarrier = {
 		sp_naval_generic_reward_test_failure_2
 		sp_naval_generic_reward_test_failure_3			
 	}
+
+	unique_prototype_rewards = {
+		sp_subcarrier_unique_reward_a = {
+			fire_only_once = yes
+			threshold = {
+				min = 25
+				max = 75
+			}
+			weight = { base = 100 }
+			option = {
+				token = sp_subcarrier_perference_a
+				iteration_output = {
+					equipment_bonus = {
+						vnr_ship_hull_cruiser_submarine = {
+							instant = yes
+							surface_detection = 0.15
+							sub_detection = 0.15
+						}
+					}
+				}
+			}
+			option = {
+				token = sp_subcarrier_perference_b
+				iteration_output = {
+					equipment_bonus = {
+						ship_hull_submarine = {
+							instant = yes
+							surface_detection = 0.05
+							sub_detection = 0.05
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 sp_nuclear_torpedo = {
     specialization = specialization_naval
 	project_tags = { sp_tag_submarine }
+	ai_will_do = {
+		base = 1
+	}
     allowed = {
         has_dlc = "Man the Guns"
     }
@@ -97,8 +178,11 @@ sp_nuclear_torpedo = {
 			has_tech = nukes
 		}
     }
+	resource_cost = {
+		resources = { steel=6 tungsten=3 chromium=6 }
+	}
     breakthrough_cost = {
-		specialization_naval = 3
+		specialization_naval = 2
 	}
     prototype_time = sp_time.prototype.long
 
@@ -124,11 +208,48 @@ sp_nuclear_torpedo = {
 		sp_naval_generic_reward_test_failure_2
 		sp_naval_generic_reward_test_failure_3			
 	}
+
+	unique_prototype_rewards = {
+		sp_nuclear_torpedo_unique_reward_a = {
+			fire_only_once = yes
+			threshold = {
+				min = 50
+				max = 90
+			}
+			weight = { base = 100 }
+			option = {
+				token = sp_nuclear_torpedo_preference_a
+				iteration_output = {
+					equipment_bonus = {
+						vnr_ship_hull_submarine_5 = {
+							instant = yes
+							reliability = 0.05
+						}
+					}
+				}
+			}
+			option = {
+				token = sp_nuclear_torpedo_preference_b
+				iteration_output = {
+					equipment_bonus = {
+						vnr_ship_hull_submarine_5 = {
+							instant = yes
+							torpedo_attack = 0.05
+							reliability = -0.05
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 sp_naval_proximity_fuze = {
     specialization = specialization_naval
 	project_tags = { sp_tag_surface_ship }
+	ai_will_do = {
+		base = 1
+	}
     allowed = {
         has_dlc = "Man the Guns"
     }
@@ -138,8 +259,11 @@ sp_naval_proximity_fuze = {
 			has_tech = naval_radio_guiding_system
 		}
     }
+	resource_cost = {
+		resources = { steel=4 tungsten=2 }
+	}
     breakthrough_cost = {
-		specialization_naval = 2
+		specialization_naval = 1
 	}
     prototype_time = sp_time.prototype.medium
 
@@ -170,6 +294,9 @@ sp_naval_proximity_fuze = {
 sp_super_heavy_guns = {
     specialization = specialization_naval
 	project_tags = { sp_tag_surface_ship }
+	ai_will_do = {
+		base = 1
+	}
     allowed = {
         has_dlc = "Man the Guns"
     }
@@ -185,16 +312,14 @@ sp_super_heavy_guns = {
 		}
     }
     breakthrough_cost = {
-		specialization_naval = 2
+		specialization_naval = 1
 	}
 	resource_cost = {
-		resources = { 
-			steel = 5
-		}
+		resources = { steel=6 tungsten=3 }
 	}
-    prototype_time = sp_time.prototype.long
+    prototype_time = sp_time.prototype.medium
 
-	complexity = sp_complexity.large
+	complexity = sp_complexity.medium
 
     project_output = {
         country_effects = {
@@ -211,6 +336,35 @@ sp_super_heavy_guns = {
 			}
         }
     }
+
+	unique_prototype_rewards = {
+		sp_super_heavy_guns_unique_reward_a = {
+			fire_only_once = yes
+			threshold = {
+				min = 60
+				max = 90
+			}
+			weight = {
+				base = 100
+			}
+			option = {
+				token = sp_super_heavy_guns_preference_a
+				iteration_output = {
+					country_effects = {
+						add_tech_bonus = {
+							bonus = 0.75
+							uses = 1
+							technology = experimental_super_heavy_battery
+						}
+						sp:sp_super_heavy_guns = { add_project_progress_ratio = -0.25 }
+					}
+				}
+			}
+			option = {
+				token = sp_super_heavy_guns_preference_b
+			}
+		}
+	}
 	
 	generic_prototype_rewards = {
 		sp_naval_generic_reward_scientist_xp_1
@@ -261,7 +415,7 @@ sp_naval_underway_replenishment = {
 		specialization_naval = 2
 	}
 	
-	complexity = sp_complexity.large
+	complexity = sp_complexity.medium
 	prototype_time = sp_time.prototype.medium 
 	
 	project_output = {
@@ -452,19 +606,14 @@ sp_naval_nuclear_missile_submarine = {
 		}
 	}	
 	complexity = sp_complexity.large 
-	prototype_time = sp_time.prototype.very_long 
+	prototype_time = sp_time.prototype.long 
 	allowed = {
 		has_dlc = "Gotterdammerung"
 	}
 
 	special_project_parent = {
 		sp_naval_rocket_launching_submarine
-	}
-
-	available = { 
-		FROM = {
-			has_tech = sub_nuclear_engine
-		}
+		sp_nuclear_warheads
 	}
 
 	breakthrough_cost = {
@@ -494,4 +643,109 @@ sp_naval_nuclear_missile_submarine = {
 		sp_naval_generic_reward_test_failure_3
 		sp_naval_generic_failure_nuclear_accident
 	}
+}
+
+sp_mega_carrier = {
+	specialization = specialization_naval
+	project_tags = { sp_tag_surface_ship }
+	allowed = {
+        has_dlc = "Gotterdammerung"
+    }
+    available = {
+		FROM = {
+			has_tech = super_carriers
+		}
+    }
+	resource_cost = {
+		resources = { 
+			steel = 16
+			chromium = 16
+		}
+	}	
+    breakthrough_cost = {
+		specialization_naval = 2
+	}
+
+    prototype_time = sp_time.prototype.long
+
+	complexity = sp_complexity.large
+
+    project_output = {
+		enable_equipments = {
+			vnr_ship_hull_mega_carrier
+		}
+        enable_equipment_modules = {
+			limit = {
+				has_dlc = "Gotterdammerung"
+			}
+            ship_deck_space_mega
+        }
+    }
+
+	generic_prototype_rewards = {
+		sp_naval_generic_reward_scientist_xp_1
+		sp_naval_generic_reward_scientist_xp_2
+		sp_naval_generic_reward_scientist_xp_3
+		sp_naval_generic_reward_navy_xp_1
+		sp_naval_generic_reward_navy_xp_2
+		sp_naval_generic_reward_navy_xp_3
+		sp_naval_generic_reward_major_progress_1
+		sp_naval_generic_reward_major_progress_2
+		sp_naval_generic_reward_major_progress_3
+		sp_naval_generic_reward_test_failure_1
+		sp_naval_generic_reward_test_failure_2
+		sp_naval_generic_reward_test_failure_3			
+	}
+}
+
+sp_arsenal_ship = {
+	specialization = specialization_naval
+	project_tags = { sp_tag_surface_ship }
+	allowed = {
+        has_dlc = "Gotterdammerung"
+    }
+    available = {
+		FROM = {
+			has_tech = full_missile_ship
+		}
+    }
+	resource_cost = {
+		resources = { 
+			steel = 12
+			tungsten = 10
+			chromium = 14
+		}
+	}	
+    breakthrough_cost = {
+		specialization_naval = 2
+	}
+
+    prototype_time = sp_time.prototype.medium
+
+	complexity = sp_complexity.large
+
+    project_output = {
+		enable_equipments = {
+			vnr_ship_hull_arsenal_ship
+		}
+        enable_equipment_modules = {
+            ship_missile_launcher
+			ship_slbm_launcher
+        }
+    }
+
+	generic_prototype_rewards = {
+		sp_naval_generic_reward_scientist_xp_1
+		sp_naval_generic_reward_scientist_xp_2
+		sp_naval_generic_reward_scientist_xp_3
+		sp_naval_generic_reward_navy_xp_1
+		sp_naval_generic_reward_navy_xp_2
+		sp_naval_generic_reward_navy_xp_3
+		sp_naval_generic_reward_major_progress_1
+		sp_naval_generic_reward_major_progress_2
+		sp_naval_generic_reward_major_progress_3
+		sp_naval_generic_reward_test_failure_1
+		sp_naval_generic_reward_test_failure_2
+		sp_naval_generic_reward_test_failure_3			
+	}
 }

src/common/technologies/MTG_naval.txt

@@ -1540,6 +1540,12 @@ technologies = {
 	}
 	nuclear_engine_research = {
 		research_cost = 1.25
+		is_special_project_tech = yes
+		allow = {
+			ROOT = {
+				is_special_project_completed = sp:sp_nuclear_reactor
+			}
+		}
 		enable_equipment_modules = {
 			cruiser_ship_engine_nuclear
 			carrier_ship_engine_nuclear
@@ -4504,7 +4510,7 @@ technologies = {
 	}
 
 	full_armored_carrier = {
-		research_cost = 1.25
+		research_cost = 0.7
 		start_year = 1944
 
 		carrier = {
@@ -4545,7 +4551,7 @@ technologies = {
 	}
 
 	carrier_angled_deck = {
-		research_cost = 0.7
+		research_cost = 0.5
 		start_year = 1944
 
 		enable_equipment_modules = {
@@ -5290,6 +5296,12 @@ technologies = {
 	}
 
 	sub_nuclear_engine = {
+		is_special_project_tech = yes
+		allow = {
+			ROOT = {
+				is_special_project_completed = sp:sp_nuclear_reactor
+			}
+		}
 		enable_equipment_modules = {
 			sub_ship_engine_nuclear
 		}
@@ -5297,9 +5309,6 @@ technologies = {
 		start_year = 1949
 		research_cost = 1.25
 
-		dependencies = {
-			nuclear_reactor = 1
-		}
 		folder = {
 			name = mtgnavalfolder
 			position = { x = -2 y = 23 }

src/common/technologies/MTG_naval_Support.txt

@@ -3556,7 +3556,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 75
 		xp_research_bonus = 1.75
-		research_cost = 2.0
+		research_cost = 0.75
 		start_year = 1938
 		folder = {
 			name = mtgnavalsupportfolder
@@ -3587,7 +3587,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 75
 		xp_research_bonus = 1.5
-		research_cost = 2.5
+		research_cost = 1
 		start_year = 1943
 		folder = {
 			name = mtgnavalsupportfolder

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

@@ -141,6 +141,26 @@ equipment_modules = {
 		}
 		dismantle_cost_ic = 2000
 	}
+	ship_deck_space_mega = {
+		category = ship_deck_space_mega
+		gui_category = ship_deck_space
+		gfx = big_ship_deck_space
+		add_equipment_type = capital_ship
+		mega_carrier = yes
+		add_stats = {
+			carrier_size = 2
+			build_cost_ic = 2000
+			surface_detection = 8
+			supply_consumption = 0.03
+		}
+		manpower = 450 #outside the add_stats section for code reasons
+		multiply_stats = {
+			naval_speed = -0.075
+			anti_air_attack = 0.035
+			fuel_consumption = 0.1
+		}
+		dismantle_cost_ic = 1600
+	}
 
 
 ###################

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

@@ -2305,7 +2305,7 @@ equipment_modules = {
 ################
 	sub_missile_launcher = {
 		abbreviation = "sml"
-		category = ship_rocket
+		category = sub_rocket
 		add_equipment_type = missile_launcher
 		allow_equipment_type = { missile ballistic_missile }
 
@@ -2315,13 +2315,14 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			sub_visibility = 0.15
+			naval_speed = -0.1
 		}
 		dismantle_cost_ic = 700 
 	}
 
 	slbm_launcher = {
 		abbreviation = "slb"
-		category = ship_nuclear_rocket
+		category = sub_rocket
 		add_equipment_type = missile_launcher
 		allow_equipment_type = { nuclear_missile }
 
@@ -2331,7 +2332,42 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			sub_visibility = 0.2 
+			naval_speed = -0.15
 		}
 		dismantle_cost_ic = 1000 
 	}
+
+	ship_missile_launcher = {
+		gfx = sub_missile_launcher
+		category = ship_rocket
+		add_equipment_type = missile_launcher
+		allow_equipment_type = { missile ballistic_missile }
+
+		add_stats = {
+			build_cost_ic = 2000
+			reliability = -0.2
+		}
+		multiply_stats = {
+			surface_visibility = 0.15
+			naval_speed = -0.1
+		}
+		dismantle_cost_ic = 1000
+	}
+
+	ship_slbm_launcher = {
+		gfx = slbm_launcher
+		category = ship_rocket
+		add_equipment_type = missile_launcher
+		allow_equipment_type = { nuclear_missile }
+
+		add_stats = {
+			build_cost_ic = 3000
+			reliability = -0.3
+		}
+		multiply_stats = {
+			surface_visibility = 0.2 
+			naval_speed = -0.15
+		}
+		dismantle_cost_ic = 1800 
+	}
 }

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

@@ -429,7 +429,7 @@ equipment_modules = {
 		}
 
 		multiply_stats = {
-			sub_visibility = 0.035
+			sub_visibility = 0.045
 			naval_speed = -0.02			
 		}
 		
@@ -457,7 +457,7 @@ equipment_modules = {
 		}
 
 		multiply_stats = {
-			sub_visibility = 0.02
+			sub_visibility = 0.04
 			naval_speed = -0.03			
 		}
 
@@ -482,7 +482,7 @@ equipment_modules = {
 		}
 
 		multiply_stats = {
-			sub_visibility = 0.01
+			sub_visibility = 0.035
 			naval_speed = -0.04			
 		}
 
@@ -507,6 +507,7 @@ equipment_modules = {
 		}
 
 		multiply_stats = {
+			sub_visibility = 0.03
 			naval_speed = -0.05	
 		}
 

src/common/units/equipment/ship_hull_carrier.txt

@@ -699,5 +699,103 @@ equipments = {
 		}
 		manpower = 5000
 	}
+
+	vnr_ship_hull_mega_carrier = {
+		year = 1950
+		archetype = ship_hull_carrier
+		model = ship_hull_super_carrier
+		priority = 1000
+		can_convert_from = { vnr_ship_hull_mega_carrier }
+		parent = vnr_ship_hull_super_carrier
+		module_slots = {
+			fixed_ship_deck_slot_1 = {
+				required = yes
+				allowed_module_categories = { ship_deck_space_mega }
+			}
+			fixed_ship_deck_slot_2 = {
+				required = yes
+				allowed_module_categories = { ship_deck_space_mega }
+			}
+			fixed_ship_anti_air_slot = {
+				required = no
+				allowed_module_categories = { ship_anti_air ship_missile_aa }
+			}
+			fixed_ship_radar_slot = inherit
+			fixed_ship_engine_slot = {
+				required = yes
+				allowed_module_categories = { carrier_ship_engine carrier_ship_engine_nuclear }
+			}
+			fixed_ship_secondaries_slot = {
+				required = no
+				allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb }
+			}
+			fixed_ship_armor_slot = {
+				required = yes
+				allowed_module_categories = { ship_carrier_armor_heavy }
+			}
+			fixed_ship_carrier_miscellaneous_slot_1 = { 
+				required = no
+				allowed_module_categories = { carrier_unit }
+			}
+			fixed_ship_carrier_miscellaneous_slot_2 = { 
+				required = no
+				allowed_module_categories = { carrier_miscellaneous }
+			}
+			fixed_ship_flight_deck_slot = inherit
+			front_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_anti_air
+					ship_missile_aa
+					steam_catapult
+					carrier_side_lift
+					carrier_angled_deck
+				}
+			}
+			mid_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_anti_air
+					ship_missile_aa
+					ship_secondaries
+					ship_dp_secondaries_bb
+					steam_catapult
+					carrier_side_lift
+					carrier_angled_deck
+				}
+			}
+			rear_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_anti_air
+					ship_missile_aa
+					ship_secondaries
+					ship_dp_secondaries_bb
+				}
+			}
+		}
+		default_modules = {
+			fixed_ship_engine_slot = carrier_ship_engine_4
+			fixed_ship_armor_slot = ship_carrier_armor_heavy
+		}
+
+		naval_range = 6000
+		reliability = 1.3
+		max_strength = 330
+		naval_speed = 28
+		surface_visibility = 32
+
+		module_count_limit = {
+			category = carrier_angled_deck
+			count < 2
+		}
+
+		build_cost_ic = 6500
+		resources = {
+			steel = 4
+			chromium = 2
+		}
+		manpower = 6500
+	}
 }
 

src/common/units/equipment/ship_hull_cruiser.txt

@@ -383,6 +383,31 @@ equipments = {
 			fixed_ship_radar_slot = ship_mast_1
 			fixed_ship_role_slot = ship_hull_cruiser_role_cd
 		}
+
+		module_count_limit = {
+			module = ship_heavy_battery_2
+			count < 1
+		}
+		module_count_limit = {
+			module = ship_heavy_battery_3
+			count < 1
+		}
+		module_count_limit = {
+			module = ship_heavy_battery_4
+			count < 1
+		}
+		module_count_limit = {
+			module = ship_heavy_battery_2_triple
+			count < 1
+		}
+		module_count_limit = {
+			module = ship_heavy_battery_3_triple
+			count < 1
+		}
+		module_count_limit = {
+			module = ship_heavy_battery_4_triple
+			count < 1
+		}
 	}
 
 	vnr_ship_hull_cruiser_panzerschiff = {

src/common/units/equipment/ship_hull_heavy.txt

@@ -766,4 +766,110 @@ equipments = {
 		}
 		manpower = 3500
 	}
+
+	vnr_ship_hull_arsenal_ship = {
+		year = 1950
+
+		archetype = ship_hull_heavy
+		model = ship_hull_modern_super_battleship
+		priority = 1500
+		can_convert_from = { vnr_ship_hull_arsenal_ship }
+		parent = vnr_ship_hull_heavy_5
+		module_slots = {
+			fixed_ship_battery_slot = {
+				required = yes
+				allowed_module_categories = { ship_heavy_battery ship_heavy_battery_triple ship_heavy_battery_quad ship_missile }
+			}
+			fixed_ship_anti_air_slot = {
+				required = no
+				allowed_module_categories = { ship_anti_air ship_missile_aa }
+			}
+			fixed_ship_fire_control_system_slot = inherit
+			fixed_ship_radar_slot = inherit
+			fixed_ship_engine_slot = {
+				required = yes
+				allowed_module_categories = { heavy_ship_engine heavy_ship_engine_nuclear }
+			}
+			fixed_ship_secondaries_slot = inherit
+			fixed_ship_armor_slot = {
+				required = yes
+				allowed_module_categories = { ship_heavy_armor }
+			}
+			fixed_ship_airplane_launcher_slot = inherit
+			fixed_ship_extra_secondaries_slot = inherit
+			fixed_ship_armor_scheme_slot = inherit
+			fixed_ship_torpedo_defense_system_slot = inherit
+			front_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_anti_air
+					ship_heavy_battery 
+					ship_heavy_battery_triple
+					ship_heavy_battery_quad
+					ship_missile
+					ship_missile_aa
+					ship_rocket
+				}
+			}
+			front_2_custom_slot = front_1_custom_slot
+			mid_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_heavy_battery
+					ship_heavy_battery_triple
+					ship_heavy_battery_quad
+					ship_anti_air
+					ship_secondaries
+					ship_dp_secondaries_bb
+					ship_airplane_launcher
+					ship_missile
+					ship_missile_aa
+				}
+			}
+			mid_2_custom_slot = mid_1_custom_slot
+			mid_3_custom_slot = mid_1_custom_slot
+			rear_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_anti_air
+					ship_heavy_battery
+					ship_heavy_battery_triple
+					ship_heavy_battery_quad
+					ship_secondaries
+					ship_dp_secondaries_bb
+					ship_airplane_launcher
+					ship_missile
+					ship_missile_aa
+					ship_rocket
+				}
+			}
+			rear_2_custom_slot = rear_1_custom_slot
+		}
+
+		default_modules = {
+			fixed_ship_engine_slot = heavy_ship_engine_5
+			fixed_ship_radar_slot = ship_mast_1
+			front_1_custom_slot = empty
+			rear_1_custom_slot = empty
+		}
+		naval_range = 5000
+
+		max_strength = 300
+		naval_speed = 32
+		fuel_consumption = 70
+		surface_visibility = 30
+		reliability = 1.4
+		build_cost_ic = 3500
+
+		manpower = 4500
+
+		module_count_limit = {
+			category = ship_missile
+			count < 8
+		}
+		module_count_limit = {
+			category = ship_missile_aa
+			count < 8
+		}
+	}
 }

src/common/units/equipment/ship_hull_submarine.txt

@@ -333,7 +333,7 @@ equipments = {
 			}
 			rear_1_custom_slot = {
 				required = no
-				allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub ship_rocket ship_nuclear_rocket }
+				allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub sub_rocket }
 			}
 			rear_2_custom_slot = rear_1_custom_slot
 		}
@@ -455,8 +455,8 @@ equipments = {
 		can_convert_from = { vnr_ship_hull_midget_submarine }
 		priority = 1500
 		module_slots = {
-			fixed_ship_engine_slot = inherit
 			fixed_ship_torpedo_slot = inherit
+			fixed_ship_engine_slot = inherit
 			fixed_ship_armor_slot = inherit
 			fixed_ship_extra_secondaries_slot = inherit
 			mid_1_custom_slot = {