From cae4bc2ca70cca1ac53c586a18f8e0041fe5d038 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Sun, 9 Nov 2025 04:02:40 +0000 Subject: [PATCH] 2025-11-09 04:02:40 --- src/common/ai_equipment/vnr_DD_screens.txt | 47 +- src/common/ai_equipment/vnr_battleships.txt | 24 +- src/common/ai_equipment/vnr_carriers.txt | 17 +- .../ai_equipment/vnr_heavy_cruisers.txt | 2 +- .../ai_equipment/vnr_light_cruisers.txt | 58 +- .../ai_equipment/vnr_medium_cruiser.txt | 5 +- src/common/ai_equipment/vnr_submarines.txt | 10 +- src/common/ai_strategy/naval_production.txt | 52 +- src/common/decisions/MTG_naval_treaty.txt | 4 +- src/common/defines/VNR_naval_defines.lua | 45 +- .../game_rules/000_naval_rework_rules.txt | 18 - .../game_rules/001_naval_rework_rules_vnr.txt | 71 + src/common/ideas/_naval_treaty.txt | 10 +- src/common/ideas/vnr_ai.txt | 21 + .../scripted_effects/_add_ai_variants.txt | 369 ++ .../scripted_effects/_add_starting_tech.txt | 1 - .../_delete_starting_naval.txt | 3 + src/common/scripted_effects/_vnr_ai.txt | 29 + .../_vnr_scripted_triggers.txt | 19 + .../projects/naval_projects.txt | 53 + src/common/technologies/MTG_naval.txt | 177 +- src/common/technologies/MTG_naval_Support.txt | 80 +- src/common/units/a_battlecarrier.txt | 2 +- .../critical_parts/00_critical_parts.txt | 31 +- .../modules/00_ship_modules_aviation.txt | 74 +- .../equipment/modules/00_ship_modules_gun.txt | 16 +- .../modules/00_ship_modules_propulsion.txt | 183 +- .../modules/00_ship_modules_protection.txt | 89 +- .../modules/00_ship_modules_role.txt | 11 +- .../modules/00_ship_modules_support.txt | 77 +- .../equipment/modules/Special_modules.txt | 4 +- .../units/equipment/ship_hull_carrier.txt | 55 +- .../units/equipment/ship_hull_civilian.txt | 4 +- .../units/equipment/ship_hull_cruiser.txt | 40 +- .../units/equipment/ship_hull_heavy.txt | 55 +- .../units/equipment/ship_hull_light.txt | 18 +- .../units/equipment/ship_hull_submarine.txt | 12 +- src/descriptor.mod | 2 +- src/documentation/Guide.md | 2 + src/documentation/Modding_Tutorial.md | 73 +- src/events/00_navy_rework.txt | 39 +- src/events/ai_ships.txt | 22 +- .../modules/icons/double_heavy_battery.png | Bin 3584 -> 4774 bytes .../icons/double_light_medium_battery.png | Bin 4427 -> 5660 bytes .../modules/icons/double_medium_battery.png | Bin 3451 -> 4849 bytes .../modules/icons/medium_heavy_battery.png | Bin 4143 -> 4143 bytes .../modules/icons/quad_heavy_battery.png | Bin 5494 -> 6473 bytes .../modules/icons/ship_sub_snorkel_0.png | Bin 0 -> 4106 bytes .../modules/icons/ship_sub_snorkel_1.png | Bin 0 -> 5159 bytes .../modules/icons/ship_sub_snorkel_2.png | Bin 0 -> 4853 bytes .../icons/single_light_medium_battery.png | Bin 4439 -> 5658 bytes .../modules/icons/triple_heavy_battery.png | Bin 4938 -> 6772 bytes .../advanced_medium_heavy_battery.png | Bin 3637 -> 0 bytes .../navy_techtree/basic_submarine_snorkel.png | Bin 0 -> 4638 bytes .../navy_techtree/carrier_radio_range.png | Bin 0 -> 6791 bytes .../navy_techtree/gas_turbine.png | Bin 6106 -> 0 bytes .../improved_medium_heavy_battery.png | Bin 3214 -> 0 bytes .../improved_submarine_snorkel.png | Bin 0 -> 4798 bytes .../navy_techtree/night_air_strike.png | Bin 6274 -> 0 bytes src/gfx/interface/vnr_main_menu_bg.dds | Bin 14745596 -> 14745596 bytes src/history/units/00_ENG_vnr_naval.txt | 58 +- src/history/units/00_GER_vnr_naval.txt | 1 - src/history/units/03_ENG_vnr_expert.txt | 2999 +++++++++++++++++ src/history/units/03_JAP_vnr_expert.txt | 2563 ++++++++++++++ src/history/units/03_USA_vnr_expert.txt | 2811 +++++++++++++++ src/interface/z_navy_techtree.gfx | 20 +- src/interface/z_ship_modules.gfx | 16 + .../english/replace/equip_naval_l_english.yml | 12 +- .../english/replace/naval_units_l_english.yml | 5 +- .../replace/navy_rework_welcome_l_english.yml | 2 +- .../replace/preset_names_l_english.yml | 3 +- .../english/replace/research_l_english.yml | 14 +- .../replace/ship_modules_l_english.yml | 32 +- .../english/replace/vnr_ai_l_english.yml | 23 +- .../replace/vnr_naval_develop_l_english.yml | 4 +- .../replace/equip_naval_l_english.yml | 12 +- .../replace/naval_units_l_english.yml | 5 +- .../replace/navy_rework_welcome_l_english.yml | 2 +- .../replace/preset_names_l_english.yml | 3 +- .../replace/research_l_english.yml | 14 +- .../replace/ship_modules_l_english.yml | 32 +- src/localisation/replace/vnr_ai_l_english.yml | 23 +- .../replace/vnr_naval_develop_l_english.yml | 4 +- .../replace/equip_naval_l_simp_chinese.yml | 12 +- .../replace/naval_units_l_simp_chinese.yml | 3 +- .../navy_rework_welcome_l_simp_chinese.yml | 2 +- .../replace/preset_names_l_simp_chinese.yml | 3 +- .../replace/research_l_simp_chinese.yml | 14 +- .../replace/ship_modules_l_simp_chinese.yml | 32 +- .../replace/vnr_ai_l_simp_chinese.yml | 23 +- .../vnr_naval_develop_l_simp_chinese.yml | 4 +- 91 files changed, 10004 insertions(+), 671 deletions(-) create mode 100755 src/common/game_rules/001_naval_rework_rules_vnr.txt create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sub_snorkel_0.png create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sub_snorkel_1.png create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sub_snorkel_2.png delete mode 100755 src/gfx/interface/technologies/navy_techtree/advanced_medium_heavy_battery.png create mode 100755 src/gfx/interface/technologies/navy_techtree/basic_submarine_snorkel.png create mode 100755 src/gfx/interface/technologies/navy_techtree/carrier_radio_range.png delete mode 100755 src/gfx/interface/technologies/navy_techtree/gas_turbine.png delete mode 100755 src/gfx/interface/technologies/navy_techtree/improved_medium_heavy_battery.png create mode 100755 src/gfx/interface/technologies/navy_techtree/improved_submarine_snorkel.png delete mode 100755 src/gfx/interface/technologies/navy_techtree/night_air_strike.png create mode 100755 src/history/units/03_ENG_vnr_expert.txt create mode 100755 src/history/units/03_JAP_vnr_expert.txt create mode 100755 src/history/units/03_USA_vnr_expert.txt diff --git a/src/common/ai_equipment/vnr_DD_screens.txt b/src/common/ai_equipment/vnr_DD_screens.txt index 88721d1..640a396 100755 --- a/src/common/ai_equipment/vnr_DD_screens.txt +++ b/src/common/ai_equipment/vnr_DD_screens.txt @@ -109,8 +109,8 @@ naval_screen = { fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } } fixed_ship_battery_slot = ship_light_battery_double fixed_ship_torpedo_slot = ship_torpedo - fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } - fixed_ship_radar_slot = { module = ship_sonar upgrade > current } + fixed_ship_fire_control_system_slot = { module = ship_sonar upgrade > current } + fixed_ship_radar_slot = { any_of = { ship_radar ship_mast } upgrade > current } fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } } fixed_ship_role_slot = ship_hull_light_role_dd fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } } @@ -125,6 +125,7 @@ naval_screen = { ship_mast ship_sonar ship_anti_air + ship_radar } } @@ -148,8 +149,8 @@ naval_screen = { fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } } fixed_ship_battery_slot = dp_light_battery fixed_ship_torpedo_slot = ship_torpedo - fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } - fixed_ship_radar_slot = { module = ship_sonar upgrade > current } + fixed_ship_fire_control_system_slot = { module = ship_sonar upgrade > current } + fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } } fixed_ship_role_slot = ship_hull_light_role_dd fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } } @@ -165,6 +166,7 @@ naval_screen = { ship_depth_charge ship_sonar ship_anti_air + ship_radar } } @@ -188,8 +190,8 @@ naval_screen = { fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } } fixed_ship_battery_slot = dp_light_battery fixed_ship_torpedo_slot = ship_torpedo - fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } - fixed_ship_radar_slot = { module = ship_sonar upgrade > current } + fixed_ship_fire_control_system_slot = { module = ship_sonar upgrade > current } + fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } } fixed_ship_role_slot = ship_hull_light_role_dd fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } } @@ -204,6 +206,7 @@ naval_screen = { ship_depth_charge ship_sonar ship_anti_air + ship_radar } } @@ -227,9 +230,9 @@ naval_screen = { fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } } fixed_ship_battery_slot = dp_light_battery fixed_ship_torpedo_slot = ship_torpedo - fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } - fixed_ship_radar_slot = { module = ship_sonar upgrade > current } - fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_missile_aa } } + fixed_ship_fire_control_system_slot = { module = ship_sonar upgrade > current } + fixed_ship_radar_slot = { module = ship_radar upgrade > current } + fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_missile_aa ship_anti_air } } fixed_ship_role_slot = ship_hull_light_role_ddg fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_missile_aa @@ -243,6 +246,7 @@ naval_screen = { ship_depth_charge ship_sonar ship_anti_air + ship_radar } } @@ -284,6 +288,7 @@ naval_screen = { ship_depth_charge ship_sonar ship_anti_air + ship_radar } } screen_1940_expert = { @@ -306,14 +311,14 @@ naval_screen = { fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } } fixed_ship_battery_slot = ship_light_battery_double fixed_ship_torpedo_slot = ship_torpedo - fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } - fixed_ship_radar_slot = { module = ship_sonar upgrade > current } + fixed_ship_fire_control_system_slot = { module = ship_sonar upgrade > current } + fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } } fixed_ship_role_slot = ship_hull_light_role_dd fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_light_battery_double mid_1_custom_slot = ship_torpedo - mid_2_custom_slot = ship_torpedo + mid_2_custom_slot = ship_anti_air rear_1_custom_slot = ship_depth_charge rear_2_custom_slot = ship_depth_charge } @@ -322,6 +327,7 @@ naval_screen = { ship_depth_charge ship_sonar ship_anti_air + ship_radar } } screen_1944_expert = { @@ -344,13 +350,13 @@ naval_screen = { fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } } fixed_ship_battery_slot = ship_light_battery_double fixed_ship_torpedo_slot = ship_torpedo - fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } - fixed_ship_radar_slot = { module = ship_sonar upgrade > current } + fixed_ship_fire_control_system_slot = { module = ship_sonar upgrade > current } + fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_anti_air_slot = { upgrade > current any_of = { ship_anti_air } } fixed_ship_role_slot = ship_hull_light_role_dd front_1_custom_slot = ship_light_battery_double - mid_1_custom_slot = ship_torpedo - mid_2_custom_slot = ship_torpedo + mid_1_custom_slot = ship_anti_air + mid_2_custom_slot = ship_anti_air rear_1_custom_slot = ship_depth_charge rear_2_custom_slot = ship_depth_charge } @@ -359,6 +365,7 @@ naval_screen = { ship_depth_charge ship_sonar ship_anti_air + ship_radar } } screen_1946_expert = { @@ -381,8 +388,8 @@ naval_screen = { fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } } fixed_ship_battery_slot = ship_light_battery_double fixed_ship_torpedo_slot = ship_torpedo - fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } - fixed_ship_radar_slot = { module = ship_sonar upgrade > current } + fixed_ship_fire_control_system_slot = { module = ship_sonar upgrade > current } + fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_anti_air_slot = ship_missile_aa fixed_ship_role_slot = ship_hull_light_role_dda front_1_custom_slot = ship_light_battery_double @@ -397,6 +404,7 @@ naval_screen = { ship_depth_charge ship_sonar ship_anti_air + ship_radar } } screen_1949_expert = { @@ -419,11 +427,11 @@ naval_screen = { fixed_ship_engine_slot = { upgrade = current any_of = { light_ship_engine_5 light_ship_engine_4 light_ship_engine_3 light_ship_engine_2 light_ship_engine_1 } } fixed_ship_battery_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } } fixed_ship_torpedo_slot = ship_torpedo - fixed_ship_fire_control_system_slot = ship_fire_control_system fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } fixed_ship_radar_slot = { module = ship_sonar upgrade > current } fixed_ship_role_slot = ship_hull_light_role_ddg fixed_ship_extra_secondaries_slot = ship_radar_jammer + fixed_ship_extra_electronics_slot = { module = ship_radar upgrade > current } front_1_custom_slot = ship_missile_aa mid_1_custom_slot = ship_torpedo mid_2_custom_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } } @@ -435,6 +443,7 @@ naval_screen = { ship_depth_charge ship_sonar ship_anti_air + ship_radar } } } diff --git a/src/common/ai_equipment/vnr_battleships.txt b/src/common/ai_equipment/vnr_battleships.txt index 5a17eb6..c8cc813 100755 --- a/src/common/ai_equipment/vnr_battleships.txt +++ b/src/common/ai_equipment/vnr_battleships.txt @@ -111,7 +111,8 @@ naval_capital_battleship = { 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 = ship_heavy_battery_triple - mid_1_custom_slot = ship_secondaries + front_2_custom_slot = ship_dp_secondaries_bb + mid_1_custom_slot = ship_anti_air mid_2_custom_slot = ship_anti_air mid_3_custom_slot = ship_dp_secondaries_bb rear_1_custom_slot = ship_heavy_battery_triple @@ -152,7 +153,8 @@ naval_capital_battleship = { 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 = ship_heavy_battery_triple - mid_1_custom_slot = ship_dp_secondaries_bb + front_2_custom_slot = ship_dp_secondaries_bb + mid_1_custom_slot = ship_anti_air mid_2_custom_slot = ship_anti_air mid_3_custom_slot = ship_dp_secondaries_bb rear_1_custom_slot = ship_heavy_battery_triple @@ -182,7 +184,7 @@ naval_capital_battleship = { fixed_ship_anti_air_slot = ship_missile_aa fixed_ship_fire_control_system_slot = { module = ship_fire_control_system upgrade > current } fixed_ship_radar_slot = { module = ship_radar upgrade > current } - fixed_ship_engine_slot = { any_of = { heavy_ship_engine_4_gas heavy_ship_engine_nuclear } } + fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_5 heavy_ship_engine_4 heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } } fixed_ship_secondaries_slot = ship_dp_secondaries_bb fixed_ship_armor_slot = { any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } } fixed_ship_airplane_launcher_slot = ship_airplane_launcher @@ -190,6 +192,7 @@ naval_capital_battleship = { 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 = ship_heavy_battery_triple + front_2_custom_slot = ship_dp_secondaries_bb 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 @@ -229,9 +232,10 @@ naval_capital_battleship = { fixed_ship_airplane_launcher_slot = ship_airplane_launcher fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_super_heavy_battery_triple - mid_1_custom_slot = ship_secondaries + front_2_custom_slot = ship_dp_secondaries_bb + mid_1_custom_slot = ship_anti_air mid_2_custom_slot = ship_anti_air - mid_3_custom_slot = ship_secondaries + mid_3_custom_slot = ship_dp_secondaries_bb rear_1_custom_slot = ship_super_heavy_battery_triple } } @@ -270,6 +274,7 @@ naval_capital_battleship = { 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 } } front_1_custom_slot = ship_heavy_battery_triple + front_2_custom_slot = ship_dp_secondaries_bb mid_1_custom_slot = ship_anti_air mid_2_custom_slot = ship_anti_air rear_1_custom_slot = ship_heavy_battery_triple @@ -308,8 +313,10 @@ 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 } } front_1_custom_slot = ship_heavy_battery_triple + front_2_custom_slot = ship_dp_secondaries_bb mid_1_custom_slot = ship_anti_air mid_2_custom_slot = ship_anti_air + mid_3_custom_slot = ship_dp_secondaries_bb rear_1_custom_slot = ship_heavy_battery_triple rear_2_custom_slot = ship_heavy_battery_triple } @@ -318,6 +325,8 @@ naval_capital_battleship = { ship_anti_air ship_fire_control_system ship_radar + ship_anti_air_circle + ship_super_heavy_weight_shell } } capital_battleship_1944_expert = { @@ -347,10 +356,11 @@ naval_capital_battleship = { fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_4 ship_armor_bb_3 ship_armor_bb_2 ship_armor_bb_1 } } 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 = ship_super_heavy_weight_shell front_1_custom_slot = ship_heavy_battery_triple + front_2_custom_slot = ship_dp_secondaries_bb mid_1_custom_slot = ship_anti_air mid_2_custom_slot = ship_anti_air + mid_3_custom_slot = ship_dp_secondaries_bb rear_1_custom_slot = ship_heavy_battery_triple rear_2_custom_slot = ship_heavy_battery_triple } @@ -359,6 +369,8 @@ naval_capital_battleship = { ship_anti_air ship_fire_control_system ship_radar + ship_anti_air_circle + ship_super_heavy_weight_shell } } } diff --git a/src/common/ai_equipment/vnr_carriers.txt b/src/common/ai_equipment/vnr_carriers.txt index a972fd4..620eeb6 100755 --- a/src/common/ai_equipment/vnr_carriers.txt +++ b/src/common/ai_equipment/vnr_carriers.txt @@ -188,8 +188,7 @@ naval_carrier = { fixed_ship_secondaries_slot = ship_dp_secondaries_bb fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck - fixed_ship_flight_deck_slot = carrier_armor_deck + fixed_ship_flight_deck_slot = carrier_strength_deck front_1_custom_slot = steam_catapult front_2_custom_slot = carrier_angled_deck mid_1_custom_slot = ship_deck_space_big @@ -228,8 +227,8 @@ naval_carrier = { fixed_ship_secondaries_slot = ship_dp_secondaries_bb fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = { any_of = { economical_nuclear_reactor_carrier carrier_strength_deck } } - fixed_ship_flight_deck_slot = carrier_armor_deck + fixed_ship_carrier_miscellaneous_slot_2 = { any_of = { economical_nuclear_reactor_carrier } } + fixed_ship_flight_deck_slot = carrier_strength_deck front_1_custom_slot = steam_catapult front_2_custom_slot = carrier_angled_deck mid_1_custom_slot = ship_deck_space_big @@ -344,8 +343,7 @@ naval_carrier = { fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } } fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck - fixed_ship_flight_deck_slot = carrier_armor_deck + fixed_ship_flight_deck_slot = { any_of = { carrier_armor_deck carrier_strength_deck } } fixed_ship_role_slot = ship_hull_carrier_role_cv front_1_custom_slot = ship_deck_space_armored mid_1_custom_slot = ship_deck_space_armored @@ -385,8 +383,7 @@ naval_carrier = { fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } } fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck - fixed_ship_flight_deck_slot = carrier_armor_deck + fixed_ship_flight_deck_slot = carrier_strength_deck front_2_custom_slot = carrier_side_lift mid_1_custom_slot = ship_deck_space_big mid_2_custom_slot = ship_deck_space_big @@ -425,8 +422,8 @@ naval_carrier = { fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } } fixed_ship_radar_slot = { module = ship_radar upgrade > current } fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck - fixed_ship_flight_deck_slot = carrier_armor_deck + fixed_ship_carrier_miscellaneous_slot_2 = { any_of = { economical_nuclear_reactor_carrier } } + fixed_ship_flight_deck_slot = carrier_strength_deck front_1_custom_slot = carrier_angled_deck front_2_custom_slot = carrier_side_lift mid_1_custom_slot = ship_deck_space_big diff --git a/src/common/ai_equipment/vnr_heavy_cruisers.txt b/src/common/ai_equipment/vnr_heavy_cruisers.txt index 8cd5dd6..b6b0cf3 100755 --- a/src/common/ai_equipment/vnr_heavy_cruisers.txt +++ b/src/common/ai_equipment/vnr_heavy_cruisers.txt @@ -192,7 +192,7 @@ naval_cruiser_heavy = { fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_5 cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } } fixed_ship_radar_slot = { any_of = { ship_radar } } fixed_ship_armor_slot = { any_of = { ship_armor_cruiser_4 ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } } - fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_ca ship_hull_cruiser_role_cg } } + fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_ca ship_hull_cruiser_role_cgaa } } fixed_ship_secondaries_slot = ship_dp_secondaries fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_medium_battery diff --git a/src/common/ai_equipment/vnr_light_cruisers.txt b/src/common/ai_equipment/vnr_light_cruisers.txt index f7e0a69..5764442 100755 --- a/src/common/ai_equipment/vnr_light_cruisers.txt +++ b/src/common/ai_equipment/vnr_light_cruisers.txt @@ -212,7 +212,7 @@ naval_cruiser_light = { priority = { base = 0 - modifier = { add = 100 has_tech = modern_ship_hull_cruiser } + modifier = { add = 200 has_tech = modern_ship_hull_cruiser } modifier = { factor = 0 expert_ai_style = yes } } @@ -224,20 +224,20 @@ naval_cruiser_light = { type = vnr_ship_hull_cruiser_6 modules = { fixed_ship_battery_slot = dp_ship_medium_1 - fixed_ship_anti_air_slot = ship_anti_air + fixed_ship_anti_air_slot = ship_missile_aa fixed_ship_fire_control_system_slot = ship_fire_control_system fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_5 cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } } fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar ship_sonar } } fixed_ship_armor_slot = { any_of = { ship_armor_cruiser_4 ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } } fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_c ship_hull_cruiser_role_aa } } fixed_ship_secondaries_slot = ship_dp_secondaries - fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } - fixed_ship_extra_missile_slot = structural_aluminum + fixed_ship_extra_secondaries_slot = ship_hull_cruiser_role_cgaa + fixed_ship_extra_missile_slot = full_missile_upgrade front_1_custom_slot = ship_anti_air front_2_custom_slot = dp_ship_medium_1 - mid_1_custom_slot = ship_dp_secondaries - mid_2_custom_slot = ship_torpedo - mid_3_custom_slot = ship_airplane_launcher + mid_1_custom_slot = ship_anti_air + mid_2_custom_slot = ship_missile_aa + mid_3_custom_slot = ship_helipad rear_1_custom_slot = dp_ship_medium_1 rear_2_custom_slot = dp_ship_medium_1 } @@ -383,5 +383,49 @@ naval_cruiser_light = { ship_anti_air } } + light_cruiser_1949_expert = { + name = vnr_cl_1949_expert + role_icon_index = 43 + + priority = { + base = 0 + modifier = { add = 200 has_tech = modern_ship_hull_cruiser } + modifier = { factor = 0 expert_ai_style = no } + } + + + history = yes + target_variant = { + match_value = 7000.0 + + type = vnr_ship_hull_cruiser_6 + modules = { + fixed_ship_battery_slot = dp_ship_medium_1 + fixed_ship_anti_air_slot = ship_missile_aa + fixed_ship_fire_control_system_slot = ship_fire_control_system + fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_5 cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } } + fixed_ship_radar_slot = { upgrade > current any_of = { ship_radar } } + fixed_ship_armor_slot = { any_of = { ship_armor_cruiser_4 ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } } + fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_c ship_hull_cruiser_role_aa } } + fixed_ship_secondaries_slot = ship_dp_secondaries + fixed_ship_extra_secondaries_slot = ship_hull_cruiser_role_cgaa + fixed_ship_extra_missile_slot = full_missile_upgrade + front_1_custom_slot = ship_anti_air + front_2_custom_slot = dp_ship_medium_1 + mid_1_custom_slot = ship_anti_air + mid_2_custom_slot = ship_missile_aa + mid_3_custom_slot = ship_helipad + rear_1_custom_slot = dp_ship_medium_1 + rear_2_custom_slot = dp_ship_medium_1 + } + } + allowed_modules = { + ship_mast + ship_fire_control_system + ship_sonar + ship_radar + ship_anti_air + } + } } diff --git a/src/common/ai_equipment/vnr_medium_cruiser.txt b/src/common/ai_equipment/vnr_medium_cruiser.txt index a069554..52d6594 100755 --- a/src/common/ai_equipment/vnr_medium_cruiser.txt +++ b/src/common/ai_equipment/vnr_medium_cruiser.txt @@ -29,6 +29,7 @@ naval_cruiser_medium = { module = empty } fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_cruiser_2 ship_armor_cruiser_1 } } + fixed_ship_role_slot = ship_hull_cruiser_role_c fixed_ship_secondaries_slot = ship_secondaries_light fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_medium_battery @@ -70,6 +71,7 @@ naval_cruiser_medium = { module = empty } fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_cruiser_2 ship_armor_cruiser_1 } } + fixed_ship_role_slot = ship_hull_cruiser_role_c fixed_ship_secondaries_slot = ship_dp_secondaries fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_medium_battery @@ -110,6 +112,7 @@ naval_cruiser_medium = { fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } } fixed_ship_radar_slot = { any_of = { ship_radar } } fixed_ship_armor_slot = { any_of = { ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } } + fixed_ship_role_slot = ship_hull_cruiser_role_c fixed_ship_secondaries_slot = ship_dp_secondaries fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_medium_battery @@ -151,7 +154,7 @@ naval_cruiser_medium = { fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_5 cruiser_ship_engine_4 cruiser_ship_engine_3 cruiser_ship_engine_2 cruiser_ship_engine_1 } } fixed_ship_radar_slot = { any_of = { ship_radar } } fixed_ship_armor_slot = { any_of = { ship_armor_cruiser_4 ship_armor_cruiser_3 ship_armor_cruiser_2 ship_armor_cruiser_1 } } - fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_c ship_hull_cruiser_role_aa ship_hull_cruiser_role_cg } } + fixed_ship_role_slot = { any_of = { ship_hull_cruiser_role_c ship_hull_cruiser_role_aa ship_hull_cruiser_role_cgaa } } fixed_ship_secondaries_slot = ship_dp_secondaries fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_medium_battery diff --git a/src/common/ai_equipment/vnr_submarines.txt b/src/common/ai_equipment/vnr_submarines.txt index ec1376f..dc6f217 100755 --- a/src/common/ai_equipment/vnr_submarines.txt +++ b/src/common/ai_equipment/vnr_submarines.txt @@ -52,7 +52,7 @@ naval_sub = { fixed_ship_engine_slot = sub_ship_engine fixed_ship_torpedo_slot = ship_torpedo_sub fixed_ship_armor_slot = pressure_hull - fixed_ship_extra_secondaries_slot = submarine_miscellaneous + fixed_ship_extra_secondaries_slot = oxygen_generator fixed_ship_conning_tower_slot = sub_conning_tower mid_1_custom_slot = sub_ship_periscope rear_1_custom_slot = ship_torpedo_sub @@ -85,7 +85,7 @@ naval_sub = { fixed_ship_engine_slot = sub_ship_engine fixed_ship_torpedo_slot = ship_torpedo_sub fixed_ship_armor_slot = pressure_hull - fixed_ship_extra_secondaries_slot = submarine_miscellaneous + fixed_ship_extra_secondaries_slot = oxygen_generator fixed_ship_conning_tower_slot = sub_conning_tower mid_1_custom_slot = sub_ship_periscope rear_1_custom_slot = ship_torpedo_sub @@ -120,7 +120,7 @@ naval_sub = { fixed_ship_torpedo_slot = ship_torpedo_sub fixed_ship_armor_slot = pressure_hull fixed_ship_fire_control_system_slot = sub_fire_control_system - fixed_ship_extra_secondaries_slot = submarine_miscellaneous + fixed_ship_extra_secondaries_slot = oxygen_generator fixed_ship_conning_tower_slot = sub_conning_tower front_1_custom_slot = ship_torpedo_sub rear_1_custom_slot = ship_torpedo_sub @@ -158,7 +158,7 @@ naval_sub = { fixed_ship_torpedo_slot = ship_torpedo_sub fixed_ship_armor_slot = pressure_hull fixed_ship_fire_control_system_slot = sub_fire_control_system - fixed_ship_extra_secondaries_slot = submarine_miscellaneous + fixed_ship_extra_secondaries_slot = oxygen_generator fixed_ship_conning_tower_slot = sub_conning_tower front_1_custom_slot = ship_torpedo_sub rear_1_custom_slot = ship_torpedo_sub @@ -232,7 +232,6 @@ naval_sub = { fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_2 sub_ship_engine_1 } } fixed_ship_torpedo_slot = ship_torpedo_sub fixed_ship_armor_slot = pressure_hull - fixed_ship_extra_secondaries_slot = oxygen_generator fixed_ship_fire_control_system_slot = sub_fire_control_system fixed_ship_conning_tower_slot = sub_conning_tower mid_1_custom_slot = sub_ship_periscope @@ -244,6 +243,7 @@ naval_sub = { ship_sub_snorkel sub_conning_tower sub_ship_periscope + sub_fire_control_system } } submarine_1940_expert = { diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt index 0915d23..2a4364e 100755 --- a/src/common/ai_strategy/naval_production.txt +++ b/src/common/ai_strategy/naval_production.txt @@ -797,13 +797,13 @@ naval_unit_role_ratios_ENG_atwar = { ai_strategy = { type = role_ratio id = vnr_naval_capital_bb - value = 80 + value = 100 } ai_strategy = { type = role_ratio id = vnr_naval_carrier - value = 100 + value = 120 } ai_strategy = { @@ -844,13 +844,13 @@ naval_unit_role_ratios_ENG_late_peace = { ai_strategy = { type = role_ratio id = vnr_naval_capital_bb - value = 5 + value = 20 } ai_strategy = { type = role_ratio id = vnr_naval_carrier - value = 10 + value = 40 } ai_strategy = { @@ -1317,7 +1317,7 @@ naval_unit_role_ratios_JAP_prewar_enough_carrier = { ai_strategy = { type = role_ratio id = vnr_naval_carrier - value = 60 + value = 100 } ai_strategy = { type = dockyard_to_military_factory_ratio @@ -1362,12 +1362,12 @@ naval_unit_role_ratios_JAP_atwar = { ai_strategy = { type = role_ratio id = vnr_naval_capital_bb - value = 20 + value = 40 } ai_strategy = { type = role_ratio id = vnr_naval_carrier - value = 65 + value = 100 } ai_strategy = { type = dockyard_to_military_factory_ratio @@ -1470,16 +1470,10 @@ naval_unit_role_ratios_USA_great_depression = { value = 200 } - ai_strategy = { - type = role_ratio - id = vnr_naval_screen_leader - value = 1 - } - ai_strategy = { type = role_ratio id = vnr_naval_cruiser_light - value = 40 + value = 150 } ai_strategy = { @@ -1514,7 +1508,7 @@ naval_unit_role_ratios_USA_go_to_war = { ai_strategy = { type = role_ratio id = vnr_naval_cruiser_light - value = 120 + value = 250 } ai_strategy = { @@ -1532,17 +1526,18 @@ naval_unit_role_ratios_USA_go_to_war = { ai_strategy = { type = role_ratio id = vnr_naval_carrier - value = 120 + value = 150 } ai_strategy = { - type = dockyard_to_military_factory_ratio - value = 200 + type = building_target + id = dockyard + value = 50 } ai_strategy = { type = building_target - id = dockyard - value = 150 + id = arms_factory + value = 80 } } @@ -1569,7 +1564,7 @@ naval_unit_role_ratios_USA_atwar = { ai_strategy = { type = role_ratio id = vnr_naval_cruiser_light - value = 150 + value = 200 } ai_strategy = { type = role_ratio @@ -1580,23 +1575,24 @@ naval_unit_role_ratios_USA_atwar = { ai_strategy = { type = role_ratio id = vnr_naval_capital_bb - value = 60 + value = 120 } ai_strategy = { type = role_ratio id = vnr_naval_carrier - value = 120 + value = 150 } ai_strategy = { - type = dockyard_to_military_factory_ratio - value = 250 + type = building_target + id = dockyard + value = 100 } ai_strategy = { type = building_target - id = dockyard - value = 250 + id = arms_factory + value = 300 } } @@ -2446,7 +2442,7 @@ build_more_missile_cruisers = { ai_strategy = { type = role_ratio id = vnr_naval_cruiser_medium - value = 20 + value = 120 } ai_strategy = { diff --git a/src/common/decisions/MTG_naval_treaty.txt b/src/common/decisions/MTG_naval_treaty.txt index 513c786..6653703 100755 --- a/src/common/decisions/MTG_naval_treaty.txt +++ b/src/common/decisions/MTG_naval_treaty.txt @@ -85,6 +85,7 @@ MTG_naval_treaties = { has_idea = MTG_naval_treaty_adherent has_idea = MTG_naval_treaty_adherent_1936 } + NOT = { has_active_mission = MTG_escalator_clause_invocation_mission } } activate_mission = MTG_escalator_clause_invocation_mission custom_effect_tooltip = MTG_escalator_clause_tt @@ -195,6 +196,7 @@ MTG_naval_treaties = { has_idea = MTG_naval_treaty_adherent has_idea = MTG_naval_treaty_adherent_1936 } + NOT = { has_active_mission = MTG_escalator_clause_invocation_mission } } activate_mission = MTG_escalator_clause_invocation_mission custom_effect_tooltip = MTG_escalator_clause_tt @@ -800,7 +802,7 @@ MTG_naval_treaties = { always = no } } - days_mission_timeout = 365 + days_mission_timeout = 300 visible = { has_naval_treaty_trigger = yes diff --git a/src/common/defines/VNR_naval_defines.lua b/src/common/defines/VNR_naval_defines.lua index a39aa90..ef5db06 100755 --- a/src/common/defines/VNR_naval_defines.lua +++ b/src/common/defines/VNR_naval_defines.lua @@ -1,6 +1,6 @@ NDefines.NAI.ENEMY_NAVY_STRENGTH_DONT_BOTHER = 1.5; NDefines.NAI.SHIPS_PRODUCTION_BASE_COST = 25000; -NDefines.NAI.NAVY_PREFERED_MAX_SIZE = 50; +NDefines.NAI.NAVY_PREFERED_MAX_SIZE = 65; NDefines.NAI.NAVAL_DOCKYARDS_SHIP_FACTOR = 2.5; NDefines.NAI.PRODUCTION_MAX_PROGRESS_TO_SWITCH_NAVAL = 0; NDefines.NAI.PRODUCTION_WAIT_TO_FINISH_IF_EXPENSIVE = 0.02; @@ -8,7 +8,7 @@ NDefines.NAI.CARRIER_TASKFORCE_MAX_CARRIER_COUNT = 6; NDefines.NAI.CAPITAL_TASKFORCE_MAX_CAPITAL_COUNT = 6; NDefines.NAI.SCREEN_TASKFORCE_MAX_SHIP_COUNT = 5; NDefines.NAI.SCREENS_TO_CAPITAL_RATIO = 3; -NDefines.NAI.MIN_CAPITALS_FOR_CARRIER_TASKFORCE = 6; +NDefines.NAI.MIN_CAPITALS_FOR_CARRIER_TASKFORCE = 8; NDefines.NAI.REPAIR_TASKFORCE_SIZE = 5; NDefines.NAI.WANTED_CARRIER_PLANES_PER_CARRIER_CAPACITY_FACTOR = 2; NDefines.NAI.WANTED_CARRIER_PLANES_PER_CARRIER_CAPACITY_IN_PRODUCTION_FACTOR = 1.5; @@ -23,6 +23,15 @@ NDefines.NAI.DEFAULT_MODULE_VARIANT_CREATION_XP_CUTOFF_NAVY = 40; NDefines.NAI.VARIANT_CREATION_XP_RESERVE_NAVY = 40; NDefines.NAI.DEFAULT_MODULE_VARIANT_CREATION_XP_CUTOFF_AIR = 15; NDefines.NAI.VARIANT_CREATION_XP_RESERVE_AIR = 30; +NDefines.NAI.MAX_SCREEN_TASKFORCES_FOR_CONVOY_DEFENSE_MIN = 0.00; +NDefines.NAI.MAX_SCREEN_TASKFORCES_FOR_CONVOY_DEFENSE_MAX = 0.25; +NDefines.NAI.MAX_SCREEN_TASKFORCES_FOR_MINE_LAYING = 0.0; +NDefines.NAI.MAX_SCREEN_TASKFORCES_FOR_MINE_SWEEPING_PRIO = 0.20; +NDefines.NAI.MAX_SCREEN_TASKFORCES_FOR_MINE_SWEEPING_PRIO_MIN_MINES = 250; +NDefines.NAI.MAX_SCREEN_FORCES_FOR_INVASION_SUPPORT = 0.1; +NDefines.NAI.NAVAL_BASE_RATIO_ALLOCATED_FOR_REPAIRS = 0.1; +NDefines.NAI.NAVAL_BASE_RATIO_ALLOCATED_FOR_REPAIRS_IN_WAR_TIME = 0.5; +NDefines.NAI.SHIP_STR_RATIO_PUT_ON_REPAIRS = 0.6; NDefines.NNavy.HIT_PROFILE_SPEED_FACTOR = 0.3; NDefines.NNavy.COMBAT_BASE_HIT_CHANCE = 0.08; @@ -47,15 +56,16 @@ NDefines.NNavy.NAVY_PIERCING_THRESHOLD_DAMAGE_VALUES = { 2.0, 1.0, 0.7, 0.6, 0.4 NDefines.NNavy.CONVOY_DEFENSE_MAX_REGION_TO_TASKFORCE_RATIO = 2; NDefines.NNavy.COMBAT_TORPEDO_CRITICAL_CHANCE = 0.6; NDefines.NNavy.CARRIER_STACK_PENALTY = 6; -NDefines.NNavy.CARRIER_STACK_PENALTY_EFFECT = 0.1; NDefines.NNavy.COMBAT_MIN_DURATION = 20; NDefines.NNavy.CAPITAL_ONLY_COMBAT_ACTIVATE_TIME = 22; NDefines.NNavy.ALL_SHIPS_ACTIVATE_TIME = 30; NDefines.NNavy.COMBAT_CHASE_RESIGNATION_HOURS = 1; NDefines.NNavy.SPEED_TO_ESCAPE_SPEED = 2; -NDefines.NNavy.MAX_ANTI_AIR_REDUCTION_EFFECT_ON_INCOMING_AIR_DAMAGE = 0.6; +NDefines.NNavy.SHIP_TO_FLEET_ANTI_AIR_RATIO = 1.0; +NDefines.NNavy.MAX_ANTI_AIR_REDUCTION_EFFECT_ON_INCOMING_AIR_DAMAGE = 0.66; NDefines.NNavy.NAVAL_COMBAT_AIR_LOW_AA_TARGET_SCORE = 1; -NDefines.NNavy.ANTI_AIR_MULT_ON_INCOMING_AIR_DAMAGE = 0.12; +NDefines.NNavy.ANTI_AIR_MULT_ON_INCOMING_AIR_DAMAGE = 0.15; +NDefines.NNavy.ANTI_AIR_TARGETTING_TO_CHANCE = 0.25; NDefines.NNavy.TRAINING_MAX_DAILY_COUNTRY_EXP = 2; NDefines.NNavy.SUBMARINE_REVEAL_BASE_CHANCE = 15; NDefines.NNavy.SUBMARINE_BASE_TORPEDO_REVEAL_CHANCE = 0.1; @@ -67,12 +77,12 @@ NDefines.NNavy.RELATIVE_SURFACE_DETECTION_TO_POSITIONING_FACTOR = 0.05; NDefines.NNavy.MAX_POSITIONING_BONUS_FROM_SURFACE_DETECTION = 0.2; NDefines.NNavy.POSITIONING_PENALTY_FOR_SHIPS_JOINED_COMBAT_AFTER_IT_STARTS = 0.02; NDefines.NNavy.MAX_POSITIONING_PENALTY_FOR_NEWLY_JOINED_SHIPS = 0.2; -NDefines.NNavy.HIGHER_SHIP_RATIO_POSITIONING_PENALTY_FACTOR = 0.3; +NDefines.NNavy.HIGHER_SHIP_RATIO_POSITIONING_PENALTY_FACTOR = 0.5; NDefines.NNavy.MAX_POSITIONING_PENALTY_FROM_HIGHER_SHIP_RATIO = 3; -NDefines.NNavy.MAX_CARRIER_RATIO_POSITIONING_PENALTY_FACTOR = 0.6; -NDefines.NNavy.DAMAGE_PENALTY_ON_MINIMUM_POSITIONING = 0.75; -NDefines.NNavy.SCREENING_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 1; -NDefines.NNavy.AA_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 0.5; +NDefines.NNavy.MAX_CARRIER_RATIO_POSITIONING_PENALTY_FACTOR = 0.2; +NDefines.NNavy.DAMAGE_PENALTY_ON_MINIMUM_POSITIONING = 0.9; +NDefines.NNavy.SCREENING_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 1.25; +NDefines.NNavy.AA_EFFICIENCY_PENALTY_ON_MINIMUM_POSITIONING = 0.75; NDefines.NNavy.MANPOWER_LOSS_RATIO_ON_STR_LOSS = 0.1; NDefines.NNavy.MANPOWER_LOSS_RATIO_ON_SUNK = 0.25; NDefines.NNavy.BASE_GUN_COOLDOWNS = { 1.0, 8.0, 1.0 }; @@ -92,6 +102,10 @@ NDefines.NNavy.UNIT_EXPERIENCE_PER_COMBAT_HOUR = 3; NDefines.NNavy.UNIT_EXPERIENCE_SCALE = 0.8; NDefines.NNavy.BASE_CARRIER_SORTIE_EFFICIENCY = 0.4; NDefines.NNavy.CHANCE_TO_DAMAGE_PART_ON_CRITICAL_HIT_FROM_AIR = 0.35 +NDefines.NNavy.COMBAT_DAMAGE_RANDOMNESS = 0.3; +NDefines.NNavy.NAVY_VISIBILITY_BONUS_ON_RETURN_FOR_REPAIR = 0.6; +NDefines.NNavy.SCREEN_RATIO_FOR_FULL_SCREENING_FOR_CONVOYS = 0.25; +NDefines.NNavy.CAPITAL_RATIO_FOR_FULL_SCREENING_FOR_CONVOYS = 0.1; NDefines.NNavy.AGGRESSION_SETTINGS_VALUES = { 0, -- do not engage 1.0, -- low @@ -133,13 +147,13 @@ NDefines.NAI.HIGH_PRIO_NAVAL_MISSION_SCORES = { 0, -- HOLD (consumes fuel HOLD_MISSION_MOVEMENT_COST fuel while moving) 10000, -- PATROL 8000, -- STRIKE FORCE - 2000, -- CONVOY RAIDING - 6000, -- CONVOY ESCORT - 100, -- MINES PLANTING + 4000, -- CONVOY RAIDING + 1500, -- CONVOY ESCORT + -1, -- MINES PLANTING 300, -- MINES SWEEPING 0, -- TRAIN 0, -- RESERVE_FLEET - 1000, -- NAVAL INVASION SUPPORT + 3000, -- NAVAL INVASION SUPPORT }; NDefines.NAI.MAX_MISSION_PER_TASKFORCE = { 0, -- HOLD (consumes fuel HOLD_MISSION_MOVEMENT_COST fuel while moving) @@ -159,7 +173,8 @@ NDefines.NAir.NAVAL_STRIKE_CARRIER_MULTIPLIER = 12; NDefines.NAir.CARRIER_HOURS_DELAY_AFTER_EACH_COMBAT = 3; NDefines.NAir.DISRUPTION_FACTOR_CARRIER = 25.0; NDefines.NAir.NAVAL_STRIKE_DAMAGE_TO_ORG = 0.25; -NDefines.NAir.AIR_AGILITY_TO_NAVAL_STRIKE_AGILITY = 0.04; +NDefines.NAir.AIR_AGILITY_TO_NAVAL_STRIKE_AGILITY = 0.06; +NDefines.NAir.CAPACITY_PENALTY = 3; NDefines.NProduction.EQUIPMENT_MODULE_ADD_XP_COST = 2; NDefines.NProduction.EQUIPMENT_MODULE_REPLACE_XP_COST = 3; diff --git a/src/common/game_rules/000_naval_rework_rules.txt b/src/common/game_rules/000_naval_rework_rules.txt index 5e9b80a..4ed284a 100755 --- a/src/common/game_rules/000_naval_rework_rules.txt +++ b/src/common/game_rules/000_naval_rework_rules.txt @@ -100,24 +100,6 @@ shipyard_output_boost_ai = { } } -vnr_ai_naval_management = { - name = RULE_AI_NAVAL_MANAGEMENT - group = RULE_GROUP_NAVY_REWORK - - default = { - name = FREE - text = RULE_OPTION_FREE - desc = RULE_AI_NAVAL_MANAGEMENT_FREE_DESC - allow_achievements = yes - } - option = { - name = BLOCKED - text = RULE_OPTION_BLOCKED - desc = RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC - allow_achievements = yes - } -} - vnr_cv_air_ai = { name = RULE_AI_AIR_DESIGN group = RULE_GROUP_NAVY_REWORK diff --git a/src/common/game_rules/001_naval_rework_rules_vnr.txt b/src/common/game_rules/001_naval_rework_rules_vnr.txt new file mode 100755 index 0000000..266f57d --- /dev/null +++ b/src/common/game_rules/001_naval_rework_rules_vnr.txt @@ -0,0 +1,71 @@ +vnr_ai_naval_management = { + name = RULE_AI_NAVAL_MANAGEMENT + group = RULE_GROUP_NAVY_REWORK + + default = { + name = FREE + text = RULE_OPTION_FREE + desc = RULE_AI_NAVAL_MANAGEMENT_FREE_DESC + allow_achievements = yes + } + option = { + name = BLOCKED + text = RULE_OPTION_BLOCKED + desc = RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC + allow_achievements = yes + } +} + +eng_start_expert_navy = { + name = RULE_ENG_EXPERT_NAVY + group = RULE_GROUP_NAVY_REWORK + + default = { + name = BLOCKED + text = RULE_OPTION_BLOCKED + desc = RULE_AI_EXPERT_NAVY_BLOCKED_DESC + allow_achievements = yes + } + option = { + name = FREE + text = RULE_OPTION_FREE + desc = RULE_AI_EXPERT_NAVY_FREE_DESC + allow_achievements = yes + } +} + +jap_start_expert_navy = { + name = RULE_JAP_EXPERT_NAVY + group = RULE_GROUP_NAVY_REWORK + + default = { + name = BLOCKED + text = RULE_OPTION_BLOCKED + desc = RULE_AI_EXPERT_NAVY_BLOCKED_DESC + allow_achievements = yes + } + option = { + name = FREE + text = RULE_OPTION_FREE + desc = RULE_AI_EXPERT_NAVY_FREE_DESC + allow_achievements = yes + } +} + +usa_start_expert_navy = { + name = RULE_USA_EXPERT_NAVY + group = RULE_GROUP_NAVY_REWORK + + default = { + name = BLOCKED + text = RULE_OPTION_BLOCKED + desc = RULE_AI_EXPERT_NAVY_BLOCKED_DESC + allow_achievements = yes + } + option = { + name = FREE + text = RULE_OPTION_FREE + desc = RULE_AI_EXPERT_NAVY_FREE_DESC + allow_achievements = yes + } +} \ No newline at end of file diff --git a/src/common/ideas/_naval_treaty.txt b/src/common/ideas/_naval_treaty.txt index 9a18517..0f96754 100755 --- a/src/common/ideas/_naval_treaty.txt +++ b/src/common/ideas/_naval_treaty.txt @@ -51,9 +51,9 @@ ideas = { picture = MTG_naval_treaty_adherent_reduced modifier = { - production_cost_max_ship_hull_cruiser = 6300 - production_cost_max_ship_hull_heavy = 11000 - production_cost_max_ship_hull_carrier = 10000 + production_cost_max_ship_hull_cruiser = 6800 + production_cost_max_ship_hull_heavy = 12000 + production_cost_max_ship_hull_carrier = 11000 production_cost_max_ship_hull_submarine = 900 convoy_raiding_efficiency_factor = -0.5 } @@ -89,9 +89,9 @@ ideas = { picture = MTG_naval_treaty_adherent_reduced modifier = { - production_cost_max_ship_hull_cruiser = 7000 + production_cost_max_ship_hull_cruiser = 7200 production_cost_max_ship_hull_heavy = 18000 - production_cost_max_ship_hull_carrier = 11000 + production_cost_max_ship_hull_carrier = 12000 } } } diff --git a/src/common/ideas/vnr_ai.txt b/src/common/ideas/vnr_ai.txt index 7ed52d2..99c3952 100755 --- a/src/common/ideas/vnr_ai.txt +++ b/src/common/ideas/vnr_ai.txt @@ -206,5 +206,26 @@ ideas = { } } } + + vnr_expert_navy_treaty_workaround = { + cancel = { + is_ai = no + is_debug = no + } + equipment_bonus = { + ship_hull_heavy = { + instant = yes + build_cost_ic = -0.25 + } + ship_hull_carrier = { + instant = yes + build_cost_ic = -0.15 + } + ship_hull_cruiser = { + instant = yes + build_cost_ic = -0.15 + } + } + } } } \ No newline at end of file diff --git a/src/common/scripted_effects/_add_ai_variants.txt b/src/common/scripted_effects/_add_ai_variants.txt index 92ba449..54ce8d7 100755 --- a/src/common/scripted_effects/_add_ai_variants.txt +++ b/src/common/scripted_effects/_add_ai_variants.txt @@ -1370,4 +1370,373 @@ SOV_AI_variants_1943 = { rear_2_custom_slot = dp_light_battery_4 } } +} +JAP_expert_AI_variants = { + create_equipment_variant = { + name = "长门级" # Nagato Class + role_icon_index = 3 + type = vnr_ship_hull_heavy_3 + parent_version = 0 + name_group = JAP_PREFECTURES + modules = { + fixed_ship_battery_slot = ship_heavy_battery_2_triple + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = heavy_ship_engine_3 + fixed_ship_secondaries_slot = dp_ship_secondaries_1_bb + fixed_ship_armor_slot = ship_armor_bb_3 + fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing + fixed_ship_torpedo_defense_system_slot = torpedo_belt + front_1_custom_slot = ship_heavy_battery_2_triple + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_anti_air_2 + mid_3_custom_slot = ship_anti_air_2 + rear_1_custom_slot = ship_heavy_battery_2_triple + } + } + create_equipment_variant = { + name = "苍龙级" # Soryu Class + role_icon_index = 13 + type = vnr_ship_hull_carrier_1 + parent_version = 0 + name_group = JAP_CV_HISTORICAL + modules = { + fixed_ship_deck_slot_1 = ship_deck_space_open + fixed_ship_deck_slot_2 = ship_deck_space_open + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_engine_slot = carrier_ship_engine_2 + fixed_ship_armor_slot = ship_armor_carrier_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_1_bb + fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad + fixed_ship_flight_deck_slot = carrier_armor_deck + fixed_ship_role_slot = ship_hull_carrier_role_cv + front_1_custom_slot = ship_deck_space_open + mid_1_custom_slot = ship_deck_space_open + } + } + create_equipment_variant = { + name = "高雄级" # Takao Class + role_icon_index = 27 + type = vnr_ship_hull_cruiser_3 + parent_version = 0 + name_group = JAP_MOUNTAIN + modules = { + fixed_ship_battery_slot = ship_medium_battery_2 + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = cruiser_ship_engine_3 + fixed_ship_secondaries_slot = dp_ship_secondaries_1 + fixed_ship_armor_slot = ship_armor_cruiser_2 + fixed_ship_role_slot = ship_hull_cruiser_role_ca + front_2_custom_slot = ship_medium_battery_2 + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_anti_air_2 + mid_3_custom_slot = ship_anti_air_3 + rear_1_custom_slot = ship_medium_battery_2 + rear_2_custom_slot = ship_medium_battery_2 + } + } + create_equipment_variant = { + name = "最上级" # Mogami Class + role_icon_index = 25 + type = vnr_ship_hull_cruiser_3 + parent_version = 0 + name_group = JAP_RIVER + modules = { + fixed_ship_battery_slot = ship_light_medium_battery_2 + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = cruiser_ship_engine_3 + fixed_ship_secondaries_slot = empty + fixed_ship_armor_slot = ship_armor_cruiser_2 + front_1_custom_slot = ship_light_medium_battery_2 + front_2_custom_slot = ship_light_medium_battery_2 + mid_1_custom_slot = ship_torpedo_2 + mid_2_custom_slot = ship_airplane_launcher_1 + mid_3_custom_slot = ship_anti_air_2 + rear_1_custom_slot = ship_light_medium_battery_2 + rear_2_custom_slot = ship_light_medium_battery_2 + } + } + create_equipment_variant = { + name = "吹雪级" # Fubuki Class + role_icon_index = 31 + type = vnr_ship_hull_light_3 + parent_version = 0 + name_group = JAP_WEATHER + modules = { + fixed_ship_battery_slot = ship_light_battery_2_double + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_radar_slot = ship_sonar_1 + fixed_ship_engine_slot = light_ship_engine_3 + front_1_custom_slot = ship_light_battery_2_double + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_torpedo_2 + rear_1_custom_slot = ship_depth_charge_1 + rear_2_custom_slot = ship_depth_charge_1 + } + } + create_equipment_variant = { + name = "海大VI级" # Kaidai VI Class + parent_version = 0 + show_position = no + role_icon_index = 37 + type = vnr_ship_hull_submarine_2 + name_group = JAP_SS_HISTORICAL + modules = { + fixed_ship_torpedo_slot = ship_torpedo_sub_2 + fixed_ship_engine_slot = sub_ship_engine_2 + fixed_ship_armor_slot = pressure_hull_2 + fixed_ship_extra_secondaries_slot = oxygen_generator + mid_1_custom_slot = sub_ship_periscope_1 + rear_1_custom_slot = ship_torpedo_sub_2 + } + } +} +USA_expert_AI_variants = { + create_equipment_variant = { + name = "科罗拉多级" # Colorado Class + role_icon_index = 3 + type = vnr_ship_hull_heavy_3 + parent_version = 0 + name_group = USA_STATES + modules = { + fixed_ship_battery_slot = ship_heavy_battery_2_triple + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = heavy_ship_engine_3 + fixed_ship_secondaries_slot = dp_ship_secondaries_1_bb + fixed_ship_armor_slot = ship_armor_bb_3 + fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing + fixed_ship_torpedo_defense_system_slot = torpedo_belt + front_1_custom_slot = ship_heavy_battery_2_triple + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_anti_air_2 + mid_3_custom_slot = ship_anti_air_2 + rear_1_custom_slot = ship_heavy_battery_2_triple + } + } + create_equipment_variant = { + name = "约克城级" # Yorktown Class + role_icon_index = 13 + type = vnr_ship_hull_carrier_1 + parent_version = 0 + name_group = USA_CV_HISTORICAL + modules = { + fixed_ship_deck_slot_1 = ship_deck_space_open + fixed_ship_deck_slot_2 = ship_deck_space_open + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_engine_slot = carrier_ship_engine_2 + fixed_ship_armor_slot = ship_armor_carrier_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_1_bb + fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad + fixed_ship_flight_deck_slot = carrier_armor_deck + fixed_ship_role_slot = ship_hull_carrier_role_cv + front_1_custom_slot = ship_deck_space_open + mid_1_custom_slot = ship_deck_space_open + } + } + create_equipment_variant = { + name = "威奇塔级" # Wichita Class + role_icon_index = 27 + type = vnr_ship_hull_cruiser_3 + parent_version = 0 + name_group = USA_CA_HISTORICAL + modules = { + fixed_ship_battery_slot = ship_medium_battery_2 + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = cruiser_ship_engine_3 + fixed_ship_secondaries_slot = dp_ship_secondaries_1 + fixed_ship_armor_slot = ship_armor_cruiser_2 + fixed_ship_role_slot = ship_hull_cruiser_role_ca + front_2_custom_slot = ship_medium_battery_2 + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_anti_air_2 + mid_3_custom_slot = ship_anti_air_3 + rear_1_custom_slot = ship_medium_battery_2 + rear_2_custom_slot = ship_medium_battery_2 + } + } + create_equipment_variant = { + name = "布鲁克林级" # Brooklyn Class + role_icon_index = 25 + type = vnr_ship_hull_cruiser_3 + parent_version = 0 + name_group = USA_CL_HISTORICAL + modules = { + fixed_ship_battery_slot = ship_light_medium_battery_2 + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = cruiser_ship_engine_3 + fixed_ship_secondaries_slot = empty + fixed_ship_armor_slot = ship_armor_cruiser_2 + front_1_custom_slot = ship_light_medium_battery_2 + front_2_custom_slot = ship_light_medium_battery_2 + mid_1_custom_slot = ship_torpedo_2 + mid_2_custom_slot = ship_airplane_launcher_1 + mid_3_custom_slot = ship_anti_air_2 + rear_1_custom_slot = ship_light_medium_battery_2 + rear_2_custom_slot = ship_light_medium_battery_2 + } + } + create_equipment_variant = { + name = "波特级" # Porter Class + role_icon_index = 31 + type = vnr_ship_hull_light_3 + parent_version = 0 + name_group = USA_HEROES_NAVY + modules = { + fixed_ship_battery_slot = ship_light_battery_2_double + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_radar_slot = ship_sonar_1 + fixed_ship_engine_slot = light_ship_engine_3 + front_1_custom_slot = ship_light_battery_2_double + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_torpedo_2 + rear_1_custom_slot = ship_depth_charge_1 + rear_2_custom_slot = ship_depth_charge_1 + } + } + create_equipment_variant = { + name = "鼠海豚级" # Porpoise Class + parent_version = 0 + show_position = no + role_icon_index = 37 + type = vnr_ship_hull_submarine_2 + name_group = USA_FISH + modules = { + fixed_ship_torpedo_slot = ship_torpedo_sub_2 + fixed_ship_engine_slot = sub_ship_engine_2 + fixed_ship_armor_slot = pressure_hull_2 + fixed_ship_extra_secondaries_slot = oxygen_generator + mid_1_custom_slot = sub_ship_periscope_1 + rear_1_custom_slot = ship_torpedo_sub_2 + } + } +} +ENG_expert_AI_variants = { + create_equipment_variant = { + name = "英王乔治五世级" # King George V Class + role_icon_index = 3 + type = vnr_ship_hull_heavy_3 + parent_version = 0 + name_group = ENG_BB_HISTORICAL + modules = { + fixed_ship_battery_slot = ship_heavy_battery_2_triple + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = heavy_ship_engine_3 + fixed_ship_secondaries_slot = dp_ship_secondaries_1_bb + fixed_ship_armor_slot = ship_armor_bb_3 + fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing + fixed_ship_torpedo_defense_system_slot = torpedo_belt + front_1_custom_slot = ship_heavy_battery_2_triple + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_anti_air_2 + mid_3_custom_slot = ship_anti_air_2 + rear_1_custom_slot = ship_heavy_battery_2_triple + } + } + create_equipment_variant = { + name = "皇家方舟级" # Ark Royal Class + role_icon_index = 13 + type = vnr_ship_hull_carrier_1 + parent_version = 0 + name_group = ENG_CV_QUALITIES + modules = { + fixed_ship_deck_slot_1 = ship_deck_space_open + fixed_ship_deck_slot_2 = ship_deck_space_open + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_engine_slot = carrier_ship_engine_2 + fixed_ship_armor_slot = ship_armor_carrier_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_1_bb + fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad + fixed_ship_flight_deck_slot = carrier_armor_deck + fixed_ship_role_slot = ship_hull_carrier_role_cv + front_1_custom_slot = ship_deck_space_open + mid_1_custom_slot = ship_deck_space_open + } + } + create_equipment_variant = { + name = "约克级" # York Class + role_icon_index = 27 + type = vnr_ship_hull_cruiser_3 + parent_version = 0 + name_group = ENG_CA_HISTORICAL + modules = { + fixed_ship_battery_slot = ship_medium_battery_2 + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = cruiser_ship_engine_3 + fixed_ship_secondaries_slot = dp_ship_secondaries_1 + fixed_ship_armor_slot = ship_armor_cruiser_2 + fixed_ship_role_slot = ship_hull_cruiser_role_ca + front_2_custom_slot = ship_medium_battery_2 + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_anti_air_2 + mid_3_custom_slot = ship_anti_air_3 + rear_1_custom_slot = ship_medium_battery_2 + rear_2_custom_slot = ship_medium_battery_2 + } + } + create_equipment_variant = { + name = "城级" # Town Class + role_icon_index = 25 + type = vnr_ship_hull_cruiser_3 + parent_version = 0 + name_group = ENG_CL_HISTORICAL + modules = { + fixed_ship_battery_slot = ship_light_medium_battery_2 + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_engine_slot = cruiser_ship_engine_3 + fixed_ship_secondaries_slot = empty + fixed_ship_armor_slot = ship_armor_cruiser_2 + front_1_custom_slot = ship_light_medium_battery_2 + front_2_custom_slot = ship_light_medium_battery_2 + mid_1_custom_slot = ship_torpedo_2 + mid_2_custom_slot = ship_airplane_launcher_1 + mid_3_custom_slot = ship_anti_air_2 + rear_1_custom_slot = ship_light_medium_battery_2 + rear_2_custom_slot = ship_light_medium_battery_2 + } + } + create_equipment_variant = { + name = "E/F/G/H级" # E/F/G/H Class + role_icon_index = 31 + type = vnr_ship_hull_light_3 + parent_version = 0 + name_group = ENG_DD_ALPHABETICAL + modules = { + fixed_ship_battery_slot = ship_light_battery_2_double + fixed_ship_anti_air_slot = ship_anti_air_2 + fixed_ship_fire_control_system_slot = ship_fire_control_system_1 + fixed_ship_radar_slot = ship_sonar_1 + fixed_ship_engine_slot = light_ship_engine_3 + front_1_custom_slot = ship_light_battery_2_double + mid_1_custom_slot = ship_anti_air_2 + mid_2_custom_slot = ship_torpedo_2 + rear_1_custom_slot = ship_depth_charge_1 + rear_2_custom_slot = ship_depth_charge_1 + } + } + create_equipment_variant = { + name = "灰海豚级" # Grampus Class + parent_version = 0 + show_position = no + role_icon_index = 37 + type = vnr_ship_hull_submarine_2 + name_group = ENG_SS_HISTORICAL + modules = { + fixed_ship_torpedo_slot = ship_torpedo_sub_2 + fixed_ship_engine_slot = sub_ship_engine_2 + fixed_ship_armor_slot = pressure_hull_2 + fixed_ship_extra_secondaries_slot = oxygen_generator + mid_1_custom_slot = sub_ship_periscope_1 + rear_1_custom_slot = ship_torpedo_sub_2 + } + } } \ No newline at end of file diff --git a/src/common/scripted_effects/_add_starting_tech.txt b/src/common/scripted_effects/_add_starting_tech.txt index 22c2b7b..92c2be8 100755 --- a/src/common/scripted_effects/_add_starting_tech.txt +++ b/src/common/scripted_effects/_add_starting_tech.txt @@ -134,7 +134,6 @@ add_starting_techs = { landing_aid_system = 1 arresting_gear = 1 aviation_dawn = 1 - night_air_strike = 1 basic_periscope = 1 improved_periscope = 1 basic_ballast_tank = 1 diff --git a/src/common/scripted_effects/_delete_starting_naval.txt b/src/common/scripted_effects/_delete_starting_naval.txt index 1080eb5..abdd398 100755 --- a/src/common/scripted_effects/_delete_starting_naval.txt +++ b/src/common/scripted_effects/_delete_starting_naval.txt @@ -28,4 +28,7 @@ special_project_workaround = { SOV = { complete_special_project = sp:sp_high_speed_light_engine } + ITA = { + complete_special_project = sp:sp_naval_super_heavy_battleship + } } \ No newline at end of file diff --git a/src/common/scripted_effects/_vnr_ai.txt b/src/common/scripted_effects/_vnr_ai.txt index 8b527a9..f7bdefa 100755 --- a/src/common/scripted_effects/_vnr_ai.txt +++ b/src/common/scripted_effects/_vnr_ai.txt @@ -226,4 +226,33 @@ set_shipyard_output_boost = { add_ideas = vnr_ai_dd_output_boost_2 } } + + ### expert country treaty workaround + ENG = { + if = { + limit = { allow_to_use_expert_navy = yes } + add_timed_idea = { + idea = vnr_expert_navy_treaty_workaround + days = 730 + } + } + } + USA = { + if = { + limit = { allow_to_use_expert_navy = yes } + add_timed_idea = { + idea = vnr_expert_navy_treaty_workaround + days = 730 + } + } + } + JAP = { + if = { + limit = { allow_to_use_expert_navy = yes } + add_timed_idea = { + idea = vnr_expert_navy_treaty_workaround + days = 730 + } + } + } } \ No newline at end of file diff --git a/src/common/scripted_triggers/_vnr_scripted_triggers.txt b/src/common/scripted_triggers/_vnr_scripted_triggers.txt index 0074851..56388e4 100755 --- a/src/common/scripted_triggers/_vnr_scripted_triggers.txt +++ b/src/common/scripted_triggers/_vnr_scripted_triggers.txt @@ -56,4 +56,23 @@ is_ai_naval_major = { tag = USA } is_ai = yes +} + +allow_to_use_expert_navy = { + OR = { + AND = { + tag = ENG + has_game_rule = { rule = eng_start_expert_navy option = FREE } + } + AND = { + tag = JAP + has_game_rule = { rule = jap_start_expert_navy option = FREE } + } + AND = { + tag = USA + has_game_rule = { rule = usa_start_expert_navy option = FREE } + } + } + is_ai = yes + has_game_rule = { rule = ai_ship_design_style option = EXPERT } } \ No newline at end of file diff --git a/src/common/special_projects/projects/naval_projects.txt b/src/common/special_projects/projects/naval_projects.txt index 0f80165..256ea7d 100755 --- a/src/common/special_projects/projects/naval_projects.txt +++ b/src/common/special_projects/projects/naval_projects.txt @@ -888,6 +888,59 @@ sp_high_speed_light_engine = { } } + 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_submarine_snorkel = { + specialization = specialization_naval + project_tags = { sp_tag_surface_ship } + allowed = { + has_dlc = "Man the Guns" + } + available = { + FROM = { + has_tech = basic_ship_hull_submarine + } + } + resource_cost = { + resources = { + steel = 6 + chromium = 4 + } + } + breakthrough_cost = { + specialization_naval = 1 + } + + prototype_time = sp_time.prototype.short + + complexity = sp_complexity.small + + project_output = { + enable_equipment_modules = { + ship_sub_snorkel_0 + } + country_effects = { + custom_effect_tooltip = { + localization_key = SP_UNLOCK_TECH + TECH = basic_submarine_snorkel + } + } + } + generic_prototype_rewards = { sp_naval_generic_reward_scientist_xp_1 sp_naval_generic_reward_scientist_xp_2 diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt index 065862c..578d9c6 100755 --- a/src/common/technologies/MTG_naval.txt +++ b/src/common/technologies/MTG_naval.txt @@ -1032,6 +1032,9 @@ technologies = { max_strength = 0.25 naval_range = 0.2 } + enable_equipment_modules = { + light_ship_engine_4_gas + } folder = { name = mtgnavalfolder @@ -1138,6 +1141,7 @@ technologies = { } path = { leads_to_tech = treaty_cruiser_trend + ##! leads_to_tech = large_cruiser_trend research_cost_coeff = 1 } path = { @@ -1508,6 +1512,7 @@ technologies = { } enable_equipment_modules = { structural_aluminum + cruiser_ship_engine_4_gas } heavy_cruiser = { build_cost_ic = -0.1 @@ -2100,6 +2105,55 @@ technologies = { } } + ##! large_cruiser_trend = { + ##! xp_research_type = navy + ##! xp_boost_cost = 20 + ##! xp_research_bonus = 1.50 + ##! start_year = 1925 + ##! research_cost = 0.5 + ##! + ##! enable_equipment_modules = { + ##! ship_hull_cruiser_role_cb + ##! } + ##! + ##! heavy_cruiser = { + ##! max_strength = 0.1 + ##! armor_value = 0.1 + ##! } + ##! medium_cruiser = { + ##! max_strength = 0.1 + ##! armor_value = 0.1 + ##! } + ##! light_cruiser = { + ##! max_strength = 0.1 + ##! } + ##! path = { + ##! leads_to_tech = basic_ship_hull_cruiser + ##! research_cost_coeff = 1 + ##! } + ##! + ##! folder = { + ##! name = mtgnavalfolder + ##! position = { x = -1 y = @1914_module_2 } + ##! } + ##! + ##! ai_will_do = { + ##! factor = 1 + ##! modifier = { + ##! num_of_naval_factories > 5 + ##! factor = 3 + ##! } + ##! } + ##! + ##! special_project_specialization = { specialization_naval } + ##! categories = { + ##! naval_equipment + ##! cl_tech + ##! ca_tech + ##! mio_cat_tech_all_cruiser_and_modules + ##! } + ##! } + cruiser_gun_upgrade = { on_research_complete = { custom_effect_tooltip = ca_tech_4_tt @@ -2635,6 +2689,11 @@ technologies = { krupp_cemented_steel = { on_research_complete = { custom_effect_tooltip = bb_tech_10_tt + add_tech_bonus = { + bonus = 1 + uses = 1 + technology = improved_heavy_armor + } } xp_research_type = navy xp_boost_cost = 20 @@ -2728,6 +2787,11 @@ technologies = { homogeneous_krupp_steel = { on_research_complete = { custom_effect_tooltip = bb_tech_10_tt + add_tech_bonus = { + bonus = 1 + uses = 1 + technology = advanced_heavy_armor + } } xp_research_type = navy xp_boost_cost = 20 @@ -3072,11 +3136,6 @@ technologies = { } research_cost = 1.5 - path = { - leads_to_tech = gas_turbine - research_cost_coeff = 1 - } - path = { leads_to_tech = fuel_tank_upgrade research_cost_coeff = 1 @@ -3685,7 +3744,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 3 y = @1944_module } + position = { x = 2 y = @1944_module } } ai_will_do = { @@ -3712,7 +3771,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = -3 y = @1944_module } + position = { x = -2 y = @1944_module } } ai_will_do = { @@ -3730,34 +3789,6 @@ technologies = { } } - gas_turbine = { - research_cost = 1.5 - - enable_equipment_modules = { - heavy_ship_engine_4_gas - } - - start_year = 1945 - - folder = { - name = mtgnavalfolder - position = { x = 1 y = @1944_module } - } - - ai_will_do = { - factor = 0 - } - - special_project_specialization = { specialization_naval } - categories = { - naval_equipment - bb_tech - bc_tech - ship_modules_tech - mio_cat_tech_all_capital_ship_and_modules - } - } - combat_information_center = { on_research_complete = { custom_effect_tooltip = bb_tech_4_tt @@ -3772,7 +3803,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = -1 y = @1944_module } + position = { x = 0 y = @1944_module } } path = { leads_to_tech = naval_tactical_data_system @@ -3810,7 +3841,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = -1 y = @1948 } + position = { x = 0 y = @1948 } } path = { leads_to_tech = memory_expansion @@ -4260,7 +4291,7 @@ technologies = { research_cost_coeff = 1 } path = { - leads_to_tech = night_air_strike + leads_to_tech = carrier_radio_range research_cost_coeff = 1 } path = { @@ -4310,6 +4341,7 @@ technologies = { improved_ship_hull_carrier = { on_research_complete = { custom_effect_tooltip = cv_tech_1_tt + set_technology = { escort_carriers_ship = 1 } } enable_equipments = { @@ -4343,10 +4375,6 @@ technologies = { research_cost_coeff = 1 } - sub_technologies = { - escort_carriers_ship - } - research_cost = 1.75 start_year = 1940 @@ -4449,10 +4477,12 @@ technologies = { on_research_complete = { custom_effect_tooltip = cv_tech_2_tt } - research_cost = 0.75 + research_cost = 0.35 start_year = 1925 - sortie_efficiency = 0.1 + sortie_efficiency = 0.05 + carrier_capacity_penalty_reduction = -0.05 + air_accidents_factor = -0.05 folder = { name = mtgnavalfolder @@ -4513,22 +4543,26 @@ technologies = { } } - night_air_strike = { - research_cost = 0.75 + carrier_radio_range = { + research_cost = 0.5 start_year = 1934 xp_research_type = navy xp_boost_cost = 20 xp_research_bonus = 1.25 - air_carrier_night_penalty_reduction_factor = 0.05 - carrier_night_traffic = 0.05 + air_accidents_factor = -0.1 + fighter_sortie_efficiency = 0.1 folder = { name = mtgnavalfolder position = { x = 1 y = @1932_module } } + dependencies = { + radio = 1 + } + ai_will_do = { factor = 1 } @@ -4564,12 +4598,10 @@ technologies = { type = capital_ship archetype = ship_hull_heavy } + NOT = { has_tech = aviation_dawn } } on_research_complete = { - if = { - limit = { NOT = { has_tech = aviation_dawn } } - add_political_power = -20 - } + add_political_power = -20 } folder = { @@ -4604,7 +4636,7 @@ technologies = { custom_effect_tooltip = cv_tech_1_tt } research_cost = 1.25 - start_year = 1938 + start_year = 1939 xp_research_type = navy xp_boost_cost = 10 @@ -4633,6 +4665,10 @@ technologies = { } } + dependencies = { + armor_piercing_bombs = 1 + } + special_project_specialization = { specialization_naval specialization_air } categories = { naval_equipment @@ -4645,7 +4681,7 @@ technologies = { on_research_complete = { custom_effect_tooltip = cv_tech_5_tt } - research_cost = 1.25 + research_cost = 1 start_year = 1941 xp_research_type = navy @@ -4657,7 +4693,7 @@ technologies = { } carrier = { - max_organisation = 10 + max_organisation = 5 max_strength = 0.1 reliability = 0.05 } @@ -5027,7 +5063,7 @@ technologies = { research_cost = 1 start_year = 1951 - air_accidents_factor = -0.1 + air_carrier_night_penalty_reduction_factor = -0.1 carrier_night_traffic = 0.1 folder = { @@ -5391,6 +5427,12 @@ technologies = { } basic_submarine_snorkel = { + is_special_project_tech = yes + allow = { + ROOT = { + is_special_project_completed = sp:sp_submarine_snorkel + } + } enable_equipment_modules = { ship_sub_snorkel_1 @@ -5425,6 +5467,12 @@ technologies = { } improved_submarine_snorkel = { + is_special_project_tech = yes + allow = { + ROOT = { + is_special_project_completed = sp:sp_submarine_snorkel + } + } enable_equipment_modules = { ship_sub_snorkel_2 @@ -6095,6 +6143,9 @@ technologies = { enable_equipments = { vnr_ship_hull_merchant_carrier } + enable_equipment_modules = { + carrier_civilian_material + } research_cost = 1 start_year = 1940 @@ -6152,7 +6203,7 @@ technologies = { enable_equipment_modules = { crewed_torpedo } - research_cost = 0.6 + research_cost = 0.1 start_year = 1930 ai_will_do = { @@ -6166,8 +6217,8 @@ technologies = { } } escort_carriers_ship = { - on_research_complete = { - custom_effect_tooltip = cv_tech_6_tt + allow = { + always = no } enable_equipments = { vnr_ship_hull_escort_carrier @@ -6179,13 +6230,7 @@ technologies = { start_year = 1940 ai_will_do = { - factor = 0 - } - special_project_specialization = { specialization_naval } - categories = { - cv_tech - naval_equipment - mio_cat_tech_all_carrier_and_modules + factor = 1 } } super_carriers = { diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt index 3a96d2e..421e432 100755 --- a/src/common/technologies/MTG_naval_Support.txt +++ b/src/common/technologies/MTG_naval_Support.txt @@ -153,7 +153,7 @@ technologies = { basic_light_battery = { - research_cost = 0.5 + research_cost = 0.25 start_year = 1924 @@ -225,15 +225,12 @@ technologies = { } light_cruiser = { lg_attack = 0.05 - lg_armor_piercing = 0.05 } heavy_cruiser = { lg_attack = 0.05 - lg_armor_piercing = 0.05 } medium_cruiser = { lg_attack = 0.05 - lg_armor_piercing = 0.05 } ##! armored_cruiser = { ##! lg_attack = 0.05 @@ -284,7 +281,7 @@ technologies = { improved_light_battery = { - research_cost = 0.5 + research_cost = 0.25 start_year = 1939 @@ -343,15 +340,12 @@ technologies = { } light_cruiser = { lg_attack = 0.05 - lg_armor_piercing = 0.05 } heavy_cruiser = { lg_attack = 0.05 - lg_armor_piercing = 0.05 } medium_cruiser = { lg_attack = 0.05 - lg_armor_piercing = 0.05 } ##! armored_cruiser = { ##! lg_attack = 0.05 @@ -406,7 +400,7 @@ technologies = { advanced_light_battery = { - research_cost = 0.5 + research_cost = 0.25 start_year = 1944 @@ -450,7 +444,7 @@ technologies = { basic_medium_battery = { - research_cost = 0.75 + research_cost = 0.5 start_year = 1936 @@ -516,16 +510,13 @@ technologies = { light_cruiser = { - lg_attack = 0.05 lg_armor_piercing = 0.05 } heavy_cruiser = { - hg_attack = 0.05 - hg_armor_piercing = 0.05 + lg_armor_piercing = 0.05 } medium_cruiser = { - hg_attack = 0.05 - hg_armor_piercing = 0.05 + lg_armor_piercing = 0.05 } folder = { @@ -554,7 +545,7 @@ technologies = { improved_medium_battery = { - research_cost = 0.75 + research_cost = 0.5 start_year = 1939 @@ -620,16 +611,13 @@ technologies = { } light_cruiser = { - lg_attack = 0.05 lg_armor_piercing = 0.05 } heavy_cruiser = { - hg_attack = 0.05 - hg_armor_piercing = 0.05 + lg_armor_piercing = 0.05 } medium_cruiser = { - hg_attack = 0.05 - hg_armor_piercing = 0.05 + lg_armor_piercing = 0.05 } @@ -659,7 +647,7 @@ technologies = { advanced_medium_battery = { - research_cost = 0.75 + research_cost = 0.5 start_year = 1944 @@ -707,7 +695,7 @@ technologies = { basic_heavy_battery = { - research_cost = 1 + research_cost = 0.75 start_year = 1924 @@ -760,7 +748,7 @@ technologies = { } improved_heavy_battery = { - research_cost = 1 + research_cost = 0.75 start_year = 1939 @@ -809,7 +797,7 @@ technologies = { } advanced_heavy_battery = { - research_cost = 1 + research_cost = 0.75 start_year = 1944 @@ -970,7 +958,7 @@ technologies = { basic_dp_light_battery = { - research_cost = 0.5 + research_cost = 0.3 start_year = 1939 @@ -1018,7 +1006,7 @@ technologies = { improved_dp_light_battery = { - research_cost = 0.5 + research_cost = 0.3 start_year = 1941 @@ -1066,7 +1054,7 @@ technologies = { advanced_dp_light_battery = { - research_cost = 0.5 + research_cost = 0.3 start_year = 1944 @@ -1114,7 +1102,7 @@ technologies = { basic_dp_medium_battery = { - research_cost = 0.75 + research_cost = 0.5 start_year = 1944 @@ -1291,7 +1279,7 @@ technologies = { ship_rocket_artillery = { - research_cost = 0.75 + research_cost = 0.1 start_year = 1943 dependencies = { @@ -1327,7 +1315,7 @@ technologies = { } unmanned_gun_turret = { - research_cost = 1 + research_cost = 0.75 start_year = 1947 heavy_cruiser = { @@ -1379,7 +1367,7 @@ technologies = { } modern_generic_battery = { - research_cost = 1 + research_cost = 0.75 start_year = 1949 on_research_complete = { @@ -1563,7 +1551,7 @@ technologies = { xp_research_type = navy xp_boost_cost = 20 xp_research_bonus = 1.50 - research_cost = 0.75 + research_cost = 0.5 start_year = 1942 destroyer = { @@ -1627,7 +1615,7 @@ technologies = { xp_research_type = navy xp_boost_cost = 20 xp_research_bonus = 1.50 - research_cost = 1 + research_cost = 0.75 enable_equipment_modules = { sub_wire_guided_torpedo } @@ -1674,7 +1662,7 @@ technologies = { xp_research_type = navy xp_boost_cost = 20 xp_research_bonus = 1.50 - research_cost = 1.25 + research_cost = 1 start_year = 1951 destroyer = { @@ -1731,7 +1719,7 @@ technologies = { xp_research_type = navy xp_boost_cost = 20 xp_research_bonus = 1.50 - research_cost = 0.75 + research_cost = 0.5 start_year = 1936 @@ -1776,7 +1764,7 @@ technologies = { xp_research_type = navy xp_boost_cost = 20 xp_research_bonus = 1.50 - research_cost = 0.75 + research_cost = 0.5 start_year = 1936 @@ -1820,7 +1808,7 @@ technologies = { xp_research_type = navy xp_boost_cost = 20 xp_research_bonus = 1.50 - research_cost = 0.75 + research_cost = 0.5 start_year = 1943 dependencies = { @@ -1928,7 +1916,7 @@ technologies = { } advanced_ship_torpedo_launcher = { - research_cost = 0.75 + research_cost = 0.5 start_year = 1940 @@ -1973,7 +1961,7 @@ technologies = { } modern_ship_torpedo_launcher = { - research_cost = 1 + research_cost = 0.75 start_year = 1944 @@ -2015,7 +2003,7 @@ technologies = { } } coldwar_ship_torpedo_launcher = { - research_cost = 1.25 + research_cost = 1 start_year = 1949 enable_equipment_modules = { @@ -2408,7 +2396,7 @@ technologies = { submarine_mine_laying = { - research_cost = 0.75 + research_cost = 0.5 start_year = 1922 @@ -2441,7 +2429,7 @@ technologies = { improved_submarine_mine_laying = { - research_cost = 0.75 + research_cost = 0.5 start_year = 1940 @@ -2470,7 +2458,7 @@ technologies = { improved_naval_mines = { - research_cost = 1 + research_cost = 0.5 start_year = 1936 @@ -2545,7 +2533,7 @@ technologies = { advanced_naval_mines = { - research_cost = 1.25 + research_cost = 0.5 start_year = 1942 @@ -2650,7 +2638,7 @@ technologies = { modern_naval_mines = { - research_cost = 1.5 + research_cost = 0.75 start_year = 1945 diff --git a/src/common/units/a_battlecarrier.txt b/src/common/units/a_battlecarrier.txt index 8e45570..7da8c5f 100755 --- a/src/common/units/a_battlecarrier.txt +++ b/src/common/units/a_battlecarrier.txt @@ -11,7 +11,7 @@ sub_units = { ship_deck_space_bb = 1 } } - max_organisation = 40 + max_organisation = 20 supply_consumption = 0.42 diff --git a/src/common/units/critical_parts/00_critical_parts.txt b/src/common/units/critical_parts/00_critical_parts.txt index 56da63c..0a7bbb4 100755 --- a/src/common/units/critical_parts/00_critical_parts.txt +++ b/src/common/units/critical_parts/00_critical_parts.txt @@ -86,9 +86,9 @@ critical_parts = { lg_attack = -0.7 torpedo_attack = -0.7 } - chance = 0.1 - str_damage_multiplier = 10 - org_damage_multiplier = 10 + chance = 0.05 + str_damage_multiplier = 30 + org_damage_multiplier = 30 } @@ -107,9 +107,10 @@ critical_parts = { icon = "GFX_default_critical_damage_icons" frame = 7 modifier = { + naval_retreat_chance = -0.95 naval_speed_factor = -0.9 } - chance = 0.5 + chance = 0.25 org_damage_multiplier = 0.5 str_damage_multiplier = 0.5 } @@ -120,7 +121,7 @@ critical_parts = { naval_retreat_chance = -0.9 naval_speed_factor = -0.5 } - chance = 0.25 + chance = 0.5 org_damage_multiplier = 0.25 str_damage_multiplier = 0.25 } @@ -181,6 +182,22 @@ critical_parts = { base_damage_instance = 1 damage_instance_per_added_module = 1 max_damage_instance = 1 + } + damaged_bb_flight_deck = { + icon = "GFX_default_critical_damage_icons" + frame = 6 + stat_penalties = { + carrier_size = -1 + } + modifier = { + navy_org_factor = -0.3 + } + chance = 1 + org_damage_multiplier = 1.5 + str_damage_multiplier = 0.75 + base_damage_instance = 1 + damage_instance_per_added_module = 1 + max_damage_instance = 1 } gas_leakage = { icon = "GFX_default_critical_damage_icons" @@ -190,7 +207,7 @@ critical_parts = { naval_morale_factor = -1 } chance = 0.05 - org_damage_multiplier = 10 - str_damage_multiplier = 10 + org_damage_multiplier = 50 + str_damage_multiplier = 50 } } \ No newline at end of file diff --git a/src/common/units/equipment/modules/00_ship_modules_aviation.txt b/src/common/units/equipment/modules/00_ship_modules_aviation.txt index 7567e1b..e2d10f8 100755 --- a/src/common/units/equipment/modules/00_ship_modules_aviation.txt +++ b/src/common/units/equipment/modules/00_ship_modules_aviation.txt @@ -88,10 +88,10 @@ equipment_modules = { ship_deck_space_small = { category = ship_deck_space_small add_equipment_type = capital_ship - gui_category = ship_deck_space + gui_category = ship_deck_space_special add_stats = { carrier_size = 1 - build_cost_ic = 500 + build_cost_ic = 700 surface_detection = 2 max_strength = 20 anti_air_attack = 0.5 @@ -131,7 +131,7 @@ equipment_modules = { } ship_deck_space_bb = { category = ship_deck_space_bb - gui_category = ship_deck_space + gui_category = ship_deck_space_special add_equipment_type = carrier gfx = ship_deck_space add_stats = { @@ -145,11 +145,12 @@ equipment_modules = { manpower = 125 multiply_stats = { naval_speed = -0.05 - max_strength = -0.1 + max_strength = -0.25 fuel_consumption = 0.05 surface_visibility = 0.05 } dismantle_cost_ic = 2000 + critical_parts = { damaged_bb_flight_deck } } ship_deck_space_mega = { category = ship_deck_space_mega @@ -249,7 +250,7 @@ equipment_modules = { steel = 1 } multiply_stats = { - naval_speed = -0.05 + naval_speed = -0.1 anti_air_attack = 0.06 build_cost_ic = 0.15 } @@ -268,7 +269,29 @@ equipment_modules = { dismantle_cost_ic = 1500 critical_parts = { damaged_wooden_flight_deck } - } + } + carrier_strength_deck = { + category = ship_flight_deck + add_equipment_type = capital_ship + parent = carrier_armor_deck + add_stats = { + reliability = 0.15 + max_strength = 80 + } + build_cost_resources = { + steel = 1 + chromium = 1 + } + multiply_stats = { + naval_speed = -0.125 + armor_value = 0.1 + anti_air_attack = 0.1 + build_cost_ic = 0.25 + } + dismantle_cost_ic = 3500 + + critical_parts = { damaged_armored_flight_deck } + } ############################ @@ -315,10 +338,6 @@ equipment_modules = { anti_air_attack = 0.05 } - build_cost_resources = { - steel = 1 - } - dismantle_cost_ic = 400 } @@ -333,10 +352,6 @@ equipment_modules = { build_cost_ic = 2000 } - build_cost_resources = { - steel = 1 - } - dismantle_cost_ic = 1250 } @@ -401,9 +416,10 @@ equipment_modules = { } } carrier_civilian_material = { - category = carrier_miscellaneous + category = carrier_civilian_material + gui_category = carrier_miscellaneous add_stats = { - reliability = -0.15 + reliability = -0.3 max_organisation = -0.2 } multiply_stats = { @@ -414,7 +430,12 @@ equipment_modules = { naval_range = -0.2 build_cost_ic = -0.2 } - dismantle_cost_ic = 1500 + dismantle_cost_ic = 100000 + forbid_module_categories = { + ship_carrier_armor + ship_carrier_armor_heavy + ship_carrier_armor_shbb + } } carrier_secondary_island = { category = carrier_island @@ -448,21 +469,6 @@ equipment_modules = { ship_radar } } - carrier_strength_deck = { - category = carrier_miscellaneous - add_stats = { - reliability = 0.1 - max_strength = 100 - } - build_cost_resources = { - steel = 1 - } - multiply_stats = { - naval_speed = -0.025 - armor_value = 0.1 - build_cost_ic = 0.15 - } - } carrier_tracing_unit = { category = carrier_unit add_stats = { @@ -490,9 +496,5 @@ equipment_modules = { reliability = 0.05 } dismantle_cost_ic = 50000 - build_cost_resources = { - steel = 1 - chromium = 1 - } } } \ No newline at end of file diff --git a/src/common/units/equipment/modules/00_ship_modules_gun.txt b/src/common/units/equipment/modules/00_ship_modules_gun.txt index ab4a1e0..3253d06 100755 --- a/src/common/units/equipment/modules/00_ship_modules_gun.txt +++ b/src/common/units/equipment/modules/00_ship_modules_gun.txt @@ -1407,7 +1407,7 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.05 - naval_speed = -0.06 + naval_speed = -0.08 } add_average_stats = { hg_armor_piercing = 48 @@ -1433,7 +1433,7 @@ equipment_modules = { } multiply_stats = { build_cost_ic = 0.06 - naval_speed = -0.07 + naval_speed = -0.09 } add_average_stats = { hg_armor_piercing = 52 @@ -1634,7 +1634,7 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.055 - naval_speed = -0.07 + naval_speed = -0.09 } add_average_stats = { hg_armor_piercing = 48 @@ -1661,7 +1661,7 @@ equipment_modules = { } multiply_stats = { build_cost_ic = 0.065 - naval_speed = -0.085 + naval_speed = -0.11 } add_average_stats = { hg_armor_piercing = 52 @@ -1875,7 +1875,7 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.06 - naval_speed = -0.1 + naval_speed = -0.12 } add_average_stats = { hg_armor_piercing = 48 @@ -1903,7 +1903,7 @@ equipment_modules = { } multiply_stats = { build_cost_ic = 0.07 - naval_speed = -0.13 + naval_speed = -0.15 } add_average_stats = { hg_armor_piercing = 52 @@ -1954,7 +1954,7 @@ equipment_modules = { } multiply_stats = { build_cost_ic = 0.06 - naval_speed = -0.075 + naval_speed = -0.1 } add_average_stats = { hg_armor_piercing = 54 @@ -1980,7 +1980,7 @@ equipment_modules = { } multiply_stats = { build_cost_ic = 0.065 - naval_speed = -0.11 + naval_speed = -0.135 } add_average_stats = { hg_armor_piercing = 54 diff --git a/src/common/units/equipment/modules/00_ship_modules_propulsion.txt b/src/common/units/equipment/modules/00_ship_modules_propulsion.txt index 6e726e0..947be14 100755 --- a/src/common/units/equipment/modules/00_ship_modules_propulsion.txt +++ b/src/common/units/equipment/modules/00_ship_modules_propulsion.txt @@ -163,6 +163,9 @@ equipment_modules = { multiply_stats = { naval_speed = 0.35 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = light_ship_engine @@ -249,6 +252,36 @@ equipment_modules = { convert_cost_ic = 250 } } + light_ship_engine_4_gas = { + category = light_ship_engine + gfx = ship_gas_engine + sfx = sfx_ui_sd_module_engine + + add_stats = { + #naval_speed = 12 + fuel_consumption = 35 + build_cost_ic = 1500 + reliability = -0.35 + } + + multiply_stats = { + naval_speed = 0.45 + naval_range = -0.35 + surface_visibility = -0.05 + } + build_cost_resources = { + chromium = 2 + } + + can_convert_from = { + module_category = light_ship_engine + convert_cost_ic = 6000 + convert_cost_resources = { + steel = 1 + chromium = 1 + } + } + } ################### @@ -381,6 +414,9 @@ equipment_modules = { sub_visibility = -0.1 max_strength = -0.1 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = sub_ship_engine convert_cost_ic = 900 @@ -404,6 +440,9 @@ equipment_modules = { max_strength = -0.1 fuel_consumption = -1 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = sub_ship_engine @@ -515,6 +554,9 @@ equipment_modules = { naval_speed = 0.4 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = cruiser_ship_engine @@ -544,6 +586,9 @@ equipment_modules = { naval_speed = 0.45 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = cruiser_ship_engine @@ -565,16 +610,15 @@ equipment_modules = { #naval_speed = 7 build_cost_ic = 3200 naval_range = 50000 - reliability = -0.5 + reliability = -0.3 } multiply_stats = { - naval_speed = 0.55 + naval_speed = 0.5 fuel_consumption = -1 } build_cost_resources = { - steel = 2 - chromium = 1 + chromium = 2 } can_convert_from = { module_category = cruiser_ship_engine @@ -622,6 +666,9 @@ equipment_modules = { naval_speed = 0.3 naval_range = 0.7 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = cruiser_ship_engine @@ -650,6 +697,9 @@ equipment_modules = { naval_speed = 0.35 naval_range = 0.8 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = cruiser_ship_engine @@ -661,6 +711,37 @@ equipment_modules = { convert_cost_ic = 920 } } + cruiser_ship_engine_4_gas = { + category = cruiser_ship_engine + gfx = ship_gas_engine + sfx = sfx_ui_sd_module_engine + + add_stats = { + #naval_speed = 12 + fuel_consumption = 48 + build_cost_ic = 3000 + reliability = -0.35 + } + + multiply_stats = { + naval_speed = 0.55 + naval_range = -0.25 + fuel_consumption = 0.1 + surface_visibility = -0.05 + } + build_cost_resources = { + chromium = 2 + } + + can_convert_from = { + module_category = cruiser_ship_engine + convert_cost_ic = 6000 + convert_cost_resources = { + steel = 1 + chromium = 1 + } + } + } ##################### @@ -683,6 +764,9 @@ equipment_modules = { naval_speed = 0.2 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = heavy_ship_engine @@ -712,6 +796,9 @@ equipment_modules = { naval_speed = 0.35 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = heavy_ship_engine @@ -744,6 +831,9 @@ equipment_modules = { multiply_stats = { naval_speed = 0.45 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = heavy_ship_engine @@ -775,6 +865,9 @@ equipment_modules = { multiply_stats = { naval_speed = 0.5 } + build_cost_resources = { + chromium = 2 + } can_convert_from = { module_category = heavy_ship_engine @@ -805,6 +898,9 @@ equipment_modules = { multiply_stats = { naval_speed = 0.55 } + build_cost_resources = { + chromium = 2 + } can_convert_from = { module_category = heavy_ship_engine @@ -835,6 +931,9 @@ equipment_modules = { naval_speed = 0.35 naval_range = 0.6 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = heavy_ship_engine @@ -863,6 +962,9 @@ equipment_modules = { naval_speed = 0.4 naval_range = 0.7 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = heavy_ship_engine @@ -894,6 +996,9 @@ equipment_modules = { naval_speed = 0.45 naval_range = 0.8 } + build_cost_resources = { + chromium = 2 + } can_convert_from = { module_category = heavy_ship_engine @@ -908,32 +1013,6 @@ equipment_modules = { convert_cost_ic = 3900 } } - heavy_ship_engine_4_gas = { - category = heavy_ship_engine - gfx = ship_gas_engine - sfx = sfx_ui_sd_module_engine - - add_stats = { - #naval_speed = 12 - fuel_consumption = 38 - build_cost_ic = 4000 - reliability = -0.3 - } - - multiply_stats = { - naval_speed = 0.6 - naval_range = -0.2 - } - - can_convert_from = { - module_category = heavy_ship_engine - convert_cost_ic = 6000 - convert_cost_resources = { - steel = 1 - chromium = 1 - } - } - } heavy_ship_engine_nuclear = { category = heavy_ship_engine_nuclear gui_category = heavy_ship_engine @@ -944,7 +1023,7 @@ equipment_modules = { #naval_speed = 12 naval_range = 50000 build_cost_ic = 6000 - reliability = -0.3 + reliability = -0.25 } multiply_stats = { @@ -952,8 +1031,7 @@ equipment_modules = { fuel_consumption = -1 } build_cost_resources = { - steel = 2 - chromium = 1 + chromium = 2 } can_convert_from = { module_category = heavy_ship_engine @@ -971,7 +1049,10 @@ equipment_modules = { build_cost_ic = 3000 } multiply_stats = { - naval_speed = 0.5 + naval_speed = 0.55 + } + build_cost_resources = { + chromium = 1 } can_convert_from = { module_category = super_heavy_ship_engine @@ -994,7 +1075,10 @@ equipment_modules = { build_cost_ic = 3500 } multiply_stats = { - naval_speed = 0.575 + naval_speed = 0.625 + } + build_cost_resources = { + chromium = 1 } can_convert_from = { module_category = super_heavy_ship_engine @@ -1021,7 +1105,10 @@ equipment_modules = { build_cost_ic = 4500 } multiply_stats = { - naval_speed = 0.65 + naval_speed = 0.7 + } + build_cost_resources = { + chromium = 2 } can_convert_from = { module_category = super_heavy_ship_engine @@ -1058,6 +1145,9 @@ equipment_modules = { naval_speed = 0.3 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = carrier_ship_engine @@ -1087,6 +1177,9 @@ equipment_modules = { naval_speed = 0.4 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = carrier_ship_engine @@ -1120,6 +1213,9 @@ equipment_modules = { naval_speed = 0.5 } + build_cost_resources = { + chromium = 2 + } can_convert_from = { module_category = carrier_ship_engine @@ -1152,6 +1248,9 @@ equipment_modules = { naval_speed = 0.55 } + build_cost_resources = { + chromium = 2 + } can_convert_from = { module_category = carrier_ship_engine @@ -1184,8 +1283,7 @@ equipment_modules = { fuel_consumption = -1 } build_cost_resources = { - steel = 2 - chromium = 1 + chromium = 2 } can_convert_from = { module_category = carrier_ship_engine @@ -1208,6 +1306,9 @@ equipment_modules = { naval_speed = 0.35 naval_range = 0.6 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = carrier_ship_engine @@ -1236,6 +1337,9 @@ equipment_modules = { naval_speed = 0.45 naval_range = 0.7 } + build_cost_resources = { + chromium = 1 + } can_convert_from = { module_category = carrier_ship_engine @@ -1267,6 +1371,9 @@ equipment_modules = { naval_speed = 0.5 naval_range = 0.8 } + build_cost_resources = { + chromium = 2 + } can_convert_from = { module_category = carrier_ship_engine diff --git a/src/common/units/equipment/modules/00_ship_modules_protection.txt b/src/common/units/equipment/modules/00_ship_modules_protection.txt index 0934241..d6762f8 100755 --- a/src/common/units/equipment/modules/00_ship_modules_protection.txt +++ b/src/common/units/equipment/modules/00_ship_modules_protection.txt @@ -17,7 +17,7 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.1 naval_speed = -0.23 - max_strength = 0.065 + max_strength = 0.05 } build_cost_resources = { steel = 1 @@ -42,7 +42,7 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.08 naval_speed = -0.08 - max_strength = 0.05 + max_strength = 0.03 } build_cost_resources = { steel = 1 @@ -68,7 +68,7 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.14 naval_speed = -0.25 - max_strength = 0.13 + max_strength = 0.1 } build_cost_resources = { steel = 1 @@ -77,7 +77,6 @@ equipment_modules = { armor_value = 35 naval_torpedo_enemy_critical_chance_factor = -0.05 naval_torpedo_damage_reduction_factor = 0.05 - reliability = 0.05 } can_convert_from = { module = ship_armor_bb_1 @@ -103,7 +102,7 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.12 naval_speed = -0.1 - max_strength = 0.1 + max_strength = 0.08 } build_cost_resources = { steel = 1 @@ -111,7 +110,6 @@ equipment_modules = { add_stats = { armor_value = 26 naval_torpedo_damage_reduction_factor = 0.05 - reliability = 0.05 } can_convert_from = { module = ship_armor_bc_1 @@ -137,17 +135,15 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.17 naval_speed = -0.3 - max_strength = 0.2 + max_strength = 0.15 } build_cost_resources = { - steel = 2 - chromium = 1 + steel = 1 } add_stats = { armor_value = 40 naval_torpedo_enemy_critical_chance_factor = -0.1 naval_torpedo_damage_reduction_factor = 0.1 - reliability = 0.1 } can_convert_from = { module = ship_armor_bb_2 @@ -173,17 +169,15 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.15 naval_speed = -0.2 - max_strength = 0.16 + max_strength = 0.12 } build_cost_resources = { steel = 1 - chromium = 1 } add_stats = { armor_value = 30 naval_torpedo_enemy_critical_chance_factor = -0.05 naval_torpedo_damage_reduction_factor = 0.1 - reliability = 0.1 } can_convert_from = { module = ship_armor_bc_2 @@ -208,17 +202,15 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.2 naval_speed = -0.32 - max_strength = 0.25 + max_strength = 0.2 } build_cost_resources = { - steel = 2 - chromium = 1 + steel = 1 } add_stats = { armor_value = 45 naval_torpedo_enemy_critical_chance_factor = -0.15 naval_torpedo_damage_reduction_factor = 0.15 - reliability = 0.15 } can_convert_from = { module = ship_armor_bb_3 @@ -243,17 +235,15 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.17 naval_speed = -0.27 - max_strength = 0.2 + max_strength = 0.16 } build_cost_resources = { - steel = 2 - chromium = 1 + steel = 1 } add_stats = { armor_value = 35 naval_torpedo_enemy_critical_chance_factor = -0.1 naval_torpedo_damage_reduction_factor = 0.15 - reliability = 0.15 } can_convert_from = { module = ship_armor_bc_3 @@ -282,7 +272,7 @@ equipment_modules = { max_strength = 0.13 } build_cost_resources = { - steel = 2 + steel = 1 chromium = 1 } add_stats = { @@ -315,10 +305,10 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.28 naval_speed = -0.35 - max_strength = 0.25 + max_strength = 0.225 } build_cost_resources = { - steel = 2 + steel = 1 chromium = 1 } add_stats = { @@ -389,9 +379,6 @@ equipment_modules = { add_stats = { armor_value = 10 } - build_cost_resources = { - steel = 1 - } can_convert_from = { module_category = ship_cruiser_armor @@ -419,7 +406,6 @@ equipment_modules = { } build_cost_resources = { steel = 1 - chromium = 1 } can_convert_from = { module_category = ship_cruiser_armor @@ -446,8 +432,7 @@ equipment_modules = { armor_value = 14 } build_cost_resources = { - steel = 2 - chromium = 1 + steel = 1 } can_convert_from = { module_category = ship_cruiser_armor @@ -522,7 +507,6 @@ equipment_modules = { } build_cost_resources = { steel = 1 - chromium = 1 } add_stats = { armor_value = 20 @@ -551,8 +535,7 @@ equipment_modules = { max_strength = 0.2 } build_cost_resources = { - steel = 2 - chromium = 1 + steel = 1 } add_stats = { armor_value = 25 @@ -581,6 +564,7 @@ equipment_modules = { multiply_stats = { build_cost_ic = 0.05 + max_strength = 0.025 naval_speed = -0.05 } dismantle_cost_ic = 1500 @@ -588,6 +572,9 @@ equipment_modules = { add_stats = { armor_value = 8 } + build_cost_resources = { + steel = 1 + } can_convert_from = { module_category = ship_carrier_armor convert_cost_ic = 600 @@ -676,7 +663,6 @@ equipment_modules = { } build_cost_resources = { steel = 1 - chromium = 1 } can_convert_from = { module_category = ship_carrier_armor @@ -722,8 +708,7 @@ equipment_modules = { armor_value = 14 } build_cost_resources = { - steel = 2 - chromium = 1 + steel = 1 } can_convert_from = { module_category = ship_carrier_armor @@ -853,12 +838,11 @@ equipment_modules = { parent = ship_armor_carrier_heavy_2 multiply_stats = { build_cost_ic = 0.15 - naval_speed = -0.125 + naval_speed = -0.15 max_strength = 0.15 } build_cost_resources = { steel = 1 - chromium = 1 } add_stats = { armor_value = 20 @@ -903,12 +887,11 @@ equipment_modules = { parent = ship_armor_carrier_heavy_3 multiply_stats = { build_cost_ic = 0.18 - naval_speed = -0.15 + naval_speed = -0.2 max_strength = 0.2 } build_cost_resources = { - steel = 2 - chromium = 1 + steel = 1 } add_stats = { armor_value = 25 @@ -956,11 +939,11 @@ equipment_modules = { build_cost_ic = 0.2 } build_cost_resources = { - steel = 2 + steel = 1 chromium = 1 } multiply_stats = { - naval_speed = -0.18 + naval_speed = -0.2 max_strength = 0.3 } add_stats = { @@ -1010,7 +993,7 @@ equipment_modules = { max_strength = 0.15 } build_cost_resources = { - steel = 2 + steel = 1 chromium = 1 } add_stats = { @@ -1038,7 +1021,7 @@ equipment_modules = { multiply_stats = { naval_speed = -0.05 - max_strength = 0.065 + max_strength = 0.05 build_cost_ic = 0.065 } dismantle_cost_ic = 1000 @@ -1053,7 +1036,7 @@ equipment_modules = { multiply_stats = { naval_speed = -0.05 - max_strength = 0.085 + max_strength = 0.075 build_cost_ic = 0.075 } add_stats = { @@ -1075,7 +1058,7 @@ equipment_modules = { multiply_stats = { naval_speed = -0.025 - max_strength = 0.075 + max_strength = 0.065 armor_value = 0.05 build_cost_ic = 0.1 } @@ -1098,7 +1081,7 @@ equipment_modules = { multiply_stats = { naval_speed = -0.025 - max_strength = 0.065 + max_strength = 0.05 armor_value = 0.1 build_cost_ic = 0.1 } @@ -1116,9 +1099,9 @@ equipment_modules = { parent = ship_scheme_all_or_nothing multiply_stats = { - naval_speed = -0.025 + naval_speed = -0.03 armor_value = 0.1 - max_strength = 0.13 + max_strength = 0.08 build_cost_ic = 0.15 } add_stats = { @@ -1162,7 +1145,7 @@ equipment_modules = { category = torpedo_defense_system add_stats = { - naval_torpedo_enemy_critical_chance_factor = -0.2 + naval_torpedo_enemy_critical_chance_factor = -0.1 naval_torpedo_damage_reduction_factor = 0.1 reliability = -0.05 } @@ -1176,7 +1159,7 @@ equipment_modules = { parent = torpedo_bulge add_stats = { - naval_torpedo_enemy_critical_chance_factor = -0.2 + naval_torpedo_enemy_critical_chance_factor = -0.15 naval_torpedo_damage_reduction_factor = 0.2 } multiply_stats = { @@ -1195,7 +1178,7 @@ equipment_modules = { parent = torpedo_belt add_stats = { - naval_torpedo_enemy_critical_chance_factor = -0.25 + naval_torpedo_enemy_critical_chance_factor = -0.2 naval_torpedo_damage_reduction_factor = 0.25 } multiply_stats = { diff --git a/src/common/units/equipment/modules/00_ship_modules_role.txt b/src/common/units/equipment/modules/00_ship_modules_role.txt index cd11034..153920e 100755 --- a/src/common/units/equipment/modules/00_ship_modules_role.txt +++ b/src/common/units/equipment/modules/00_ship_modules_role.txt @@ -413,7 +413,6 @@ equipment_modules = { dismantle_cost_ic = 100000 build_cost_resources = { steel = 1 - chromium = 1 } } @@ -430,11 +429,15 @@ equipment_modules = { } ship_hull_carrier_role_cvl = { category = cv_role + add_stats = { + max_organisation = -0.1 + } multiply_stats = { build_cost_ic = -0.1 max_strength = -0.3 naval_speed = -0.1 anti_air_attack = -0.15 + surface_visibility = -0.1 } dismantle_cost_ic = 100000 forbid_module_categories = { @@ -445,10 +448,12 @@ equipment_modules = { ship_hull_carrier_role_cve = { category = cve_role gui_category = cv_role - multiply_stats = { - anti_air_attack = -0.1 + add_stats = { max_organisation = -0.2 } + multiply_stats = { + anti_air_attack = -0.25 + } dismantle_cost_ic = 100000 forbid_module_categories = { ship_deck_space diff --git a/src/common/units/equipment/modules/00_ship_modules_support.txt b/src/common/units/equipment/modules/00_ship_modules_support.txt index 6a4a60d..120ac45 100755 --- a/src/common/units/equipment/modules/00_ship_modules_support.txt +++ b/src/common/units/equipment/modules/00_ship_modules_support.txt @@ -123,10 +123,10 @@ equipment_modules = { anti_air_attack = 6 reliability = -0.025 build_cost_ic = 300 - naval_light_gun_hit_chance_factor = -0.01 + naval_light_gun_hit_chance_factor = -0.025 } multiply_stats = { - naval_speed = -0.003 + naval_speed = -0.01 } } ship_missile_aa_1 = { @@ -630,7 +630,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = -0.01 + naval_speed = -0.02 } } @@ -651,7 +651,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = -0.02 + naval_speed = -0.03 } } @@ -672,7 +672,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = -0.02 + naval_speed = -0.04 } } @@ -688,7 +688,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = -0.02 + naval_speed = -0.06 } } @@ -775,13 +775,27 @@ equipment_modules = { ############### ## SNORKEL ## ############### + ship_sub_snorkel_0 = { + abbreviation = "scw" + category = ship_sub_snorkel + + multiply_stats = { + sub_visibility = -0.03 + } + + add_stats = { + build_cost_ic = 30 + reliability = -0.1 + } + } ship_sub_snorkel_1 = { abbreviation = "scw" category = ship_sub_snorkel gfx = ship_sub_snorkel_1 + parent = ship_sub_snorkel_0 multiply_stats = { - sub_visibility = -0.05 + sub_visibility = -0.075 } add_stats = { @@ -825,7 +839,7 @@ equipment_modules = { build_cost_ic = 150 } multiply_stats = { - naval_speed = -0.003 + naval_speed = -0.005 surface_detection = -0.03 } } @@ -845,7 +859,7 @@ equipment_modules = { convert_cost_ic = 80 } multiply_stats = { - naval_speed = -0.004 + naval_speed = -0.02 surface_detection = -0.04 } } @@ -880,7 +894,7 @@ equipment_modules = { multiply_stats = { surface_detection = 0.25 sub_detection = 0.25 - naval_speed = -0.05 + naval_speed = -0.1 fuel_consumption = 0.05 } add_stats = { @@ -895,6 +909,7 @@ equipment_modules = { add_stats = { surface_detection = 2 naval_torpedo_hit_chance_factor = 0.01 + reliability = -0.05 build_cost_ic = 150 } multiply_stats = { @@ -909,6 +924,7 @@ equipment_modules = { naval_torpedo_hit_chance_factor = 0.02 hg_attack = 2 lg_attack = 1 + reliability = -0.1 build_cost_ic = 250 } can_convert_from = { @@ -1127,50 +1143,53 @@ equipment_modules = { } } ship_light_weight_shell = { - category = heavy_miscellaneous + category = ap_shell gui_category = ship_miscellaneous multiply_stats = { hg_attack = -0.05 hg_armor_piercing = -0.05 - naval_heavy_gun_hit_chance_factor = 0.005 + naval_heavy_gun_hit_chance_factor = 0.025 build_cost_ic = -0.05 } forbid_module_categories = { ship_light_medium_battery ship_light_medium_battery_double ship_light_medium_battery_single + ship_missile } } ship_super_heavy_weight_shell = { - category = heavy_miscellaneous + category = ap_shell gui_category = ship_miscellaneous multiply_stats = { hg_attack = 0.05 hg_armor_piercing = 0.05 - naval_heavy_gun_hit_chance_factor = -0.01 + naval_heavy_gun_hit_chance_factor = -0.05 build_cost_ic = 0.05 } forbid_module_categories = { ship_light_medium_battery ship_light_medium_battery_double ship_light_medium_battery_single + ship_missile } } ship_high_velocity_shell = { - category = heavy_miscellaneous + category = ap_shell gui_category = ship_miscellaneous add_stats = { reliability = -0.1 } multiply_stats = { hg_armor_piercing = 0.075 - naval_heavy_gun_hit_chance_factor = 0.01 + naval_heavy_gun_hit_chance_factor = 0.05 build_cost_ic = 0.065 } forbid_module_categories = { ship_light_medium_battery ship_light_medium_battery_double ship_light_medium_battery_single + ship_missile } } ship_anti_air_shell = { @@ -1183,11 +1202,16 @@ equipment_modules = { anti_air_attack = 0.2 build_cost_ic = 0.05 } + forbid_module_categories = { + ship_missile_aa + } } ship_vt_shell = { category = generic_miscellaneous gui_category = ship_miscellaneous multiply_stats = { + naval_light_gun_hit_chance_factor = 0.025 + naval_heavy_gun_hit_chance_factor = 0.025 anti_air_attack = 0.25 build_cost_ic = 0.08 } @@ -1310,12 +1334,12 @@ equipment_modules = { add_stats = { surface_detection = 5 max_organisation = 0.1 - naval_light_gun_hit_chance_factor = 0.015 - naval_heavy_gun_hit_chance_factor = 0.015 - naval_torpedo_hit_chance_factor = 0.015 + naval_light_gun_hit_chance_factor = 0.025 + naval_heavy_gun_hit_chance_factor = 0.025 + naval_torpedo_hit_chance_factor = 0.025 } multiply_stats = { - build_cost_ic = 0.025 + build_cost_ic = 0.05 } } sub_wire_guided_torpedo = { @@ -1337,7 +1361,7 @@ equipment_modules = { } build_cost_resources = { aluminium = 2 - steel = -3 + steel = -2 } forbid_module_categories = { ship_cruiser_armor @@ -1349,10 +1373,11 @@ equipment_modules = { gui_category = ship_anti_air multiply_stats = { anti_air_attack = 0.35 + naval_speed = -0.05 build_cost_ic = 0.15 } - build_cost_resources = { - steel = 1 + forbid_module_categories = { + ship_missile_aa } } ship_radar_finder = { @@ -1414,7 +1439,7 @@ equipment_modules = { gui_category = cold_war_miscellaneous multiply_stats = { - build_cost_ic = 0.2 + build_cost_ic = 0.1 lg_attack = 0.1 hg_attack = 0.1 anti_air_attack = 0.15 @@ -1425,9 +1450,5 @@ equipment_modules = { naval_torpedo_damage_reduction_factor = 0.05 } dismantle_cost_ic = 50000 - build_cost_resources = { - steel = 1 - chromium = 1 - } } } \ No newline at end of file diff --git a/src/common/units/equipment/modules/Special_modules.txt b/src/common/units/equipment/modules/Special_modules.txt index 83f2a62..45d3e95 100755 --- a/src/common/units/equipment/modules/Special_modules.txt +++ b/src/common/units/equipment/modules/Special_modules.txt @@ -13,7 +13,7 @@ equipment_modules = { surface_visibility = 0.5 hg_attack = 6 max_strength = 28 - build_cost_ic = 430 + build_cost_ic = 330 } multiply_stats = { build_cost_ic = 0.015 @@ -43,7 +43,7 @@ equipment_modules = { surface_visibility = 0.8 hg_attack = 11.5 max_strength = 45 - build_cost_ic = 800 + build_cost_ic = 650 reliability = -0.05 naval_heavy_gun_hit_chance_factor = -0.01 } diff --git a/src/common/units/equipment/ship_hull_carrier.txt b/src/common/units/equipment/ship_hull_carrier.txt index 88931d2..a2d16a5 100755 --- a/src/common/units/equipment/ship_hull_carrier.txt +++ b/src/common/units/equipment/ship_hull_carrier.txt @@ -60,7 +60,7 @@ equipments = { } fixed_ship_carrier_miscellaneous_slot_2 = { required = no - allowed_module_categories = { carrier_miscellaneous carrier_island } + allowed_module_categories = { carrier_miscellaneous carrier_island carrier_civilian_material } } fixed_ship_flight_deck_slot = { required = yes @@ -82,10 +82,6 @@ equipments = { category = ship_radar count < 2 } - module_count_limit = { - module = carrier_civilian_material - count < 2 - } module_count_limit = { category = carrier_island count < 2 @@ -134,8 +130,7 @@ equipments = { build_cost_ic = 1600 resources = { - steel = 2 - chromium = 1 + steel = 1 } manpower = 3000 @@ -180,14 +175,14 @@ equipments = { } naval_range = 3000 - max_strength = 80 + max_strength = 60 reliability = 0.65 naval_speed = 20 surface_visibility = 22 build_cost_ic = 1200 resources = { - steel = 2 + steel = 1 } manpower = 1300 } @@ -265,8 +260,7 @@ equipments = { build_cost_ic = 2800 resources = { - steel = 3 - chromium = 1 + steel = 1 } manpower = 3500 } @@ -417,6 +411,7 @@ equipments = { reliability = 0.75 max_strength = 125 naval_speed = 28 + surface_visibility = 25 module_count_limit = { category = carrier_angled_deck @@ -426,8 +421,7 @@ equipments = { build_cost_ic = 2200 resources = { - steel = 3 - chromium = 1 + steel = 2 } manpower = 3100 } @@ -454,7 +448,7 @@ equipments = { fixed_ship_carrier_miscellaneous_slot_1 = inherit fixed_ship_carrier_miscellaneous_slot_2 = { required = no - allowed_module_categories = { carrier_miscellaneous carrier_island coldwar_upgrade_cv } + allowed_module_categories = { carrier_miscellaneous carrier_island coldwar_upgrade_cv carrier_civilian_material } } fixed_ship_flight_deck_slot = inherit fixed_ship_role_slot = inherit @@ -522,6 +516,7 @@ equipments = { reliability = 0.8 max_strength = 140 naval_speed = 28 + surface_visibility = 27 module_count_limit = { category = carrier_angled_deck @@ -530,8 +525,7 @@ equipments = { build_cost_ic = 2600 resources = { - steel = 3 - chromium = 2 + steel = 2 } manpower = 3500 } @@ -560,13 +554,13 @@ 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_island } + } fixed_ship_carrier_miscellaneous_slot_2 = { required = no - allowed_module_categories = { carrier_miscellaneous carrier_island } + allowed_module_categories = { carrier_miscellaneous carrier_civilian_material } } fixed_ship_flight_deck_slot = inherit fixed_ship_role_slot = { @@ -581,6 +575,7 @@ equipments = { fixed_ship_anti_air_slot = empty fixed_ship_radar_slot = empty fixed_ship_engine_slot = carrier_ship_engine_1 + fixed_ship_role_slot = ship_hull_carrier_role_cve } naval_range = 3000 @@ -624,9 +619,13 @@ equipments = { allowed_module_categories = { civilian_ship_engine } } fixed_ship_flight_deck_slot = inherit + fixed_ship_carrier_miscellaneous_slot_1 = { + required = no + allowed_module_categories = { carrier_island } + } fixed_ship_carrier_miscellaneous_slot_2 = { required = yes - allowed_module_categories = { carrier_miscellaneous } + allowed_module_categories = { carrier_civilian_material } } fixed_ship_role_slot = { required = yes @@ -639,7 +638,7 @@ equipments = { fixed_ship_anti_air_slot = empty fixed_ship_radar_slot = empty fixed_ship_engine_slot = civilian_ship_engine_1 - fixed_ship_carrier_miscellaneous_slot_2 = carrier_civilian_material + fixed_ship_role_slot = ship_hull_carrier_role_cve } naval_range = 2000 @@ -659,10 +658,6 @@ equipments = { module = carrier_secondary_island count < 1 } - module_count_limit = { - module = carrier_civilian_material - count > 0 - } } vnr_ship_hull_super_carrier = { @@ -767,8 +762,7 @@ equipments = { build_cost_ic = 3000 resources = { - steel = 4 - chromium = 2 + steel = 2 } manpower = 5000 } @@ -870,8 +864,7 @@ equipments = { build_cost_ic = 6500 resources = { - steel = 4 - chromium = 2 + steel = 2 } manpower = 6500 } diff --git a/src/common/units/equipment/ship_hull_civilian.txt b/src/common/units/equipment/ship_hull_civilian.txt index 5ff749e..95d5ae3 100755 --- a/src/common/units/equipment/ship_hull_civilian.txt +++ b/src/common/units/equipment/ship_hull_civilian.txt @@ -165,7 +165,7 @@ equipments = { build_cost_ic = 1000 manpower = 600 resources = { - steel = 2 + steel = 1 } } @@ -198,7 +198,7 @@ equipments = { manpower = 800 naval_range = 10000 resources = { - steel = 2 + steel = 1 } } } \ No newline at end of file diff --git a/src/common/units/equipment/ship_hull_cruiser.txt b/src/common/units/equipment/ship_hull_cruiser.txt index c8eb3a3..c992601 100755 --- a/src/common/units/equipment/ship_hull_cruiser.txt +++ b/src/common/units/equipment/ship_hull_cruiser.txt @@ -66,7 +66,7 @@ equipments = { } fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous ap_shell } } fixed_ship_extra_electronics_slot = { required = no @@ -205,6 +205,14 @@ equipments = { module = coldwar_upgrade_bb count < 1 } + module_count_limit = { + module = ship_anti_air_circle + count < 2 + } + module_count_limit = { + category = ap_shell + count < 2 + } default_modules = { fixed_ship_battery_slot = empty @@ -247,7 +255,7 @@ equipments = { build_cost_ic = 1400 resources = { - steel = 2 + steel = 1 } manpower = 800 @@ -278,7 +286,7 @@ equipments = { max_strength = 45 naval_speed = 20 reliability = 0.80 - surface_visibility = 20 + surface_visibility = 28 naval_range = 1500 module_slots = { fixed_ship_battery_slot = { @@ -448,7 +456,7 @@ equipments = { manpower = 1000 build_cost_ic = 3500 naval_speed = 26 - surface_visibility = 22 + surface_visibility = 26 naval_range = 5000 max_strength = 140 reliability = 0.7 @@ -474,7 +482,7 @@ equipments = { fixed_ship_airplane_launcher_slot = inherit fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous ap_shell } } fixed_ship_role_slot = { required = yes @@ -639,7 +647,7 @@ equipments = { } fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous ap_shell } } fixed_ship_extra_electronics_slot = { required = no @@ -730,6 +738,7 @@ equipments = { } surface_detection = 15 + surface_visibility = 27 sub_detection = 1 naval_speed = 28 reliability = 0.65 @@ -758,6 +767,7 @@ equipments = { naval_speed = 31 build_cost_ic = 1800 manpower = 1000 + surface_visibility = 26 default_modules = { fixed_ship_engine_slot = cruiser_ship_engine_2 } @@ -775,11 +785,12 @@ equipments = { manpower = 1200 naval_speed = 32 reliability = 0.8 + surface_visibility = 25 build_cost_ic = 2100 naval_range = 3000 max_strength = 75 resources = { - steel = 3 + steel = 1 } module_slots = inherit @@ -800,11 +811,12 @@ equipments = { naval_speed = 32 build_cost_ic = 2300 reliability = 0.85 + surface_visibility = 23 max_strength = 85 naval_range = 4000 manpower = 1400 resources = { - steel = 4 + steel = 2 } module_slots = inherit @@ -826,11 +838,11 @@ equipments = { reliability = 0.9 manpower = 1600 build_cost_ic = 2500 + surface_visibility = 21 naval_range = 4500 max_strength = 90 resources = { - steel = 4 - chromium = 1 + steel = 2 } module_slots = { fixed_ship_battery_slot = inherit @@ -943,11 +955,11 @@ equipments = { reliability = 0.95 manpower = 1800 build_cost_ic = 3000 + surface_visibility = 20 naval_range = 5000 max_strength = 100 resources = { - steel = 4 - chromium = 1 + steel = 2 } module_slots = { fixed_ship_battery_slot = { @@ -1188,7 +1200,7 @@ equipments = { armor_value = 0 sub_detection = 1 - surface_visibility = 15 + surface_visibility = 26 naval_speed = 30 reliability = 0.6 @@ -1204,7 +1216,7 @@ equipments = { build_cost_ic = 1700 resources = { #oil = 2 - steel = 3 + steel = 1 } manpower = 800 diff --git a/src/common/units/equipment/ship_hull_heavy.txt b/src/common/units/equipment/ship_hull_heavy.txt index 04cdeb9..ddcd984 100755 --- a/src/common/units/equipment/ship_hull_heavy.txt +++ b/src/common/units/equipment/ship_hull_heavy.txt @@ -55,7 +55,7 @@ equipments = { } fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous ap_shell } } fixed_ship_armor_scheme_slot = { required = yes @@ -149,6 +149,14 @@ equipments = { module = structural_aluminum count < 2 } + module_count_limit = { + module = ship_anti_air_circle + count < 2 + } + module_count_limit = { + category = ap_shell + count < 2 + } default_modules = { fixed_ship_battery_slot = empty @@ -193,8 +201,7 @@ equipments = { build_cost_ic = 3300 resources = { - steel = 3 - chromium = 1 + steel = 2 } manpower = 2000 @@ -249,7 +256,7 @@ equipments = { } fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous ap_shell } } fixed_ship_armor_scheme_slot = { required = yes @@ -298,9 +305,9 @@ equipments = { fuel_consumption = 67 reliability = 0.5 build_cost_ic = 2000 + surface_visibility = 45 resources = { steel = 2 - chromium = 1 } manpower = 1500 @@ -350,7 +357,7 @@ equipments = { } fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous ap_shell } } fixed_ship_armor_scheme_slot = { required = yes @@ -475,7 +482,7 @@ equipments = { reliability = 0.75 naval_speed = 27.5 fuel_consumption = 67 - surface_visibility = 36 + surface_visibility = 37 build_cost_ic = 2300 manpower = 2200 } @@ -500,10 +507,10 @@ equipments = { naval_range = 3500 max_strength = 210 - reliability = 0.85 + reliability = 0.8 fuel_consumption = 67 naval_speed = 32 - surface_visibility = 34 + surface_visibility = 36 build_cost_ic = 2500 manpower = 2500 @@ -530,13 +537,12 @@ equipments = { naval_range = 4000 naval_speed = 31 max_strength = 240 - reliability = 0.9 + reliability = 0.85 fuel_consumption = 67 - surface_visibility = 32 + surface_visibility = 35 build_cost_ic = 2800 resources = { - steel = 4 - chromium = 1 + steel = 3 } manpower = 2800 @@ -575,7 +581,7 @@ equipments = { fixed_ship_airplane_launcher_slot = inherit fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous coldwar_upgrade_bb } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous coldwar_upgrade_bb ap_shell } } fixed_ship_armor_scheme_slot = inherit fixed_ship_torpedo_defense_system_slot = inherit @@ -645,12 +651,11 @@ equipments = { max_strength = 265 naval_speed = 30.5 fuel_consumption = 67 - surface_visibility = 30 - reliability = 0.95 + surface_visibility = 34 + reliability = 0.9 build_cost_ic = 3100 resources = { - steel = 5 - chromium = 1 + steel = 3 } manpower = 3800 @@ -701,7 +706,7 @@ equipments = { } fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous ap_shell } } fixed_ship_armor_scheme_slot = { required = yes @@ -774,15 +779,14 @@ equipments = { rear_1_custom_slot = empty } naval_range = 4500 - naval_speed = 26.5 + naval_speed = 27 max_strength = 265 fuel_consumption = 75 reliability = 0.9 surface_visibility = 46 build_cost_ic = 3500 resources = { - steel = 5 - chromium = 1 + steel = 3 } manpower = 3500 } @@ -817,7 +821,7 @@ equipments = { } fixed_ship_extra_secondaries_slot = { required = no - allowed_module_categories = { heavy_miscellaneous generic_miscellaneous } + allowed_module_categories = { heavy_miscellaneous generic_miscellaneous ap_shell } } fixed_ship_extra_missile_slot = { required = no @@ -882,12 +886,11 @@ equipments = { max_strength = 225 naval_speed = 32 fuel_consumption = 70 - surface_visibility = 30 + surface_visibility = 33 reliability = 1.25 build_cost_ic = 3200 resources = { - steel = 4 - chromium = 2 + steel = 2 aluminium = 1 } diff --git a/src/common/units/equipment/ship_hull_light.txt b/src/common/units/equipment/ship_hull_light.txt index 38fd76a..401e1a1 100755 --- a/src/common/units/equipment/ship_hull_light.txt +++ b/src/common/units/equipment/ship_hull_light.txt @@ -197,7 +197,7 @@ equipments = { surface_detection = 20 sub_detection = 1 - surface_visibility = 10 + surface_visibility = 15 naval_speed = 32 reliability = 0.80 @@ -210,7 +210,7 @@ equipments = { build_cost_ic = 300 resources = { - steel = 2 + steel = 1 } manpower = 250 @@ -248,6 +248,7 @@ equipments = { archetype = ship_hull_light priority = 2000 + surface_visibility = 14 can_convert_from = { vnr_ship_hull_light_2 } #alias = destroyer_1 @@ -277,6 +278,7 @@ equipments = { reliability = 0.85 naval_range = 1800 max_strength = 55 + surface_visibility = 13 build_cost_ic = 400 resources = { steel = 2 @@ -299,11 +301,11 @@ equipments = { resources = { - steel = 3 + steel = 2 } surface_detection = 20 - surface_visibility = 10 + surface_visibility = 12 reliability = 0.90 naval_range = 2000 max_strength = 65 @@ -402,10 +404,10 @@ equipments = { reliability = 0.92 naval_range = 2500 max_strength = 75 + surface_visibility = 11 build_cost_ic = 650 resources = { - steel = 3 - chromium = 1 + steel = 2 } manpower = 500 naval_speed = 34 @@ -541,10 +543,10 @@ equipments = { reliability = 1.25 naval_range = 3000 max_strength = 100 + surface_visibility = 10 build_cost_ic = 800 resources = { - steel = 3 - chromium = 1 + steel = 2 } manpower = 600 naval_speed = 36.5 diff --git a/src/common/units/equipment/ship_hull_submarine.txt b/src/common/units/equipment/ship_hull_submarine.txt index 2a75ef1..f4cbaf5 100755 --- a/src/common/units/equipment/ship_hull_submarine.txt +++ b/src/common/units/equipment/ship_hull_submarine.txt @@ -198,7 +198,7 @@ equipments = { build_cost_ic = 150 resources = { #oil = 1 - steel = 2 + steel = 1 } } @@ -256,7 +256,7 @@ equipments = { build_cost_ic = 200 resources = { - steel = 2 + steel = 1 } } vnr_ship_hull_submarine_4 = { @@ -308,8 +308,7 @@ equipments = { build_cost_ic = 275 resources = { - steel = 3 - chromium = 1 + steel = 1 } } @@ -366,8 +365,7 @@ equipments = { build_cost_ic = 400 resources = { - steel = 3 - chromium = 1 + steel = 2 } } @@ -454,7 +452,7 @@ equipments = { build_cost_ic = 250 resources = { - steel = 2 + steel = 1 } } diff --git a/src/descriptor.mod b/src/descriptor.mod index 2c5e829..487e0b9 100755 --- a/src/descriptor.mod +++ b/src/descriptor.mod @@ -1,4 +1,4 @@ -version="v2.4 - Ironbottom Sound" +version="v2.5 - Santa Cruz" tags={ "Military" "Translation" diff --git a/src/documentation/Guide.md b/src/documentation/Guide.md index e62aacf..416bb7a 100755 --- a/src/documentation/Guide.md +++ b/src/documentation/Guide.md @@ -75,7 +75,9 @@ Unlike vanilla, the traditional definition of light or heavy cruiser has been re - Heavy capital cruiser is the same as heavy cruiser in basegame with a capital ship related role. - Heavy fleet cruiser is a screen ship version of heavy cruiser with medium guns and a screen ship related role. - Light cruiser is the same as its origin in basegame with light medium guns and a screen ship related role. + and it prompts to 3 types of cruiser guns: + - Heavy medium gun: for large cruiser exclusively, heavy attack oriented, firepower slightly inferior to WWI dreadnoughts - Medium gun: balanced between heavy and light attack, universal but not very effective to heavy ships (half penetration) - Light medium gun: light attack oriented, unable to pierce heavy armor, almost useless towards heavy ships (it can hit but only leave scratches) diff --git a/src/documentation/Modding_Tutorial.md b/src/documentation/Modding_Tutorial.md index e2f19d1..61e40d0 100755 --- a/src/documentation/Modding_Tutorial.md +++ b/src/documentation/Modding_Tutorial.md @@ -1,6 +1,6 @@ # Vanilla Navy Rework Modding Tutorial # -Hi there, this is MrPunk, in this file I will try to explain everything about VNR technically. +Hi there, this is MrPunk. In this file, I will try to explain everything about VNR technically. ## Topics ## @@ -15,7 +15,7 @@ Hi there, this is MrPunk, in this file I will try to explain everything about VN Common is where the fundamental materials of the game are stored, usually it includes technology, national focus, decisions and much more. -The files in this folder will be loaded at game starts (in the loading screen), so if the game never made it to the menu, more likely it's caused by bugs in Common. +The files in this folder will be loaded once you boot up HOI4 (in the loading screen), so if the game never made it to the menu, more likely it's caused by bugs in Common. **Structure** @@ -25,7 +25,7 @@ The files in this folder will be loaded at game starts (in the loading screen), - ai_strategy - AI production strategies are stored here. Using roles defined in ai_equipment, it directly tells AI what to produce, and assigning a value to it determines how willing AI is to produce such templates. Theoretically, any value over 0 will make AI execute the strategy, unless the number of AI's dockyards is too low to make that happen. + AI strategies are stored here. Production AI uses roles defined in ai_equipment, it directly tells AI what to produce, and assigning a value to it determines how willing AI is to produce such templates. Theoretically, any value over 0 will make AI execute the strategy, unless the number of AI's dockyards is too low to make that happen. Naval Management AI will decide where and how to concentrate its fleet in different scenarios of war. - decisions @@ -33,7 +33,23 @@ The files in this folder will be loaded at game starts (in the loading screen), - defines - Here you modify some static constants in the game mechanism. Since formulas are set in bottom-level codes, editing these values is the only way to scale the effects. + Here you modify some static constants in the game mechanism. Since formulas are hard-coded in bottom-level and can not be modded, editing these values is the only way to scale their effects. + +- dynamic_modifiers + + The dynamic modifiers are customized spirits with constantly changing effects, and it can be applied to not only countries but also states. + +- game_rules + + All starting rules available in country selection menu are stored here. + +- ideas + + These are national spirits. + +- modifiers + + Static modifiers applied by weather, time, and unit experience. - on_actions @@ -51,10 +67,26 @@ The files in this folder will be loaded at game starts (in the loading screen), Defines alternative text for behemoth events. (used by different countries) +- scripted_triggers + + Customized triggers that will be evaluated before firing a certain effect such as event or decision. + +- special_projects + + All special projects introduced by the mod. + - technologies Title says all +- terrain + + Specifically terrain modifiers, used by the mod to edit sea regions. + +- unit_leader + + Traits and abilities of admirals. + - units Defining units, equipments and modules. @@ -75,11 +107,15 @@ All the pictures, icons and 3D assets are put here. - army_icons - The ship insignia and their tooltips + The ship insignia and their tooltips. + +-entities + + 3D assets definitions (they are not models). - event_pictures - Nothing special + Pictures used by in-game events. - interface @@ -89,12 +125,19 @@ All the pictures, icons and 3D assets are put here. - equipmentdesigner - Icons of ship modules and topviews. - Definition of ship icon database. + It contains icons of ship modules, topviews, and definition of ship icon database. + + - ideas + + Icons of national spirits and officer corps. - navalcomabt Black silhouettes of ships shown on the ship list when you select a fleet. They are also used in naval combat UI. + + - special_project + + Icons of special projects. - technologies @@ -112,7 +155,7 @@ All files start with 00_vnr will be loaded as starting navy of that country. The ### Interface ### -This folder is in close relation to GFX, which it defines the name of GFX files, the UI lookings and which location the GFX should show up. +This folder is in close relation to GFX, which it defines the name of GFX files, the UI appearance, and which location the GFX should show up. **Structure** @@ -135,20 +178,20 @@ The texts of events, technologies, etc. ## Post-Loading ## -The most interesting feature of VNR is the post-loading mechanism. For so long, there are many navy mods out there, but they all have to change the files under history/countries, which tank/air/ship designs are defined. In instance of a large naval overhaul mod, you have to modify these files to make new modules and new hulls work. It's very common on mods such as NRM. +The most interesting feature of VNR is the post-loading mechanism. For so long, there have been many navy mods out there, but they without exception have to change files under history/countries, where tank/air/ship designs are defined (if you don't do that, vanilla variants still hold a place in the production menu, making it untidy for people with OCD). In instance of a large naval overhaul mod (e.g. adding/replacing slots on ship hulls, or creating new hulls), this method seems essential in making your variants appear as available at the begining. It's very common on mods such as NRM. Despite the most sraightforward approach, it will bring harms to compatibility and robustness throughout basegame updates. The country history files store more than starting variants, they also have leaders, historical events, political status, and national spirits. Overwriting such files is a complete disaster when it comes to compatibility. Even a minor fix on the country's starting stability will be incompatible, and depending on the loading order, it may break variants too. To counter it, the post-loading mechanism is created. It is not some fancy skill, but I want it recorded, so the late comers know how to do that. The basis of post-loading is achieved in following steps: -1. Put all vanilla ship hulls to a hidden and disallowed techs. This blocks any variants using these hulls from appearing and won't cause any crash/error, because variants using blocked tech will be unlocked after the tech is researched. But in this case, it will never be researched. Then simply replacing them with hulls of different IDs, and these hulls become totally independent from literally everything from basegame or other mods. +1. Put all vanilla ship hulls to a hidden and disallowed tech. This blocks any variants using these hulls from appearing and won't cause any crash/error, because variants using blocked tech will be unlocked after the tech is researched. But in this case, it will never be researched. Then simply replacing them with hulls of different IDs, and these hulls become totally independent from literally everything from basegame or other mods. -2. Overwrite all vanilla OOBs with empty files. OOB, or Order of Battle, is the definition of starting military forces in history/units. Unlike country history files, unit files are less sensitive since they only take effects when loaded in your script. Combining step 1 and step 2 will give a clean state on game start, no country has naval variant or fleet. Then you may load your own version. +2. Overwrite all vanilla OOBs with empty files. OOB, or Order of Battle, is the definition of starting military forces in history/units. Unlike country history files, unit files are less sensitive since they only take effect when loaded in your script. Combining step 1 and step 2 will give you a clean state on game start, no country has naval variant or fleet. Then you got to paint your stuff on a blank sheet. 2.1. An alternative way to clear starting fleets will be the effect "destroy_ships". If you find overwriting all OOBs is too complicated, you can also create a scripted effect which iterates every starting country and deletes its navy. -3. Loading customized units and designs is the last step. It is achieved through hidden events. Some people say game is an art of interaction, and here is how I load everything without you even noticing it. By completing step 2, no country has navy upon game start, but as you may notice, there is an intro panel. The intro panel draws your attention, and your first reaction is to click continue. A trigger is set there, when it is clicked, it will fire a loading event which gives every country variants and fleets (If you choose step 2.1, this is where you can use it). Its effects are modified to have no popup, and done in an instant. Then you get everything set. +3. Loading customized designs and units is the last step, which is achieved through hidden events. Some people say game is an art of interaction, and here is how I load everything without you even noticing it. By completing step 2, no country has navy upon game start, but as you may notice, there is an intro panel. The intro panel draws your attention, and your first reaction is to click continue. A trigger is set there, when it is clicked, it will fire a loading event which gives every country variants and fleets (If you choose step 2.1, this is where you can use it). Its effects are modified to have no popup, and done in an instant. Then you get everything set. Reference files: @@ -160,9 +203,9 @@ Reference files: 1. **Multiple customized ship icons for one hull** - NSB and BBA have introduced a new style of designer to the game, which you can choose the sprite for your tank/airplane from numerous icon presets. But ship designer still adopts the tradition from MTG that only equipment icons are available. Fortunately, this new feature is actually supported, just not applied. + NSB and BBA have introduced a new style of designer to the game, which you can choose the sprite for your tank/airplane from numerous icon presets. But ship designer still adopts the tradition from MTG that only equipment/tech icons are available, rendering your choices quite limited. Fortunately, this new feature is actually supported, just not applied. - This is achieved through graphic_db which is the database for icons in equipment designer. It seems that, even though ship designer owns a standalone UI, the way of accessing database is common among all designers. To do it, create a file for ship icons in gfx/interface/equipmentdesigner/graphic_db, then try to assign a pool of icons to each hull and each tag. For details, you can refer to tank and air icon files in the same location, which share the same style and grammar. + This is achieved through graphic_db which is the database for icons in equipment designer. It seems that, even though ship designer owns a standalone UI, the way of accessing database is common among all designers. To do it, create a file for ship icons in gfx/interface/equipmentdesigner/graphic_db, then try to assign a pool of icons to each hull and each tag. For details, you can refer to tank and air icon files in the same location, which share the same style of coding. As for unique icons for starting variants, that is actually a workaround. You can add a line "icon = xxx.dds" in the variant definition. diff --git a/src/events/00_navy_rework.txt b/src/events/00_navy_rework.txt index 1ff3431..21c02c3 100755 --- a/src/events/00_navy_rework.txt +++ b/src/events/00_navy_rework.txt @@ -46,8 +46,17 @@ country_event = { load_oob = 00_DEN_vnr_naval } ENG = { - ENG_start_naval_variants = yes - load_oob = 00_ENG_vnr_naval + if = { + limit = { + allow_to_use_expert_navy = yes + } + ENG_expert_AI_variants = yes + load_oob = 03_ENG_vnr_expert + } + else = { + ENG_start_naval_variants = yes + load_oob = 00_ENG_vnr_naval + } if = { limit = { has_dlc = "By Blood Alone" } load_oob = 01_ENG_vnr_air_bba @@ -88,8 +97,17 @@ country_event = { load_oob = 00_ITA_vnr_naval } JAP = { - JAP_start_naval_variants = yes - load_oob = 00_JAP_vnr_naval + if = { + limit = { + allow_to_use_expert_navy = yes + } + JAP_expert_AI_variants = yes + load_oob = 03_JAP_vnr_expert + } + else = { + JAP_start_naval_variants = yes + load_oob = 00_JAP_vnr_naval + } if = { limit = { has_dlc = "By Blood Alone" } load_oob = 01_JAP_vnr_air_bba @@ -127,8 +145,17 @@ country_event = { load_oob = 00_TUR_vnr_naval } USA = { - USA_start_naval_variants = yes - load_oob = 00_USA_vnr_naval + if = { + limit = { + allow_to_use_expert_navy = yes + } + USA_expert_AI_variants = yes + load_oob = 03_USA_vnr_expert + } + else = { + USA_start_naval_variants = yes + load_oob = 00_USA_vnr_naval + } if = { limit = { has_dlc = "By Blood Alone" } load_oob = 01_USA_vnr_air_bba diff --git a/src/events/ai_ships.txt b/src/events/ai_ships.txt index e37eb47..6f73d82 100755 --- a/src/events/ai_ships.txt +++ b/src/events/ai_ships.txt @@ -327,6 +327,7 @@ country_event = { limit = { is_ai = yes } + complete_special_project = sp:sp_air_radar set_technology = { improved_ship_hull_heavy = 1 improved_ship_hull_light = 1 @@ -335,8 +336,7 @@ country_event = { antiair2 = 1 antiair3 = 1 improved_fire_control_system = 1 - decimetric_radar = 1 - improved_decimetric_radar = 1 + cavity_magnatron = 1 basic_dp_light_battery = 1 improved_heavy_battery = 1 improved_super_heavy_battery = 1 @@ -364,11 +364,15 @@ country_event = { basic_light_shell = 1 basic_medium_shell = 1 basic_heavy_shell = 1 + magnetic_detonator = 1 + oxygen_torpedo = 1 damage_control_1 = 1 fire_control_methods_1 = 1 basic_ballast_tank = 1 improved_ballast_tank = 1 + dive_bomber_study = 1 + carrier_radio_range = 1 } ai_get_navy_experience = yes ai_get_mio_upgrade = yes @@ -437,7 +441,7 @@ country_event = { antiair4 = 1 antiair5 = 1 advanced_fire_control_system = 1 - centimetric_radar = 1 + monopulse_radar = 1 advanced_dp_light_battery = 1 advanced_heavy_battery = 1 advanced_medium_battery = 1 @@ -456,6 +460,7 @@ country_event = { homogeneous_krupp_steel = 1 modern_ship_torpedo_launcher = 1 + proximity_detonator = 1 fire_control_methods_3 = 1 } @@ -607,6 +612,7 @@ country_event = { iff_device = 1 wire_guided_torpedo = 1 super_carriers = 1 + coldwar_ship_torpedo_launcher = 1 } ai_get_navy_experience = yes ai_get_mio_upgrade = yes @@ -760,7 +766,7 @@ country_event = { has_global_flag = { flag = naval_tech_1940 value > 0 - days > 545 + days > 900 } has_global_flag = naval_tech_1943 } @@ -776,6 +782,8 @@ country_event = { is_ai = yes } set_technology = { + centimetric_radar = 1 + phased_array = 1 folding_wing = 1 carrier_mass_production = 1 carrier_damage_control = 1 @@ -785,6 +793,12 @@ country_event = { fire_control_methods_2 = 1 battleship_aa_upgrade = 1 escort_carriers_ship = 1 + + improved_light_shell = 1 + improved_medium_shell = 1 + improved_heavy_shell = 1 + improved_dp_light_battery = 1 + homing_torpedo = 1 } ai_get_navy_experience = yes ai_get_mio_upgrade = yes diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery.png index 2c307065ed9c6771cf4b1f00c13785c845035951..395913e5c73dfee6b2d266cefc26a51ba9fe1338 100755 GIT binary patch delta 4762 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 delta 3562 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 L_V^;p<1zmLqwVsc diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery.png index bfe61690f732ad9b54a2a9b7ae0352b41d208c11..bafec3a8a5f8b08c88390ea54c3b8d81964ec001 100755 GIT binary patch literal 6473 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 IM6N<$g8e(yA^-pY literal 0 HcmV?d00001 diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sub_snorkel_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sub_snorkel_1.png new file mode 100755 index 0000000000000000000000000000000000000000..ed0ded4f31d450fcb2ee3f07d497b28a3a7aa0f0 GIT binary patch literal 5159 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 delta 4424 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 O0000ifRG-}_y{TFd_*UpwUg>k0f- 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 diff --git a/src/gfx/interface/technologies/navy_techtree/advanced_medium_heavy_battery.png b/src/gfx/interface/technologies/navy_techtree/advanced_medium_heavy_battery.png deleted file mode 100755 index d79e7003fc70b26b435964ed637aa408642f4700..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3637 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 diff --git a/src/gfx/interface/technologies/navy_techtree/basic_submarine_snorkel.png b/src/gfx/interface/technologies/navy_techtree/basic_submarine_snorkel.png new file mode 100755 index 0000000000000000000000000000000000000000..6adbac8b500c8fe12ad4edc90b90dbd4af445ef6 GIT binary patch literal 4638 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/navy_techtree/carrier_radio_range.png b/src/gfx/interface/technologies/navy_techtree/carrier_radio_range.png new file mode 100755 index 0000000000000000000000000000000000000000..73962ff1fa677ac2ae9b0ae2ac3f118f135074ba GIT binary patch literal 6791 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/navy_techtree/gas_turbine.png b/src/gfx/interface/technologies/navy_techtree/gas_turbine.png deleted file mode 100755 index 18b1de2bcb7c0875e47f23f633ec091659f69147..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6106 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 UaZU1b|H66zOhy@6C2bV+KN>>k;Q#;t diff --git a/src/gfx/interface/technologies/navy_techtree/improved_medium_heavy_battery.png b/src/gfx/interface/technologies/navy_techtree/improved_medium_heavy_battery.png deleted file mode 100755 index fb3296e0d953b8c27191675d03ea3e102b4fba68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3214 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 AjQ{`u diff --git a/src/gfx/interface/technologies/navy_techtree/improved_submarine_snorkel.png b/src/gfx/interface/technologies/navy_techtree/improved_submarine_snorkel.png new file mode 100755 index 0000000000000000000000000000000000000000..b1975bd960a8c54857d7a4d8d1be4531c86c5c20 GIT binary patch literal 4798 zcmV;v5<%^WP)TJ2dS`cM7K1G%C6(Um?yC3d`>Wsms}{~V{x3KAQZL}8ZvRh! zmwEv&b^Ct;ywnSLshfAHAA}G;&2?ORD-~19K@Qf0?0eJAylkUE|mR@`U zRNyaV94-gG`dtV?t__2%K*{lgsyU_Q5eO+KpP_(;RO)d1@Xh!5vx^6cerF&aJ9gYT z*9SV3VxR#tQxA6v3D^YzD)5un$yR~5TyQ0YV56V%{P|71?KnV8D*ExaK+W@m#c5vtOmO z3<3~GU;8$9;<0b+7|)At1uiE7N(u^NIlJC3)w`TTDaImjF?%_{>O6O~<^oB5g{0RZ z9rQYsI%4<$Xdk?8SL@xC65Q@;uaHog6a`})jnL=kUU3j8QT3A?>l{)_+;BWXB87x8 zA4ovX@7rH~IkjExtbCTz5n*2YY~L_Rb9d|C)o8Z2|I^?vX9_1qjm9Y{XhuFtDx?%hAy8YN zDFC!CoX#?YQ%FyNHI)Zw84{uOQ}qNdp#Ud=U&=L}o?2*2XOJPJDhVSm+8c@RWNZHt zs1es`#smN$+8zF@_XL4UYQjm-+kwC3$ewK}cXFlc0?$J#h1^O23CM6}-j{KgAZj9g z>3Y3x%*5^keDB${UE$evFjU=dKjzA;f9ulTYWDO~+|u5b064P|J7GtgT3G>Ujlo)r zH5TCnvgCk@01jYZyS`IMz%E4qE*}f*qRKP^RZX4jk3YY{HUW{0JFDdVHJrO0r2?c$ ztBla-#fSGrJ6!{C6&!H6koeN_UQQUYe&yJBjD2`L(cRN8tPy7#wh~G@Q{YDpoOK{Q zq!g2xAP3OgrCR^-9HEIX#tQOci!enLF??@h*nP@KE&*b|{rcTExureLNl{T@trq&N zdEX@+low!%#3cPe%#;%R@*}5q3JJIhGq^<*D#yh+taU>#&yKEkcm+n+;X6H`^_F|? zd)+U+<9GgyGTjvp!E%0mFug`85WXJt1QvvFNaa~w=z=LF_{7PdQa+&iAVn3&55IEd zjW>+%E6$Np!I-5zpy7Gm(oAdaW?+Ugvm*d8KU150r35@7WnhgFQdshIK-g@HbmP3u zCfNVkHSLVieDo(pfQ#hcIfQ_2oN;EYw@qLqw#^<<>VR-q4a)lYIZ2PtZ3zpEHQiHnF( z<@UWiOPx--t5aZUL|c|60covM@#Y$hMjf5yB;5@Y$8pBEKES^{dKTR7N(8$$gVW6p zx!|U2=F!GdXgdb4)Ru9KMIZqDy?Yi8hk+jsL5`Av+FaxVppB7v(xcsKqKlNYyJmDz z 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/navy_techtree/night_air_strike.png b/src/gfx/interface/technologies/navy_techtree/night_air_strike.png deleted file mode 100755 index d34125dad6b6eed42406f8d2834fa940784409e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6274 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 diff --git a/src/gfx/interface/vnr_main_menu_bg.dds b/src/gfx/interface/vnr_main_menu_bg.dds index c798fb511830a4b82063197c6cdac9d02f6b8fa9..6b37c3dc35dce2548cb1f917fe4b4d9e5b8e46a8 100755 GIT binary patch delta 26429 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 delta 26781 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 J!UITY{{yrgsJs9G diff --git a/src/history/units/00_ENG_vnr_naval.txt b/src/history/units/00_ENG_vnr_naval.txt index 1fef9b7..348b7b2 100755 --- a/src/history/units/00_ENG_vnr_naval.txt +++ b/src/history/units/00_ENG_vnr_naval.txt @@ -1991,7 +1991,7 @@ } } ship = { - name = "HMS 彗星" # HMS Stuart + name = "HMS 斯图亚特" # HMS Stuart definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2003,7 +2003,7 @@ } } ship = { - name = "HMS 十字军" # HMS Comet + name = "HMS 彗星" # HMS Comet definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2015,7 +2015,7 @@ } } ship = { - name = "HMS 小天鹅" # HMS Crusader + name = "HMS 十字军" # HMS Crusader definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2027,7 +2027,7 @@ } } ship = { - name = "HMS 新月" # HMS Cygnet + name = "HMS 小天鹅" # HMS Cygnet definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2039,7 +2039,7 @@ } } ship = { - name = "HMS 沃克" # HMS Crescent + name = "HMS 新月" # HMS Crescent definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2051,7 +2051,7 @@ } } ship = { - name = "HMS 维米" # HMS Walker + name = "HMS 沃克" # HMS Walker definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2063,7 +2063,7 @@ } } ship = { - name = "HMS 布鲁斯" # HMS Vimy + name = "HMS 维米" # HMS Vimy definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2075,7 +2075,7 @@ } } ship = { - name = "HMS 马尔科姆" # HMS Bruce + name = "HMS 布鲁斯" # HMS Bruce definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2087,7 +2087,7 @@ } } ship = { - name = "HMS 老兵" # HMS Malcolm + name = "HMS 马尔科姆" # HMS Malcolm definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2099,7 +2099,7 @@ } } ship = { - name = "HMS 韦斯科特" # HMS Veteran + name = "HMS 老兵" # HMS Veteran definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2111,7 +2111,7 @@ } } ship = { - name = "HMS 鹪鹩" # HMS Westcott + name = "HMS 韦斯科特" # HMS Westcott definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2123,7 +2123,7 @@ } } ship = { - name = "HMS 埃克斯茅斯" # HMS Wren + name = "HMS 鹪鹩" # HMS Wren definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2135,7 +2135,7 @@ } } ship = { - name = "HMS 厄勒克特拉" # HMS Exmouth + name = "HMS 埃克斯茅斯" # HMS Exmouth definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2147,7 +2147,7 @@ } } ship = { - name = "HMS 日蚀" # HMS Electra + name = "HMS 厄勒克特拉" # HMS Electra definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2159,7 +2159,7 @@ } } ship = { - name = "HMS 埃斯克" # HMS Eclipse + name = "HMS 日蚀" # HMS Eclipse definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2171,7 +2171,7 @@ } } ship = { - name = "HMS 特快" # HMS Esk + name = "HMS 埃斯克" # HMS Esk definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2183,7 +2183,7 @@ } } ship = { - name = "HMS 遭遇" # HMS Express + name = "HMS 特快" # HMS Express definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2195,7 +2195,7 @@ } } ship = { - name = "HMS 冒险" # HMS Encounter + name = "HMS 遭遇" # HMS Encounter definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2207,7 +2207,7 @@ } } ship = { - name = "HMS 护卫" # HMS Escapade + name = "HMS 冒险" # HMS Escapade definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2219,7 +2219,7 @@ } } ship = { - name = "HMS 回响" # HMS Escort + name = "HMS 护卫" # HMS Escort definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2231,7 +2231,7 @@ } } ship = { - name = "HMS 邓肯" # HMS Echo + name = "HMS 回响" # HMS Echo definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2243,7 +2243,7 @@ } } ship = { - name = "HMS 诱饵" # HMS Duncan + name = "HMS 邓肯" # HMS Duncan definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2255,7 +2255,7 @@ } } ship = { - name = "HMS 卫士" # HMS Decoy + name = "HMS 诱饵" # HMS Decoy definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2267,7 +2267,7 @@ } } ship = { - name = "HMS 女公爵" # HMS Defender + name = "HMS 卫士" # HMS Defender definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2279,7 +2279,7 @@ } } ship = { - name = "HMS 喜悦" # HMS Duchess + name = "HMS 女公爵" # HMS Duchess definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2291,7 +2291,7 @@ } } ship = { - name = "HMS 纤巧" # HMS Delight + name = "HMS 喜悦" # HMS Delight definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2303,7 +2303,7 @@ } } ship = { - name = "HMS 大胆" # HMS Dainty + name = "HMS 纤巧" # HMS Dainty definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2315,7 +2315,7 @@ } } ship = { - name = "HMS 钻石" # HMS Daring + name = "HMS 大胆" # HMS Daring definition = destroyer start_experience_factor = 0.10 equipment = { @@ -2327,7 +2327,7 @@ } } ship = { - name = "HMS 戴安娜" # HMS Diamond + name = "HMS 钻石" # HMS Diamond definition = destroyer start_experience_factor = 0.10 equipment = { diff --git a/src/history/units/00_GER_vnr_naval.txt b/src/history/units/00_GER_vnr_naval.txt index ffaa5b7..2f82aa8 100755 --- a/src/history/units/00_GER_vnr_naval.txt +++ b/src/history/units/00_GER_vnr_naval.txt @@ -482,7 +482,6 @@ } } instant_effect = { - industrial_manufacturer = mio:GER_blohm_und_voss_organization add_equipment_production = { equipment = { type = vnr_ship_hull_heavy_3 diff --git a/src/history/units/03_ENG_vnr_expert.txt b/src/history/units/03_ENG_vnr_expert.txt new file mode 100755 index 0000000..90e0289 --- /dev/null +++ b/src/history/units/03_ENG_vnr_expert.txt @@ -0,0 +1,2999 @@ +units = { + fleet = { + name = "本土指挥部" # Home Command + naval_base = 11064 + task_force = { + name = "本土舰队" # Home Fleet + location = 11064 + ship = { + name = "HMS 暴怒" # HMS Furious + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = ENG + version_name = "皇家方舟级" # Ark Royal Class + } + } + } + ship = { + name = "HMS 纳尔逊" # HMS Nelson + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 罗德尼" # HMS Rodney + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 皇家橡树" # HMS Royal Oak + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 君权" # HMS Royal Sovereign + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 拉米利斯" # HMS Ramillies + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 胡德" # HMS Hood + pride_of_the_fleet = yes + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 反击" # HMS Repulse + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 声望" # HMS Renown + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 诺福克" # HMS Norfolk + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 加尔各答" # HMS Calcutta + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 翡翠" # HMS Emerald + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 进取" # HMS Enterprise + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 军刀" # HMS Sabre + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 猎人" # HMS Shikari + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 凯斯" # HMS Keith + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 威尼斯" # HMS Venetia + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 瓦妮莎" # HMS Vanessa + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 子爵" # HMS Viscount + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 威塞克斯" # HMS Wessex + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 黄昏" # HMS Vesper + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 活泼" # HMS Vivacious + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 清醒" # HMS Wakeful + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 温莎" # HMS Windsor + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 福克纳" # HMS Faulknor + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 猎狐犬" # HMS Foxhound + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 狂怒" # HMS Fury + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 无惧" # HMS Fearless + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 林地人" # HMS Forester + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 声誉" # HMS Fame + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 火龙" # HMS Firedrake + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 远见" # HMS Foresight + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 财富" # HMS Fortune + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "预备役舰队" # Reserve Fleet + location = 9458 + ship = { + name = "HMS 伊丽莎白女王" # HMS Queen Elizabeth + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 勇士" # HMS Valiant + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 弗罗比舍" # HMS Frobisher + definition = heavy_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 霍金斯" # HMS Hawkins + definition = heavy_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 卡莱尔" # HMS Carlisle + definition = light_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 杓鹬" # HMS Curlew + definition = light_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 历险" # HMS Adventure + definition = light_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 惠特谢德" # HMS Whitshed + definition = destroyer + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 野天鹅" # HMS Wild Swan + definition = destroyer + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 总督" # HMS Viceroy + definition = destroyer + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 凡尔登" # HMS Verdun + definition = destroyer + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 虚荣" # HMS Vanity + definition = destroyer + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "海峡舰队" # Channel Force + location = 9458 + ship = { + name = "HMS 勇敢" # HMS Courageous + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = ENG + version_name = "皇家方舟级" # Ark Royal Class + } + } + } + ship = { + name = "HMS 决心" # HMS Resolution + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 复仇" # HMS Revenge + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 刻瑞斯" # HMS Ceres + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 卡拉多克" # HMS Caradoc + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 开罗" # HMS Cairo + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 肯彭费尔特" # HMS Kempenfelt + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 阿卡斯塔" # HMS Acasta + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 羚羊" # HMS Antelope + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 热心" # HMS Ardent + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 阿刻戎" # HMS Acheron + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 阿盖特" # HMS Achates + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 安东尼" # HMS Anthony + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 箭头" # HMS Arrow + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 亚马逊" # HMS Amazon + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "亨伯支队" # Humber Force + location = 11297 + ship = { + name = "HMS 徘徊者" # HMS Wanderer + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 白厅" # HMS Whitehall + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 女巫" # HMS Witch + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 真实" # HMS Verity + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 志愿者" # HMS Volunteer + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 威瑟林顿" # HMS Witherington + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 人狼" # HMS Wolverine + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "北岸巡逻支队" # Northern Patrol + location = 11064 + ship = { + name = "HMS 迪奥米德" # HMS Diomede + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 龙" # HMS Dragon + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 艾芬汉" # HMS Effingham + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 加的夫" # HMS Cardiff + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 德里" # HMS Delhi + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 达尼丁" # HMS Dunedin + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + } + task_force = { + name = "罗塞斯护航分队" # Rosyth Escort Force + location = 6300 + ship = { + name = "HMS 华莱士" # HMS Wallace + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 勇气" # HMS Valorous + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 惠特利" # HMS Whitley + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "诺尔舰队" # Nore Fleet + location = 3501 + ship = { + name = "HMS 伦敦" # HMS London + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 库拉索" # HMS Curacoa + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 坎贝尔" # HMS Campbell + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 薇薇安" # HMS Vivien + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 伍斯特" # HMS Worcester + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 伍尔斯顿" # HMS Woolston + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 狼狗" # HMS Wolfhound + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 科德林顿" # HMS Codrington + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 巴西利斯克" # HMS Basilisk + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 比格犬" # HMS Beagle + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 玻瑞阿斯" # HMS Boreas + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 斗牛犬" # HMS Bulldog + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 布兰切" # HMS Blanche + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 布狄卡" # HMS Boadicea + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 无耻" # HMS Brazen + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 杰出" # HMS Brilliant + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "朴次茅斯舰队" # Portsmouth Fleet + location = 9458 + ship = { + name = "HMS 萨福克" # HMS Suffolk + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 鳐鱼" # HMS Skate + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 萨拉丁" # HMS Saladin + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 弯刀" # HMS Scimitar + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 缟玛瑙" # HMS Sardonyx + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 伏击" # HMS Ambuscade + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 温彻斯特" # HMS Winchester + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "西岸舰队" # Western Approaches Fleet + location = 540 + ship = { + name = "HMS 蒙特罗斯" # HMS Montrose + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 强健" # HMS Sturdy + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 瓦伦丁" # HMS Valentine + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 织女星" # HMS Vega + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 威斯敏斯特" # HMS Westminster + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 麦凯" # HMS Mackay + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 征服者" # HMS Vanquisher + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 瓦诺克" # HMS Vanoc + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 沃波尔" # HMS Walpole + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 温切尔西" # HMS Winchelsea + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 才华" # HMS Versatile + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 维米拉" # HMS Vimiera + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 旋风" # HMS Whirlwind + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 沃威克" # HMS Warwick + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "北大西洋舰队" # North Atlantic Fleet + location = 4135 + ship = { + name = "HMS 科伦坡" # HMS Colombo + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 开普敦" # HMS Capetown + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 斜颈鸟" # HMS Wryneck + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 卡普佩尔" # HMS Keppel + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 维德特" # HMS Vidette + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 沃蒂根" # HMS Vortigern + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 维罗克斯" # HMS Velox + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 看守" # HMS Watchman + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 道格拉斯" # HMS Douglas + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 积极" # HMS Active + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 威沙特" # HMS Wishart + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 摔跤手" # HMS Wrestler + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "第二潜艇舰队" # 2nd Submarine Flotilla + location = 11064 + ship = { + name = "HMS 奥克斯利" # HMS Oxley + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 剑鱼" # HMS Swordfish + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 鲟鱼" # HMS Sturgeon + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 海马" # HMS Seahorse + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 海星" # HMS Starfish + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H32" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS L26" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS L27" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS L53" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS L54" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS L56" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS L69" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS L71" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + } + task_force = { + name = "第五潜艇舰队" # 5th Submarine Flotilla + location = 9458 + ship = { + name = "HMS 奥伯龙" # HMS Oberon + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 泰晤士" # HMS Thames + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS L23" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H28" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H31" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H33" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H34" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H43" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H44" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H49" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS H50" + definition = submarine + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + } + } + fleet = { + name = "地中海指挥部" # Mediterranean Command + naval_base = 4076 + task_force = { + name = "地中海舰队" # Mediterranean Fleet + location = 4076 + ship = { + name = "HMS 光荣" # HMS Glorious + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = ENG + version_name = "皇家方舟级" # Ark Royal Class + } + } + } + ship = { + name = "HMS 厌战" # HMS Warspite + definition = battleship + start_experience_factor = 0.125 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 巴勒姆" # HMS Barham + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 马来亚" # HMS Malaya + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = ENG + version_name = "英王乔治五世级" # King George V Class + } + } + } + ship = { + name = "HMS 德文郡" # HMS Devonshire + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 什罗普郡" # HMS Shropshire + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 萨塞克斯" # HMS Sussex + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 林仙" # HMS Arethusa + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 加拉蒂亚" # HMS Galatea + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 考文垂" # HMS Coventry + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 沃尔西" # HMS Wolsey + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 要塞" # HMS Stronghold + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 斯图亚特" # HMS Stuart + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 彗星" # HMS Comet + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 十字军" # HMS Crusader + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 小天鹅" # HMS Cygnet + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 新月" # HMS Crescent + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 沃克" # HMS Walker + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 维米" # HMS Vimy + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 布鲁斯" # HMS Bruce + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 马尔科姆" # HMS Malcolm + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 老兵" # HMS Veteran + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 韦斯科特" # HMS Westcott + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 鹪鹩" # HMS Wren + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 埃克斯茅斯" # HMS Exmouth + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 厄勒克特拉" # HMS Electra + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 日蚀" # HMS Eclipse + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 埃斯克" # HMS Esk + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 特快" # HMS Express + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 遭遇" # HMS Encounter + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 冒险" # HMS Escapade + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 护卫" # HMS Escort + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 回响" # HMS Echo + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 邓肯" # HMS Duncan + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 诱饵" # HMS Decoy + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 卫士" # HMS Defender + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 女公爵" # HMS Duchess + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 喜悦" # HMS Delight + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 纤巧" # HMS Dainty + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 大胆" # HMS Daring + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 钻石" # HMS Diamond + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 戴安娜" # HMS Diana + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "第一潜艇舰队" # 1st Submarine Flotilla + location = 4076 + ship = { + name = "HMS 海狮" # HMS Sealion + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 鲨鱼" # HMS Shark + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 鲷鱼" # HMS Snapper + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 鲑鱼" # HMS Salmon + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 鼠海豚" # HMS Porpoise + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 奥特威" # HMS Otway + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 欧西里斯" # HMS Osiris + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 奥斯瓦尔德" # HMS Oswald + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + } + } + fleet = { + name = "美洲指挥部" # North and South Americas Command + naval_base = 2038 + task_force = { + name = "美洲与西印度群岛分队" # America and West Indies Fleet + location = 13010 + ship = { + name = "HMS 贝里克" # HMS Berwick + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 约克" # HMS York + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 猎户座" # HMS Orion + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + } + task_force = { + name = "南大西洋舰队" # South Atlantic Fleet + location = 2038 + ship = { + name = "HMS 海王星" # HMS Neptune + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 无畏" # HMS Dauntless + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 范西塔特" # HMS Vansittart + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 恶毒" # HMS Venomous + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 飞龙" # HMS Wivern + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "南美特遣舰队" # South America Squadron + location = 12960 + ship = { + name = "HMS 艾克塞特" # HMS Exeter + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 坎伯兰" # HMS Cumberland + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 阿贾克斯" # HMS Ajax + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + } + task_force = { + name = "第三潜艇舰队" # 3rd Submarine Flotilla + location = 2038 + ship = { + name = "HMS 塞文" # HMS Severn + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 克莱德" # HMS Clyde + definition = submarine + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + } + } + fleet = { + name = "远东指挥部" # Far East Command + naval_base = 12299 + task_force = { + name = "东印度舰队" # East Indies Fleet + location = 10201 + ship = { + name = "HMS 竞技神" # HMS Hermes + definition = carrier + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = ENG + version_name = "皇家方舟级" # Ark Royal Class + } + } + } + ship = { + name = "HMS 达娜厄" # HMS Danae + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 德班" # HMS Durban + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 派遣" # HMS Despatch + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + } + task_force = { + name = "中国舰队" # China Fleet + location = 10062 + ship = { + name = "HMS 鹰" # HMS Eagle + definition = carrier + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = ENG + version_name = "皇家方舟级" # Ark Royal Class + } + } + } + ship = { + name = "HMS 肯特" # HMS Kent + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 康沃尔" # HMS Cornwall + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 多塞特郡" # HMS Dorsetshire + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "约克级" # York Class + } + } + } + ship = { + name = "HMS 卡利登" # HMS Caledon + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 卡吕普索" # HMS Calypso + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 侦察" # HMS Scout + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 忒涅多斯" # HMS Tenedos + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 萨尼特" # HMS Thanet + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + ship = { + name = "HMS 色雷斯" # HMS Thracian + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = ENG + version_name = "E/F/G/H级" # E/F/G/H Class + } + } + } + } + task_force = { + name = "新西兰分队" # New Zealand Division + location = 13056 + ship = { + name = "HMS 阿喀琉斯" # HMS Achilles + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + ship = { + name = "HMS 利安德" # HMS Leander + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = ENG + version_name = "城级" # Town Class + } + } + } + } + task_force = { + name = "第四潜艇舰队" # 4th Submarine Flotilla + location = 12299 + ship = { + name = "HMS 奥林匹斯" # HMS Olympus + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 帕提亚" # HMS Parthian + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 普罗透斯" # HMS Proteus + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 摄政" # HMS Regent + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 流浪者" # HMS Rover + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 奥丁" # HMS Odin + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 俄耳甫斯" # HMS Orpheus + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 奥图斯" # HMS Otus + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 潘多拉" # HMS Pandora + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 珀耳修斯" # HMS Perseus + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 凤凰" # HMS Phoenix + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 彩虹" # HMS Rainbow + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + ship = { + name = "HMS 王太子" # HMS Regulus + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = ENG + version_name = "灰海豚级" # Grampus Class + } + } + } + } + } +} \ No newline at end of file diff --git a/src/history/units/03_JAP_vnr_expert.txt b/src/history/units/03_JAP_vnr_expert.txt new file mode 100755 index 0000000..ce33194 --- /dev/null +++ b/src/history/units/03_JAP_vnr_expert.txt @@ -0,0 +1,2563 @@ +units = { + fleet = { + name = "第一舰队" # Dai 1 Kantai + naval_base = 9998 + task_force = { + name = "第一舰队" # 1 Kantai + location = 9998 + ship = { + name = "长门" # Nagato + pride_of_the_fleet = yes + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "榛名" # Haruna + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "扶桑" # Fuso + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "山城" # Yamashiro + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "川内" # Sendai + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "神通" # Jintsu + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "长良" # Nagara + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + } + task_force = { + name = "第一水雷战队" # 1 Suirai Sentai + location = 9998 + ship = { + name = "阿武隈" # Abukuma + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "有明" # Ariake + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "夕暮" # Yugure + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "初春" # Hatsuharu + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "子日" # Nenohi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "若叶" # Wakaba + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "初霜" # Hatsushimo + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "睦月" # Mutsuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "如月" # Kisaragi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "弥生" # Yayoi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "卯月" # Uzuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + task_force = { + name = "第一潜水战队" # 1 Sensui Sentai + location = 9998 + ship = { + name = "伊-51" # I-51 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-152" # I-152 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-153" # I-153 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-154" # I-154 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-155" # I-155 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-156" # I-156 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-157" # I-157 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-158" # I-158 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-159" # I-159 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-60" # I-60 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-61" # I-61 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-162" # I-162 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-63" # I-63 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-164" # I-164 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-165" # I-165 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-166" # I-166 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-67" # I-67 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-168" # I-168 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-169" # I-169 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-70" # I-70 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-171" # I-171 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + } + task_force = { + name = "第一航空战队" # 1 Koku Sentai + location = 9998 + ship = { + name = "龙骧" # Ryujo + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = JAP + version_name = "苍龙级" # Soryu Class + } + } + } + ship = { + name = "凤翔" # Hosho + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = JAP + version_name = "苍龙级" # Soryu Class + } + } + } + ship = { + name = "朝风" # Asakaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "春风" # Harukaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "松风" # Matsukaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "旗风" # Hatakaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + task_force = { + name = "横须贺预备舰队" # Yokosuka Yobikantai + location = 9998 + ship = { + name = "陆奥" # Mutsu + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "高雄" # Takao + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "鸟海" # Choukai + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "摩耶" # Maya + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "爱宕" # Atago + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "五十铃" # Isuzu + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "木曾" # Kiso + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "汐风" # Shiokaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "夕风" # Yukaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "太刀风" # Tachikaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "帆风" # Hokaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "夕雾" # Yugiri + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "狭雾" # Sagiri + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + } + fleet = { + name = "第二舰队" # Dai 2 Kantai + naval_base = 9950 + task_force = { + name = "第二舰队" # 2 Kantai + location = 9950 + ship = { + name = "羽黑" # Haguro + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "那智" # Nachi + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "妙高" # Myoko + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "足柄" # Ashigara + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "青叶" # Aoba + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "衣笠" # Kinugasa + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "加贺" # Kaga + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = JAP + version_name = "苍龙级" # Soryu Class + } + } + } + } + task_force = { + name = "第二水雷战队" # 2 Suirai Sentai + location = 9950 + ship = { + name = "那珂" # Naka + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "晓" # Akatsuki + definition = destroyer + start_experience_factor = 0.13 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "响" # Hibiki + definition = destroyer + start_experience_factor = 0.13 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "雷" # Ikazuchi + definition = destroyer + start_experience_factor = 0.13 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "电" # Inazuma + definition = destroyer + start_experience_factor = 0.13 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "天雾" # Amagiri + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "朝雾" # Asagiri + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "浦波" # Uranami + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "凌波" # Ayanami + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "敷波" # Shikinami + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "吹雪" # Fubuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "东云" # Shinonome + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "矶波" # Isonami + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "朝凪" # Asanagi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "夕凪" # Yunagi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + task_force = { + name = "第二潜水战队" # 2 Sensui Sentai + location = 9950 + ship = { + name = "鬼怒" # Kinu + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "伊-1" # I-1 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-2" # I-2 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-3" # I-3 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-4" # I-4 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-5" # I-5 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-6" # I-6 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + } + task_force = { + name = "第三潜水战队" # 3 Sensui Sentai + location = 9950 + ship = { + name = "伊-121" # I-121 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-122" # I-122 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-123" # I-123 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "伊-124" # I-124 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + } + task_force = { + name = "佐世保预备役舰队" # Sasebo Yobikantai + location = 9950 + ship = { + name = "金刚" # Kongo + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "雾岛" # Kirishima + definition = battleship + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "赤城" # Akagi + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = JAP + version_name = "苍龙级" # Soryu Class + } + } + } + ship = { + name = "名取" # Natori + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "由良" # Yura + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "北上" # Kitakami + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "龙田" # Tatsuta + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "皋月" # Satsuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "水无月" # Minazuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "文月" # Fumizuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "长月" # Nagatsuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "菊月" # Kikuzuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "三日月" # Mikazuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "望月" # Mochizuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "夕月" # Yuzuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "桃" # Momo + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "樫" # Kashi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "桧" # Hinoki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "柳" # Yanagi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + } + fleet = { + name = "第三舰队" # Dai 3 Kantai + naval_base = 12068 + task_force = { + name = "第三舰队" # 3 Kantai + location = 12068 + ship = { + name = "出云" # Izumo + definition = heavy_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "球磨" # Kuma + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "淀" # Yodo + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "榧" # Kaya + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "梨" # Nashi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "竹" # Take + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "榆" # Nire + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "栗" # Kuri + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "柿" # Kaki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "栂" # Tsuga + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "苇" # Ashi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "菱" # Hishi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "堇" # Sumire + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "莲" # Hasu + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "蓬" # Yomogi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "蓼" # Tade + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "菊" # Kiku + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "葵" # Aoi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "萩" # Hagi + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "藤" # Fuji + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "薄" # Susuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "茑" # Tsuta + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "千鸟" # Chidori + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "真鹤" # Manazuru + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "友鹤" # Tomozuru + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "初雁" # Hatsukari + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "八重山" # Yaeyama + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "白鹰" # Shirataka + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "严岛" # Itsukushima + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + } + task_force = { + name = "第五水雷战队" # 5 Suirai Sentai + location = 12068 + ship = { + name = "夕张" # Yubari + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "吴竹" # Kuretake + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "若竹" # Wakatake + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "早苗" # Sanae + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "芙蓉" # Fuyo + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "刈萱" # Karukaya + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "夕颜" # Yugao + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "朝颜" # Asagao + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + task_force = { + name = "台南警备舰队" # Makou Keibi Sentai + location = 12068 + ship = { + name = "岛风" # Shimakaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "滩风" # Nadakaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "秋风" # Akikaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "羽风" # Hakaze + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + } + fleet = { + name = "海军预备舰队" # Kaigun Yobikantai + naval_base = 1092 + task_force = { + name = "吴市预备舰队" # Kure Yobikantai + location = 1092 + ship = { + name = "伊势" # Ise + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "日向" # Hyuga + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = JAP + version_name = "长门级" # Nagato Class + } + } + } + ship = { + name = "最上" # Mogami + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "三隈" # Mikuma + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "古鹰" # Furutaka + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "加古" # Kako + definition = heavy_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "大井" # Oi + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "天龙" # Tenryu + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "多摩" # Tama + definition = light_cruiser + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "白雪" # Shirayuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "初雪" # Hatsuyuki + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "丛云" # Murakumo + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "薄云" # Usugumo + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "白云" # Shirakumo + definition = destroyer + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "胧" # Oboro + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "曙" # Akebono + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "涟" # Sazanami + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "潮" # Ushio + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + task_force = { + name = "第四潜水战队" # 3 Sensui Kantai + location = 1092 + ship = { + name = "吕-26" # Ro-26 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-27" # Ro-27 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-28" # Ro-28 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-30" # Ro-30 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-31" # Ro-31 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-32" # Ro-32 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-33" # Ro-33 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-51" # Ro-51 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-53" # Ro-53 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-54" # Ro-54 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-55" # Ro-55 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-56" # Ro-56 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-57" # Ro-57 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-58" # Ro-58 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-59" # Ro-59 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-60" # Ro-60 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-61" # Ro-61 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-62" # Ro-62 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-63" # Ro-63 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-64" # Ro-64 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-65" # Ro-65 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-66" # Ro-66 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-67" # Ro-67 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + ship = { + name = "吕-68" # Ro-68 + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = JAP + version_name = "海大IV级" # Kaidai IV Class + } + } + } + } + task_force = { + name = "大凑警备舰队" # Ominato Keibi Sentai + location = 9859 + ship = { + name = "神风" # Kamikaze + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "野风" # Nokaze + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "波风" # Namikaze + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "沼风" # Numakaze + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + task_force = { + name = "防护巡洋舰分队" # Bogojunyokan Kantai + location = 4056 + ship = { + name = "磐手" # Iwate + definition = heavy_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "高雄级" # Takao Class + } + } + } + ship = { + name = "平户" # Hirado + definition = light_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + ship = { + name = "矢矧" # Yahagi + definition = light_cruiser + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = JAP + version_name = "最上级" # Mogami Class + } + } + } + } + } + fleet = { + name = "南方运输船团" # Nanpo Yuso Sendan + naval_base = 2489 + task_force = { + name = "南方运输船团" # Nanpo Yuso Sendan + location = 2489 + ship = { + name = "追风" # Oite + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "疾风" # Hayate + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "峰风" # Minekaze + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "泽风" # Sawakaze + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "冲风" # Okikaze + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + ship = { + name = "矢风" # Yakaze + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = JAP + version_name = "吹雪级" # Fubuki Class + } + } + } + } + } +} \ No newline at end of file diff --git a/src/history/units/03_USA_vnr_expert.txt b/src/history/units/03_USA_vnr_expert.txt new file mode 100755 index 0000000..d163b04 --- /dev/null +++ b/src/history/units/03_USA_vnr_expert.txt @@ -0,0 +1,2811 @@ +units = { + fleet = { + name = "战斗舰队" # Battle Force + naval_base = 1562 + task_force = { + name = "战列舰部队" # Battleships, Battle Force + location = 1562 + ship = { + name = "USS 内华达" # USS Nevada + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 亚利桑那" # USS Arizona + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 宾夕法尼亚" # USS Pennsylvania + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 俄克拉荷马" # USS Oklahoma + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 田纳西" # USS Tennessee + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 加利福尼亚" # USS California + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 新墨西哥" # USS New Mexico + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 密西西比" # USS Mississippi + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 爱达荷" # USS Idaho + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 科罗拉多" # USS Colorado + pride_of_the_fleet = yes + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 西弗吉尼亚" # USS West Virginia + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 马里兰" # USS Maryland + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + } + task_force = { + name = "航母分队" # Carrier Division, Battle Force + location = 1562 + ship = { + name = "USS 突击者" # USS Ranger + definition = carrier + start_experience_factor = 0.04 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = USA + version_name = "约克城级" # Yorktown Class + } + } + } + ship = { + name = "USS 列克星敦" # USS Lexington + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = USA + version_name = "约克城级" # Yorktown Class + } + } + } + ship = { + name = "USS 萨拉托加" # USS Saratoga + definition = carrier + start_experience_factor = 0.10 + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = USA + version_name = "约克城级" # Yorktown Class + } + } + } + } + task_force = { + name = "巡洋舰部队" # Cruisers, Battle Force + location = 9814 + ship = { + name = "USS 奥马哈" # USS Omaha + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 密尔沃基" # USS Milwaukee + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 辛辛那提" # USS Cincinnati + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 新奥尔良" # USS New Orleans + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 阿斯托里亚" # USS Astoria + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 明尼阿波利斯" # USS Minneapolis + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 印第安纳波利斯" # USS Indianapolis + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + } + task_force = { + name = "第三巡洋舰分队" # Cruiser Division 3 + location = 1562 + ship = { + name = "USS 特伦顿" # USS Trenton + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 康科德" # USS Concord + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 奥格拉拉" # USS Oglala + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + } + task_force = { + name = "第一驱逐舰中队" # Destroyer Flotilla 1 + location = 1562 + ship = { + name = "USS 罗利" # USS Raleigh + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 杜威" # USS Dewey + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 赫尔" # USS Hull + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 麦克多诺" # USS MacDonough + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 沃登" # USS Worden + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 法拉格特" # USS Farragut + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 戴尔" # USS Dale + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 莫纳根" # USS Monaghan + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 艾尔文" # USS Aylwin + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 哈特菲尔德" # USS Hatfield + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 布鲁克斯" # USS Brooks + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 福克斯" # USS Fox + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 凯恩" # USS Kane + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 拉斯伯恩" # USS Rathburne + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 塔尔博特" # USS Talbot + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 沃特斯" # USS Waters + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 登特" # USS Dent + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 麦克莱什" # USS MacLeish + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 麦科米克" # USS McCormick + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 斯图尔芬特" # USS Sturtevant + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 奥弗顿" # USS Overton + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 班布里奇" # USS Bainbridge + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 金" # USS King + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 桑德斯" # USS Sands + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 劳伦斯" # USS Lawrence + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 汉弗莱斯" # USS Humphreys + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + task_force = { + name = "第二驱逐舰中队" # Destroyer Flotilla 2 + location = 9814 + ship = { + name = "USS 底特律" # USS Detroit + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 赞恩" # USS Zane + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 瓦斯穆斯" # USS Wasmuth + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 特雷沃" # USS Trever + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 佩里" # USS Perry + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 钱德勒" # USS Chandler + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 索萨德" # USS Southard + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 霍维" # USS Hovey + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 朗" # USS Long + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 达拉斯" # USS Dallas + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 鲁本·詹姆斯" # USS Reuben James + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 戈夫" # USS Goff + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 巴里" # USS Barry + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 霍普金斯" # USS Hopkins + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 布鲁姆" # USS Broome + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 博里" # USS Borie + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 辛普森" # USS Simpson + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 特鲁克斯顿" # USS Truxtun + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + task_force = { + name = "第二十驱逐舰支队" # Destroyer Division 20 + location = 9671 + ship = { + name = "USS 布雷肯里奇" # USS Breckinridge + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 巴尼" # USS Barney + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 布莱克利" # USS Blakeley + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 比德尔" # USS Biddle + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + } + fleet = { + name = "侦察舰队" # Scouting Force + naval_base = 9814 + task_force = { + name = "侦察舰队" # Scouting Force + location = 9814 + ship = { + name = "USS 阿肯色" # USS Arkansas + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 纽约" # USS New York + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 德克萨斯" # USS Texas + definition = battleship + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_heavy_3 = { + amount = 1 + owner = USA + version_name = "科罗拉多级" # Colorado Class + } + } + } + ship = { + name = "USS 孟菲斯" # USS Memphis + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 北安普敦" # USS Northampton + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 休斯顿" # USS Houston + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 彭萨科拉" # USS Pensacola + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 盐湖城" # USS Salt Lake City + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 芝加哥" # USS Chicago + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 切斯特" # USS Chester + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 路易斯维尔" # USS Louisville + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 塔斯卡卢萨" # USS Tuscaloosa + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 旧金山" # USS San Francisco + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 波特兰" # USS Portland + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 迪凯特" # USS Decatur + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 巴杰" # USS Badger + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 雅各布·琼斯" # USS Jacob Jones + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 莱利" # USS Leary + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 申克" # USS Schenck + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 巴比特" # USS Babbitt + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 汉密尔顿" # USS Hamilton + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 罗帕" # USS Roper + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + } + fleet = { + name = "太平洋潜艇部队" # Submarine Base Force + naval_base = 1562 + task_force = { + name = "太平洋潜艇部队" # Submarine Base Force + location = 1562 + ship = { + name = "USS 里士满" # USS Richmond + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 利奇菲尔德" # USS Litchfield + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + task_force = { + name = "第四潜艇分队" # 4th Submarine Squadron + location = 4180 + ship = { + name = "USS 亚尔戈" # USS Argonaut + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-1" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-18" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-23" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-27" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-28" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-34" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-35" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-31" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-32" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-33" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + } + task_force = { + name = "第六潜艇分队" # 6th Submarine Squadron + location = 1562 + ship = { + name = "USS 梭鱼" # USS Barracuda + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 鲈鱼" # USS Bass + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 鲣鱼" # USS Bonita + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 独角鲸" # USS Narwhal + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 海豚" # USS Dolphin + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 鹦鹉螺" # USS Nautilus + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 抹香鲸" # USS Cachalot + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 墨鱼" # USS Cuttlefish + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 鼠海豚" # USS Porpoise + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 狗鱼" # USS Pike + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS 鲨鱼" # USS Shark + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + } + } + fleet = { + name = "太平洋舰队预备役舰队" # Pacific Reserve Fleet + naval_base = 1562 + task_force = { + name = "预备役航母" # Pacific Reserve Carriers + location = 1562 + ship = { + name = "USS 兰利" # USS Langley + definition = carrier + equipment = { + vnr_ship_hull_carrier_1 = { + amount = 1 + owner = USA + version_name = "约克城级" # Yorktown Class + } + } + } + } + task_force = { + name = "预备役驱逐舰" # Pacific Reserve Destroyers + location = 1562 + ship = { + name = "USS 巴拉德" # USS Ballard + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 赵" # USS Chew + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 克雷因" # USS Crane + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 克罗斯比" # USS Crosby + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 格林" # USS Greene + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 霍根" # USS Hogan + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 霍华德" # USS Howard + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 肯尼森" # USS Kennison + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 基尔蒂" # USS Kilty + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 帕尔默" # USS Palmer + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 雪莉" # USS Schley + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 斯坦斯布里" # USS Stansbury + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 索顿" # USS Thornton + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 瓦德" # USS Ward + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 多尔西" # USS Dorsey + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 艾略特" # USS Elliot + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 伯格斯" # USS Boggs + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + } + fleet = { + name = "大西洋舰队" # Atlantic Fleet + naval_base = 788 + task_force = { + name = "第十二驱逐舰支队" # Destroyer Squadron 12 + location = 3878 + ship = { + name = "USS 吉尔莫" # USS Gilmer + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 杜邦" # USS Du Pont + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 贝尔纳杜" # USS Bernadou + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 艾利斯" # USS Ellis + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 科尔" # USS Cole + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 塔贝尔" # USS Tarbell + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 厄普舍" # USS Upshur + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 格里尔" # USS Greer + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + task_force = { + name = "第二潜艇分队" # 2nd Submarine Squadron + location = 9832 + ship = { + name = "USS S-20" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-22" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-2" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-4" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-10" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-11" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-13" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-14" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-21" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-24" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-25" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-26" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-29" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-30" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + } + task_force = { + name = "预备役驱逐舰" # Atlantic Reserve Destroyers + location = 6845 + ship = { + name = "USS 艾伦" # USS Allen + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 科尔洪" # USS Colhoun + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 格里高利" # USS Gregory + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 利特尔" # USS Little + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 麦基恩" # USS McKean + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 斯特林汉" # USS Stringham + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 克莱门森" # USS Clemson + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 戈尔兹伯勒" # USS Goldsborough + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 麦克法兰" # USS McFarland + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 奥斯蒙德·英格拉姆" # USS Osmond Ingram + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 贝尔纳普" # USS Belknap + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 基里尔斯" # USS Gillis + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 赫尔伯特" # USS Hulbert + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 诺阿" # USS Noa + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 威廉·B·普雷斯顿" # USS William B Preston + definition = destroyer + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + task_force = { + name = "预备役潜艇" # Atlantic Reserve Submarines + location = 6845 + ship = { + name = "USS O-2" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS O-3" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS O-4" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS O-6" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS O-7" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS O-8" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS O-9" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS O-10" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-1" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-3" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-5" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-6" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-7" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-9" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-11" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-12" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-13" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-14" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-15" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-16" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-17" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-48" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS R-20" + definition = submarine + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + } + } + fleet = { + name = "特遣舰队" # Special Assignment Forces + naval_base = 7617 + task_force = { + name = "大西洋海军分遣舰队" # Naval Detachment Atlantic + location = 6732 + ship = { + name = "USS 迪克森" # USS Dickerson + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 赫伯特" # USS Herbert + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 达尔格伦" # USS Dahlgren + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + task_force = { + name = "运河区特遣舰队" # Special Service Squadron + location = 7617 + ship = { + name = "USS 塔特纳尔" # USS Tattnall + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS J·弗雷德·塔尔博特" # USS J Fred Talbott + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + task_force = { + name = "第三潜艇分队" # 3rd Submarine Squadron + location = 7617 + ship = { + name = "USS S-42" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-43" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-44" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-45" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-46" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-47" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + } + } + fleet = { + name = "亚洲舰队" # Asiatic Fleet + naval_base = 10265 + task_force = { + name = "亚洲舰队" # Asiatic Fleet + location = 10265 + ship = { + name = "USS 奥古斯塔" # USS Augusta + definition = heavy_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "威奇塔级" # Wichita Class + } + } + } + ship = { + name = "USS 马布尔黑德" # USS Marblehead + definition = light_cruiser + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_cruiser_3 = { + amount = 1 + owner = USA + version_name = "布鲁克林级" # Brooklyn Class + } + } + } + ship = { + name = "USS 保罗·琼斯" # USS Paul Jones + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 阿尔登" # USS Alden + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 贝克" # USS Barker + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 约翰·D·爱德华兹" # USS John D Edwards + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 惠普尔" # USS Whipple + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 埃德萨尔" # USS Edsall + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 帕罗特" # USS Parrott + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 布尔莫" # USS Bulmer + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 斯图亚特" # USS Stewart + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 波普" # USS Pope + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 皮里" # USS Peary + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 皮尔斯伯里" # USS Pillsbury + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + ship = { + name = "USS 约翰·D·福特" # USS John D Ford + definition = destroyer + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_light_3 = { + amount = 1 + owner = USA + version_name = "波特级" # Porter Class + } + } + } + } + task_force = { + name = "第5潜艇中队" # 5th Submarine Squadron + location = 10265 + ship = { + name = "USS S-36" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-37" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-38" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-39" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-40" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + ship = { + name = "USS S-41" + definition = submarine + start_experience_factor = 0.075 + equipment = { + vnr_ship_hull_submarine_2 = { + amount = 1 + owner = USA + version_name = "鼠海豚级" # Porpoise Class + } + } + } + } + } +} \ No newline at end of file diff --git a/src/interface/z_navy_techtree.gfx b/src/interface/z_navy_techtree.gfx index 3edf71a..238faad 100755 --- a/src/interface/z_navy_techtree.gfx +++ b/src/interface/z_navy_techtree.gfx @@ -180,10 +180,6 @@ spriteTypes = { name = "GFX_ship_living_standard_medium" textureFile = "gfx/interface/technologies/navy_techtree/ship_living_standard.png" } - spriteType = { - name = "GFX_gas_turbine_medium" - textureFile = "gfx/interface/technologies/navy_techtree/gas_turbine.png" - } spriteType = { name = "GFX_battleship_aa_upgrade_medium" textureFile = "gfx/interface/technologies/navy_techtree/battleship_aa_upgrade.png" @@ -240,8 +236,8 @@ spriteTypes = { textureFile = "gfx/interface/technologies/navy_techtree/arresting_gear.png" } spriteType = { - name = "GFX_night_air_strike_medium" - textureFile = "gfx/interface/technologies/navy_techtree/night_air_strike.png" + name = "GFX_carrier_radio_range_medium" + textureFile = "gfx/interface/technologies/navy_techtree/carrier_radio_range.png" } spriteType = { name = "GFX_folding_wing_medium" @@ -700,6 +696,14 @@ spriteTypes = { name = "GFX_advanced_missile_system_medium" textureFile = "gfx/interface/technologies/navy_techtree/advanced_missile_system.png" } + spriteType = { + name = "GFX_basic_submarine_snorkel_medium" + textureFile = "gfx/interface/technologies/navy_techtree/basic_submarine_snorkel.png" + } + spriteType = { + name = "GFX_improved_submarine_snorkel_medium" + textureFile = "gfx/interface/technologies/navy_techtree/improved_submarine_snorkel.png" + } ### special projects @@ -735,4 +739,8 @@ spriteTypes = { name = "GFX_sp_high_speed_light_engine" textureFile = "gfx/interface/special_project/project_icons/sp_high_speed_light_engine.png" } + spriteType = { + name = "GFX_sp_submarine_snorkel" + textureFile = "gfx/interface/special_project/project_icons/sp_naval_anechoic_tiles.dds" + } } diff --git a/src/interface/z_ship_modules.gfx b/src/interface/z_ship_modules.gfx index 630a881..45fd2e9 100755 --- a/src/interface/z_ship_modules.gfx +++ b/src/interface/z_ship_modules.gfx @@ -1381,6 +1381,10 @@ spriteTypes = { name = "GFX_SMI_ship_deck_space_big" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big_armored.png" } + spriteType = { + name = "GFX_SMI_ship_deck_space_special" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space.png" + } # carrier miscellaneous spriteType = { @@ -1630,4 +1634,16 @@ spriteTypes = { name = "GFX_SMI_ship_asw_battery_1" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_asw_battery_1.png" } + spriteType = { + name = "GFX_SMI_ship_sub_snorkel_0" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_sub_snorkel_0.png" + } + spriteType = { + name = "GFX_SMI_ship_sub_snorkel_1" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_sub_snorkel_1.png" + } + spriteType = { + name = "GFX_SMI_ship_sub_snorkel_2" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_sub_snorkel_2.png" + } } diff --git a/src/localisation/english/replace/equip_naval_l_english.yml b/src/localisation/english/replace/equip_naval_l_english.yml index b81508d..212ca08 100755 --- a/src/localisation/english/replace/equip_naval_l_english.yml +++ b/src/localisation/english/replace/equip_naval_l_english.yml @@ -66,10 +66,10 @@ vnr_ship_hull_submarine_4: "现代潜艇船体" vnr_ship_hull_pre_dreadnought: "前无畏舰" vnr_ship_hull_pre_dreadnought_desc: "随着19世纪90年代的威严级战列舰登上历史舞台，前无畏舰取代了19世纪70年代至80年代的铁甲舰。前无畏舰以钢制成，有坚固的钢制装甲保护，其主炮塔上装备有重型火炮，副炮塔上则有一组或多组轻型武器。\n\n由于“无畏舰”的出现，它们多在世界大战爆发前就退出了历史舞台，再加上过去三十年中以无畏舰为基础建造的钢铁巨兽轮番登场，如今只有少数前无畏舰仍在海军中服役。" - vnr_ship_hull_cruiser_panzerschiff: "袖珍战列舰" - GER_vnr_ship_hull_cruiser_panzerschiff: "装甲舰" + vnr_ship_hull_cruiser_panzerschiff: "袖珍战列舰船体" + GER_vnr_ship_hull_cruiser_panzerschiff: "装甲舰船体" vnr_ship_hull_cruiser_panzerschiff_desc: "作为一种绕过凡尔赛条约限制的激进方案，德国战争海军首次在三十年代发展了装甲舰，并作为海军临时的主力舰使用，一些国家也将其称为袖珍战列舰。由于拥有介于重巡洋舰和战列巡洋舰之间的火力水平，装甲舰在面对普通巡洋舰的一对一战斗中具有一定的优势，但却无力对抗一支有着良好组织且架构合理的舰队。\n一些类似的设计也曾见于包括日本和美国在内的海军早期的设计计划中，例如B65超甲巡等，只不过这些设计从未被实现过。" - vnr_ship_hull_cruiser_coastal_defense_ship: "岸防舰艇" + vnr_ship_hull_cruiser_coastal_defense_ship: "岸防舰艇船体" vnr_ship_hull_cruiser_coastal_defense_ship_desc: "岸防舰艇是一种小型战舰，其体型往往与巡洋舰相当，它们牺牲了速度和航程，换来了更为厚实的装甲和更为强大的武器。对造不起正儿八经战列舰的国家和那些只需要有能在本国海岸附近执行任务的浅吃水舰艇的国家来说，这类“岸防舰艇”可谓是性价比优异。" vnr_ship_hull_super_heavy_1: "超重型船体" vnr_ship_hull_cruiser_submarine: "大型潜艇船体" @@ -85,7 +85,7 @@ vnr_ship_hull_cruiser_6_desc: "第二次世界大战期间，空中力量的长足发展极大地改变了海战的形式，从此制空权成为海军作战中最不可或缺的主导因素之一。即使是最快的巡洋舰也无法通过快速机动躲避航空攻击，而如今舰载机使用的鱼雷等武器已经对战舰形成了中距离的拒止能力。\n\n在导弹出现后，战列舰很快便被淘汰了，而巡洋舰在二十世纪后半叶几乎成为了世界上最大的主力舰。它们当中的一部分使用了全导弹化设计甚至还装备有核动力引擎。" vnr_ship_hull_submarine_5: "冷战潜艇船体" vnr_ship_hull_submarine_5_desc: "时至50年代，核动力逐渐取代柴电混合动力，成为了海军大国的潜艇的主流动力方案。在此基础上，强国们还发展了一些设备用于从海水中提取氧气。这两类创新完全改变了潜艇的作战能力，最新的核动力潜艇可以保持潜航状态长达数周甚至数月。" - vnr_ship_hull_torpedo_cruiser: "鱼雷巡洋舰" + vnr_ship_hull_torpedo_cruiser: "鱼雷巡洋舰船体" vnr_ship_hull_torpedo_cruiser_desc: "以拆除一些主炮和防空炮为代价，搭载着大量鱼雷发射管的轻巡洋舰。" ship_hull_civilian: "辅助船" ocean_liner_equipment: "远洋客轮" @@ -97,4 +97,6 @@ vnr_ship_hull_mega_carrier: "战略打击航母船体" vnr_ship_hull_mega_carrier_desc: "四十年代末期，核武器的威力已经在实战中得到验证，其在人口稠密的大城市引爆的恐怖损失迫使各国发展和部署具有核三位一体打击能力的武器与平台。在洲际导弹普及之前，使用重型喷气式轰炸机是唯一能向远距离投放核武器的核打击形式。这促使海军提出了一种能够支援这类行动的机动平台，也就是打击航母。" vnr_ship_hull_arsenal_ship: "武库舰船体" - vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" \ No newline at end of file + vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" + vnr_ship_hull_escort_carrier: "护航航母船体" + vnr_ship_hull_escort_carrier_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" \ No newline at end of file diff --git a/src/localisation/english/replace/naval_units_l_english.yml b/src/localisation/english/replace/naval_units_l_english.yml index 94e5eef..cbde26d 100755 --- a/src/localisation/english/replace/naval_units_l_english.yml +++ b/src/localisation/english/replace/naval_units_l_english.yml @@ -1,7 +1,7 @@ l_english: submarine: "潜艇" submarine_desc: "§H潜艇§!\n\n\n\n\n£GFX_ss_desc_icon\n\n\n\n\n\n潜艇被称为隐秘的死神，这种舰船可以从水下利用鱼雷发动攻击，或者浮出水面用甲板炮摧毁敌舰。虽然潜艇在未来的战争中扮演的角色已经十分明确，但国际惯例仍然对其猎杀商船的行动方式有着约束效应，这一般要求潜艇在确保商船船员转移到安全位置后再行击沉。与此同时，技术的进步在潜艇的航程、耐力和可靠性方面起到了重要作用，这也使它们成为了舰队侦察的核心力量，如果能够运用得当，也会是一件致命的武器。" - both_cruisers_desc: "§H巡洋舰§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n轻巡洋舰 - 由防护巡洋舰发展而来的轻型化舰体，其主要目标是为主力舰提供屏卫，驱离灵活的驱逐舰，同时也可以用威力巨大的鱼雷攻击缓慢的主力舰。\n\n重巡洋舰 - 由防护巡洋舰发展而来的重型化舰体，可执行非常多样的任务，包括独自袭扰敌方补给线或者在舰队当中担任斥候的角色。对于无力负担主力舰的国家而言是一个经济的选择。" + both_cruisers_desc: "§HCruiser§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n轻巡洋舰 - 由防护巡洋舰发展而来的轻型化舰体，其主要目标是为主力舰提供屏卫，驱离灵活的驱逐舰，同时也可以用威力巨大的鱼雷攻击缓慢的主力舰。\n\n重巡洋舰 - 由防护巡洋舰发展而来的重型化舰体，可执行非常多样的任务，包括独自袭扰敌方补给线或者在舰队当中担任斥候的角色。对于无力负担主力舰的国家而言是一个经济的选择。" light_cruiser: "轻型巡洋舰" light_cruiser_desc: "§H轻型巡洋舰§!\n\n\n\n\n£GFX_cl_desc_icon\n\n\n\n\n\n轻型巡洋舰有着防护巡洋舰发展而来的轻量化船体，是舰队中用途多样的中流砥柱，通常配备了6英寸主炮。从前出侦察到指挥鱼雷战队，再到保护舰队免受敌方驱逐舰袭扰，它们负担的任务种类也非常繁多。轻型巡洋舰在各国海军的保有量较多，远超重型巡洋舰，这也使它们成为了巡逻舰队和殖民地舰队的中坚力量。" heavy_cruiser: "重型主力巡洋舰" @@ -31,4 +31,5 @@ damaged_armored_flight_deck: "装甲甲板受损" gas_leakage: "油气泄露" medium_cruiser: "重型舰队巡洋舰" - medium_cruiser_desc: "§H重型巡洋舰§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n重型巡洋舰有着防护巡洋舰发展而来的大型化舰体，并且通常配备了8英寸主炮和不错的装甲。这些舰船被设计为长程护航舰或破袭舰，在有些时候还可以依靠比战列舰快得多的航速担任舰队的前卫。部分国家发展了这种巡洋舰，并将其作为巡洋舰部队的核心。" \ No newline at end of file + medium_cruiser_desc: "§H重型巡洋舰§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n重型巡洋舰有着防护巡洋舰发展而来的大型化舰体，并且通常配备了8英寸主炮和不错的装甲。这些舰船被设计为长程护航舰或破袭舰，在有些时候还可以依靠比战列舰快得多的航速担任舰队的前卫。部分国家发展了这种巡洋舰，并将其作为巡洋舰部队的核心。" + damaged_bb_flight_deck: "甲板受损" \ No newline at end of file diff --git a/src/localisation/english/replace/navy_rework_welcome_l_english.yml b/src/localisation/english/replace/navy_rework_welcome_l_english.yml index f56db26..cf322ac 100755 --- a/src/localisation/english/replace/navy_rework_welcome_l_english.yml +++ b/src/localisation/english/replace/navy_rework_welcome_l_english.yml @@ -4,7 +4,7 @@ navy_rework_welcome_splash_tab_3: "额外信息" navy_rework_welcome_splash_tab_4: "致谢" navy_rework_options_button_text: "继续" - navy_rework_welcome_splash_tab_1_content: "§Hv2.4 “铁底湾”§!\n\n§C重要新增：§!\n\n-新立绘：大和（1965现代化改装），镇海，安德烈亚·多利亚（1926），柯尔贝尔（导弹改装），伊丽莎白女王（1941）\n-新角色：护航航母\n-增加了在局中开启专家AI模式的决议\n-舰载机在陆上的单个机队规模被减少为10架，防止出现航母沉船吃飞机库存的问题\n-重做甲弹对抗公式，平衡轻炮对重甲的效果\n-大幅增加暴击时损坏关键部件的几率\n-为大部分科技的鼠标悬浮弹窗增加了艺术图\n\n§C更新：§!\n\n-安德烈亚·多利亚级战列舰在开局时处于现役未改装的状态\n-博尔扎诺级现在采用战间期巡洋舰船体\n-希佩尔海军上将级巡洋舰现在拥有额外装甲模块\n-日本开局拥有声呐科技\n-为苏/俄添加专属的海军学院军官团精神\n-舰载机对组织度的伤害系数降低到合理水平\n-舰载机空袭的基础时间间隔回调到3小时\n-重做经验和护航带来的加成和惩罚数值\n-商船航母现在必须使用民用材料\n-一些航母科技现在可以提供航空技术突破点\n-小国的海军生产AI现在只检查舰队规模，不再检查船厂数量\n-为AI加强的数值中加入船厂建造速度和设计花费减免\n-雷达和桅杆观察哨将互斥\n-为AI加入了平衡多用途驱逐舰的花费减免\n-降低潜艇船体和耐压艇壳的花费\n-调整一些航母模块的效果\n-水上飞机弹射器会带来可见度惩罚\n-在自动科技解锁模式下，如果玩家选择超前研究，AI也会相应进行超前解锁\n\n§C修复：§!\n\n-海军单位经验获取系数从0.1回调到0.8\n-德国可以正常使用一战时期的驱逐舰立绘了\n-修复一些海军大国仍然可以使用海军发展决议的问题\n-修复要塞上限失效的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv2.5 “圣克鲁斯”§!\n\n§C重要新增：§!\n\n-新特殊项目：潜艇通气管\n-新科技：归航信标\n-新模块：通气管原型，轻型燃气轮机，巡洋舰燃气轮机\n-降低所有船体的资源消耗到合适的水平\n-增加开局规则，允许美国、英国和日本的开局舰队全部转为专家设计\n\n§C更新：§!\n\n-航母夜战科技被新科技替换\n-移除燃气轮机科技和重型燃气轮机模块，轻型和巡洋舰燃气轮机分别由相关的冷战科技解锁\n-移除护航航母科技，改为1940航母船体科技附赠\n-增加小型机库的造价\n-平衡一些模块的可靠性修正\n-强力甲板现在被重新分类为飞行甲板模块\n-平衡超重型主炮和超重引擎的速度修正\n-水上飞机弹射器会降低更多的航速\n-为航空战列舰增加甲板致命伤效果\n-平衡战列舰防御相关模块的效果\n-增加装甲甲板的造价\n-增加深水炸弹模块的速度惩罚\n-将小型机库和航空战列舰机库单独划为特殊机库种类\n-增加一些小几率出现的致命损伤所造成的伤害\n-增加所有炮弹模块带来的命中率修正（正面或负面皆有）\n-降低一些舰炮科技的科研时间\n-更新部分AI模板\n-略微降低美国AI大规模建造船坞的倾向\n-降低AI海军分配到护航和水雷战相关任务的编队数\n-微调海军条约的吨位限制\n-加强舰队防空对减伤效果的加成\n-改进部分规则文字的描述，指向性更加明确\n-重做设计器中舰炮大类的图标\n\n§C修复：§!\n\n-修复AI科技自动解锁模式开启时AI无法正确获取雷达的问题\n-修复部分国家由于缺少超重型船体项目无法选择国策的问题\n-修复商船航母有民用材料时无法建造的问题\n-修复巡洋舰可以安装两个炮弹模块的问题\n\n感谢你的游玩！" navy_rework_welcome_splash_tab_2_content: "§H这里包含了你想知道的关于海军重置的一切。§!\n\n§C设计器-§!\n£white_dot 在设计§Y驱逐舰§!、§Y巡洋舰§!或§Y战列舰§!的时候，§Y主炮§!是和历史唯一的一一对应的装备。由于它们的火力和穿甲据此做了平衡，§R请确保它们的数量和现实中接近§!。诸如§Y副炮§!和§Y鱼雷§!等装备则与原版没有区别。\n£white_dot 一些在原版受限的装备在本模组中是开放的，比如你可以建造超重炮战列舰，轻炮重巡，无甲巡洋舰等等。\n£white_dot 舰船角色在驱逐舰和巡洋舰上是必须的，它们可以提供不同的增益并解锁特殊的部件。\n£white_dot 巡洋舰的主力屏卫之分不由主炮口径为标准。所有巡洋舰（除装甲舰外）都初始默认为屏卫舰，且需要特殊的角色才能让它们成为主力舰。\n£white_dot §Y导弹§!可以安装在晚期的重型或巡洋舰船体上，不过后者需要专门的导弹巡洋舰角色来安装。\n£white_dot 此模组中实现最大屏卫效率的屏卫/主力比例为2\n£white_dot 鱼雷可以对重型舰船造成巨量的伤害，不过重型装甲只能提供非常有限的鱼雷防护，你需要安装§Y鱼雷防御系统§!来避免这一点。\n£white_dot 主炮的穿甲经过一定的平衡。其基础穿深为同时期装甲的1.1倍，这也意味着基础的装甲钢和混合防护方案可以避免被击穿，而下一代主炮则可以击穿使用重点防护的该型战舰。\n£white_dot 海战中的甲弹对抗公式以如下规则计算，穿甲和装甲的比值与伤害权重之间的映射关系为：超过200%为200%伤害，100%到200%为100%伤害，85%到100%为70%伤害，75%到85%为60%伤害，70%到75%为45%伤害，65%到70%为35%伤害，60%到65%为20%伤害，55%到60%为10%伤害，50%到55%为5%伤害，30%到50%为2%伤害，小于30%为1%伤害。\n£white_dot §Y超重型主炮§!根据炮管数量和§Y重型主炮§!归类在一起，但是它们仍然在某些船体上受到安装限制。\n£white_dot 设计器中的舰船分类符号可以帮助你更好地管理舰队。其仅仅表示该国对舰船的分类和定义，没有实际效果。\n£white_dot 辅助船非常脆弱，但是航程极长。由于舰队最大航程是由平均数决定的，因此在舰队中加入一些辅助船可以增加航程。\n\n§C科技树-§!\n£white_dot 尽管科技树的外观变化巨大，但是它的本质仍然和原版类似，你不需要花费大量时间去理解。\n£white_dot 并不是所有科技都是有价值的，请根据你的战略和地缘情况理智选择。\n£white_dot 子科技需要船体科技研究完成才能解锁。其中有一些还需要非海军科技的进步来推动。例如，主动声呐需要被动声呐研究完成，而一些火控系统则需要工程科技的进步作为前提。\n\n§C海战-§!\n£white_dot 海战的最短时间§Y已经被提高到20小时，主力舰在第22小时开火，其他舰艇在第30小时开火§!，而§G航母则可以在刚加入战斗时就参与进攻§!。§Y航母堆叠限制§!被放宽到6。你使用舰载机的方式在本模组中更加重要。\n£white_dot 舰艇的防空和舰载战斗机的伤害与命中率都获得了提升。一支没有战斗机护航的航母舰队可能会在进攻中损失更多的舰载机。\n£white_dot 基础的阵位被削减为50%，但优势的水面探测数值可以带来最多20%的阵位奖励。\n£white_dot 堆叠带来的阵位惩罚为每超过敌方数量的100%时增加30%，最高可达150%。只有舰队规模超过65时才会触发。\n£white_dot 水上飞机弹射器、航母和声呐在反潜战中的表现都更加有用和强力，而§Y潜艇§!基础的§Y可见度§!相较原版被§R增加§!了，在面对有良好反潜能力的舰队时，潜艇不再拥有优势。\n£white_dot AI的设计模板是刻意默认设置为§Y史实向§!的。尽管这些模板比原版要强一些，但是过去的最优设计仍然是有效的。\n\n§C其他-§!\n£white_dot 玩家和AI都享有§G-15%§!海军燃料消耗减免。\n£white_dot 单个船厂的产出已被提高到§G160%§!，一般在没有加成的情况下，建造一艘满配战列舰的时间在1-2年之间。\n£white_dot AI控制的主要国家会分别在1940年，1943年，1945年和冷战时期（如果没有投降的话）获得一批海军科技和独特的舰船设计。\n£white_dot AI会根据历史上的学说选择和战争情况选择不同的海军建造策略（包括舰载机）。例如，原版的§g德国§!会更加专注于潜艇，而§B美国§!则会重视航母。" navy_rework_welcome_splash_tab_3_content: "§H这里罗列关于海军重置的其他信息。§!\n\n§C兼容性-§!\n£white_dot 除非有§Y兼容包§!，本模组与修改科技树的模组不兼容，已有的兼容包链接都会在创意工坊界面列出。\n£white_dot §R所有生成舰船设计的国策/事件/决议都会失效，这是为了兼容性的考量和必要牺牲。§!\n\n§C二次创作-§!\n£white_dot 除了56之路外，不会再有其他的官方兼容包发布，希望社区可以更多地参与此事。目前日共重置与日本史实国策重做已完全兼容本模组。\n£white_dot 所有人都可以随意利用本模组的资源（代码/图标/文本），但在使用中请标明出处并通知我。感谢你的理解。" navy_rework_welcome_splash_tab_4_content: "大家好，海军重置已经走过了艰难的开发阶段，如今史实设计器、初始海军编制和设计、图标和科技树都已经基本完成，整个大框架完成后，剩余的工作便是进一步丰富和扩充，而这相比之前的开拓等等都要简单一些。借此机会我想和大家讲讲这个mod的过去和未来。\n\n我是2016年入的钢4坑，在加里波第的噩梦版本，也就是0.6时期接触到的KR，当时就被它详实有趣的世界观所吸引，之后几年KR一直是我玩的最多的mod之一。KR在0.8发布了海军重做，也是我最喜欢最兴奋的一个版本，由此我开始对海军感兴趣，也越发经常地想象KR世界观中的海军和军舰会是什么样子的。\n\n2021年春节前夕的一个周五下午，我在办公室摸鱼逛reddit，看到了一位外国网友写的对KR中加拿大和日本海军的战舰原型考证，这篇文章深深吸引了我，我用了一个下午翻译后发布到了贴吧上，收获了很多人的支持。尽管后来因为屏蔽的问题我转战知乎，但我始终将KR海军考据的系列坚持了下来，从海军大国到一些特色小国我都查阅了大量资料，也为这个mod打下了基础。\n\n在KR0.22更新之前，开发因为一些原因多次削减了海军的内容，我一直感到很遗憾，0.22的大改给了我这个动力去做之前我不敢想的事情。虽然写代码是我的老本行，但是美工、文案和汉译英等等我都是从头开始学，一次次试错，一个人陆陆续续弄了大半年，发布了KR和KX两版，才做到现在这个地步，我从中也学到了很多。如今，我们也终于迎来了原版海军重置的发布。\n\n我想借这个机会感谢所有在这个过程中帮助我的朋友和玩家，包括启发我的reddit网友Tragic-tragedy，贴吧上对我的史料斧正的朋友，在知乎上追更的朋友，还有许多订阅海军重置的玩家，没有你们的支持就没有这个mod，谢谢你们！\n\n最后，我还想借此机会感谢我的外公，他曾在中国人民解放军海军服役了几十年，在我的孩提时代启发了我对海军的认识。上世纪七八十年代，我的外公分别在几艘海军科考船上服役，担任过气象专家和部门政委等职务，他的大部分军旅生涯是在向阳红10号船上度过的，这也是当时中国自主设计建造的吨位最大的远洋科考船。1980年，向阳红10号作为新中国历史上最大规模远洋舰队的一员参加了中国第一次洲际弹道导弹发射试验，这就是大家熟知的580任务。我的外公当时负责气象部门，为回收导弹黑匣子的时间窗口提供预报支持。四年后，他随船参加了中国第一次南极科考任务，并在乔治王岛参与了长城站的建设。向阳红10号船之后被改装成了远望4号，在2007年遇到事故损坏，最后成了东风21D的靶子，每每说起来，他还是有些惋惜。我能看出来他对曾经的海军生涯有着复杂的情感，一方面为对国家做出贡献而感到骄傲光荣，而另一方面又为错过了孩子们的成长感到缺憾。不过尽管如此，他从小给我讲述的故事仍然点燃了我对海军的兴趣，为这个mod播下了一颗种子。\n\n随着我现在工作生活越来越忙，不知道海军重置还能维持多久，所以我在此也希望成立一个小团队，用半做半学的方式，把这个mod延续下去。\n\n有兴趣加我qq：1245385638，或海军重置群：162239327" \ No newline at end of file diff --git a/src/localisation/english/replace/preset_names_l_english.yml b/src/localisation/english/replace/preset_names_l_english.yml index 7f26846..3fb3434 100755 --- a/src/localisation/english/replace/preset_names_l_english.yml +++ b/src/localisation/english/replace/preset_names_l_english.yml @@ -343,4 +343,5 @@ SOV_submarine_equipment_4: "独角鲸级" SOV_submarine_equipment_5: "鲸鱼级" SOV_submarine_equipment_sc: "K级" - submarine_equipment_sc: "巡洋潜艇" \ No newline at end of file + submarine_equipment_sc: "巡洋潜艇" + vnr_cl_1949_expert: "1949专家轻巡" \ No newline at end of file diff --git a/src/localisation/english/replace/research_l_english.yml b/src/localisation/english/replace/research_l_english.yml index 0619e57..d2b7571 100755 --- a/src/localisation/english/replace/research_l_english.yml +++ b/src/localisation/english/replace/research_l_english.yml @@ -88,8 +88,6 @@ rudder_upgrade_desc: "通过使用改良过的舵机，舰船可以实现灵活转向，更小的转弯半径有利于舰队调整阵型或者尽快撤退。" battleship_aa_upgrade: "战列舰防空改装" battleship_aa_upgrade_desc: "航母在战争中展现出的实战价值推动了各海军强国将注意力转移至航母战斗群，战列舰的地位似乎已大不如前。但是航母在缺乏战舰护航的情况下仍然十分脆弱，战列舰的体型为舰队防空提供了平台，这些安装了大量防空炮的战列舰开始出现在航母的身边担当护卫。" - gas_turbine: "燃气轮机" - gas_turbine_desc: "燃气轮机是以连续流动的气体为工质带动叶轮高速旋转，将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多，但是受限于耐热材料等技术缺陷，燃气轮机目前的应用场景还比较有限。" fuel_tank_upgrade: "大型燃料舱" fuel_tank_upgrade_desc: "建成一支全球海军的标准就是该国的舰队可以在任何情况下部署到远离其核心势力范围的地方，并在当地有效地执行威慑，这对海军舰艇的航程提出了要求，更大的燃料舱有助于实现这一目标。" radar_jammer: "雷达干扰装置" @@ -104,12 +102,8 @@ arresting_gear_desc: "舰载机阻拦着陆装置是航母上的重要辅助设备，实现了舰载机在有限的甲板长度上安全地着舰。阻拦索是这一装置最重要的一环，其通过高强度的绳索钩住舰载机的挂钩。如果阻拦索无法起到作用，拦机网将成为最后一道防线。" aviation_dawn: "航空黎明" aviation_dawn_desc: "从最初的莱特飞行器到如今的单翼机，飞机工业的革命带来了结构强度更高、抗腐蚀性更好的材料。随着海军航空兵的发展，其在舰队中的地位也相应得到了提高，日本海军、英国皇家海军和美国海军都在二十年代末和三十年代初组织了大量规模各异的作战演习，从中总结了很多舰载机的战术。由于这一兵种极高的技术门槛，任何一国的海军若是想要建成一支强大的海航力量都必须经过实践。\n\n然而对于任何一支拥有大量战列舰的海军而言，想要在海战理论上改变航向都将是困难的，也注定会受到来自既得利益集团的阻力。\n\n§R航空时代来临了，大舰巨炮也许终究会被扫进垃圾桶......§!" - night_air_strike: "夜间空袭" - night_air_strike_desc: "夜间航行是一项极为危险的任务，但也正因为它的危险性，往往可以起到出其不意的效果。通过大量的夜间舰载机起降训练，飞行员和航母地勤队伍逐渐具备了在部分照明条件较好的夜晚发动有效空袭的能力。" carrier_mass_production: "航母大规模生产" carrier_mass_production_desc: "经过多年的发展，航母已不再是一艘安装了木制直通甲板的简陋船舶了，相反，在航空母舰上应用的新技术越来越多，甚至大有超越战列舰的趋势，全新的建造模式可以让航母的下水时间提前。" - vnr_ship_hull_escort_carrier: "护航航母" - vnr_ship_hull_escort_carrier_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" folding_wing: "折叠机翼" folding_wing_desc: "第二次世界大战的海战是立体的、海空联动的全新作战方式，而舰载机在其中扮演的角色至关重要。为了使航母能一次性搭载更多飞机执行任务，航空设计师开始在飞机上采用折叠机翼以最大程度地节省甲板和机库空间，但是这一技术对飞机机翼的工艺要求很高。" carrier_damage_control: "航母综合损害管制" @@ -273,7 +267,7 @@ naval_tactical_data_system: "海军战术数据系统" naval_tactical_data_system_desc: "海军战术数据系统（NTDS）是20世纪50年代开发的用于战舰的计算机信息处理系统。它可以从不同船只上的多个传感器获取报告，并将其整理以生成一张统一的战场态势图。然后，这些信息可以被转发回船只和​​武器操作员。" tactical_air_navigation_system: "战术空中导航系统" - tactical_air_navigation_system_desc: "战术空中导航系统通常简称为TACAN，是军用飞机使用的导航系统，它可以为使用者提供到地面机场或航母的方位和距离等航行信息。" + tactical_air_navigation_system_desc: "战术空中导航系统通常简称为TACAN，是军用飞机使用的导航系统，相比过去的单源无线电信标在性能上有了较大提升，它可以为使用者提供到地面机场或航母的方位和距离等航行信息。" TITLE_FLEET_IN_BEING: "舰队决战" TITLE_TRADE_INTERDICTION: "交通线破袭" TITLE_BASE_STRIKE: "空海一体战" @@ -427,4 +421,8 @@ bb_tech_10_tt: "\n\n\n\n\n£GFX_bb_tech_10\n\n\n\n\n\n" ca_tech_10_tt: "\n\n\n\n\n£GFX_ca_tech_10\n\n\n\n\n\n" ca_tech_11_tt: "\n\n\n\n\n£GFX_ca_tech_11\n\n\n\n\n\n" - dd_tech_9_tt: "\n\n\n\n\n£GFX_dd_tech_9\n\n\n\n\n\n" \ No newline at end of file + dd_tech_9_tt: "\n\n\n\n\n£GFX_dd_tech_9\n\n\n\n\n\n" + carrier_radio_range: "归航信标" + carrier_radio_range_desc: "随着近些年来舰载机在载荷与航程方面的崛起，航母作战面临着一项重大挑战：任务结束后，飞行员如何在茫茫大海上找到并返回移动中的航母。无线电技术的进步在一定程度上解决了这个问题。在这个构想中，航母会在有限的时间窗口内发送特定频率的无线电信号，就如同一个信标。携带有接收器的战斗机可以据此确定返航的航向以及会合时间表。这项技术对于在恶劣天气和超远距离作战的情况下安全回收起到了至关重要的作用。" + escort_carriers_ship: "护航航母" + escort_carriers_ship_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" \ No newline at end of file diff --git a/src/localisation/english/replace/ship_modules_l_english.yml b/src/localisation/english/replace/ship_modules_l_english.yml index e825be2..1ade3cf 100755 --- a/src/localisation/english/replace/ship_modules_l_english.yml +++ b/src/localisation/english/replace/ship_modules_l_english.yml @@ -158,9 +158,6 @@ heavy_ship_engine_2_diesel_desc:0 "这种引擎的推力比之前的要大得多，这种引擎可以使大型船只相较老式战舰拥有明显的速度优势。" heavy_ship_engine_3_diesel_desc:0 "随着装甲和火炮重量的增加，引擎也被设计得能够提供更高的速度，以便于追击逃跑的敌军，抑或是和比自己更强大的对手保持距离。" heavy_ship_engine_4_diesel_desc:0 "通过采用新材料和改进的锅炉设计，这种动力装置能使一艘现代战列舰跟上那些高速的航母和巡洋舰。" - heavy_ship_engine_4_gas: "250000马力引擎" - heavy_ship_engine_4_gas_short: "重型燃气轮机" - heavy_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" carrier_ship_engine_1_short: "航母蒸汽引擎 I" carrier_ship_engine_2_short: "航母蒸汽引擎 II" carrier_ship_engine_3_short: "航母蒸汽引擎 III" @@ -448,9 +445,9 @@ EQ_MOD_CAT_ship_airplane_launcher_TITLE: "飞机设施" EQ_MOD_CAT_ship_torpedo_sub_TITLE: "鱼雷舱" EQ_MOD_CAT_ship_secondaries_TITLE: "副炮组" - EQ_MOD_CAT_light_ship_engine_TITLE: "驱逐舰引擎" + EQ_MOD_CAT_light_ship_engine_TITLE: "轻型引擎" EQ_MOD_CAT_cruiser_ship_engine_TITLE: "巡洋舰引擎" - EQ_MOD_CAT_heavy_ship_engine_TITLE: "重型舰船引擎" + EQ_MOD_CAT_heavy_ship_engine_TITLE: "重型引擎" EQ_MOD_CAT_carrier_ship_engine_TITLE: "航空母舰引擎" EQ_MOD_CAT_sub_ship_engine_TITLE: "潜艇引擎" EQ_MOD_CAT_ship_radar_TITLE: "雷达" @@ -792,7 +789,7 @@ ship_hull_cruiser_role_cd_short: "岸防舰" ship_hull_cruiser_role_cd_desc: "体型接近巡洋舰的岸防舰艇。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" EQ_MOD_CAT_cds_role_TITLE: "岸防舰角色" - EQ_MOD_CAT_super_heavy_ship_engine_TITLE: "超重型蒸汽引擎" + EQ_MOD_CAT_super_heavy_ship_engine_TITLE: "超重型引擎" EQ_MOD_CAT_carrier_unit_TITLE: "航母指挥控制单位" EQ_MOD_CAT_carrier_miscellaneous_TITLE: "航母杂项装备" EQ_MOD_SLOT_fixed_ship_carrier_miscellaneous_slot_1_TITLE: "航母杂项1" @@ -814,13 +811,13 @@ carrier_fuel_storage_desc: "一个在航母内部用于储藏航空燃料的巨大容器。" carrier_civilian_material: "使用民用材料" carrier_civilian_material_short: "民用材料" - carrier_civilian_material_desc: "在航母上更多应用民用材料可以使它们的造价更便宜。\n\n§R最大组织度惩罚：-20%§!" + carrier_civilian_material_desc: "在航母上更多应用民用材料可以使它们的造价更便宜。\n§R此模块一旦安装后将难以拆除。§!\n\n§R最大组织度惩罚：-20%§!" carrier_secondary_island: "第二舰岛" carrier_secondary_island_short: "第二舰岛" carrier_secondary_island_desc: "一座飞行甲板上的副舰岛，可以将航母的航海和飞控部门分开，保证双方的工作效率。\n\n§G最大组织度加成：+5%§!" carrier_strength_deck: "船体集成强力甲板" carrier_strength_deck_short: "强力甲板" - carrier_strength_deck_desc: "强力甲板亦称上甲板，以高强度的甲板结构保证船体总纵强度稳定，这一部件与船体深度集成。" + carrier_strength_deck_desc: "强力甲板亦称上甲板，以高强度的甲板结构保证船体总纵强度稳定，这一部件与船体深度集成。\n\n§Y甲板受损几率：§!§G-25%§!\n§Y甲板受损惩罚：§!§G-50%§!" ship_deck_space_more: "大型开放式机库" ship_deck_space_more_short: "大型开放式机库" ship_deck_space_more_desc: "船舱内一块体积巨大的开放区域，可以为着舰的飞机进行维护和后勤。为船上增加更多的机库会使得造价飙升。\n\n§R最大组织度惩罚：-20%§!" @@ -921,10 +918,10 @@ EQ_MOD_SLOT_fixed_ship_flight_deck_slot_TITLE: "飞行甲板槽位" carrier_wooden_deck: "19mm飞行甲板" carrier_wooden_deck_short: "木制飞行甲板" - carrier_wooden_deck_desc: "一条木制的全通式飞行甲板。\n§R木制甲板可能在空袭中会遭受严重的损伤。§!" + carrier_wooden_deck_desc: "一条木制的全通式飞行甲板。" carrier_armor_deck: "90mm飞行甲板" carrier_armor_deck_short: "装甲飞行甲板" - carrier_armor_deck_desc: "一条使用装甲加固的全通式飞行甲板。\n§G装甲甲板可以降低在空袭中遭受致命一击的机会和效果。\n甲板遭受致命一击的几率会下降25%，减益下降一半。§!" + carrier_armor_deck_desc: "一条使用装甲加固的全通式飞行甲板。\n\n§Y甲板受损几率：§!§G-25%§!\n§Y甲板受损惩罚：§!§G-50%§!" EQ_MOD_CAT_ship_torpedo_bb_TITLE: "鱼雷发射管" ship_torpedo_bb: "450mm舷侧发射管" ship_torpedo_bb_short: "舷侧鱼雷发射管" @@ -1159,7 +1156,7 @@ ship_hull_carrier_role_cv_desc: "一艘为舰队行动设计的标准航母。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" ship_hull_carrier_role_cvl: "轻型航母角色" ship_hull_carrier_role_cvl_short: "轻型航母" - ship_hull_carrier_role_cvl_desc: "一艘规模和载机量都较为有限的航母。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" + ship_hull_carrier_role_cvl_desc: "一艘规模和载机量都较为有限的航母。\n\n§R最大组织度惩罚：-10%§!\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" EQ_MOD_CAT_coldwar_upgrade_bb_TITLE: "冷战战列舰改装" EQ_MOD_CAT_cv_role_TITLE: "航母角色" EQ_MOD_CAT_ship_carrier_armor_shbb_TITLE: "航母超重型装甲带" @@ -1189,4 +1186,15 @@ EQ_MOD_CAT_cve_role_TITLE: "护航航母角色" ship_hull_carrier_role_cve: "护航航母角色" ship_hull_carrier_role_cve_short: "护航航母" - ship_hull_carrier_role_cve_desc: "一艘用于商船队护航和反潜的小型航母。\n\n§R最大组织度惩罚：-20%§! " \ No newline at end of file + ship_hull_carrier_role_cve_desc: "一艘用于商船队护航和反潜的小型航母。\n\n§R最大组织度惩罚：-20%§! " + ship_sub_snorkel_0: "通气管原型" + ship_sub_snorkel_0_desc: "可以让潜艇引擎在水下继续工作，但目前该技术仍然十分不稳定。" + light_ship_engine_4_gas: "80000马力引擎" + light_ship_engine_4_gas_short: "轻型燃气轮机" + light_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" + cruiser_ship_engine_4_gas: "100000马力引擎" + cruiser_ship_engine_4_gas_short: "巡洋舰燃气轮机" + cruiser_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" + EQ_MOD_CAT_carrier_civilian_material_TITLE: "民用材料" + EQ_MOD_CAT_ship_deck_space_special_TITLE: "非常规机库" + EQ_MOD_CAT_ap_shell_TITLE: "穿甲弹" \ No newline at end of file diff --git a/src/localisation/english/replace/vnr_ai_l_english.yml b/src/localisation/english/replace/vnr_ai_l_english.yml index 784144f..e3e5848 100755 --- a/src/localisation/english/replace/vnr_ai_l_english.yml +++ b/src/localisation/english/replace/vnr_ai_l_english.yml @@ -17,8 +17,8 @@ RULE_AI_SHIP_DESIGN_STYLE: "AI舰船设计风格" RULE_OPTION_HISTORICAL: "史实" RULE_OPTION_EXPERT: "专家" - RULE_AI_SHIP_DESIGN_STYLE_HISTORICAL_DESC: "AI会依照史实方案设计舰船，这是过去海军重置一直采用的默认设计方法。" - RULE_AI_SHIP_DESIGN_STYLE_EXPERT_DESC: "AI会基于效率至上的目标设计和建造最优的模板。\n§R这个选项会让海战更加有挑战性，但是也意味着角色扮演的元素将会大幅减少。§!" + RULE_AI_SHIP_DESIGN_STYLE_HISTORICAL_DESC: "AI会依照史实方案，以符合现实的模块方案设计舰船。\n\n§C这是过去海军重置一直采用的默认设计方法。§!" + RULE_AI_SHIP_DESIGN_STYLE_EXPERT_DESC: "AI会基于效率至上的目标设计和建造最优的模板。\n\n这个选项会让海战§R更加有挑战性§!，但是也意味着§R角色扮演的元素将会大幅减少§!。§Y推荐想要更高挑战性的玩家使用。§!" buff_ai_production: "AI生产加强" buff_ai_production_desc: "这也太简单了。" vnr_ai.1.t: "选择海军AI生产强度" @@ -35,15 +35,15 @@ vnr_hard_production: "AI生产加强：§O困难§!" vnr_normal_production: "AI生产加强：§G普通§!" RULE_ALLOW_AI_TECH_AUTO_UNLOCK: "允许AI自动解锁科技" - RULE_ALLOW_AI_TECH_AUTO_UNLOCK_FREE_DESC: "AI会在游戏中自动解锁海军科技。" - RULE_ALLOW_AI_TECH_AUTO_UNLOCK_BLOCKED_DESC: "AI不会在游戏中自动解锁海军科技。\n§R这可能改变AI选择科技的倾向，并且影响其他方面的科研。§!" + RULE_ALLOW_AI_TECH_AUTO_UNLOCK_FREE_DESC: "§G开启§!AI在游戏中自动解锁海军科技。\n\n此选项包含了§RAI作弊§!，在玩家选择§C使用正常或作弊手段提前研究某些海军科技§!时，AI将也会§Y提前解锁部分科技§!。" + RULE_ALLOW_AI_TECH_AUTO_UNLOCK_BLOCKED_DESC: "§R关闭§!AI在游戏中自动解锁海军科技。\n\n这个选项将会§Y改变§!AI选择科技的行为，使其以§Y更加平衡的倾向§!进行科研，但是在海军科技的研究速度上会§R落后于§!§C专注投入海军§!的玩家，并且可能§R影响其他方面的科研§!。" RULE_SHIPYARD_OUTPUT_BOOST_BLOCKED_DESC: "船厂的产出为2.5点IC/日，与原版一致。" vnr_shipyard_output_boost: "海军重置船厂产出加成" join_tactical_data_link: "接入[ROOT.GetFactionName]海军战术数据链" join_tactical_data_link_desc: "一套联合战术数据链系统已经由我们阵营当中的领先成员部署成功。虽然这是一个加强我军与盟友协同作战能力的好机会，但是我们仍然可以独立开发一套自己的数据链系统。\n§C如果我们选择接入友方数据链，我们将不能研发自己的版本，但会立刻解锁以下加成：§!\n§Y海军协同性：§!§G+10%§!\n§Y海军组织度：§!§G+7.5%§!\n§Y可见度：§!§G-7.5%§!" RULE_AI_NAVAL_MANAGEMENT: "使用海军重置海军管理AI" - RULE_AI_NAVAL_MANAGEMENT_FREE_DESC: "在原版环境中§G启动§!海军舰队管理AI。\n§R请勿将本选项与修改地块和战略区域的mod混用。§!" - RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC: "在原版环境中§R关闭§!海军舰队管理AI。\n§Y使用原版或其他激活状态mod提供的海军AI。§!" + RULE_AI_NAVAL_MANAGEMENT_FREE_DESC: "在原版环境中§G启动§!海军舰队管理AI。\n\n此选项专为§Y历史模式§!设计，可以模拟历史上比较著名的海军战略例如§C无限制潜艇战§!或§C跳岛战术§!，使AI大国在§C史实的二战场景§!中表现得更加§Y真实和强大§!。\n\n§R此选项在以下场景中不推荐使用：§!\n£white_dot 架空历史模组（即使有兼容包）\n£white_dot 修改海域地块的模组\n£white_dot 非默认的二战场景（随机路线/非历史，任何偏离轴心对同盟的情况）" + RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC: "在原版环境中§R关闭§!海军舰队管理AI。\n\n§Y使用原版或其他处于激活状态模组提供的海军AI。§!" RULE_SHIPYARD_OUTPUT_BOOST_PLAYER: "玩家船厂产出加成" RULE_SHIPYARD_OUTPUT_BOOST_AI: "AI船厂产出加成" RULE_OPTION_BUFF_60: "增加全满" @@ -51,8 +51,8 @@ RULE_SHIPYARD_OUTPUT_BOOST_BUFF_60_DESC: "船厂的产出为4点IC/日，比原版§G快60%§!。" RULE_SHIPYARD_OUTPUT_BOOST_BUFF_30_DESC: "船厂的产出为3.25点IC/日，比原版§G快30%§!。" RULE_AI_AIR_DESIGN: "启用AI改进舰载机设计" - RULE_AI_AIR_DESIGN_FREE_DESC: "为AI§G启用§!改进过的舰载机设计模板。\n§R请勿将本选项与修改空军科技的mod混用。§!" - RULE_AI_AIR_DESIGN_BLOCKED_DESC: "为AI§R关闭§!改进过的舰载机设计模板。\n§Y使用原版或其他激活状态mod提供的飞机模板。§!" + RULE_AI_AIR_DESIGN_FREE_DESC: "为AI§G启用§!改进过的舰载机设计模板。\n\n§R此选项不推荐与修改空军科技或飞机设计器的模组混用。§!" + RULE_AI_AIR_DESIGN_BLOCKED_DESC: "为AI§R关闭§!改进过的舰载机设计模板。\n\n§Y使用原版或其他激活状态模组提供的飞机模板。§!" vnr_cv_plane_output_boost: "海军重置舰载机产出加成" enable_ai_ship_design: "AI舰船设计风格" enable_ai_plane_design: "AI舰载机设计风格" @@ -63,4 +63,9 @@ vnr_ai.3.t: "AI舰载机设计风格" vnr_ai.3.d: "§R虽然目前推荐的方式是在开局的规则设置中开启专家AI设计§!，但是为了以防你错过这一特性，你仍然可以在局中使用该决议开启专家设计。为了使AI可以快速从史实模板切换到专家模板，所有的AI大国将会立刻获得部分空军经验。\n\n§R请注意，该选项不能与修改过飞机科技和模块的模组一起使用。如果你开启了这类模组，请勿进行模板切换。§!" vnr_ai.3.1: "§R切换到专家设计§!" - vnr_ai.3.2: "§G切换到原版设计§!" \ No newline at end of file + vnr_ai.3.2: "§G切换到原版设计§!" + RULE_ENG_EXPERT_NAVY: "@ENG 专家皇家海军" + RULE_USA_EXPERT_NAVY: "@USA 专家美国海军" + RULE_JAP_EXPERT_NAVY: "@JAP 专家日本帝国海军" + RULE_AI_EXPERT_NAVY_BLOCKED_DESC: "此国家开局的舰队不会被替换。" + RULE_AI_EXPERT_NAVY_FREE_DESC: "此国家开局的舰队全部替换为专家设计。\n\n此选项仅在§YAI舰船设计风格§!设置为§C专家§!且该国家为§RAI控制§!时方可生效。" \ No newline at end of file diff --git a/src/localisation/english/replace/vnr_naval_develop_l_english.yml b/src/localisation/english/replace/vnr_naval_develop_l_english.yml index 06fc9b6..432c144 100755 --- a/src/localisation/english/replace/vnr_naval_develop_l_english.yml +++ b/src/localisation/english/replace/vnr_naval_develop_l_english.yml @@ -105,4 +105,6 @@ nakhimov_naval_academy: "纳希莫夫海军学院" nakhimov_naval_academy_desc: "作为世界上最富盛名的海军军官培训院校之一，这所学院在二月革命的烽火中脱胎于尼古拉耶夫学院而组建。每年，数百名经验丰富的学员从这里毕业并踏上仕途，渴望着为俄罗斯母亲献身。" usn_fighter_weapons_school: "TOPGUN" - usn_fighter_weapons_school_desc: "美国海军战斗机武器学校（俗称“TOPGUN”），是一项旨在为海军飞行员提供空战训练的教学课程，其目的不是为了基础训练而是培训经验丰富的航空教官。该学校通过空气动力学和战术技巧的相关课程，以及对精英主义的重视，意在将学员培养成最顶尖的飞行员。" \ No newline at end of file + usn_fighter_weapons_school_desc: "美国海军战斗机武器学校（俗称“TOPGUN”），是一项旨在为海军飞行员提供空战训练的教学课程，其目的不是为了基础训练而是培训经验丰富的航空教官。该学校通过空气动力学和战术技巧的相关课程，以及对精英主义的重视，意在将学员培养成最顶尖的飞行员。" + sp_submarine_snorkel: "潜艇通气管" + sp_submarine_snorkel_desc: "潜艇通气管是一种在潜艇潜航状态下伸出水面的装置，可以让潜艇发动机在水下仍然吸入空气并正常运转。" \ No newline at end of file diff --git a/src/localisation/replace/equip_naval_l_english.yml b/src/localisation/replace/equip_naval_l_english.yml index b81508d..212ca08 100755 --- a/src/localisation/replace/equip_naval_l_english.yml +++ b/src/localisation/replace/equip_naval_l_english.yml @@ -66,10 +66,10 @@ vnr_ship_hull_submarine_4: "现代潜艇船体" vnr_ship_hull_pre_dreadnought: "前无畏舰" vnr_ship_hull_pre_dreadnought_desc: "随着19世纪90年代的威严级战列舰登上历史舞台，前无畏舰取代了19世纪70年代至80年代的铁甲舰。前无畏舰以钢制成，有坚固的钢制装甲保护，其主炮塔上装备有重型火炮，副炮塔上则有一组或多组轻型武器。\n\n由于“无畏舰”的出现，它们多在世界大战爆发前就退出了历史舞台，再加上过去三十年中以无畏舰为基础建造的钢铁巨兽轮番登场，如今只有少数前无畏舰仍在海军中服役。" - vnr_ship_hull_cruiser_panzerschiff: "袖珍战列舰" - GER_vnr_ship_hull_cruiser_panzerschiff: "装甲舰" + vnr_ship_hull_cruiser_panzerschiff: "袖珍战列舰船体" + GER_vnr_ship_hull_cruiser_panzerschiff: "装甲舰船体" vnr_ship_hull_cruiser_panzerschiff_desc: "作为一种绕过凡尔赛条约限制的激进方案，德国战争海军首次在三十年代发展了装甲舰，并作为海军临时的主力舰使用，一些国家也将其称为袖珍战列舰。由于拥有介于重巡洋舰和战列巡洋舰之间的火力水平，装甲舰在面对普通巡洋舰的一对一战斗中具有一定的优势，但却无力对抗一支有着良好组织且架构合理的舰队。\n一些类似的设计也曾见于包括日本和美国在内的海军早期的设计计划中，例如B65超甲巡等，只不过这些设计从未被实现过。" - vnr_ship_hull_cruiser_coastal_defense_ship: "岸防舰艇" + vnr_ship_hull_cruiser_coastal_defense_ship: "岸防舰艇船体" vnr_ship_hull_cruiser_coastal_defense_ship_desc: "岸防舰艇是一种小型战舰，其体型往往与巡洋舰相当，它们牺牲了速度和航程，换来了更为厚实的装甲和更为强大的武器。对造不起正儿八经战列舰的国家和那些只需要有能在本国海岸附近执行任务的浅吃水舰艇的国家来说，这类“岸防舰艇”可谓是性价比优异。" vnr_ship_hull_super_heavy_1: "超重型船体" vnr_ship_hull_cruiser_submarine: "大型潜艇船体" @@ -85,7 +85,7 @@ vnr_ship_hull_cruiser_6_desc: "第二次世界大战期间，空中力量的长足发展极大地改变了海战的形式，从此制空权成为海军作战中最不可或缺的主导因素之一。即使是最快的巡洋舰也无法通过快速机动躲避航空攻击，而如今舰载机使用的鱼雷等武器已经对战舰形成了中距离的拒止能力。\n\n在导弹出现后，战列舰很快便被淘汰了，而巡洋舰在二十世纪后半叶几乎成为了世界上最大的主力舰。它们当中的一部分使用了全导弹化设计甚至还装备有核动力引擎。" vnr_ship_hull_submarine_5: "冷战潜艇船体" vnr_ship_hull_submarine_5_desc: "时至50年代，核动力逐渐取代柴电混合动力，成为了海军大国的潜艇的主流动力方案。在此基础上，强国们还发展了一些设备用于从海水中提取氧气。这两类创新完全改变了潜艇的作战能力，最新的核动力潜艇可以保持潜航状态长达数周甚至数月。" - vnr_ship_hull_torpedo_cruiser: "鱼雷巡洋舰" + vnr_ship_hull_torpedo_cruiser: "鱼雷巡洋舰船体" vnr_ship_hull_torpedo_cruiser_desc: "以拆除一些主炮和防空炮为代价，搭载着大量鱼雷发射管的轻巡洋舰。" ship_hull_civilian: "辅助船" ocean_liner_equipment: "远洋客轮" @@ -97,4 +97,6 @@ vnr_ship_hull_mega_carrier: "战略打击航母船体" vnr_ship_hull_mega_carrier_desc: "四十年代末期，核武器的威力已经在实战中得到验证，其在人口稠密的大城市引爆的恐怖损失迫使各国发展和部署具有核三位一体打击能力的武器与平台。在洲际导弹普及之前，使用重型喷气式轰炸机是唯一能向远距离投放核武器的核打击形式。这促使海军提出了一种能够支援这类行动的机动平台，也就是打击航母。" vnr_ship_hull_arsenal_ship: "武库舰船体" - vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" \ No newline at end of file + vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" + vnr_ship_hull_escort_carrier: "护航航母船体" + vnr_ship_hull_escort_carrier_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" \ No newline at end of file diff --git a/src/localisation/replace/naval_units_l_english.yml b/src/localisation/replace/naval_units_l_english.yml index 94e5eef..cbde26d 100755 --- a/src/localisation/replace/naval_units_l_english.yml +++ b/src/localisation/replace/naval_units_l_english.yml @@ -1,7 +1,7 @@ l_english: submarine: "潜艇" submarine_desc: "§H潜艇§!\n\n\n\n\n£GFX_ss_desc_icon\n\n\n\n\n\n潜艇被称为隐秘的死神，这种舰船可以从水下利用鱼雷发动攻击，或者浮出水面用甲板炮摧毁敌舰。虽然潜艇在未来的战争中扮演的角色已经十分明确，但国际惯例仍然对其猎杀商船的行动方式有着约束效应，这一般要求潜艇在确保商船船员转移到安全位置后再行击沉。与此同时，技术的进步在潜艇的航程、耐力和可靠性方面起到了重要作用，这也使它们成为了舰队侦察的核心力量，如果能够运用得当，也会是一件致命的武器。" - both_cruisers_desc: "§H巡洋舰§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n轻巡洋舰 - 由防护巡洋舰发展而来的轻型化舰体，其主要目标是为主力舰提供屏卫，驱离灵活的驱逐舰，同时也可以用威力巨大的鱼雷攻击缓慢的主力舰。\n\n重巡洋舰 - 由防护巡洋舰发展而来的重型化舰体，可执行非常多样的任务，包括独自袭扰敌方补给线或者在舰队当中担任斥候的角色。对于无力负担主力舰的国家而言是一个经济的选择。" + both_cruisers_desc: "§HCruiser§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n轻巡洋舰 - 由防护巡洋舰发展而来的轻型化舰体，其主要目标是为主力舰提供屏卫，驱离灵活的驱逐舰，同时也可以用威力巨大的鱼雷攻击缓慢的主力舰。\n\n重巡洋舰 - 由防护巡洋舰发展而来的重型化舰体，可执行非常多样的任务，包括独自袭扰敌方补给线或者在舰队当中担任斥候的角色。对于无力负担主力舰的国家而言是一个经济的选择。" light_cruiser: "轻型巡洋舰" light_cruiser_desc: "§H轻型巡洋舰§!\n\n\n\n\n£GFX_cl_desc_icon\n\n\n\n\n\n轻型巡洋舰有着防护巡洋舰发展而来的轻量化船体，是舰队中用途多样的中流砥柱，通常配备了6英寸主炮。从前出侦察到指挥鱼雷战队，再到保护舰队免受敌方驱逐舰袭扰，它们负担的任务种类也非常繁多。轻型巡洋舰在各国海军的保有量较多，远超重型巡洋舰，这也使它们成为了巡逻舰队和殖民地舰队的中坚力量。" heavy_cruiser: "重型主力巡洋舰" @@ -31,4 +31,5 @@ damaged_armored_flight_deck: "装甲甲板受损" gas_leakage: "油气泄露" medium_cruiser: "重型舰队巡洋舰" - medium_cruiser_desc: "§H重型巡洋舰§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n重型巡洋舰有着防护巡洋舰发展而来的大型化舰体，并且通常配备了8英寸主炮和不错的装甲。这些舰船被设计为长程护航舰或破袭舰，在有些时候还可以依靠比战列舰快得多的航速担任舰队的前卫。部分国家发展了这种巡洋舰，并将其作为巡洋舰部队的核心。" \ No newline at end of file + medium_cruiser_desc: "§H重型巡洋舰§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n重型巡洋舰有着防护巡洋舰发展而来的大型化舰体，并且通常配备了8英寸主炮和不错的装甲。这些舰船被设计为长程护航舰或破袭舰，在有些时候还可以依靠比战列舰快得多的航速担任舰队的前卫。部分国家发展了这种巡洋舰，并将其作为巡洋舰部队的核心。" + damaged_bb_flight_deck: "甲板受损" \ No newline at end of file diff --git a/src/localisation/replace/navy_rework_welcome_l_english.yml b/src/localisation/replace/navy_rework_welcome_l_english.yml index f56db26..cf322ac 100755 --- a/src/localisation/replace/navy_rework_welcome_l_english.yml +++ b/src/localisation/replace/navy_rework_welcome_l_english.yml @@ -4,7 +4,7 @@ navy_rework_welcome_splash_tab_3: "额外信息" navy_rework_welcome_splash_tab_4: "致谢" navy_rework_options_button_text: "继续" - navy_rework_welcome_splash_tab_1_content: "§Hv2.4 “铁底湾”§!\n\n§C重要新增：§!\n\n-新立绘：大和（1965现代化改装），镇海，安德烈亚·多利亚（1926），柯尔贝尔（导弹改装），伊丽莎白女王（1941）\n-新角色：护航航母\n-增加了在局中开启专家AI模式的决议\n-舰载机在陆上的单个机队规模被减少为10架，防止出现航母沉船吃飞机库存的问题\n-重做甲弹对抗公式，平衡轻炮对重甲的效果\n-大幅增加暴击时损坏关键部件的几率\n-为大部分科技的鼠标悬浮弹窗增加了艺术图\n\n§C更新：§!\n\n-安德烈亚·多利亚级战列舰在开局时处于现役未改装的状态\n-博尔扎诺级现在采用战间期巡洋舰船体\n-希佩尔海军上将级巡洋舰现在拥有额外装甲模块\n-日本开局拥有声呐科技\n-为苏/俄添加专属的海军学院军官团精神\n-舰载机对组织度的伤害系数降低到合理水平\n-舰载机空袭的基础时间间隔回调到3小时\n-重做经验和护航带来的加成和惩罚数值\n-商船航母现在必须使用民用材料\n-一些航母科技现在可以提供航空技术突破点\n-小国的海军生产AI现在只检查舰队规模，不再检查船厂数量\n-为AI加强的数值中加入船厂建造速度和设计花费减免\n-雷达和桅杆观察哨将互斥\n-为AI加入了平衡多用途驱逐舰的花费减免\n-降低潜艇船体和耐压艇壳的花费\n-调整一些航母模块的效果\n-水上飞机弹射器会带来可见度惩罚\n-在自动科技解锁模式下，如果玩家选择超前研究，AI也会相应进行超前解锁\n\n§C修复：§!\n\n-海军单位经验获取系数从0.1回调到0.8\n-德国可以正常使用一战时期的驱逐舰立绘了\n-修复一些海军大国仍然可以使用海军发展决议的问题\n-修复要塞上限失效的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv2.5 “圣克鲁斯”§!\n\n§C重要新增：§!\n\n-新特殊项目：潜艇通气管\n-新科技：归航信标\n-新模块：通气管原型，轻型燃气轮机，巡洋舰燃气轮机\n-降低所有船体的资源消耗到合适的水平\n-增加开局规则，允许美国、英国和日本的开局舰队全部转为专家设计\n\n§C更新：§!\n\n-航母夜战科技被新科技替换\n-移除燃气轮机科技和重型燃气轮机模块，轻型和巡洋舰燃气轮机分别由相关的冷战科技解锁\n-移除护航航母科技，改为1940航母船体科技附赠\n-增加小型机库的造价\n-平衡一些模块的可靠性修正\n-强力甲板现在被重新分类为飞行甲板模块\n-平衡超重型主炮和超重引擎的速度修正\n-水上飞机弹射器会降低更多的航速\n-为航空战列舰增加甲板致命伤效果\n-平衡战列舰防御相关模块的效果\n-增加装甲甲板的造价\n-增加深水炸弹模块的速度惩罚\n-将小型机库和航空战列舰机库单独划为特殊机库种类\n-增加一些小几率出现的致命损伤所造成的伤害\n-增加所有炮弹模块带来的命中率修正（正面或负面皆有）\n-降低一些舰炮科技的科研时间\n-更新部分AI模板\n-略微降低美国AI大规模建造船坞的倾向\n-降低AI海军分配到护航和水雷战相关任务的编队数\n-微调海军条约的吨位限制\n-加强舰队防空对减伤效果的加成\n-改进部分规则文字的描述，指向性更加明确\n-重做设计器中舰炮大类的图标\n\n§C修复：§!\n\n-修复AI科技自动解锁模式开启时AI无法正确获取雷达的问题\n-修复部分国家由于缺少超重型船体项目无法选择国策的问题\n-修复商船航母有民用材料时无法建造的问题\n-修复巡洋舰可以安装两个炮弹模块的问题\n\n感谢你的游玩！" navy_rework_welcome_splash_tab_2_content: "§H这里包含了你想知道的关于海军重置的一切。§!\n\n§C设计器-§!\n£white_dot 在设计§Y驱逐舰§!、§Y巡洋舰§!或§Y战列舰§!的时候，§Y主炮§!是和历史唯一的一一对应的装备。由于它们的火力和穿甲据此做了平衡，§R请确保它们的数量和现实中接近§!。诸如§Y副炮§!和§Y鱼雷§!等装备则与原版没有区别。\n£white_dot 一些在原版受限的装备在本模组中是开放的，比如你可以建造超重炮战列舰，轻炮重巡，无甲巡洋舰等等。\n£white_dot 舰船角色在驱逐舰和巡洋舰上是必须的，它们可以提供不同的增益并解锁特殊的部件。\n£white_dot 巡洋舰的主力屏卫之分不由主炮口径为标准。所有巡洋舰（除装甲舰外）都初始默认为屏卫舰，且需要特殊的角色才能让它们成为主力舰。\n£white_dot §Y导弹§!可以安装在晚期的重型或巡洋舰船体上，不过后者需要专门的导弹巡洋舰角色来安装。\n£white_dot 此模组中实现最大屏卫效率的屏卫/主力比例为2\n£white_dot 鱼雷可以对重型舰船造成巨量的伤害，不过重型装甲只能提供非常有限的鱼雷防护，你需要安装§Y鱼雷防御系统§!来避免这一点。\n£white_dot 主炮的穿甲经过一定的平衡。其基础穿深为同时期装甲的1.1倍，这也意味着基础的装甲钢和混合防护方案可以避免被击穿，而下一代主炮则可以击穿使用重点防护的该型战舰。\n£white_dot 海战中的甲弹对抗公式以如下规则计算，穿甲和装甲的比值与伤害权重之间的映射关系为：超过200%为200%伤害，100%到200%为100%伤害，85%到100%为70%伤害，75%到85%为60%伤害，70%到75%为45%伤害，65%到70%为35%伤害，60%到65%为20%伤害，55%到60%为10%伤害，50%到55%为5%伤害，30%到50%为2%伤害，小于30%为1%伤害。\n£white_dot §Y超重型主炮§!根据炮管数量和§Y重型主炮§!归类在一起，但是它们仍然在某些船体上受到安装限制。\n£white_dot 设计器中的舰船分类符号可以帮助你更好地管理舰队。其仅仅表示该国对舰船的分类和定义，没有实际效果。\n£white_dot 辅助船非常脆弱，但是航程极长。由于舰队最大航程是由平均数决定的，因此在舰队中加入一些辅助船可以增加航程。\n\n§C科技树-§!\n£white_dot 尽管科技树的外观变化巨大，但是它的本质仍然和原版类似，你不需要花费大量时间去理解。\n£white_dot 并不是所有科技都是有价值的，请根据你的战略和地缘情况理智选择。\n£white_dot 子科技需要船体科技研究完成才能解锁。其中有一些还需要非海军科技的进步来推动。例如，主动声呐需要被动声呐研究完成，而一些火控系统则需要工程科技的进步作为前提。\n\n§C海战-§!\n£white_dot 海战的最短时间§Y已经被提高到20小时，主力舰在第22小时开火，其他舰艇在第30小时开火§!，而§G航母则可以在刚加入战斗时就参与进攻§!。§Y航母堆叠限制§!被放宽到6。你使用舰载机的方式在本模组中更加重要。\n£white_dot 舰艇的防空和舰载战斗机的伤害与命中率都获得了提升。一支没有战斗机护航的航母舰队可能会在进攻中损失更多的舰载机。\n£white_dot 基础的阵位被削减为50%，但优势的水面探测数值可以带来最多20%的阵位奖励。\n£white_dot 堆叠带来的阵位惩罚为每超过敌方数量的100%时增加30%，最高可达150%。只有舰队规模超过65时才会触发。\n£white_dot 水上飞机弹射器、航母和声呐在反潜战中的表现都更加有用和强力，而§Y潜艇§!基础的§Y可见度§!相较原版被§R增加§!了，在面对有良好反潜能力的舰队时，潜艇不再拥有优势。\n£white_dot AI的设计模板是刻意默认设置为§Y史实向§!的。尽管这些模板比原版要强一些，但是过去的最优设计仍然是有效的。\n\n§C其他-§!\n£white_dot 玩家和AI都享有§G-15%§!海军燃料消耗减免。\n£white_dot 单个船厂的产出已被提高到§G160%§!，一般在没有加成的情况下，建造一艘满配战列舰的时间在1-2年之间。\n£white_dot AI控制的主要国家会分别在1940年，1943年，1945年和冷战时期（如果没有投降的话）获得一批海军科技和独特的舰船设计。\n£white_dot AI会根据历史上的学说选择和战争情况选择不同的海军建造策略（包括舰载机）。例如，原版的§g德国§!会更加专注于潜艇，而§B美国§!则会重视航母。" navy_rework_welcome_splash_tab_3_content: "§H这里罗列关于海军重置的其他信息。§!\n\n§C兼容性-§!\n£white_dot 除非有§Y兼容包§!，本模组与修改科技树的模组不兼容，已有的兼容包链接都会在创意工坊界面列出。\n£white_dot §R所有生成舰船设计的国策/事件/决议都会失效，这是为了兼容性的考量和必要牺牲。§!\n\n§C二次创作-§!\n£white_dot 除了56之路外，不会再有其他的官方兼容包发布，希望社区可以更多地参与此事。目前日共重置与日本史实国策重做已完全兼容本模组。\n£white_dot 所有人都可以随意利用本模组的资源（代码/图标/文本），但在使用中请标明出处并通知我。感谢你的理解。" navy_rework_welcome_splash_tab_4_content: "大家好，海军重置已经走过了艰难的开发阶段，如今史实设计器、初始海军编制和设计、图标和科技树都已经基本完成，整个大框架完成后，剩余的工作便是进一步丰富和扩充，而这相比之前的开拓等等都要简单一些。借此机会我想和大家讲讲这个mod的过去和未来。\n\n我是2016年入的钢4坑，在加里波第的噩梦版本，也就是0.6时期接触到的KR，当时就被它详实有趣的世界观所吸引，之后几年KR一直是我玩的最多的mod之一。KR在0.8发布了海军重做，也是我最喜欢最兴奋的一个版本，由此我开始对海军感兴趣，也越发经常地想象KR世界观中的海军和军舰会是什么样子的。\n\n2021年春节前夕的一个周五下午，我在办公室摸鱼逛reddit，看到了一位外国网友写的对KR中加拿大和日本海军的战舰原型考证，这篇文章深深吸引了我，我用了一个下午翻译后发布到了贴吧上，收获了很多人的支持。尽管后来因为屏蔽的问题我转战知乎，但我始终将KR海军考据的系列坚持了下来，从海军大国到一些特色小国我都查阅了大量资料，也为这个mod打下了基础。\n\n在KR0.22更新之前，开发因为一些原因多次削减了海军的内容，我一直感到很遗憾，0.22的大改给了我这个动力去做之前我不敢想的事情。虽然写代码是我的老本行，但是美工、文案和汉译英等等我都是从头开始学，一次次试错，一个人陆陆续续弄了大半年，发布了KR和KX两版，才做到现在这个地步，我从中也学到了很多。如今，我们也终于迎来了原版海军重置的发布。\n\n我想借这个机会感谢所有在这个过程中帮助我的朋友和玩家，包括启发我的reddit网友Tragic-tragedy，贴吧上对我的史料斧正的朋友，在知乎上追更的朋友，还有许多订阅海军重置的玩家，没有你们的支持就没有这个mod，谢谢你们！\n\n最后，我还想借此机会感谢我的外公，他曾在中国人民解放军海军服役了几十年，在我的孩提时代启发了我对海军的认识。上世纪七八十年代，我的外公分别在几艘海军科考船上服役，担任过气象专家和部门政委等职务，他的大部分军旅生涯是在向阳红10号船上度过的，这也是当时中国自主设计建造的吨位最大的远洋科考船。1980年，向阳红10号作为新中国历史上最大规模远洋舰队的一员参加了中国第一次洲际弹道导弹发射试验，这就是大家熟知的580任务。我的外公当时负责气象部门，为回收导弹黑匣子的时间窗口提供预报支持。四年后，他随船参加了中国第一次南极科考任务，并在乔治王岛参与了长城站的建设。向阳红10号船之后被改装成了远望4号，在2007年遇到事故损坏，最后成了东风21D的靶子，每每说起来，他还是有些惋惜。我能看出来他对曾经的海军生涯有着复杂的情感，一方面为对国家做出贡献而感到骄傲光荣，而另一方面又为错过了孩子们的成长感到缺憾。不过尽管如此，他从小给我讲述的故事仍然点燃了我对海军的兴趣，为这个mod播下了一颗种子。\n\n随着我现在工作生活越来越忙，不知道海军重置还能维持多久，所以我在此也希望成立一个小团队，用半做半学的方式，把这个mod延续下去。\n\n有兴趣加我qq：1245385638，或海军重置群：162239327" \ No newline at end of file diff --git a/src/localisation/replace/preset_names_l_english.yml b/src/localisation/replace/preset_names_l_english.yml index 7f26846..3fb3434 100755 --- a/src/localisation/replace/preset_names_l_english.yml +++ b/src/localisation/replace/preset_names_l_english.yml @@ -343,4 +343,5 @@ SOV_submarine_equipment_4: "独角鲸级" SOV_submarine_equipment_5: "鲸鱼级" SOV_submarine_equipment_sc: "K级" - submarine_equipment_sc: "巡洋潜艇" \ No newline at end of file + submarine_equipment_sc: "巡洋潜艇" + vnr_cl_1949_expert: "1949专家轻巡" \ No newline at end of file diff --git a/src/localisation/replace/research_l_english.yml b/src/localisation/replace/research_l_english.yml index 0619e57..d2b7571 100755 --- a/src/localisation/replace/research_l_english.yml +++ b/src/localisation/replace/research_l_english.yml @@ -88,8 +88,6 @@ rudder_upgrade_desc: "通过使用改良过的舵机，舰船可以实现灵活转向，更小的转弯半径有利于舰队调整阵型或者尽快撤退。" battleship_aa_upgrade: "战列舰防空改装" battleship_aa_upgrade_desc: "航母在战争中展现出的实战价值推动了各海军强国将注意力转移至航母战斗群，战列舰的地位似乎已大不如前。但是航母在缺乏战舰护航的情况下仍然十分脆弱，战列舰的体型为舰队防空提供了平台，这些安装了大量防空炮的战列舰开始出现在航母的身边担当护卫。" - gas_turbine: "燃气轮机" - gas_turbine_desc: "燃气轮机是以连续流动的气体为工质带动叶轮高速旋转，将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多，但是受限于耐热材料等技术缺陷，燃气轮机目前的应用场景还比较有限。" fuel_tank_upgrade: "大型燃料舱" fuel_tank_upgrade_desc: "建成一支全球海军的标准就是该国的舰队可以在任何情况下部署到远离其核心势力范围的地方，并在当地有效地执行威慑，这对海军舰艇的航程提出了要求，更大的燃料舱有助于实现这一目标。" radar_jammer: "雷达干扰装置" @@ -104,12 +102,8 @@ arresting_gear_desc: "舰载机阻拦着陆装置是航母上的重要辅助设备，实现了舰载机在有限的甲板长度上安全地着舰。阻拦索是这一装置最重要的一环，其通过高强度的绳索钩住舰载机的挂钩。如果阻拦索无法起到作用，拦机网将成为最后一道防线。" aviation_dawn: "航空黎明" aviation_dawn_desc: "从最初的莱特飞行器到如今的单翼机，飞机工业的革命带来了结构强度更高、抗腐蚀性更好的材料。随着海军航空兵的发展，其在舰队中的地位也相应得到了提高，日本海军、英国皇家海军和美国海军都在二十年代末和三十年代初组织了大量规模各异的作战演习，从中总结了很多舰载机的战术。由于这一兵种极高的技术门槛，任何一国的海军若是想要建成一支强大的海航力量都必须经过实践。\n\n然而对于任何一支拥有大量战列舰的海军而言，想要在海战理论上改变航向都将是困难的，也注定会受到来自既得利益集团的阻力。\n\n§R航空时代来临了，大舰巨炮也许终究会被扫进垃圾桶......§!" - night_air_strike: "夜间空袭" - night_air_strike_desc: "夜间航行是一项极为危险的任务，但也正因为它的危险性，往往可以起到出其不意的效果。通过大量的夜间舰载机起降训练，飞行员和航母地勤队伍逐渐具备了在部分照明条件较好的夜晚发动有效空袭的能力。" carrier_mass_production: "航母大规模生产" carrier_mass_production_desc: "经过多年的发展，航母已不再是一艘安装了木制直通甲板的简陋船舶了，相反，在航空母舰上应用的新技术越来越多，甚至大有超越战列舰的趋势，全新的建造模式可以让航母的下水时间提前。" - vnr_ship_hull_escort_carrier: "护航航母" - vnr_ship_hull_escort_carrier_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" folding_wing: "折叠机翼" folding_wing_desc: "第二次世界大战的海战是立体的、海空联动的全新作战方式，而舰载机在其中扮演的角色至关重要。为了使航母能一次性搭载更多飞机执行任务，航空设计师开始在飞机上采用折叠机翼以最大程度地节省甲板和机库空间，但是这一技术对飞机机翼的工艺要求很高。" carrier_damage_control: "航母综合损害管制" @@ -273,7 +267,7 @@ naval_tactical_data_system: "海军战术数据系统" naval_tactical_data_system_desc: "海军战术数据系统（NTDS）是20世纪50年代开发的用于战舰的计算机信息处理系统。它可以从不同船只上的多个传感器获取报告，并将其整理以生成一张统一的战场态势图。然后，这些信息可以被转发回船只和​​武器操作员。" tactical_air_navigation_system: "战术空中导航系统" - tactical_air_navigation_system_desc: "战术空中导航系统通常简称为TACAN，是军用飞机使用的导航系统，它可以为使用者提供到地面机场或航母的方位和距离等航行信息。" + tactical_air_navigation_system_desc: "战术空中导航系统通常简称为TACAN，是军用飞机使用的导航系统，相比过去的单源无线电信标在性能上有了较大提升，它可以为使用者提供到地面机场或航母的方位和距离等航行信息。" TITLE_FLEET_IN_BEING: "舰队决战" TITLE_TRADE_INTERDICTION: "交通线破袭" TITLE_BASE_STRIKE: "空海一体战" @@ -427,4 +421,8 @@ bb_tech_10_tt: "\n\n\n\n\n£GFX_bb_tech_10\n\n\n\n\n\n" ca_tech_10_tt: "\n\n\n\n\n£GFX_ca_tech_10\n\n\n\n\n\n" ca_tech_11_tt: "\n\n\n\n\n£GFX_ca_tech_11\n\n\n\n\n\n" - dd_tech_9_tt: "\n\n\n\n\n£GFX_dd_tech_9\n\n\n\n\n\n" \ No newline at end of file + dd_tech_9_tt: "\n\n\n\n\n£GFX_dd_tech_9\n\n\n\n\n\n" + carrier_radio_range: "归航信标" + carrier_radio_range_desc: "随着近些年来舰载机在载荷与航程方面的崛起，航母作战面临着一项重大挑战：任务结束后，飞行员如何在茫茫大海上找到并返回移动中的航母。无线电技术的进步在一定程度上解决了这个问题。在这个构想中，航母会在有限的时间窗口内发送特定频率的无线电信号，就如同一个信标。携带有接收器的战斗机可以据此确定返航的航向以及会合时间表。这项技术对于在恶劣天气和超远距离作战的情况下安全回收起到了至关重要的作用。" + escort_carriers_ship: "护航航母" + escort_carriers_ship_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" \ No newline at end of file diff --git a/src/localisation/replace/ship_modules_l_english.yml b/src/localisation/replace/ship_modules_l_english.yml index e825be2..1ade3cf 100755 --- a/src/localisation/replace/ship_modules_l_english.yml +++ b/src/localisation/replace/ship_modules_l_english.yml @@ -158,9 +158,6 @@ heavy_ship_engine_2_diesel_desc:0 "这种引擎的推力比之前的要大得多，这种引擎可以使大型船只相较老式战舰拥有明显的速度优势。" heavy_ship_engine_3_diesel_desc:0 "随着装甲和火炮重量的增加，引擎也被设计得能够提供更高的速度，以便于追击逃跑的敌军，抑或是和比自己更强大的对手保持距离。" heavy_ship_engine_4_diesel_desc:0 "通过采用新材料和改进的锅炉设计，这种动力装置能使一艘现代战列舰跟上那些高速的航母和巡洋舰。" - heavy_ship_engine_4_gas: "250000马力引擎" - heavy_ship_engine_4_gas_short: "重型燃气轮机" - heavy_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" carrier_ship_engine_1_short: "航母蒸汽引擎 I" carrier_ship_engine_2_short: "航母蒸汽引擎 II" carrier_ship_engine_3_short: "航母蒸汽引擎 III" @@ -448,9 +445,9 @@ EQ_MOD_CAT_ship_airplane_launcher_TITLE: "飞机设施" EQ_MOD_CAT_ship_torpedo_sub_TITLE: "鱼雷舱" EQ_MOD_CAT_ship_secondaries_TITLE: "副炮组" - EQ_MOD_CAT_light_ship_engine_TITLE: "驱逐舰引擎" + EQ_MOD_CAT_light_ship_engine_TITLE: "轻型引擎" EQ_MOD_CAT_cruiser_ship_engine_TITLE: "巡洋舰引擎" - EQ_MOD_CAT_heavy_ship_engine_TITLE: "重型舰船引擎" + EQ_MOD_CAT_heavy_ship_engine_TITLE: "重型引擎" EQ_MOD_CAT_carrier_ship_engine_TITLE: "航空母舰引擎" EQ_MOD_CAT_sub_ship_engine_TITLE: "潜艇引擎" EQ_MOD_CAT_ship_radar_TITLE: "雷达" @@ -792,7 +789,7 @@ ship_hull_cruiser_role_cd_short: "岸防舰" ship_hull_cruiser_role_cd_desc: "体型接近巡洋舰的岸防舰艇。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" EQ_MOD_CAT_cds_role_TITLE: "岸防舰角色" - EQ_MOD_CAT_super_heavy_ship_engine_TITLE: "超重型蒸汽引擎" + EQ_MOD_CAT_super_heavy_ship_engine_TITLE: "超重型引擎" EQ_MOD_CAT_carrier_unit_TITLE: "航母指挥控制单位" EQ_MOD_CAT_carrier_miscellaneous_TITLE: "航母杂项装备" EQ_MOD_SLOT_fixed_ship_carrier_miscellaneous_slot_1_TITLE: "航母杂项1" @@ -814,13 +811,13 @@ carrier_fuel_storage_desc: "一个在航母内部用于储藏航空燃料的巨大容器。" carrier_civilian_material: "使用民用材料" carrier_civilian_material_short: "民用材料" - carrier_civilian_material_desc: "在航母上更多应用民用材料可以使它们的造价更便宜。\n\n§R最大组织度惩罚：-20%§!" + carrier_civilian_material_desc: "在航母上更多应用民用材料可以使它们的造价更便宜。\n§R此模块一旦安装后将难以拆除。§!\n\n§R最大组织度惩罚：-20%§!" carrier_secondary_island: "第二舰岛" carrier_secondary_island_short: "第二舰岛" carrier_secondary_island_desc: "一座飞行甲板上的副舰岛，可以将航母的航海和飞控部门分开，保证双方的工作效率。\n\n§G最大组织度加成：+5%§!" carrier_strength_deck: "船体集成强力甲板" carrier_strength_deck_short: "强力甲板" - carrier_strength_deck_desc: "强力甲板亦称上甲板，以高强度的甲板结构保证船体总纵强度稳定，这一部件与船体深度集成。" + carrier_strength_deck_desc: "强力甲板亦称上甲板，以高强度的甲板结构保证船体总纵强度稳定，这一部件与船体深度集成。\n\n§Y甲板受损几率：§!§G-25%§!\n§Y甲板受损惩罚：§!§G-50%§!" ship_deck_space_more: "大型开放式机库" ship_deck_space_more_short: "大型开放式机库" ship_deck_space_more_desc: "船舱内一块体积巨大的开放区域，可以为着舰的飞机进行维护和后勤。为船上增加更多的机库会使得造价飙升。\n\n§R最大组织度惩罚：-20%§!" @@ -921,10 +918,10 @@ EQ_MOD_SLOT_fixed_ship_flight_deck_slot_TITLE: "飞行甲板槽位" carrier_wooden_deck: "19mm飞行甲板" carrier_wooden_deck_short: "木制飞行甲板" - carrier_wooden_deck_desc: "一条木制的全通式飞行甲板。\n§R木制甲板可能在空袭中会遭受严重的损伤。§!" + carrier_wooden_deck_desc: "一条木制的全通式飞行甲板。" carrier_armor_deck: "90mm飞行甲板" carrier_armor_deck_short: "装甲飞行甲板" - carrier_armor_deck_desc: "一条使用装甲加固的全通式飞行甲板。\n§G装甲甲板可以降低在空袭中遭受致命一击的机会和效果。\n甲板遭受致命一击的几率会下降25%，减益下降一半。§!" + carrier_armor_deck_desc: "一条使用装甲加固的全通式飞行甲板。\n\n§Y甲板受损几率：§!§G-25%§!\n§Y甲板受损惩罚：§!§G-50%§!" EQ_MOD_CAT_ship_torpedo_bb_TITLE: "鱼雷发射管" ship_torpedo_bb: "450mm舷侧发射管" ship_torpedo_bb_short: "舷侧鱼雷发射管" @@ -1159,7 +1156,7 @@ ship_hull_carrier_role_cv_desc: "一艘为舰队行动设计的标准航母。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" ship_hull_carrier_role_cvl: "轻型航母角色" ship_hull_carrier_role_cvl_short: "轻型航母" - ship_hull_carrier_role_cvl_desc: "一艘规模和载机量都较为有限的航母。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" + ship_hull_carrier_role_cvl_desc: "一艘规模和载机量都较为有限的航母。\n\n§R最大组织度惩罚：-10%§!\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" EQ_MOD_CAT_coldwar_upgrade_bb_TITLE: "冷战战列舰改装" EQ_MOD_CAT_cv_role_TITLE: "航母角色" EQ_MOD_CAT_ship_carrier_armor_shbb_TITLE: "航母超重型装甲带" @@ -1189,4 +1186,15 @@ EQ_MOD_CAT_cve_role_TITLE: "护航航母角色" ship_hull_carrier_role_cve: "护航航母角色" ship_hull_carrier_role_cve_short: "护航航母" - ship_hull_carrier_role_cve_desc: "一艘用于商船队护航和反潜的小型航母。\n\n§R最大组织度惩罚：-20%§! " \ No newline at end of file + ship_hull_carrier_role_cve_desc: "一艘用于商船队护航和反潜的小型航母。\n\n§R最大组织度惩罚：-20%§! " + ship_sub_snorkel_0: "通气管原型" + ship_sub_snorkel_0_desc: "可以让潜艇引擎在水下继续工作，但目前该技术仍然十分不稳定。" + light_ship_engine_4_gas: "80000马力引擎" + light_ship_engine_4_gas_short: "轻型燃气轮机" + light_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" + cruiser_ship_engine_4_gas: "100000马力引擎" + cruiser_ship_engine_4_gas_short: "巡洋舰燃气轮机" + cruiser_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" + EQ_MOD_CAT_carrier_civilian_material_TITLE: "民用材料" + EQ_MOD_CAT_ship_deck_space_special_TITLE: "非常规机库" + EQ_MOD_CAT_ap_shell_TITLE: "穿甲弹" \ No newline at end of file diff --git a/src/localisation/replace/vnr_ai_l_english.yml b/src/localisation/replace/vnr_ai_l_english.yml index 784144f..e3e5848 100755 --- a/src/localisation/replace/vnr_ai_l_english.yml +++ b/src/localisation/replace/vnr_ai_l_english.yml @@ -17,8 +17,8 @@ RULE_AI_SHIP_DESIGN_STYLE: "AI舰船设计风格" RULE_OPTION_HISTORICAL: "史实" RULE_OPTION_EXPERT: "专家" - RULE_AI_SHIP_DESIGN_STYLE_HISTORICAL_DESC: "AI会依照史实方案设计舰船，这是过去海军重置一直采用的默认设计方法。" - RULE_AI_SHIP_DESIGN_STYLE_EXPERT_DESC: "AI会基于效率至上的目标设计和建造最优的模板。\n§R这个选项会让海战更加有挑战性，但是也意味着角色扮演的元素将会大幅减少。§!" + RULE_AI_SHIP_DESIGN_STYLE_HISTORICAL_DESC: "AI会依照史实方案，以符合现实的模块方案设计舰船。\n\n§C这是过去海军重置一直采用的默认设计方法。§!" + RULE_AI_SHIP_DESIGN_STYLE_EXPERT_DESC: "AI会基于效率至上的目标设计和建造最优的模板。\n\n这个选项会让海战§R更加有挑战性§!，但是也意味着§R角色扮演的元素将会大幅减少§!。§Y推荐想要更高挑战性的玩家使用。§!" buff_ai_production: "AI生产加强" buff_ai_production_desc: "这也太简单了。" vnr_ai.1.t: "选择海军AI生产强度" @@ -35,15 +35,15 @@ vnr_hard_production: "AI生产加强：§O困难§!" vnr_normal_production: "AI生产加强：§G普通§!" RULE_ALLOW_AI_TECH_AUTO_UNLOCK: "允许AI自动解锁科技" - RULE_ALLOW_AI_TECH_AUTO_UNLOCK_FREE_DESC: "AI会在游戏中自动解锁海军科技。" - RULE_ALLOW_AI_TECH_AUTO_UNLOCK_BLOCKED_DESC: "AI不会在游戏中自动解锁海军科技。\n§R这可能改变AI选择科技的倾向，并且影响其他方面的科研。§!" + RULE_ALLOW_AI_TECH_AUTO_UNLOCK_FREE_DESC: "§G开启§!AI在游戏中自动解锁海军科技。\n\n此选项包含了§RAI作弊§!，在玩家选择§C使用正常或作弊手段提前研究某些海军科技§!时，AI将也会§Y提前解锁部分科技§!。" + RULE_ALLOW_AI_TECH_AUTO_UNLOCK_BLOCKED_DESC: "§R关闭§!AI在游戏中自动解锁海军科技。\n\n这个选项将会§Y改变§!AI选择科技的行为，使其以§Y更加平衡的倾向§!进行科研，但是在海军科技的研究速度上会§R落后于§!§C专注投入海军§!的玩家，并且可能§R影响其他方面的科研§!。" RULE_SHIPYARD_OUTPUT_BOOST_BLOCKED_DESC: "船厂的产出为2.5点IC/日，与原版一致。" vnr_shipyard_output_boost: "海军重置船厂产出加成" join_tactical_data_link: "接入[ROOT.GetFactionName]海军战术数据链" join_tactical_data_link_desc: "一套联合战术数据链系统已经由我们阵营当中的领先成员部署成功。虽然这是一个加强我军与盟友协同作战能力的好机会，但是我们仍然可以独立开发一套自己的数据链系统。\n§C如果我们选择接入友方数据链，我们将不能研发自己的版本，但会立刻解锁以下加成：§!\n§Y海军协同性：§!§G+10%§!\n§Y海军组织度：§!§G+7.5%§!\n§Y可见度：§!§G-7.5%§!" RULE_AI_NAVAL_MANAGEMENT: "使用海军重置海军管理AI" - RULE_AI_NAVAL_MANAGEMENT_FREE_DESC: "在原版环境中§G启动§!海军舰队管理AI。\n§R请勿将本选项与修改地块和战略区域的mod混用。§!" - RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC: "在原版环境中§R关闭§!海军舰队管理AI。\n§Y使用原版或其他激活状态mod提供的海军AI。§!" + RULE_AI_NAVAL_MANAGEMENT_FREE_DESC: "在原版环境中§G启动§!海军舰队管理AI。\n\n此选项专为§Y历史模式§!设计，可以模拟历史上比较著名的海军战略例如§C无限制潜艇战§!或§C跳岛战术§!，使AI大国在§C史实的二战场景§!中表现得更加§Y真实和强大§!。\n\n§R此选项在以下场景中不推荐使用：§!\n£white_dot 架空历史模组（即使有兼容包）\n£white_dot 修改海域地块的模组\n£white_dot 非默认的二战场景（随机路线/非历史，任何偏离轴心对同盟的情况）" + RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC: "在原版环境中§R关闭§!海军舰队管理AI。\n\n§Y使用原版或其他处于激活状态模组提供的海军AI。§!" RULE_SHIPYARD_OUTPUT_BOOST_PLAYER: "玩家船厂产出加成" RULE_SHIPYARD_OUTPUT_BOOST_AI: "AI船厂产出加成" RULE_OPTION_BUFF_60: "增加全满" @@ -51,8 +51,8 @@ RULE_SHIPYARD_OUTPUT_BOOST_BUFF_60_DESC: "船厂的产出为4点IC/日，比原版§G快60%§!。" RULE_SHIPYARD_OUTPUT_BOOST_BUFF_30_DESC: "船厂的产出为3.25点IC/日，比原版§G快30%§!。" RULE_AI_AIR_DESIGN: "启用AI改进舰载机设计" - RULE_AI_AIR_DESIGN_FREE_DESC: "为AI§G启用§!改进过的舰载机设计模板。\n§R请勿将本选项与修改空军科技的mod混用。§!" - RULE_AI_AIR_DESIGN_BLOCKED_DESC: "为AI§R关闭§!改进过的舰载机设计模板。\n§Y使用原版或其他激活状态mod提供的飞机模板。§!" + RULE_AI_AIR_DESIGN_FREE_DESC: "为AI§G启用§!改进过的舰载机设计模板。\n\n§R此选项不推荐与修改空军科技或飞机设计器的模组混用。§!" + RULE_AI_AIR_DESIGN_BLOCKED_DESC: "为AI§R关闭§!改进过的舰载机设计模板。\n\n§Y使用原版或其他激活状态模组提供的飞机模板。§!" vnr_cv_plane_output_boost: "海军重置舰载机产出加成" enable_ai_ship_design: "AI舰船设计风格" enable_ai_plane_design: "AI舰载机设计风格" @@ -63,4 +63,9 @@ vnr_ai.3.t: "AI舰载机设计风格" vnr_ai.3.d: "§R虽然目前推荐的方式是在开局的规则设置中开启专家AI设计§!，但是为了以防你错过这一特性，你仍然可以在局中使用该决议开启专家设计。为了使AI可以快速从史实模板切换到专家模板，所有的AI大国将会立刻获得部分空军经验。\n\n§R请注意，该选项不能与修改过飞机科技和模块的模组一起使用。如果你开启了这类模组，请勿进行模板切换。§!" vnr_ai.3.1: "§R切换到专家设计§!" - vnr_ai.3.2: "§G切换到原版设计§!" \ No newline at end of file + vnr_ai.3.2: "§G切换到原版设计§!" + RULE_ENG_EXPERT_NAVY: "@ENG 专家皇家海军" + RULE_USA_EXPERT_NAVY: "@USA 专家美国海军" + RULE_JAP_EXPERT_NAVY: "@JAP 专家日本帝国海军" + RULE_AI_EXPERT_NAVY_BLOCKED_DESC: "此国家开局的舰队不会被替换。" + RULE_AI_EXPERT_NAVY_FREE_DESC: "此国家开局的舰队全部替换为专家设计。\n\n此选项仅在§YAI舰船设计风格§!设置为§C专家§!且该国家为§RAI控制§!时方可生效。" \ No newline at end of file diff --git a/src/localisation/replace/vnr_naval_develop_l_english.yml b/src/localisation/replace/vnr_naval_develop_l_english.yml index 06fc9b6..432c144 100755 --- a/src/localisation/replace/vnr_naval_develop_l_english.yml +++ b/src/localisation/replace/vnr_naval_develop_l_english.yml @@ -105,4 +105,6 @@ nakhimov_naval_academy: "纳希莫夫海军学院" nakhimov_naval_academy_desc: "作为世界上最富盛名的海军军官培训院校之一，这所学院在二月革命的烽火中脱胎于尼古拉耶夫学院而组建。每年，数百名经验丰富的学员从这里毕业并踏上仕途，渴望着为俄罗斯母亲献身。" usn_fighter_weapons_school: "TOPGUN" - usn_fighter_weapons_school_desc: "美国海军战斗机武器学校（俗称“TOPGUN”），是一项旨在为海军飞行员提供空战训练的教学课程，其目的不是为了基础训练而是培训经验丰富的航空教官。该学校通过空气动力学和战术技巧的相关课程，以及对精英主义的重视，意在将学员培养成最顶尖的飞行员。" \ No newline at end of file + usn_fighter_weapons_school_desc: "美国海军战斗机武器学校（俗称“TOPGUN”），是一项旨在为海军飞行员提供空战训练的教学课程，其目的不是为了基础训练而是培训经验丰富的航空教官。该学校通过空气动力学和战术技巧的相关课程，以及对精英主义的重视，意在将学员培养成最顶尖的飞行员。" + sp_submarine_snorkel: "潜艇通气管" + sp_submarine_snorkel_desc: "潜艇通气管是一种在潜艇潜航状态下伸出水面的装置，可以让潜艇发动机在水下仍然吸入空气并正常运转。" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/equip_naval_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/equip_naval_l_simp_chinese.yml index aa7c66d..5b8c3d4 100755 --- a/src/localisation/simp_chinese/replace/equip_naval_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/equip_naval_l_simp_chinese.yml @@ -66,10 +66,10 @@ vnr_ship_hull_submarine_4: "现代潜艇船体" vnr_ship_hull_pre_dreadnought: "前无畏舰" vnr_ship_hull_pre_dreadnought_desc: "随着19世纪90年代的威严级战列舰登上历史舞台，前无畏舰取代了19世纪70年代至80年代的铁甲舰。前无畏舰以钢制成，有坚固的钢制装甲保护，其主炮塔上装备有重型火炮，副炮塔上则有一组或多组轻型武器。\n\n由于“无畏舰”的出现，它们多在世界大战爆发前就退出了历史舞台，再加上过去三十年中以无畏舰为基础建造的钢铁巨兽轮番登场，如今只有少数前无畏舰仍在海军中服役。" - vnr_ship_hull_cruiser_panzerschiff: "袖珍战列舰" - GER_vnr_ship_hull_cruiser_panzerschiff: "装甲舰" + vnr_ship_hull_cruiser_panzerschiff: "袖珍战列舰船体" + GER_vnr_ship_hull_cruiser_panzerschiff: "装甲舰船体" vnr_ship_hull_cruiser_panzerschiff_desc: "作为一种绕过凡尔赛条约限制的激进方案，德国战争海军首次在三十年代发展了装甲舰，并作为海军临时的主力舰使用，一些国家也将其称为袖珍战列舰。由于拥有介于重巡洋舰和战列巡洋舰之间的火力水平，装甲舰在面对普通巡洋舰的一对一战斗中具有一定的优势，但却无力对抗一支有着良好组织且架构合理的舰队。\n一些类似的设计也曾见于包括日本和美国在内的海军早期的设计计划中，例如B65超甲巡等，只不过这些设计从未被实现过。" - vnr_ship_hull_cruiser_coastal_defense_ship: "岸防舰艇" + vnr_ship_hull_cruiser_coastal_defense_ship: "岸防舰艇船体" vnr_ship_hull_cruiser_coastal_defense_ship_desc: "岸防舰艇是一种小型战舰，其体型往往与巡洋舰相当，它们牺牲了速度和航程，换来了更为厚实的装甲和更为强大的武器。对造不起正儿八经战列舰的国家和那些只需要有能在本国海岸附近执行任务的浅吃水舰艇的国家来说，这类“岸防舰艇”可谓是性价比优异。" vnr_ship_hull_super_heavy_1: "超重型船体" vnr_ship_hull_cruiser_submarine: "大型潜艇船体" @@ -85,7 +85,7 @@ vnr_ship_hull_cruiser_6_desc: "第二次世界大战期间，空中力量的长足发展极大地改变了海战的形式，从此制空权成为海军作战中最不可或缺的主导因素之一。即使是最快的巡洋舰也无法通过快速机动躲避航空攻击，而如今舰载机使用的鱼雷等武器已经对战舰形成了中距离的拒止能力。\n\n在导弹出现后，战列舰很快便被淘汰了，而巡洋舰在二十世纪后半叶几乎成为了世界上最大的主力舰。它们当中的一部分使用了全导弹化设计甚至还装备有核动力引擎。" vnr_ship_hull_submarine_5: "冷战潜艇船体" vnr_ship_hull_submarine_5_desc: "时至50年代，核动力逐渐取代柴电混合动力，成为了海军大国的潜艇的主流动力方案。在此基础上，强国们还发展了一些设备用于从海水中提取氧气。这两类创新完全改变了潜艇的作战能力，最新的核动力潜艇可以保持潜航状态长达数周甚至数月。" - vnr_ship_hull_torpedo_cruiser: "鱼雷巡洋舰" + vnr_ship_hull_torpedo_cruiser: "鱼雷巡洋舰船体" vnr_ship_hull_torpedo_cruiser_desc: "以拆除一些主炮和防空炮为代价，搭载着大量鱼雷发射管的轻巡洋舰。" ship_hull_civilian: "辅助船" ocean_liner_equipment: "远洋客轮" @@ -97,4 +97,6 @@ vnr_ship_hull_mega_carrier: "战略打击航母船体" vnr_ship_hull_mega_carrier_desc: "四十年代末期，核武器的威力已经在实战中得到验证，其在人口稠密的大城市引爆的恐怖损失迫使各国发展和部署具有核三位一体打击能力的武器与平台。在洲际导弹普及之前，使用重型喷气式轰炸机是唯一能向远距离投放核武器的核打击形式。这促使海军提出了一种能够支援这类行动的机动平台，也就是打击航母。" vnr_ship_hull_arsenal_ship: "武库舰船体" - vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" \ No newline at end of file + vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" + vnr_ship_hull_escort_carrier: "护航航母船体" + vnr_ship_hull_escort_carrier_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/naval_units_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/naval_units_l_simp_chinese.yml index 6b045a1..ea4067b 100755 --- a/src/localisation/simp_chinese/replace/naval_units_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/naval_units_l_simp_chinese.yml @@ -31,4 +31,5 @@ damaged_armored_flight_deck: "装甲甲板受损" gas_leakage: "油气泄露" medium_cruiser: "重型舰队巡洋舰" - medium_cruiser_desc: "§H重型巡洋舰§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n重型巡洋舰有着防护巡洋舰发展而来的大型化舰体，并且通常配备了8英寸主炮和不错的装甲。这些舰船被设计为长程护航舰或破袭舰，在有些时候还可以依靠比战列舰快得多的航速担任舰队的前卫。部分国家发展了这种巡洋舰，并将其作为巡洋舰部队的核心。" \ No newline at end of file + medium_cruiser_desc: "§H重型巡洋舰§!\n\n\n\n\n£GFX_ca_desc_icon\n\n\n\n\n\n重型巡洋舰有着防护巡洋舰发展而来的大型化舰体，并且通常配备了8英寸主炮和不错的装甲。这些舰船被设计为长程护航舰或破袭舰，在有些时候还可以依靠比战列舰快得多的航速担任舰队的前卫。部分国家发展了这种巡洋舰，并将其作为巡洋舰部队的核心。" + damaged_bb_flight_deck: "甲板受损" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/navy_rework_welcome_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/navy_rework_welcome_l_simp_chinese.yml index 92392eb..f926dd0 100755 --- a/src/localisation/simp_chinese/replace/navy_rework_welcome_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/navy_rework_welcome_l_simp_chinese.yml @@ -4,7 +4,7 @@ navy_rework_welcome_splash_tab_3: "额外信息" navy_rework_welcome_splash_tab_4: "致谢" navy_rework_options_button_text: "继续" - navy_rework_welcome_splash_tab_1_content: "§Hv2.4 “铁底湾”§!\n\n§C重要新增：§!\n\n-新立绘：大和（1965现代化改装），镇海，安德烈亚·多利亚（1926），柯尔贝尔（导弹改装），伊丽莎白女王（1941）\n-新角色：护航航母\n-增加了在局中开启专家AI模式的决议\n-舰载机在陆上的单个机队规模被减少为10架，防止出现航母沉船吃飞机库存的问题\n-重做甲弹对抗公式，平衡轻炮对重甲的效果\n-大幅增加暴击时损坏关键部件的几率\n-为大部分科技的鼠标悬浮弹窗增加了艺术图\n\n§C更新：§!\n\n-安德烈亚·多利亚级战列舰在开局时处于现役未改装的状态\n-博尔扎诺级现在采用战间期巡洋舰船体\n-希佩尔海军上将级巡洋舰现在拥有额外装甲模块\n-日本开局拥有声呐科技\n-为苏/俄添加专属的海军学院军官团精神\n-舰载机对组织度的伤害系数降低到合理水平\n-舰载机空袭的基础时间间隔回调到3小时\n-重做经验和护航带来的加成和惩罚数值\n-商船航母现在必须使用民用材料\n-一些航母科技现在可以提供航空技术突破点\n-小国的海军生产AI现在只检查舰队规模，不再检查船厂数量\n-为AI加强的数值中加入船厂建造速度和设计花费减免\n-雷达和桅杆观察哨将互斥\n-为AI加入了平衡多用途驱逐舰的花费减免\n-降低潜艇船体和耐压艇壳的花费\n-调整一些航母模块的效果\n-水上飞机弹射器会带来可见度惩罚\n-在自动科技解锁模式下，如果玩家选择超前研究，AI也会相应进行超前解锁\n\n§C修复：§!\n\n-海军单位经验获取系数从0.1回调到0.8\n-德国可以正常使用一战时期的驱逐舰立绘了\n-修复一些海军大国仍然可以使用海军发展决议的问题\n-修复要塞上限失效的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv2.5 “圣克鲁斯”§!\n\n§C重要新增：§!\n\n-新特殊项目：潜艇通气管\n-新科技：归航信标\n-新模块：通气管原型，轻型燃气轮机，巡洋舰燃气轮机\n-降低所有船体的资源消耗到合适的水平\n-增加开局规则，允许美国、英国和日本的开局舰队全部转为专家设计\n\n§C更新：§!\n\n-航母夜战科技被新科技替换\n-移除燃气轮机科技和重型燃气轮机模块，轻型和巡洋舰燃气轮机分别由相关的冷战科技解锁\n-移除护航航母科技，改为1940航母船体科技附赠\n-增加小型机库的造价\n-平衡一些模块的可靠性修正\n-强力甲板现在被重新分类为飞行甲板模块\n-平衡超重型主炮和超重引擎的速度修正\n-水上飞机弹射器会降低更多的航速\n-为航空战列舰增加甲板致命伤效果\n-平衡战列舰防御相关模块的效果\n-增加装甲甲板的造价\n-增加深水炸弹模块的速度惩罚\n-将小型机库和航空战列舰机库单独划为特殊机库种类\n-增加一些小几率出现的致命损伤所造成的伤害\n-增加所有炮弹模块带来的命中率修正（正面或负面皆有）\n-降低一些舰炮科技的科研时间\n-更新部分AI模板\n-略微降低美国AI大规模建造船坞的倾向\n-降低AI海军分配到护航和水雷战相关任务的编队数\n-微调海军条约的吨位限制\n-加强舰队防空对减伤效果的加成\n-改进部分规则文字的描述，指向性更加明确\n-重做设计器中舰炮大类的图标\n\n§C修复：§!\n\n-修复AI科技自动解锁模式开启时AI无法正确获取雷达的问题\n-修复部分国家由于缺少超重型船体项目无法选择国策的问题\n-修复商船航母有民用材料时无法建造的问题\n-修复巡洋舰可以安装两个炮弹模块的问题\n\n感谢你的游玩！" navy_rework_welcome_splash_tab_2_content: "§H这里包含了你想知道的关于海军重置的一切。§!\n\n§C设计器-§!\n£white_dot 在设计§Y驱逐舰§!、§Y巡洋舰§!或§Y战列舰§!的时候，§Y主炮§!是和历史唯一的一一对应的装备。由于它们的火力和穿甲据此做了平衡，§R请确保它们的数量和现实中接近§!。诸如§Y副炮§!和§Y鱼雷§!等装备则与原版没有区别。\n£white_dot 一些在原版受限的装备在本模组中是开放的，比如你可以建造超重炮战列舰，轻炮重巡，无甲巡洋舰等等。\n£white_dot 舰船角色在驱逐舰和巡洋舰上是必须的，它们可以提供不同的增益并解锁特殊的部件。\n£white_dot 巡洋舰的主力屏卫之分不由主炮口径为标准。所有巡洋舰（除装甲舰外）都初始默认为屏卫舰，且需要特殊的角色才能让它们成为主力舰。\n£white_dot §Y导弹§!可以安装在晚期的重型或巡洋舰船体上，不过后者需要专门的导弹巡洋舰角色来安装。\n£white_dot 此模组中实现最大屏卫效率的屏卫/主力比例为2\n£white_dot 鱼雷可以对重型舰船造成巨量的伤害，不过重型装甲只能提供非常有限的鱼雷防护，你需要安装§Y鱼雷防御系统§!来避免这一点。\n£white_dot 主炮的穿甲经过一定的平衡。其基础穿深为同时期装甲的1.1倍，这也意味着基础的装甲钢和混合防护方案可以避免被击穿，而下一代主炮则可以击穿使用重点防护的该型战舰。\n£white_dot 海战中的甲弹对抗公式以如下规则计算，穿甲和装甲的比值与伤害权重之间的映射关系为：超过200%为200%伤害，100%到200%为100%伤害，85%到100%为70%伤害，75%到85%为60%伤害，70%到75%为45%伤害，65%到70%为35%伤害，60%到65%为20%伤害，55%到60%为10%伤害，50%到55%为5%伤害，30%到50%为2%伤害，小于30%为1%伤害。\n£white_dot §Y超重型主炮§!根据炮管数量和§Y重型主炮§!归类在一起，但是它们仍然在某些船体上受到安装限制。\n£white_dot 设计器中的舰船分类符号可以帮助你更好地管理舰队。其仅仅表示该国对舰船的分类和定义，没有实际效果。\n£white_dot 辅助船非常脆弱，但是航程极长。由于舰队最大航程是由平均数决定的，因此在舰队中加入一些辅助船可以增加航程。\n\n§C科技树-§!\n£white_dot 尽管科技树的外观变化巨大，但是它的本质仍然和原版类似，你不需要花费大量时间去理解。\n£white_dot 并不是所有科技都是有价值的，请根据你的战略和地缘情况理智选择。\n£white_dot 子科技需要船体科技研究完成才能解锁。其中有一些还需要非海军科技的进步来推动。例如，主动声呐需要被动声呐研究完成，而一些火控系统则需要工程科技的进步作为前提。\n\n§C海战-§!\n£white_dot 海战的最短时间§Y已经被提高到20小时，主力舰在第22小时开火，其他舰艇在第30小时开火§!，而§G航母则可以在刚加入战斗时就参与进攻§!。§Y航母堆叠限制§!被放宽到6。你使用舰载机的方式在本模组中更加重要。\n£white_dot 舰艇的防空和舰载战斗机的伤害与命中率都获得了提升。一支没有战斗机护航的航母舰队可能会在进攻中损失更多的舰载机。\n£white_dot 基础的阵位被削减为50%，但优势的水面探测数值可以带来最多20%的阵位奖励。\n£white_dot 堆叠带来的阵位惩罚为每超过敌方数量的100%时增加30%，最高可达150%。只有舰队规模超过65时才会触发。\n£white_dot 水上飞机弹射器、航母和声呐在反潜战中的表现都更加有用和强力，而§Y潜艇§!基础的§Y可见度§!相较原版被§R增加§!了，在面对有良好反潜能力的舰队时，潜艇不再拥有优势。\n£white_dot AI的设计模板是刻意默认设置为§Y史实向§!的。尽管这些模板比原版要强一些，但是过去的最优设计仍然是有效的。\n\n§C其他-§!\n£white_dot 玩家和AI都享有§G-15%§!海军燃料消耗减免。\n£white_dot 单个船厂的产出已被提高到§G160%§!，一般在没有加成的情况下，建造一艘满配战列舰的时间在1-2年之间。\n£white_dot AI控制的主要国家会分别在1940年，1943年，1945年和冷战时期（如果没有投降的话）获得一批海军科技和独特的舰船设计。\n£white_dot AI会根据历史上的学说选择和战争情况选择不同的海军建造策略（包括舰载机）。例如，原版的§g德国§!会更加专注于潜艇，而§B美国§!则会重视航母。" navy_rework_welcome_splash_tab_3_content: "§H这里罗列关于海军重置的其他信息。§!\n\n§C兼容性-§!\n£white_dot 除非有§Y兼容包§!，本模组与修改科技树的模组不兼容，已有的兼容包链接都会在创意工坊界面列出。\n£white_dot §R所有生成舰船设计的国策/事件/决议都会失效，这是为了兼容性的考量和必要牺牲。§!\n\n§C二次创作-§!\n£white_dot 除了56之路外，不会再有其他的官方兼容包发布，希望社区可以更多地参与此事。目前日共重置与日本史实国策重做已完全兼容本模组。\n£white_dot 所有人都可以随意利用本模组的资源（代码/图标/文本），但在使用中请标明出处并通知我。感谢你的理解。" navy_rework_welcome_splash_tab_4_content: "大家好，海军重置已经走过了艰难的开发阶段，如今史实设计器、初始海军编制和设计、图标和科技树都已经基本完成，整个大框架完成后，剩余的工作便是进一步丰富和扩充，而这相比之前的开拓等等都要简单一些。借此机会我想和大家讲讲这个mod的过去和未来。\n\n我是2016年入的钢4坑，在加里波第的噩梦版本，也就是0.6时期接触到的KR，当时就被它详实有趣的世界观所吸引，之后几年KR一直是我玩的最多的mod之一。KR在0.8发布了海军重做，也是我最喜欢最兴奋的一个版本，由此我开始对海军感兴趣，也越发经常地想象KR世界观中的海军和军舰会是什么样子的。\n\n2021年春节前夕的一个周五下午，我在办公室摸鱼逛reddit，看到了一位外国网友写的对KR中加拿大和日本海军的战舰原型考证，这篇文章深深吸引了我，我用了一个下午翻译后发布到了贴吧上，收获了很多人的支持。尽管后来因为屏蔽的问题我转战知乎，但我始终将KR海军考据的系列坚持了下来，从海军大国到一些特色小国我都查阅了大量资料，也为这个mod打下了基础。\n\n在KR0.22更新之前，开发因为一些原因多次削减了海军的内容，我一直感到很遗憾，0.22的大改给了我这个动力去做之前我不敢想的事情。虽然写代码是我的老本行，但是美工、文案和汉译英等等我都是从头开始学，一次次试错，一个人陆陆续续弄了大半年，发布了KR和KX两版，才做到现在这个地步，我从中也学到了很多。如今，我们也终于迎来了原版海军重置的发布。\n\n我想借这个机会感谢所有在这个过程中帮助我的朋友和玩家，包括启发我的reddit网友Tragic-tragedy，贴吧上对我的史料斧正的朋友，在知乎上追更的朋友，还有许多订阅海军重置的玩家，没有你们的支持就没有这个mod，谢谢你们！\n\n最后，我还想借此机会感谢我的外公，他曾在中国人民解放军海军服役了几十年，在我的孩提时代启发了我对海军的认识。上世纪七八十年代，我的外公分别在几艘海军科考船上服役，担任过气象专家和部门政委等职务，他的大部分军旅生涯是在向阳红10号船上度过的，这也是当时中国自主设计建造的吨位最大的远洋科考船。1980年，向阳红10号作为新中国历史上最大规模远洋舰队的一员参加了中国第一次洲际弹道导弹发射试验，这就是大家熟知的580任务。我的外公当时负责气象部门，为回收导弹黑匣子的时间窗口提供预报支持。四年后，他随船参加了中国第一次南极科考任务，并在乔治王岛参与了长城站的建设。向阳红10号船之后被改装成了远望4号，在2007年遇到事故损坏，最后成了东风21D的靶子，每每说起来，他还是有些惋惜。我能看出来他对曾经的海军生涯有着复杂的情感，一方面为对国家做出贡献而感到骄傲光荣，而另一方面又为错过了孩子们的成长感到缺憾。不过尽管如此，他从小给我讲述的故事仍然点燃了我对海军的兴趣，为这个mod播下了一颗种子。\n\n随着我现在工作生活越来越忙，不知道海军重置还能维持多久，所以我在此也希望成立一个小团队，用半做半学的方式，把这个mod延续下去。\n\n有兴趣加我qq：1245385638，或海军重置群：162239327" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/preset_names_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/preset_names_l_simp_chinese.yml index 1d87766..508c52a 100755 --- a/src/localisation/simp_chinese/replace/preset_names_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/preset_names_l_simp_chinese.yml @@ -343,4 +343,5 @@ SOV_submarine_equipment_4: "独角鲸级" SOV_submarine_equipment_5: "鲸鱼级" SOV_submarine_equipment_sc: "K级" - submarine_equipment_sc: "巡洋潜艇" \ No newline at end of file + submarine_equipment_sc: "巡洋潜艇" + vnr_cl_1949_expert: "1949专家轻巡" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml index 9db6776..b026e91 100755 --- a/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml @@ -88,8 +88,6 @@ rudder_upgrade_desc: "通过使用改良过的舵机，舰船可以实现灵活转向，更小的转弯半径有利于舰队调整阵型或者尽快撤退。" battleship_aa_upgrade: "战列舰防空改装" battleship_aa_upgrade_desc: "航母在战争中展现出的实战价值推动了各海军强国将注意力转移至航母战斗群，战列舰的地位似乎已大不如前。但是航母在缺乏战舰护航的情况下仍然十分脆弱，战列舰的体型为舰队防空提供了平台，这些安装了大量防空炮的战列舰开始出现在航母的身边担当护卫。" - gas_turbine: "燃气轮机" - gas_turbine_desc: "燃气轮机是以连续流动的气体为工质带动叶轮高速旋转，将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多，但是受限于耐热材料等技术缺陷，燃气轮机目前的应用场景还比较有限。" fuel_tank_upgrade: "大型燃料舱" fuel_tank_upgrade_desc: "建成一支全球海军的标准就是该国的舰队可以在任何情况下部署到远离其核心势力范围的地方，并在当地有效地执行威慑，这对海军舰艇的航程提出了要求，更大的燃料舱有助于实现这一目标。" radar_jammer: "雷达干扰装置" @@ -104,12 +102,8 @@ arresting_gear_desc: "舰载机阻拦着陆装置是航母上的重要辅助设备，实现了舰载机在有限的甲板长度上安全地着舰。阻拦索是这一装置最重要的一环，其通过高强度的绳索钩住舰载机的挂钩。如果阻拦索无法起到作用，拦机网将成为最后一道防线。" aviation_dawn: "航空黎明" aviation_dawn_desc: "从最初的莱特飞行器到如今的单翼机，飞机工业的革命带来了结构强度更高、抗腐蚀性更好的材料。随着海军航空兵的发展，其在舰队中的地位也相应得到了提高，日本海军、英国皇家海军和美国海军都在二十年代末和三十年代初组织了大量规模各异的作战演习，从中总结了很多舰载机的战术。由于这一兵种极高的技术门槛，任何一国的海军若是想要建成一支强大的海航力量都必须经过实践。\n\n然而对于任何一支拥有大量战列舰的海军而言，想要在海战理论上改变航向都将是困难的，也注定会受到来自既得利益集团的阻力。\n\n§R航空时代来临了，大舰巨炮也许终究会被扫进垃圾桶......§!" - night_air_strike: "夜间空袭" - night_air_strike_desc: "夜间航行是一项极为危险的任务，但也正因为它的危险性，往往可以起到出其不意的效果。通过大量的夜间舰载机起降训练，飞行员和航母地勤队伍逐渐具备了在部分照明条件较好的夜晚发动有效空袭的能力。" carrier_mass_production: "航母大规模生产" carrier_mass_production_desc: "经过多年的发展，航母已不再是一艘安装了木制直通甲板的简陋船舶了，相反，在航空母舰上应用的新技术越来越多，甚至大有超越战列舰的趋势，全新的建造模式可以让航母的下水时间提前。" - vnr_ship_hull_escort_carrier: "护航航母" - vnr_ship_hull_escort_carrier_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" folding_wing: "折叠机翼" folding_wing_desc: "第二次世界大战的海战是立体的、海空联动的全新作战方式，而舰载机在其中扮演的角色至关重要。为了使航母能一次性搭载更多飞机执行任务，航空设计师开始在飞机上采用折叠机翼以最大程度地节省甲板和机库空间，但是这一技术对飞机机翼的工艺要求很高。" carrier_damage_control: "航母综合损害管制" @@ -273,7 +267,7 @@ naval_tactical_data_system: "海军战术数据系统" naval_tactical_data_system_desc: "海军战术数据系统（NTDS）是20世纪50年代开发的用于战舰的计算机信息处理系统。它可以从不同船只上的多个传感器获取报告，并将其整理以生成一张统一的战场态势图。然后，这些信息可以被转发回船只和​​武器操作员。" tactical_air_navigation_system: "战术空中导航系统" - tactical_air_navigation_system_desc: "战术空中导航系统通常简称为TACAN，是军用飞机使用的导航系统，它可以为使用者提供到地面机场或航母的方位和距离等航行信息。" + tactical_air_navigation_system_desc: "战术空中导航系统通常简称为TACAN，是军用飞机使用的导航系统，相比过去的单源无线电信标在性能上有了较大提升，它可以为使用者提供到地面机场或航母的方位和距离等航行信息。" TITLE_FLEET_IN_BEING: "舰队决战" TITLE_TRADE_INTERDICTION: "交通线破袭" TITLE_BASE_STRIKE: "空海一体战" @@ -427,4 +421,8 @@ bb_tech_10_tt: "\n\n\n\n\n£GFX_bb_tech_10\n\n\n\n\n\n" ca_tech_10_tt: "\n\n\n\n\n£GFX_ca_tech_10\n\n\n\n\n\n" ca_tech_11_tt: "\n\n\n\n\n£GFX_ca_tech_11\n\n\n\n\n\n" - dd_tech_9_tt: "\n\n\n\n\n£GFX_dd_tech_9\n\n\n\n\n\n" \ No newline at end of file + dd_tech_9_tt: "\n\n\n\n\n£GFX_dd_tech_9\n\n\n\n\n\n" + carrier_radio_range: "归航信标" + carrier_radio_range_desc: "随着近些年来舰载机在载荷与航程方面的崛起，航母作战面临着一项重大挑战：任务结束后，飞行员如何在茫茫大海上找到并返回移动中的航母。无线电技术的进步在一定程度上解决了这个问题。在这个构想中，航母会在有限的时间窗口内发送特定频率的无线电信号，就如同一个信标。携带有接收器的战斗机可以据此确定返航的航向以及会合时间表。这项技术对于在恶劣天气和超远距离作战的情况下安全回收起到了至关重要的作用。" + escort_carriers_ship: "护航航母" + escort_carriers_ship_desc: "潜艇的进步导致参战国的海上航线受到了严重的威胁，虽然飞机的反潜效率较高，但是无法为大洋深处的商船队提供掩护，正规航母的价值又限制其必须用于正面战场。小巧的护航航母在此时出现，其拥有小型机库，因为使用了部分民船规格的部件，建造成本也非常便宜。" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml index a4673fc..43b3a94 100755 --- a/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml @@ -158,9 +158,6 @@ heavy_ship_engine_2_diesel_desc:0 "这种引擎的推力比之前的要大得多，这种引擎可以使大型船只相较老式战舰拥有明显的速度优势。" heavy_ship_engine_3_diesel_desc:0 "随着装甲和火炮重量的增加，引擎也被设计得能够提供更高的速度，以便于追击逃跑的敌军，抑或是和比自己更强大的对手保持距离。" heavy_ship_engine_4_diesel_desc:0 "通过采用新材料和改进的锅炉设计，这种动力装置能使一艘现代战列舰跟上那些高速的航母和巡洋舰。" - heavy_ship_engine_4_gas: "250000马力引擎" - heavy_ship_engine_4_gas_short: "重型燃气轮机" - heavy_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" carrier_ship_engine_1_short: "航母蒸汽引擎 I" carrier_ship_engine_2_short: "航母蒸汽引擎 II" carrier_ship_engine_3_short: "航母蒸汽引擎 III" @@ -448,9 +445,9 @@ EQ_MOD_CAT_ship_airplane_launcher_TITLE: "飞机设施" EQ_MOD_CAT_ship_torpedo_sub_TITLE: "鱼雷舱" EQ_MOD_CAT_ship_secondaries_TITLE: "副炮组" - EQ_MOD_CAT_light_ship_engine_TITLE: "驱逐舰引擎" + EQ_MOD_CAT_light_ship_engine_TITLE: "轻型引擎" EQ_MOD_CAT_cruiser_ship_engine_TITLE: "巡洋舰引擎" - EQ_MOD_CAT_heavy_ship_engine_TITLE: "重型舰船引擎" + EQ_MOD_CAT_heavy_ship_engine_TITLE: "重型引擎" EQ_MOD_CAT_carrier_ship_engine_TITLE: "航空母舰引擎" EQ_MOD_CAT_sub_ship_engine_TITLE: "潜艇引擎" EQ_MOD_CAT_ship_radar_TITLE: "雷达" @@ -792,7 +789,7 @@ ship_hull_cruiser_role_cd_short: "岸防舰" ship_hull_cruiser_role_cd_desc: "体型接近巡洋舰的岸防舰艇。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" EQ_MOD_CAT_cds_role_TITLE: "岸防舰角色" - EQ_MOD_CAT_super_heavy_ship_engine_TITLE: "超重型蒸汽引擎" + EQ_MOD_CAT_super_heavy_ship_engine_TITLE: "超重型引擎" EQ_MOD_CAT_carrier_unit_TITLE: "航母指挥控制单位" EQ_MOD_CAT_carrier_miscellaneous_TITLE: "航母杂项装备" EQ_MOD_SLOT_fixed_ship_carrier_miscellaneous_slot_1_TITLE: "航母杂项1" @@ -814,13 +811,13 @@ carrier_fuel_storage_desc: "一个在航母内部用于储藏航空燃料的巨大容器。" carrier_civilian_material: "使用民用材料" carrier_civilian_material_short: "民用材料" - carrier_civilian_material_desc: "在航母上更多应用民用材料可以使它们的造价更便宜。\n\n§R最大组织度惩罚：-20%§!" + carrier_civilian_material_desc: "在航母上更多应用民用材料可以使它们的造价更便宜。\n§R此模块一旦安装后将难以拆除。§!\n\n§R最大组织度惩罚：-20%§!" carrier_secondary_island: "第二舰岛" carrier_secondary_island_short: "第二舰岛" carrier_secondary_island_desc: "一座飞行甲板上的副舰岛，可以将航母的航海和飞控部门分开，保证双方的工作效率。\n\n§G最大组织度加成：+5%§!" carrier_strength_deck: "船体集成强力甲板" carrier_strength_deck_short: "强力甲板" - carrier_strength_deck_desc: "强力甲板亦称上甲板，以高强度的甲板结构保证船体总纵强度稳定，这一部件与船体深度集成。" + carrier_strength_deck_desc: "强力甲板亦称上甲板，以高强度的甲板结构保证船体总纵强度稳定，这一部件与船体深度集成。\n\n§Y甲板受损几率：§!§G-25%§!\n§Y甲板受损惩罚：§!§G-50%§!" ship_deck_space_more: "大型开放式机库" ship_deck_space_more_short: "大型开放式机库" ship_deck_space_more_desc: "船舱内一块体积巨大的开放区域，可以为着舰的飞机进行维护和后勤。为船上增加更多的机库会使得造价飙升。\n\n§R最大组织度惩罚：-20%§!" @@ -921,10 +918,10 @@ EQ_MOD_SLOT_fixed_ship_flight_deck_slot_TITLE: "飞行甲板槽位" carrier_wooden_deck: "19mm飞行甲板" carrier_wooden_deck_short: "木制飞行甲板" - carrier_wooden_deck_desc: "一条木制的全通式飞行甲板。\n§R木制甲板可能在空袭中会遭受严重的损伤。§!" + carrier_wooden_deck_desc: "一条木制的全通式飞行甲板。" carrier_armor_deck: "90mm飞行甲板" carrier_armor_deck_short: "装甲飞行甲板" - carrier_armor_deck_desc: "一条使用装甲加固的全通式飞行甲板。\n§G装甲甲板可以降低在空袭中遭受致命一击的机会和效果。\n甲板遭受致命一击的几率会下降25%，减益下降一半。§!" + carrier_armor_deck_desc: "一条使用装甲加固的全通式飞行甲板。\n\n§Y甲板受损几率：§!§G-25%§!\n§Y甲板受损惩罚：§!§G-50%§!" EQ_MOD_CAT_ship_torpedo_bb_TITLE: "鱼雷发射管" ship_torpedo_bb: "450mm舷侧发射管" ship_torpedo_bb_short: "舷侧鱼雷发射管" @@ -1159,7 +1156,7 @@ ship_hull_carrier_role_cv_desc: "一艘为舰队行动设计的标准航母。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" ship_hull_carrier_role_cvl: "轻型航母角色" ship_hull_carrier_role_cvl_short: "轻型航母" - ship_hull_carrier_role_cvl_desc: "一艘规模和载机量都较为有限的航母。\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" + ship_hull_carrier_role_cvl_desc: "一艘规模和载机量都较为有限的航母。\n\n§R最大组织度惩罚：-10%§!\n\n§R此角色为起源性角色，一旦安装后将难以替换§!" EQ_MOD_CAT_coldwar_upgrade_bb_TITLE: "冷战战列舰改装" EQ_MOD_CAT_cv_role_TITLE: "航母角色" EQ_MOD_CAT_ship_carrier_armor_shbb_TITLE: "航母超重型装甲带" @@ -1189,4 +1186,15 @@ EQ_MOD_CAT_cve_role_TITLE: "护航航母角色" ship_hull_carrier_role_cve: "护航航母角色" ship_hull_carrier_role_cve_short: "护航航母" - ship_hull_carrier_role_cve_desc: "一艘用于商船队护航和反潜的小型航母。\n\n§R最大组织度惩罚：-20%§! " \ No newline at end of file + ship_hull_carrier_role_cve_desc: "一艘用于商船队护航和反潜的小型航母。\n\n§R最大组织度惩罚：-20%§! " + ship_sub_snorkel_0: "通气管原型" + ship_sub_snorkel_0_desc: "可以让潜艇引擎在水下继续工作，但目前该技术仍然十分不稳定。" + light_ship_engine_4_gas: "80000马力引擎" + light_ship_engine_4_gas_short: "轻型燃气轮机" + light_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" + cruiser_ship_engine_4_gas: "100000马力引擎" + cruiser_ship_engine_4_gas_short: "巡洋舰燃气轮机" + cruiser_ship_engine_4_gas_desc: "一种将燃料的能量转变为有用功的内燃式动力机械，比传统蒸气轮机产生的航速还要快很多。" + EQ_MOD_CAT_carrier_civilian_material_TITLE: "民用材料" + EQ_MOD_CAT_ship_deck_space_special_TITLE: "非常规机库" + EQ_MOD_CAT_ap_shell_TITLE: "穿甲弹" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/vnr_ai_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/vnr_ai_l_simp_chinese.yml index 2a6b321..14632f0 100755 --- a/src/localisation/simp_chinese/replace/vnr_ai_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/vnr_ai_l_simp_chinese.yml @@ -17,8 +17,8 @@ RULE_AI_SHIP_DESIGN_STYLE: "AI舰船设计风格" RULE_OPTION_HISTORICAL: "史实" RULE_OPTION_EXPERT: "专家" - RULE_AI_SHIP_DESIGN_STYLE_HISTORICAL_DESC: "AI会依照史实方案设计舰船，这是过去海军重置一直采用的默认设计方法。" - RULE_AI_SHIP_DESIGN_STYLE_EXPERT_DESC: "AI会基于效率至上的目标设计和建造最优的模板。\n§R这个选项会让海战更加有挑战性，但是也意味着角色扮演的元素将会大幅减少。§!" + RULE_AI_SHIP_DESIGN_STYLE_HISTORICAL_DESC: "AI会依照史实方案，以符合现实的模块方案设计舰船。\n\n§C这是过去海军重置一直采用的默认设计方法。§!" + RULE_AI_SHIP_DESIGN_STYLE_EXPERT_DESC: "AI会基于效率至上的目标设计和建造最优的模板。\n\n这个选项会让海战§R更加有挑战性§!，但是也意味着§R角色扮演的元素将会大幅减少§!。§Y推荐想要更高挑战性的玩家使用。§!" buff_ai_production: "AI生产加强" buff_ai_production_desc: "这也太简单了。" vnr_ai.1.t: "选择海军AI生产强度" @@ -35,15 +35,15 @@ vnr_hard_production: "AI生产加强：§O困难§!" vnr_normal_production: "AI生产加强：§G普通§!" RULE_ALLOW_AI_TECH_AUTO_UNLOCK: "允许AI自动解锁科技" - RULE_ALLOW_AI_TECH_AUTO_UNLOCK_FREE_DESC: "AI会在游戏中自动解锁海军科技。" - RULE_ALLOW_AI_TECH_AUTO_UNLOCK_BLOCKED_DESC: "AI不会在游戏中自动解锁海军科技。\n§R这可能改变AI选择科技的倾向，并且影响其他方面的科研。§!" + RULE_ALLOW_AI_TECH_AUTO_UNLOCK_FREE_DESC: "§G开启§!AI在游戏中自动解锁海军科技。\n\n此选项包含了§RAI作弊§!，在玩家选择§C使用正常或作弊手段提前研究某些海军科技§!时，AI将也会§Y提前解锁部分科技§!。" + RULE_ALLOW_AI_TECH_AUTO_UNLOCK_BLOCKED_DESC: "§R关闭§!AI在游戏中自动解锁海军科技。\n\n这个选项将会§Y改变§!AI选择科技的行为，使其以§Y更加平衡的倾向§!进行科研，但是在海军科技的研究速度上会§R落后于§!§C专注投入海军§!的玩家，并且可能§R影响其他方面的科研§!。" RULE_SHIPYARD_OUTPUT_BOOST_BLOCKED_DESC: "船厂的产出为2.5点IC/日，与原版一致。" vnr_shipyard_output_boost: "海军重置船厂产出加成" join_tactical_data_link: "接入[ROOT.GetFactionName]海军战术数据链" join_tactical_data_link_desc: "一套联合战术数据链系统已经由我们阵营当中的领先成员部署成功。虽然这是一个加强我军与盟友协同作战能力的好机会，但是我们仍然可以独立开发一套自己的数据链系统。\n§C如果我们选择接入友方数据链，我们将不能研发自己的版本，但会立刻解锁以下加成：§!\n§Y海军协同性：§!§G+10%§!\n§Y海军组织度：§!§G+7.5%§!\n§Y可见度：§!§G-7.5%§!" RULE_AI_NAVAL_MANAGEMENT: "使用海军重置海军管理AI" - RULE_AI_NAVAL_MANAGEMENT_FREE_DESC: "在原版环境中§G启动§!海军舰队管理AI。\n§R请勿将本选项与修改地块和战略区域的mod混用。§!" - RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC: "在原版环境中§R关闭§!海军舰队管理AI。\n§Y使用原版或其他激活状态mod提供的海军AI。§!" + RULE_AI_NAVAL_MANAGEMENT_FREE_DESC: "在原版环境中§G启动§!海军舰队管理AI。\n\n此选项专为§Y历史模式§!设计，可以模拟历史上比较著名的海军战略例如§C无限制潜艇战§!或§C跳岛战术§!，使AI大国在§C史实的二战场景§!中表现得更加§Y真实和强大§!。\n\n§R此选项在以下场景中不推荐使用：§!\n£white_dot 架空历史模组（即使有兼容包）\n£white_dot 修改海域地块的模组\n£white_dot 非默认的二战场景（随机路线/非历史，任何偏离轴心对同盟的情况）" + RULE_AI_NAVAL_MANAGEMENT_BLOCKED_DESC: "在原版环境中§R关闭§!海军舰队管理AI。\n\n§Y使用原版或其他处于激活状态模组提供的海军AI。§!" RULE_SHIPYARD_OUTPUT_BOOST_PLAYER: "玩家船厂产出加成" RULE_SHIPYARD_OUTPUT_BOOST_AI: "AI船厂产出加成" RULE_OPTION_BUFF_60: "增加全满" @@ -51,8 +51,8 @@ RULE_SHIPYARD_OUTPUT_BOOST_BUFF_60_DESC: "船厂的产出为4点IC/日，比原版§G快60%§!。" RULE_SHIPYARD_OUTPUT_BOOST_BUFF_30_DESC: "船厂的产出为3.25点IC/日，比原版§G快30%§!。" RULE_AI_AIR_DESIGN: "启用AI改进舰载机设计" - RULE_AI_AIR_DESIGN_FREE_DESC: "为AI§G启用§!改进过的舰载机设计模板。\n§R请勿将本选项与修改空军科技的mod混用。§!" - RULE_AI_AIR_DESIGN_BLOCKED_DESC: "为AI§R关闭§!改进过的舰载机设计模板。\n§Y使用原版或其他激活状态mod提供的飞机模板。§!" + RULE_AI_AIR_DESIGN_FREE_DESC: "为AI§G启用§!改进过的舰载机设计模板。\n\n§R此选项不推荐与修改空军科技或飞机设计器的模组混用。§!" + RULE_AI_AIR_DESIGN_BLOCKED_DESC: "为AI§R关闭§!改进过的舰载机设计模板。\n\n§Y使用原版或其他激活状态模组提供的飞机模板。§!" vnr_cv_plane_output_boost: "海军重置舰载机产出加成" enable_ai_ship_design: "AI舰船设计风格" enable_ai_plane_design: "AI舰载机设计风格" @@ -63,4 +63,9 @@ vnr_ai.3.t: "AI舰载机设计风格" vnr_ai.3.d: "§R虽然目前推荐的方式是在开局的规则设置中开启专家AI设计§!，但是为了以防你错过这一特性，你仍然可以在局中使用该决议开启专家设计。为了使AI可以快速从史实模板切换到专家模板，所有的AI大国将会立刻获得部分空军经验。\n\n§R请注意，该选项不能与修改过飞机科技和模块的模组一起使用。如果你开启了这类模组，请勿进行模板切换。§!" vnr_ai.3.1: "§R切换到专家设计§!" - vnr_ai.3.2: "§G切换到原版设计§!" \ No newline at end of file + vnr_ai.3.2: "§G切换到原版设计§!" + RULE_ENG_EXPERT_NAVY: "@ENG 专家皇家海军" + RULE_USA_EXPERT_NAVY: "@USA 专家美国海军" + RULE_JAP_EXPERT_NAVY: "@JAP 专家日本帝国海军" + RULE_AI_EXPERT_NAVY_BLOCKED_DESC: "此国家开局的舰队不会被替换。" + RULE_AI_EXPERT_NAVY_FREE_DESC: "此国家开局的舰队全部替换为专家设计。\n\n此选项仅在§YAI舰船设计风格§!设置为§C专家§!且该国家为§RAI控制§!时方可生效。" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/vnr_naval_develop_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/vnr_naval_develop_l_simp_chinese.yml index cd4b289..30c2041 100755 --- a/src/localisation/simp_chinese/replace/vnr_naval_develop_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/vnr_naval_develop_l_simp_chinese.yml @@ -105,4 +105,6 @@ nakhimov_naval_academy: "纳希莫夫海军学院" nakhimov_naval_academy_desc: "作为世界上最富盛名的海军军官培训院校之一，这所学院在二月革命的烽火中脱胎于尼古拉耶夫学院而组建。每年，数百名经验丰富的学员从这里毕业并踏上仕途，渴望着为俄罗斯母亲献身。" usn_fighter_weapons_school: "TOPGUN" - usn_fighter_weapons_school_desc: "美国海军战斗机武器学校（俗称“TOPGUN”），是一项旨在为海军飞行员提供空战训练的教学课程，其目的不是为了基础训练而是培训经验丰富的航空教官。该学校通过空气动力学和战术技巧的相关课程，以及对精英主义的重视，意在将学员培养成最顶尖的飞行员。" \ No newline at end of file + usn_fighter_weapons_school_desc: "美国海军战斗机武器学校（俗称“TOPGUN”），是一项旨在为海军飞行员提供空战训练的教学课程，其目的不是为了基础训练而是培训经验丰富的航空教官。该学校通过空气动力学和战术技巧的相关课程，以及对精英主义的重视，意在将学员培养成最顶尖的飞行员。" + sp_submarine_snorkel: "潜艇通气管" + sp_submarine_snorkel_desc: "潜艇通气管是一种在潜艇潜航状态下伸出水面的装置，可以让潜艇发动机在水下仍然吸入空气并正常运转。" \ No newline at end of file