From c47bb005dea04e0db07f09020da2d833be040eac Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 29 Aug 2024 19:01:05 +0000 Subject: [PATCH] 2024-08-29 19:01:05 --- src/common/decisions/naval_develop.txt | 28 ++ .../scripted_effects/_add_ai_variants.txt | 90 +++--- .../scripted_effects/_add_naval_variants.txt | 11 +- .../scripted_effects/_add_never_built.txt | 22 +- src/common/technologies/MTG_naval.txt | 290 ++++++++++++++++-- .../critical_parts/00_critical_parts.txt | 2 +- .../modules/00_ship_modules_aviation.txt | 12 + .../equipment/modules/00_ship_modules_gun.txt | 8 +- .../modules/00_ship_modules_propulsion.txt | 34 +- .../modules/00_ship_modules_support.txt | 29 +- .../units/equipment/ship_hull_carrier.txt | 12 +- .../units/equipment/ship_hull_cruiser.txt | 47 ++- .../units/equipment/ship_hull_heavy.txt | 4 + .../units/equipment/ship_hull_light.txt | 6 +- src/descriptor.mod | 2 +- .../graphic_db/00_ship_icons.txt | 6 + .../naval/modules/icons/ship_radar_finder.png | Bin 0 -> 4195 bytes .../modules/icons/ship_ski_jump_ramp.png | Bin 0 -> 2992 bytes .../Japan/JAP_carrier_Shinano.png | Bin 0 -> 16776 bytes .../USA/USA_light_cruiser_Atlanta.png | Bin 0 -> 18891 bytes .../navy_techtree/advanced_radar_finder.png | Bin 0 -> 6078 bytes .../close_in_area_air_defense.png | Bin 0 -> 9447 bytes .../navy_techtree/luneburg_lens.png | Bin 0 -> 7573 bytes .../navy_techtree/signal_control.png | Bin 0 -> 7754 bytes .../navy_techtree/symmetric_key_algorithm.png | Bin 0 -> 7794 bytes .../navy_techtree/tactical_data_link.png | Bin 0 -> 6803 bytes .../navy_techtree/wave_resistance_design.png | Bin 0 -> 6798 bytes src/gfx/interface/vnr_main_menu_bg.dds | Bin 14745596 -> 14745596 bytes .../ships/ship_hull_carrier.gui | 16 +- .../ships/ship_hull_heavy.gui | 24 +- .../ships/ship_hull_super_heavy.gui | 28 +- src/interface/z_navy_techtree.gfx | 33 ++ src/interface/z_ship_modules.gfx | 8 + .../replace/navy_rework_welcome_l_english.yml | 2 +- .../english/replace/research_l_english.yml | 18 +- .../replace/ship_modules_l_english.yml | 12 +- .../english/replace/vnr_ai_l_english.yml | 4 +- .../replace/navy_rework_welcome_l_english.yml | 2 +- .../replace/research_l_english.yml | 18 +- .../replace/ship_modules_l_english.yml | 12 +- src/localisation/replace/vnr_ai_l_english.yml | 4 +- .../navy_rework_welcome_l_simp_chinese.yml | 2 +- .../replace/research_l_simp_chinese.yml | 18 +- .../replace/ship_modules_l_simp_chinese.yml | 12 +- .../replace/vnr_ai_l_simp_chinese.yml | 4 +- 45 files changed, 638 insertions(+), 182 deletions(-) create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar_finder.png create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ski_jump_ramp.png create mode 100755 src/gfx/interface/technologies/Japan/JAP_carrier_Shinano.png create mode 100755 src/gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png create mode 100755 src/gfx/interface/technologies/navy_techtree/advanced_radar_finder.png create mode 100755 src/gfx/interface/technologies/navy_techtree/close_in_area_air_defense.png create mode 100755 src/gfx/interface/technologies/navy_techtree/luneburg_lens.png create mode 100755 src/gfx/interface/technologies/navy_techtree/signal_control.png create mode 100755 src/gfx/interface/technologies/navy_techtree/symmetric_key_algorithm.png create mode 100755 src/gfx/interface/technologies/navy_techtree/tactical_data_link.png create mode 100755 src/gfx/interface/technologies/navy_techtree/wave_resistance_design.png diff --git a/src/common/decisions/naval_develop.txt b/src/common/decisions/naval_develop.txt index c6508c7..f9ac731 100755 --- a/src/common/decisions/naval_develop.txt +++ b/src/common/decisions/naval_develop.txt @@ -310,4 +310,32 @@ naval_develop_category = { modifier = { factor = 0 has_political_power < 20 } } } + + join_tactical_data_link = { + icon = generic_naval + visible = { + is_in_faction = yes + any_allied_country = { + has_tech = tactical_data_link + } + NOT = { + has_tech = tactical_data_link + has_tech = tactical_data_link_for_member + } + } + available = { + has_tech = radio + } + cancel_if_not_visible = yes + fire_only_once = yes + cost = 15 + days_remove = 7 + + remove_effect = { + set_technology = { tactical_data_link_for_member = 1 } + } + ai_will_do = { + factor = 50 + } + } } \ 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 ccd6d4b..c7c2629 100755 --- a/src/common/scripted_effects/_add_ai_variants.txt +++ b/src/common/scripted_effects/_add_ai_variants.txt @@ -11,15 +11,15 @@ GER_AI_variants_1940 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_2 fixed_ship_radar_slot = ship_radar_1 fixed_ship_engine_slot = heavy_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_2_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_anti_air_3 front_2_custom_slot = ship_heavy_battery_3_triple - mid_1_custom_slot = dp_ship_secondaries_2 + mid_1_custom_slot = dp_ship_secondaries_2_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_2 + mid_3_custom_slot = dp_ship_secondaries_2_bb rear_1_custom_slot = ship_heavy_battery_3_triple } } @@ -78,15 +78,15 @@ GER_AI_variants_1943 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_3 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = heavy_ship_engine_5 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb fixed_ship_armor_slot = ship_armor_bb_4 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt_enhanced front_1_custom_slot = ship_anti_air_4 front_2_custom_slot = ship_heavy_battery_4_triple - mid_1_custom_slot = dp_ship_secondaries_4 + mid_1_custom_slot = dp_ship_secondaries_4_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_4 + mid_3_custom_slot = dp_ship_secondaries_4_bb rear_1_custom_slot = ship_heavy_battery_4_triple rear_2_custom_slot = ship_heavy_battery_4_triple } @@ -102,7 +102,7 @@ GER_AI_variants_1943 = { fixed_ship_anti_air_slot = ship_anti_air_4 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = carrier_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space mid_2_custom_slot = ship_deck_space @@ -165,15 +165,15 @@ ENG_AI_variants_1940 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_2 fixed_ship_radar_slot = ship_radar_1 fixed_ship_engine_slot = heavy_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_2_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_anti_air_3 front_2_custom_slot = ship_heavy_battery_3_triple - mid_1_custom_slot = dp_ship_secondaries_2 + mid_1_custom_slot = dp_ship_secondaries_2_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_2 + mid_3_custom_slot = dp_ship_secondaries_2_bb rear_1_custom_slot = ship_heavy_battery_3_triple } } @@ -189,7 +189,7 @@ ENG_AI_variants_1940 = { fixed_ship_anti_air_slot = ship_anti_air_3 fixed_ship_radar_slot = ship_radar_2 fixed_ship_engine_slot = carrier_ship_engine_3 - fixed_ship_secondaries_slot = dp_ship_secondaries_3 + fixed_ship_secondaries_slot = dp_ship_secondaries_3_bb front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space } @@ -250,15 +250,15 @@ ENG_AI_variants_1943 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_3 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = heavy_ship_engine_5 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb fixed_ship_armor_slot = ship_armor_bb_4 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt_enhanced front_1_custom_slot = ship_anti_air_4 front_2_custom_slot = ship_heavy_battery_4 - mid_1_custom_slot = dp_ship_secondaries_4 + mid_1_custom_slot = dp_ship_secondaries_4_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_4 + mid_3_custom_slot = dp_ship_secondaries_4_bb rear_1_custom_slot = ship_heavy_battery_4 rear_2_custom_slot = ship_heavy_battery_4 } @@ -275,7 +275,7 @@ ENG_AI_variants_1943 = { fixed_ship_anti_air_slot = ship_anti_air_4 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = carrier_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space mid_2_custom_slot = ship_deck_space @@ -338,13 +338,13 @@ JAP_AI_variants_1940 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_2 fixed_ship_radar_slot = ship_radar_1 fixed_ship_engine_slot = heavy_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_2_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_anti_air_3 front_2_custom_slot = ship_heavy_battery_3_triple - mid_1_custom_slot = dp_ship_secondaries_2 + mid_1_custom_slot = dp_ship_secondaries_2_bb mid_2_custom_slot = ship_airplane_launcher_1 mid_3_custom_slot = ship_anti_air_3 rear_1_custom_slot = ship_heavy_battery_3_triple @@ -362,7 +362,7 @@ JAP_AI_variants_1940 = { fixed_ship_anti_air_slot = ship_anti_air_2 fixed_ship_radar_slot = ship_radar_1 fixed_ship_engine_slot = carrier_ship_engine_3 - fixed_ship_secondaries_slot = dp_ship_secondaries_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_2_bb front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space } @@ -446,15 +446,15 @@ JAP_AI_variants_1943 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_3 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = heavy_ship_engine_5 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb fixed_ship_armor_slot = ship_armor_bb_4 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt_enhanced front_1_custom_slot = ship_anti_air_4 front_2_custom_slot = ship_super_heavy_battery_2 - mid_1_custom_slot = dp_ship_secondaries_4 + mid_1_custom_slot = dp_ship_secondaries_4_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_4 + mid_3_custom_slot = dp_ship_secondaries_4_bb rear_1_custom_slot = ship_super_heavy_battery_2 rear_2_custom_slot = ship_super_heavy_battery_2 } @@ -470,7 +470,7 @@ JAP_AI_variants_1943 = { fixed_ship_anti_air_slot = ship_anti_air_4 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = carrier_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space mid_2_custom_slot = ship_deck_space @@ -556,15 +556,15 @@ USA_AI_variants_1940 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_2 fixed_ship_radar_slot = ship_radar_1 fixed_ship_engine_slot = heavy_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_2_bb fixed_ship_armor_slot = ship_armor_bb_3 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt front_1_custom_slot = ship_anti_air_3 front_2_custom_slot = ship_heavy_battery_3_triple - mid_1_custom_slot = dp_ship_secondaries_2 + mid_1_custom_slot = dp_ship_secondaries_2_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_2 + mid_3_custom_slot = dp_ship_secondaries_2_bb rear_1_custom_slot = ship_heavy_battery_3_triple } } @@ -580,7 +580,7 @@ USA_AI_variants_1940 = { fixed_ship_anti_air_slot = ship_anti_air_3 fixed_ship_radar_slot = ship_radar_2 fixed_ship_engine_slot = carrier_ship_engine_3 - fixed_ship_secondaries_slot = dp_ship_secondaries_3 + fixed_ship_secondaries_slot = dp_ship_secondaries_3_bb front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space } @@ -664,15 +664,15 @@ USA_AI_variants_1943 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_3 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = heavy_ship_engine_5 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb fixed_ship_armor_slot = ship_armor_bb_4 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt_enhanced front_1_custom_slot = ship_anti_air_4 front_2_custom_slot = ship_heavy_battery_4_triple - mid_1_custom_slot = dp_ship_secondaries_4 + mid_1_custom_slot = dp_ship_secondaries_4_bb mid_2_custom_slot = ship_anti_air_4 - mid_3_custom_slot = dp_ship_secondaries_4 + mid_3_custom_slot = dp_ship_secondaries_4_bb rear_1_custom_slot = ship_heavy_battery_4_triple rear_2_custom_slot = ship_airplane_launcher_1 } @@ -689,7 +689,7 @@ USA_AI_variants_1943 = { fixed_ship_anti_air_slot = ship_anti_air_4 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = carrier_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb front_1_custom_slot = ship_deck_space front_2_custom_slot = angled_deck mid_1_custom_slot = ship_deck_space @@ -799,15 +799,15 @@ FRA_AI_variants_1940 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_2 fixed_ship_radar_slot = ship_radar_1 fixed_ship_engine_slot = heavy_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_2_bb fixed_ship_armor_slot = ship_armor_bb_3 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt front_1_custom_slot = ship_anti_air_3 front_2_custom_slot = ship_heavy_battery_3_quad - mid_1_custom_slot = dp_ship_secondaries_2 + mid_1_custom_slot = dp_ship_secondaries_2_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_2 + mid_3_custom_slot = dp_ship_secondaries_2_bb rear_1_custom_slot = ship_heavy_battery_3_quad } } @@ -856,7 +856,7 @@ FRA_AI_variants_1940 = { } FRA_AI_variants_1943 = { create_equipment_variant = { - name = "共和级" # République Class + name = "共和级" # Republique Class role_icon_index = 1 type = vnr_ship_hull_heavy_5 parent_version = 0 @@ -867,15 +867,15 @@ FRA_AI_variants_1943 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_3 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = heavy_ship_engine_5 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb fixed_ship_armor_slot = ship_armor_bb_4 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt front_1_custom_slot = ship_anti_air_4 front_2_custom_slot = ship_heavy_battery_4_quad - mid_1_custom_slot = dp_ship_secondaries_4 + mid_1_custom_slot = dp_ship_secondaries_4_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_4 + mid_3_custom_slot = dp_ship_secondaries_4_bb rear_1_custom_slot = ship_heavy_battery_4_quad } } @@ -891,7 +891,7 @@ FRA_AI_variants_1943 = { fixed_ship_anti_air_slot = ship_anti_air_4 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = carrier_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space mid_2_custom_slot = ship_deck_space @@ -954,15 +954,15 @@ ITA_AI_variants_1940 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_2 fixed_ship_radar_slot = ship_radar_1 fixed_ship_engine_slot = heavy_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_2 + fixed_ship_secondaries_slot = dp_ship_secondaries_2_bb fixed_ship_armor_slot = ship_armor_bb_3 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt front_1_custom_slot = ship_anti_air_3 front_2_custom_slot = ship_heavy_battery_3_triple - mid_1_custom_slot = dp_ship_secondaries_2 + mid_1_custom_slot = dp_ship_secondaries_2_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_2 + mid_3_custom_slot = dp_ship_secondaries_2_bb rear_1_custom_slot = ship_heavy_battery_3_triple rear_2_custom_slot = ship_airplane_launcher_1 } @@ -1023,15 +1023,15 @@ ITA_AI_variants_1943 = { fixed_ship_fire_control_system_slot = ship_fire_control_system_3 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = heavy_ship_engine_5 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb fixed_ship_armor_slot = ship_armor_bb_4 fixed_ship_armor_scheme_slot = ship_scheme_all_or_nothing_armor_box fixed_ship_torpedo_defense_system_slot = torpedo_belt_enhanced front_1_custom_slot = ship_anti_air_4 front_2_custom_slot = ship_heavy_battery_4_triple - mid_1_custom_slot = dp_ship_secondaries_4 + mid_1_custom_slot = dp_ship_secondaries_4_bb mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = dp_ship_secondaries_4 + mid_3_custom_slot = dp_ship_secondaries_4_bb rear_1_custom_slot = ship_heavy_battery_4_triple rear_2_custom_slot = ship_heavy_battery_4_triple } @@ -1048,7 +1048,7 @@ ITA_AI_variants_1943 = { fixed_ship_anti_air_slot = ship_anti_air_4 fixed_ship_radar_slot = ship_radar_3 fixed_ship_engine_slot = carrier_ship_engine_4 - fixed_ship_secondaries_slot = dp_ship_secondaries_4 + fixed_ship_secondaries_slot = dp_ship_secondaries_4_bb front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space } diff --git a/src/common/scripted_effects/_add_naval_variants.txt b/src/common/scripted_effects/_add_naval_variants.txt index 63677b5..9b92d16 100755 --- a/src/common/scripted_effects/_add_naval_variants.txt +++ b/src/common/scripted_effects/_add_naval_variants.txt @@ -796,8 +796,8 @@ GER_start_naval_variants = { fixed_ship_battery_slot = ship_light_medium_battery_2 fixed_ship_anti_air_slot = ship_anti_air_1 fixed_ship_fire_control_system_slot = ship_fire_control_system_1 - fixed_ship_engine_slot = cruiser_ship_engine_2 - fixed_ship_armor_slot = ship_armor_cruiser_2 + fixed_ship_engine_slot = cruiser_ship_engine_2_diesel + fixed_ship_armor_slot = ship_armor_cruiser_1 fixed_ship_secondaries_slot = ship_secondaries_1 front_1_custom_slot = ship_anti_air_1 mid_1_custom_slot = ship_airplane_launcher_1 @@ -818,8 +818,8 @@ GER_start_naval_variants = { fixed_ship_battery_slot = ship_light_medium_battery_2 fixed_ship_anti_air_slot = ship_anti_air_1 fixed_ship_fire_control_system_slot = ship_fire_control_system_1 - fixed_ship_engine_slot = cruiser_ship_engine_2 - fixed_ship_armor_slot = ship_armor_cruiser_2 + fixed_ship_engine_slot = cruiser_ship_engine_2_diesel + fixed_ship_armor_slot = ship_armor_cruiser_1 fixed_ship_secondaries_slot = ship_secondaries_1 mid_2_custom_slot = ship_torpedo_2 mid_3_custom_slot = ship_mine_layer_1 @@ -1524,7 +1524,7 @@ FRA_start_naval_variants = { front_1_custom_slot = ship_light_medium_battery_1_single mid_1_custom_slot = ship_airplane_launcher_1 mid_2_custom_slot = ship_airplane_launcher_1 - mid_3_custom_slot = ship_airplane_launcher_1 + mid_3_custom_slot = empty rear_1_custom_slot = ship_light_medium_battery_1_single rear_2_custom_slot = ship_airplane_launcher_1 } @@ -2532,6 +2532,7 @@ ITA_start_naval_variants = { name = "扎拉级" # Zara Class parent_version = 0 role_icon_index = 27 + icon = "gfx/interface/technologies/Italy/ITA_heavy_cruiser3.png" type = vnr_ship_hull_cruiser_3 name_group = ITA_CA_HISTORICAL modules = { diff --git a/src/common/scripted_effects/_add_never_built.txt b/src/common/scripted_effects/_add_never_built.txt index 0aced49..7817ed9 100755 --- a/src/common/scripted_effects/_add_never_built.txt +++ b/src/common/scripted_effects/_add_never_built.txt @@ -8,7 +8,7 @@ ENG_never_built_blueprints = { name_group = ENG_BB_HISTORICAL modules = { fixed_ship_battery_slot = ship_heavy_battery_2_triple - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_2 @@ -31,7 +31,7 @@ ENG_never_built_blueprints = { name_group = ENG_BB_HISTORICAL modules = { fixed_ship_battery_slot = ship_super_heavy_battery_1_triple - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_2 @@ -54,7 +54,7 @@ ENG_never_built_blueprints = { name_group = ENG_BC_HISTORICAL modules = { fixed_ship_battery_slot = ship_super_heavy_battery_big_1 - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = heavy_ship_engine_3 fixed_ship_secondaries_slot = ship_secondaries_1 @@ -79,7 +79,7 @@ FRA_never_built_blueprints = { name_group = FRA_BB_HISTORICAL modules = { fixed_ship_battery_slot = ship_heavy_battery_1_quad - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_1 @@ -104,7 +104,7 @@ GER_never_built_blueprints = { name_group = GER_BB_HISTORICAL modules = { fixed_ship_battery_slot = ship_heavy_battery_2 - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_2 @@ -178,7 +178,7 @@ ITA_never_built_blueprints = { name_group = ITA_BC_HISTORICAL modules = { fixed_ship_battery_slot = ship_heavy_battery_big_1 - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_2 @@ -205,7 +205,7 @@ JAP_never_built_blueprints = { name_group = JAP_PREFECTURES modules = { fixed_ship_battery_slot = ship_heavy_battery_2 - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_2 @@ -230,7 +230,7 @@ JAP_never_built_blueprints = { name_group = JAP_MOUNTAIN modules = { fixed_ship_battery_slot = ship_heavy_battery_2 - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_2 @@ -258,7 +258,7 @@ SOV_never_built_blueprints = { name_group = SOV_BATTLES_NAVY modules = { fixed_ship_battery_slot = ship_heavy_battery_1_triple - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_1 @@ -283,7 +283,7 @@ USA_never_built_blueprints = { name_group = USA_BATTLES modules = { fixed_ship_battery_slot = ship_heavy_battery_2 - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_radar_slot = empty fixed_ship_engine_slot = heavy_ship_engine_2 @@ -308,7 +308,7 @@ USA_never_built_blueprints = { name_group = USA_STATES modules = { fixed_ship_armor_slot = ship_armor_bb_2 - front_1_custom_slot = ship_anti_air_1 + front_1_custom_slot = ship_anti_air_1_h fixed_ship_battery_slot = ship_heavy_battery_2_triple front_2_custom_slot = ship_heavy_battery_2_triple rear_1_custom_slot = ship_heavy_battery_2_triple diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt index 267113a..412fe25 100755 --- a/src/common/technologies/MTG_naval.txt +++ b/src/common/technologies/MTG_naval.txt @@ -303,13 +303,17 @@ technologies = { research_cost_coeff = 1 } path = { - leads_to_tech = destroyer_hull_improvement + leads_to_tech = wave_resistance_design research_cost_coeff = 1 } path = { leads_to_tech = modern_sonar research_cost_coeff = 1 } + path = { + leads_to_tech = close_in_area_air_defense + research_cost_coeff = 1 + } ai_will_do = { factor = 1 @@ -891,6 +895,10 @@ technologies = { dependencies = { destroyer_missile_upgrade = 1 } + path = { + leads_to_tech = destroyer_hull_improvement + research_cost_coeff = 1 + } ai_will_do = { factor = 1 @@ -908,19 +916,73 @@ technologies = { destroyer_hull_improvement = { research_cost = 1 - start_year = 1950 + start_year = 1954 destroyer = { - max_strength = 0.15 + max_strength = 0.25 + naval_range = 0.2 } + folder = { + name = mtgnavalfolder + position = { x = 0 y = @1952_module } + } + + ai_will_do = { + factor = 2 + } + categories = { + dd_tech + mio_cat_tech_all_screen_ship_and_modules + mio_cat_tech_all_capital_ship_and_modules + } + } + + close_in_area_air_defense = { + research_cost = 0.8 + start_year = 1952 + + destroyer = { + anti_air_attack = 0.2 + } + + folder = { + name = mtgnavalfolder + position = { x = 0 y = @1952 } + } + path = { + leads_to_tech = destroyer_hull_improvement + research_cost_coeff = 1 + } + + ai_will_do = { + factor = 1 + } + categories = { + dd_tech + mio_cat_tech_all_screen_ship_and_modules + mio_cat_tech_all_capital_ship_and_modules + } + } + + wave_resistance_design = { + research_cost = 1.25 + start_year = 1951 + + screening_efficiency = 0.15 + navy_weather_penalty = -0.15 + folder = { name = mtgnavalfolder position = { x = -2 y = @1952 } } - + path = { + leads_to_tech = destroyer_hull_improvement + research_cost_coeff = 1 + } + ai_will_do = { - factor = 2 + factor = 1 } categories = { dd_tech @@ -1229,7 +1291,11 @@ technologies = { research_cost_coeff = 1 } path = { - leads_to_tech = nuclear_reactor_cost_reduction + leads_to_tech = nuclear_engine_research + research_cost_coeff = 1 + } + path = { + leads_to_tech = signal_control research_cost_coeff = 1 } @@ -1237,7 +1303,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 4 y = @1948 } + position = { x = 0 y = @1948 } } ai_will_do = { @@ -1267,7 +1333,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 4 y = @1952_module } + position = { x = 1 y = @1952_module } } ai_will_do = { factor = 4 @@ -1300,7 +1366,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 0 y = @1948_module } + position = { x = 4 y = @1948_module } } on_research_complete = { hidden_effect = { add_ideas = vnr_cruiser_cost_2 } @@ -1329,7 +1395,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 6 y = @1952 } + position = { x = 3 y = @1952 } } ai_will_do = { factor = 2 @@ -1352,8 +1418,63 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = -2 y = @1948_module } + position = { x = -5 y = @1948_module } } + path = { + leads_to_tech = advanced_radar_finder + research_cost_coeff = 1 + } + ai_will_do = { + factor = 1 + } + + categories = { + naval_equipment + cl_tech + ca_tech + mio_cat_tech_all_cruiser_and_modules + } + } + signal_control = { + navy_visibility = -0.1 + + research_cost = 0.8 + start_year = 1951 + + folder = { + name = mtgnavalfolder + position = { x = -3 y = @1948_module } + } + path = { + leads_to_tech = advanced_radar_finder + research_cost_coeff = 1 + } + + ai_will_do = { + factor = 2 + } + + categories = { + naval_equipment + cl_tech + ca_tech + mio_cat_tech_all_cruiser_and_modules + } + } + advanced_radar_finder = { + enable_equipment_modules = { + ship_radar_finder + } + naval_enemy_fleet_size_ratio_penalty_factor = 0.2 + + research_cost = 1 + start_year = 1954 + + folder = { + name = mtgnavalfolder + position = { x = -4 y = 29 } + } + ai_will_do = { factor = 1 } @@ -1372,12 +1493,16 @@ technologies = { carrier_ship_engine_nuclear heavy_ship_engine_nuclear } + path = { + leads_to_tech = nuclear_reactor_cost_reduction + research_cost_coeff = 1 + } start_year = 1950 folder = { name = mtgnavalfolder - position = { x = -1 y = 22 } + position = { x = -1 y = @1948_module } } dependencies = { nuclear_reactor = 1 @@ -1391,6 +1516,7 @@ technologies = { naval_equipment bb_tech bc_tech + ca_tech ship_modules_tech mio_cat_tech_all_capital_ship_and_modules } @@ -1407,7 +1533,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 2 y = @1952 } + position = { x = -1 y = @1952 } } dependencies = { nuclear_engine_research = 1 @@ -1883,7 +2009,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 0 y = @1944_module } + position = { x = 1 y = 20 } } ai_will_do = { @@ -1936,7 +2062,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 1 y = 21 } + position = { x = 2 y = 22 } } ai_will_do = { @@ -2629,10 +2755,6 @@ technologies = { leads_to_tech = combat_information_center research_cost_coeff = 1 } - path = { - leads_to_tech = nuclear_engine_research - research_cost_coeff = 1 - } path = { leads_to_tech = modern_ship_hull_cruiser research_cost_coeff = 1 @@ -3233,7 +3355,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = -1 y = @1944_module } + position = { x = 1 y = @1944_module } } ai_will_do = { @@ -3260,7 +3382,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 1 y = @1944_module } + position = { x = -1 y = @1944_module } } path = { leads_to_tech = naval_tactical_data_system @@ -3289,7 +3411,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 1 y = @1948 } + position = { x = -1 y = @1948 } } path = { leads_to_tech = memory_expansion @@ -3311,6 +3433,10 @@ technologies = { leads_to_tech = electromagnetic_signature_study research_cost_coeff = 1 } + path = { + leads_to_tech = symmetric_key_algorithm + research_cost_coeff = 1 + } ai_will_do = { factor = 2 @@ -3325,6 +3451,32 @@ technologies = { } } + symmetric_key_algorithm = { + research_cost = 0.8 + start_year = 1950 + + navy_intel_to_others = -20 + + folder = { + name = mtgnavalfolder + position = { x = 1 y = @1948_module } + } + dependencies = { + advanced_computing_machine = 1 + } + + ai_will_do = { + factor = 1 + } + allow_branch = { + has_dlc = "La Resistance" + } + + categories = { + naval_equipment + } + } + memory_expansion = { research_cost = 1.5 naval_hit_chance = 0.05 @@ -3334,7 +3486,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = -2 y = @1948_module } + position = { x = -4 y = @1948_module } } dependencies = { advanced_computing_machine = 1 @@ -3361,11 +3513,15 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = 1 y = @1952_module } + position = { x = -1 y = @1952 } } dependencies = { phased_array_radar = 1 } + path = { + leads_to_tech = tactical_data_link + research_cost_coeff = 1 + } ai_will_do = { factor = 2 @@ -3379,6 +3535,47 @@ technologies = { mio_cat_tech_all_capital_ship_and_modules } } + tactical_data_link = { + research_cost = 1.5 + start_year = 1955 + + naval_coordination = 0.2 + navy_org_factor = 0.1 + navy_visibility = -0.1 + + folder = { + name = mtgnavalfolder + position = { x = -1 y = @1952_module } + } + + allow = { + NOT = { has_tech = tactical_data_link_for_member } + } + + ai_will_do = { + factor = 1 + } + categories = { + naval_equipment + bb_tech + bc_tech + ship_modules_tech + mio_cat_tech_all_capital_ship_and_modules + } + } + tactical_data_link_for_member = { + research_cost = 1.5 + start_year = 1955 + + naval_coordination = 0.1 + navy_org_factor = 0.075 + navy_visibility = -0.075 + + # enabled through decision + allow = { + always = no + } + } comprehensive_display_system = { research_cost = 1.2 enable_equipment_modules = { @@ -3389,7 +3586,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = -1 y = @1952 } + position = { x = -3 y = @1952 } } ai_will_do = { @@ -3433,7 +3630,8 @@ technologies = { } electromagnetic_signature_study = { research_cost = 2 - navy_visibility = -0.2 + navy_visibility = -0.1 + naval_mines_effect_reduction = 0.1 start_year = 1952 @@ -4228,6 +4426,10 @@ technologies = { name = mtgnavalfolder position = { x = 0 y = @1948_module } } + path = { + leads_to_tech = airborne_early_warning + research_cost_coeff = 1 + } ai_will_do = { factor = 1 @@ -4241,7 +4443,7 @@ technologies = { } airborne_early_warning = { research_cost = 1.5 - start_year = 1948 + start_year = 1951 enable_equipment_modules = { carrier_tracing_unit @@ -4249,7 +4451,7 @@ technologies = { folder = { name = mtgnavalfolder - position = { x = -2 y = @1948_module } + position = { x = -1 y = @1952 } } ai_will_do = { @@ -4305,6 +4507,33 @@ technologies = { mio_cat_tech_all_carrier_and_modules } } + luneburg_lens = { + research_cost = 1.2 + start_year = 1952 + + carrier = { + surface_detection = 0.15 + } + naval_enemy_retreat_chance = -0.1 + + folder = { + name = mtgnavalfolder + position = { x = -2 y = @1948_module } + } + path = { + leads_to_tech = airborne_early_warning + research_cost_coeff = 1 + } + ai_will_do = { + factor = 3 + } + + categories = { + naval_equipment + cv_tech + mio_cat_tech_all_carrier_and_modules + } + } # ## # # ### # # ## ### ### # # ### ## #{~._.~} # # # # # ## ## # # # # # ## # # # @@ -5297,6 +5526,7 @@ technologies = { enable_equipment_modules = { ship_carrier_armor_heavy ship_deck_space_big + ship_ski_jump_ramp } folder = { name = mtgnavalfolder @@ -5307,7 +5537,7 @@ technologies = { research_cost_coeff = 1 } path = { - leads_to_tech = airborne_early_warning + leads_to_tech = luneburg_lens research_cost_coeff = 1 } path = { @@ -5319,7 +5549,7 @@ technologies = { research_cost_coeff = 1 } research_cost = 1.5 - start_year = 1946 + start_year = 1948 dependencies = { full_armored_carrier = 1 diff --git a/src/common/units/critical_parts/00_critical_parts.txt b/src/common/units/critical_parts/00_critical_parts.txt index c910d50..afb92cd 100755 --- a/src/common/units/critical_parts/00_critical_parts.txt +++ b/src/common/units/critical_parts/00_critical_parts.txt @@ -180,7 +180,7 @@ critical_parts = { gas_leakage = { icon = "GFX_default_critical_damage_icons" frame = 6 - stat_penalties = { + modifier = { navy_org_factor = -0.9 naval_morale_factor = -1 } 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 46ece80..dc6a9b3 100755 --- a/src/common/units/equipment/modules/00_ship_modules_aviation.txt +++ b/src/common/units/equipment/modules/00_ship_modules_aviation.txt @@ -191,7 +191,19 @@ equipment_modules = { } dismantle_cost_ic = 800 } + ship_ski_jump_ramp = { + category = steam_catapult + gui_category = modern_carrier_equipments + add_stats = { + build_cost_ic = 500 + } + multiply_stats = { + anti_air_attack = 0.1 + surface_detection = 0.06 + } + dismantle_cost_ic = 400 + } side_lift = { category = carrier_side_lift 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 f207dd5..e4aeeb7 100755 --- a/src/common/units/equipment/modules/00_ship_modules_gun.txt +++ b/src/common/units/equipment/modules/00_ship_modules_gun.txt @@ -740,7 +740,6 @@ equipment_modules = { lg_attack = 4 build_cost_ic = 750 surface_visibility = 1 - reliability = -0.05 max_strength = 15 armor_value = 0.2 } @@ -773,7 +772,6 @@ equipment_modules = { lg_attack = 6 build_cost_ic = 850 surface_visibility = 1 - reliability = -0.05 max_strength = 18 armor_value = 0.2 } @@ -807,7 +805,6 @@ equipment_modules = { lg_attack = 5 build_cost_ic = 900 surface_visibility = 1 - reliability = -0.05 max_strength = 16 armor_value = 0.3 } @@ -840,7 +837,6 @@ equipment_modules = { lg_attack = 7 build_cost_ic = 1000 surface_visibility = 1 - reliability = -0.05 max_strength = 20 armor_value = 0.3 } @@ -1325,7 +1321,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = -0.045 + naval_speed = -0.05 max_strength = 0.13 } add_average_stats = { @@ -2266,7 +2262,7 @@ equipment_modules = { hg_attack = 15 naval_heavy_gun_hit_chance_factor = -1.0 reliability = -0.15 - build_cost_ic = 250 + build_cost_ic = 120 } multiply_stats = { max_strength = -0.1 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 a366ce5..d04e3dd 100755 --- a/src/common/units/equipment/modules/00_ship_modules_propulsion.txt +++ b/src/common/units/equipment/modules/00_ship_modules_propulsion.txt @@ -157,7 +157,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 12 + fuel_consumption = 23 build_cost_ic = 200 reliability = -0.1 } @@ -265,7 +265,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 7 + fuel_consumption = 5 build_cost_ic = 90 } @@ -290,7 +290,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 8 + fuel_consumption = 7 build_cost_ic = 120 } @@ -318,7 +318,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 10 + fuel_consumption = 9 build_cost_ic = 150 } @@ -346,7 +346,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 10 + fuel_consumption = 11 build_cost_ic = 170 } @@ -373,7 +373,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 12 + fuel_consumption = 15 build_cost_ic = 250 reliability = -0.3 } @@ -425,7 +425,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 12 + fuel_consumption = 15 build_cost_ic = 400 } @@ -450,7 +450,7 @@ equipment_modules = { add_stats = { #naval_speed = 6 - fuel_consumption = 16 + fuel_consumption = 19 build_cost_ic = 480 } @@ -480,7 +480,7 @@ equipment_modules = { add_stats = { #naval_speed = 7 - fuel_consumption = 20 + fuel_consumption = 22 build_cost_ic = 550 } @@ -509,7 +509,7 @@ equipment_modules = { add_stats = { #naval_speed = 7 - fuel_consumption = 24 + fuel_consumption = 25 build_cost_ic = 670 } @@ -538,7 +538,7 @@ equipment_modules = { add_stats = { #naval_speed = 7 - fuel_consumption = 28 + fuel_consumption = 29 build_cost_ic = 800 } @@ -993,7 +993,7 @@ equipment_modules = { parent = super_heavy_ship_engine_1 add_stats = { - fuel_consumption = 30 + fuel_consumption = 40 build_cost_ic = 3500 } multiply_stats = { @@ -1020,7 +1020,7 @@ equipment_modules = { parent = super_heavy_ship_engine_2 add_stats = { - fuel_consumption = 40 + fuel_consumption = 50 build_cost_ic = 4000 } multiply_stats = { @@ -1053,7 +1053,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 12 + fuel_consumption = 18 build_cost_ic = 1500 } @@ -1082,7 +1082,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 16 + fuel_consumption = 23 build_cost_ic = 2000 } @@ -1115,7 +1115,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 20 + fuel_consumption = 28 build_cost_ic = 2500 } @@ -1147,7 +1147,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 - fuel_consumption = 24 + fuel_consumption = 32 build_cost_ic = 3000 } 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 013c463..69ace5f 100755 --- a/src/common/units/equipment/modules/00_ship_modules_support.txt +++ b/src/common/units/equipment/modules/00_ship_modules_support.txt @@ -1112,7 +1112,7 @@ equipment_modules = { surface_visibility = -0.05 } add_stats = { - build_cost_ic = 180 + build_cost_ic = 35 } } full_missile_upgrade = { @@ -1121,6 +1121,9 @@ equipment_modules = { add_stats = { reliability = 0.3 } + multiply_stats = { + build_cost_ic = 0.05 + } forbid_module_categories = { ship_heavy_battery ship_heavy_battery_triple @@ -1144,8 +1147,10 @@ equipment_modules = { gui_category = cold_war_miscellaneous gfx = economical_nuclear_reactor add_stats = { - build_cost_ic = -1300 - reliability = -0.05 + reliability = -0.15 + } + multiply_stats = { + build_cost_ic = -0.1 } forbid_module_categories = { heavy_ship_engine @@ -1158,11 +1163,16 @@ equipment_modules = { category = carrier_miscellaneous gfx = economical_nuclear_reactor add_stats = { - build_cost_ic = -1000 - reliability = -0.05 + reliability = -0.15 + } + multiply_stats = { + build_cost_ic = -0.1 } forbid_module_categories = { carrier_ship_engine + heavy_ship_engine + cruiser_ship_engine + civilian_ship_engine } } ship_display_system = { @@ -1212,4 +1222,13 @@ equipment_modules = { steel = 1 } } + ship_radar_finder = { + category = generic_miscellaneous + gui_category = cold_war_miscellaneous + add_stats = { + surface_detection = 3 + build_cost_ic = 80 + reliability = -0.05 + } + } } \ No newline at end of file diff --git a/src/common/units/equipment/ship_hull_carrier.txt b/src/common/units/equipment/ship_hull_carrier.txt index a62c5eb..b78cefe 100755 --- a/src/common/units/equipment/ship_hull_carrier.txt +++ b/src/common/units/equipment/ship_hull_carrier.txt @@ -199,13 +199,16 @@ equipments = { fixed_ship_radar_slot = inherit fixed_ship_engine_slot = { required = yes - allowed_module_categories = { heavy_ship_engine carrier_ship_engine } + allowed_module_categories = { super_heavy_ship_engine heavy_ship_engine carrier_ship_engine } } fixed_ship_secondaries_slot = { required = no allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb ship_medium_battery_single ship_secondaries_special } } - fixed_ship_armor_slot = inherit + fixed_ship_armor_slot = { + required = no + allowed_module_categories = { ship_heavy_armor ship_cruiser_armor ship_cruiser_heavy_armor } + } fixed_ship_carrier_miscellaneous_slot_1 = inherit fixed_ship_carrier_miscellaneous_slot_2 = inherit fixed_ship_flight_deck_slot = inherit @@ -283,7 +286,10 @@ equipments = { required = no allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb } } - fixed_ship_armor_slot = inherit + fixed_ship_armor_slot = { + required = no + allowed_module_categories = { ship_cruiser_armor ship_cruiser_heavy_armor } + } fixed_ship_carrier_miscellaneous_slot_1 = inherit fixed_ship_carrier_miscellaneous_slot_2 = inherit fixed_ship_flight_deck_slot = inherit diff --git a/src/common/units/equipment/ship_hull_cruiser.txt b/src/common/units/equipment/ship_hull_cruiser.txt index 7162453..f662c14 100755 --- a/src/common/units/equipment/ship_hull_cruiser.txt +++ b/src/common/units/equipment/ship_hull_cruiser.txt @@ -177,6 +177,10 @@ equipments = { module = ship_display_system count < 2 } + module_count_limit = { + module = ship_aa_fire_control + count < 2 + } default_modules = { fixed_ship_battery_slot = empty @@ -435,8 +439,6 @@ equipments = { required = no allowed_module_categories = { ship_anti_air - ship_heavy_battery - ship_heavy_battery_triple ship_medium_heavy_battery_triple ship_medium_heavy_battery_double ship_secondaries @@ -470,17 +472,52 @@ equipments = { seaplane_hangar } } - rear_2_custom_slot = rear_1_custom_slot + rear_2_custom_slot = { + required = no + allowed_module_categories = { + ship_anti_air + ship_airplane_launcher + ship_torpedo + ship_medium_heavy_battery_triple + ship_medium_heavy_battery_double + seaplane_hangar + } + } } default_modules = { front_1_custom_slot = empty fixed_ship_battery_slot = ship_heavy_battery_1 fixed_ship_engine_slot = empty - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = empty fixed_ship_radar_slot = ship_mast_1 rear_1_custom_slot = ship_torpedo_1 } + + module_count_limit = { + module = ship_heavy_battery_2 + count < 1 + } + module_count_limit = { + module = ship_heavy_battery_3 + count < 1 + } + module_count_limit = { + module = ship_heavy_battery_4 + count < 1 + } + module_count_limit = { + module = ship_heavy_battery_2_triple + count < 1 + } + module_count_limit = { + module = ship_heavy_battery_3_triple + count < 1 + } + module_count_limit = { + module = ship_heavy_battery_4_triple + count < 1 + } } vnr_ship_hull_cruiser_1 = { @@ -838,7 +875,7 @@ equipments = { priority = 1900 parent = vnr_ship_hull_cruiser_5 naval_speed = 34 - reliability = 1.5 + reliability = 1.25 manpower = 1800 build_cost_ic = 2500 naval_range = 5000 diff --git a/src/common/units/equipment/ship_hull_heavy.txt b/src/common/units/equipment/ship_hull_heavy.txt index 2ed9780..2af22a6 100755 --- a/src/common/units/equipment/ship_hull_heavy.txt +++ b/src/common/units/equipment/ship_hull_heavy.txt @@ -137,6 +137,10 @@ equipments = { category = ship_missile_aa count < 4 } + module_count_limit = { + module = ship_aa_fire_control + count < 2 + } default_modules = { fixed_ship_battery_slot = empty diff --git a/src/common/units/equipment/ship_hull_light.txt b/src/common/units/equipment/ship_hull_light.txt index 047b8a3..1426dfc 100755 --- a/src/common/units/equipment/ship_hull_light.txt +++ b/src/common/units/equipment/ship_hull_light.txt @@ -145,6 +145,10 @@ equipments = { category = ship_anti_air count < 4 } + module_count_limit = { + module = ship_aa_fire_control + count < 2 + } default_modules = { fixed_ship_battery_slot = empty @@ -482,7 +486,7 @@ equipments = { surface_detection = 20 - reliability = 1.5 + reliability = 1.25 naval_range = 3000 max_strength = 100 build_cost_ic = 800 diff --git a/src/descriptor.mod b/src/descriptor.mod index 46f047f..bece05d 100755 --- a/src/descriptor.mod +++ b/src/descriptor.mod @@ -1,4 +1,4 @@ -version="v1.11 - King's Gambit" +version="v1.12 - Overlord" tags={ "Military" "Translation" diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/00_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/00_ship_icons.txt index e1d27e6..3bee8c4 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/00_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/00_ship_icons.txt @@ -4931,6 +4931,7 @@ JAP = { pool = { icons = { + "gfx/interface/technologies/Japan/JAP_carrier_Shinano.png" "gfx/interface/technologies/Japan/JAP_carrier_Kaga.png" } } @@ -5013,6 +5014,7 @@ JAP = { GFX_JAP_vnr_ship_hull_carrier_2_medium GFX_JAP_vnr_ship_hull_carrier_3_medium "gfx/interface/technologies/Japan/JAP_carrier_Hiryu.png" + "gfx/interface/technologies/Japan/JAP_carrier_Shinano.png" "gfx/interface/technologies/Japan/JAP_carrier_Kaga.png" "gfx/interface/technologies/Japan/JAP_carrier_conversion_ca.png" } @@ -8488,6 +8490,7 @@ USA = { GFX_USA_vnr_ship_hull_cruiser_2_medium GFX_USA_vnr_ship_hull_cruiser_1_capital_medium GFX_USA_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" } } @@ -8511,6 +8514,7 @@ USA = { GFX_USA_vnr_ship_hull_cruiser_1_capital_medium GFX_USA_vnr_ship_hull_cruiser_2_capital_medium GFX_USA_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" } } @@ -8536,6 +8540,7 @@ USA = { GFX_USA_vnr_ship_hull_cruiser_2_capital_medium GFX_USA_vnr_ship_hull_cruiser_3_capital_medium GFX_USA_vnr_ship_hull_cruiser_4_capital_medium + "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" } } @@ -8563,6 +8568,7 @@ USA = { GFX_USA_vnr_ship_hull_cruiser_3_capital_medium GFX_USA_vnr_ship_hull_cruiser_4_capital_medium GFX_USA_vnr_ship_hull_cruiser_5_capital_medium + "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" } } diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar_finder.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar_finder.png new file mode 100755 index 0000000000000000000000000000000000000000..870c528e9d067694404d130fdd5b6b31904172dc GIT binary patch literal 4195 zcmV-p5S;IcP)s(6Fpqjb7bXnOi#Ja+`EHlPrh;b=+mz4u+tg{HtNNPix_}BrMR}S`|`I2Tf2V`(sOx{S(iIwU1sxAY?fPV zT_(mlFk-B=#u%|K6Vm}PM#LDg)`+nVW2_kKaL(cK0%IJ;Wn_6l^q#?R$aJy5w{1do z`S{@e!Q$lL?)>Qfe?PqWgYUG}q7`FWI`w*HJS#Cmr#d6x8!qp?nU_OcmSeJbi3yiUZ7`V1R zNoFms*E5;3!?OQ{p?USouX)wCCr9^>>pLGju%Bg2tt-Z>+9K>`nHl{G{*ZHRV6D2#Mt71 zaIygfs9cF`tB>(ykv9h8mf>|z*ln?XUF)I*n9n}{Owy`=5PMuRrC1p(VzeL zKfgQHP!}R%>B5CSC^2-zNYs>;DTdHia}*`ZOY;5*5y6!Mvfc;*Vr;LAvi0#Q|~lv0Z^NJ@x6ih(>^BP)6kJ(A}P)_3TytzokqO^FZ! zDJf`oeQ0a?Yg@GSoO*uN`2zg`(Kq;Nj*6l6fs`UDLVqyi#m$l%TO$f*`0&9gP3xlw zauqqrOG*q$HPwRpq8y-r%}c}xHp>Ae8?19}?-jEC8h$w=h5(vKDN*!BI4iVK(a;jw zir#3G@r_q_eD~+n(^E#5VpUWy#{?h^*|fwfhpI z;Tk^Xcx$MtIlG^G6HSTbfsT@ix^T2sDLXUF{pdfw{f@@w z)VTc8#9YO49nth8k`*xsLOB>S-oAlvmQ;&5stHxl;Hjo36l+_2>C0asCFSgBpV{P; z!Wp(V$JA{=L?I=TZ$TANXhS0U7Q}S6N)-`UANA2{GHI&CiHKPO&1!7Vmzb1dBhsxh z)@6t>^f$JdpFQR?FYfWy+ux)=-lo5KopS9OWF>EZ{i{^VIraP$NX$-;SS)KY=O|1f zc#kXloumX0LZ?a!h#+DyrdxC}YcZ0drdZKM)#o%;@lM>pN>1@uR*Q3|#b2?j+6@8k; z6jjBDkTjtJ1_9GKgjNiyiY7fzab8J!^RiWfZV;L(V+^DOBDk`@@^~Z5#e(;5J;XZ4 z#<1Yk-7%kkX`92-IeWX;8ExGl`UX;@T})|0=$yXbQ4}i`R#2SZ)!MYq{4At2ogWO<5`01@f_O^!XtapYuhITc> zZu24Glai9}96(J3-w?toXjHo8K6Zg8D+WUFUQ_glT*|hb;|gqyL`~Yn*iA&EM>UdC zz*vV^%jEDrho>`oh3nD}J~HSPoSsaWog5${q!>HLFDb3}XzW(66g;aWI3cctLWC4k zmx4%&h(KsUj6TQ}kOG&tF%gKGQmrW=#^ReA5SrN;`Ctvf5QFEJAH2u*c*OB+$@kyC zkFkb(_wS)GfXPX*Bf%KKH!U%=*y!=q0!E-xsD>j;Un!+X5P~DZzE$iW3+XH zdfsDw_htOuC82HDzx{Ktj<&8?oE;-#h_TDdxV)qsj)}q3Rx`vH9)0)@SV#mJ|ab(BHTQVyG8WLQ`Y2g7J-4*m~)U*sO#U32ogO+?D!hN?0Sr z1Z~}TO)+paG31pj*AcYVRbEjw;fg-Xvm>hMV*FXo^vjy0%^*#^Lgk#pwaYSlV0fv-#rdY`*k)+G;_D@190*w3 zIf7y>or9QIoE{L{nivCFIUpTa{E3F}9sA6Fi}*NFfq~584rPKDOsZ%=rMK zLeLc3(X|(dAPI{W;}m zgTdx5#@dx16Q5@NQtS-3b);C4V(>g|2YGJglZ(V80WV_OdOqpA*c3ovw7o|)JLxiU z*LFc6HZ>^*TviZ6ix`VBT|!?(5KC8RTTBSPp%|=D4A!4Kj1*VVHK=MQUBMIDrWG+) z5?RAl*%%0j`q`z5lnPg2EL$6&loJwL-0C0WrYP8tM*h%nl^fz2|mzx*X0e)K;) zF&~;b&sPk=FIb)(bN1-g_oj#Ueqe33pi5FccVgmdAX6h|A$f*)g9zBHAhr$j#|QZO z<5fw;(p%rcWhE2^!;R}8LNz#E2#Mniv`cXzPmTo6c|HJh+aSEC-jfJUjf^ z{zpIlS5x77j>>B_f*b(;AZvLY?`me_VuB*x&|S|7as{qNMv>APa=ec+6)S@F3yCqgH( zH6kY|hB!OAe~QREAVXl_T)t(p*`Bd>N5pK|EWe%=y`8)_+H^&46xu2`*5PL-EKU#U zjW&oOV6(0)qMFdqNk|I5%l*;?lgGE-`>&%rAN(809pHqgO^H{6t1-SX0~#@QLf37O z17(bD5qy(_7CM&b~z#M4Lh|` zFfJo3CXfAJneKU zLt7U?tDIFUY_psU7w&KjW(+!VdAU*aM>n!^xMy9l>xyF2<>h#O{2=p9Eh)6i+3~}F zZkE#@8|w~$30Jg4U&K`qbB>D%=!+tKv7yjUDmQ&Rtv~590R2kZ)*DR)epbt6} zV@G*^ZKvoBx69Gywr`fVC;NB4ZLE7hr$Xm7q$`Cy%inUIp=JJ8o_S$^-Vtu;UXr7e ztc;GRuEAP0S50=+{Jb>APU$3N!KX;e^JtlWR_KNOufOSw{d0D;Wr#QtYvgI3xm|5n tl6(1Wcpk+3U-)h6Sg-c-3D^Bz@V`WNe}MzBp7HOLxkh@D%$3~77^@*?Cavz&pqR3UUkee6{ zn=|JY-oGI>%Zaf zH+2XE0J!-73lQ)!7xs5}m>~^pyrUT}`_pbuI``H1)k*;5xBo^6KZdmeWUfMH_f`$eUzUH@RKqXMKn}4fvk7R}~}chUv2>;gjP= z+@3I&5fD}Xj7E3V82LNi#fw_n+V_~JfM4>u!qCkHFzB{$OaQ^X8n6!}MW6B12>I#X zz@r&HwT6FL@j=v5lgOC82hp|!%UWWrhGCS=aGDS%0rM1*&eo`&rguCueA*qCP@p@x zftUT9^`x${a#9DxSC;aRcEYNs+9n$#d3-2Kg8L#p3;biFGFt%k!j>*Rbb+9<%NkY`6uJr{6aE{eHVIDP1P(p7h@{vi}dJEBD{^h>3M?bst6 zp00{E)+fR<_e)`>qa}@H7ebqhyS||cjDff8BR@Vp-N6gI9+t(<2<;)KA_D|akC;KPB-RN*nQYI(xLH-^-H#?2gz$aC=a@(oj4Tfy3NWU-$} zd^#0RSxyIkc!Lh`A%r03M)dbeSQuY$_GhMg_Bcz3p5b16{4?qzwZQju{8@o> z@WLVqDXY9<>7B*8f%84z1CJX`y?x0pnrw<=6_=E?aGo?xCc_Nm=wdP$TPr&mkFV*5 z7+wn%F{?&u*zVKeh8A$0Z*WI2zW0!%i(5GURS@}e=?{;NX#A{77Y&FwkfjNq4qYF! zR#_V-GMKNHNI^J{e*Rk?VyIgL&kA=h!TjzV{@TEwVZ75+$5wRJM6m+3kuwD^%vg@) zlTr}|raX_e;zY2X1-S^@jLF{xc6zb$8K8_CIrF3qO*r{LrpXZ3?I~-Cl8Pe9fQZlA zGoGn;z*-i$^I9t%xYMr%$D5?Oh|^cYt|xmRT$p~f=ZJF&QU_?O9YnWWoFxfX2{Yo4 zsq@&vb9WfrKI%s?$;5k-1tHE|k00Cdi<-At0l%1g>+yQv|hP$5_HGK;ZR57MG) zR=Qtvsx1YUqRz>%Q!=-_{n*tr&tRp$@GP8tFsiNn$ruQ+z~)TouYVs`IAU(}#F{}^ z=BB)BSyEhFT*fw{dh4M{v}rri4a9gy?Yh9RJd0j(kuW;b04khV>f*gF^PnMOW&BT< z!jGLG3N0-B(XN$eGfZ68_6OIY@@MoeAL=ujha-`oHKDi9yE6r!-u$asN_H z=I{})iwR_fRNHA(tzD1b4Z@NsOup%++MJTvT|X6#=5KU*+nC-=tLi4xndvv{bVnP! z7wvr>h`RWovpHZSiy&v5b=eY;UaHS#@JbLZjh9ii8xhGABzUJIZRIlAJ435kWRu{$ z;gU!3;}Dz5@&uGdj&-&g)`LHO6G$;VkO>i9vW%!)^n&P!}=^{x@*kbQmD z!NU0F*I<(VCjB7B6!$fqP0C9568 zPGo0kckq$9kW#W;LLEDII7!Wo^(b3PB0Cxy>~&8ln?LV~dB*4$af(PAk9=98ZlSTf zK;!gFO_=#v@s};;If@;cANlAV|+ znF$kPZhiW3%=ckyNjRt#oQr@guI8xeLe?WN1U_K(s6vx+_H^ouaCS05T19}Oyee^M z-*Gz2q&~maI$7&HJv05S<9)DCI9_8_d|*JSM40#MkOlCdRUzQ+Z>b>Vvd>EE9P8}a z_L30fJrF1bB?=zWcNkmMcb`T+<26eMN$VGlprfONUTe-hLw!zs4&X3JnAZOFv|wdF zk_jpy8fF0^6;fX*ZN4+tdpU^`I@S_AB@^M<_^z0tT^LGwIBAu zgAn@8`vyGh1jgGSI`NG~JnHzU;G{;N|Kjm&YB{> z``0g)_{A40gPz=Y>81?hmZu8Kv%e*o@p(eT<0`Am(J$IVao-ty-ch{b&yoglmZIdn4(%7O?X`A6Lqu8jxsU{To^$rf%E@@xT9u6PAONi#!idg>L#dPLstl* zh0s2v#vqQoB#QZk38<$^8Nuk4_SKCMMV@YrGOqJ|-d}Q)5No$n%<&a^$Df22_fP(a zCY<_jqc*Cr&aH1l7LQD>ieO0n4%mO9+4eW{uU%;;yCiW55>7OA zhE?_5!vV82kG2fQg`w}2g9q?ogu~)MY0r!Kq0v=eO&#?-W*A94FHiY&lJ@cU!{RGC z?SX_Q)^G60(D|NLE$!K88dvY;bi&%2>zw%t{n?c*VE*ra)4siM;O!As*%kX59^0fd($pvF1l0=wC3j&OtjPB$4K<0lcA6{L9FzOH_$6p(Cz#G%n4idb@u$_ TW{-})7aU+_Y>uoobbIn2moK`- literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/Japan/JAP_carrier_Shinano.png b/src/gfx/interface/technologies/Japan/JAP_carrier_Shinano.png new file mode 100755 index 0000000000000000000000000000000000000000..88f21680361bca68cae2836cd0db898980a43fa6 GIT binary patch literal 16776 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png b/src/gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png new file mode 100755 index 0000000000000000000000000000000000000000..de0b64552a95f43dd49082ca11fa941821363248 GIT binary patch literal 18891 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 Eg1Ec0NB{r; literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/navy_techtree/close_in_area_air_defense.png b/src/gfx/interface/technologies/navy_techtree/close_in_area_air_defense.png new file mode 100755 index 0000000000000000000000000000000000000000..34a64d16862bc0b025f558f4c1ee5c500be200b1 GIT binary patch literal 9447 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/navy_techtree/luneburg_lens.png b/src/gfx/interface/technologies/navy_techtree/luneburg_lens.png new file mode 100755 index 0000000000000000000000000000000000000000..e00e14b4402ad86ad51df3257a75daaef7685689 GIT binary patch literal 7573 zcmV;G9cto(k_<%_Rk8&j{*R>v`xSPETA^uE@0310tl#xD}fxy<~s&bAemotZi4d90)+YX zuYc`_zFCM$dbQSEzWmgJ;|3MM4&VU|pgG?Szz5uwm6g`^_Sv>!n5Jo(q9}{<#`PQ1 z{r&w}p63x2@c}ReCi81J|2*TSROlC9d_k9GiD{aYWr

rPRsU0G@pE@|^+rVF}k- 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 QX8-^I07*qoM6N<$f)P`u!vFvP literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/navy_techtree/symmetric_key_algorithm.png b/src/gfx/interface/technologies/navy_techtree/symmetric_key_algorithm.png new file mode 100755 index 0000000000000000000000000000000000000000..bbc3830f96b854a93144a0493b7df14e01f2fd1c GIT binary patch literal 7794 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 Eg4YQ?NdN!< literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/navy_techtree/tactical_data_link.png b/src/gfx/interface/technologies/navy_techtree/tactical_data_link.png new file mode 100755 index 0000000000000000000000000000000000000000..4eb6208d54ed0e99c4f36ef74a7d477f0397c0bf GIT binary patch literal 6803 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/vnr_main_menu_bg.dds b/src/gfx/interface/vnr_main_menu_bg.dds index ad00e3af983bf4012ab7e4edefadaad305f40bde..a020dbe278910693a12556eb1a5a38b1d43b290d 100755 GIT binary patch delta 25309 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 diff --git a/src/interface/equipmentdesigner/ships/ship_hull_carrier.gui b/src/interface/equipmentdesigner/ships/ship_hull_carrier.gui index 308b688..7814da9 100755 --- a/src/interface/equipmentdesigner/ships/ship_hull_carrier.gui +++ b/src/interface/equipmentdesigner/ships/ship_hull_carrier.gui @@ -255,7 +255,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -267,7 +267,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -522,7 +522,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -533,7 +533,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -625,7 +625,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -636,7 +636,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -728,7 +728,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -739,7 +739,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } diff --git a/src/interface/equipmentdesigner/ships/ship_hull_heavy.gui b/src/interface/equipmentdesigner/ships/ship_hull_heavy.gui index eaa1988..11ada20 100755 --- a/src/interface/equipmentdesigner/ships/ship_hull_heavy.gui +++ b/src/interface/equipmentdesigner/ships/ship_hull_heavy.gui @@ -190,7 +190,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -202,7 +202,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -932,7 +932,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -943,7 +943,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1002,7 +1002,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1013,7 +1013,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1266,7 +1266,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1277,7 +1277,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1529,7 +1529,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1540,7 +1540,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1791,7 +1791,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1802,7 +1802,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } diff --git a/src/interface/equipmentdesigner/ships/ship_hull_super_heavy.gui b/src/interface/equipmentdesigner/ships/ship_hull_super_heavy.gui index a007c8c..ea008e1 100755 --- a/src/interface/equipmentdesigner/ships/ship_hull_super_heavy.gui +++ b/src/interface/equipmentdesigner/ships/ship_hull_super_heavy.gui @@ -184,7 +184,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -196,7 +196,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -349,7 +349,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -361,7 +361,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -904,7 +904,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -915,7 +915,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -959,7 +959,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -970,7 +970,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1039,7 +1039,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1050,7 +1050,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1118,7 +1118,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1129,7 +1129,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1381,7 +1381,7 @@ guiTypes = { } containerWindowType = { - name = "ship_dp_secondaries" + name = "ship_dp_secondaries_bb" position = { x=0 y=0 } size = { width=100% height=100% } @@ -1392,7 +1392,7 @@ guiTypes = { } } containerWindowType = { - name = "ship_dp_secondaries@highlight" + name = "ship_dp_secondaries_bb@highlight" position = { x=0 y=0 } size = { width=100% height=100% } diff --git a/src/interface/z_navy_techtree.gfx b/src/interface/z_navy_techtree.gfx index 4d60357..25a27bf 100755 --- a/src/interface/z_navy_techtree.gfx +++ b/src/interface/z_navy_techtree.gfx @@ -663,4 +663,37 @@ spriteTypes = { name = "GFX_oxygen_torpedo_medium" textureFile = "gfx/interface/technologies/navy_techtree/oxygen_torpedo.png" } + + spriteType = { + name = "GFX_tactical_data_link_medium" + textureFile = "gfx/interface/technologies/navy_techtree/tactical_data_link.png" + } + spriteType = { + name = "GFX_tactical_data_link_for_member_medium" + textureFile = "gfx/interface/technologies/navy_techtree/tactical_data_link.png" + } + spriteType = { + name = "GFX_signal_control_medium" + textureFile = "gfx/interface/technologies/navy_techtree/signal_control.png" + } + spriteType = { + name = "GFX_advanced_radar_finder_medium" + textureFile = "gfx/interface/technologies/navy_techtree/advanced_radar_finder.png" + } + spriteType = { + name = "GFX_close_in_area_air_defense_medium" + textureFile = "gfx/interface/technologies/navy_techtree/close_in_area_air_defense.png" + } + spriteType = { + name = "GFX_wave_resistance_design_medium" + textureFile = "gfx/interface/technologies/navy_techtree/wave_resistance_design.png" + } + spriteType = { + name = "GFX_symmetric_key_algorithm_medium" + textureFile = "gfx/interface/technologies/navy_techtree/symmetric_key_algorithm.png" + } + spriteType = { + name = "GFX_luneburg_lens_medium" + textureFile = "gfx/interface/technologies/navy_techtree/luneburg_lens.png" + } } diff --git a/src/interface/z_ship_modules.gfx b/src/interface/z_ship_modules.gfx index c289553..bb4cbdc 100755 --- a/src/interface/z_ship_modules.gfx +++ b/src/interface/z_ship_modules.gfx @@ -1360,4 +1360,12 @@ spriteTypes = { name = "GFX_SMI_ship_anti_air_circle" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_anti_air_circle.png" } + spriteType = { + name = "GFX_SMI_ship_ski_jump_ramp" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_ski_jump_ramp.png" + } + spriteType = { + name = "GFX_SMI_ship_radar_finder" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar_finder.png" + } } 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 237ec24..e489f89 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: "§Hv1.11 “王翼弃兵”§!\n\n§C重要新增：§!\n\n-新科技：先进鱼雷弹道学\n-新模块：潜艇鱼雷弹道计算机（1-3），舰船鱼雷弹道计算机（1-3），带穿甲的重型舰船高平两用炮\n-加强鱼雷的装填速度和命中率\n\n§C更新：§!\n\n-加强空海一体战学说的海军航空兵分支\n-加强防空火控，VT炮弹和燃烧霰弹的防空效果\n-为直升机平台添加新图标\n-增加战列巡洋舰和航空战列舰被暴击的权重\n-早期船体的可见度现在更高\n-降低巡洋舰改装航母的航程\n-为意大利战列舰的舰名组添加罗马号\n-增加战列舰装甲拆除费用\n-后期的战列舰装甲科技需要装甲加工科技作为前提\n-早期的船体现在不能安装导弹相关的角色\n-降低反舰导弹的造价，增加导弹角色的造价\n-降低改进超重炮的速度影响\n-增加一条开局规则可以自定义船厂产出\n-更新模组制作技术文档和教程\n\n§C修复：§!\n\n-修复重型舰队巡洋舰模型问题\n-修复基础改装费用的错误\n-修复AI模板的一些错误\n-修复一些辅助船模块没有造价的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.12 “霸王行动”§!\n\n§C重要新增：§!\n\n-新科技：抗波设计，电磁信号管制，雷达源定位，对称密钥加密，龙勃透镜，密接区域防空\n-新模块：雷达定位装置，滑跃起飞甲板\n-调整冷战科技布局\n\n§C更新：§!\n\n-允许战列舰改装战列舰安装超重型装甲\n-装甲舰不能再安装16英寸或更大的舰炮\n-全导弹布局现在有造价，冷战船体的可靠性降低\n-经济型核反应堆以百分比降低造价\n-降低诱饵发射装置和火箭炮的造价\n-超级航母科技移动到1948年\n-为德国巡洋舰添加柴油机\n-为扎拉级设置正确的图标\n-核动力引擎科技移动到冷战巡洋舰分支\n-增加加入友军数据链的决议\n-4级双联装主炮的速度影响略微提高\n-为轻巡亚特兰大添加一个立绘\n-为航母信浓添加一个立绘\n\n§C修复：§!\n\n-修复部分计划蓝图的防空炮没有重型的问题\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 鱼雷可以对重型舰船造成巨量的伤害，不过重型装甲只能提供非常有限的鱼雷防护，你需要安装§Y鱼雷防御系统§!来避免这一点。\n£white_dot 主炮的穿甲经过一定的平衡。其基础穿深为同时期装甲的1.1倍，这也意味着基础的装甲钢和混合防护方案可以避免被击穿，而下一代主炮则可以击穿使用重点防护的该型战舰。\n£white_dot 海战中的甲弹对抗公式以如下规则计算，穿甲和装甲的比值与伤害权重之间的映射关系为：超过200%为100%伤害，100%到200%为100%伤害，85%到100%为70%伤害，75%到85%为60%伤害，60%到75%为45%伤害，50%到60%为35%伤害，30%到50%为20%伤害，10%到30%为10%伤害，低于10%为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%，但优势的水面探测数值可以带来最多50%的阵位奖励。\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/research_l_english.yml b/src/localisation/english/replace/research_l_english.yml index 346356b..716d010 100755 --- a/src/localisation/english/replace/research_l_english.yml +++ b/src/localisation/english/replace/research_l_english.yml @@ -353,4 +353,20 @@ advanced_torpedo_ballistics_desc: "世界大战时期，各国的潜艇普遍使用计算尺和机械式计算器等设备辅助鱼雷弹道计算，这一方式主要依靠操作者的计算能力且精度较差。随着流体动力学和鱼雷推进技术的进步，大量对不同水文环境下鱼雷运动轨迹的研究极大地促进了潜艇进攻战术的发展。" fleet_in_being_tree: "舰队决战学说" trade_interdiction_tree: "交通线破袭学说" - base_strike_tree: "空海一体战学说" \ No newline at end of file + base_strike_tree: "空海一体战学说" + tactical_data_link: "战术数据链" + tactical_data_link_desc: "战术数据链是一套利用无线电波或信号线缆进行通信的数据传输标准。接入该标准的所有军用级C3系统都会使用统一的格式进行数据传输、转发和收取，这将保证友方单位之间的数据传输和通信更加安全且有效。\n\n§Y研究完成后，处于你阵营的盟友将会获得一个决议接入你的数据链系统。如果选择接入后，将不能再选择研究自己的数据链。§!" + tactical_data_link_for_member: "接入盟友战术数据链" + tactical_data_link_for_member_desc: "战术数据链是一套利用无线电波或信号线缆进行通信的数据传输标准。接入该标准的所有军用级C3系统都会使用统一的格式进行数据传输、转发和收取，这将保证友方单位之间的数据传输和通信更加安全且有效。" + signal_control: "电磁信号管制" + signal_control_desc: "随着舰船上部署了越来越多的电子设备，产生的繁杂电子信号使得舰船的行动几乎已经双向透明。对电磁信号的管制措施在海军发现这一问题后启用，其可以确保所有设备工作在标准化的频段，舰队因此能够在电子层面保持不可见。" + advanced_radar_finder: "雷达源定位" + advanced_radar_finder_desc: "雷达是一种通过释放无线电波来确定目标距离、方向和运动矢量的装置。反雷达定位技术利用了雷达的这一特点，通过多台定位天线对无线电波进行反向探测，可以让被探测者运用三角定位法快速锁定无线电波源。" + close_in_area_air_defense: "密接区域防空" + close_in_area_air_defense_desc: "在第二次世界大战期间，海军舰队经常面临着自杀式飞机和无线电制导巡航导弹等低空目标带来的威胁。通过对战时建造的驱逐舰进行修缮和现代化改装，它们将成为抵御这些威胁的最后一道屏障。" + wave_resistance_design: "抗波设计" + wave_resistance_design_desc: "公海上的巨浪在过去几个世纪以来一直都是船舶面临的最大挑战，对于诸如驱逐舰之类的轻型舰艇尤其是如此。通过使用更加尖锐的船首，船体推开波浪的过程将更有延续性，由于节省了克服整体阻力所需的动能，舰船的适航性被大大提高了。" + symmetric_key_algorithm: "对称密钥加密算法" + symmetric_key_algorithm_desc: "自从通信加密技术发明以来，对称密钥算法就一直是最主流的加密算法之一，这种密钥管理方案使用统一的加密和解密密钥来处理电子数据。对称密钥加密技术在战后得到了一些改进，这包括了随机化且频繁更新的密钥，可以让数据传输的过程更加安全。" + luneburg_lens: "龙勃透镜" + luneburg_lens_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 73dd780..4c48b82 100755 --- a/src/localisation/english/replace/ship_modules_l_english.yml +++ b/src/localisation/english/replace/ship_modules_l_english.yml @@ -893,10 +893,10 @@ full_missile_upgrade: "全导弹设计" full_missile_upgrade_short: "全导弹设计" full_missile_upgrade_desc: "这艘战舰已经按照只使用导弹作为武器而进行了专门地设计。" - economical_nuclear_reactor_cruiser: "经济型核反应堆" + economical_nuclear_reactor_cruiser: "经济型核反应堆（重型）" economical_nuclear_reactor_cruiser_short: "经济型核反应堆" economical_nuclear_reactor_cruiser_desc: "采用了新材料核新技术的经济型核反应堆。" - economical_nuclear_reactor_carrier: "经济型核反应堆" + economical_nuclear_reactor_carrier: "经济型核反应堆（航母）" economical_nuclear_reactor_carrier_short: "经济型核反应堆" economical_nuclear_reactor_carrier_desc: "采用了新材料核新技术的经济型核反应堆。" ship_fire_control_system_5: "综合作战系统" @@ -1039,4 +1039,10 @@ ship_torpedo_fire_control_4_short: "鱼雷计算机 III" ship_torpedo_fire_control_4_desc: "电子鱼雷计算机可以更快地处理数据，但是功耗也很大。" EQ_MOD_CAT_dd_role_missile_TITLE: "导弹舰角色" - EQ_MOD_CAT_c_role_missile_TITLE: "导弹舰角色" \ No newline at end of file + EQ_MOD_CAT_c_role_missile_TITLE: "导弹舰角色" + ship_ski_jump_ramp: "滑跃甲板" + ship_ski_jump_ramp_short: "滑跃甲板" + ship_ski_jump_ramp_desc: "滑跃甲板是一个帮助固定翼飞机从短跑道起飞的弧线型结构。" + ship_radar_finder: "无线电方位探测装置" + ship_radar_finder_short: "雷达源定位装置" + ship_radar_finder_desc: "一套用于定位测距无线电源的设备。" \ 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 a834311..9c91ca6 100755 --- a/src/localisation/english/replace/vnr_ai_l_english.yml +++ b/src/localisation/english/replace/vnr_ai_l_english.yml @@ -62,4 +62,6 @@ RULE_SHIPYARD_OUTPUT_BOOST_FREE_AI_DESC: "船厂的产出为4点IC/日，比原版快60%。\n§G此加成仅适用于AI。§!" RULE_SHIPYARD_OUTPUT_BOOST_FREE_PLAYER_DESC: "船厂的产出为4点IC/日，比原版快60%。\n§G此加成仅适用于玩家。§!" RULE_SHIPYARD_OUTPUT_BOOST_BLOCKED_DESC: "船厂的产出为2.5点IC/日，与原版一致。" - vnr_shipyard_output_boost: "海军重置船厂产出加成" \ No newline at end of file + 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%§!" \ 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 237ec24..e489f89 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: "§Hv1.11 “王翼弃兵”§!\n\n§C重要新增：§!\n\n-新科技：先进鱼雷弹道学\n-新模块：潜艇鱼雷弹道计算机（1-3），舰船鱼雷弹道计算机（1-3），带穿甲的重型舰船高平两用炮\n-加强鱼雷的装填速度和命中率\n\n§C更新：§!\n\n-加强空海一体战学说的海军航空兵分支\n-加强防空火控，VT炮弹和燃烧霰弹的防空效果\n-为直升机平台添加新图标\n-增加战列巡洋舰和航空战列舰被暴击的权重\n-早期船体的可见度现在更高\n-降低巡洋舰改装航母的航程\n-为意大利战列舰的舰名组添加罗马号\n-增加战列舰装甲拆除费用\n-后期的战列舰装甲科技需要装甲加工科技作为前提\n-早期的船体现在不能安装导弹相关的角色\n-降低反舰导弹的造价，增加导弹角色的造价\n-降低改进超重炮的速度影响\n-增加一条开局规则可以自定义船厂产出\n-更新模组制作技术文档和教程\n\n§C修复：§!\n\n-修复重型舰队巡洋舰模型问题\n-修复基础改装费用的错误\n-修复AI模板的一些错误\n-修复一些辅助船模块没有造价的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.12 “霸王行动”§!\n\n§C重要新增：§!\n\n-新科技：抗波设计，电磁信号管制，雷达源定位，对称密钥加密，龙勃透镜，密接区域防空\n-新模块：雷达定位装置，滑跃起飞甲板\n-调整冷战科技布局\n\n§C更新：§!\n\n-允许战列舰改装战列舰安装超重型装甲\n-装甲舰不能再安装16英寸或更大的舰炮\n-全导弹布局现在有造价，冷战船体的可靠性降低\n-经济型核反应堆以百分比降低造价\n-降低诱饵发射装置和火箭炮的造价\n-超级航母科技移动到1948年\n-为德国巡洋舰添加柴油机\n-为扎拉级设置正确的图标\n-核动力引擎科技移动到冷战巡洋舰分支\n-增加加入友军数据链的决议\n-4级双联装主炮的速度影响略微提高\n-为轻巡亚特兰大添加一个立绘\n-为航母信浓添加一个立绘\n\n§C修复：§!\n\n-修复部分计划蓝图的防空炮没有重型的问题\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 鱼雷可以对重型舰船造成巨量的伤害，不过重型装甲只能提供非常有限的鱼雷防护，你需要安装§Y鱼雷防御系统§!来避免这一点。\n£white_dot 主炮的穿甲经过一定的平衡。其基础穿深为同时期装甲的1.1倍，这也意味着基础的装甲钢和混合防护方案可以避免被击穿，而下一代主炮则可以击穿使用重点防护的该型战舰。\n£white_dot 海战中的甲弹对抗公式以如下规则计算，穿甲和装甲的比值与伤害权重之间的映射关系为：超过200%为100%伤害，100%到200%为100%伤害，85%到100%为70%伤害，75%到85%为60%伤害，60%到75%为45%伤害，50%到60%为35%伤害，30%到50%为20%伤害，10%到30%为10%伤害，低于10%为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%，但优势的水面探测数值可以带来最多50%的阵位奖励。\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/research_l_english.yml b/src/localisation/replace/research_l_english.yml index 346356b..716d010 100755 --- a/src/localisation/replace/research_l_english.yml +++ b/src/localisation/replace/research_l_english.yml @@ -353,4 +353,20 @@ advanced_torpedo_ballistics_desc: "世界大战时期，各国的潜艇普遍使用计算尺和机械式计算器等设备辅助鱼雷弹道计算，这一方式主要依靠操作者的计算能力且精度较差。随着流体动力学和鱼雷推进技术的进步，大量对不同水文环境下鱼雷运动轨迹的研究极大地促进了潜艇进攻战术的发展。" fleet_in_being_tree: "舰队决战学说" trade_interdiction_tree: "交通线破袭学说" - base_strike_tree: "空海一体战学说" \ No newline at end of file + base_strike_tree: "空海一体战学说" + tactical_data_link: "战术数据链" + tactical_data_link_desc: "战术数据链是一套利用无线电波或信号线缆进行通信的数据传输标准。接入该标准的所有军用级C3系统都会使用统一的格式进行数据传输、转发和收取，这将保证友方单位之间的数据传输和通信更加安全且有效。\n\n§Y研究完成后，处于你阵营的盟友将会获得一个决议接入你的数据链系统。如果选择接入后，将不能再选择研究自己的数据链。§!" + tactical_data_link_for_member: "接入盟友战术数据链" + tactical_data_link_for_member_desc: "战术数据链是一套利用无线电波或信号线缆进行通信的数据传输标准。接入该标准的所有军用级C3系统都会使用统一的格式进行数据传输、转发和收取，这将保证友方单位之间的数据传输和通信更加安全且有效。" + signal_control: "电磁信号管制" + signal_control_desc: "随着舰船上部署了越来越多的电子设备，产生的繁杂电子信号使得舰船的行动几乎已经双向透明。对电磁信号的管制措施在海军发现这一问题后启用，其可以确保所有设备工作在标准化的频段，舰队因此能够在电子层面保持不可见。" + advanced_radar_finder: "雷达源定位" + advanced_radar_finder_desc: "雷达是一种通过释放无线电波来确定目标距离、方向和运动矢量的装置。反雷达定位技术利用了雷达的这一特点，通过多台定位天线对无线电波进行反向探测，可以让被探测者运用三角定位法快速锁定无线电波源。" + close_in_area_air_defense: "密接区域防空" + close_in_area_air_defense_desc: "在第二次世界大战期间，海军舰队经常面临着自杀式飞机和无线电制导巡航导弹等低空目标带来的威胁。通过对战时建造的驱逐舰进行修缮和现代化改装，它们将成为抵御这些威胁的最后一道屏障。" + wave_resistance_design: "抗波设计" + wave_resistance_design_desc: "公海上的巨浪在过去几个世纪以来一直都是船舶面临的最大挑战，对于诸如驱逐舰之类的轻型舰艇尤其是如此。通过使用更加尖锐的船首，船体推开波浪的过程将更有延续性，由于节省了克服整体阻力所需的动能，舰船的适航性被大大提高了。" + symmetric_key_algorithm: "对称密钥加密算法" + symmetric_key_algorithm_desc: "自从通信加密技术发明以来，对称密钥算法就一直是最主流的加密算法之一，这种密钥管理方案使用统一的加密和解密密钥来处理电子数据。对称密钥加密技术在战后得到了一些改进，这包括了随机化且频繁更新的密钥，可以让数据传输的过程更加安全。" + luneburg_lens: "龙勃透镜" + luneburg_lens_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 73dd780..4c48b82 100755 --- a/src/localisation/replace/ship_modules_l_english.yml +++ b/src/localisation/replace/ship_modules_l_english.yml @@ -893,10 +893,10 @@ full_missile_upgrade: "全导弹设计" full_missile_upgrade_short: "全导弹设计" full_missile_upgrade_desc: "这艘战舰已经按照只使用导弹作为武器而进行了专门地设计。" - economical_nuclear_reactor_cruiser: "经济型核反应堆" + economical_nuclear_reactor_cruiser: "经济型核反应堆（重型）" economical_nuclear_reactor_cruiser_short: "经济型核反应堆" economical_nuclear_reactor_cruiser_desc: "采用了新材料核新技术的经济型核反应堆。" - economical_nuclear_reactor_carrier: "经济型核反应堆" + economical_nuclear_reactor_carrier: "经济型核反应堆（航母）" economical_nuclear_reactor_carrier_short: "经济型核反应堆" economical_nuclear_reactor_carrier_desc: "采用了新材料核新技术的经济型核反应堆。" ship_fire_control_system_5: "综合作战系统" @@ -1039,4 +1039,10 @@ ship_torpedo_fire_control_4_short: "鱼雷计算机 III" ship_torpedo_fire_control_4_desc: "电子鱼雷计算机可以更快地处理数据，但是功耗也很大。" EQ_MOD_CAT_dd_role_missile_TITLE: "导弹舰角色" - EQ_MOD_CAT_c_role_missile_TITLE: "导弹舰角色" \ No newline at end of file + EQ_MOD_CAT_c_role_missile_TITLE: "导弹舰角色" + ship_ski_jump_ramp: "滑跃甲板" + ship_ski_jump_ramp_short: "滑跃甲板" + ship_ski_jump_ramp_desc: "滑跃甲板是一个帮助固定翼飞机从短跑道起飞的弧线型结构。" + ship_radar_finder: "无线电方位探测装置" + ship_radar_finder_short: "雷达源定位装置" + ship_radar_finder_desc: "一套用于定位测距无线电源的设备。" \ 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 a834311..9c91ca6 100755 --- a/src/localisation/replace/vnr_ai_l_english.yml +++ b/src/localisation/replace/vnr_ai_l_english.yml @@ -62,4 +62,6 @@ RULE_SHIPYARD_OUTPUT_BOOST_FREE_AI_DESC: "船厂的产出为4点IC/日，比原版快60%。\n§G此加成仅适用于AI。§!" RULE_SHIPYARD_OUTPUT_BOOST_FREE_PLAYER_DESC: "船厂的产出为4点IC/日，比原版快60%。\n§G此加成仅适用于玩家。§!" RULE_SHIPYARD_OUTPUT_BOOST_BLOCKED_DESC: "船厂的产出为2.5点IC/日，与原版一致。" - vnr_shipyard_output_boost: "海军重置船厂产出加成" \ No newline at end of file + 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%§!" \ 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 15b6c72..a6b707d 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: "§Hv1.11 “王翼弃兵”§!\n\n§C重要新增：§!\n\n-新科技：先进鱼雷弹道学\n-新模块：潜艇鱼雷弹道计算机（1-3），舰船鱼雷弹道计算机（1-3），带穿甲的重型舰船高平两用炮\n-加强鱼雷的装填速度和命中率\n\n§C更新：§!\n\n-加强空海一体战学说的海军航空兵分支\n-加强防空火控，VT炮弹和燃烧霰弹的防空效果\n-为直升机平台添加新图标\n-增加战列巡洋舰和航空战列舰被暴击的权重\n-早期船体的可见度现在更高\n-降低巡洋舰改装航母的航程\n-为意大利战列舰的舰名组添加罗马号\n-增加战列舰装甲拆除费用\n-后期的战列舰装甲科技需要装甲加工科技作为前提\n-早期的船体现在不能安装导弹相关的角色\n-降低反舰导弹的造价，增加导弹角色的造价\n-降低改进超重炮的速度影响\n-增加一条开局规则可以自定义船厂产出\n-更新模组制作技术文档和教程\n\n§C修复：§!\n\n-修复重型舰队巡洋舰模型问题\n-修复基础改装费用的错误\n-修复AI模板的一些错误\n-修复一些辅助船模块没有造价的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.12 “霸王行动”§!\n\n§C重要新增：§!\n\n-新科技：抗波设计，电磁信号管制，雷达源定位，对称密钥加密，龙勃透镜，密接区域防空\n-新模块：雷达定位装置，滑跃起飞甲板\n-调整冷战科技布局\n\n§C更新：§!\n\n-允许战列舰改装战列舰安装超重型装甲\n-装甲舰不能再安装16英寸或更大的舰炮\n-全导弹布局现在有造价，冷战船体的可靠性降低\n-经济型核反应堆以百分比降低造价\n-降低诱饵发射装置和火箭炮的造价\n-超级航母科技移动到1948年\n-为德国巡洋舰添加柴油机\n-为扎拉级设置正确的图标\n-核动力引擎科技移动到冷战巡洋舰分支\n-增加加入友军数据链的决议\n-4级双联装主炮的速度影响略微提高\n-为轻巡亚特兰大添加一个立绘\n-为航母信浓添加一个立绘\n\n§C修复：§!\n\n-修复部分计划蓝图的防空炮没有重型的问题\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 鱼雷可以对重型舰船造成巨量的伤害，不过重型装甲只能提供非常有限的鱼雷防护，你需要安装§Y鱼雷防御系统§!来避免这一点。\n£white_dot 主炮的穿甲经过一定的平衡。其基础穿深为同时期装甲的1.1倍，这也意味着基础的装甲钢和混合防护方案可以避免被击穿，而下一代主炮则可以击穿使用重点防护的该型战舰。\n£white_dot 海战中的甲弹对抗公式以如下规则计算，穿甲和装甲的比值与伤害权重之间的映射关系为：超过200%为100%伤害，100%到200%为100%伤害，85%到100%为70%伤害，75%到85%为60%伤害，60%到75%为45%伤害，50%到60%为35%伤害，30%到50%为20%伤害，10%到30%为10%伤害，低于10%为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%，但优势的水面探测数值可以带来最多50%的阵位奖励。\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/research_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml index 7cce01c..0f45a9c 100755 --- a/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml @@ -353,4 +353,20 @@ advanced_torpedo_ballistics_desc: "世界大战时期，各国的潜艇普遍使用计算尺和机械式计算器等设备辅助鱼雷弹道计算，这一方式主要依靠操作者的计算能力且精度较差。随着流体动力学和鱼雷推进技术的进步，大量对不同水文环境下鱼雷运动轨迹的研究极大地促进了潜艇进攻战术的发展。" fleet_in_being_tree: "舰队决战学说" trade_interdiction_tree: "交通线破袭学说" - base_strike_tree: "空海一体战学说" \ No newline at end of file + base_strike_tree: "空海一体战学说" + tactical_data_link: "战术数据链" + tactical_data_link_desc: "战术数据链是一套利用无线电波或信号线缆进行通信的数据传输标准。接入该标准的所有军用级C3系统都会使用统一的格式进行数据传输、转发和收取，这将保证友方单位之间的数据传输和通信更加安全且有效。\n\n§Y研究完成后，处于你阵营的盟友将会获得一个决议接入你的数据链系统。如果选择接入后，将不能再选择研究自己的数据链。§!" + tactical_data_link_for_member: "接入盟友战术数据链" + tactical_data_link_for_member_desc: "战术数据链是一套利用无线电波或信号线缆进行通信的数据传输标准。接入该标准的所有军用级C3系统都会使用统一的格式进行数据传输、转发和收取，这将保证友方单位之间的数据传输和通信更加安全且有效。" + signal_control: "电磁信号管制" + signal_control_desc: "随着舰船上部署了越来越多的电子设备，产生的繁杂电子信号使得舰船的行动几乎已经双向透明。对电磁信号的管制措施在海军发现这一问题后启用，其可以确保所有设备工作在标准化的频段，舰队因此能够在电子层面保持不可见。" + advanced_radar_finder: "雷达源定位" + advanced_radar_finder_desc: "雷达是一种通过释放无线电波来确定目标距离、方向和运动矢量的装置。反雷达定位技术利用了雷达的这一特点，通过多台定位天线对无线电波进行反向探测，可以让被探测者运用三角定位法快速锁定无线电波源。" + close_in_area_air_defense: "密接区域防空" + close_in_area_air_defense_desc: "在第二次世界大战期间，海军舰队经常面临着自杀式飞机和无线电制导巡航导弹等低空目标带来的威胁。通过对战时建造的驱逐舰进行修缮和现代化改装，它们将成为抵御这些威胁的最后一道屏障。" + wave_resistance_design: "抗波设计" + wave_resistance_design_desc: "公海上的巨浪在过去几个世纪以来一直都是船舶面临的最大挑战，对于诸如驱逐舰之类的轻型舰艇尤其是如此。通过使用更加尖锐的船首，船体推开波浪的过程将更有延续性，由于节省了克服整体阻力所需的动能，舰船的适航性被大大提高了。" + symmetric_key_algorithm: "对称密钥加密算法" + symmetric_key_algorithm_desc: "自从通信加密技术发明以来，对称密钥算法就一直是最主流的加密算法之一，这种密钥管理方案使用统一的加密和解密密钥来处理电子数据。对称密钥加密技术在战后得到了一些改进，这包括了随机化且频繁更新的密钥，可以让数据传输的过程更加安全。" + luneburg_lens: "龙勃透镜" + luneburg_lens_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 e61d06f..f645e0e 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 @@ -893,10 +893,10 @@ full_missile_upgrade: "全导弹设计" full_missile_upgrade_short: "全导弹设计" full_missile_upgrade_desc: "这艘战舰已经按照只使用导弹作为武器而进行了专门地设计。" - economical_nuclear_reactor_cruiser: "经济型核反应堆" + economical_nuclear_reactor_cruiser: "经济型核反应堆（重型）" economical_nuclear_reactor_cruiser_short: "经济型核反应堆" economical_nuclear_reactor_cruiser_desc: "采用了新材料核新技术的经济型核反应堆。" - economical_nuclear_reactor_carrier: "经济型核反应堆" + economical_nuclear_reactor_carrier: "经济型核反应堆（航母）" economical_nuclear_reactor_carrier_short: "经济型核反应堆" economical_nuclear_reactor_carrier_desc: "采用了新材料核新技术的经济型核反应堆。" ship_fire_control_system_5: "综合作战系统" @@ -1039,4 +1039,10 @@ ship_torpedo_fire_control_4_short: "鱼雷计算机 III" ship_torpedo_fire_control_4_desc: "电子鱼雷计算机可以更快地处理数据，但是功耗也很大。" EQ_MOD_CAT_dd_role_missile_TITLE: "导弹舰角色" - EQ_MOD_CAT_c_role_missile_TITLE: "导弹舰角色" \ No newline at end of file + EQ_MOD_CAT_c_role_missile_TITLE: "导弹舰角色" + ship_ski_jump_ramp: "滑跃甲板" + ship_ski_jump_ramp_short: "滑跃甲板" + ship_ski_jump_ramp_desc: "滑跃甲板是一个帮助固定翼飞机从短跑道起飞的弧线型结构。" + ship_radar_finder: "无线电方位探测装置" + ship_radar_finder_short: "雷达源定位装置" + ship_radar_finder_desc: "一套用于定位测距无线电源的设备。" \ 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 788b45b..db81d7f 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 @@ -62,4 +62,6 @@ RULE_SHIPYARD_OUTPUT_BOOST_FREE_AI_DESC: "船厂的产出为4点IC/日，比原版快60%。\n§G此加成仅适用于AI。§!" RULE_SHIPYARD_OUTPUT_BOOST_FREE_PLAYER_DESC: "船厂的产出为4点IC/日，比原版快60%。\n§G此加成仅适用于玩家。§!" RULE_SHIPYARD_OUTPUT_BOOST_BLOCKED_DESC: "船厂的产出为2.5点IC/日，与原版一致。" - vnr_shipyard_output_boost: "海军重置船厂产出加成" \ No newline at end of file + 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%§!" \ No newline at end of file