2024-11-03 16:35:55

src/common/decisions/naval_develop.txt

@@ -338,4 +338,127 @@ naval_develop_category = {
 			factor = 50
 		}
 	}
+
+	wartime_convoy_conversion = {
+		icon = GFX_decision_generic_construction
+		visible = {
+			has_tech = early_ship_hull_carrier
+			has_war = yes
+			num_of_naval_factories > 15
+		}
+		available = {
+			any_enemy_country = {
+				has_navy_size = {
+					type = carrier
+					size > 5
+				}
+			}
+			has_equipment = { convoy > 0 }
+		}
+		cancel_trigger = {
+			has_equipment = { convoy < 1 }
+		}
+		days_remove = 60
+		days_re_enable = 28
+		cost = 15
+		modifier = {
+			civilian_factory_use = 2
+		}
+
+		complete_effect = {
+			hidden_effect = {
+				if = {
+					limit = { NOT = { has_country_flag = merchant_carrier_design_added } }
+					set_country_flag = merchant_carrier_design_added
+					set_technology = {
+						merchant_carrier = 1
+						popup = no
+					}
+					create_equipment_variant = {
+    				    name = "Converted Merchant Carrier"
+						role_icon_index = 67
+    				    type = vnr_ship_hull_merchant_carrier
+    				    modules = {
+    				        fixed_ship_deck_slot_1 = ship_deck_space_small
+    				        fixed_ship_anti_air_slot = ship_anti_air_1
+							fixed_ship_engine_slot = civilian_ship_engine_1
+    				    }
+    				}
+				}
+			}
+		}
+		remove_effect = {
+			custom_effect_tooltip = wartime_carrier_conversion_tt_1
+			hidden_effect = {
+				add_equipment_to_stockpile = { type = convoy amount = -1 }
+				create_ship = { type = vnr_ship_hull_merchant_carrier equipment_variant = "Converted Merchant Carrier" creator = ROOT }
+			}
+		}
+
+		ai_will_do = {
+			factor = 0
+		}
+	}
+
+	wartime_liner_conversion = {
+		icon = GFX_decision_generic_construction
+		visible = {
+			has_tech = early_ship_hull_carrier
+			has_war = yes
+			num_of_naval_factories > 20
+		}
+		available = {
+			any_enemy_country = {
+				has_navy_size = {
+					type = carrier
+					size > 5
+				}
+			}
+			has_equipment = { ocean_liner_equipment > 0 }
+		}
+		cancel_trigger = {
+			has_equipment = { ocean_liner_equipment < 1 }
+		}
+		days_remove = 90
+		days_re_enable = 14
+		cost = 25
+		modifier = {
+			civilian_factory_use = 5
+		}
+
+		complete_effect = {
+			hidden_effect = {
+				if = {
+					limit = { NOT = { has_country_flag = escort_carrier_design_added } }
+					set_country_flag = escort_carrier_design_added
+					set_technology = {
+						escort_carriers_ship = 1
+						popup = no
+					}
+					create_equipment_variant = {
+    				    name = "Converted Escort Carrier"
+						role_icon_index = 67
+    				    type = vnr_ship_hull_escort_carrier
+    				    modules = {
+    				        fixed_ship_deck_slot_1 = ship_deck_space_small
+    				        fixed_ship_deck_slot_2 = ship_deck_space_small
+    				        fixed_ship_anti_air_slot = ship_anti_air_1
+							fixed_ship_engine_slot = civilian_ship_engine_1
+    				    }
+    				}
+				}
+			}
+		}
+		remove_effect = {
+			custom_effect_tooltip = wartime_carrier_conversion_tt_2
+			hidden_effect = {
+				add_equipment_to_stockpile = { type = ocean_liner_equipment amount = -1 }
+				create_ship = { type = vnr_ship_hull_escort_carrier equipment_variant = "Converted Escort Carrier" creator = ROOT }
+			}
+		}
+
+		ai_will_do = {
+			factor = 0
+		}
+	}
 }

src/common/defines/VNR_naval_defines.lua

@@ -5,12 +5,13 @@ NDefines.NAI.DOCKYARDS_PER_NAVAL_DESIRE_EFFECT = 10;
 NDefines.NAI.PRODUCTION_MAX_PROGRESS_TO_SWITCH_NAVAL = 0;
 NDefines.NAI.PRODUCTION_WAIT_TO_FINISH_IF_EXPENSIVE = 0.02;
 NDefines.NAI.CARRIER_TASKFORCE_MAX_CARRIER_COUNT = 6;
-NDefines.NAI.SCREENS_TO_CAPITAL_RATIO = 5;
+NDefines.NAI.SCREENS_TO_CAPITAL_RATIO = 4;
 NDefines.NAI.REPAIR_TASKFORCE_SIZE = 25;
 NDefines.NAI.WANTED_CARRIER_PLANES_PER_CARRIER_CAPACITY_FACTOR = 2;
 NDefines.NAI.WANTED_CARRIER_PLANES_PER_CARRIER_CAPACITY_IN_PRODUCTION_FACTOR = 1.5;
 NDefines.NAI.AI_WANTED_CARRIER_BASED_PLANES_FACTOR = 1.5;
 
+NDefines.NNavy.SCREEN_RATIO_FOR_FULL_SCREENING_FOR_CAPITALS = 2.0;
 NDefines.NNavy.ESCAPE_SPEED_PER_COMBAT_DAY = 0.03;
 NDefines.NNavy.MAX_ESCAPE_SPEED_FROM_COMBAT_DURATION = 0.30;
 NDefines.NNavy.CONVOY_ATTACK_BASE_FACTOR = 0.3;
@@ -19,7 +20,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 = 120;
+NDefines.NNavy.CONVOY_HIT_PROFILE = 110;
 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 }
@@ -41,12 +42,12 @@ NDefines.NNavy.SHORE_BOMBARDMENT_CAP = 0.5;
 NDefines.NNavy.BASE_POSITIONING = 0.5;
 NDefines.NNavy.RELATIVE_SURFACE_DETECTION_TO_POSITIONING_FACTOR = 0.05;
 NDefines.NNavy.MAX_POSITIONING_BONUS_FROM_SURFACE_DETECTION = 0.5;
-NDefines.NNavy.POSITIONING_PENALTY_FOR_SHIPS_JOINED_COMBAT_AFTER_IT_STARTS = 0.02;
-NDefines.NNavy.MAX_POSITIONING_PENALTY_FOR_NEWLY_JOINED_SHIPS = 0.4;
-NDefines.NNavy.HIGHER_SHIP_RATIO_POSITIONING_PENALTY_FACTOR = 0.2;
-NDefines.NNavy.MAX_POSITIONING_PENALTY_FROM_HIGHER_SHIP_RATIO = 0.6;
+NDefines.NNavy.POSITIONING_PENALTY_FOR_SHIPS_JOINED_COMBAT_AFTER_IT_STARTS = 0.04;
+NDefines.NNavy.MAX_POSITIONING_PENALTY_FOR_NEWLY_JOINED_SHIPS = 0.8;
+NDefines.NNavy.HIGHER_SHIP_RATIO_POSITIONING_PENALTY_FACTOR = 0.25;
+NDefines.NNavy.MAX_POSITIONING_PENALTY_FROM_HIGHER_SHIP_RATIO = 0.75;
 NDefines.NNavy.DAMAGE_PENALTY_ON_MINIMUM_POSITIONING = 0.45;
-NDefines.NNavy.SCREENING_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 0.45;
+NDefines.NNavy.SCREENING_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 1;
 NDefines.NNavy.AA_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 0.5;
 NDefines.NNavy.MANPOWER_LOSS_RATIO_ON_STR_LOSS = 0.1;
 NDefines.NNavy.MANPOWER_LOSS_RATIO_ON_SUNK = 0.25;
@@ -73,7 +74,7 @@ NDefines.NNavy.AGGRESSION_SETTINGS_VALUES = {
 };
 NDefines.NNavy.GUN_HIT_PROFILES = { -- hit profiles for guns, if target ih profile is lower the gun will have lower accuracy
 		80.0,	-- big guns
-		120.0,	-- torpedoes
+		105.0,	-- torpedoes
 		45.0,	-- small guns
 };
 NDefines.NNavy.MISSION_SUPREMACY_RATIOS = {

src/common/ideas/vnr_navy_spirits.txt

@@ -0,0 +1,238 @@
+ideas = {
+    naval_academy_spirit = {
+        etajima_naval_academy = {
+            ledger = navy
+            visible = { original_tag = JAP }
+            modifier = {
+                navy_leader_start_level = 1
+                trait_air_controller_xp_gain_factor = 0.15
+                trait_superior_tactician_xp_gain_factor = 0.15
+            }
+            ai_will_do = {
+                factor = 1.5
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        annapolis_naval_academy = {
+            ledger = navy
+            visible = { original_tag = USA }
+            modifier = {
+                naval_doctrine_cost_factor = -0.05
+                navy_advisor_cost_factor = -0.33
+                trait_air_controller_xp_gain_factor = 0.25
+                trait_fleet_protector_xp_gain_factor = 0.25
+            }
+            ai_will_do = {
+                factor = 1.5
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        dartmouth_naval_academy = {
+            ledger = navy
+            visible = { original_tag = ENG }
+            modifier = {
+                navy_leader_start_level = 2
+                trait_air_controller_xp_gain_factor = 0.1
+                trait_ironside_xp_gain_factor = 0.1
+                trait_superior_tactician_xp_gain_factor = 0.3
+            }
+            ai_will_do = {
+                factor = 1.5
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+    }
+
+    navy_spirit = {
+        panama_standard = {
+            ledger = navy
+            visible = { original_tag = USA }
+            research_bonus = {
+                bb_tech = 0.05
+                bc_tech = 0.05
+            }
+            modifier = {
+                ship_hull_heavy_design_cost_factor = 0.5
+            }
+            ai_will_do = {
+                factor = 0
+            }
+        }
+        kiel_standard = {
+            ledger = navy
+			visible = { original_tag = GER }
+            equipment_bonus = {
+                ship_hull_heavy = {
+                    instant = yes
+                    build_cost_ic = 0.1
+                }
+            }
+            modifier = {
+                ship_hull_heavy_design_cost_factor = 0.4
+                navy_capital_ship_defence_factor = 0.05
+            }
+            ai_will_do = {
+                factor = 0
+            }
+        }
+        professional_damage_control = {
+            ledger = navy
+            modifier = {
+                critical_receive_chance = -0.1
+                naval_critical_effect_factor = -0.15
+            }
+            ai_will_do = {
+                factor = 1
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        advancing_base = {
+            ledger = navy
+            modifier = {
+                production_speed_naval_base_factor = 0.2
+                navy_fuel_consumption_factor = -0.1
+            }
+            ai_will_do = {
+                factor = 1
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        advanced_supply_fleet = {
+            ledger = navy
+            modifier = {
+                naval_attrition = -0.15
+                navy_max_range_factor = 0.1
+                floating_harbor_supply = 0.4
+                floating_harbor_range = 0.4
+            }
+            ai_will_do = {
+                factor = 1
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        disciplined_crewmen = {
+            ledger = navy
+            modifier = {
+                navy_org_factor = 0.05
+                naval_morale_factor = 0.1
+            }
+            ai_will_do = {
+                factor = 1
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+    }
+
+    naval_command_spirit = {
+        underwater_death = {
+            ledger = navy
+            modifier = {
+                navy_submarine_attack_factor = 0.1
+                navy_submarine_defence_factor = 0.05
+                sub_retreat_speed = 0.05
+            }
+            ai_will_do = {
+                factor = 1
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        efficient_escort = {
+            ledger = navy
+            modifier = {
+                screening_efficiency = 0.1
+                convoy_escort_efficiency = 0.1
+            }
+            ai_will_do = {
+                factor = 1
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        merchant_fleet = {
+            ledger = navy
+            available = {
+                has_equipment = { convoy > 199 }
+            }
+            modifier = {
+                convoy_retreat_speed = 0.3
+                trade_opinion_factor = 0.3
+                local_resources_factor = 0.05
+            }
+            ai_will_do = {
+                factor = 1
+				modifier = {
+					factor = 0
+					NOT = { has_dlc = "No Step Back" }
+				}
+            }
+        }
+        inflexible_headquarter = {
+            ledger = navy
+            modifier = {
+                political_power_factor = 0.05
+                navy_advisor_cost_factor = 0.25
+                navy_leader_cost_factor = 0.25
+                navy_intel_to_others = 20
+                experience_gain_navy_factor = -0.15
+            }
+            ai_will_do = {
+                factor = 0
+            }
+        }
+        win_or_die = {
+            ledger = navy
+            available = {
+                has_war = yes
+                enemies_naval_strength_ratio > 2
+            }
+            modifier = {
+                naval_damage_factor = 0.25
+                naval_defense_factor = -0.25
+                critical_receive_chance = 0.33
+            }
+            ai_will_do = {
+                factor = 0
+            }
+        }
+        recovering_from_naval_race = {  # saved for KR/KX
+            ledger = navy
+            available = {
+				custom_trigger_tooltip = {
+					tooltip = recovering_from_naval_race_tt
+					NOT = { has_global_flag = vnr_enabled }
+				}
+            }
+            modifier = {
+                ship_hull_carrier_design_cost_factor = 0.2
+                ship_hull_heavy_design_cost_factor = 0.2
+                production_speed_dockyard_factor = -0.25
+            }
+        }
+    }
+}

src/common/scripted_effects/_add_naval_variants.txt

@@ -698,6 +698,7 @@ GER_start_naval_variants = {
       fixed_ship_armor_slot = ship_armor_bb_2
       fixed_ship_armor_scheme_slot = ship_scheme_mixed
       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
       front_2_custom_slot = ship_heavy_battery_big_1
       mid_1_custom_slot = ship_airplane_launcher_1
@@ -739,6 +740,7 @@ GER_start_naval_variants = {
       fixed_ship_armor_scheme_slot = ship_scheme_incremental_post_jutland
       fixed_ship_armor_slot = ship_armor_bc_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
       front_2_custom_slot = ger_11in_c34_triple
       mid_1_custom_slot = ship_airplane_launcher_1
@@ -759,6 +761,7 @@ GER_start_naval_variants = {
       fixed_ship_engine_slot = cruiser_ship_engine_2_diesel
       fixed_ship_secondaries_slot = ship_secondaries_2
       fixed_ship_armor_slot = ship_armor_cruiser_2
+      fixed_ship_extra_secondaries_slot = ship_light_weight_shell
       mid_1_custom_slot = ship_airplane_launcher_1
       mid_2_custom_slot = ship_secondaries_2
       rear_1_custom_slot = ger_11in_c34_triple

src/common/scripted_effects/_vnr_naval_treaty.txt

@@ -55,4 +55,21 @@ add_article_xix = {
 			modifier = washington_treaty_article_xix
 		}
 	}
+}
+
+add_starting_navy_spirits = {
+	JAP = {
+		add_ideas = etajima_naval_academy
+		add_ideas = inflexible_headquarter
+	}
+	GER = {
+		add_ideas = kiel_standard
+	}
+	USA = {
+		add_ideas = annapolis_naval_academy
+		add_ideas = panama_standard
+	}
+	ENG = {
+		add_ideas = dartmouth_naval_academy
+	}
 }

src/common/technologies/MTG_naval.txt

@@ -736,6 +736,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			dd_tech
 			asw_tech
 		}
@@ -1829,6 +1830,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			cl_tech
 			ca_tech
 		}
@@ -1877,6 +1879,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			cl_tech
 			ca_tech
 			mio_cat_tech_all_cruiser_and_modules
@@ -1909,6 +1912,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			cl_tech
 			ca_tech
 			mio_cat_tech_all_cruiser_and_modules
@@ -2003,6 +2007,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			cl_tech
 			ca_tech
 			mio_cat_tech_all_cruiser_and_modules
@@ -2025,6 +2030,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			cl_tech
 			ca_tech
 		}
@@ -2298,8 +2304,10 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -2342,8 +2350,10 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -2390,8 +2400,10 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -2423,8 +2435,10 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -2448,8 +2462,10 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
+			mio_cat_tech_all_capital_ship_and_modules
 		}
 	}
 
@@ -3046,6 +3062,7 @@ technologies = {
 			}
 		}
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 		}
@@ -3070,6 +3087,7 @@ technologies = {
 			factor = 1
 		}
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
@@ -3117,6 +3135,7 @@ technologies = {
 			}
 		}
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
@@ -3144,6 +3163,7 @@ technologies = {
 			factor = 0
 		}
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 		}
@@ -3169,6 +3189,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
@@ -3195,6 +3216,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
@@ -3244,6 +3266,7 @@ technologies = {
 			}
 		}
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
@@ -3299,6 +3322,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
@@ -3321,6 +3345,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
@@ -3346,6 +3371,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
@@ -4000,6 +4026,7 @@ technologies = {
 		}
 		
 		categories = {
+			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
 		}
@@ -4025,6 +4052,7 @@ technologies = {
 		}
 		
 		categories = {
+			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
 		}
@@ -4050,6 +4078,7 @@ technologies = {
 		}
 		
 		categories = {
+			naval_equipment
 			cv_tech
 		}
 	}
@@ -4104,6 +4133,7 @@ technologies = {
 		}
 		
 		categories = {
+			naval_equipment
 			cv_tech
 		}
 	}
@@ -4140,6 +4170,7 @@ technologies = {
 		}
 		
 		categories = {
+			naval_equipment
 			cv_tech
 			mio_cat_all_cas_and_modules
 		}
@@ -4930,6 +4961,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -4960,6 +4992,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 		}
 	}
@@ -4985,6 +5018,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5049,6 +5083,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5080,6 +5115,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5277,6 +5313,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5297,6 +5334,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5323,6 +5361,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5346,6 +5385,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5369,6 +5409,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5391,6 +5432,7 @@ technologies = {
 		}
 
 		categories = {
+			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
 		}
@@ -5468,6 +5510,18 @@ technologies = {
 			always = no
 		}
 	}
+	merchant_carrier = {
+		enable_equipments = {
+			vnr_ship_hull_merchant_carrier
+		}
+
+		research_cost = 1
+		start_year = 1940
+
+		allow = {
+			always = no
+		}
+	}
 	cruiser_submarines = {
 
 		enable_equipments = {

src/common/technologies/MTG_naval_Support.txt

@@ -1408,6 +1408,7 @@ technologies = {
 			ship_torpedo_bb
 			ship_torpedo_sub_1
 		}
+		naval_torpedo_screen_penetration_factor = 0.05
 
 		on_research_complete = {
 			custom_effect_tooltip = torpedo_advice_tt
@@ -2684,6 +2685,13 @@ technologies = {
 			research_cost_coeff = 1
 		}
 
+		enable_equipments = {
+			ocean_liner
+		}
+
+		force_use_small_tech_layout = yes
+		show_equipment_icon = yes
+
 		research_cost = 0.5
 		start_year = 1922
 

src/common/units/critical_parts/00_critical_parts.txt

@@ -154,12 +154,8 @@ critical_parts = {
 		modifier = {
 			navy_org_factor = -0.3
 		}
-        chance = 0.8
         org_damage_multiplier = 1.25
         str_damage_multiplier = 1.25
-		base_damage_instance = 1
-		damage_instance_per_added_module = 1
-		max_damage_instance = 3
     }
 	damaged_armored_flight_deck = {
         icon = "GFX_default_critical_damage_icons"
@@ -170,12 +166,9 @@ critical_parts = {
 		modifier = {
 			navy_org_factor = -0.15
 		}
-        chance = 0.4
+        chance = 0.75
         org_damage_multiplier = 1
         str_damage_multiplier = 1
-		base_damage_instance = 1
-		damage_instance_per_added_module = 1
-		max_damage_instance = 6
     }
     gas_leakage = {
         icon = "GFX_default_critical_damage_icons"

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

@@ -339,6 +339,7 @@ equipment_modules = {
 			naval_range = -0.2
 			build_cost_ic = -0.2
 		}
+		dismantle_cost_ic = 1500
 	}
 	carrier_secondary_island = {
 		category = carrier_miscellaneous

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

@@ -298,5 +298,8 @@ equipment_modules = {
 			naval_speed = -0.2
 			build_cost_ic = -0.2
 		}
+		forbid_module_categories = {
+			ship_cruiser_heavy_armor
+		}
 	}
 }

src/common/units/equipment/ocean_liner.txt

@@ -0,0 +1,35 @@
+equipments = {
+	ocean_liner_equipment = {
+		year = 1910
+
+		is_archetype = yes
+		is_buildable = no
+		type = floating_harbor
+		
+		group_by = archetype
+		sprite = floating_harbor
+
+		interface_category = interface_category_other_ships
+
+		build_cost_ic = 1500
+		resources = {
+			steel = 1
+		}
+
+		can_be_lend_leased = {
+			always = no
+		}
+
+		can_be_produced = {
+			has_dlc = "No Step Back"
+		}
+	}
+    ocean_liner = {
+        year = 1910
+
+		archetype = ocean_liner_equipment
+
+		active = no
+		priority = 1
+    }
+}

src/common/units/equipment/ship_hull_carrier.txt

@@ -520,10 +520,10 @@ equipments = {
 				required = yes
 				allowed_module_categories = { carrier_ship_engine cruiser_ship_engine civilian_ship_engine }
 			}
-			fixed_ship_carrier_miscellaneous_slot_1 = { 
-				required = no
-				allowed_module_categories = { carrier_unit }
-			}
+			# 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 }
@@ -554,6 +554,51 @@ equipments = {
 		manpower = 700
 	}
 
+	vnr_ship_hull_merchant_carrier = {
+		derived_variant_name = carrier_equipment_cve
+		year = 1941
+		archetype = ship_hull_carrier
+		priority = 1000
+		can_convert_from = { vnr_ship_hull_merchant_carrier }
+		module_slots = {
+			fixed_ship_deck_slot_1 = {
+				required = yes
+				allowed_module_categories = { ship_deck_space_small }
+			}
+			fixed_ship_anti_air_slot = {
+				required = no
+				allowed_module_categories = { ship_anti_air }
+			}
+			fixed_ship_radar_slot = inherit
+			fixed_ship_engine_slot = {
+				required = yes
+				allowed_module_categories = { civilian_ship_engine }
+			}
+			fixed_ship_flight_deck_slot = inherit
+		}
+
+		default_modules = {
+			fixed_ship_deck_slot_1 = empty
+			fixed_ship_anti_air_slot = empty
+			fixed_ship_radar_slot = empty
+			fixed_ship_engine_slot = civilian_ship_engine_1
+		}
+		naval_range = 2000
+
+		max_strength = 35
+		fuel_consumption = 23
+
+		reliability = 0.5
+		naval_speed = 18
+		sub_detection = 4
+		surface_visibility = 16
+		build_cost_ic = 180
+		resources = {
+			steel = 1
+		}
+		manpower = 400
+	}
+
 	vnr_ship_hull_super_carrier = {
 		derived_variant_name = carrier_equipment_cvh
 		year = 1944

src/common/units/equipment/ship_hull_cruiser.txt

@@ -295,7 +295,7 @@ equipments = {
 			}
 			fixed_ship_armor_slot = {
 				required = no
-				allowed_module_categories = { ship_cruiser_armor }
+				allowed_module_categories = { ship_cruiser_armor ship_cruiser_heavy_armor }
 			}
 			fixed_ship_airplane_launcher_slot = {
 				required = no

src/common/units/equipment/ship_hull_light.txt

@@ -418,6 +418,7 @@ equipments = {
 				allowed_module_categories = { dd_role dd_role_missile }
 			}
 			fixed_ship_extra_secondaries_slot = inherit
+			fixed_ship_extra_missile_slot = fixed_ship_extra_secondaries_slot
 			front_1_custom_slot = {
 				required = no
 				allowed_module_categories = {