2025-01-24 13:45:53

src/common/ai_equipment/vnr_carriers.txt

@@ -309,7 +309,7 @@ naval_carrier = {
 				fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
 				fixed_ship_radar_slot = ship_radar
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
-				fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island
+				fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck
 				fixed_ship_flight_deck_slot = carrier_armor_deck
 				front_1_custom_slot = ship_deck_space
 				front_2_custom_slot = carrier_angled_deck
@@ -342,7 +342,7 @@ naval_carrier = {
 				fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
 				fixed_ship_radar_slot = ship_radar
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
-				fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island
+				fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck
 				fixed_ship_flight_deck_slot = carrier_armor_deck
 				front_1_custom_slot = carrier_angled_deck
 				front_2_custom_slot = carrier_side_lift
@@ -375,7 +375,7 @@ naval_carrier = {
 				fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } }
 				fixed_ship_radar_slot = ship_radar
 				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
-				fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island
+				fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck
 				fixed_ship_flight_deck_slot = carrier_armor_deck
 				front_1_custom_slot = carrier_angled_deck
 				front_2_custom_slot = carrier_side_lift

src/common/ai_equipment/vnr_carriers_light.txt

@@ -140,7 +140,6 @@ naval_light_carrier = {
 				fixed_ship_anti_air_slot = empty
 				fixed_ship_radar_slot = ship_radar
 				fixed_ship_engine_slot = { upgrade = current any_of = { civilian_ship_engine_2 civilian_ship_engine_1 } }
-				fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad
 			}
 		}
 	}

src/common/decisions/MTG_naval_treaty.txt

@@ -209,10 +209,9 @@ MTG_naval_treaties = {
 			
 	
 		available = {
-			
+			threat > 0.1
 		}
 	
-		cost = 50
 		fire_only_once = yes
 		ai_will_do = {
 			factor = 3
@@ -696,7 +695,7 @@ MTG_naval_treaties = {
 		icon = generic_naval	
 		
 		available = {
-
+			always = no
 		}
 		days_mission_timeout = 86
 		
@@ -709,114 +708,74 @@ MTG_naval_treaties = {
 		visible = {
 			has_naval_treaty_trigger = yes
 		}
-        selectable_mission = yes
 		timeout_effect = {
-            every_country = {
-				limit = { has_naval_treaty_trigger = yes }
-				activate_mission = MTG_escalator_clause_invocation_mission
-			}
-			activate_mission = MTG_treaty_rejoin_mission
-			clr_global_flag = MTG_second_london_conference 
-            modify_global_flag = { flag = MTG_naval_treaty_violator value = 1 }
-		}
-		complete_effect = {
-			FROM = {
-				if = {
-					limit = { has_idea = MTG_naval_treaty_adherent }
-					swap_ideas = {
-						remove_idea = MTG_naval_treaty_adherent
-						add_idea = MTG_naval_treaty_adherent_1936
-					}
-				}
-				else = {
-					swap_ideas = {
-						remove_idea = MTG_naval_treaty_cheating
-						add_idea = MTG_naval_treaty_adherent_1936
-					}
-				}
-                
-                if = {
-					limit = {
-						OR = {
-							has_government = fascism 
-							has_government = communism
-						}
-					}
-					custom_effect_tooltip = fascism_renew_naval_treaty_tt
-					add_political_power = -100
-				}
-				else = {
-					custom_effect_tooltip = democracy_renew_naval_treaty_tt
-					add_political_power = 10
-				}
-				set_country_flag = MTG_second_london_treaty_signed
-            }
+			custom_effect_tooltip = MTG_treaty_renew_mission_tt
 			if = {
 				limit = {
-					all_other_country = {
-						NOT = { has_idea = MTG_naval_treaty_adherent }
-					}
+					has_global_flag = { flag = MTG_naval_treaty_violator value > 0 }
 				}
-				clr_global_flag = MTG_second_london_conference
+				custom_effect_tooltip = MTG_treaty_renew_mission_tt_a
+				activate_mission = MTG_escalator_clause_invocation_mission
 			}
+			if = {
+				limit = {
+					NOT = { has_country_flag = MTG_second_london_treaty_signed }
+				}
+				custom_effect_tooltip = MTG_treaty_renew_mission_tt_b
+				unlock_decision_tooltip = { decision = MTG_treaty_rejoin_mission }
+			}
+            
+			clr_global_flag = MTG_second_london_conference 
 		}
-
-        ai_will_do = {
-            base = 100
-            modifier = {
-                OR = {
-                    has_government = fascism
-					has_government = communism
-                }
-                factor = 0
-            }
-        }
 	}
 	MTG_treaty_rejoin_mission = {
 
 		icon = generic_naval	
-		
-		allowed = { 
-			always = no
-		}
-		available = {
-
-		}
-		days_mission_timeout = 365
-		
-		activation = {
-			has_naval_treaty_trigger = yes
-		}
-
 		visible = {
 			has_naval_treaty_trigger = yes
+			NOT = {
+				has_global_flag = MTG_second_london_conference
+				has_country_flag = MTG_second_london_treaty_signed
+			}
+			has_active_mission = MTG_escalator_clause_invocation_mission
 		}
-        selectable_mission = yes
-		timeout_effect = {
-            add_threat = 5
+		cancel_trigger = {
+			NOT = { has_active_mission = MTG_escalator_clause_invocation_mission }
 		}
+		fire_only_once = yes
+		
 		complete_effect = {
-			FROM = {
-                swap_ideas = {
-                    remove_idea = MTG_naval_treaty_adherent
-                    add_idea = MTG_naval_treaty_adherent_1936
-                }
-                if = {
-					limit = {
-						OR = {
-							has_government = fascism 
-							has_government = communism
-						}
+            if = {
+				limit = { has_idea = MTG_naval_treaty_adherent }
+				swap_ideas = {
+					remove_idea = MTG_naval_treaty_adherent
+					add_idea = MTG_naval_treaty_adherent_1936
+				}
+			}
+			else = {
+				swap_ideas = {
+					remove_idea = MTG_naval_treaty_cheating
+					add_idea = MTG_naval_treaty_adherent_1936
+				}
+			}
+
+            if = {
+				limit = {
+					OR = {
+						has_government = fascism 
+						has_government = communism
 					}
-					custom_effect_tooltip = fascism_renew_naval_treaty_tt
-					add_political_power = -100
 				}
-				else = {
-					custom_effect_tooltip = democracy_renew_naval_treaty_tt
-					add_political_power = 10
-				}
-				set_country_flag = MTG_second_london_treaty_signed
-            }
+				custom_effect_tooltip = fascism_renew_naval_treaty_tt
+				add_political_power = -100
+			}
+			else = {
+				custom_effect_tooltip = democracy_renew_naval_treaty_tt
+				add_political_power = 10
+			}
+			set_country_flag = MTG_second_london_treaty_signed
+
+			modify_global_flag = { flag = MTG_naval_treaty_violator value = -1 }
 		}
 
         ai_will_do = {

src/common/decisions/naval_develop.txt

@@ -464,15 +464,17 @@ naval_develop_category = {
 	super_heavy_carrier_conversion = {
 		icon = GFX_decision_generic_construction
 		visible = {
-			has_tech = improved_ship_hull_carrier
+			has_tech = basic_ship_hull_carrier
 			has_tech = ship_hull_super_heavy
 			num_of_naval_factories > 12
+			NOT = { has_tech = converted_super_heavy_carrier }
 		}
 		available = {
 			has_navy_size = {
 				unit = SH_battleship
 				size > 0
 			}
+			has_tech = improved_ship_hull_carrier
 		}
 		fire_only_once = yes
 		days_remove = 90

src/common/decisions/stronger_ai.txt

@@ -11,4 +11,73 @@ navy_rework_category = {
             FROM = { country_event = vnr_ai.1 }
         }
 	}
+
+    shipyard_boost_for_new_tag_player = {
+        available = {
+            always = no
+        }
+        days_mission_timeout = 1
+        activation = {
+            date > 1936.1.2
+            is_ai = no
+            OR = {
+                AND = {
+                    has_game_rule = { rule = shipyard_output_boost_player option = BUFF_60 }
+                    NOT = { has_idea = vnr_shipyard_output_boost }
+                }
+                AND = {
+                    has_game_rule = { rule = shipyard_output_boost_player option = BUFF_30 }
+                    NOT = { has_idea = vnr_shipyard_output_boost_half }
+                }
+            }
+        }
+        timeout_effect = {
+            if = {
+	        	limit = {
+	        		has_game_rule = { rule = shipyard_output_boost_player option = BUFF_60 }
+	        	}
+	        	add_ideas = vnr_shipyard_output_boost
+	        }
+	        else_if = {
+	        	limit = {
+	        		has_game_rule = { rule = shipyard_output_boost_player option = BUFF_30 }
+	        	}
+	        	add_ideas = vnr_shipyard_output_boost_half
+	        }
+        }
+    }
+    shipyard_boost_for_new_tag_ai = {
+        available = {
+            always = no
+        }
+        days_mission_timeout = 1
+        activation = {
+            date > 1936.1.2
+            is_ai = yes
+            OR = {
+                AND = {
+                    has_game_rule = { rule = shipyard_output_boost_ai option = BUFF_60 }
+                    NOT = { has_idea = vnr_shipyard_output_boost }
+                }
+                AND = {
+                    has_game_rule = { rule = shipyard_output_boost_ai option = BUFF_30 }
+                    NOT = { has_idea = vnr_shipyard_output_boost_half }
+                }
+            }
+        }
+        timeout_effect = {
+            if = {
+	        	limit = {
+	        		has_game_rule = { rule = shipyard_output_boost_ai option = BUFF_60 }
+	        	}
+	        	add_ideas = vnr_shipyard_output_boost
+	        }
+	        else_if = {
+	        	limit = {
+	        		has_game_rule = { rule = shipyard_output_boost_ai option = BUFF_30 }
+	        	}
+	        	add_ideas = vnr_shipyard_output_boost_half
+	        }
+        }
+    }
 }

src/common/defines/VNR_naval_defines.lua

@@ -33,6 +33,8 @@ NDefines.NNavy.CAPITAL_ONLY_COMBAT_ACTIVATE_TIME = 22;
 NDefines.NNavy.ALL_SHIPS_ACTIVATE_TIME = 30;
 NDefines.NNavy.COMBAT_CHASE_RESIGNATION_HOURS = 4;
 NDefines.NNavy.ANTI_AIR_TARGETING = 0.93;
+NDefines.NNavy.MAX_ANTI_AIR_REDUCTION_EFFECT_ON_INCOMING_AIR_DAMAGE = 0.6;
+NDefines.NNavy.TRAINING_MAX_DAILY_COUNTRY_EXP = 2;
 NDefines.NNavy.SUBMARINE_REVEAL_BASE_CHANCE = 14;
 NDefines.NNavy.SUBMARINE_BASE_TORPEDO_REVEAL_CHANCE = 0.05;
 NDefines.NNavy.WAR_SCORE_GAIN_FOR_SUNK_SHIP_MANPOWER_FACTOR = 0.01;
@@ -147,5 +149,3 @@ NDefines.NIntel.NAVY_SHIP_TYPE_COUNT_INTEL_MIN = 0.01;
 NDefines.NIntel.NAVY_SHIP_TYPE_COUNT_INTEL_MAX = 0.3;
 NDefines.NIntel.NAVY_MIN_INTEL_TO_SHOW_SHIP_CLASSES = 0.15;
 NDefines.NIntel.NAVY_MIN_INTEL_TO_SHOW_SHIP_DESIGN_DETAILS = 0.5;
-
-NDefines.NGame.DECISION_ALERT_TIMEOUT_DAYS = 60;

src/common/ideas/vnr_navy_spirits.txt

@@ -114,8 +114,14 @@ ideas = {
         }
         advanced_supply_fleet = {
             ledger = navy
+            available = {
+                has_navy_size = {
+                    archetype = ship_hull_civilian
+                    size > 30
+                }
+            }
             modifier = {
-                naval_attrition = -0.15
+                navy_fuel_consumption_factor = -0.15
                 navy_max_range_factor = 0.1
                 floating_harbor_supply = 0.4
                 floating_harbor_range = 0.4

src/common/scripted_effects/_add_naval_variants.txt

@@ -2556,6 +2556,7 @@ ITA_start_naval_variants = {
       fixed_ship_armor_slot = ship_armor_cruiser_2
       fixed_ship_secondaries_slot = ship_secondaries_2
       fixed_ship_role_slot = ship_hull_cruiser_role_ca
+      fixed_ship_extra_secondaries_slot = ship_armor_extra
       front_1_custom_slot = ship_medium_battery_2_double
       mid_1_custom_slot = empty
       mid_2_custom_slot = ship_anti_air_1

src/common/scripted_effects/_add_starting_tech.txt

@@ -255,7 +255,7 @@ add_starting_techs = {
             basic_ballast_tank = 1
             cruiser_submarines = 1
             improved_ship_torpedo_launcher = 1
-
+            ita_extra_armor = 1
 
 			popup = no
         }

src/common/scripted_effects/_delete_starting_naval.txt

@@ -14,13 +14,11 @@ special_project_workaround = {
 	USA = {
 		complete_special_project = {
 			project = sp:sp_naval_cruiser_submarine
-			popup = no
 		}
 	}
 	JAP = {
 		complete_special_project = {
 			project = sp:sp_naval_super_heavy_battleship
-			popup = no
 		}
 	}
 }

src/common/scripted_effects/_vnr_naval_treaty.txt

@@ -72,4 +72,14 @@ add_starting_navy_spirits = {
 	ENG = {
 		add_ideas = dartmouth_naval_academy
 	}
+}
+
+sign_naval_treaty = {
+	every_country = {
+		limit = { has_naval_treaty_trigger = yes }
+		country_event = {
+			id = MTG_naval_treaty.12
+			days = 60
+		}
+	}
 }

src/common/special_projects/projects/naval_projects.txt

@@ -734,6 +734,108 @@ sp_arsenal_ship = {
         }
     }
 
+	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_early_informatization_system = {
+	specialization = specialization_naval
+	project_tags = { sp_tag_surface_ship }
+    available = {
+		FROM = {
+			has_tech = naval_tactical_data_system
+		}
+    }
+	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 = {
+		country_effects = {
+            custom_effect_tooltip = {
+				localization_key = SP_UNLOCK_TECH
+				TECH = phased_array_radar
+			}
+			custom_override_tooltip = {	
+				tooltip = tech_effect|phased_array_radar
+				set_technology = {
+					phased_array_radar = 1
+					popup = no
+				}
+			}
+			custom_effect_tooltip = {
+				localization_key = SP_UNLOCK_TECH
+				TECH = integrated_combat_system
+			}
+			custom_override_tooltip = {	
+				tooltip = tech_effect|integrated_combat_system
+				set_technology = {
+					integrated_combat_system = 1
+					popup = no
+				}
+			}
+        }
+    }
+
+	unique_prototype_rewards = {
+		sp_early_informatization_system_unique_reward_a = {
+			fire_only_once = yes
+			threshold = {
+				min = 25
+				max = 75
+			}
+			weight = { base = 100 }
+			option = {
+				token = sp_early_informatization_system_perference_a
+				iteration_output = {
+					country_effects = {
+						add_tech_bonus = {
+							bonus = 0.5
+							uses = 1
+							technology = tactical_data_link
+						}
+					}
+				}
+			}
+			option = {
+				token = sp_early_informatization_system_perference_b
+				iteration_output = {
+					country_effects = {
+						add_tech_bonus = {
+							bonus = 1
+							uses = 1
+							technology = tactical_data_link
+						}
+						sp:sp_early_informatization_system = { add_project_progress_ratio = -0.25 }
+					}
+				}
+			}
+		}
+	}
+
 	generic_prototype_rewards = {
 		sp_naval_generic_reward_scientist_xp_1
 		sp_naval_generic_reward_scientist_xp_2

src/common/technologies/MTG_naval.txt

@@ -907,6 +907,7 @@ technologies = {
 			dd_tech
 			mio_cat_tech_all_screen_ship_and_modules
 			mio_cat_tech_all_capital_ship_and_modules
+			rocketry
 		}
 	}
 
@@ -1370,6 +1371,12 @@ technologies = {
 	}
 
 	phased_array_radar = {
+		is_special_project_tech = yes
+		allow = {
+			ROOT = {
+				is_special_project_completed = sp:sp_early_informatization_system
+			}
+		}
 		enable_equipment_modules = {
 			ship_radar_5
 		}
@@ -1392,6 +1399,7 @@ technologies = {
 			cl_tech
 			ca_tech
 			mio_cat_tech_all_cruiser_and_modules
+			electronics
 		}
 	}
 	new_ship_materials = {
@@ -1510,6 +1518,7 @@ technologies = {
 			cl_tech
 			ca_tech
 			mio_cat_tech_all_cruiser_and_modules
+			electronics
 		}
 	}
 	advanced_radar_finder = {
@@ -1536,6 +1545,8 @@ technologies = {
 			cl_tech
 			ca_tech
 			mio_cat_tech_all_cruiser_and_modules
+			electronics
+			radar_tech
 		}
 	}
 	nuclear_engine_research = {
@@ -1603,6 +1614,7 @@ technologies = {
 		special_project_specialization = { specialization_naval }
 		categories = {
 			naval_equipment
+			nuclear
 			bb_tech
 			bc_tech
 			ship_modules_tech
@@ -2144,6 +2156,8 @@ technologies = {
 		}
 		enable_equipment_modules = {
 			ship_helipad
+			carrier_helipad_asw
+			carrier_helipad_aew
 		}
 
 		folder = {
@@ -3475,6 +3489,8 @@ technologies = {
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
+			electronics
+			radar_tech
 		}
 	}
 
@@ -3535,6 +3551,7 @@ technologies = {
 			bc_tech
 			ship_modules_tech
 			mio_cat_tech_all_capital_ship_and_modules
+			electronics
 		}
 	}
 
@@ -3585,6 +3602,8 @@ technologies = {
 			bc_tech
 			ship_modules_tech
 			mio_cat_tech_all_capital_ship_and_modules
+			electronics
+			computing_tech
 		}
 	}
 
@@ -3612,6 +3631,8 @@ technologies = {
 		special_project_specialization = { specialization_naval }
 		categories = {
 			naval_equipment
+			electronics
+			computing_tech
 		}
 	}
 
@@ -3641,9 +3662,17 @@ technologies = {
 			bc_tech
 			ship_modules_tech
 			mio_cat_tech_all_capital_ship_and_modules
+			electronics
+			computing_tech
 		}
 	}
 	integrated_combat_system = {
+		is_special_project_tech = yes
+		allow = {
+			ROOT = {
+				is_special_project_completed = sp:sp_early_informatization_system
+			}
+		}
 		research_cost = 1.5
 		enable_equipment_modules = {
 			ship_fire_control_system_5
@@ -3654,9 +3683,6 @@ technologies = {
 			name = mtgnavalfolder
 			position = { x = -1 y = @1952 }
 		}
-		dependencies = {
-			phased_array_radar = 1
-		}
 		path = {
 			leads_to_tech = tactical_data_link
 			research_cost_coeff = 1
@@ -3673,6 +3699,8 @@ technologies = {
 			bc_tech
 			ship_modules_tech
 			mio_cat_tech_all_capital_ship_and_modules
+			electronics
+			computing_tech
 		}
 	}
 	tactical_data_link = {
@@ -3702,6 +3730,8 @@ technologies = {
 			bc_tech
 			ship_modules_tech
 			mio_cat_tech_all_capital_ship_and_modules
+			electronics
+			computing_tech
 		}
 	}
 	tactical_data_link_for_member = {
@@ -3740,6 +3770,8 @@ technologies = {
 			bb_tech
 			bc_tech
 			mio_cat_tech_all_capital_ship_and_modules
+			electronics
+			computing_tech
 		}
 	}
 	recon_drones = {
@@ -4610,6 +4642,8 @@ technologies = {
 			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
+			electronics
+			radar_tech
 		}
 	}
 	airborne_early_warning = {
@@ -4634,6 +4668,8 @@ technologies = {
 			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
+			electronics
+			radar_tech
 		}
 	}
 	iff_device = {
@@ -4656,6 +4692,7 @@ technologies = {
 			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
+			electronics
 		}
 	}
 	optical_landing_system = {
@@ -4707,6 +4744,8 @@ technologies = {
 			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
+			electronics
+			radar_tech
 		}
 	}
 
@@ -5537,6 +5576,7 @@ technologies = {
 			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
+			rocketry
 		}
 	}
 	rescue_submarine = {
@@ -5702,6 +5742,7 @@ technologies = {
 	converted_super_heavy_carrier = {
 		enable_equipment_modules = {
 			carrier_shbb_conversion
+			ship_deck_space_converted
 		}
 
 		research_cost = 1
@@ -5858,6 +5899,8 @@ technologies = {
 		special_project_specialization = { specialization_naval }
 		categories = {
 			naval_equipment
+			electronics
+			radar_tech
 		}
 	}
 

src/common/technologies/MTG_naval_Support.txt

@@ -1318,9 +1318,9 @@ technologies = {
 		categories = {
 			naval_equipment
 			ship_modules_tech
-			cat_ship_medium_battery
 			mio_cat_tech_all_cruiser_and_modules
 			mio_cat_tech_all_capital_ship_and_modules
+			rocketry
 		}
 	}
 

src/common/technologies/Speical_modules.txt

@@ -47,4 +47,16 @@ technologies = {
             fra_11in_1931_quad
         }
     }
+
+    ita_extra_armor = {
+        research_cost = 1
+        start_year = 1936
+
+        allow = {
+            always = no
+        }
+        enable_equipment_modules = {
+            ship_armor_extra
+        }
+    }
 }

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

@@ -161,6 +161,61 @@ equipment_modules = {
 		}
 		dismantle_cost_ic = 1600
 	}
+	ship_deck_space_converted = {
+		category = ship_deck_space_converted
+		gui_category = ship_deck_space
+		gfx = ship_deck_space
+
+		add_equipment_type = capital_ship
+		add_stats = {
+			carrier_size = 2
+			build_cost_ic = 2000
+			surface_detection = 4
+			supply_consumption = 0.015
+		}
+		manpower = 200 #outside the add_stats section for code reasons
+		multiply_stats = {
+			naval_speed = -0.05
+			anti_air_attack = 0.025
+			fuel_consumption = 0.075
+		}
+		dismantle_cost_ic = 600
+		can_convert_from = {
+			module_category = ship_deck_space
+			convert_cost_ic = 1000
+		}
+	}
+
+##########################
+##  CARRIER HELICOPTER  ##
+##########################
+	carrier_helipad_asw = {
+		category = carrier_helipad
+		add_stats = {
+			surface_detection = 0.5
+			sub_detection = 6
+			sub_attack = 6
+			build_cost_ic = 350
+		}
+		multiply_stats = {
+			naval_speed = -0.005
+		}
+		dismantle_cost_ic = 100
+	}
+	carrier_helipad_aew = {
+		category = carrier_helipad
+		add_stats = {
+			surface_detection = 7
+			sub_detection = 1
+			sub_attack = 0.5
+			build_cost_ic = 350
+		}
+		multiply_stats = {
+			anti_air_attack = 0.05
+			naval_speed = -0.005
+		}
+		dismantle_cost_ic = 100
+	}
 
 
 ###################

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

@@ -374,7 +374,7 @@ equipment_modules = {
 		add_stats = {
 			#naval_speed = 5
 			fuel_consumption = 15
-			build_cost_ic = 500
+			build_cost_ic = 1500
 			reliability = -0.3
 		}
 		
@@ -395,14 +395,14 @@ equipment_modules = {
 
 		add_stats = {
 			#naval_speed = 5
-			build_cost_ic = 3000
+			build_cost_ic = 4000
 			naval_range = 50000
 			reliability = -0.3
 		}
 		
 		multiply_stats = {
 			naval_speed = 0.3
-			sub_visibility = -0.3
+			sub_visibility = -0.2
 			max_strength = -0.1
 			fuel_consumption = -1
 		}

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

@@ -337,6 +337,7 @@ equipment_modules = {
 		dismantle_cost_ic = 100000
 		forbid_module_categories = {
 			ship_super_heavy_armor
+			ship_deck_space_converted
 		}
 	}
 	carrier_bc_conversion = {
@@ -351,16 +352,16 @@ equipment_modules = {
 		dismantle_cost_ic = 100000
 		forbid_module_categories = {
 			ship_super_heavy_armor
+			ship_deck_space_converted
 		}
 	}
 	carrier_shbb_conversion = {
 		category = bb_carrier_role
 		add_stats = {
-			carrier_size = 2
 			reliability = 0.1
 		}
 		multiply_stats = {
-			build_cost_ic = 0.5
+			build_cost_ic = 0.35
 			max_strength = 0.1
 		}
 		dismantle_cost_ic = 100000

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

@@ -1280,4 +1280,18 @@ equipment_modules = {
 			naval_speed = -0.01
 		}
 	}
+	ship_armor_extra = {
+		category = heavy_miscellaneous
+		gfx = ship_cruiser_armor
+		
+		multiply_stats = {
+			build_cost_ic = 0.025
+			naval_speed = -0.02
+		}
+		dismantle_cost_ic = 1000
+
+		add_stats = {
+			armor_value = 3
+		}
+	}
 }

src/common/units/equipment/ship_hull_carrier.txt

@@ -233,6 +233,12 @@ equipments = {
 					ship_deck_space_small
 				}
 			}
+			rear_1_custom_slot = {
+				required = no
+				allowed_module_categories = {
+					ship_deck_space_converted
+				}
+			}
 		}
 
 		default_modules = {
@@ -435,6 +441,7 @@ equipments = {
 					ship_anti_air
 					ship_deck_space
 					ship_deck_space_small
+					carrier_helipad
 				}
 			}
 			front_2_custom_slot = {
@@ -455,6 +462,7 @@ equipments = {
 					steam_catapult
 					carrier_side_lift
 					carrier_angled_deck
+					carrier_helipad
 				}
 			}
 			mid_2_custom_slot = {
@@ -467,6 +475,7 @@ equipments = {
 					steam_catapult
 					carrier_side_lift
 					carrier_angled_deck
+					carrier_helipad
 				}
 			}
 			rear_1_custom_slot = {
@@ -654,6 +663,7 @@ equipments = {
 					steam_catapult
 					carrier_side_lift
 					carrier_angled_deck
+					carrier_helipad
 				}
 			}
 			front_2_custom_slot = front_1_custom_slot
@@ -667,6 +677,7 @@ equipments = {
 					steam_catapult
 					carrier_side_lift
 					carrier_angled_deck
+					carrier_helipad
 				}
 			}
 			mid_2_custom_slot = mid_1_custom_slot
@@ -678,8 +689,10 @@ equipments = {
 					ship_anti_air
 					ship_missile_aa
 					carrier_side_lift
+					carrier_helipad
 				}
 			}
+			rear_2_custom_slot = rear_1_custom_slot
 		}
 		default_modules = {
 			fixed_ship_engine_slot = carrier_ship_engine_4
@@ -755,6 +768,7 @@ equipments = {
 					steam_catapult
 					carrier_side_lift
 					carrier_angled_deck
+					carrier_helipad
 				}
 			}
 			mid_1_custom_slot = {
@@ -767,6 +781,7 @@ equipments = {
 					steam_catapult
 					carrier_side_lift
 					carrier_angled_deck
+					carrier_helipad
 				}
 			}
 			rear_1_custom_slot = {
@@ -776,8 +791,11 @@ equipments = {
 					ship_missile_aa
 					ship_secondaries
 					ship_dp_secondaries_bb
+					carrier_side_lift
+					carrier_helipad
 				}
 			}
+			rear_2_custom_slot = rear_1_custom_slot
 		}
 		default_modules = {
 			fixed_ship_engine_slot = carrier_ship_engine_4

src/common/units/equipment/ship_hull_civilian.txt

@@ -143,6 +143,9 @@ equipments = {
         reliability = 0.70
         build_cost_ic = 1000
         manpower = 600
+        resources = {
+            steel = 2
+        }
     }
 
     vnr_ship_hull_civilian_3 = {
@@ -171,5 +174,8 @@ equipments = {
         build_cost_ic = 1000
         manpower = 800
 		naval_range = 10000
+        resources = {
+            steel = 2
+        }
     }
 }

src/common/units/equipment/ship_hull_cruiser.txt

@@ -181,6 +181,10 @@ equipments = {
 			module = ship_aa_fire_control
 			count < 2
 		}
+		module_count_limit = {
+			module = ship_radar_jammer
+			count < 2
+		}
 
 		default_modules = {
 			fixed_ship_battery_slot = empty
@@ -430,7 +434,8 @@ equipments = {
 		reliability = 0.7
 		armor_value = 10
 		resources = {
-			steel = 3
+			steel = 2
+			chromium = 1
 		}
 		module_slots = {
 			fixed_ship_battery_slot = {
@@ -744,7 +749,7 @@ equipments = {
 		naval_range = 3000
 		max_strength = 75
 		resources = {
-			steel = 2
+			steel = 3
 		}
 		module_slots = inherit
 
@@ -769,7 +774,7 @@ equipments = {
 		naval_range = 4000
 		manpower = 1400
 		resources = {
-			steel = 3
+			steel = 4
 		}
 		module_slots = inherit
 
@@ -794,7 +799,8 @@ equipments = {
 		naval_range = 4500
 		max_strength = 90
 		resources = {
-			steel = 3
+			steel = 4
+			chromium = 1
 		}
 		module_slots = {
 			fixed_ship_battery_slot = inherit
@@ -909,7 +915,8 @@ equipments = {
 		naval_range = 5000
 		max_strength = 100
 		resources = {
-			steel = 3
+			steel = 4
+			chromium = 1
 		}
 		module_slots = {
 			fixed_ship_battery_slot = {

src/common/units/equipment/ship_hull_heavy.txt

@@ -141,6 +141,10 @@ equipments = {
 			module = ship_aa_fire_control
 			count < 2
 		}
+		module_count_limit = {
+			module = ship_radar_jammer
+			count < 2
+		}
 
 		default_modules = {
 			fixed_ship_battery_slot = empty
@@ -525,6 +529,10 @@ equipments = {
 		fuel_consumption = 67
 		surface_visibility = 29
 		build_cost_ic = 3000
+		resources = {
+			steel = 4
+			chromium = 1
+		}
 
 		manpower = 2800
 	}
@@ -632,6 +640,10 @@ equipments = {
 		surface_visibility = 27
 		reliability = 0.95
 		build_cost_ic = 3300
+		resources = {
+			steel = 5
+			chromium = 1
+		}
 
 		manpower = 3800
 	}
@@ -761,7 +773,7 @@ equipments = {
 		surface_visibility = 46
 		build_cost_ic = 3800
 		resources = {
-			steel = 4
+			steel = 5
 			chromium = 1
 		}
 		manpower = 3500
@@ -860,6 +872,11 @@ equipments = {
 		surface_visibility = 30
 		reliability = 1.4
 		build_cost_ic = 3500
+		resources = {
+			steel = 4
+			chromium = 2
+			aluminium = 1
+		}
 
 		manpower = 4500
 

src/common/units/equipment/ship_hull_light.txt

@@ -149,6 +149,10 @@ equipments = {
 			module = ship_aa_fire_control
 			count < 2
 		}
+		module_count_limit = {
+			module = ship_radar_jammer
+			count < 2
+		}
 
 		default_modules = {
 			fixed_ship_battery_slot = empty
@@ -384,7 +388,7 @@ equipments = {
 		max_strength = 75
 		build_cost_ic = 650
 		resources = {
-			steel = 4
+			steel = 3
 			chromium = 1
 		}
 		manpower = 500
@@ -522,7 +526,7 @@ equipments = {
 		max_strength = 100
 		build_cost_ic = 800
 		resources = {
-			steel = 4
+			steel = 3
 			chromium = 1
 		}
 		manpower = 600

src/common/units/equipment/ship_hull_submarine.txt

@@ -50,6 +50,7 @@ equipments = {
 				allowed_module_categories = {
 					ship_torpedo_sub
 					ship_mine_layer_sub
+					ship_extra_fuel_tank
 				}
 			}
 		}
@@ -225,7 +226,7 @@ equipments = {
 					ship_sub_snorkel
 				}
 			}
-			rear_1_custom_slot = front_1_custom_slot
+			rear_1_custom_slot = inherit
 		}
 
 		default_modules = {
@@ -276,7 +277,7 @@ equipments = {
 					sub_ship_stealth
 				}
 			}
-			rear_1_custom_slot = front_1_custom_slot
+			rear_1_custom_slot = inherit
 		}
 
 		default_modules = {
@@ -333,7 +334,7 @@ equipments = {
 			}
 			rear_1_custom_slot = {
 				required = no
-				allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub sub_rocket }
+				allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub sub_rocket ship_extra_fuel_tank }
 			}
 			rear_2_custom_slot = rear_1_custom_slot
 		}

src/common/units/names_ships/ENG_ship_names.txt

@@ -297,7 +297,7 @@ ENG_BB_HISTORICAL = {
 	fallback_name = "Battleship %s"
 
 	unique = {
-		"英王乔治五世" "威尔士亲王" "约克公爵"
+		"英王乔治五世" "威尔士亲王" "约克公爵" "安森" "豪"
 		
 		# Lion class
 		"狮" "鲁莽" "解放者" "雷神" "前卫" "反抗"