diff --git a/src/common/ai_equipment/vnr_carriers.txt b/src/common/ai_equipment/vnr_carriers.txt index ea9b5d5..96b9405 100755 --- a/src/common/ai_equipment/vnr_carriers.txt +++ b/src/common/ai_equipment/vnr_carriers.txt @@ -309,7 +309,7 @@ naval_carrier = { fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } } fixed_ship_radar_slot = ship_radar fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island + fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck fixed_ship_flight_deck_slot = carrier_armor_deck front_1_custom_slot = ship_deck_space front_2_custom_slot = carrier_angled_deck @@ -342,7 +342,7 @@ naval_carrier = { fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } } fixed_ship_radar_slot = ship_radar fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island + fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck fixed_ship_flight_deck_slot = carrier_armor_deck front_1_custom_slot = carrier_angled_deck front_2_custom_slot = carrier_side_lift @@ -375,7 +375,7 @@ naval_carrier = { fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } } fixed_ship_radar_slot = ship_radar fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island + fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck fixed_ship_flight_deck_slot = carrier_armor_deck front_1_custom_slot = carrier_angled_deck front_2_custom_slot = carrier_side_lift diff --git a/src/common/ai_equipment/vnr_carriers_light.txt b/src/common/ai_equipment/vnr_carriers_light.txt index d17719c..153e2e3 100755 --- a/src/common/ai_equipment/vnr_carriers_light.txt +++ b/src/common/ai_equipment/vnr_carriers_light.txt @@ -140,7 +140,6 @@ naval_light_carrier = { fixed_ship_anti_air_slot = empty fixed_ship_radar_slot = ship_radar fixed_ship_engine_slot = { upgrade = current any_of = { civilian_ship_engine_2 civilian_ship_engine_1 } } - fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad } } } diff --git a/src/common/decisions/MTG_naval_treaty.txt b/src/common/decisions/MTG_naval_treaty.txt index aa210aa..514e827 100755 --- a/src/common/decisions/MTG_naval_treaty.txt +++ b/src/common/decisions/MTG_naval_treaty.txt @@ -209,10 +209,9 @@ MTG_naval_treaties = { available = { - + threat > 0.1 } - cost = 50 fire_only_once = yes ai_will_do = { factor = 3 @@ -696,7 +695,7 @@ MTG_naval_treaties = { icon = generic_naval available = { - + always = no } days_mission_timeout = 86 @@ -709,114 +708,74 @@ MTG_naval_treaties = { visible = { has_naval_treaty_trigger = yes } - selectable_mission = yes timeout_effect = { - every_country = { - limit = { has_naval_treaty_trigger = yes } - activate_mission = MTG_escalator_clause_invocation_mission - } - activate_mission = MTG_treaty_rejoin_mission - clr_global_flag = MTG_second_london_conference - modify_global_flag = { flag = MTG_naval_treaty_violator value = 1 } - } - complete_effect = { - FROM = { - if = { - limit = { has_idea = MTG_naval_treaty_adherent } - swap_ideas = { - remove_idea = MTG_naval_treaty_adherent - add_idea = MTG_naval_treaty_adherent_1936 - } - } - else = { - swap_ideas = { - remove_idea = MTG_naval_treaty_cheating - add_idea = MTG_naval_treaty_adherent_1936 - } - } - - if = { - limit = { - OR = { - has_government = fascism - has_government = communism - } - } - custom_effect_tooltip = fascism_renew_naval_treaty_tt - add_political_power = -100 - } - else = { - custom_effect_tooltip = democracy_renew_naval_treaty_tt - add_political_power = 10 - } - set_country_flag = MTG_second_london_treaty_signed - } + custom_effect_tooltip = MTG_treaty_renew_mission_tt if = { limit = { - all_other_country = { - NOT = { has_idea = MTG_naval_treaty_adherent } - } + has_global_flag = { flag = MTG_naval_treaty_violator value > 0 } } - clr_global_flag = MTG_second_london_conference + custom_effect_tooltip = MTG_treaty_renew_mission_tt_a + activate_mission = MTG_escalator_clause_invocation_mission } + if = { + limit = { + NOT = { has_country_flag = MTG_second_london_treaty_signed } + } + custom_effect_tooltip = MTG_treaty_renew_mission_tt_b + unlock_decision_tooltip = { decision = MTG_treaty_rejoin_mission } + } + + clr_global_flag = MTG_second_london_conference } - - ai_will_do = { - base = 100 - modifier = { - OR = { - has_government = fascism - has_government = communism - } - factor = 0 - } - } } MTG_treaty_rejoin_mission = { icon = generic_naval - - allowed = { - always = no - } - available = { - - } - days_mission_timeout = 365 - - activation = { - has_naval_treaty_trigger = yes - } - visible = { has_naval_treaty_trigger = yes + NOT = { + has_global_flag = MTG_second_london_conference + has_country_flag = MTG_second_london_treaty_signed + } + has_active_mission = MTG_escalator_clause_invocation_mission } - selectable_mission = yes - timeout_effect = { - add_threat = 5 + cancel_trigger = { + NOT = { has_active_mission = MTG_escalator_clause_invocation_mission } } + fire_only_once = yes + complete_effect = { - FROM = { - swap_ideas = { - remove_idea = MTG_naval_treaty_adherent - add_idea = MTG_naval_treaty_adherent_1936 - } - if = { - limit = { - OR = { - has_government = fascism - has_government = communism - } + if = { + limit = { has_idea = MTG_naval_treaty_adherent } + swap_ideas = { + remove_idea = MTG_naval_treaty_adherent + add_idea = MTG_naval_treaty_adherent_1936 + } + } + else = { + swap_ideas = { + remove_idea = MTG_naval_treaty_cheating + add_idea = MTG_naval_treaty_adherent_1936 + } + } + + if = { + limit = { + OR = { + has_government = fascism + has_government = communism } - custom_effect_tooltip = fascism_renew_naval_treaty_tt - add_political_power = -100 } - else = { - custom_effect_tooltip = democracy_renew_naval_treaty_tt - add_political_power = 10 - } - set_country_flag = MTG_second_london_treaty_signed - } + custom_effect_tooltip = fascism_renew_naval_treaty_tt + add_political_power = -100 + } + else = { + custom_effect_tooltip = democracy_renew_naval_treaty_tt + add_political_power = 10 + } + set_country_flag = MTG_second_london_treaty_signed + + modify_global_flag = { flag = MTG_naval_treaty_violator value = -1 } } ai_will_do = { diff --git a/src/common/decisions/naval_develop.txt b/src/common/decisions/naval_develop.txt index 77d8b9b..efe5fbb 100755 --- a/src/common/decisions/naval_develop.txt +++ b/src/common/decisions/naval_develop.txt @@ -464,15 +464,17 @@ naval_develop_category = { super_heavy_carrier_conversion = { icon = GFX_decision_generic_construction visible = { - has_tech = improved_ship_hull_carrier + has_tech = basic_ship_hull_carrier has_tech = ship_hull_super_heavy num_of_naval_factories > 12 + NOT = { has_tech = converted_super_heavy_carrier } } available = { has_navy_size = { unit = SH_battleship size > 0 } + has_tech = improved_ship_hull_carrier } fire_only_once = yes days_remove = 90 diff --git a/src/common/decisions/stronger_ai.txt b/src/common/decisions/stronger_ai.txt index ab7ffd8..11c75ea 100755 --- a/src/common/decisions/stronger_ai.txt +++ b/src/common/decisions/stronger_ai.txt @@ -11,4 +11,73 @@ navy_rework_category = { FROM = { country_event = vnr_ai.1 } } } + + shipyard_boost_for_new_tag_player = { + available = { + always = no + } + days_mission_timeout = 1 + activation = { + date > 1936.1.2 + is_ai = no + OR = { + AND = { + has_game_rule = { rule = shipyard_output_boost_player option = BUFF_60 } + NOT = { has_idea = vnr_shipyard_output_boost } + } + AND = { + has_game_rule = { rule = shipyard_output_boost_player option = BUFF_30 } + NOT = { has_idea = vnr_shipyard_output_boost_half } + } + } + } + timeout_effect = { + if = { + limit = { + has_game_rule = { rule = shipyard_output_boost_player option = BUFF_60 } + } + add_ideas = vnr_shipyard_output_boost + } + else_if = { + limit = { + has_game_rule = { rule = shipyard_output_boost_player option = BUFF_30 } + } + add_ideas = vnr_shipyard_output_boost_half + } + } + } + shipyard_boost_for_new_tag_ai = { + available = { + always = no + } + days_mission_timeout = 1 + activation = { + date > 1936.1.2 + is_ai = yes + OR = { + AND = { + has_game_rule = { rule = shipyard_output_boost_ai option = BUFF_60 } + NOT = { has_idea = vnr_shipyard_output_boost } + } + AND = { + has_game_rule = { rule = shipyard_output_boost_ai option = BUFF_30 } + NOT = { has_idea = vnr_shipyard_output_boost_half } + } + } + } + timeout_effect = { + if = { + limit = { + has_game_rule = { rule = shipyard_output_boost_ai option = BUFF_60 } + } + add_ideas = vnr_shipyard_output_boost + } + else_if = { + limit = { + has_game_rule = { rule = shipyard_output_boost_ai option = BUFF_30 } + } + add_ideas = vnr_shipyard_output_boost_half + } + } + } } \ No newline at end of file diff --git a/src/common/defines/VNR_naval_defines.lua b/src/common/defines/VNR_naval_defines.lua index 7b116ce..47b64b1 100755 --- a/src/common/defines/VNR_naval_defines.lua +++ b/src/common/defines/VNR_naval_defines.lua @@ -33,6 +33,8 @@ NDefines.NNavy.CAPITAL_ONLY_COMBAT_ACTIVATE_TIME = 22; NDefines.NNavy.ALL_SHIPS_ACTIVATE_TIME = 30; NDefines.NNavy.COMBAT_CHASE_RESIGNATION_HOURS = 4; NDefines.NNavy.ANTI_AIR_TARGETING = 0.93; +NDefines.NNavy.MAX_ANTI_AIR_REDUCTION_EFFECT_ON_INCOMING_AIR_DAMAGE = 0.6; +NDefines.NNavy.TRAINING_MAX_DAILY_COUNTRY_EXP = 2; NDefines.NNavy.SUBMARINE_REVEAL_BASE_CHANCE = 14; NDefines.NNavy.SUBMARINE_BASE_TORPEDO_REVEAL_CHANCE = 0.05; NDefines.NNavy.WAR_SCORE_GAIN_FOR_SUNK_SHIP_MANPOWER_FACTOR = 0.01; @@ -147,5 +149,3 @@ NDefines.NIntel.NAVY_SHIP_TYPE_COUNT_INTEL_MIN = 0.01; NDefines.NIntel.NAVY_SHIP_TYPE_COUNT_INTEL_MAX = 0.3; NDefines.NIntel.NAVY_MIN_INTEL_TO_SHOW_SHIP_CLASSES = 0.15; NDefines.NIntel.NAVY_MIN_INTEL_TO_SHOW_SHIP_DESIGN_DETAILS = 0.5; - -NDefines.NGame.DECISION_ALERT_TIMEOUT_DAYS = 60; \ No newline at end of file diff --git a/src/common/ideas/vnr_navy_spirits.txt b/src/common/ideas/vnr_navy_spirits.txt index b078b73..3667862 100755 --- a/src/common/ideas/vnr_navy_spirits.txt +++ b/src/common/ideas/vnr_navy_spirits.txt @@ -114,8 +114,14 @@ ideas = { } advanced_supply_fleet = { ledger = navy + available = { + has_navy_size = { + archetype = ship_hull_civilian + size > 30 + } + } modifier = { - naval_attrition = -0.15 + navy_fuel_consumption_factor = -0.15 navy_max_range_factor = 0.1 floating_harbor_supply = 0.4 floating_harbor_range = 0.4 diff --git a/src/common/scripted_effects/_add_naval_variants.txt b/src/common/scripted_effects/_add_naval_variants.txt index 4b8a19b..728ea63 100755 --- a/src/common/scripted_effects/_add_naval_variants.txt +++ b/src/common/scripted_effects/_add_naval_variants.txt @@ -2556,6 +2556,7 @@ ITA_start_naval_variants = { fixed_ship_armor_slot = ship_armor_cruiser_2 fixed_ship_secondaries_slot = ship_secondaries_2 fixed_ship_role_slot = ship_hull_cruiser_role_ca + fixed_ship_extra_secondaries_slot = ship_armor_extra front_1_custom_slot = ship_medium_battery_2_double mid_1_custom_slot = empty mid_2_custom_slot = ship_anti_air_1 diff --git a/src/common/scripted_effects/_add_starting_tech.txt b/src/common/scripted_effects/_add_starting_tech.txt index 5983a5e..e9439e1 100755 --- a/src/common/scripted_effects/_add_starting_tech.txt +++ b/src/common/scripted_effects/_add_starting_tech.txt @@ -255,7 +255,7 @@ add_starting_techs = { basic_ballast_tank = 1 cruiser_submarines = 1 improved_ship_torpedo_launcher = 1 - + ita_extra_armor = 1 popup = no } diff --git a/src/common/scripted_effects/_delete_starting_naval.txt b/src/common/scripted_effects/_delete_starting_naval.txt index 1dbfcbf..4438ad9 100755 --- a/src/common/scripted_effects/_delete_starting_naval.txt +++ b/src/common/scripted_effects/_delete_starting_naval.txt @@ -14,13 +14,11 @@ special_project_workaround = { USA = { complete_special_project = { project = sp:sp_naval_cruiser_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/scripted_effects/_vnr_naval_treaty.txt b/src/common/scripted_effects/_vnr_naval_treaty.txt index 7593a35..1792bf9 100755 --- a/src/common/scripted_effects/_vnr_naval_treaty.txt +++ b/src/common/scripted_effects/_vnr_naval_treaty.txt @@ -72,4 +72,14 @@ add_starting_navy_spirits = { ENG = { add_ideas = dartmouth_naval_academy } +} + +sign_naval_treaty = { + every_country = { + limit = { has_naval_treaty_trigger = yes } + country_event = { + id = MTG_naval_treaty.12 + days = 60 + } + } } \ 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 66dc3af..97036c7 100755 --- a/src/common/special_projects/projects/naval_projects.txt +++ b/src/common/special_projects/projects/naval_projects.txt @@ -734,6 +734,108 @@ sp_arsenal_ship = { } } + 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_early_informatization_system = { + specialization = specialization_naval + project_tags = { sp_tag_surface_ship } + available = { + FROM = { + has_tech = naval_tactical_data_system + } + } + 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 = { + country_effects = { + custom_effect_tooltip = { + localization_key = SP_UNLOCK_TECH + TECH = phased_array_radar + } + custom_override_tooltip = { + tooltip = tech_effect|phased_array_radar + set_technology = { + phased_array_radar = 1 + popup = no + } + } + custom_effect_tooltip = { + localization_key = SP_UNLOCK_TECH + TECH = integrated_combat_system + } + custom_override_tooltip = { + tooltip = tech_effect|integrated_combat_system + set_technology = { + integrated_combat_system = 1 + popup = no + } + } + } + } + + unique_prototype_rewards = { + sp_early_informatization_system_unique_reward_a = { + fire_only_once = yes + threshold = { + min = 25 + max = 75 + } + weight = { base = 100 } + option = { + token = sp_early_informatization_system_perference_a + iteration_output = { + country_effects = { + add_tech_bonus = { + bonus = 0.5 + uses = 1 + technology = tactical_data_link + } + } + } + } + option = { + token = sp_early_informatization_system_perference_b + iteration_output = { + country_effects = { + add_tech_bonus = { + bonus = 1 + uses = 1 + technology = tactical_data_link + } + sp:sp_early_informatization_system = { add_project_progress_ratio = -0.25 } + } + } + } + } + } + generic_prototype_rewards = { sp_naval_generic_reward_scientist_xp_1 sp_naval_generic_reward_scientist_xp_2 diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt index 478fe19..6fd80f6 100755 --- a/src/common/technologies/MTG_naval.txt +++ b/src/common/technologies/MTG_naval.txt @@ -907,6 +907,7 @@ technologies = { dd_tech mio_cat_tech_all_screen_ship_and_modules mio_cat_tech_all_capital_ship_and_modules + rocketry } } @@ -1370,6 +1371,12 @@ technologies = { } phased_array_radar = { + is_special_project_tech = yes + allow = { + ROOT = { + is_special_project_completed = sp:sp_early_informatization_system + } + } enable_equipment_modules = { ship_radar_5 } @@ -1392,6 +1399,7 @@ technologies = { cl_tech ca_tech mio_cat_tech_all_cruiser_and_modules + electronics } } new_ship_materials = { @@ -1510,6 +1518,7 @@ technologies = { cl_tech ca_tech mio_cat_tech_all_cruiser_and_modules + electronics } } advanced_radar_finder = { @@ -1536,6 +1545,8 @@ technologies = { cl_tech ca_tech mio_cat_tech_all_cruiser_and_modules + electronics + radar_tech } } nuclear_engine_research = { @@ -1603,6 +1614,7 @@ technologies = { special_project_specialization = { specialization_naval } categories = { naval_equipment + nuclear bb_tech bc_tech ship_modules_tech @@ -2144,6 +2156,8 @@ technologies = { } enable_equipment_modules = { ship_helipad + carrier_helipad_asw + carrier_helipad_aew } folder = { @@ -3475,6 +3489,8 @@ technologies = { bb_tech bc_tech mio_cat_tech_all_capital_ship_and_modules + electronics + radar_tech } } @@ -3535,6 +3551,7 @@ technologies = { bc_tech ship_modules_tech mio_cat_tech_all_capital_ship_and_modules + electronics } } @@ -3585,6 +3602,8 @@ technologies = { bc_tech ship_modules_tech mio_cat_tech_all_capital_ship_and_modules + electronics + computing_tech } } @@ -3612,6 +3631,8 @@ technologies = { special_project_specialization = { specialization_naval } categories = { naval_equipment + electronics + computing_tech } } @@ -3641,9 +3662,17 @@ technologies = { bc_tech ship_modules_tech mio_cat_tech_all_capital_ship_and_modules + electronics + computing_tech } } integrated_combat_system = { + is_special_project_tech = yes + allow = { + ROOT = { + is_special_project_completed = sp:sp_early_informatization_system + } + } research_cost = 1.5 enable_equipment_modules = { ship_fire_control_system_5 @@ -3654,9 +3683,6 @@ technologies = { name = mtgnavalfolder position = { x = -1 y = @1952 } } - dependencies = { - phased_array_radar = 1 - } path = { leads_to_tech = tactical_data_link research_cost_coeff = 1 @@ -3673,6 +3699,8 @@ technologies = { bc_tech ship_modules_tech mio_cat_tech_all_capital_ship_and_modules + electronics + computing_tech } } tactical_data_link = { @@ -3702,6 +3730,8 @@ technologies = { bc_tech ship_modules_tech mio_cat_tech_all_capital_ship_and_modules + electronics + computing_tech } } tactical_data_link_for_member = { @@ -3740,6 +3770,8 @@ technologies = { bb_tech bc_tech mio_cat_tech_all_capital_ship_and_modules + electronics + computing_tech } } recon_drones = { @@ -4610,6 +4642,8 @@ technologies = { naval_equipment cv_tech mio_cat_tech_all_carrier_and_modules + electronics + radar_tech } } airborne_early_warning = { @@ -4634,6 +4668,8 @@ technologies = { naval_equipment cv_tech mio_cat_tech_all_carrier_and_modules + electronics + radar_tech } } iff_device = { @@ -4656,6 +4692,7 @@ technologies = { naval_equipment cv_tech mio_cat_tech_all_carrier_and_modules + electronics } } optical_landing_system = { @@ -4707,6 +4744,8 @@ technologies = { naval_equipment cv_tech mio_cat_tech_all_carrier_and_modules + electronics + radar_tech } } @@ -5537,6 +5576,7 @@ technologies = { naval_equipment ss_tech mio_cat_tech_all_submarine_and_modules + rocketry } } rescue_submarine = { @@ -5702,6 +5742,7 @@ technologies = { converted_super_heavy_carrier = { enable_equipment_modules = { carrier_shbb_conversion + ship_deck_space_converted } research_cost = 1 @@ -5858,6 +5899,8 @@ technologies = { special_project_specialization = { specialization_naval } categories = { naval_equipment + electronics + radar_tech } } diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt index f151213..b2baac8 100755 --- a/src/common/technologies/MTG_naval_Support.txt +++ b/src/common/technologies/MTG_naval_Support.txt @@ -1318,9 +1318,9 @@ technologies = { categories = { naval_equipment ship_modules_tech - cat_ship_medium_battery mio_cat_tech_all_cruiser_and_modules mio_cat_tech_all_capital_ship_and_modules + rocketry } } diff --git a/src/common/technologies/Speical_modules.txt b/src/common/technologies/Speical_modules.txt index 2e233fd..d123492 100755 --- a/src/common/technologies/Speical_modules.txt +++ b/src/common/technologies/Speical_modules.txt @@ -47,4 +47,16 @@ technologies = { fra_11in_1931_quad } } + + ita_extra_armor = { + research_cost = 1 + start_year = 1936 + + allow = { + always = no + } + enable_equipment_modules = { + ship_armor_extra + } + } } \ No newline at end of file diff --git a/src/common/units/equipment/modules/00_ship_modules_aviation.txt b/src/common/units/equipment/modules/00_ship_modules_aviation.txt index d02db7a..1d4dae5 100755 --- a/src/common/units/equipment/modules/00_ship_modules_aviation.txt +++ b/src/common/units/equipment/modules/00_ship_modules_aviation.txt @@ -161,6 +161,61 @@ equipment_modules = { } dismantle_cost_ic = 1600 } + ship_deck_space_converted = { + category = ship_deck_space_converted + gui_category = ship_deck_space + gfx = ship_deck_space + + add_equipment_type = capital_ship + add_stats = { + carrier_size = 2 + build_cost_ic = 2000 + surface_detection = 4 + supply_consumption = 0.015 + } + manpower = 200 #outside the add_stats section for code reasons + multiply_stats = { + naval_speed = -0.05 + anti_air_attack = 0.025 + fuel_consumption = 0.075 + } + dismantle_cost_ic = 600 + can_convert_from = { + module_category = ship_deck_space + convert_cost_ic = 1000 + } + } + +########################## +## CARRIER HELICOPTER ## +########################## + carrier_helipad_asw = { + category = carrier_helipad + add_stats = { + surface_detection = 0.5 + sub_detection = 6 + sub_attack = 6 + build_cost_ic = 350 + } + multiply_stats = { + naval_speed = -0.005 + } + dismantle_cost_ic = 100 + } + carrier_helipad_aew = { + category = carrier_helipad + add_stats = { + surface_detection = 7 + sub_detection = 1 + sub_attack = 0.5 + build_cost_ic = 350 + } + multiply_stats = { + anti_air_attack = 0.05 + naval_speed = -0.005 + } + dismantle_cost_ic = 100 + } ################### 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 649b4cc..756c84b 100755 --- a/src/common/units/equipment/modules/00_ship_modules_propulsion.txt +++ b/src/common/units/equipment/modules/00_ship_modules_propulsion.txt @@ -374,7 +374,7 @@ equipment_modules = { add_stats = { #naval_speed = 5 fuel_consumption = 15 - build_cost_ic = 500 + build_cost_ic = 1500 reliability = -0.3 } @@ -395,14 +395,14 @@ equipment_modules = { add_stats = { #naval_speed = 5 - build_cost_ic = 3000 + build_cost_ic = 4000 naval_range = 50000 reliability = -0.3 } multiply_stats = { naval_speed = 0.3 - sub_visibility = -0.3 + sub_visibility = -0.2 max_strength = -0.1 fuel_consumption = -1 } diff --git a/src/common/units/equipment/modules/00_ship_modules_role.txt b/src/common/units/equipment/modules/00_ship_modules_role.txt index 1a13504..82bb5fc 100755 --- a/src/common/units/equipment/modules/00_ship_modules_role.txt +++ b/src/common/units/equipment/modules/00_ship_modules_role.txt @@ -337,6 +337,7 @@ equipment_modules = { dismantle_cost_ic = 100000 forbid_module_categories = { ship_super_heavy_armor + ship_deck_space_converted } } carrier_bc_conversion = { @@ -351,16 +352,16 @@ equipment_modules = { dismantle_cost_ic = 100000 forbid_module_categories = { ship_super_heavy_armor + ship_deck_space_converted } } carrier_shbb_conversion = { category = bb_carrier_role add_stats = { - carrier_size = 2 reliability = 0.1 } multiply_stats = { - build_cost_ic = 0.5 + build_cost_ic = 0.35 max_strength = 0.1 } dismantle_cost_ic = 100000 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 0318cd7..330c7ac 100755 --- a/src/common/units/equipment/modules/00_ship_modules_support.txt +++ b/src/common/units/equipment/modules/00_ship_modules_support.txt @@ -1280,4 +1280,18 @@ equipment_modules = { naval_speed = -0.01 } } + ship_armor_extra = { + category = heavy_miscellaneous + gfx = ship_cruiser_armor + + multiply_stats = { + build_cost_ic = 0.025 + naval_speed = -0.02 + } + dismantle_cost_ic = 1000 + + add_stats = { + armor_value = 3 + } + } } \ 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 207c186..dd52ab2 100755 --- a/src/common/units/equipment/ship_hull_carrier.txt +++ b/src/common/units/equipment/ship_hull_carrier.txt @@ -233,6 +233,12 @@ equipments = { ship_deck_space_small } } + rear_1_custom_slot = { + required = no + allowed_module_categories = { + ship_deck_space_converted + } + } } default_modules = { @@ -435,6 +441,7 @@ equipments = { ship_anti_air ship_deck_space ship_deck_space_small + carrier_helipad } } front_2_custom_slot = { @@ -455,6 +462,7 @@ equipments = { steam_catapult carrier_side_lift carrier_angled_deck + carrier_helipad } } mid_2_custom_slot = { @@ -467,6 +475,7 @@ equipments = { steam_catapult carrier_side_lift carrier_angled_deck + carrier_helipad } } rear_1_custom_slot = { @@ -654,6 +663,7 @@ equipments = { steam_catapult carrier_side_lift carrier_angled_deck + carrier_helipad } } front_2_custom_slot = front_1_custom_slot @@ -667,6 +677,7 @@ equipments = { steam_catapult carrier_side_lift carrier_angled_deck + carrier_helipad } } mid_2_custom_slot = mid_1_custom_slot @@ -678,8 +689,10 @@ equipments = { ship_anti_air ship_missile_aa carrier_side_lift + carrier_helipad } } + rear_2_custom_slot = rear_1_custom_slot } default_modules = { fixed_ship_engine_slot = carrier_ship_engine_4 @@ -755,6 +768,7 @@ equipments = { steam_catapult carrier_side_lift carrier_angled_deck + carrier_helipad } } mid_1_custom_slot = { @@ -767,6 +781,7 @@ equipments = { steam_catapult carrier_side_lift carrier_angled_deck + carrier_helipad } } rear_1_custom_slot = { @@ -776,8 +791,11 @@ equipments = { ship_missile_aa ship_secondaries ship_dp_secondaries_bb + carrier_side_lift + carrier_helipad } } + rear_2_custom_slot = rear_1_custom_slot } default_modules = { fixed_ship_engine_slot = carrier_ship_engine_4 diff --git a/src/common/units/equipment/ship_hull_civilian.txt b/src/common/units/equipment/ship_hull_civilian.txt index 9cb2c5e..39d36b4 100755 --- a/src/common/units/equipment/ship_hull_civilian.txt +++ b/src/common/units/equipment/ship_hull_civilian.txt @@ -143,6 +143,9 @@ equipments = { reliability = 0.70 build_cost_ic = 1000 manpower = 600 + resources = { + steel = 2 + } } vnr_ship_hull_civilian_3 = { @@ -171,5 +174,8 @@ equipments = { build_cost_ic = 1000 manpower = 800 naval_range = 10000 + resources = { + steel = 2 + } } } \ No newline at end of file diff --git a/src/common/units/equipment/ship_hull_cruiser.txt b/src/common/units/equipment/ship_hull_cruiser.txt index 75ecee5..4f3b3ea 100755 --- a/src/common/units/equipment/ship_hull_cruiser.txt +++ b/src/common/units/equipment/ship_hull_cruiser.txt @@ -181,6 +181,10 @@ equipments = { module = ship_aa_fire_control count < 2 } + module_count_limit = { + module = ship_radar_jammer + count < 2 + } default_modules = { fixed_ship_battery_slot = empty @@ -430,7 +434,8 @@ equipments = { reliability = 0.7 armor_value = 10 resources = { - steel = 3 + steel = 2 + chromium = 1 } module_slots = { fixed_ship_battery_slot = { @@ -744,7 +749,7 @@ equipments = { naval_range = 3000 max_strength = 75 resources = { - steel = 2 + steel = 3 } module_slots = inherit @@ -769,7 +774,7 @@ equipments = { naval_range = 4000 manpower = 1400 resources = { - steel = 3 + steel = 4 } module_slots = inherit @@ -794,7 +799,8 @@ equipments = { naval_range = 4500 max_strength = 90 resources = { - steel = 3 + steel = 4 + chromium = 1 } module_slots = { fixed_ship_battery_slot = inherit @@ -909,7 +915,8 @@ equipments = { naval_range = 5000 max_strength = 100 resources = { - steel = 3 + steel = 4 + chromium = 1 } module_slots = { fixed_ship_battery_slot = { diff --git a/src/common/units/equipment/ship_hull_heavy.txt b/src/common/units/equipment/ship_hull_heavy.txt index 3293712..41991d5 100755 --- a/src/common/units/equipment/ship_hull_heavy.txt +++ b/src/common/units/equipment/ship_hull_heavy.txt @@ -141,6 +141,10 @@ equipments = { module = ship_aa_fire_control count < 2 } + module_count_limit = { + module = ship_radar_jammer + count < 2 + } default_modules = { fixed_ship_battery_slot = empty @@ -525,6 +529,10 @@ equipments = { fuel_consumption = 67 surface_visibility = 29 build_cost_ic = 3000 + resources = { + steel = 4 + chromium = 1 + } manpower = 2800 } @@ -632,6 +640,10 @@ equipments = { surface_visibility = 27 reliability = 0.95 build_cost_ic = 3300 + resources = { + steel = 5 + chromium = 1 + } manpower = 3800 } @@ -761,7 +773,7 @@ equipments = { surface_visibility = 46 build_cost_ic = 3800 resources = { - steel = 4 + steel = 5 chromium = 1 } manpower = 3500 @@ -860,6 +872,11 @@ equipments = { surface_visibility = 30 reliability = 1.4 build_cost_ic = 3500 + resources = { + steel = 4 + chromium = 2 + aluminium = 1 + } manpower = 4500 diff --git a/src/common/units/equipment/ship_hull_light.txt b/src/common/units/equipment/ship_hull_light.txt index 11d6a35..3a93559 100755 --- a/src/common/units/equipment/ship_hull_light.txt +++ b/src/common/units/equipment/ship_hull_light.txt @@ -149,6 +149,10 @@ equipments = { module = ship_aa_fire_control count < 2 } + module_count_limit = { + module = ship_radar_jammer + count < 2 + } default_modules = { fixed_ship_battery_slot = empty @@ -384,7 +388,7 @@ equipments = { max_strength = 75 build_cost_ic = 650 resources = { - steel = 4 + steel = 3 chromium = 1 } manpower = 500 @@ -522,7 +526,7 @@ equipments = { max_strength = 100 build_cost_ic = 800 resources = { - steel = 4 + steel = 3 chromium = 1 } manpower = 600 diff --git a/src/common/units/equipment/ship_hull_submarine.txt b/src/common/units/equipment/ship_hull_submarine.txt index d50a368..32062fa 100755 --- a/src/common/units/equipment/ship_hull_submarine.txt +++ b/src/common/units/equipment/ship_hull_submarine.txt @@ -50,6 +50,7 @@ equipments = { allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub + ship_extra_fuel_tank } } } @@ -225,7 +226,7 @@ equipments = { ship_sub_snorkel } } - rear_1_custom_slot = front_1_custom_slot + rear_1_custom_slot = inherit } default_modules = { @@ -276,7 +277,7 @@ equipments = { sub_ship_stealth } } - rear_1_custom_slot = front_1_custom_slot + rear_1_custom_slot = inherit } default_modules = { @@ -333,7 +334,7 @@ equipments = { } rear_1_custom_slot = { required = no - allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub sub_rocket } + allowed_module_categories = { ship_torpedo_sub ship_mine_layer_sub sub_rocket ship_extra_fuel_tank } } rear_2_custom_slot = rear_1_custom_slot } diff --git a/src/common/units/names_ships/ENG_ship_names.txt b/src/common/units/names_ships/ENG_ship_names.txt index 75cf33f..58bde52 100755 --- a/src/common/units/names_ships/ENG_ship_names.txt +++ b/src/common/units/names_ships/ENG_ship_names.txt @@ -297,7 +297,7 @@ ENG_BB_HISTORICAL = { fallback_name = "Battleship %s" unique = { - "英王乔治五世" "威尔士亲王" "约克公爵" + "英王乔治五世" "威尔士亲王" "约克公爵" "安森" "豪" # Lion class "狮" "鲁莽" "解放者" "雷神" "前卫" "反抗" diff --git a/src/descriptor.mod b/src/descriptor.mod index a6c71ff..27e6300 100755 --- a/src/descriptor.mod +++ b/src/descriptor.mod @@ -1,4 +1,4 @@ -version="v1.17 - Across Suez" +version="v1.18 - Cape Matapan" tags={ "Military" "Translation" diff --git a/src/events/00_navy_rework.txt b/src/events/00_navy_rework.txt index ca07550..c5c44bc 100755 --- a/src/events/00_navy_rework.txt +++ b/src/events/00_navy_rework.txt @@ -195,6 +195,8 @@ country_event = { add_article_xix = yes add_starting_navy_spirits = yes + + sign_naval_treaty = yes } } diff --git a/src/events/MTG_naval_treaty_events.txt b/src/events/MTG_naval_treaty_events.txt index 8b931c9..26cd921 100755 --- a/src/events/MTG_naval_treaty_events.txt +++ b/src/events/MTG_naval_treaty_events.txt @@ -329,4 +329,72 @@ country_event = { option = { #great name = MTG_naval_treaty.11.a } +} + +country_event = { #notification about 2nd London Naval Conference + id = MTG_naval_treaty.12 + title = MTG_naval_treaty.12.t + desc = MTG_naval_treaty.12.d + picture = GFX_report_event_second_london_treaty + + is_triggered_only = yes + + option = { #yes + name = MTG_naval_treaty.12.a + if = { + limit = { has_idea = MTG_naval_treaty_adherent } + swap_ideas = { + remove_idea = MTG_naval_treaty_adherent + add_idea = MTG_naval_treaty_adherent_1936 + } + } + else = { + swap_ideas = { + remove_idea = MTG_naval_treaty_cheating + add_idea = MTG_naval_treaty_adherent_1936 + } + } + + if = { + limit = { + OR = { + has_government = fascism + has_government = communism + } + } + custom_effect_tooltip = fascism_renew_naval_treaty_tt + add_political_power = -100 + } + else = { + custom_effect_tooltip = democracy_renew_naval_treaty_tt + add_political_power = 10 + } + set_country_flag = MTG_second_london_treaty_signed + + ai_chance = { + factor = 100 + modifier = { + OR = { + has_government = fascism + has_government = communism + } + factor = 0 + } + } + } + option = { #no + name = MTG_naval_treaty.12.b + modify_global_flag = { flag = MTG_naval_treaty_violator value = 1 } + + ai_chance = { + factor = 10 + modifier = { + NOT = { + has_government = fascism + has_government = communism + } + factor = 0 + } + } + } } \ No newline at end of file diff --git a/src/gfx/event_pictures/VNR/second_london_treaty.png b/src/gfx/event_pictures/VNR/second_london_treaty.png new file mode 100755 index 0000000..a4c0024 Binary files /dev/null and b/src/gfx/event_pictures/VNR/second_london_treaty.png differ 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 8a32cc8..766bc6f 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/00_generic_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/00_generic_icons.txt @@ -378,27 +378,55 @@ default = { } vnr_ship_hull_civilian_1 = { pool = { + weight = 5 icons = { GFX_vnr_ship_hull_civilian_1_medium } } + pool = { + icons = { + "gfx/interface/technologies/extra/ENG_auxiliary_ship_Ben_my_Chree.png" + "gfx/interface/technologies/extra/ENG_auxiliary_ship_Empire_Faith.png" + "gfx/interface/technologies/extra/GER_auxiliary_ship_Otto.png" + } + } } vnr_ship_hull_civilian_2 = { pool = { + weight = 5 icons = { GFX_vnr_ship_hull_civilian_1_medium GFX_vnr_ship_hull_civilian_3_medium GFX_vnr_ship_hull_civilian_2_medium } } + pool = { + icons = { + "gfx/interface/technologies/extra/ENG_auxiliary_ship_Ben_my_Chree.png" + "gfx/interface/technologies/extra/ENG_auxiliary_ship_Empire_Faith.png" + "gfx/interface/technologies/extra/GER_auxiliary_ship_Otto.png" + "gfx/interface/technologies/extra/USA_auxiliary_ship_Currituck.png" + "gfx/interface/technologies/extra/USA_auxiliary_ship_Blue_Ridge.png" + } + } } vnr_ship_hull_civilian_3 = { pool = { + weight = 5 icons = { GFX_vnr_ship_hull_civilian_1_medium GFX_vnr_ship_hull_civilian_2_medium GFX_vnr_ship_hull_civilian_3_medium } } + pool = { + icons = { + "gfx/interface/technologies/extra/ENG_auxiliary_ship_Ben_my_Chree.png" + "gfx/interface/technologies/extra/ENG_auxiliary_ship_Empire_Faith.png" + "gfx/interface/technologies/extra/GER_auxiliary_ship_Otto.png" + "gfx/interface/technologies/extra/USA_auxiliary_ship_Currituck.png" + "gfx/interface/technologies/extra/USA_auxiliary_ship_Blue_Ridge.png" + } + } } } \ No newline at end of file diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/01_China_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/01_China_ship_icons.txt index fe096fa..4471172 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/01_China_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/01_China_ship_icons.txt @@ -595,3 +595,105 @@ MAN = { } } + +TIB = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_6_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Zhaohe.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + +} \ No newline at end of file diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt index 30e800e..20b2d6f 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt @@ -3402,3 +3402,614 @@ NZL = { } } + + +MAL = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_light_1_medium + } + } + + } + + vnr_ship_hull_light_2 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_light_2_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_light_1_medium + } + } + + } + + vnr_ship_hull_light_3 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_light_3_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + } + } + + } + + vnr_ship_hull_light_4 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_light_4_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + } + } + + } + + vnr_ship_hull_light_5 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_light_5_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_light_6_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_5_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_cruiser_3 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + } + } + + } + + vnr_ship_hull_cruiser_4 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + } + } + + } + + vnr_ship_hull_cruiser_5 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_cruiser_6_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_cruiser_coastal_defense_ship_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_pre_dreadnought = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_pre_dreadnought_medium + } + } + + } + + vnr_ship_hull_heavy_1 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" + } + } + + } + + vnr_ship_hull_heavy_2 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_heavy_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" + } + } + + } + + vnr_ship_hull_heavy_3 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_heavy_3_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" + } + } + + } + + vnr_ship_hull_heavy_4 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_heavy_4_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" + } + } + + } + + vnr_ship_hull_heavy_5 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_heavy_5_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" + } + } + + } + + vnr_ship_hull_super_heavy_1 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + } + } + + } + + vnr_ship_hull_carrier_conversion_ca = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + } + } + + } + + vnr_ship_hull_carrier_conversion_bb = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + } + } + + } + + vnr_ship_hull_carrier_1 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_carrier_1_medium + } + } + pool = { + icons = { + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + } + } + } + + vnr_ship_hull_carrier_2 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_carrier_2_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" + } + } + + } + + vnr_ship_hull_carrier_3 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_carrier_3_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" + } + } + + } + + vnr_ship_hull_super_carrier = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_super_carrier_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" + } + } + + } + + vnr_ship_hull_escort_carrier = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_escort_carrier_medium + } + } + + } + + vnr_ship_hull_submarine_1 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_submarine_1_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium + } + } + + } + + vnr_ship_hull_submarine_2 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_submarine_2_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium + } + } + + } + + vnr_ship_hull_submarine_3 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_submarine_3_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium + } + } + + } + + vnr_ship_hull_submarine_4 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_submarine_4_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium + } + } + + } + + vnr_ship_hull_submarine_5 = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_submarine_5_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium + } + } + + } + + vnr_ship_hull_cruiser_submarine = { + pool = { + weight = 5 + icons = { + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium + } + } + + pool = { + icons = { + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium + } + } + + } + +} \ No newline at end of file diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt index c58d2c0..614bbdc 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt @@ -172,6 +172,7 @@ JAP = { GFX_JAP_vnr_ship_hull_cruiser_2_medium GFX_JAP_vnr_ship_hull_cruiser_1_capital_medium GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" } @@ -196,6 +197,7 @@ JAP = { GFX_JAP_vnr_ship_hull_cruiser_1_capital_medium GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" @@ -223,6 +225,7 @@ JAP = { GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium GFX_JAP_vnr_ship_hull_cruiser_4_capital_medium + "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" @@ -252,6 +255,7 @@ JAP = { GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium GFX_JAP_vnr_ship_hull_cruiser_4_capital_medium GFX_JAP_vnr_ship_hull_cruiser_5_capital_medium + "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" @@ -952,3 +956,267 @@ SIA = { } } + + +INS = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_light_1_medium + } + } + + } + + vnr_ship_hull_light_2 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_light_2_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_light_1_medium + } + } + + } + + vnr_ship_hull_light_3 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_light_3_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_light_1_medium + GFX_HOL_vnr_ship_hull_light_2_medium + } + } + + } + + vnr_ship_hull_light_4 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_light_4_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_light_1_medium + GFX_HOL_vnr_ship_hull_light_2_medium + GFX_HOL_vnr_ship_hull_light_3_medium + } + } + + } + + vnr_ship_hull_light_5 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_light_5_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_light_1_medium + GFX_HOL_vnr_ship_hull_light_2_medium + GFX_HOL_vnr_ship_hull_light_3_medium + GFX_HOL_vnr_ship_hull_light_4_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_cruiser_1_medium + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_cruiser_1_medium + } + } + + } + + vnr_ship_hull_cruiser_3 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_cruiser_3_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_cruiser_1_medium + GFX_HOL_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_4 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_cruiser_4_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_cruiser_1_medium + GFX_HOL_vnr_ship_hull_cruiser_2_medium + GFX_HOL_vnr_ship_hull_cruiser_3_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_cruiser_coastal_defense_ship_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_cruiser_1_medium + } + } + + } + + vnr_ship_hull_heavy_1 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_heavy_1_medium + } + } + + } + + vnr_ship_hull_heavy_2 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_heavy_2_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_heavy_1_medium + } + } + + } + + vnr_ship_hull_heavy_3 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_heavy_3_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_heavy_1_medium + GFX_HOL_vnr_ship_hull_heavy_2_medium + } + } + + } + + vnr_ship_hull_carrier_conversion_ca = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_carrier_conversion_ca_medium + } + } + + } + + vnr_ship_hull_carrier_1 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_carrier_1_medium + } + } + pool = { + icons = { + GFX_HOL_vnr_ship_hull_carrier_conversion_ca_medium + } + } + } + + vnr_ship_hull_carrier_2 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_carrier_2_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_carrier_conversion_ca_medium + GFX_HOL_vnr_ship_hull_carrier_1_medium + } + } + + } + + vnr_ship_hull_carrier_3 = { + pool = { + weight = 5 + icons = { + GFX_HOL_vnr_ship_hull_carrier_3_medium + } + } + + pool = { + icons = { + GFX_HOL_vnr_ship_hull_carrier_conversion_ca_medium + GFX_HOL_vnr_ship_hull_carrier_1_medium + GFX_HOL_vnr_ship_hull_carrier_2_medium + } + } + + } + +} \ No newline at end of file diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/carrier_helipad_aew.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/carrier_helipad_aew.png new file mode 100755 index 0000000..002ae4d Binary files /dev/null and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/carrier_helipad_aew.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/carrier_helipad_asw.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/carrier_helipad_asw.png new file mode 100755 index 0000000..ebe50ea Binary files /dev/null and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/carrier_helipad_asw.png differ diff --git a/src/gfx/interface/special_project/project_icons/sp_early_informatization_system.png b/src/gfx/interface/special_project/project_icons/sp_early_informatization_system.png new file mode 100755 index 0000000..4d7ba6b Binary files /dev/null and b/src/gfx/interface/special_project/project_icons/sp_early_informatization_system.png differ diff --git a/src/gfx/interface/technologies/extra/ENG_auxiliary_ship_Ben_my_Chree.png b/src/gfx/interface/technologies/extra/ENG_auxiliary_ship_Ben_my_Chree.png new file mode 100755 index 0000000..e0ba2b5 Binary files /dev/null and b/src/gfx/interface/technologies/extra/ENG_auxiliary_ship_Ben_my_Chree.png differ diff --git a/src/gfx/interface/technologies/extra/ENG_auxiliary_ship_Empire_Faith.png b/src/gfx/interface/technologies/extra/ENG_auxiliary_ship_Empire_Faith.png new file mode 100755 index 0000000..102c6b2 Binary files /dev/null and b/src/gfx/interface/technologies/extra/ENG_auxiliary_ship_Empire_Faith.png differ diff --git a/src/gfx/interface/technologies/extra/GER_auxiliary_ship_Otto.png b/src/gfx/interface/technologies/extra/GER_auxiliary_ship_Otto.png new file mode 100755 index 0000000..f601c96 Binary files /dev/null and b/src/gfx/interface/technologies/extra/GER_auxiliary_ship_Otto.png differ diff --git a/src/gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png b/src/gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png new file mode 100755 index 0000000..573036f Binary files /dev/null and b/src/gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png differ diff --git a/src/gfx/interface/technologies/extra/USA_auxiliary_ship_Blue_Ridge.png b/src/gfx/interface/technologies/extra/USA_auxiliary_ship_Blue_Ridge.png new file mode 100755 index 0000000..37fbc00 Binary files /dev/null and b/src/gfx/interface/technologies/extra/USA_auxiliary_ship_Blue_Ridge.png differ diff --git a/src/gfx/interface/technologies/extra/USA_auxiliary_ship_Currituck.png b/src/gfx/interface/technologies/extra/USA_auxiliary_ship_Currituck.png new file mode 100755 index 0000000..9052155 Binary files /dev/null and b/src/gfx/interface/technologies/extra/USA_auxiliary_ship_Currituck.png differ diff --git a/src/gfx/interface/vnr_main_menu_bg.dds b/src/gfx/interface/vnr_main_menu_bg.dds index c6853b4..692937b 100755 Binary files a/src/gfx/interface/vnr_main_menu_bg.dds and b/src/gfx/interface/vnr_main_menu_bg.dds differ diff --git a/src/interface/countryproductionlineview.gui b/src/interface/countryproductionlineview.gui index f3dfc85..b6a6532 100755 --- a/src/interface/countryproductionlineview.gui +++ b/src/interface/countryproductionlineview.gui @@ -4605,7 +4605,7 @@ guiTypes = { spriteType = "GFX_technology_medium" position = { x=205 y=49 } centerposition = yes - scale = 0.9 + scale = 1 alwaystransparent = yes } diff --git a/src/interface/naval_pictures.gfx b/src/interface/naval_pictures.gfx index a533b84..29c2556 100755 --- a/src/interface/naval_pictures.gfx +++ b/src/interface/naval_pictures.gfx @@ -23,6 +23,10 @@ spriteTypes = { name = "GFX_report_event_yamato" texturefile = "gfx/event_pictures/VNR/yamato.png" } + spriteType = { + name = "GFX_report_event_second_london_treaty" + texturefile = "gfx/event_pictures/VNR/second_london_treaty.png" + } spriteType = { name = "GFX_decision_cat_navy_rework" diff --git a/src/interface/naviesview.gui b/src/interface/naviesview.gui index 1678a6b..b21733a 100755 --- a/src/interface/naviesview.gui +++ b/src/interface/naviesview.gui @@ -913,6 +913,48 @@ guiTypes = { pdx_tooltip = "OPEN_TASK_FORCE_COMPOSITION_EDITOR" pdx_tooltip_delayed = "TASK_FORCE_COMPOSITION_EDITOR_DESC" } + + buttonType = { + name = "toggle_btn_split_for_repair_indiv" + position = {x=389 y=43} + spriteType = "GFX_NV_btn_base_partial_toggle" + clicksound = click_default + } + + iconType = { + name = "toggle_btn_split_for_repair_indiv_icon" + position = {x=389 y=43} + spriteType = "GFX_NV_btn_toggle_split_for_repair" + alwaystransparent = yes + } + + buttonType = { + position = {x=419 y=43} + name = "toggle_btn_for_repair_priority_indiv" + spriteType = "GFX_NV_btn_base_partial_toggle" + clicksound = click_default + } + + iconType = { + position = {x=419 y=43} + name = "toggle_btn_repair_priority_indiv_icon" + spriteType = "GFX_NV_btn_repair_priority" + alwaystransparent = yes + } + + buttonType = { + position = {x=449 y=43} + name = "toggle_btn_aggressiveness_indiv" + spriteType = "GFX_NV_btn_base_partial_toggle" + clicksound = click_default + } + + iconType = { + name = "toggle_btn_aggressiveness_indiv_icon" + position = {x=449 y=43} + spriteType = "GFX_NV_btn_aggressiveness_small" + alwaystransparent = yes + } buttonType = { name = "select_btn" @@ -1018,25 +1060,6 @@ guiTypes = { position = { x=350 y=47 } } - iconType = { - name = "split_for_repair_icon" - position = {x=385 y=45} - spriteType = "GFX_NV_icon_split_for_repair" - } - - iconType = { - name = "repair_priority_icon" - position = {x=418 y=45} - spriteType = "GFX_NV_btn_repair_priority" - } - - iconType = { - name = "aggressiveness_icon" - position = {x=447 y=45} - spriteType = "GFX_NV_btn_aggressiveness_small" - frame = 1 - } - # Code toggles visibility on ships_detailed containerWindowType = { name = "ships_detailed" diff --git a/src/interface/z_navy_techtree.gfx b/src/interface/z_navy_techtree.gfx index da441dc..d73e186 100755 --- a/src/interface/z_navy_techtree.gfx +++ b/src/interface/z_navy_techtree.gfx @@ -723,4 +723,8 @@ spriteTypes = { name = "GFX_sp_arsenal_ship" textureFile = "gfx/interface/special_project/project_icons/sp_arsenal_ship.png" } + spriteType = { + name = "GFX_sp_early_informatization_system" + textureFile = "gfx/interface/special_project/project_icons/sp_early_informatization_system.png" + } } diff --git a/src/interface/z_ship_modules.gfx b/src/interface/z_ship_modules.gfx index b3a6b67..ac39267 100755 --- a/src/interface/z_ship_modules.gfx +++ b/src/interface/z_ship_modules.gfx @@ -174,6 +174,10 @@ spriteTypes = { name = "GFX_SMI_sub_airplane_launcher" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/airplane_launcher_icn.dds" } + spriteType = { + name = "GFX_SMI_carrier_helipad" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_helipad.png" + } # topview images spriteType = { @@ -1421,4 +1425,13 @@ spriteTypes = { name = "GFX_SMI_carrier_shbb_conversion" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/carrier_shbb_conversion.png" } + + spriteType = { + name = "GFX_SMI_carrier_helipad_asw" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/carrier_helipad_asw.png" + } + spriteType = { + name = "GFX_SMI_carrier_helipad_aew" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/carrier_helipad_aew.png" + } } diff --git a/src/localisation/english/replace/naval_treaty_l_english.yml b/src/localisation/english/replace/naval_treaty_l_english.yml index 4d83a96..c8cde97 100755 --- a/src/localisation/english/replace/naval_treaty_l_english.yml +++ b/src/localisation/english/replace/naval_treaty_l_english.yml @@ -1,5 +1,5 @@ l_english: - MTG_treaty_renew_mission: "签署《第二次伦敦海军条约》" + MTG_treaty_renew_mission: "第二次伦敦海军裁军会议" MTG_treaty_renew_mission_desc: "第二伦敦海军会议是对过去控制海军军备达成的国际共识的一种延续，从它签署之日到最终过期的1942年，我们将确保海洋上不会再有新的冲突。" MTG_naval_treaty_adherent_1936: "《第二次伦敦海军条约》签署国" MTG_naval_treaty_adherent_1936_desc: "我们已签署《第二次伦敦海军条约》，按照其规定，我方需要对主力舰和潜艇等战斗舰艇的吨位进行限制。另外，伦敦潜艇协约（或称巡洋规范）要求潜艇同样也要遵守水面舰艇攻击商船的国际准则。" @@ -14,4 +14,11 @@ MTG_naval_treaty_adherent: "《伦敦海军条约》签署国" MTG_naval_treaty_adherent_desc: "我们已经签署了《伦敦海军条约》，因此我们主力舰的规模受到了限制。另外，伦敦潜艇协约（或称巡洋规范）要求潜艇同样也要遵守水面舰艇攻击商船的国际准则。" MTG_naval_treaty_adherent_reduced: "援引调整条款" - MTG_naval_treaty_adherent_reduced_desc: "在一些《华盛顿海军条约》的签署国放弃了《伦敦海军条约》后，我们援引了调整条款，放宽了《第二次伦敦海军条约》对我们主力舰规模及装备的限制。" \ No newline at end of file + MTG_naval_treaty_adherent_reduced_desc: "在一些《华盛顿海军条约》的签署国放弃了《伦敦海军条约》后，我们援引了调整条款，放宽了《第二次伦敦海军条约》对我们主力舰规模及装备的限制。" + MTG_treaty_renew_mission_tt: "§G第二次伦敦海军会议正式闭幕。§!\n" + MTG_treaty_renew_mission_tt_a: "§Y若任何一个裁军会议与会国拒绝签署：§!" + MTG_treaty_renew_mission_tt_b: "§Y若我们拒绝签署：§!" + MTG_naval_treaty.12.t: "第二次伦敦海军裁军会议" + MTG_naval_treaty.12.d: "在经历了世界大战的摧残和破坏之后，世界各国的民意都开始倾向于和平，各国政府在经济下行的压力下选择顺应这种关切，并在二十年代开始采取一系列军控措施。基于过去海军裁军协议达成的条款，1935年12月9日举行的第二次伦敦海军裁军会议可以被视为对这一和平努力的延续。尽管如此，伦敦海军条约签约国之间的明争暗斗可称不上“和平”，在各方调和的基础上，以下条款被作为正式的会议最终决议提出，直到1942年过期之前将一直有效地规范各缔约国的造舰计划。\n\n1. 主力舰（包括战列舰和战列巡洋舰）的标准排水量不得超过35000吨，且主炮口径不可超过14英寸（356毫米）。\n\n2. 航空母舰的标准排水量不得超过23000吨，且携带的武器口径不可超过6.1英寸（155mm）\n\n3. 轻型水面舰艇的标准排水量不得超过8000吨。但是在该国认为自身国家安全因其他拥有同类轻型水面舰艇的国家实际建造或计划建造的舰船而受到威胁时，其有权建造或购买最大标准排水量不超过10000吨的轻型水面舰艇。\n\n4. 如任一华盛顿海军军控条约的缔约国未能在该协议生效之日前签署，其余缔约国有权将主力舰携带的武器最大口径提高到16英寸（406毫米）。" + MTG_naval_treaty.12.a: "同意签署。" + MTG_naval_treaty.12.b: "拒绝签署。" \ 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 5580d13..66289ec 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.17 “跨越苏伊士§!\n\n§C重要新增：§!\n\n-新模块：改装重型航母船壳（战列舰，战列巡洋舰，超重战列舰）\n-新立绘：库兹涅佐夫，伏龙芝（1144巡洋舰），查尔斯·亚当斯，基阿特（DDG-1）\n\n§C更新：§!\n\n-移除了任务区域的限制，AI分配区域和任务数量的效率做了限制\n-防空瞄准由1.0降低到0.93\n-船厂产出加成规则现在被拆为两部分对应玩家和AI，增加一个一半加成的选项\n-为中国添加冷战驱逐舰和巡洋舰图标\n-为南斯拉夫添加岸防舰图标\n-海军学说的经验消耗增加15-20点\n-加强空海一体战的海军航空兵分支\n-削弱中途补给科技的加成，但是科研时间更短\n-无舰岛设计模块移动到航母杂项槽\n-平衡导弹在所有船体的安装上限\n-海军大国在开局拥有更多的海军辅助科技\n-增加一个解锁超重改装航母的决议\n-自动科研模式下专家AI会获得更多经验\n\n§C修复：§!\n\n-修复巡洋潜艇默认名称缺失的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.18 “马塔潘角”§!\n\n§C重要新增：§!\n\n-重做第二次伦敦海军会议的机制\n-新模块：反潜直升机，预警直升机\n-新工程：早期信息化系统\n-新立绘：心上人，帝国信仰，奥托·温舍，日进，蓝岭，柯里塔克\n\n§C更新：§!\n\n-增加一个关于海军条约的事件\n-超重改装航母模块现在会解锁一个额外机库，本身不提供载机\n-超重改装航母决议在更早的时间可见\n-超级航母和打击航母新增一个舰尾槽位\n-意大利重巡扎拉新增一个特殊的额外装甲部件\n-普通的潜艇现在可以安装燃料舱\n-电子和火箭相关的科技现在有正确的类型，可以获得对应的加成\n-专家AI会在超级航母上使用强力甲板\n-雷达干扰器在所有船体上限制为1座\n-削弱潜艇核动力引擎的可见度效果\n-AIP引擎价格现在更高\n-一些殖民地会使用宗主国的舰船图标\n-在生产选择界面的图标现在更大更清晰\n-重新平衡所以船体所需的资源\n-防空提供的最大减伤下调到60%\n-每日获取的最大海军经验下调到2\n\n§C修复：§!\n\n-成熟的补给船队精神现在取消损耗相关效果，而是提供燃料消耗减少效果\n-增加一个在游戏过程中根据规则动态为新tag添加船坞产出的功能\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 088917c..914b6e4 100755 --- a/src/localisation/english/replace/ship_modules_l_english.yml +++ b/src/localisation/english/replace/ship_modules_l_english.yml @@ -1075,4 +1075,15 @@ carrier_bc_conversion_desc: "一艘基于战列巡洋舰船体改装的航母。" carrier_shbb_conversion: "由超重型战列舰改装而来" carrier_shbb_conversion_short: "超重型战列舰船体" - carrier_shbb_conversion_desc: "一艘基于超重型战列舰船体改装的航母。" \ No newline at end of file + carrier_shbb_conversion_desc: "一艘基于超重型战列舰船体改装的航母。\n\n§G在舰尾解锁一个额外机库。§!" + carrier_helipad_asw: "反潜直升机" + carrier_helipad_asw_desc: "一队带有反潜武器的直升机。" + carrier_helipad_aew: "预警直升机" + carrier_helipad_aew_desc: "一队带有预警雷达的直升机。" + EQ_MOD_CAT_carrier_helipad_TITLE: "航母舰载直升机" + ship_deck_space_converted: "中型开放式机库" + ship_deck_space_converted_short: "中型开放式机库" + ship_deck_space_converted_desc: "船舱内一块体积中等的开放区域，可以为着舰的飞机进行维护和后勤。为船上增加更多的机库会使得造价飙升。" + EQ_MOD_CAT_ship_deck_space_converted_TITLE: "额外机库" + ship_armor_extra: "额外装甲" + ship_armor_extra_desc: "这艘舰船的装甲被略微加强了。" \ No newline at end of file diff --git a/src/localisation/english/replace/vnr_behemoth_l_english.yml b/src/localisation/english/replace/vnr_behemoth_l_english.yml index 9414c33..f5ddc68 100755 --- a/src/localisation/english/replace/vnr_behemoth_l_english.yml +++ b/src/localisation/english/replace/vnr_behemoth_l_english.yml @@ -111,7 +111,7 @@ RULE_GROUP_NAVY_REWORK: "海军重置" RULE_OPTION_FREE: "允许" RULE_OPTION_BLOCKED: "禁止" - RULE_ALLOW_NEVER_BUILT_FREE_DESC: "将§R允许§!作弊决议，可以获得未被建造的战舰和战争巨兽。" + RULE_ALLOW_NEVER_BUILT_FREE_DESC: "将§G允许§!作弊决议，可以获得未被建造的战舰和战争巨兽。" RULE_ALLOW_NEVER_BUILT_BLOCKED_DESC: "将§R禁止§!作弊决议，不可以获得未被建造的战舰和战争巨兽。\n\n§R多人模式推荐。§!" ship_alicorn: "天角兽号" ship_constitution: "宪法号" 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 2d0dab6..e472fbf 100755 --- a/src/localisation/english/replace/vnr_naval_develop_l_english.yml +++ b/src/localisation/english/replace/vnr_naval_develop_l_english.yml @@ -83,4 +83,10 @@ sp_super_heavy_guns_preference_a: "同意" sp_super_heavy_guns_preference_b: "算了" super_heavy_carrier_conversion: "敲定超重型航母改装方案" - super_heavy_carrier_conversion_desc: "随着至少一艘超重型战列舰加入现役，海军设计团队提出可以尝试将其充足的空间作为新航母的平台。" \ No newline at end of file + super_heavy_carrier_conversion_desc: "随着至少一艘超重型战列舰加入现役，海军设计团队提出可以尝试将其充足的空间作为新航母的平台。" + sp_early_informatization_system: "早期信息化系统" + sp_early_informatization_system_desc: "与过去的海战不同，未来海战的形式已经展现出对事态感知和数据处理的依赖，这一趋势的发展速度远超人类的理解，而信息化就是未来几十年中确保胜利的基石。" + sp_early_informatization_system_unique_reward_a: "信息化努力" + sp_early_informatization_system_unique_reward_a_desc: "在计算机科技领域处于领导地位的研发团队提出了一项旨在扩展信息化系统，以及合并所有海军舰船上电子设备的集成化计算机系统。这是一个有趣的点子，但也会在很大程度上影响目前的项目进度。" + sp_early_informatization_system_perference_a: "慢慢来。" + sp_early_informatization_system_perference_b: "分出一部分预算。" \ No newline at end of file diff --git a/src/localisation/replace/naval_treaty_l_english.yml b/src/localisation/replace/naval_treaty_l_english.yml index 4d83a96..c8cde97 100755 --- a/src/localisation/replace/naval_treaty_l_english.yml +++ b/src/localisation/replace/naval_treaty_l_english.yml @@ -1,5 +1,5 @@ l_english: - MTG_treaty_renew_mission: "签署《第二次伦敦海军条约》" + MTG_treaty_renew_mission: "第二次伦敦海军裁军会议" MTG_treaty_renew_mission_desc: "第二伦敦海军会议是对过去控制海军军备达成的国际共识的一种延续，从它签署之日到最终过期的1942年，我们将确保海洋上不会再有新的冲突。" MTG_naval_treaty_adherent_1936: "《第二次伦敦海军条约》签署国" MTG_naval_treaty_adherent_1936_desc: "我们已签署《第二次伦敦海军条约》，按照其规定，我方需要对主力舰和潜艇等战斗舰艇的吨位进行限制。另外，伦敦潜艇协约（或称巡洋规范）要求潜艇同样也要遵守水面舰艇攻击商船的国际准则。" @@ -14,4 +14,11 @@ MTG_naval_treaty_adherent: "《伦敦海军条约》签署国" MTG_naval_treaty_adherent_desc: "我们已经签署了《伦敦海军条约》，因此我们主力舰的规模受到了限制。另外，伦敦潜艇协约（或称巡洋规范）要求潜艇同样也要遵守水面舰艇攻击商船的国际准则。" MTG_naval_treaty_adherent_reduced: "援引调整条款" - MTG_naval_treaty_adherent_reduced_desc: "在一些《华盛顿海军条约》的签署国放弃了《伦敦海军条约》后，我们援引了调整条款，放宽了《第二次伦敦海军条约》对我们主力舰规模及装备的限制。" \ No newline at end of file + MTG_naval_treaty_adherent_reduced_desc: "在一些《华盛顿海军条约》的签署国放弃了《伦敦海军条约》后，我们援引了调整条款，放宽了《第二次伦敦海军条约》对我们主力舰规模及装备的限制。" + MTG_treaty_renew_mission_tt: "§G第二次伦敦海军会议正式闭幕。§!\n" + MTG_treaty_renew_mission_tt_a: "§Y若任何一个裁军会议与会国拒绝签署：§!" + MTG_treaty_renew_mission_tt_b: "§Y若我们拒绝签署：§!" + MTG_naval_treaty.12.t: "第二次伦敦海军裁军会议" + MTG_naval_treaty.12.d: "在经历了世界大战的摧残和破坏之后，世界各国的民意都开始倾向于和平，各国政府在经济下行的压力下选择顺应这种关切，并在二十年代开始采取一系列军控措施。基于过去海军裁军协议达成的条款，1935年12月9日举行的第二次伦敦海军裁军会议可以被视为对这一和平努力的延续。尽管如此，伦敦海军条约签约国之间的明争暗斗可称不上“和平”，在各方调和的基础上，以下条款被作为正式的会议最终决议提出，直到1942年过期之前将一直有效地规范各缔约国的造舰计划。\n\n1. 主力舰（包括战列舰和战列巡洋舰）的标准排水量不得超过35000吨，且主炮口径不可超过14英寸（356毫米）。\n\n2. 航空母舰的标准排水量不得超过23000吨，且携带的武器口径不可超过6.1英寸（155mm）\n\n3. 轻型水面舰艇的标准排水量不得超过8000吨。但是在该国认为自身国家安全因其他拥有同类轻型水面舰艇的国家实际建造或计划建造的舰船而受到威胁时，其有权建造或购买最大标准排水量不超过10000吨的轻型水面舰艇。\n\n4. 如任一华盛顿海军军控条约的缔约国未能在该协议生效之日前签署，其余缔约国有权将主力舰携带的武器最大口径提高到16英寸（406毫米）。" + MTG_naval_treaty.12.a: "同意签署。" + MTG_naval_treaty.12.b: "拒绝签署。" \ 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 5580d13..66289ec 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.17 “跨越苏伊士§!\n\n§C重要新增：§!\n\n-新模块：改装重型航母船壳（战列舰，战列巡洋舰，超重战列舰）\n-新立绘：库兹涅佐夫，伏龙芝（1144巡洋舰），查尔斯·亚当斯，基阿特（DDG-1）\n\n§C更新：§!\n\n-移除了任务区域的限制，AI分配区域和任务数量的效率做了限制\n-防空瞄准由1.0降低到0.93\n-船厂产出加成规则现在被拆为两部分对应玩家和AI，增加一个一半加成的选项\n-为中国添加冷战驱逐舰和巡洋舰图标\n-为南斯拉夫添加岸防舰图标\n-海军学说的经验消耗增加15-20点\n-加强空海一体战的海军航空兵分支\n-削弱中途补给科技的加成，但是科研时间更短\n-无舰岛设计模块移动到航母杂项槽\n-平衡导弹在所有船体的安装上限\n-海军大国在开局拥有更多的海军辅助科技\n-增加一个解锁超重改装航母的决议\n-自动科研模式下专家AI会获得更多经验\n\n§C修复：§!\n\n-修复巡洋潜艇默认名称缺失的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.18 “马塔潘角”§!\n\n§C重要新增：§!\n\n-重做第二次伦敦海军会议的机制\n-新模块：反潜直升机，预警直升机\n-新工程：早期信息化系统\n-新立绘：心上人，帝国信仰，奥托·温舍，日进，蓝岭，柯里塔克\n\n§C更新：§!\n\n-增加一个关于海军条约的事件\n-超重改装航母模块现在会解锁一个额外机库，本身不提供载机\n-超重改装航母决议在更早的时间可见\n-超级航母和打击航母新增一个舰尾槽位\n-意大利重巡扎拉新增一个特殊的额外装甲部件\n-普通的潜艇现在可以安装燃料舱\n-电子和火箭相关的科技现在有正确的类型，可以获得对应的加成\n-专家AI会在超级航母上使用强力甲板\n-雷达干扰器在所有船体上限制为1座\n-削弱潜艇核动力引擎的可见度效果\n-AIP引擎价格现在更高\n-一些殖民地会使用宗主国的舰船图标\n-在生产选择界面的图标现在更大更清晰\n-重新平衡所以船体所需的资源\n-防空提供的最大减伤下调到60%\n-每日获取的最大海军经验下调到2\n\n§C修复：§!\n\n-成熟的补给船队精神现在取消损耗相关效果，而是提供燃料消耗减少效果\n-增加一个在游戏过程中根据规则动态为新tag添加船坞产出的功能\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 088917c..914b6e4 100755 --- a/src/localisation/replace/ship_modules_l_english.yml +++ b/src/localisation/replace/ship_modules_l_english.yml @@ -1075,4 +1075,15 @@ carrier_bc_conversion_desc: "一艘基于战列巡洋舰船体改装的航母。" carrier_shbb_conversion: "由超重型战列舰改装而来" carrier_shbb_conversion_short: "超重型战列舰船体" - carrier_shbb_conversion_desc: "一艘基于超重型战列舰船体改装的航母。" \ No newline at end of file + carrier_shbb_conversion_desc: "一艘基于超重型战列舰船体改装的航母。\n\n§G在舰尾解锁一个额外机库。§!" + carrier_helipad_asw: "反潜直升机" + carrier_helipad_asw_desc: "一队带有反潜武器的直升机。" + carrier_helipad_aew: "预警直升机" + carrier_helipad_aew_desc: "一队带有预警雷达的直升机。" + EQ_MOD_CAT_carrier_helipad_TITLE: "航母舰载直升机" + ship_deck_space_converted: "中型开放式机库" + ship_deck_space_converted_short: "中型开放式机库" + ship_deck_space_converted_desc: "船舱内一块体积中等的开放区域，可以为着舰的飞机进行维护和后勤。为船上增加更多的机库会使得造价飙升。" + EQ_MOD_CAT_ship_deck_space_converted_TITLE: "额外机库" + ship_armor_extra: "额外装甲" + ship_armor_extra_desc: "这艘舰船的装甲被略微加强了。" \ No newline at end of file diff --git a/src/localisation/replace/vnr_behemoth_l_english.yml b/src/localisation/replace/vnr_behemoth_l_english.yml index 9414c33..f5ddc68 100755 --- a/src/localisation/replace/vnr_behemoth_l_english.yml +++ b/src/localisation/replace/vnr_behemoth_l_english.yml @@ -111,7 +111,7 @@ RULE_GROUP_NAVY_REWORK: "海军重置" RULE_OPTION_FREE: "允许" RULE_OPTION_BLOCKED: "禁止" - RULE_ALLOW_NEVER_BUILT_FREE_DESC: "将§R允许§!作弊决议，可以获得未被建造的战舰和战争巨兽。" + RULE_ALLOW_NEVER_BUILT_FREE_DESC: "将§G允许§!作弊决议，可以获得未被建造的战舰和战争巨兽。" RULE_ALLOW_NEVER_BUILT_BLOCKED_DESC: "将§R禁止§!作弊决议，不可以获得未被建造的战舰和战争巨兽。\n\n§R多人模式推荐。§!" ship_alicorn: "天角兽号" ship_constitution: "宪法号" diff --git a/src/localisation/replace/vnr_naval_develop_l_english.yml b/src/localisation/replace/vnr_naval_develop_l_english.yml index 2d0dab6..e472fbf 100755 --- a/src/localisation/replace/vnr_naval_develop_l_english.yml +++ b/src/localisation/replace/vnr_naval_develop_l_english.yml @@ -83,4 +83,10 @@ sp_super_heavy_guns_preference_a: "同意" sp_super_heavy_guns_preference_b: "算了" super_heavy_carrier_conversion: "敲定超重型航母改装方案" - super_heavy_carrier_conversion_desc: "随着至少一艘超重型战列舰加入现役，海军设计团队提出可以尝试将其充足的空间作为新航母的平台。" \ No newline at end of file + super_heavy_carrier_conversion_desc: "随着至少一艘超重型战列舰加入现役，海军设计团队提出可以尝试将其充足的空间作为新航母的平台。" + sp_early_informatization_system: "早期信息化系统" + sp_early_informatization_system_desc: "与过去的海战不同，未来海战的形式已经展现出对事态感知和数据处理的依赖，这一趋势的发展速度远超人类的理解，而信息化就是未来几十年中确保胜利的基石。" + sp_early_informatization_system_unique_reward_a: "信息化努力" + sp_early_informatization_system_unique_reward_a_desc: "在计算机科技领域处于领导地位的研发团队提出了一项旨在扩展信息化系统，以及合并所有海军舰船上电子设备的集成化计算机系统。这是一个有趣的点子，但也会在很大程度上影响目前的项目进度。" + sp_early_informatization_system_perference_a: "慢慢来。" + sp_early_informatization_system_perference_b: "分出一部分预算。" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/naval_treaty_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/naval_treaty_l_simp_chinese.yml index a182756..e34bb74 100755 --- a/src/localisation/simp_chinese/replace/naval_treaty_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/naval_treaty_l_simp_chinese.yml @@ -1,5 +1,5 @@ l_simp_chinese: - MTG_treaty_renew_mission: "签署《第二次伦敦海军条约》" + MTG_treaty_renew_mission: "第二次伦敦海军裁军会议" MTG_treaty_renew_mission_desc: "第二伦敦海军会议是对过去控制海军军备达成的国际共识的一种延续，从它签署之日到最终过期的1942年，我们将确保海洋上不会再有新的冲突。" MTG_naval_treaty_adherent_1936: "《第二次伦敦海军条约》签署国" MTG_naval_treaty_adherent_1936_desc: "我们已签署《第二次伦敦海军条约》，按照其规定，我方需要对主力舰和潜艇等战斗舰艇的吨位进行限制。另外，伦敦潜艇协约（或称巡洋规范）要求潜艇同样也要遵守水面舰艇攻击商船的国际准则。" @@ -14,4 +14,11 @@ MTG_naval_treaty_adherent: "《伦敦海军条约》签署国" MTG_naval_treaty_adherent_desc: "我们已经签署了《伦敦海军条约》，因此我们主力舰的规模受到了限制。另外，伦敦潜艇协约（或称巡洋规范）要求潜艇同样也要遵守水面舰艇攻击商船的国际准则。" MTG_naval_treaty_adherent_reduced: "援引调整条款" - MTG_naval_treaty_adherent_reduced_desc: "在一些《华盛顿海军条约》的签署国放弃了《伦敦海军条约》后，我们援引了调整条款，放宽了《第二次伦敦海军条约》对我们主力舰规模及装备的限制。" \ No newline at end of file + MTG_naval_treaty_adherent_reduced_desc: "在一些《华盛顿海军条约》的签署国放弃了《伦敦海军条约》后，我们援引了调整条款，放宽了《第二次伦敦海军条约》对我们主力舰规模及装备的限制。" + MTG_treaty_renew_mission_tt: "§G第二次伦敦海军会议正式闭幕。§!\n" + MTG_treaty_renew_mission_tt_a: "§Y若任何一个裁军会议与会国拒绝签署：§!" + MTG_treaty_renew_mission_tt_b: "§Y若我们拒绝签署：§!" + MTG_naval_treaty.12.t: "第二次伦敦海军裁军会议" + MTG_naval_treaty.12.d: "在经历了世界大战的摧残和破坏之后，世界各国的民意都开始倾向于和平，各国政府在经济下行的压力下选择顺应这种关切，并在二十年代开始采取一系列军控措施。基于过去海军裁军协议达成的条款，1935年12月9日举行的第二次伦敦海军裁军会议可以被视为对这一和平努力的延续。尽管如此，伦敦海军条约签约国之间的明争暗斗可称不上“和平”，在各方调和的基础上，以下条款被作为正式的会议最终决议提出，直到1942年过期之前将一直有效地规范各缔约国的造舰计划。\n\n1. 主力舰（包括战列舰和战列巡洋舰）的标准排水量不得超过35000吨，且主炮口径不可超过14英寸（356毫米）。\n\n2. 航空母舰的标准排水量不得超过23000吨，且携带的武器口径不可超过6.1英寸（155mm）\n\n3. 轻型水面舰艇的标准排水量不得超过8000吨。但是在该国认为自身国家安全因其他拥有同类轻型水面舰艇的国家实际建造或计划建造的舰船而受到威胁时，其有权建造或购买最大标准排水量不超过10000吨的轻型水面舰艇。\n\n4. 如任一华盛顿海军军控条约的缔约国未能在该协议生效之日前签署，其余缔约国有权将主力舰携带的武器最大口径提高到16英寸（406毫米）。" + MTG_naval_treaty.12.a: "同意签署。" + MTG_naval_treaty.12.b: "拒绝签署。" \ 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 559d71c..941b84f 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.17 “跨越苏伊士§!\n\n§C重要新增：§!\n\n-新模块：改装重型航母船壳（战列舰，战列巡洋舰，超重战列舰）\n-新立绘：库兹涅佐夫，伏龙芝（1144巡洋舰），查尔斯·亚当斯，基阿特（DDG-1）\n\n§C更新：§!\n\n-移除了任务区域的限制，AI分配区域和任务数量的效率做了限制\n-防空瞄准由1.0降低到0.93\n-船厂产出加成规则现在被拆为两部分对应玩家和AI，增加一个一半加成的选项\n-为中国添加冷战驱逐舰和巡洋舰图标\n-为南斯拉夫添加岸防舰图标\n-海军学说的经验消耗增加15-20点\n-加强空海一体战的海军航空兵分支\n-削弱中途补给科技的加成，但是科研时间更短\n-无舰岛设计模块移动到航母杂项槽\n-平衡导弹在所有船体的安装上限\n-海军大国在开局拥有更多的海军辅助科技\n-增加一个解锁超重改装航母的决议\n-自动科研模式下专家AI会获得更多经验\n\n§C修复：§!\n\n-修复巡洋潜艇默认名称缺失的问题\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv1.18 “马塔潘角”§!\n\n§C重要新增：§!\n\n-重做第二次伦敦海军会议的机制\n-新模块：反潜直升机，预警直升机\n-新工程：早期信息化系统\n-新立绘：心上人，帝国信仰，奥托·温舍，日进，蓝岭，柯里塔克\n\n§C更新：§!\n\n-增加一个关于海军条约的事件\n-超重改装航母模块现在会解锁一个额外机库，本身不提供载机\n-超重改装航母决议在更早的时间可见\n-超级航母和打击航母新增一个舰尾槽位\n-意大利重巡扎拉新增一个特殊的额外装甲部件\n-普通的潜艇现在可以安装燃料舱\n-电子和火箭相关的科技现在有正确的类型，可以获得对应的加成\n-专家AI会在超级航母上使用强力甲板\n-雷达干扰器在所有船体上限制为1座\n-削弱潜艇核动力引擎的可见度效果\n-AIP引擎价格现在更高\n-一些殖民地会使用宗主国的舰船图标\n-在生产选择界面的图标现在更大更清晰\n-重新平衡所以船体所需的资源\n-防空提供的最大减伤下调到60%\n-每日获取的最大海军经验下调到2\n\n§C修复：§!\n\n-成熟的补给船队精神现在取消损耗相关效果，而是提供燃料消耗减少效果\n-增加一个在游戏过程中根据规则动态为新tag添加船坞产出的功能\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 44144e0..5890e39 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 @@ -1075,4 +1075,15 @@ carrier_bc_conversion_desc: "一艘基于战列巡洋舰船体改装的航母。" carrier_shbb_conversion: "由超重型战列舰改装而来" carrier_shbb_conversion_short: "超重型战列舰船体" - carrier_shbb_conversion_desc: "一艘基于超重型战列舰船体改装的航母。" \ No newline at end of file + carrier_shbb_conversion_desc: "一艘基于超重型战列舰船体改装的航母。\n\n§G在舰尾解锁一个额外机库。§!" + carrier_helipad_asw: "反潜直升机" + carrier_helipad_asw_desc: "一队带有反潜武器的直升机。" + carrier_helipad_aew: "预警直升机" + carrier_helipad_aew_desc: "一队带有预警雷达的直升机。" + EQ_MOD_CAT_carrier_helipad_TITLE: "航母舰载直升机" + ship_deck_space_converted: "中型开放式机库" + ship_deck_space_converted_short: "中型开放式机库" + ship_deck_space_converted_desc: "船舱内一块体积中等的开放区域，可以为着舰的飞机进行维护和后勤。为船上增加更多的机库会使得造价飙升。" + EQ_MOD_CAT_ship_deck_space_converted_TITLE: "额外机库" + ship_armor_extra: "额外装甲" + ship_armor_extra_desc: "这艘舰船的装甲被略微加强了。" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/vnr_behemoth_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/vnr_behemoth_l_simp_chinese.yml index ab194d1..010a918 100755 --- a/src/localisation/simp_chinese/replace/vnr_behemoth_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/vnr_behemoth_l_simp_chinese.yml @@ -111,7 +111,7 @@ RULE_GROUP_NAVY_REWORK: "海军重置" RULE_OPTION_FREE: "允许" RULE_OPTION_BLOCKED: "禁止" - RULE_ALLOW_NEVER_BUILT_FREE_DESC: "将§R允许§!作弊决议，可以获得未被建造的战舰和战争巨兽。" + RULE_ALLOW_NEVER_BUILT_FREE_DESC: "将§G允许§!作弊决议，可以获得未被建造的战舰和战争巨兽。" RULE_ALLOW_NEVER_BUILT_BLOCKED_DESC: "将§R禁止§!作弊决议，不可以获得未被建造的战舰和战争巨兽。\n\n§R多人模式推荐。§!" ship_alicorn: "天角兽号" ship_constitution: "宪法号" 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 cdb95ae..048c642 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 @@ -83,4 +83,10 @@ sp_super_heavy_guns_preference_a: "同意" sp_super_heavy_guns_preference_b: "算了" super_heavy_carrier_conversion: "敲定超重型航母改装方案" - super_heavy_carrier_conversion_desc: "随着至少一艘超重型战列舰加入现役，海军设计团队提出可以尝试将其充足的空间作为新航母的平台。" \ No newline at end of file + super_heavy_carrier_conversion_desc: "随着至少一艘超重型战列舰加入现役，海军设计团队提出可以尝试将其充足的空间作为新航母的平台。" + sp_early_informatization_system: "早期信息化系统" + sp_early_informatization_system_desc: "与过去的海战不同，未来海战的形式已经展现出对事态感知和数据处理的依赖，这一趋势的发展速度远超人类的理解，而信息化就是未来几十年中确保胜利的基石。" + sp_early_informatization_system_unique_reward_a: "信息化努力" + sp_early_informatization_system_unique_reward_a_desc: "在计算机科技领域处于领导地位的研发团队提出了一项旨在扩展信息化系统，以及合并所有海军舰船上电子设备的集成化计算机系统。这是一个有趣的点子，但也会在很大程度上影响目前的项目进度。" + sp_early_informatization_system_perference_a: "慢慢来。" + sp_early_informatization_system_perference_b: "分出一部分预算。" \ No newline at end of file