From c70d9b827a43957e39ab3fcea46d04d5239949b1 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Mon, 30 Jun 2025 04:03:22 +0000 Subject: [PATCH] 2025-06-30 04:03:22 --- src/common/ai_equipment/vnr_battleships.txt | 37 +++++++++---------- src/common/ai_strategy/naval_production.txt | 32 ++++++++-------- src/common/ai_strategy/vnr_naval_strategy.txt | 20 ++++++++++ .../scripted_effects/_add_starting_tech.txt | 1 + src/common/technologies/MTG_naval.txt | 16 +++++--- src/common/technologies/MTG_naval_Support.txt | 2 + src/events/ai_ships.txt | 2 + 7 files changed, 70 insertions(+), 40 deletions(-) diff --git a/src/common/ai_equipment/vnr_battleships.txt b/src/common/ai_equipment/vnr_battleships.txt index ab7ad17..22ca0aa 100755 --- a/src/common/ai_equipment/vnr_battleships.txt +++ b/src/common/ai_equipment/vnr_battleships.txt @@ -59,22 +59,21 @@ naval_capital_battleship = { type = vnr_ship_hull_heavy_3 modules = { - fixed_ship_battery_slot = ship_heavy_battery + fixed_ship_battery_slot = ship_heavy_battery_triple fixed_ship_anti_air_slot = ship_anti_air fixed_ship_fire_control_system_slot = ship_fire_control_system - fixed_ship_radar_slot = ship_mast + fixed_ship_radar_slot = { any_of = { ship_radar ship_mast } } fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } } - fixed_ship_secondaries_slot = ship_secondaries + fixed_ship_secondaries_slot = ship_dp_secondaries_bb fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_2 ship_armor_bb_1 } } fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } } fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } } fixed_ship_airplane_launcher_slot = ship_airplane_launcher fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } - front_1_custom_slot = ship_heavy_battery - mid_1_custom_slot = ship_secondaries + front_1_custom_slot = ship_heavy_battery_triple + mid_1_custom_slot = ship_dp_secondaries_bb mid_2_custom_slot = ship_anti_air - rear_1_custom_slot = ship_heavy_battery - rear_2_custom_slot = ship_heavy_battery + rear_1_custom_slot = ship_heavy_battery_triple } } } @@ -96,7 +95,7 @@ naval_capital_battleship = { type = vnr_ship_hull_heavy_4 modules = { - fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + fixed_ship_battery_slot = ship_heavy_battery_triple fixed_ship_anti_air_slot = ship_anti_air fixed_ship_fire_control_system_slot = ship_fire_control_system fixed_ship_radar_slot = ship_radar @@ -107,12 +106,12 @@ naval_capital_battleship = { fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } } fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } } fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } - front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + front_1_custom_slot = ship_heavy_battery_triple mid_1_custom_slot = ship_secondaries mid_2_custom_slot = ship_anti_air mid_3_custom_slot = ship_dp_secondaries_bb - rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } - rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + rear_1_custom_slot = ship_heavy_battery_triple + rear_2_custom_slot = ship_heavy_battery_triple } } } @@ -134,7 +133,7 @@ naval_capital_battleship = { type = vnr_ship_hull_heavy_5 modules = { - fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + fixed_ship_battery_slot = ship_heavy_battery_triple fixed_ship_anti_air_slot = ship_anti_air fixed_ship_fire_control_system_slot = ship_fire_control_system fixed_ship_radar_slot = ship_radar @@ -145,12 +144,12 @@ naval_capital_battleship = { fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } } fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } } fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } - front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + front_1_custom_slot = ship_heavy_battery_triple mid_1_custom_slot = ship_dp_secondaries_bb mid_2_custom_slot = ship_anti_air mid_3_custom_slot = ship_dp_secondaries_bb - rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } - rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + rear_1_custom_slot = ship_heavy_battery_triple + rear_2_custom_slot = ship_heavy_battery_triple } } } @@ -172,7 +171,7 @@ naval_capital_battleship = { type = vnr_ship_hull_heavy_5 modules = { - fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + fixed_ship_battery_slot = ship_heavy_battery_triple fixed_ship_anti_air_slot = ship_missile_aa fixed_ship_fire_control_system_slot = ship_fire_control_system fixed_ship_radar_slot = ship_radar @@ -183,11 +182,11 @@ naval_capital_battleship = { fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } } fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } } fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } - front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + front_1_custom_slot = ship_heavy_battery_triple mid_1_custom_slot = ship_dp_secondaries_bb mid_2_custom_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } } mid_3_custom_slot = ship_dp_secondaries_bb - rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + rear_1_custom_slot = ship_heavy_battery_triple rear_2_custom_slot = ship_missile_aa } } @@ -200,7 +199,7 @@ naval_capital_battleship = { priority = { base = 0 modifier = { add = 50 tag = CHY } - modifier = { factor = 0 has_navy_size = { unit = SH_battleship size > 4 } } + modifier = { factor = 0 has_navy_size = { unit = SH_battleship size > 3 } } modifier = { factor = 0 expert_ai_style = yes } } diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt index 219049e..43b349c 100755 --- a/src/common/ai_strategy/naval_production.txt +++ b/src/common/ai_strategy/naval_production.txt @@ -2244,7 +2244,7 @@ we_need_cv_planes_1 = { ai_strategy = { type = unit_ratio id = cv_cas - value = 10 + value = 1 } ai_strategy = { @@ -2256,13 +2256,13 @@ we_need_cv_planes_1 = { ai_strategy = { type = equipment_production_factor id = cv_naval_bomber - value = 20 + value = 50 } ai_strategy = { type = equipment_production_factor id = cv_cas - value = 20 + value = 1 } ai_strategy = { @@ -2309,31 +2309,31 @@ we_need_cv_planes_2 = { ai_strategy = { type = unit_ratio id = cv_naval_bomber - value = 25 + value = 45 } ai_strategy = { type = unit_ratio id = cv_cas - value = 20 + value = 1 } ai_strategy = { type = equipment_production_factor id = cv_fighter - value = 50 + value = 35 } ai_strategy = { type = equipment_production_factor id = cv_naval_bomber - value = 40 + value = 50 } ai_strategy = { type = equipment_production_factor id = cv_cas - value = 40 + value = 1 } ai_strategy = { @@ -2351,7 +2351,7 @@ we_need_cv_planes_2 = { ai_strategy = { type = equipment_production_min_factories id = cv_cas - value = 5 + value = 1 } ai_strategy = { @@ -2373,37 +2373,37 @@ we_need_cv_planes_3 = { ai_strategy = { type = unit_ratio id = cv_fighter - value = 50 + value = 45 } ai_strategy = { type = unit_ratio id = cv_naval_bomber - value = 40 + value = 60 } ai_strategy = { type = unit_ratio id = cv_cas - value = 35 + value = 1 } ai_strategy = { type = equipment_production_factor id = cv_fighter - value = 80 + value = 60 } ai_strategy = { type = equipment_production_factor id = cv_naval_bomber - value = 60 + value = 100 } ai_strategy = { type = equipment_production_factor id = cv_cas - value = 60 + value = 1 } ai_strategy = { @@ -2421,7 +2421,7 @@ we_need_cv_planes_3 = { ai_strategy = { type = equipment_production_min_factories id = cv_cas - value = 8 + value = 1 } ai_strategy = { diff --git a/src/common/ai_strategy/vnr_naval_strategy.txt b/src/common/ai_strategy/vnr_naval_strategy.txt index a100d05..26aca4b 100755 --- a/src/common/ai_strategy/vnr_naval_strategy.txt +++ b/src/common/ai_strategy/vnr_naval_strategy.txt @@ -245,16 +245,36 @@ USA_pacific_war_naval_avoid_first = { id = 77 value = 100 } + ai_strategy = { + type = naval_avoid_region + id = 78 + value = 100 + } ai_strategy = { type = naval_avoid_region id = 79 value = 100 } + ai_strategy = { + type = naval_avoid_region + id = 84 + value = 50 + } ai_strategy = { type = naval_avoid_region id = 90 value = 100 } + ai_strategy = { + type = naval_avoid_region + id = 94 + value = 100 + } + ai_strategy = { + type = naval_avoid_region + id = 97 + value = 100 + } ai_strategy = { type = naval_avoid_region id = 177 diff --git a/src/common/scripted_effects/_add_starting_tech.txt b/src/common/scripted_effects/_add_starting_tech.txt index fbd7ce2..d8aa8a4 100755 --- a/src/common/scripted_effects/_add_starting_tech.txt +++ b/src/common/scripted_effects/_add_starting_tech.txt @@ -425,6 +425,7 @@ makeup_starting_techs = { mixed_armor_scheme = 1 basic_heavy_armor = 1 krupp_steel = 1 + fuel_oil_boiler = 1 popup = no } } diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt index e95de6c..222e41c 100755 --- a/src/common/technologies/MTG_naval.txt +++ b/src/common/technologies/MTG_naval.txt @@ -503,6 +503,7 @@ technologies = { enable_equipment_modules = { ship_depth_charge_4 + ship_asw_battery_1 } on_research_complete = { custom_effect_tooltip = depth_charges_advice_tt @@ -3639,7 +3640,7 @@ technologies = { research_cost_coeff = 1 } path = { - leads_to_tech = symmetric_key_algorithm + leads_to_tech = cryptography_revolution research_cost_coeff = 1 } @@ -3659,11 +3660,13 @@ technologies = { } } - symmetric_key_algorithm = { + cryptography_revolution = { research_cost = 0.8 start_year = 1950 - navy_intel_to_others = -20 + army_intel_to_others = -25 + navy_intel_to_others = -25 + airforce_intel_to_others = -25 folder = { name = mtgnavalfolder @@ -4326,7 +4329,10 @@ technologies = { } } on_research_complete = { - add_political_power = -20 + if = { + limit = { NOT = { has_tech = aviation_dawn } } + add_political_power = -20 + } } folder = { @@ -4365,7 +4371,7 @@ technologies = { xp_research_bonus = 1.25 cv_cas = { - naval_strike_attack = 0.3 + naval_strike_attack = 0.2 naval_strike_targetting = 0.15 air_agility = 0.15 maximum_speed = 0.1 diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt index b970346..5cd3bf0 100755 --- a/src/common/technologies/MTG_naval_Support.txt +++ b/src/common/technologies/MTG_naval_Support.txt @@ -1389,6 +1389,8 @@ technologies = { enable_equipment_modules = { dp_light_battery_5 dp_light_battery_5_single + dp_ship_secondaries_5 + dp_ship_secondaries_5_bb } folder = { diff --git a/src/events/ai_ships.txt b/src/events/ai_ships.txt index 2245159..3941786 100755 --- a/src/events/ai_ships.txt +++ b/src/events/ai_ships.txt @@ -606,6 +606,7 @@ country_event = { aa_hmg = 1 air_torpedoe_2 = 1 } + air_experience = 80 } } set_global_flag = cv_air_tech_1939 @@ -631,6 +632,7 @@ country_event = { advanced_small_airframe = 1 air_torpedoe_3 = 1 } + air_experience = 80 } } set_global_flag = cv_air_tech_1944