2025-02-10 09:14:41

src/common/ai_equipment/vnr_battleships.txt

@@ -3,7 +3,7 @@ naval_capital_battleship = {
 	#available_for = {}
 	#blocked_for = {}
 	roles = { vnr_naval_capital_bb }
-	priority = { base = 10 }
+	priority = { base = 50 }
 
 	capital_battleship_1924 = {
 		name = vnr_bb_1924

src/common/ai_strategy/naval_production.txt

@@ -439,7 +439,7 @@ naval_unit_role_ratios_GER_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 500
+		value = 800
 	}
 
 	ai_strategy = {
@@ -475,7 +475,7 @@ naval_unit_role_ratios_GER_atwar_many_shipyard = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 180
+		value = 1000
 	}
 
 	ai_strategy = {
@@ -723,7 +723,7 @@ naval_unit_role_ratios_ENG_prewar_early = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 30
+		value = 50
 	}
 }
 
@@ -783,7 +783,7 @@ naval_unit_role_ratios_ENG_prewar_late = {
 
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 50
+		value = 90
 	}
 }
 
@@ -829,7 +829,7 @@ naval_unit_role_ratios_ENG_atwar = {
 
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 65
+		value = 100
 	}
 }
 
@@ -1324,7 +1324,7 @@ naval_unit_role_ratios_JAP_prewar_enough_carrier = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 30
+		value = 55
 	}
 }
 
@@ -1374,7 +1374,7 @@ naval_unit_role_ratios_JAP_atwar = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 60
+		value = 90
 	}
 }
 
@@ -1432,7 +1432,7 @@ naval_unit_role_ratios_JAP_late_peace = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 30
+		value = 100
 	}
 }
 
@@ -1594,7 +1594,7 @@ naval_unit_role_ratios_USA_atwar = {
 	
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 90
+		value = 150
 	}
 }
 
@@ -1736,7 +1736,7 @@ naval_unit_role_ratios_ITA_atwar_with_England = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 40
+		value = 75
 	}
 }
 
@@ -1793,7 +1793,7 @@ naval_unit_role_ratios_ITA_atwar_with_major = {
 	}
 	ai_strategy = {
 		type = dockyard_to_military_factory_ratio
-		value = 50
+		value = 90
 	}
 }
 

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 = {
+			custom_effect_tooltip = MTG_treaty_renew_mission_tt
-				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
-            }
 			if = {
 				limit = {
-					all_other_country = {
+					has_global_flag = { flag = MTG_naval_treaty_violator value > 0 }
-						NOT = { has_idea = MTG_naval_treaty_adherent }
-					}
 				}
-				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 }
 			}
-		}
             
-        ai_will_do = {
+			clr_global_flag = MTG_second_london_conference 
-            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
+		cancel_trigger = {
-		timeout_effect = {
+			NOT = { has_active_mission = MTG_escalator_clause_invocation_mission }
-            add_threat = 5
 		}
+		fire_only_once = yes
+		
 		complete_effect = {
-			FROM = {
+            if = {
-                swap_ideas = {
+				limit = { has_idea = MTG_naval_treaty_adherent }
-                    remove_idea = MTG_naval_treaty_adherent
+				swap_ideas = {
-                    add_idea = MTG_naval_treaty_adherent_1936
+					remove_idea = MTG_naval_treaty_adherent
-                }
+					add_idea = MTG_naval_treaty_adherent_1936
-                if = {
+				}
-					limit = {
+			}
-						OR = {
+			else = {
-							has_government = fascism 
+				swap_ideas = {
-							has_government = communism
+					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 = fascism_renew_naval_treaty_tt
-					custom_effect_tooltip = democracy_renew_naval_treaty_tt
+				add_political_power = -100
-					add_political_power = 10
+			}
-				}
+			else = {
-				set_country_flag = MTG_second_london_treaty_signed
+				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/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_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
         }
@@ -512,6 +512,8 @@ makeup_starting_techs = {
 		set_technology = {
 			dry_dock = 1
 			heavy_crane = 1
+            repair_ship = 1
+            hospital_ship = 1
 			popup = no
 		}
 	}

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 = {
@@ -3847,6 +3879,8 @@ technologies = {
 			ship_deck_space_more
 			carrier_spared_squad
 			carrier_wooden_deck
+			carrier_bb_conversion
+			carrier_bc_conversion
 		}
 		ship_hull_carrier_design_cost_factor = -0.1
 		path = {
@@ -3890,6 +3924,7 @@ technologies = {
 			carrier_ship_engine_1
 			ship_deck_space_armored
 			carrier_scouting_unit
+			carrier_no_island
 		}
 
 		path = {
@@ -4607,6 +4642,8 @@ technologies = {
 			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
+			electronics
+			radar_tech
 		}
 	}
 	airborne_early_warning = {
@@ -4631,6 +4668,8 @@ technologies = {
 			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
+			electronics
+			radar_tech
 		}
 	}
 	iff_device = {
@@ -4653,6 +4692,7 @@ technologies = {
 			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
+			electronics
 		}
 	}
 	optical_landing_system = {
@@ -4704,6 +4744,8 @@ technologies = {
 			naval_equipment
 			cv_tech
 			mio_cat_tech_all_carrier_and_modules
+			electronics
+			radar_tech
 		}
 	}
 
@@ -5507,7 +5549,7 @@ technologies = {
 	}
 
 	missile_submarine = {
-		research_cost = 1.25
+		research_cost = 1
 		enable_equipment_modules = {
 			ship_cruise_missile_sub_1
 		}
@@ -5534,6 +5576,7 @@ technologies = {
 			naval_equipment
 			ss_tech
 			mio_cat_tech_all_submarine_and_modules
+			rocketry
 		}
 	}
 	rescue_submarine = {
@@ -5564,9 +5607,9 @@ technologies = {
 	hydrocooling_battery = {
 		research_cost = 0.75
 		submarine = {
-			naval_speed = 0.1
+			naval_speed = 0.15
 		}
-		sub_retreat_speed = 0.05
+		sub_retreat_speed = 0.1
 
 		start_year = 1952
 
@@ -5696,6 +5739,19 @@ technologies = {
 			always = no
 		}
 	}
+	converted_super_heavy_carrier = {
+		enable_equipment_modules = {
+			carrier_shbb_conversion
+			ship_deck_space_converted
+		}
+
+		research_cost = 1
+		start_year = 1940
+
+		allow = {
+			always = no
+		}
+	}
 	cruiser_submarines = {
 
 		enable_equipments = {
@@ -5843,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
 		}
 	}
 
@@ -2029,6 +2029,14 @@ technologies = {
 			name = mtgnavalsupportfolder
 			position = { x = 0 y = 23 }
 		}
+		special_project_specialization = { specialization_naval }
+		categories = {
+			naval_equipment
+			ship_modules_tech
+			cat_torpedoes
+			mio_cat_tech_all_screen_ship_and_modules
+			mio_cat_tech_all_destroyer_and_modules
+		}
 	}
 
 
@@ -3033,6 +3041,7 @@ technologies = {
 		}
 
 		production_speed_dockyard_factor = 0.1
+		repair_speed_factor = 0.15
 		special_project_specialization = { specialization_naval }
 		categories = {
 			naval_equipment
@@ -3534,8 +3543,8 @@ technologies = {
 
 	sp_multi_product_supply_ships = {
 
-		underway_replenishment_range = 0.5
+		underway_replenishment_range = 0.25
-		underway_replenishment_convoy_cost = -0.25
+		underway_replenishment_convoy_cost = -0.1
 
 		allow_branch = {
 			has_dlc = "Gotterdammerung"
@@ -3556,7 +3565,7 @@ technologies = {
 		xp_research_type = navy
 		xp_boost_cost = 75
 		xp_research_bonus = 1.75
-		research_cost = 0.75
+		research_cost = 0.5
 		start_year = 1938
 		folder = {
 			name = mtgnavalsupportfolder
@@ -3579,15 +3588,15 @@ technologies = {
 			}
 		}
 
-		underway_replenishment_range = 0.5
+		underway_replenishment_range = 0.25
-		underway_replenishment_convoy_cost = -0.25
+		underway_replenishment_convoy_cost = -0.1
 
 		force_use_small_tech_layout = yes
 		is_special_project_tech = yes
 		xp_research_type = navy
 		xp_boost_cost = 75
 		xp_research_bonus = 1.5
-		research_cost = 1
+		research_cost = 0.5
 		start_year = 1943
 		folder = {
 			name = mtgnavalsupportfolder

src/common/units/names_ships/ENG_ship_names.txt

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

src/events/00_navy_rework.txt

@@ -195,6 +195,8 @@ country_event = {
 		add_article_xix = yes
 		
 		add_starting_navy_spirits = yes
+		
+		sign_naval_treaty = yes
     }
 }