From 8ff30176d6d24f93be30f04cff6545a089949c67 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 28 Nov 2024 20:01:22 +0000 Subject: [PATCH] 2024-11-28 20:01:21 --- src/common/ai_equipment/vnr_submarines.txt | 4 +- src/common/defines/VNR_naval_defines.lua | 2 +- .../scripted_effects/_add_naval_variants.txt | 6 +- .../_delete_starting_naval.txt | 16 + .../special_projects/projects/_overwrite.txt | 79 +++++ .../projects/naval_projects.txt | 286 +++++++++++++++++- src/common/technologies/MTG_naval.txt | 19 +- src/common/technologies/MTG_naval_Support.txt | 4 +- .../modules/00_ship_modules_aviation.txt | 20 ++ .../equipment/modules/00_ship_modules_gun.txt | 40 ++- .../modules/00_ship_modules_support.txt | 7 +- .../units/equipment/ship_hull_carrier.txt | 98 ++++++ .../units/equipment/ship_hull_cruiser.txt | 25 ++ .../units/equipment/ship_hull_heavy.txt | 106 +++++++ .../units/equipment/ship_hull_submarine.txt | 4 +- .../graphic_db/00_generic_icons.txt | 20 ++ .../project_icons/sp_arsenal_ship.png | Bin 0 -> 3506 bytes .../project_icons/sp_battlecarrier.png | Bin 7946 -> 9251 bytes .../project_icons/sp_mega_carrier.png | Bin 0 -> 6626 bytes .../project_icons/sp_subcarrier.png | Bin 1998 -> 6462 bytes .../project_icons/sp_super_heavy_guns.png | Bin 2151 -> 6386 bytes .../Generic/generic_arsenal_ship.png | Bin 0 -> 16464 bytes .../Generic/generic_mega_carrier.png | Bin 0 -> 15868 bytes src/interface/vnr_user_interface_assets.gfx | 2 + src/interface/z_generic_icons.gfx | 8 + src/interface/z_navy_techtree.gfx | 8 + src/interface/z_ship_modules.gfx | 4 + .../english/replace/equip_naval_l_english.yml | 8 +- .../replace/navy_rework_welcome_l_english.yml | 2 +- .../replace/ship_modules_l_english.yml | 9 +- .../replace/vnr_naval_develop_l_english.yml | 24 +- .../replace/equip_naval_l_english.yml | 8 +- .../replace/navy_rework_welcome_l_english.yml | 2 +- .../replace/ship_modules_l_english.yml | 9 +- .../replace/vnr_naval_develop_l_english.yml | 24 +- .../replace/equip_naval_l_simp_chinese.yml | 8 +- .../navy_rework_welcome_l_simp_chinese.yml | 2 +- .../replace/ship_modules_l_simp_chinese.yml | 9 +- .../vnr_naval_develop_l_simp_chinese.yml | 24 +- 39 files changed, 830 insertions(+), 57 deletions(-) create mode 100755 src/common/special_projects/projects/_overwrite.txt create mode 100755 src/gfx/interface/special_project/project_icons/sp_arsenal_ship.png create mode 100755 src/gfx/interface/special_project/project_icons/sp_mega_carrier.png create mode 100755 src/gfx/interface/technologies/Generic/generic_arsenal_ship.png create mode 100755 src/gfx/interface/technologies/Generic/generic_mega_carrier.png diff --git a/src/common/ai_equipment/vnr_submarines.txt b/src/common/ai_equipment/vnr_submarines.txt index d9890bb..8ec7de2 100755 --- a/src/common/ai_equipment/vnr_submarines.txt +++ b/src/common/ai_equipment/vnr_submarines.txt @@ -232,7 +232,7 @@ naval_sub = { mid_1_custom_slot = sub_ship_periscope mid_2_custom_slot = ship_sub_snorkel mid_3_custom_slot = sub_ship_stealth - fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_4 sub_ship_engine_3 sub_ship_engine_2 sub_ship_engine_1 } } + fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_5 sub_ship_engine_4 sub_ship_engine_3 sub_ship_engine_2 sub_ship_engine_1 } } fixed_ship_torpedo_slot = ship_torpedo_sub fixed_ship_armor_slot = pressure_hull fixed_ship_fire_control_system_slot = sub_fire_control_system @@ -260,7 +260,7 @@ naval_sub = { mid_1_custom_slot = sub_ship_periscope mid_2_custom_slot = ship_sub_snorkel mid_3_custom_slot = sub_ship_stealth - fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_4 sub_ship_engine_3 sub_ship_engine_2 sub_ship_engine_1 } } + fixed_ship_engine_slot = { upgrade > current any_of = { sub_ship_engine_5 sub_ship_engine_4 sub_ship_engine_3 sub_ship_engine_2 sub_ship_engine_1 } } fixed_ship_torpedo_slot = ship_torpedo_sub fixed_ship_armor_slot = pressure_hull fixed_ship_fire_control_system_slot = sub_fire_control_system diff --git a/src/common/defines/VNR_naval_defines.lua b/src/common/defines/VNR_naval_defines.lua index 362da86..70dcf2a 100755 --- a/src/common/defines/VNR_naval_defines.lua +++ b/src/common/defines/VNR_naval_defines.lua @@ -61,7 +61,7 @@ NDefines.NNavy.EXPERIENCE_FACTOR_NON_CARRIER_GAIN = 0.1 NDefines.NNavy.EXPERIENCE_FACTOR_CARRIER_GAIN = 0.2 NDefines.NNavy.TRAINING_DAILY_COUNTRY_EXP_FACTOR = 0.005 NDefines.NNavy.TRAINING_MAX_DAILY_COUNTRY_EXP = 7 -NDefines.NNavy.NAVAL_TRANSFER_BASE_SPEED = 2 +NDefines.NNavy.NAVAL_TRANSFER_BASE_SPEED = 4 NDefines.NNavy.AMPHIBIOUS_INVADE_SPEED_BASE = 0.25 NDefines.NNavy.SUPREMACY_PER_SHIP_PER_MANPOWER = 0.001 NDefines.NNavy.SUPREMACY_PER_SHIP_PER_IC = 0.05 diff --git a/src/common/scripted_effects/_add_naval_variants.txt b/src/common/scripted_effects/_add_naval_variants.txt index b0357d1..a34af15 100755 --- a/src/common/scripted_effects/_add_naval_variants.txt +++ b/src/common/scripted_effects/_add_naval_variants.txt @@ -735,10 +735,10 @@ GER_start_naval_variants = { fixed_ship_battery_slot = ger_11in_c34_triple fixed_ship_anti_air_slot = ship_anti_air_1_h fixed_ship_fire_control_system_slot = ship_fire_control_system_1 - fixed_ship_engine_slot = heavy_ship_engine_1 + fixed_ship_engine_slot = heavy_ship_engine_2 fixed_ship_secondaries_slot = ship_secondaries_2 fixed_ship_armor_scheme_slot = ship_scheme_incremental_post_jutland - fixed_ship_armor_slot = ship_armor_bc_2 + fixed_ship_armor_slot = ship_armor_bb_2 fixed_ship_torpedo_defense_system_slot = torpedo_belt fixed_ship_extra_secondaries_slot = ship_light_weight_shell front_1_custom_slot = ship_anti_air_1 @@ -3649,7 +3649,7 @@ USA_start_naval_variants = { fixed_ship_armor_slot = ship_armor_bb_1 fixed_ship_torpedo_defense_system_slot = torpedo_bulge mid_1_custom_slot = empty - mid_2_custom_slot = empty + mid_2_custom_slot = ship_heavy_battery_small_1 mid_3_custom_slot = ship_heavy_battery_small_1 rear_1_custom_slot = ship_heavy_battery_small_1 rear_2_custom_slot = ship_heavy_battery_small_1 diff --git a/src/common/scripted_effects/_delete_starting_naval.txt b/src/common/scripted_effects/_delete_starting_naval.txt index ab116fb..8b5d048 100755 --- a/src/common/scripted_effects/_delete_starting_naval.txt +++ b/src/common/scripted_effects/_delete_starting_naval.txt @@ -7,4 +7,20 @@ delete_starting_naval_oob = { destroy_ships = { type = ship_hull_carrier count = all } destroy_ships = { type = ship_hull_submarine count = all } } + special_project_workaround = yes +} + +special_project_workaround = { + USA = { + complete_special_project = { + project = sp:sp_naval_fleet_submarine + popup = no + } + } + JAP = { + complete_special_project = { + project = sp:sp_naval_super_heavy_battleship + popup = no + } + } } \ No newline at end of file diff --git a/src/common/special_projects/projects/_overwrite.txt b/src/common/special_projects/projects/_overwrite.txt new file mode 100755 index 0000000..5924b6e --- /dev/null +++ b/src/common/special_projects/projects/_overwrite.txt @@ -0,0 +1,79 @@ +sp_naval_fleet_submarine = { + specialization = specialization_naval + + + project_tags = sp_tag_submarine + + allowed = { + #FREE PROJECT + } + visible = { + always = no + } + + complexity = sp_complexity.medium + prototype_time = sp_time.prototype.long + + breakthrough_cost = { + specialization_naval = 1 + } + + project_output = { + + } + +} + +sp_naval_cruiser_submarine = { + specialization = specialization_naval + + project_tags = sp_tag_submarine + + complexity = sp_complexity.medium + prototype_time = sp_time.prototype.medium + allowed = { + #FREE PROJECT + } + visible = { + always = no + } + + special_project_parent = { + + } + + + breakthrough_cost = { + specialization_naval = 1 + } + + + project_output = { + + } + +} + +sp_naval_super_heavy_battleship = { + specialization = specialization_naval + + + project_tags = sp_tag_surface_ship + + allowed = { + #FREE + } + + visible = { + always = no + } + complexity = sp_complexity.medium + prototype_time = sp_time.prototype.medium + + breakthrough_cost = { + specialization_naval = 1 + } + project_output = { + + } +} \ No newline at end of file diff --git a/src/common/special_projects/projects/naval_projects.txt b/src/common/special_projects/projects/naval_projects.txt index e16c35b..66dc3af 100755 --- a/src/common/special_projects/projects/naval_projects.txt +++ b/src/common/special_projects/projects/naval_projects.txt @@ -14,6 +14,11 @@ sp_battlecarrier = { } } } + resource_cost = { + resources = { + steel = 5 + } + } breakthrough_cost = { specialization_naval = 1 } @@ -27,6 +32,39 @@ sp_battlecarrier = { ship_deck_space_bb } } + + unique_prototype_rewards = { + sp_battlecarrier_unique_reward_a = { + fire_only_once = yes + threshold = { + min = 25 + max = 75 + } + weight = { base = 100 } + option = { + token = sp_battlecarrier_perference_a + iteration_output = { + sub_unit_bonus = { + battlecarrier = { + anti_air_attack = 0.1 + armor_value = 0.1 + max_strength = 0.1 + } + } + } + } + option = { + token = sp_battlecarrier_perference_b + iteration_output = { + sub_unit_bonus = { + battlecarrier = { + max_organisation = 15 + } + } + } + } + } + } generic_prototype_rewards = { sp_naval_generic_reward_scientist_xp_1 @@ -59,6 +97,11 @@ sp_subcarrier = { breakthrough_cost = { specialization_naval = 1 } + resource_cost = { + resources = { + steel = 3 + } + } prototype_time = sp_time.prototype.short complexity = sp_complexity.small @@ -83,11 +126,49 @@ sp_subcarrier = { sp_naval_generic_reward_test_failure_2 sp_naval_generic_reward_test_failure_3 } + + unique_prototype_rewards = { + sp_subcarrier_unique_reward_a = { + fire_only_once = yes + threshold = { + min = 25 + max = 75 + } + weight = { base = 100 } + option = { + token = sp_subcarrier_perference_a + iteration_output = { + equipment_bonus = { + vnr_ship_hull_cruiser_submarine = { + instant = yes + surface_detection = 0.15 + sub_detection = 0.15 + } + } + } + } + option = { + token = sp_subcarrier_perference_b + iteration_output = { + equipment_bonus = { + ship_hull_submarine = { + instant = yes + surface_detection = 0.05 + sub_detection = 0.05 + } + } + } + } + } + } } sp_nuclear_torpedo = { specialization = specialization_naval project_tags = { sp_tag_submarine } + ai_will_do = { + base = 1 + } allowed = { has_dlc = "Man the Guns" } @@ -97,8 +178,11 @@ sp_nuclear_torpedo = { has_tech = nukes } } + resource_cost = { + resources = { steel=6 tungsten=3 chromium=6 } + } breakthrough_cost = { - specialization_naval = 3 + specialization_naval = 2 } prototype_time = sp_time.prototype.long @@ -124,11 +208,48 @@ sp_nuclear_torpedo = { sp_naval_generic_reward_test_failure_2 sp_naval_generic_reward_test_failure_3 } + + unique_prototype_rewards = { + sp_nuclear_torpedo_unique_reward_a = { + fire_only_once = yes + threshold = { + min = 50 + max = 90 + } + weight = { base = 100 } + option = { + token = sp_nuclear_torpedo_preference_a + iteration_output = { + equipment_bonus = { + vnr_ship_hull_submarine_5 = { + instant = yes + reliability = 0.05 + } + } + } + } + option = { + token = sp_nuclear_torpedo_preference_b + iteration_output = { + equipment_bonus = { + vnr_ship_hull_submarine_5 = { + instant = yes + torpedo_attack = 0.05 + reliability = -0.05 + } + } + } + } + } + } } sp_naval_proximity_fuze = { specialization = specialization_naval project_tags = { sp_tag_surface_ship } + ai_will_do = { + base = 1 + } allowed = { has_dlc = "Man the Guns" } @@ -138,8 +259,11 @@ sp_naval_proximity_fuze = { has_tech = naval_radio_guiding_system } } + resource_cost = { + resources = { steel=4 tungsten=2 } + } breakthrough_cost = { - specialization_naval = 2 + specialization_naval = 1 } prototype_time = sp_time.prototype.medium @@ -170,6 +294,9 @@ sp_naval_proximity_fuze = { sp_super_heavy_guns = { specialization = specialization_naval project_tags = { sp_tag_surface_ship } + ai_will_do = { + base = 1 + } allowed = { has_dlc = "Man the Guns" } @@ -185,16 +312,14 @@ sp_super_heavy_guns = { } } breakthrough_cost = { - specialization_naval = 2 + specialization_naval = 1 } resource_cost = { - resources = { - steel = 5 - } + resources = { steel=6 tungsten=3 } } - prototype_time = sp_time.prototype.long + prototype_time = sp_time.prototype.medium - complexity = sp_complexity.large + complexity = sp_complexity.medium project_output = { country_effects = { @@ -211,6 +336,35 @@ sp_super_heavy_guns = { } } } + + unique_prototype_rewards = { + sp_super_heavy_guns_unique_reward_a = { + fire_only_once = yes + threshold = { + min = 60 + max = 90 + } + weight = { + base = 100 + } + option = { + token = sp_super_heavy_guns_preference_a + iteration_output = { + country_effects = { + add_tech_bonus = { + bonus = 0.75 + uses = 1 + technology = experimental_super_heavy_battery + } + sp:sp_super_heavy_guns = { add_project_progress_ratio = -0.25 } + } + } + } + option = { + token = sp_super_heavy_guns_preference_b + } + } + } generic_prototype_rewards = { sp_naval_generic_reward_scientist_xp_1 @@ -261,7 +415,7 @@ sp_naval_underway_replenishment = { specialization_naval = 2 } - complexity = sp_complexity.large + complexity = sp_complexity.medium prototype_time = sp_time.prototype.medium project_output = { @@ -452,19 +606,14 @@ sp_naval_nuclear_missile_submarine = { } } complexity = sp_complexity.large - prototype_time = sp_time.prototype.very_long + prototype_time = sp_time.prototype.long allowed = { has_dlc = "Gotterdammerung" } special_project_parent = { sp_naval_rocket_launching_submarine - } - - available = { - FROM = { - has_tech = sub_nuclear_engine - } + sp_nuclear_warheads } breakthrough_cost = { @@ -494,4 +643,109 @@ sp_naval_nuclear_missile_submarine = { sp_naval_generic_reward_test_failure_3 sp_naval_generic_failure_nuclear_accident } +} + +sp_mega_carrier = { + specialization = specialization_naval + project_tags = { sp_tag_surface_ship } + allowed = { + has_dlc = "Gotterdammerung" + } + available = { + FROM = { + has_tech = super_carriers + } + } + resource_cost = { + resources = { + steel = 16 + chromium = 16 + } + } + breakthrough_cost = { + specialization_naval = 2 + } + + prototype_time = sp_time.prototype.long + + complexity = sp_complexity.large + + project_output = { + enable_equipments = { + vnr_ship_hull_mega_carrier + } + enable_equipment_modules = { + limit = { + has_dlc = "Gotterdammerung" + } + ship_deck_space_mega + } + } + + generic_prototype_rewards = { + sp_naval_generic_reward_scientist_xp_1 + sp_naval_generic_reward_scientist_xp_2 + sp_naval_generic_reward_scientist_xp_3 + sp_naval_generic_reward_navy_xp_1 + sp_naval_generic_reward_navy_xp_2 + sp_naval_generic_reward_navy_xp_3 + sp_naval_generic_reward_major_progress_1 + sp_naval_generic_reward_major_progress_2 + sp_naval_generic_reward_major_progress_3 + sp_naval_generic_reward_test_failure_1 + sp_naval_generic_reward_test_failure_2 + sp_naval_generic_reward_test_failure_3 + } +} + +sp_arsenal_ship = { + specialization = specialization_naval + project_tags = { sp_tag_surface_ship } + allowed = { + has_dlc = "Gotterdammerung" + } + available = { + FROM = { + has_tech = full_missile_ship + } + } + resource_cost = { + resources = { + steel = 12 + tungsten = 10 + chromium = 14 + } + } + breakthrough_cost = { + specialization_naval = 2 + } + + prototype_time = sp_time.prototype.medium + + complexity = sp_complexity.large + + project_output = { + enable_equipments = { + vnr_ship_hull_arsenal_ship + } + enable_equipment_modules = { + ship_missile_launcher + ship_slbm_launcher + } + } + + generic_prototype_rewards = { + sp_naval_generic_reward_scientist_xp_1 + sp_naval_generic_reward_scientist_xp_2 + sp_naval_generic_reward_scientist_xp_3 + sp_naval_generic_reward_navy_xp_1 + sp_naval_generic_reward_navy_xp_2 + sp_naval_generic_reward_navy_xp_3 + sp_naval_generic_reward_major_progress_1 + sp_naval_generic_reward_major_progress_2 + sp_naval_generic_reward_major_progress_3 + sp_naval_generic_reward_test_failure_1 + sp_naval_generic_reward_test_failure_2 + sp_naval_generic_reward_test_failure_3 + } } \ No newline at end of file diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt index 6a15bf4..8c082af 100755 --- a/src/common/technologies/MTG_naval.txt +++ b/src/common/technologies/MTG_naval.txt @@ -1540,6 +1540,12 @@ technologies = { } nuclear_engine_research = { research_cost = 1.25 + is_special_project_tech = yes + allow = { + ROOT = { + is_special_project_completed = sp:sp_nuclear_reactor + } + } enable_equipment_modules = { cruiser_ship_engine_nuclear carrier_ship_engine_nuclear @@ -4504,7 +4510,7 @@ technologies = { } full_armored_carrier = { - research_cost = 1.25 + research_cost = 0.7 start_year = 1944 carrier = { @@ -4545,7 +4551,7 @@ technologies = { } carrier_angled_deck = { - research_cost = 0.7 + research_cost = 0.5 start_year = 1944 enable_equipment_modules = { @@ -5290,6 +5296,12 @@ technologies = { } sub_nuclear_engine = { + is_special_project_tech = yes + allow = { + ROOT = { + is_special_project_completed = sp:sp_nuclear_reactor + } + } enable_equipment_modules = { sub_ship_engine_nuclear } @@ -5297,9 +5309,6 @@ technologies = { start_year = 1949 research_cost = 1.25 - dependencies = { - nuclear_reactor = 1 - } folder = { name = mtgnavalfolder position = { x = -2 y = 23 } diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt index b4b3b57..665fb6e 100755 --- a/src/common/technologies/MTG_naval_Support.txt +++ b/src/common/technologies/MTG_naval_Support.txt @@ -3556,7 +3556,7 @@ technologies = { xp_research_type = navy xp_boost_cost = 75 xp_research_bonus = 1.75 - research_cost = 2.0 + research_cost = 0.75 start_year = 1938 folder = { name = mtgnavalsupportfolder @@ -3587,7 +3587,7 @@ technologies = { xp_research_type = navy xp_boost_cost = 75 xp_research_bonus = 1.5 - research_cost = 2.5 + research_cost = 1 start_year = 1943 folder = { name = mtgnavalsupportfolder 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 37c02f0..8fbb394 100755 --- a/src/common/units/equipment/modules/00_ship_modules_aviation.txt +++ b/src/common/units/equipment/modules/00_ship_modules_aviation.txt @@ -141,6 +141,26 @@ equipment_modules = { } dismantle_cost_ic = 2000 } + ship_deck_space_mega = { + category = ship_deck_space_mega + gui_category = ship_deck_space + gfx = big_ship_deck_space + add_equipment_type = capital_ship + mega_carrier = yes + add_stats = { + carrier_size = 2 + build_cost_ic = 2000 + surface_detection = 8 + supply_consumption = 0.03 + } + manpower = 450 #outside the add_stats section for code reasons + multiply_stats = { + naval_speed = -0.075 + anti_air_attack = 0.035 + fuel_consumption = 0.1 + } + dismantle_cost_ic = 1600 + } ################### 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 a1de9d2..ee3f11f 100755 --- a/src/common/units/equipment/modules/00_ship_modules_gun.txt +++ b/src/common/units/equipment/modules/00_ship_modules_gun.txt @@ -2305,7 +2305,7 @@ equipment_modules = { ################ sub_missile_launcher = { abbreviation = "sml" - category = ship_rocket + category = sub_rocket add_equipment_type = missile_launcher allow_equipment_type = { missile ballistic_missile } @@ -2315,13 +2315,14 @@ equipment_modules = { } multiply_stats = { sub_visibility = 0.15 + naval_speed = -0.1 } dismantle_cost_ic = 700 } slbm_launcher = { abbreviation = "slb" - category = ship_nuclear_rocket + category = sub_rocket add_equipment_type = missile_launcher allow_equipment_type = { nuclear_missile } @@ -2331,7 +2332,42 @@ equipment_modules = { } multiply_stats = { sub_visibility = 0.2 + naval_speed = -0.15 } dismantle_cost_ic = 1000 } + + ship_missile_launcher = { + gfx = sub_missile_launcher + category = ship_rocket + add_equipment_type = missile_launcher + allow_equipment_type = { missile ballistic_missile } + + add_stats = { + build_cost_ic = 2000 + reliability = -0.2 + } + multiply_stats = { + surface_visibility = 0.15 + naval_speed = -0.1 + } + dismantle_cost_ic = 1000 + } + + ship_slbm_launcher = { + gfx = slbm_launcher + category = ship_rocket + add_equipment_type = missile_launcher + allow_equipment_type = { nuclear_missile } + + add_stats = { + build_cost_ic = 3000 + reliability = -0.3 + } + multiply_stats = { + surface_visibility = 0.2 + naval_speed = -0.15 + } + dismantle_cost_ic = 1800 + } } \ No newline at end of file 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 0186338..5cc24e6 100755 --- a/src/common/units/equipment/modules/00_ship_modules_support.txt +++ b/src/common/units/equipment/modules/00_ship_modules_support.txt @@ -429,7 +429,7 @@ equipment_modules = { } multiply_stats = { - sub_visibility = 0.035 + sub_visibility = 0.045 naval_speed = -0.02 } @@ -457,7 +457,7 @@ equipment_modules = { } multiply_stats = { - sub_visibility = 0.02 + sub_visibility = 0.04 naval_speed = -0.03 } @@ -482,7 +482,7 @@ equipment_modules = { } multiply_stats = { - sub_visibility = 0.01 + sub_visibility = 0.035 naval_speed = -0.04 } @@ -507,6 +507,7 @@ equipment_modules = { } multiply_stats = { + sub_visibility = 0.03 naval_speed = -0.05 } diff --git a/src/common/units/equipment/ship_hull_carrier.txt b/src/common/units/equipment/ship_hull_carrier.txt index f21d52d..e5c6288 100755 --- a/src/common/units/equipment/ship_hull_carrier.txt +++ b/src/common/units/equipment/ship_hull_carrier.txt @@ -699,5 +699,103 @@ equipments = { } manpower = 5000 } + + vnr_ship_hull_mega_carrier = { + year = 1950 + archetype = ship_hull_carrier + model = ship_hull_super_carrier + priority = 1000 + can_convert_from = { vnr_ship_hull_mega_carrier } + parent = vnr_ship_hull_super_carrier + module_slots = { + fixed_ship_deck_slot_1 = { + required = yes + allowed_module_categories = { ship_deck_space_mega } + } + fixed_ship_deck_slot_2 = { + required = yes + allowed_module_categories = { ship_deck_space_mega } + } + fixed_ship_anti_air_slot = { + required = no + allowed_module_categories = { ship_anti_air ship_missile_aa } + } + fixed_ship_radar_slot = inherit + fixed_ship_engine_slot = { + required = yes + allowed_module_categories = { carrier_ship_engine carrier_ship_engine_nuclear } + } + fixed_ship_secondaries_slot = { + required = no + allowed_module_categories = { ship_secondaries ship_dp_secondaries_bb } + } + fixed_ship_armor_slot = { + required = yes + allowed_module_categories = { ship_carrier_armor_heavy } + } + fixed_ship_carrier_miscellaneous_slot_1 = { + required = no + allowed_module_categories = { carrier_unit } + } + fixed_ship_carrier_miscellaneous_slot_2 = { + required = no + allowed_module_categories = { carrier_miscellaneous } + } + fixed_ship_flight_deck_slot = inherit + front_1_custom_slot = { + required = no + allowed_module_categories = { + ship_anti_air + ship_missile_aa + steam_catapult + carrier_side_lift + carrier_angled_deck + } + } + mid_1_custom_slot = { + required = no + allowed_module_categories = { + ship_anti_air + ship_missile_aa + ship_secondaries + ship_dp_secondaries_bb + steam_catapult + carrier_side_lift + carrier_angled_deck + } + } + rear_1_custom_slot = { + required = no + allowed_module_categories = { + ship_anti_air + ship_missile_aa + ship_secondaries + ship_dp_secondaries_bb + } + } + } + default_modules = { + fixed_ship_engine_slot = carrier_ship_engine_4 + fixed_ship_armor_slot = ship_carrier_armor_heavy + } + + naval_range = 6000 + reliability = 1.3 + max_strength = 330 + naval_speed = 28 + surface_visibility = 32 + + module_count_limit = { + category = carrier_angled_deck + count < 2 + } + + build_cost_ic = 6500 + resources = { + steel = 4 + chromium = 2 + } + manpower = 6500 + } } diff --git a/src/common/units/equipment/ship_hull_cruiser.txt b/src/common/units/equipment/ship_hull_cruiser.txt index 4396f4f..e746719 100755 --- a/src/common/units/equipment/ship_hull_cruiser.txt +++ b/src/common/units/equipment/ship_hull_cruiser.txt @@ -383,6 +383,31 @@ equipments = { fixed_ship_radar_slot = ship_mast_1 fixed_ship_role_slot = ship_hull_cruiser_role_cd } + + 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_panzerschiff = { diff --git a/src/common/units/equipment/ship_hull_heavy.txt b/src/common/units/equipment/ship_hull_heavy.txt index d61ccdc..db86f98 100755 --- a/src/common/units/equipment/ship_hull_heavy.txt +++ b/src/common/units/equipment/ship_hull_heavy.txt @@ -766,4 +766,110 @@ equipments = { } manpower = 3500 } + + vnr_ship_hull_arsenal_ship = { + year = 1950 + + archetype = ship_hull_heavy + model = ship_hull_modern_super_battleship + priority = 1500 + can_convert_from = { vnr_ship_hull_arsenal_ship } + parent = vnr_ship_hull_heavy_5 + module_slots = { + fixed_ship_battery_slot = { + required = yes + allowed_module_categories = { ship_heavy_battery ship_heavy_battery_triple ship_heavy_battery_quad ship_missile } + } + fixed_ship_anti_air_slot = { + required = no + allowed_module_categories = { ship_anti_air ship_missile_aa } + } + fixed_ship_fire_control_system_slot = inherit + fixed_ship_radar_slot = inherit + fixed_ship_engine_slot = { + required = yes + allowed_module_categories = { heavy_ship_engine heavy_ship_engine_nuclear } + } + fixed_ship_secondaries_slot = inherit + fixed_ship_armor_slot = { + required = yes + allowed_module_categories = { ship_heavy_armor } + } + fixed_ship_airplane_launcher_slot = inherit + fixed_ship_extra_secondaries_slot = inherit + fixed_ship_armor_scheme_slot = inherit + fixed_ship_torpedo_defense_system_slot = inherit + front_1_custom_slot = { + required = no + allowed_module_categories = { + ship_anti_air + ship_heavy_battery + ship_heavy_battery_triple + ship_heavy_battery_quad + ship_missile + ship_missile_aa + ship_rocket + } + } + front_2_custom_slot = front_1_custom_slot + mid_1_custom_slot = { + required = no + allowed_module_categories = { + ship_heavy_battery + ship_heavy_battery_triple + ship_heavy_battery_quad + ship_anti_air + ship_secondaries + ship_dp_secondaries_bb + ship_airplane_launcher + ship_missile + ship_missile_aa + } + } + mid_2_custom_slot = mid_1_custom_slot + mid_3_custom_slot = mid_1_custom_slot + rear_1_custom_slot = { + required = no + allowed_module_categories = { + ship_anti_air + ship_heavy_battery + ship_heavy_battery_triple + ship_heavy_battery_quad + ship_secondaries + ship_dp_secondaries_bb + ship_airplane_launcher + ship_missile + ship_missile_aa + ship_rocket + } + } + rear_2_custom_slot = rear_1_custom_slot + } + + default_modules = { + fixed_ship_engine_slot = heavy_ship_engine_5 + fixed_ship_radar_slot = ship_mast_1 + front_1_custom_slot = empty + rear_1_custom_slot = empty + } + naval_range = 5000 + + max_strength = 300 + naval_speed = 32 + fuel_consumption = 70 + surface_visibility = 30 + reliability = 1.4 + build_cost_ic = 3500 + + manpower = 4500 + + module_count_limit = { + category = ship_missile + count < 8 + } + module_count_limit = { + category = ship_missile_aa + count < 8 + } + } } \ No newline at end of file diff --git a/src/common/units/equipment/ship_hull_submarine.txt b/src/common/units/equipment/ship_hull_submarine.txt index 3b9ff3d..d50a368 100755 --- a/src/common/units/equipment/ship_hull_submarine.txt +++ b/src/common/units/equipment/ship_hull_submarine.txt @@ -333,7 +333,7 @@ equipments = { } rear_1_custom_slot = { required = no - allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub ship_rocket ship_nuclear_rocket } + allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub sub_rocket } } rear_2_custom_slot = rear_1_custom_slot } @@ -455,8 +455,8 @@ equipments = { can_convert_from = { vnr_ship_hull_midget_submarine } priority = 1500 module_slots = { - fixed_ship_engine_slot = inherit fixed_ship_torpedo_slot = inherit + fixed_ship_engine_slot = inherit fixed_ship_armor_slot = inherit fixed_ship_extra_secondaries_slot = inherit mid_1_custom_slot = { diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/00_generic_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/00_generic_icons.txt index d97ab1c..3249f2d 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/00_generic_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/00_generic_icons.txt @@ -212,6 +212,13 @@ default = { GFX_vnr_ship_hull_heavy_5_medium } } + } + vnr_ship_hull_arsenal_ship = { + pool = { + icons = { + GFX_vnr_ship_hull_arsenal_ship_medium + } + } } vnr_ship_hull_carrier_conversion_ca = { pool = { @@ -288,6 +295,19 @@ default = { GFX_vnr_ship_hull_super_carrier_medium } } + } + vnr_ship_hull_mega_carrier = { + pool = { + icons = { + GFX_vnr_ship_hull_carrier_conversion_ca_medium + GFX_vnr_ship_hull_carrier_conversion_bb_medium + GFX_vnr_ship_hull_carrier_1_medium + GFX_vnr_ship_hull_carrier_2_medium + GFX_vnr_ship_hull_carrier_3_medium + GFX_vnr_ship_hull_super_carrier_medium + GFX_vnr_ship_hull_mega_carrier_medium + } + } } vnr_ship_hull_midget_submarine = { pool = { diff --git a/src/gfx/interface/special_project/project_icons/sp_arsenal_ship.png b/src/gfx/interface/special_project/project_icons/sp_arsenal_ship.png new file mode 100755 index 0000000000000000000000000000000000000000..18251671dbae47eb093b1137ad111f117c5952fd GIT binary patch literal 3506 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 QfBgU$Lo;-xfn)Ul0GpXHVgLXD literal 7946 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 F{2#Zh_38is literal 0 HcmV?d00001 diff --git a/src/gfx/interface/special_project/project_icons/sp_subcarrier.png b/src/gfx/interface/special_project/project_icons/sp_subcarrier.png index cafe3b22a530401e401f555308eba7536ad01ff1..ee4d9a30f1ac864d523fe4c180092d8d20343494 100755 GIT binary patch literal 6462 zcmd6si#rtW|Nlp#Ey)g&%4vs0AzI{^L!@2Tx?n2-<38F<8`b5 zDSH#{TNKs&ZESAX#pOX%PT;)Fcp|hzP%x1!=5jYS_AFUYpa8t`uGJeJs0cU&YAR9w zA71LQ->BGFGzNL#5zaxVwYa=-50jvEb8_eHWh2;-C^)|0FD2E`f0zeqU0>G>(vei{ z0Dx#tr0e)x5IQJ17g$xq?1LrLZYZR(3)Q>(rFE3IgT|Qs)_U)c`69Fpo zVSm{%AA^HC&naIo+X-#Rnf)SyHv2ExvRu1c;5O3v!Ze*KNfWDvUhy??un4;Y!R+Pd zb#QXxh5l8y;Pf?h+3F!Uh{IJFSdcgNipA~__lVABb<#M^jC1=S{J0!sPK;PFmrO?1 zs{GRq7Y~UVN6VS5N7y+%9I2(zxS>@_o4?{kj!KnJHqKLG)UHUfB*<8m`V&y=b@h!* z$Bc-&;l1=LmFqItV*m6ucfDas#h3;9;4?h36ADj)+dH8bfznBnN!?wEL#3Cg@ zz%f;Bf$=v_?W|zjnO%TeDa|LlBkQ^Gp1uY4*6{lJ`nXEMbE+4>+eKvJ~ zpY{2CD#buj>nu=BVr8)83w%m_OLs4LSFan_y+#^nVVts*f3)k|^B!LFA`RlAfztWw79cU4}oQ#{)D0eH~ z|1*!z!Lrl2;WntLsd)_dbdDVsbs1K1AZ{lFE`6F>`CYK4XRt_%s(8h*n$$Lbfz0-* zM~DJfgM-<*zc#s+Il7@sDLvPJ1p?1#oKPpC!4hq|IoM}4csiD~`#A2PM{{^oA-znA z-eUBjYHzCC-Id#SWQ*^}*^U;6++Mz-lfw@U^$`4>h~q5`f?{w_xPNF!$d)2LSA1XG zwlgteiS1Ao)^SBkV(XRK%#WFwnQ|6sYa*nc`=qN*7_@ZFjCH*xmQkYF(L6IF5B#Xz z%h=obK)UJ1X3>!2&#@*Pr@WriAMV1XSq`0)|jgUa^+^@&$c0$(5$$+6Y%g@%F<}4Yde76yq z#kMMXFzD|lusS(iIp}SpXneQSExN;&{SWWuZ}KmVXb$%WSMscV>ic~3U#96KBK1(! zJ%rBc&fT`j@U(p4y`c@f2^esfC0CS3%|GEWOVtZq`*f;lyY-&HcBK-1_=|c(gI)JL z)n2q+=&0H1bz0JZPy|?)nB9%9CS%`g_n&F=kAE-dw4w}?)88aZ>hiO?a_Sjx&lg-O zymccTb6F_vhZh!jhV1lOLL*)C;p%E*p2F#xhK9e@+{o=y+1XQ(I3r(rK#e>Wm-mDc z82aGs^9Q=D$Qx)zaJ?U&zEVm{%&u0VKfOBBsMc{jUml$@u0*aja9ws%49xMINkS6x z6vmE2mur}fC&)i9rpk@Gd+o(FIMjYdFpoa$e9c_*rR6ECx3_m>RUfr{`uFo-^)+e! z=un>KCjRKUP6hg^3mUg3)wL5Rl$E){cur#8n*xOdA@p;v0dDPtg@u0j6U)#CQkKUMC-0<*&Wy*;<4x|$c2<|MT>WkaHG zGP0eHY}p07ruY6DD}Y54@_yH`+3Zj-CAe$!AK0lQE61*w-DGmLR3RZ$kUu60G=6rW zVC{|d9?esyaP+D(_Z%!TPC*tyqbBbe6;!INBXu()BjZ*nTOeK4-rl}NoY%?8iT&;H z)WTn|GUjWq2HRsSd|+%WHc#PImET-Qy}xDeuQgP!auYgFLPPR-iOeBs_SksS>({>= zyR} z*S{TIG6?Fr$+-FuDg1pgR*`P4n2!Mk^1uFic9%q3Sq~ns=_S1T_|cqtsY*ZlJU_g1 zF(h1SxumSjxPCM?@xTdV$BeZhe4r=a5QCyttr~a?I?fylam?t;#X|w&2gCv6h-o3e8{Tx&4GVRPk=+fAzBxeXiHNtVmC#aU_hzu{|%XeMltIpE)_Rr@zLIgI36U^CAmq zDArLgiP1pu9OQ#3fZ<)_9wGzsdAagNyQa$hPm!=diM&}=byd}>6YwoFGc&3uJnELG z=d>OC+QjOwsg>wO+d_oIm`t>U%Rpi{ayf#Wps)I4dk(y2o&cKZ zP+oR+3Dv)!kh{PR(1;E7HE{YHx2ypf~Iyy&-NeN%^8Ly*Kzu+1DC4p*6$4 z0)P}CW!bB4Z|(@IGa7`IM{QtOF?~m~7-)gL`6N4Y@^-SDX1orLjA{!si3LN?U}T}N zvqXImoaJne7pgZi-YF0?JMPfLbQ;VQsiYT;WugvDy8?fdF#V6_;TT?fc$$lu1QyMo zy~&041@QxP;BzA0Kme!2V>lchB?TV!eyl=TuJ7S4BBlaBs@7D*4<&4hcdDGOS*kOV zY7tP7;&%AEPcOjDD`AuGV&A& z1KdnrOw+aje7T(2Y5-+L5fHUtVJoq{J8xINR#kL z5t<*!Oh))`@|||~f*{{gnj~;1RnGDqL)gMiQ{YzCL7}s7B60+O98hI67{e@{XLN=> z^jLLG84gk*2ke5D+6UChSOTmL<+*?>U3KBvq*+S%6SbK^G=agC(*PDfexsC|=$OIP z1>T5vu0`hCd}QbY7+75l^hhG@1W$Clt>kQdzk2e|dpFhJ(^}pq&P1#}%GI+bBN*n8 zE?P{svyq+PpSRX~rb1Q5{!0sc*1r((BzqWTl5%PdVL{)6QA=f_xx3JjRgMoFL}~Y7 z_VNuX;el#33NjjAOGnLa-Obj3{0h7`^0CH4iy^rc%tj4*m4W#Ev&(kogD6+-D`gMP z1%;geX7#$aC4jX5Q4=ytuaY?A(HM)=6BY`P>t__%3CN9DY;w9M=}UN%dnpZ1{(K@~ z@-^}Tonxxte)ORnq%bj0%LtCTQL0~*_BM<4Cmsz1M7mY-ur?Lm*H z#}X#rSkL#Nliwos`*G4!X?#b+H_C!SzU%tf;ry>JIgJmH@UcxzC=38tBM-AJwOL8b zjfJuB{Ird!+l%(#iaSNi1ak#Jo}ifWf*IyhO5+7P(U8G#_;P>NplV>JcBla8>qN99 zmR?5LUj@=3meMq~qUxC&=~YUWaoD9A=2Lm7JT2_ysNZ%7I`G0h#|aCW$ZS1xNGKM& zWZWhJp219ff<*zDUV?#763K?hz43!1Nm<+$0GiP;yZ-p)Wz`O6E$eIcRpk2m`rLr7 z96NJ%{PpAHfF#6KwL|X&bQ}mMww^!YC586-k~!@o>)O#|Snh(w1ljcM)A2*@HloHojIY3islI(yhZ+f^{=K+?;^$&yCWZ z%-ti%*-mO9viUYrrL}Fhc=5#!e&-a^RSl(I2MbV-cfAp9&nmL!9lX_;IKUzn?Yr=XqDKjQn@2ntvFJOP8x+o#mj~nc%JwMM_^4TGwRsUJsL^7(@gPV%(7cl%NZs6>jpZI@>y4b)RW4ui(wQSo<_v>o*$`Ca^5@ zLCNHu6;|bGu?cxn2I?Y^D=%RH|fmZPtUZ6e9K1x`b&(2Sq`HwrzMk39p?}s~A>t)cSccHrr0Qyo2Pcu)o1;Fi* zWnyO?7ILw}RuN0Zl^`gxoC~*H>01s^{N6giBI%tpwQO>LjF^xsE z@u4(ML9(>L76=_`UlZyZ>{FT;w=wsn5=xI!nd3#t()sgYj<-z{rd0Q31b@{y*SA*4 z*L#KKT+~%wkSw@)@cvn8W%_ChimgPTqBt$g&)=YvKPD-wftJ45gg_BUkQ%+qSI7-b_~F8!zfinO=sK zV_*MQT>tyVaH-X84X{+kPHbK9**v+pZ?R%SI@mXO$*4PsdJ+VWyu5tc6n>7rAQ#@* zF|~3IbpqBIo|nH5U1ImkwdN_vbgwlr7el1gIvOTvO&`Leq8`88wuh4trTr!=YWZI^ zLH)}a(~FQb(42ZrX<>wjCB zq>*SR`2O@nXLsegK?ktu6XQB9{y<{(W4nFvW^r0P)jnP&rFf%l;G~4rS=;SbzB}=u zlx7AyZir;-B2*k2A;i5np~G4l92(l7qIB&4Nbb*B)Dh6D8j45#qBPA?uL=1qD4e;~ zu6G5+UCLpZyf(gbPKwke%BCVbl4$m&R>mEblzQqq*?L}Wnd=P^1aK4xdVnNk_li$7 z{EO_y=aL;?wR1MPmp>B>_UoD_njV8(;E{Wdk7K@lX(k~VY9WRH(ys+XJY2|e7DQs- z#PDRg_grj$)o0kJv*_dXTS3ivT-LuAs*Gm9$BG zwBO^&e&>@r1D>g{cRMu2eoM6%0T1p)9f)TVDePo+!)16KW$*IqrJ?0wP+wgh#zPka z=z;qI)v>X$tz9NoBQXdU1;N2ADF?o2beZXz`{WvGuG-=eaS!KIxjO5Qi%U!V;2hZV zin$TV8d3C`L2E-UGI9>SK#VX_4CVpTnQsl-Zc+yd#S~OUzKpo{>4cBXRgAYYl>f27 zi0(3WkFz7`VpB93N}<%@TdH>o`SV=kHi+$wDTQ`jecHB#;P$J|_TtYm#6%_XV1jMD z>Cv)=I_)u$;`{Saya zA9@~q;k}1IM6DJ-5Up;(5-L2FZ%7>VnDIb04Y;n$^5cu1 zGn3RVinjlC@+U0(5n4o}^yk6E3vZom&mF)3=XMh_Y|F(tc^s#bu%k+;xDkF4f4yBh zv^9L&HUDd@+Kh8h-`;A;hsT5pJt$f{(W0Qm>%F476Si4(fzjDW{VhdXn|Q+(#*q7K zJ>D$GPy2wq$m|h{?@b&~`1>cym2%{tcGSk{R_|@y_#zLxQPr`MIp=)f-C1RWmwor;oAUS*4{rm3?v1 zNsib9C}-`KO3eFBM}8~e4Mu&ajl6&?OxYgz(pQD)7ZvF+jz9}=X`4B`7I%JXedzGI z6i5bO)n`qmUpt#UfTJC2@jPpX{`SBmtQ-ZKqoD z&GOtMHh~J^2mPf_{^c??za|^qu+;Y|8(F?$S6_A8TKUfWl<++ZbX`WrqSxP|pm#%L zejIO4B?}7nKapl!{^tE##6-3=_FgYiab-dsy5XR8A9Gmj!v8my*0y;8Z6YJ}ldEeSPR(-1}M)DqNEWB!SG_|Eq`Z|Ci#yEt8u6ju@l005G9ws^NwGfoK- z6FE(cZe#7KAQao{Q2+o`=5K@mMa2pLfM}8(9_tZXyjBvH=}T1XPi$P1kN1a?&!k4C z6I=oyXe?GZ+13Rj4xE9n?_+_s_@2<5Wz7mZqnxB7ih-I&R&s%Yn6QVKQvFPjj8b(v z_5Iqb|2@wxsq&_P3;BdOm9 zFQVu$ApQS{_!IxDzct&3Z3*_D^9TTa4ZLk##40ih(|)f4u{5UxcQe9!_1Sm`0%Tut zmLp0P+905V6i5{*rb#F~y23e=fDZV(_BcQ>dMeI@%OM4oDh0xk5fDVx&?2KQS{EdU=?G16Y(Bk?wAjA|QMN^nD~dP?dD9{WREq@E-h z?wCs{_$2%}LqyA;@OU$l*T`Hq{?H-1?_=`a2!7DDb3K@e9u50(aK?aDpK|;X{4=

+7C_lvU#fL4<<+dGa=Bg$|v2R2Ls;Y>J&*T=JD>?Ht*uHD^%D-|?bhS$w zB?$j7J^_`1N^O3f+D;zXVLwGDkGXR#b?@2?Yv<85it~8f(+Vkp!^5TwI*qb`-<>&9Pg9I1gwB7c^u3esVW^~ z$5<%u57l-ReiZkWFuNyWLmUPsKxyE8wVbUL<`A<`D_gfg1%rrXq_ynymLru3miu!6 z%P6__MO~g5Po4KxtH=@PkK-&lKr0T|BV>ttQTw*|HYwPtW7@p)sI6Bjtgpm zHf|kVg_B#N@qb1)o{c?2nEN+$bT*pV`k%62bazcmlb*ReS1m}=kA*l}Lk{2Gi1oJ| zOG#xqlTNywb(N=o!u+t|;(RMS97(Zz^7Me$AX|h#a z+2>m~3K+w%O8Ig~?w>|NzEHEv@8kLI+@4OS!w*B=hDpYtHqE?w^y22yraCX#qbq62 zbqgG%Ibl&-?(qlP#)`dG1lv3Qps2wX#3u{qd z5ft1WXb@ScUZPPf{QaJMe}>v+M1wN5LvGx7yo-tM7HD+OiX5@O{P=bar*lrtmYr8ci^(S&mFW>+=h=OemKD+b z(j`7?Dt{`*>SnJz&-0+eAs3cVS{HXL*2Jfwy&0Eo)mqeQ)2Pb>Hgrg}Fmw0p)ya2;^pFvZ0Z%CG+>`(4SGhR3uI@0i; a6AfsQL(IxQ*Tp+MXn-BT3I7@waPKd%y_Vtt diff --git a/src/gfx/interface/special_project/project_icons/sp_super_heavy_guns.png b/src/gfx/interface/special_project/project_icons/sp_super_heavy_guns.png index 37ced3ada87bc171f799b25a7d3cad59bbcea983..aafdcdccfbeb1dd09264ead46783e93f1b219bdf 100755 GIT binary patch literal 6386 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 diff --git a/src/gfx/interface/technologies/Generic/generic_arsenal_ship.png b/src/gfx/interface/technologies/Generic/generic_arsenal_ship.png new file mode 100755 index 0000000000000000000000000000000000000000..8185e9fae915b573ecf095b15b03acfffee9ddf2 GIT binary patch literal 16464 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%0A9}{#IrCl5 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/Generic/generic_mega_carrier.png b/src/gfx/interface/technologies/Generic/generic_mega_carrier.png new file mode 100755 index 0000000000000000000000000000000000000000..d8eb05e891d7421be709170f28a2aedf45ddf251 GIT binary patch literal 15868 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 Qw{t`8Xy~bzBdtRJ2YJl4)c^nh literal 0 HcmV?d00001 diff --git a/src/interface/vnr_user_interface_assets.gfx b/src/interface/vnr_user_interface_assets.gfx index a1b2315..b0a87e6 100755 --- a/src/interface/vnr_user_interface_assets.gfx +++ b/src/interface/vnr_user_interface_assets.gfx @@ -25,6 +25,7 @@ spriteTypes = { spriteType = { name = "GFX_unit_battleship_4_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_III.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battleship_5_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_IV.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battleship_6_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_V.dds" noOfFrames = 2 } + spriteType = { name = "GFX_unit_battleship_7_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_V.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_heavy_cruiser_1_icon_medium" texturefile = "gfx/interface/navalcombat/ships/heavy_cruiser_0.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_heavy_cruiser_2_icon_medium" texturefile = "gfx/interface/navalcombat/ships/panzerschiff.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_heavy_cruiser_3_icon_medium" texturefile = "gfx/interface/navalcombat/ships/heavy_cruiser_I.dds" noOfFrames = 2 } @@ -55,6 +56,7 @@ spriteTypes = { spriteType = { name = "GFX_unit_carrier_4_icon_medium" texturefile = "gfx/interface/navalcombat/ships/carrier_III.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_carrier_5_icon_medium" texturefile = "gfx/interface/navalcombat/ships/carrier_IV.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_carrier_6_icon_medium" texturefile = "gfx/interface/navalcombat/ships/carrier_VI.dds" noOfFrames = 2 } + spriteType = { name = "GFX_unit_carrier_7_icon_medium" texturefile = "gfx/interface/navalcombat/ships/carrier_VI.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battlecarrier_1_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battlecarrier.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battlecarrier_2_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battlecarrier.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battlecarrier_3_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battlecarrier.dds" noOfFrames = 2 } diff --git a/src/interface/z_generic_icons.gfx b/src/interface/z_generic_icons.gfx index e305fcc..4c59b58 100755 --- a/src/interface/z_generic_icons.gfx +++ b/src/interface/z_generic_icons.gfx @@ -116,6 +116,10 @@ spriteTypes = { name = "GFX_vnr_ship_hull_super_heavy_1_medium" texturefile = "gfx/interface/technologies/Generic/generic_heavy_battleship1.png" } + spriteType = { + name = "GFX_vnr_ship_hull_arsenal_ship_medium" + texturefile = "gfx/interface/technologies/Generic/generic_arsenal_ship.png" + } # carrier spriteType = { @@ -146,6 +150,10 @@ spriteTypes = { name = "GFX_vnr_ship_hull_super_carrier_medium" texturefile = "gfx/interface/technologies/Generic/generic_super_carrier.png" } + spriteType = { + name = "GFX_vnr_ship_hull_mega_carrier_medium" + texturefile = "gfx/interface/technologies/Generic/generic_mega_carrier.png" + } # submarine spriteType = { diff --git a/src/interface/z_navy_techtree.gfx b/src/interface/z_navy_techtree.gfx index 515bf81..da441dc 100755 --- a/src/interface/z_navy_techtree.gfx +++ b/src/interface/z_navy_techtree.gfx @@ -715,4 +715,12 @@ spriteTypes = { name = "GFX_sp_subcarrier" textureFile = "gfx/interface/special_project/project_icons/sp_subcarrier.png" } + spriteType = { + name = "GFX_sp_mega_carrier" + textureFile = "gfx/interface/special_project/project_icons/sp_mega_carrier.png" + } + spriteType = { + name = "GFX_sp_arsenal_ship" + textureFile = "gfx/interface/special_project/project_icons/sp_arsenal_ship.png" + } } diff --git a/src/interface/z_ship_modules.gfx b/src/interface/z_ship_modules.gfx index 3479d79..9ba9e13 100755 --- a/src/interface/z_ship_modules.gfx +++ b/src/interface/z_ship_modules.gfx @@ -170,6 +170,10 @@ spriteTypes = { name = "GFX_SMI_cold_war_miscellaneous" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/full_missile_upgrade.png" } + spriteType = { + name = "GFX_SMI_sub_airplane_launcher" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/airplane_launcher_icn.dds" + } # topview images spriteType = { diff --git a/src/localisation/english/replace/equip_naval_l_english.yml b/src/localisation/english/replace/equip_naval_l_english.yml index 36e8d49..4fe29c2 100755 --- a/src/localisation/english/replace/equip_naval_l_english.yml +++ b/src/localisation/english/replace/equip_naval_l_english.yml @@ -92,5 +92,9 @@ ocean_liner_equipment_desc: "私营企业或个人所有的远洋客轮，主要用于跨海或跨洋航线。客轮可以作为一种应急的浮动港使用。" ocean_liner: "远洋客轮" ocean_liner_desc: "私营企业或个人所有的远洋客轮，主要用于跨海或跨洋航线。客轮可以作为一种应急的浮动港使用。" - vnr_ship_hull_merchant_carrier: "商船航母" - vnr_ship_hull_merchant_carrier_desc: "商船航母是一种特殊的航空母舰，通常是在谷物运输船或油轮的船壳上增加一条全通甲板改装而成的，其可以支持反潜飞机的起降，并作为商船队的护卫使用。" \ No newline at end of file + vnr_ship_hull_merchant_carrier: "商船航母船体" + vnr_ship_hull_merchant_carrier_desc: "商船航母是一种特殊的航空母舰，通常是在谷物运输船或油轮的船壳上增加一条全通甲板改装而成的，其可以支持反潜飞机的起降，并作为商船队的护卫使用。" + vnr_ship_hull_mega_carrier: "战略打击航母船体" + vnr_ship_hull_mega_carrier_desc: "四十年代末期，核武器的威力已经在实战中得到验证，其在人口稠密的大城市引爆的恐怖损失迫使各国发展和部署具有核三位一体打击能力的武器与平台。在洲际导弹普及之前，使用重型喷气式轰炸机是唯一能向远距离投放核武器的核打击形式。这促使海军提出了一种能够支援这类行动的机动平台，也就是打击航母。" + vnr_ship_hull_arsenal_ship: "武库舰船体" + vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" \ No newline at end of file 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 13f654c..40df649 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.15 “特拉法尔加”§!\n\n§C重要新增：§!\n\n-兼容原版1.15更新和新dlc\n-海军特殊项目：航空战列舰，潜水航母，核鱼雷，vt弹，超重舰炮，中途补给，导弹潜艇，核导弹潜艇\n-重新平衡巡洋舰和相关模块的HP加成效果\n-新角色：岸防战列舰\n\n§C更新：§!\n\n-减少探测带来的阵位加成\n-降低潜艇的基础可见度，减可见度的模块效果削弱\n-重做所有装甲钢处理科技的图标\n-为蒸汽弹射器更换图标\n-为近海行动学说更换图标\n-潜望镜科技需要父科技完成才能研究\n-为德国添加获取一战设计的决议\n-超级航母现在使用新dlc提供的模型\n-现代战列舰现在使用新dlc提供的模型\n\n§C修复：§!\n\n-远洋客轮添加一条关于其作用的提示\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.15.1 “特拉法尔加”§!\n\n§C重要新增：§!\n\n-新特殊工程：战略打击航母，武库舰\n-新模块：超大型装甲机库，水面弹道导弹发射器，水面核弹道导弹发射器\n-为海军工程添加一些特殊选择事件\n\n§C更新：§!\n\n-重做海军工程的图标\n-为所有海军工程添加资源消耗\n-允许AI研究一些有价值的海军工程\n-降低超重炮的原型复杂度\n-降低研究核鱼雷、近炸引信、超重炮所需的突破点数\n-大幅降低中途补给科技的研究时间\n-沙恩霍斯特级现在使用战列舰装甲和2级引擎\n-怀俄明级现在有六座炮塔\n-降低解锁改装航母决议所需的船坞和敌军航母数量\n-核动力引擎现在需要核反应堆项目完成才能研究\n-为潜艇鱼雷增加可见度惩罚\n-运输船运兵速度上调\n-专家AI会在潜艇上安装AIP引擎\n\n§C修复：§!\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 此模组中实现最大屏卫效率的屏卫/主力比例为2\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/ship_modules_l_english.yml b/src/localisation/english/replace/ship_modules_l_english.yml index 102e0f6..486f4c8 100755 --- a/src/localisation/english/replace/ship_modules_l_english.yml +++ b/src/localisation/english/replace/ship_modules_l_english.yml @@ -1055,4 +1055,11 @@ sub_airplane_launcher_2: "改进型水上飞机弹射器" sub_airplane_launcher_2_desc: "改进过的弹射装置可以让潜艇弹射更大的、航程更远航速更快的飞机。" sub_nuclear_torpedo: "核鱼雷" - sub_nuclear_torpedo_desc: "装有核战斗部的鱼雷。" \ No newline at end of file + sub_nuclear_torpedo_desc: "装有核战斗部的鱼雷。" + EQ_MOD_CAT_sub_rocket: "潜射导弹发射器" + ship_deck_space_mega: "超大型装甲机库" + ship_deck_space_mega_short: "超大型装甲机库" + ship_deck_space_mega_desc: "携带大量飞机的超大型装甲机库。" + EQ_MOD_CAT_ship_deck_space_mega_TITLE: "超大型装甲机库" + ship_missile_launcher: "导弹发射井" + ship_slbm_launcher: "核导弹发射井" \ No newline at end of file diff --git a/src/localisation/english/replace/vnr_naval_develop_l_english.yml b/src/localisation/english/replace/vnr_naval_develop_l_english.yml index 22bd4a6..e62c5ba 100755 --- a/src/localisation/english/replace/vnr_naval_develop_l_english.yml +++ b/src/localisation/english/replace/vnr_naval_develop_l_english.yml @@ -60,7 +60,25 @@ sp_subcarrier_desc: "潜水航母事实上是一种能够弹射飞机的大型潜艇。虽然其装载的飞机更小更轻，但是在潜艇狭小的空间内仍然很难容纳飞机，因此它们的载机量通常只有二到三架。" sp_nuclear_torpedo: "核鱼雷" sp_nuclear_torpedo_desc: "水下核爆炸对水面舰艇和潜艇都是极为致命的。通过加装微型核弹头，这种鱼雷将成为潜艇上最强大的武器。" - sp_vt_shell: "近炸引信" - sp_vt_shell_desc: "近炸引信是一种以无线电发射器进行制导的装置，可以在接近目标时爆炸。其对于高速移动的物体有着更好的命中效率。" sp_super_heavy_guns: "超大口径舰炮" - sp_super_heavy_guns_desc: "超大口径舰炮是一种口径达到甚至超过18寸（约460mm）的重型火炮。" \ No newline at end of file + sp_super_heavy_guns_desc: "超大口径舰炮是一种口径达到甚至超过18寸（约460mm）的重型火炮。" + sp_mega_carrier: "战略打击航母" + sp_mega_carrier_desc: "战略打击航母是浮动机场的真正定义，拥有可以从远距离放飞重型喷气机的能力。" + sp_arsenal_ship: "武库舰" + sp_arsenal_ship_desc: "随着对导弹在未来可以改变战争模式的认可，支持者们的目光转向了携带数百枚导弹的武库舰。" + sp_battlecarrier_unique_reward_a: "对航空战列舰角色的争议" + sp_battlecarrier_unique_reward_a_desc: "在航空战列舰的设计迭代过程中，一个问题油然而生。我们应该注重于提升单舰的性能还是试图将其纳入到舰队的作战指挥体系中？" + sp_battlecarrier_perference_a: "注重性能" + sp_battlecarrier_perference_b: "注重协同" + sp_subcarrier_unique_reward_a: "工程经验的应用" + sp_subcarrier_unique_reward_a_desc: "在潜水航母的设计过程中，一个问题油然而生。我们应该将工程中获得的经验用于加强巡洋潜艇还是所有的潜艇？" + sp_subcarrier_perference_a: "巡洋潜艇" + sp_subcarrier_perference_b: "所有潜艇" + sp_nuclear_torpedo_unique_reward_a: "核鱼雷项目的重心" + sp_nuclear_torpedo_unique_reward_a_desc: "在潜艇上储存核战斗部的安全性仍然有待商榷。" + sp_nuclear_torpedo_preference_a: "安全第一" + sp_nuclear_torpedo_preference_b: "扩大储备" + sp_super_heavy_guns_unique_reward_a: "对20英寸主炮的追求" + sp_super_heavy_guns_unique_reward_a_desc: "在超重型舰炮的设计选型中，研发团队提出了一个建造更大口径舰炮的疯狂计划。如果我们选择在这方面寻求突破，那势必会影响目前的设计进程。" + sp_super_heavy_guns_preference_a: "同意" + sp_super_heavy_guns_preference_b: "算了" \ No newline at end of file diff --git a/src/localisation/replace/equip_naval_l_english.yml b/src/localisation/replace/equip_naval_l_english.yml index 36e8d49..4fe29c2 100755 --- a/src/localisation/replace/equip_naval_l_english.yml +++ b/src/localisation/replace/equip_naval_l_english.yml @@ -92,5 +92,9 @@ ocean_liner_equipment_desc: "私营企业或个人所有的远洋客轮，主要用于跨海或跨洋航线。客轮可以作为一种应急的浮动港使用。" ocean_liner: "远洋客轮" ocean_liner_desc: "私营企业或个人所有的远洋客轮，主要用于跨海或跨洋航线。客轮可以作为一种应急的浮动港使用。" - vnr_ship_hull_merchant_carrier: "商船航母" - vnr_ship_hull_merchant_carrier_desc: "商船航母是一种特殊的航空母舰，通常是在谷物运输船或油轮的船壳上增加一条全通甲板改装而成的，其可以支持反潜飞机的起降，并作为商船队的护卫使用。" \ No newline at end of file + vnr_ship_hull_merchant_carrier: "商船航母船体" + vnr_ship_hull_merchant_carrier_desc: "商船航母是一种特殊的航空母舰，通常是在谷物运输船或油轮的船壳上增加一条全通甲板改装而成的，其可以支持反潜飞机的起降，并作为商船队的护卫使用。" + vnr_ship_hull_mega_carrier: "战略打击航母船体" + vnr_ship_hull_mega_carrier_desc: "四十年代末期，核武器的威力已经在实战中得到验证，其在人口稠密的大城市引爆的恐怖损失迫使各国发展和部署具有核三位一体打击能力的武器与平台。在洲际导弹普及之前，使用重型喷气式轰炸机是唯一能向远距离投放核武器的核打击形式。这促使海军提出了一种能够支援这类行动的机动平台，也就是打击航母。" + vnr_ship_hull_arsenal_ship: "武库舰船体" + vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" \ No newline at end of file diff --git a/src/localisation/replace/navy_rework_welcome_l_english.yml b/src/localisation/replace/navy_rework_welcome_l_english.yml index 13f654c..40df649 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.15 “特拉法尔加”§!\n\n§C重要新增：§!\n\n-兼容原版1.15更新和新dlc\n-海军特殊项目：航空战列舰，潜水航母，核鱼雷，vt弹，超重舰炮，中途补给，导弹潜艇，核导弹潜艇\n-重新平衡巡洋舰和相关模块的HP加成效果\n-新角色：岸防战列舰\n\n§C更新：§!\n\n-减少探测带来的阵位加成\n-降低潜艇的基础可见度，减可见度的模块效果削弱\n-重做所有装甲钢处理科技的图标\n-为蒸汽弹射器更换图标\n-为近海行动学说更换图标\n-潜望镜科技需要父科技完成才能研究\n-为德国添加获取一战设计的决议\n-超级航母现在使用新dlc提供的模型\n-现代战列舰现在使用新dlc提供的模型\n\n§C修复：§!\n\n-远洋客轮添加一条关于其作用的提示\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.15.1 “特拉法尔加”§!\n\n§C重要新增：§!\n\n-新特殊工程：战略打击航母，武库舰\n-新模块：超大型装甲机库，水面弹道导弹发射器，水面核弹道导弹发射器\n-为海军工程添加一些特殊选择事件\n\n§C更新：§!\n\n-重做海军工程的图标\n-为所有海军工程添加资源消耗\n-允许AI研究一些有价值的海军工程\n-降低超重炮的原型复杂度\n-降低研究核鱼雷、近炸引信、超重炮所需的突破点数\n-大幅降低中途补给科技的研究时间\n-沙恩霍斯特级现在使用战列舰装甲和2级引擎\n-怀俄明级现在有六座炮塔\n-降低解锁改装航母决议所需的船坞和敌军航母数量\n-核动力引擎现在需要核反应堆项目完成才能研究\n-为潜艇鱼雷增加可见度惩罚\n-运输船运兵速度上调\n-专家AI会在潜艇上安装AIP引擎\n\n§C修复：§!\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 此模组中实现最大屏卫效率的屏卫/主力比例为2\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/ship_modules_l_english.yml b/src/localisation/replace/ship_modules_l_english.yml index 102e0f6..486f4c8 100755 --- a/src/localisation/replace/ship_modules_l_english.yml +++ b/src/localisation/replace/ship_modules_l_english.yml @@ -1055,4 +1055,11 @@ sub_airplane_launcher_2: "改进型水上飞机弹射器" sub_airplane_launcher_2_desc: "改进过的弹射装置可以让潜艇弹射更大的、航程更远航速更快的飞机。" sub_nuclear_torpedo: "核鱼雷" - sub_nuclear_torpedo_desc: "装有核战斗部的鱼雷。" \ No newline at end of file + sub_nuclear_torpedo_desc: "装有核战斗部的鱼雷。" + EQ_MOD_CAT_sub_rocket: "潜射导弹发射器" + ship_deck_space_mega: "超大型装甲机库" + ship_deck_space_mega_short: "超大型装甲机库" + ship_deck_space_mega_desc: "携带大量飞机的超大型装甲机库。" + EQ_MOD_CAT_ship_deck_space_mega_TITLE: "超大型装甲机库" + ship_missile_launcher: "导弹发射井" + ship_slbm_launcher: "核导弹发射井" \ No newline at end of file diff --git a/src/localisation/replace/vnr_naval_develop_l_english.yml b/src/localisation/replace/vnr_naval_develop_l_english.yml index 22bd4a6..e62c5ba 100755 --- a/src/localisation/replace/vnr_naval_develop_l_english.yml +++ b/src/localisation/replace/vnr_naval_develop_l_english.yml @@ -60,7 +60,25 @@ sp_subcarrier_desc: "潜水航母事实上是一种能够弹射飞机的大型潜艇。虽然其装载的飞机更小更轻，但是在潜艇狭小的空间内仍然很难容纳飞机，因此它们的载机量通常只有二到三架。" sp_nuclear_torpedo: "核鱼雷" sp_nuclear_torpedo_desc: "水下核爆炸对水面舰艇和潜艇都是极为致命的。通过加装微型核弹头，这种鱼雷将成为潜艇上最强大的武器。" - sp_vt_shell: "近炸引信" - sp_vt_shell_desc: "近炸引信是一种以无线电发射器进行制导的装置，可以在接近目标时爆炸。其对于高速移动的物体有着更好的命中效率。" sp_super_heavy_guns: "超大口径舰炮" - sp_super_heavy_guns_desc: "超大口径舰炮是一种口径达到甚至超过18寸（约460mm）的重型火炮。" \ No newline at end of file + sp_super_heavy_guns_desc: "超大口径舰炮是一种口径达到甚至超过18寸（约460mm）的重型火炮。" + sp_mega_carrier: "战略打击航母" + sp_mega_carrier_desc: "战略打击航母是浮动机场的真正定义，拥有可以从远距离放飞重型喷气机的能力。" + sp_arsenal_ship: "武库舰" + sp_arsenal_ship_desc: "随着对导弹在未来可以改变战争模式的认可，支持者们的目光转向了携带数百枚导弹的武库舰。" + sp_battlecarrier_unique_reward_a: "对航空战列舰角色的争议" + sp_battlecarrier_unique_reward_a_desc: "在航空战列舰的设计迭代过程中，一个问题油然而生。我们应该注重于提升单舰的性能还是试图将其纳入到舰队的作战指挥体系中？" + sp_battlecarrier_perference_a: "注重性能" + sp_battlecarrier_perference_b: "注重协同" + sp_subcarrier_unique_reward_a: "工程经验的应用" + sp_subcarrier_unique_reward_a_desc: "在潜水航母的设计过程中，一个问题油然而生。我们应该将工程中获得的经验用于加强巡洋潜艇还是所有的潜艇？" + sp_subcarrier_perference_a: "巡洋潜艇" + sp_subcarrier_perference_b: "所有潜艇" + sp_nuclear_torpedo_unique_reward_a: "核鱼雷项目的重心" + sp_nuclear_torpedo_unique_reward_a_desc: "在潜艇上储存核战斗部的安全性仍然有待商榷。" + sp_nuclear_torpedo_preference_a: "安全第一" + sp_nuclear_torpedo_preference_b: "扩大储备" + sp_super_heavy_guns_unique_reward_a: "对20英寸主炮的追求" + sp_super_heavy_guns_unique_reward_a_desc: "在超重型舰炮的设计选型中，研发团队提出了一个建造更大口径舰炮的疯狂计划。如果我们选择在这方面寻求突破，那势必会影响目前的设计进程。" + sp_super_heavy_guns_preference_a: "同意" + sp_super_heavy_guns_preference_b: "算了" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/equip_naval_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/equip_naval_l_simp_chinese.yml index 8ab077f..c7cae79 100755 --- a/src/localisation/simp_chinese/replace/equip_naval_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/equip_naval_l_simp_chinese.yml @@ -92,5 +92,9 @@ ocean_liner_equipment_desc: "私营企业或个人所有的远洋客轮，主要用于跨海或跨洋航线。客轮可以作为一种应急的浮动港使用。" ocean_liner: "远洋客轮" ocean_liner_desc: "私营企业或个人所有的远洋客轮，主要用于跨海或跨洋航线。客轮可以作为一种应急的浮动港使用。" - vnr_ship_hull_merchant_carrier: "商船航母" - vnr_ship_hull_merchant_carrier_desc: "商船航母是一种特殊的航空母舰，通常是在谷物运输船或油轮的船壳上增加一条全通甲板改装而成的，其可以支持反潜飞机的起降，并作为商船队的护卫使用。" \ No newline at end of file + vnr_ship_hull_merchant_carrier: "商船航母船体" + vnr_ship_hull_merchant_carrier_desc: "商船航母是一种特殊的航空母舰，通常是在谷物运输船或油轮的船壳上增加一条全通甲板改装而成的，其可以支持反潜飞机的起降，并作为商船队的护卫使用。" + vnr_ship_hull_mega_carrier: "战略打击航母船体" + vnr_ship_hull_mega_carrier_desc: "四十年代末期，核武器的威力已经在实战中得到验证，其在人口稠密的大城市引爆的恐怖损失迫使各国发展和部署具有核三位一体打击能力的武器与平台。在洲际导弹普及之前，使用重型喷气式轰炸机是唯一能向远距离投放核武器的核打击形式。这促使海军提出了一种能够支援这类行动的机动平台，也就是打击航母。" + vnr_ship_hull_arsenal_ship: "武库舰船体" + vnr_ship_hull_arsenal_ship_desc: "火箭引擎的发展和大规模生产已经使得导弹的成本远低于其他的武器装备。此时，一种装载数百枚导弹的大型水面舰艇方案被提出，海军寄希望于这种战舰主导大规模的对岸精确支援行动。一些专家将这类船舶称为武库舰。" \ No newline at end of file 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 d549e75..640a8a4 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.15 “特拉法尔加”§!\n\n§C重要新增：§!\n\n-兼容原版1.15更新和新dlc\n-海军特殊项目：航空战列舰，潜水航母，核鱼雷，vt弹，超重舰炮，中途补给，导弹潜艇，核导弹潜艇\n-重新平衡巡洋舰和相关模块的HP加成效果\n-新角色：岸防战列舰\n\n§C更新：§!\n\n-减少探测带来的阵位加成\n-降低潜艇的基础可见度，减可见度的模块效果削弱\n-重做所有装甲钢处理科技的图标\n-为蒸汽弹射器更换图标\n-为近海行动学说更换图标\n-潜望镜科技需要父科技完成才能研究\n-为德国添加获取一战设计的决议\n-超级航母现在使用新dlc提供的模型\n-现代战列舰现在使用新dlc提供的模型\n\n§C修复：§!\n\n-远洋客轮添加一条关于其作用的提示\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.15.1 “特拉法尔加”§!\n\n§C重要新增：§!\n\n-新特殊工程：战略打击航母，武库舰\n-新模块：超大型装甲机库，水面弹道导弹发射器，水面核弹道导弹发射器\n-为海军工程添加一些特殊选择事件\n\n§C更新：§!\n\n-重做海军工程的图标\n-为所有海军工程添加资源消耗\n-允许AI研究一些有价值的海军工程\n-降低超重炮的原型复杂度\n-降低研究核鱼雷、近炸引信、超重炮所需的突破点数\n-大幅降低中途补给科技的研究时间\n-沙恩霍斯特级现在使用战列舰装甲和2级引擎\n-怀俄明级现在有六座炮塔\n-降低解锁改装航母决议所需的船坞和敌军航母数量\n-核动力引擎现在需要核反应堆项目完成才能研究\n-为潜艇鱼雷增加可见度惩罚\n-运输船运兵速度上调\n-专家AI会在潜艇上安装AIP引擎\n\n§C修复：§!\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 此模组中实现最大屏卫效率的屏卫/主力比例为2\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/ship_modules_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml index d1ca43e..d623580 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 @@ -1055,4 +1055,11 @@ sub_airplane_launcher_2: "改进型水上飞机弹射器" sub_airplane_launcher_2_desc: "改进过的弹射装置可以让潜艇弹射更大的、航程更远航速更快的飞机。" sub_nuclear_torpedo: "核鱼雷" - sub_nuclear_torpedo_desc: "装有核战斗部的鱼雷。" \ No newline at end of file + sub_nuclear_torpedo_desc: "装有核战斗部的鱼雷。" + EQ_MOD_CAT_sub_rocket: "潜射导弹发射器" + ship_deck_space_mega: "超大型装甲机库" + ship_deck_space_mega_short: "超大型装甲机库" + ship_deck_space_mega_desc: "携带大量飞机的超大型装甲机库。" + EQ_MOD_CAT_ship_deck_space_mega_TITLE: "超大型装甲机库" + ship_missile_launcher: "导弹发射井" + ship_slbm_launcher: "核导弹发射井" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/vnr_naval_develop_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/vnr_naval_develop_l_simp_chinese.yml index 679bf11..de7e1ea 100755 --- a/src/localisation/simp_chinese/replace/vnr_naval_develop_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/vnr_naval_develop_l_simp_chinese.yml @@ -60,7 +60,25 @@ sp_subcarrier_desc: "潜水航母事实上是一种能够弹射飞机的大型潜艇。虽然其装载的飞机更小更轻，但是在潜艇狭小的空间内仍然很难容纳飞机，因此它们的载机量通常只有二到三架。" sp_nuclear_torpedo: "核鱼雷" sp_nuclear_torpedo_desc: "水下核爆炸对水面舰艇和潜艇都是极为致命的。通过加装微型核弹头，这种鱼雷将成为潜艇上最强大的武器。" - sp_vt_shell: "近炸引信" - sp_vt_shell_desc: "近炸引信是一种以无线电发射器进行制导的装置，可以在接近目标时爆炸。其对于高速移动的物体有着更好的命中效率。" sp_super_heavy_guns: "超大口径舰炮" - sp_super_heavy_guns_desc: "超大口径舰炮是一种口径达到甚至超过18寸（约460mm）的重型火炮。" \ No newline at end of file + sp_super_heavy_guns_desc: "超大口径舰炮是一种口径达到甚至超过18寸（约460mm）的重型火炮。" + sp_mega_carrier: "战略打击航母" + sp_mega_carrier_desc: "战略打击航母是浮动机场的真正定义，拥有可以从远距离放飞重型喷气机的能力。" + sp_arsenal_ship: "武库舰" + sp_arsenal_ship_desc: "随着对导弹在未来可以改变战争模式的认可，支持者们的目光转向了携带数百枚导弹的武库舰。" + sp_battlecarrier_unique_reward_a: "对航空战列舰角色的争议" + sp_battlecarrier_unique_reward_a_desc: "在航空战列舰的设计迭代过程中，一个问题油然而生。我们应该注重于提升单舰的性能还是试图将其纳入到舰队的作战指挥体系中？" + sp_battlecarrier_perference_a: "注重性能" + sp_battlecarrier_perference_b: "注重协同" + sp_subcarrier_unique_reward_a: "工程经验的应用" + sp_subcarrier_unique_reward_a_desc: "在潜水航母的设计过程中，一个问题油然而生。我们应该将工程中获得的经验用于加强巡洋潜艇还是所有的潜艇？" + sp_subcarrier_perference_a: "巡洋潜艇" + sp_subcarrier_perference_b: "所有潜艇" + sp_nuclear_torpedo_unique_reward_a: "核鱼雷项目的重心" + sp_nuclear_torpedo_unique_reward_a_desc: "在潜艇上储存核战斗部的安全性仍然有待商榷。" + sp_nuclear_torpedo_preference_a: "安全第一" + sp_nuclear_torpedo_preference_b: "扩大储备" + sp_super_heavy_guns_unique_reward_a: "对20英寸主炮的追求" + sp_super_heavy_guns_unique_reward_a_desc: "在超重型舰炮的设计选型中，研发团队提出了一个建造更大口径舰炮的疯狂计划。如果我们选择在这方面寻求突破，那势必会影响目前的设计进程。" + sp_super_heavy_guns_preference_a: "同意" + sp_super_heavy_guns_preference_b: "算了" \ No newline at end of file