diff --git a/src/common/ai_equipment/vnr_battleships.txt b/src/common/ai_equipment/vnr_battleships.txt index b4bc0f4..08f0ff5 100755 --- a/src/common/ai_equipment/vnr_battleships.txt +++ b/src/common/ai_equipment/vnr_battleships.txt @@ -59,22 +59,21 @@ naval_capital_battleship = { type = vnr_ship_hull_heavy_3 modules = { - fixed_ship_battery_slot = ship_heavy_battery + fixed_ship_battery_slot = ship_heavy_battery_triple fixed_ship_anti_air_slot = ship_anti_air fixed_ship_fire_control_system_slot = ship_fire_control_system - fixed_ship_radar_slot = ship_mast + fixed_ship_radar_slot = { any_of = { ship_radar ship_mast } } fixed_ship_engine_slot = { upgrade = current any_of = { heavy_ship_engine_3 heavy_ship_engine_2 heavy_ship_engine_1 } } - fixed_ship_secondaries_slot = ship_secondaries + fixed_ship_secondaries_slot = ship_dp_secondaries_bb fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_bb_2 ship_armor_bb_1 } } fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental_post_jutland ship_scheme_incremental } } fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } } fixed_ship_airplane_launcher_slot = ship_airplane_launcher fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } - front_1_custom_slot = ship_heavy_battery - mid_1_custom_slot = ship_secondaries + front_1_custom_slot = ship_heavy_battery_triple + mid_1_custom_slot = ship_dp_secondaries_bb mid_2_custom_slot = ship_anti_air - rear_1_custom_slot = ship_heavy_battery - rear_2_custom_slot = ship_heavy_battery + rear_1_custom_slot = ship_heavy_battery_triple } } } @@ -96,7 +95,7 @@ naval_capital_battleship = { type = vnr_ship_hull_heavy_4 modules = { - fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + fixed_ship_battery_slot = ship_heavy_battery_triple fixed_ship_anti_air_slot = ship_anti_air fixed_ship_fire_control_system_slot = ship_fire_control_system fixed_ship_radar_slot = ship_radar @@ -107,12 +106,12 @@ naval_capital_battleship = { fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } } fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } } fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } - front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + front_1_custom_slot = ship_heavy_battery_triple mid_1_custom_slot = ship_secondaries mid_2_custom_slot = ship_anti_air mid_3_custom_slot = ship_dp_secondaries_bb - rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } - rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + rear_1_custom_slot = ship_heavy_battery_triple + rear_2_custom_slot = ship_heavy_battery_triple } } } @@ -134,7 +133,7 @@ naval_capital_battleship = { type = vnr_ship_hull_heavy_5 modules = { - fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + fixed_ship_battery_slot = ship_heavy_battery_triple fixed_ship_anti_air_slot = ship_anti_air fixed_ship_fire_control_system_slot = ship_fire_control_system fixed_ship_radar_slot = ship_radar @@ -145,12 +144,12 @@ naval_capital_battleship = { fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } } fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } } fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } - front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + front_1_custom_slot = ship_heavy_battery_triple mid_1_custom_slot = ship_dp_secondaries_bb mid_2_custom_slot = ship_anti_air mid_3_custom_slot = ship_dp_secondaries_bb - rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } - rear_2_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + rear_1_custom_slot = ship_heavy_battery_triple + rear_2_custom_slot = ship_heavy_battery_triple } } } @@ -172,7 +171,7 @@ naval_capital_battleship = { type = vnr_ship_hull_heavy_5 modules = { - fixed_ship_battery_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + fixed_ship_battery_slot = ship_heavy_battery_triple fixed_ship_anti_air_slot = ship_missile_aa fixed_ship_fire_control_system_slot = ship_fire_control_system fixed_ship_radar_slot = ship_radar @@ -183,11 +182,11 @@ naval_capital_battleship = { fixed_ship_armor_scheme_slot = { upgrade = current any_of = { ship_scheme_all_or_nothing_armor_box ship_scheme_all_or_nothing ship_scheme_mixed ship_scheme_incremental } } fixed_ship_torpedo_defense_system_slot = { upgrade = current any_of = { torpedo_belt_enhanced torpedo_belt torpedo_bulge } } fixed_ship_extra_secondaries_slot = { any_of = { heavy_miscellaneous generic_miscellaneous } } - front_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + front_1_custom_slot = ship_heavy_battery_triple mid_1_custom_slot = ship_dp_secondaries_bb mid_2_custom_slot = { upgrade = current any_of = { ship_missile_2 ship_missile_1 } } mid_3_custom_slot = ship_dp_secondaries_bb - rear_1_custom_slot = { any_of = { ship_heavy_battery_triple ship_super_heavy_battery } } + rear_1_custom_slot = ship_heavy_battery_triple rear_2_custom_slot = ship_missile_aa } } @@ -200,7 +199,7 @@ naval_capital_battleship = { priority = { base = 0 modifier = { add = 50 tag = JAP } - modifier = { factor = 0 has_navy_size = { unit = SH_battleship size > 4 } } + modifier = { factor = 0 has_navy_size = { unit = SH_battleship size > 3 } } modifier = { factor = 0 expert_ai_style = yes } } diff --git a/src/common/ai_equipment/vnr_cv_planes.txt b/src/common/ai_equipment/vnr_cv_planes.txt index 908bc72..35ec3a0 100755 --- a/src/common/ai_equipment/vnr_cv_planes.txt +++ b/src/common/ai_equipment/vnr_cv_planes.txt @@ -141,11 +141,7 @@ vnr_cv_cas = { roles = { air_cv_cas } priority = { - factor = 9999 - modifier = { - factor = 0 - has_game_rule = { rule = RULE_AI_AIR_DESIGN option = BLOCKED } - } + factor = 0 } 1936_cv_cas = { diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt index 0eb1fc0..993fff4 100755 --- a/src/common/ai_strategy/naval_production.txt +++ b/src/common/ai_strategy/naval_production.txt @@ -2244,7 +2244,7 @@ we_need_cv_planes_1 = { ai_strategy = { type = unit_ratio id = cv_cas - value = 10 + value = 1 } ai_strategy = { @@ -2256,13 +2256,13 @@ we_need_cv_planes_1 = { ai_strategy = { type = equipment_production_factor id = cv_naval_bomber - value = 20 + value = 50 } ai_strategy = { type = equipment_production_factor id = cv_cas - value = 20 + value = 1 } ai_strategy = { @@ -2309,31 +2309,31 @@ we_need_cv_planes_2 = { ai_strategy = { type = unit_ratio id = cv_naval_bomber - value = 25 + value = 45 } ai_strategy = { type = unit_ratio id = cv_cas - value = 20 + value = 1 } ai_strategy = { type = equipment_production_factor id = cv_fighter - value = 50 + value = 35 } ai_strategy = { type = equipment_production_factor id = cv_naval_bomber - value = 40 + value = 50 } ai_strategy = { type = equipment_production_factor id = cv_cas - value = 40 + value = 1 } ai_strategy = { @@ -2351,7 +2351,7 @@ we_need_cv_planes_2 = { ai_strategy = { type = equipment_production_min_factories id = cv_cas - value = 5 + value = 1 } ai_strategy = { @@ -2373,37 +2373,37 @@ we_need_cv_planes_3 = { ai_strategy = { type = unit_ratio id = cv_fighter - value = 50 + value = 45 } ai_strategy = { type = unit_ratio id = cv_naval_bomber - value = 40 + value = 60 } ai_strategy = { type = unit_ratio id = cv_cas - value = 35 + value = 1 } ai_strategy = { type = equipment_production_factor id = cv_fighter - value = 80 + value = 60 } ai_strategy = { type = equipment_production_factor id = cv_naval_bomber - value = 60 + value = 100 } ai_strategy = { type = equipment_production_factor id = cv_cas - value = 60 + value = 1 } ai_strategy = { @@ -2421,7 +2421,7 @@ we_need_cv_planes_3 = { ai_strategy = { type = equipment_production_min_factories id = cv_cas - value = 8 + value = 1 } ai_strategy = { diff --git a/src/common/ai_strategy/vnr_naval_strategy.txt b/src/common/ai_strategy/vnr_naval_strategy.txt index cc9f246..c0cc1b7 100755 --- a/src/common/ai_strategy/vnr_naval_strategy.txt +++ b/src/common/ai_strategy/vnr_naval_strategy.txt @@ -245,16 +245,36 @@ USA_pacific_war_naval_avoid_first = { id = 77 value = 100 } + ai_strategy = { + type = naval_avoid_region + id = 78 + value = 100 + } ai_strategy = { type = naval_avoid_region id = 79 value = 100 } + ai_strategy = { + type = naval_avoid_region + id = 84 + value = 50 + } ai_strategy = { type = naval_avoid_region id = 90 value = 100 } + ai_strategy = { + type = naval_avoid_region + id = 94 + value = 100 + } + ai_strategy = { + type = naval_avoid_region + id = 97 + value = 100 + } ai_strategy = { type = naval_avoid_region id = 177 diff --git a/src/common/scripted_effects/_add_starting_tech.txt b/src/common/scripted_effects/_add_starting_tech.txt index 839c2e0..1119638 100755 --- a/src/common/scripted_effects/_add_starting_tech.txt +++ b/src/common/scripted_effects/_add_starting_tech.txt @@ -425,6 +425,7 @@ makeup_starting_techs = { mixed_armor_scheme = 1 basic_heavy_armor = 1 krupp_steel = 1 + fuel_oil_boiler = 1 popup = no } } diff --git a/src/common/scripted_guis/00_navy_rework_welcome_splash_gui.txt b/src/common/scripted_guis/00_navy_rework_welcome_splash_gui.txt index 235cedd..1e580d9 100755 --- a/src/common/scripted_guis/00_navy_rework_welcome_splash_gui.txt +++ b/src/common/scripted_guis/00_navy_rework_welcome_splash_gui.txt @@ -10,6 +10,12 @@ scripted_gui = { has_global_flag = navy_rework_splash_show } + properties = { + naval_rework_logo = { + image = "[get_naval_rework_logo]" + } + } + triggers = { tab_1_click_enabled = { NOT = { check_variable = { navy_rework_welcome_splash_variable = 1 } } } diff --git a/src/common/scripted_localisation/vnr_scripted_gfx.txt b/src/common/scripted_localisation/vnr_scripted_gfx.txt new file mode 100755 index 0000000..843ccb4 --- /dev/null +++ b/src/common/scripted_localisation/vnr_scripted_gfx.txt @@ -0,0 +1,9 @@ +defined_text = { + name = get_naval_rework_logo + text = { + random_list = { + 50 = { localization_key = GFX_navy_splash_intro } + 10 = { localization_key = GFX_navy_splash_intro_1 } + } + } +} \ 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 5eff5c4..0f80165 100755 --- a/src/common/special_projects/projects/naval_projects.txt +++ b/src/common/special_projects/projects/naval_projects.txt @@ -472,7 +472,7 @@ sp_naval_underway_replenishment = { iteration_output = { country_effects = { - custom_effect_tooltip = sp_naval_underway_replenishment_pick_a_tt + custom_effect_tooltip = tech_effect|sp_naval_underway_replenishment_pick_a hidden_effect = { set_technology = { sp_naval_underway_replenishment_pick_a = 1 @@ -499,7 +499,7 @@ sp_naval_underway_replenishment = { iteration_output = { country_effects = { - custom_effect_tooltip = sp_naval_underway_replenishment_pick_b_tt + custom_effect_tooltip = tech_effect|sp_naval_underway_replenishment_pick_b hidden_effect = { set_technology = { sp_naval_underway_replenishment_pick_b = 1 diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt index 9e2552c..e68aff3 100755 --- a/src/common/technologies/MTG_naval.txt +++ b/src/common/technologies/MTG_naval.txt @@ -503,6 +503,7 @@ technologies = { enable_equipment_modules = { ship_depth_charge_4 + ship_asw_battery_1 } on_research_complete = { custom_effect_tooltip = depth_charges_advice_tt @@ -3639,7 +3640,7 @@ technologies = { research_cost_coeff = 1 } path = { - leads_to_tech = symmetric_key_algorithm + leads_to_tech = cryptography_revolution research_cost_coeff = 1 } @@ -3659,11 +3660,13 @@ technologies = { } } - symmetric_key_algorithm = { + cryptography_revolution = { research_cost = 0.8 start_year = 1950 - navy_intel_to_others = -20 + army_intel_to_others = -25 + navy_intel_to_others = -25 + airforce_intel_to_others = -25 folder = { name = mtgnavalfolder @@ -4326,7 +4329,10 @@ technologies = { } } on_research_complete = { - add_political_power = -20 + if = { + limit = { NOT = { has_tech = aviation_dawn } } + add_political_power = -20 + } } folder = { @@ -4365,7 +4371,7 @@ technologies = { xp_research_bonus = 1.25 cv_cas = { - naval_strike_attack = 0.3 + naval_strike_attack = 0.2 naval_strike_targetting = 0.15 air_agility = 0.15 maximum_speed = 0.1 diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt index db1dbbc..beaa840 100755 --- a/src/common/technologies/MTG_naval_Support.txt +++ b/src/common/technologies/MTG_naval_Support.txt @@ -1389,6 +1389,8 @@ technologies = { enable_equipment_modules = { dp_light_battery_5 dp_light_battery_5_single + dp_ship_secondaries_5 + dp_ship_secondaries_5_bb } folder = { diff --git a/src/common/units/battlecruiser.txt b/src/common/units/battlecruiser.txt index d22b551..918a53b 100755 --- a/src/common/units/battlecruiser.txt +++ b/src/common/units/battlecruiser.txt @@ -17,7 +17,7 @@ sub_units = { max_organisation = 50 - supply_consumption = 0.4 + supply_consumption = 0.33 critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire } critical_part_damage_chance_mult = 1.25 diff --git a/src/common/units/battleship.txt b/src/common/units/battleship.txt index efc2a88..54e37ec 100755 --- a/src/common/units/battleship.txt +++ b/src/common/units/battleship.txt @@ -9,7 +9,7 @@ sub_units = { max_organisation = 50 - supply_consumption = 0.45 + supply_consumption = 0.35 critical_parts = { rudder_jammed destroyed_ammo_storage broken_propeller on_fire } critical_part_damage_chance_mult = 1 diff --git a/src/common/units/carrier.txt b/src/common/units/carrier.txt index 496dd52..38b408a 100755 --- a/src/common/units/carrier.txt +++ b/src/common/units/carrier.txt @@ -10,7 +10,7 @@ sub_units = { } need = { ship_hull_carrier = 1 } - supply_consumption = 0.4 + supply_consumption = 0.3 max_organisation = 40 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 eb0ef4f..28d3a9b 100755 --- a/src/common/units/equipment/modules/00_ship_modules_aviation.txt +++ b/src/common/units/equipment/modules/00_ship_modules_aviation.txt @@ -347,9 +347,9 @@ equipment_modules = { carrier_scouting_unit = { category = carrier_unit add_stats = { - surface_detection = 8 - sub_detection = 5 - build_cost_ic = 400 + surface_detection = 5 + sub_detection = 4 + build_cost_ic = 350 } } carrier_spared_squad = { @@ -442,10 +442,8 @@ equipment_modules = { category = carrier_unit add_stats = { build_cost_ic = 800 - } - multiply_stats = { - surface_detection = 0.3 - sub_detection = 0.2 + surface_detection = 10 + sub_detection = 8 } } coldwar_upgrade_cv = { diff --git a/src/common/units/equipment/modules/00_ship_modules_gun.txt b/src/common/units/equipment/modules/00_ship_modules_gun.txt index 3f14c82..e0e443a 100755 --- a/src/common/units/equipment/modules/00_ship_modules_gun.txt +++ b/src/common/units/equipment/modules/00_ship_modules_gun.txt @@ -894,6 +894,7 @@ equipment_modules = { build_cost_ic = 400 naval_light_gun_hit_chance_factor = 0.006 max_strength = 19 + reliability = -0.03 } multiply_stats = { naval_speed = -0.04 @@ -917,9 +918,10 @@ equipment_modules = { build_cost_ic = 450 naval_light_gun_hit_chance_factor = 0.007 max_strength = 24.5 + reliability = -0.04 } multiply_stats = { - naval_speed = -0.05 + naval_speed = -0.06 } add_average_stats = { lg_armor_piercing = 13 @@ -939,9 +941,10 @@ equipment_modules = { build_cost_ic = 500 naval_light_gun_hit_chance_factor = 0.008 max_strength = 30 + reliability = -0.05 } multiply_stats = { - naval_speed = -0.06 + naval_speed = -0.08 } add_average_stats = { lg_armor_piercing = 15 @@ -987,6 +990,7 @@ equipment_modules = { build_cost_ic = 325 naval_light_gun_hit_chance_factor = 0.006 max_strength = 15 + reliability = -0.02 } multiply_stats = { naval_speed = -0.035 @@ -1010,9 +1014,10 @@ equipment_modules = { build_cost_ic = 375 naval_light_gun_hit_chance_factor = 0.007 max_strength = 20 + reliability = -0.03 } multiply_stats = { - naval_speed = -0.045 + naval_speed = -0.05 } add_average_stats = { lg_armor_piercing = 13 @@ -1032,9 +1037,10 @@ equipment_modules = { build_cost_ic = 400 naval_light_gun_hit_chance_factor = 0.008 max_strength = 24 + reliability = -0.04 } multiply_stats = { - naval_speed = -0.055 + naval_speed = -0.065 } add_average_stats = { lg_armor_piercing = 15 @@ -1080,6 +1086,7 @@ equipment_modules = { build_cost_ic = 250 naval_light_gun_hit_chance_factor = 0.002 max_strength = 11.5 + reliability = -0.01 } multiply_stats = { naval_speed = -0.035 @@ -1103,6 +1110,7 @@ equipment_modules = { build_cost_ic = 275 naval_light_gun_hit_chance_factor = 0.003 max_strength = 15 + reliability = -0.02 } multiply_stats = { naval_speed = -0.045 @@ -1125,6 +1133,7 @@ equipment_modules = { build_cost_ic = 325 naval_light_gun_hit_chance_factor = 0.004 max_strength = 18 + reliability = -0.03 } multiply_stats = { naval_speed = -0.055 @@ -1149,10 +1158,11 @@ equipment_modules = { build_cost_ic = 400 naval_light_gun_hit_chance_factor = 0.007 max_strength = 28 + reliability = -0.045 } multiply_stats = { - naval_speed = -0.055 + naval_speed = -0.065 } add_average_stats = { @@ -1854,7 +1864,7 @@ equipment_modules = { surface_visibility = 1 hg_attack = 18 build_cost_ic = 1650 - reliability = -0.12 + reliability = -0.08 } multiply_stats = { naval_speed = -0.065 @@ -2133,6 +2143,26 @@ equipment_modules = { critical_parts = { damaged_secondaries } } + dp_ship_secondaries_5 = { + category = ship_dp_secondaries + gui_category = ship_secondaries + parent = dp_ship_secondaries_4 + sfx = sfx_ui_sd_module_turret + add_stats = { + lg_attack = 5 + anti_air_attack = 4 + naval_light_gun_hit_chance_factor = 0.005 + build_cost_ic = 330 + } + + multiply_stats = { + naval_speed = -0.035 + } + + dismantle_cost_ic = 75 + critical_parts = { damaged_secondaries } + } + dp_ship_secondaries_1_bb = { category = ship_dp_secondaries_bb gui_category = ship_secondaries @@ -2158,7 +2188,7 @@ equipment_modules = { dp_ship_secondaries_2_bb = { category = ship_dp_secondaries_bb gui_category = ship_secondaries - parent = dp_ship_secondaries_1 + parent = dp_ship_secondaries_1_bb gfx = dp_ship_secondaries_2 sfx = sfx_ui_sd_module_turret add_stats = { @@ -2181,7 +2211,7 @@ equipment_modules = { dp_ship_secondaries_3_bb = { category = ship_dp_secondaries_bb gui_category = ship_secondaries - parent = dp_ship_secondaries_2 + parent = dp_ship_secondaries_2_bb gfx = dp_ship_secondaries_3 sfx = sfx_ui_sd_module_turret add_stats = { @@ -2204,7 +2234,7 @@ equipment_modules = { dp_ship_secondaries_4_bb = { category = ship_dp_secondaries_bb gui_category = ship_secondaries - parent = dp_ship_secondaries_3 + parent = dp_ship_secondaries_3_bb gfx = dp_ship_secondaries_4 sfx = sfx_ui_sd_module_turret add_stats = { @@ -2224,6 +2254,30 @@ equipment_modules = { critical_parts = { damaged_secondaries } } + dp_ship_secondaries_5_bb = { + category = ship_dp_secondaries_bb + gui_category = ship_secondaries + parent = dp_ship_secondaries_4_bb + gfx = dp_ship_secondaries_5 + sfx = sfx_ui_sd_module_turret + add_stats = { + lg_attack = 5 + anti_air_attack = 4 + naval_light_gun_hit_chance_factor = 0.005 + build_cost_ic = 330 + } + + multiply_stats = { + naval_speed = -0.035 + } + add_average_stats = { + lg_armor_piercing = 13 + } + + dismantle_cost_ic = 75 + critical_parts = { damaged_secondaries } + } + ################ ## MISSILES ## @@ -2438,4 +2492,28 @@ equipment_modules = { } dismantle_cost_ic = 1800 } + +################### +## ASW Battery ## +################### + ship_asw_battery_1 = { + category = ship_light_battery + gui_category = ship_light_battery_all + sfx = sfx_ui_sd_module_turret + + add_stats = { + lg_attack = 1.5 + sub_attack = 6 + build_cost_ic = 120 + } + multiply_stats = { + naval_speed = -0.015 + } + add_average_stats = { + lg_armor_piercing = 6 + } + dismantle_cost_ic = 10 + + critical_parts = { damaged_light_guns } + } } \ No newline at end of file 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 eb13ee1..f3e2d0d 100755 --- a/src/common/units/equipment/modules/00_ship_modules_propulsion.txt +++ b/src/common/units/equipment/modules/00_ship_modules_propulsion.txt @@ -179,12 +179,12 @@ equipment_modules = { #naval_speed = 5 fuel_consumption = 5 build_cost_ic = 200 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.17 - naval_range = 0.3 + naval_range = 0.6 } can_convert_from = { @@ -203,12 +203,12 @@ equipment_modules = { #naval_speed = 5 fuel_consumption = 7 build_cost_ic = 250 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.22 - naval_range = 0.4 + naval_range = 0.7 } can_convert_from = { @@ -231,12 +231,12 @@ equipment_modules = { #naval_speed = 5 fuel_consumption = 9 build_cost_ic = 300 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.27 - naval_range = 0.5 + naval_range = 0.8 } can_convert_from = { @@ -591,12 +591,12 @@ equipment_modules = { #naval_speed = 6 fuel_consumption = 12 build_cost_ic = 600 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.25 - naval_range = 0.4 + naval_range = 0.6 } can_convert_from = { @@ -615,12 +615,12 @@ equipment_modules = { #naval_speed = 7 fuel_consumption = 16 build_cost_ic = 660 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.3 - naval_range = 0.5 + naval_range = 0.7 } can_convert_from = { @@ -643,12 +643,12 @@ equipment_modules = { #naval_speed = 7 fuel_consumption = 20 build_cost_ic = 750 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.35 - naval_range = 0.6 + naval_range = 0.8 } can_convert_from = { @@ -828,12 +828,12 @@ equipment_modules = { #naval_speed = 10 fuel_consumption = 20 build_cost_ic = 2200 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.35 - naval_range = 0.3 + naval_range = 0.6 } can_convert_from = { @@ -856,12 +856,12 @@ equipment_modules = { #naval_speed = 11 fuel_consumption = 25 build_cost_ic = 2600 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.4 - naval_range = 0.4 + naval_range = 0.7 } can_convert_from = { @@ -887,12 +887,12 @@ equipment_modules = { #naval_speed = 12 fuel_consumption = 30 build_cost_ic = 3500 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.5 - naval_range = 0.5 + naval_range = 0.8 } can_convert_from = { @@ -1201,12 +1201,12 @@ equipment_modules = { #naval_speed = 5 fuel_consumption = 12 build_cost_ic = 2500 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.35 - naval_range = 0.3 + naval_range = 0.6 } can_convert_from = { @@ -1229,12 +1229,12 @@ equipment_modules = { #naval_speed = 5 fuel_consumption = 16 build_cost_ic = 3000 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.45 - naval_range = 0.4 + naval_range = 0.7 } can_convert_from = { @@ -1260,12 +1260,12 @@ equipment_modules = { #naval_speed = 5 fuel_consumption = 20 build_cost_ic = 3500 - reliability = -0.05 + reliability = 0.05 } multiply_stats = { naval_speed = 0.5 - naval_range = 0.5 + naval_range = 0.8 } can_convert_from = { @@ -1296,6 +1296,8 @@ equipment_modules = { } multiply_stats = { naval_speed = 0.1 + surface_visibility = 0.15 + naval_range = 0.2 } can_convert_from = { module_category = civilian_ship_engine @@ -1313,6 +1315,8 @@ equipment_modules = { } multiply_stats = { naval_speed = 0.3 + surface_visibility = 0.1 + naval_range = 0.4 } can_convert_from = { diff --git a/src/common/units/equipment/modules/00_ship_modules_protection.txt b/src/common/units/equipment/modules/00_ship_modules_protection.txt index 29f85f4..f8320d9 100755 --- a/src/common/units/equipment/modules/00_ship_modules_protection.txt +++ b/src/common/units/equipment/modules/00_ship_modules_protection.txt @@ -172,7 +172,7 @@ equipment_modules = { parent = ship_armor_bc_2 multiply_stats = { build_cost_ic = 0.15 - naval_speed = -0.15 + naval_speed = -0.2 max_strength = 0.12 } build_cost_resources = { @@ -242,7 +242,7 @@ equipment_modules = { parent = ship_armor_bc_3 multiply_stats = { build_cost_ic = 0.17 - naval_speed = -0.2 + naval_speed = -0.27 max_strength = 0.16 } build_cost_resources = { @@ -801,7 +801,7 @@ equipment_modules = { category = ship_carrier_armor_heavy gfx = ship_armor_2 add_equipment_type = capital_ship - parent = ship_armor_cruiser_heavy_1 + parent = ship_armor_carrier_heavy_1 multiply_stats = { build_cost_ic = 0.12 naval_speed = -0.1 @@ -850,7 +850,7 @@ equipment_modules = { category = ship_carrier_armor_heavy gfx = ship_armor_3 add_equipment_type = capital_ship - parent = ship_armor_cruiser_heavy_2 + parent = ship_armor_carrier_heavy_2 multiply_stats = { build_cost_ic = 0.15 naval_speed = -0.125 @@ -900,7 +900,7 @@ equipment_modules = { category = ship_carrier_armor_heavy gfx = ship_armor_bc_4 add_equipment_type = capital_ship - parent = ship_armor_cruiser_heavy_3 + parent = ship_armor_carrier_heavy_3 multiply_stats = { build_cost_ic = 0.18 naval_speed = -0.15 @@ -950,7 +950,7 @@ equipment_modules = { category = ship_carrier_armor_heavy gfx = ship_heavy_armor add_equipment_type = capital_ship - parent = ship_armor_cruiser_heavy_4 + parent = ship_armor_carrier_heavy_4 multiply_stats = { build_cost_ic = 0.2 @@ -1302,6 +1302,9 @@ equipment_modules = { sub_visibility = -0.1 build_cost_ic = 0.2 } + build_cost_resources = { + rubber = 1 + } dismantle_cost_ic = 750 } 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 8a84b68..d04a9d4 100755 --- a/src/common/units/equipment/modules/00_ship_modules_support.txt +++ b/src/common/units/equipment/modules/00_ship_modules_support.txt @@ -281,7 +281,7 @@ equipment_modules = { add_stats = { - torpedo_attack = 18 + torpedo_attack = 15 build_cost_ic = 90 } multiply_stats = { @@ -301,7 +301,7 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - torpedo_attack = 24 + torpedo_attack = 20 naval_torpedo_hit_chance_factor = 0.01 build_cost_ic = 120 } @@ -332,7 +332,7 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - torpedo_attack = 30 + torpedo_attack = 25 build_cost_ic = 150 naval_torpedo_hit_chance_factor = 0.015 } @@ -356,7 +356,7 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - torpedo_attack = 36 + torpedo_attack = 30 build_cost_ic = 180 naval_torpedo_hit_chance_factor = 0.02 } @@ -379,7 +379,8 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - torpedo_attack = 40 + torpedo_attack = 35 + sub_attack = 12 build_cost_ic = 220 naval_torpedo_hit_chance_factor = 0.025 } @@ -523,7 +524,7 @@ equipment_modules = { add_stats = { torpedo_attack = 30 - sub_attack = 2.5 + sub_attack = 8 build_cost_ic = 180 naval_torpedo_hit_chance_factor = 0.05 } @@ -1321,7 +1322,7 @@ equipment_modules = { gui_category = cold_war_miscellaneous multiply_stats = { reliability = -0.1 - armor_value = -0.3 + armor_value = -1 max_strength = -0.3 naval_speed = 0.3 build_cost_ic = 0.2 @@ -1330,6 +1331,10 @@ equipment_modules = { aluminium = 2 steel = -3 } + forbid_module_categories = { + ship_cruiser_armor + ship_cruiser_heavy_armor + } } ship_anti_air_circle = { category = heavy_miscellaneous diff --git a/src/common/units/equipment/ship_hull_carrier.txt b/src/common/units/equipment/ship_hull_carrier.txt index 85f1fa7..13a8e7c 100755 --- a/src/common/units/equipment/ship_hull_carrier.txt +++ b/src/common/units/equipment/ship_hull_carrier.txt @@ -391,6 +391,7 @@ equipments = { ship_dp_secondaries_bb ship_deck_space ship_deck_space_small + carrier_miscellaneous } } } @@ -487,6 +488,7 @@ equipments = { carrier_side_lift carrier_angled_deck carrier_helipad + carrier_miscellaneous } } rear_1_custom_slot = { @@ -690,6 +692,7 @@ equipments = { carrier_side_lift carrier_angled_deck carrier_helipad + carrier_miscellaneous } } mid_2_custom_slot = mid_1_custom_slot diff --git a/src/common/units/equipment/ship_hull_cruiser.txt b/src/common/units/equipment/ship_hull_cruiser.txt index 2df3cde..f987f58 100755 --- a/src/common/units/equipment/ship_hull_cruiser.txt +++ b/src/common/units/equipment/ship_hull_cruiser.txt @@ -68,6 +68,10 @@ equipments = { required = no allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous } } + fixed_ship_extra_electronics_slot = { + required = no + allowed_module_categories = { ship_radar ship_sonar ship_fire_control_system } + } front_1_custom_slot = { required = no allowed_module_categories = { @@ -149,6 +153,10 @@ equipments = { category = ship_sonar count < 2 } + module_count_limit = { + category = ship_fire_control_system + count < 2 + } module_count_limit = { category = ship_missile count < 3 @@ -628,6 +636,10 @@ equipments = { required = no allowed_module_categories = { heavy_miscellaneous generic_miscellaneous light_miscellaneous } } + fixed_ship_extra_electronics_slot = { + required = no + allowed_module_categories = { ship_radar ship_sonar ship_fire_control_system } + } front_1_custom_slot = { required = no allowed_module_categories = { @@ -831,6 +843,7 @@ equipments = { allowed_module_categories = { c_role c_role_missile } } fixed_ship_extra_secondaries_slot = inherit + fixed_ship_extra_electronics_slot = inherit front_1_custom_slot = { required = no allowed_module_categories = { @@ -961,11 +974,11 @@ equipments = { } fixed_ship_secondaries_slot = inherit fixed_ship_armor_slot = inherit - fixed_ship_airplane_launcher_slot = inherit fixed_ship_role_slot = { required = yes allowed_module_categories = { c_role c_role_missile } } + fixed_ship_extra_electronics_slot = inherit fixed_ship_extra_secondaries_slot = inherit fixed_ship_extra_missile_slot = fixed_ship_extra_secondaries_slot front_1_custom_slot = { @@ -1090,6 +1103,7 @@ equipments = { fixed_ship_airplane_launcher_slot = inherit fixed_ship_role_slot = inherit fixed_ship_extra_secondaries_slot = inherit + fixed_ship_extra_electronics_slot = inherit front_1_custom_slot = { required = no allowed_module_categories = { diff --git a/src/common/units/equipment/ship_hull_light.txt b/src/common/units/equipment/ship_hull_light.txt index 928cf2d..38fd76a 100755 --- a/src/common/units/equipment/ship_hull_light.txt +++ b/src/common/units/equipment/ship_hull_light.txt @@ -46,6 +46,10 @@ equipments = { required = no allowed_module_categories = { ship_radar ship_sonar ship_mast } } + fixed_ship_extra_electronics_slot = { + required = no + allowed_module_categories = { ship_radar ship_sonar ship_fire_control_system } + } fixed_ship_torpedo_slot = { required = no allowed_module_categories = { ship_torpedo } @@ -127,7 +131,10 @@ equipments = { category = ship_radar count < 2 } - + module_count_limit = { + category = ship_fire_control_system + count < 2 + } module_count_limit = { category = ship_sonar count < 2 @@ -335,6 +342,7 @@ equipments = { } fixed_ship_fire_control_system_slot = inherit fixed_ship_radar_slot = inherit + fixed_ship_extra_electronics_slot = inherit fixed_ship_torpedo_slot = inherit fixed_ship_engine_slot = inherit fixed_ship_role_slot = { @@ -437,6 +445,7 @@ equipments = { } fixed_ship_fire_control_system_slot = inherit fixed_ship_radar_slot = inherit + fixed_ship_extra_electronics_slot = inherit fixed_ship_torpedo_slot = inherit fixed_ship_engine_slot = inherit fixed_ship_role_slot = { diff --git a/src/descriptor.mod b/src/descriptor.mod index a92e705..b00dcac 100755 --- a/src/descriptor.mod +++ b/src/descriptor.mod @@ -1,4 +1,4 @@ -version="v2.1 - Coral Sea" +version="v2.2 - Midway" tags={ "Military" "Translation" diff --git a/src/events/ai_ships.txt b/src/events/ai_ships.txt index 6712dc5..c5539da 100755 --- a/src/events/ai_ships.txt +++ b/src/events/ai_ships.txt @@ -606,6 +606,7 @@ country_event = { aa_hmg = 1 air_torpedoe_2 = 1 } + air_experience = 80 } } set_global_flag = cv_air_tech_1939 @@ -631,6 +632,7 @@ country_event = { advanced_small_airframe = 1 air_torpedoe_3 = 1 } + air_experience = 80 } } set_global_flag = cv_air_tech_1944 diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt index bcf345c..29f67e4 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt @@ -450,6 +450,7 @@ GER = { pool = { icons = { "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" GFX_GER_vnr_ship_hull_submarine_1_medium GFX_GER_vnr_ship_hull_cruiser_submarine_medium } @@ -471,6 +472,8 @@ GER = { GFX_GER_vnr_ship_hull_submarine_2_medium GFX_GER_vnr_ship_hull_cruiser_submarine_medium "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" + "gfx/interface/technologies/extra/GER_submarine_Type_X.png" } } @@ -491,6 +494,8 @@ GER = { GFX_GER_vnr_ship_hull_submarine_3_medium GFX_GER_vnr_ship_hull_cruiser_submarine_medium "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" + "gfx/interface/technologies/extra/GER_submarine_Type_X.png" } } @@ -512,6 +517,8 @@ GER = { GFX_GER_vnr_ship_hull_submarine_4_medium GFX_GER_vnr_ship_hull_cruiser_submarine_medium "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" + "gfx/interface/technologies/extra/GER_submarine_Type_X.png" } } @@ -532,6 +539,8 @@ GER = { GFX_GER_vnr_ship_hull_submarine_3_medium GFX_GER_vnr_ship_hull_cruiser_submarine_medium "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" + "gfx/interface/technologies/extra/GER_submarine_Type_X.png" } } diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/01_USA_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/01_USA_ship_icons.txt index 76fb724..5e9a9c7 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/01_USA_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/01_USA_ship_icons.txt @@ -499,6 +499,7 @@ USA = { "gfx/interface/technologies/extra/USA_carrier_Enterprise.png" "gfx/interface/technologies/extra/USA_carrier_Forrestal.png" "gfx/interface/technologies/extra/USA_carrier_Oriskany.png" + "gfx/interface/technologies/extra/USA_carrier_Midway.png" } } @@ -599,6 +600,7 @@ USA = { GFX_USA_vnr_ship_hull_submarine_3_medium GFX_USA_vnr_ship_hull_submarine_4_medium GFX_USA_vnr_ship_hull_cruiser_submarine_medium + "gfx/interface/technologies/extra/USA_submarine_Nautilus.png" } } diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/02_east_europe_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/02_east_europe_ship_icons.txt index 9c31382..4d23382 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/02_east_europe_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/02_east_europe_ship_icons.txt @@ -1054,6 +1054,8 @@ SOV = { GFX_SOV_vnr_ship_hull_submarine_3_medium GFX_SOV_vnr_ship_hull_submarine_4_medium GFX_SOV_vnr_ship_hull_cruiser_submarine_medium + "gfx/interface/technologies/extra/SOV_submarine_Zulu.png" + "gfx/interface/technologies/extra/SOV_submarine_Hotel.png" } } diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air1.png index 99cfcc8..d44bca3 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air2.png index 0e93325..7225072 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air3.png index 6091248..1853089 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air4.png index 9bd8a97..7379617 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air5.png index 39498f5..825fb25 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/anti_air5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/civilian_ship_engine_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/civilian_ship_engine_1.png index a0c2ff8..637e7cc 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/civilian_ship_engine_1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/civilian_ship_engine_1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/civilian_ship_engine_2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/civilian_ship_engine_2.png index 071f6dc..1761322 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/civilian_ship_engine_2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/civilian_ship_engine_2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge1.png index 1f1705f..10af548 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge2.png index 7090e89..d205e3c 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge3.png index a4861a8..ad68368 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge4.png index 614b318..004297f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge5.png index 26372a3..6da0723 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/depth_charge5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery1.png index bf4b32a..23489a2 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery2.png index f94f7dc..4379055 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery3.png index 52acaf4..5fa65c1 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery4.png index 398cff4..edb251c 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery5.png index 980fc1e..95d0aa2 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery6.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery6.png index a904a78..e77bc67 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery6.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery6.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery7.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery7.png index 35c2c78..3df7ec4 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery7.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery7.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery8.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery8.png index 8a85219..806d6a3 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery8.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery8.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery9.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery9.png index 696787d..5db83b2 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery9.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_heavy_battery9.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery1.png index cba0d46..216aa8a 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery2.png index 1f649f9..3d37a71 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery3.png index 36a3673..7a0110c 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery4.png index e778d43..553514d 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery1.png index e07b60b..2328e55 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery2.png index 8a432b1..8dc96c7 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery3.png index a54ee5a..51ac224 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery4.png index 6e8b06e..604a5ac 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_light_medium_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery1.png index 1c06e5a..d7b3402 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery2.png index 205c452..610e526 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery3.png index 3ce972a..005b18e 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery4.png index 9210d2c..3beea55 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_heavy_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_heavy_battery1.png index c4414d0..9701cda 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_heavy_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_heavy_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_heavy_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_heavy_battery2.png index 31d6e30..821f394 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_heavy_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/double_medium_heavy_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery1.png index 1c5bd62..2152c09 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery2.png index f18d1ec..6545bed 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery3.png index e4ac71e..05e602a 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery4.png index 3d7729b..ebd0398 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery5.png index 7ee9356..22714f4 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/dp_light_battery5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control1.png index 230ce88..aa73671 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control2.png index c32da6b..d155cb1 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control3.png index f40dd3f..64fe2b7 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control4.png index e527075..290e6fa 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/fire_control4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/gas_engine.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/gas_engine.png index 93b672f..576e410 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/gas_engine.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/gas_engine.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air1.png index aa78aa6..c29d5e2 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air2.png index 131eeb7..8e45284 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air3.png index d89ba5a..007b708 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air4.png index f354fd2..c9c4d7a 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/heavy_anti_air4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/high_speed_engine.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/high_speed_engine.png index f867aa8..2bcb4d3 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/high_speed_engine.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/high_speed_engine.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope1.png index 9195bc2..7bf2479 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope2.png index a0674ae..08fd981 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope3.png index 2e1631b..c4ece8b 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope4.png index 379a164..27349d1 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/periscope4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull1.png index de885ea..b98ad01 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull2.png index 4a07dbd..346d866 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull3.png index cf7ad54..42b70ff 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull4.png index f66a550..39989d7 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull5.png index 110bc58..35105dd 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/pressure_hull5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery1.png index 95cc10c..602b8de 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery2.png index 0674e73..7cdc9a1 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery3.png index d9b6dd2..b79e098 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery4.png index 4afd7f3..133492a 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery5.png index b9eeb60..bb877cd 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery6.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery6.png index 4fb003b..b5c9426 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery6.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery6.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery7.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery7.png index c2102ee..0bed3e5 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery7.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery7.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery8.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery8.png index c19e764..aaaaf5c 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery8.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery8.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery9.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery9.png index ce33f91..434184f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery9.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/quad_heavy_battery9.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell.png deleted file mode 100755 index 5ed093e..0000000 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell.png and /dev/null differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell1.png deleted file mode 100755 index 42c5291..0000000 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell1.png and /dev/null differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell2.png deleted file mode 100755 index 000ab67..0000000 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell2.png and /dev/null differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell3.png deleted file mode 100755 index 12a6758..0000000 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_ap_shell3.png and /dev/null differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_asw_battery_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_asw_battery_1.png new file mode 100755 index 0000000..4d6b6d3 Binary files /dev/null and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_asw_battery_1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big.png index 0fd389a..4c1cf8e 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big_armored.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big_armored.png index ea8dde3..ae52504 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big_armored.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_big_armored.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_small.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_small.png index 5b908cb..f966881 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_small.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_deck_space_small.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_decoy_launcher.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_decoy_launcher.png index 021b996..606da96 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_decoy_launcher.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_decoy_launcher.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine1.png index 361df15..bfd8034 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine2.png index a509b07..3a4d92b 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine3.png index 272564b..8a793d0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine4.png index b10d05a..43ac997 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_diesel_engine4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_fire_control_system_5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_fire_control_system_5.png index 477c5e9..b9950d0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_fire_control_system_5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_fire_control_system_5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_heavy_mg_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_heavy_mg_1.png deleted file mode 100755 index a67d91c..0000000 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_heavy_mg_1.png and /dev/null differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_high_velocity_shell.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_high_velocity_shell.png index 4476c50..e1c0d91 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_high_velocity_shell.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_high_velocity_shell.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar1.png index 9ac0ea0..a076ead 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar2.png index 7dacfc5..20e4543 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar3.png index 8b2d9f7..3fd9ab5 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar4.png index b8fb38d..c00f0b6 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar5.png index 6e04de8..7703de2 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_radar5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries1.png index d80a6a2..41021c4 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries2.png index be60cff..f6f2850 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries3.png index ba785f0..d7ea60a 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries4.png index e06ed5c..bd98393 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries5.png index ed4d310..9a48289 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries6.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries6.png index 93621fc..13f5d71 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries6.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries6.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries7.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries7.png index c9b3ef1..5af454f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries7.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries7.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries8.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries8.png index 4841e39..dd114a9 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries8.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries8.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries9.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries9.png new file mode 100755 index 0000000..b7ecbf7 Binary files /dev/null and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries9.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light1.png index f79e4df..3cd0aff 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light2.png index f56db3a..fe6f652 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_1.png index 0db2a6e..f3d458f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_2.png index 7cb0dc7..92efaee 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_3.png index c8dbb16..f6a051b 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_4.png index d8c5d21..b6ec2cf 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_sonar_4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_super_heavy_weight_shell.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_super_heavy_weight_shell.png index a8526c0..c3abc0e 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_super_heavy_weight_shell.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_super_heavy_weight_shell.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo1.png index d89e648..079a924 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo2.png index 076edf9..25969be 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo3.png index 951bd8e..1a330c3 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo4.png index e5da036..9cbeedd 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo5.png index 59f2edb..d045e03 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo_sub_5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo_sub_5.png index 84dfd6c..8a752fb 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo_sub_5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_torpedo_sub_5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery1.png index bbcba01..52bc242 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery2.png index d1bad57..289ca74 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery3.png index 19910a4..0c2544d 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery4.png index 368ed5e..07e1b71 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery5.png index 423e9ea..e7b14d0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_dp_light_battery5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery1.png index fc38866..e3c8baa 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery2.png index bc894e8..67d4f1e 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery3.png index 729b826..cf38dbe 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery4.png index e6547dc..74b9ab9 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery1.png index 3b98552..fed4684 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery2.png index c7b9ae0..284d761 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery3.png index f6036d1..1ab7db3 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery4.png index 178452f..97181f5 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_light_medium_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery1.png index 4429ced..407b02a 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery2.png index be6869a..9c085e6 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery3.png index c17abab..119bde0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery4.png index 745d6f4..a06bdc3 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/single_medium_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_1.png index 0a230e2..25154c7 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_2.png index 39a44ed..f08602c 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_3.png index 048b980..6f30bdf 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_4.png index 449c73c..b85c889 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_5.png index 3041941..d2f554f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_1.png index 2491a17..645f224 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_2.png index 994544d..9590ec8 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_3.png index c0d7b26..d246e9c 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_4.png index d0402d3..f4a4d7c 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_5.png index 3602cd5..7834253 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large_5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_1.png index d460816..0638b2e 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_2.png index 6e12039..5f4cba5 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_3.png index f80128e..5d324c0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_4.png index fa26ee9..1576e09 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_5.png index 9f955f6..c9b14b3 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_light_5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_1.png index 81b62d6..778bf0f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_2.png index 7c26d9b..9b43486 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_3.png index e907749..5f96cac 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_super_3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/structural_aluminum.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/structural_aluminum.png index 441cc79..bf182a4 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/structural_aluminum.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/structural_aluminum.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_AIP_engine.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_AIP_engine.png index 19e5d86..2a849d0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_AIP_engine.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_AIP_engine.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_0.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_0.png index 9005821..9319b0c 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_0.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_0.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_1.png index 8bc6d89..670aa5f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_2.png index a2a555e..973ef47 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/sub_conning_tower_2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_belt.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_belt.png index 127808e..974b7d5 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_belt.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_belt.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_belt_enhanced.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_belt_enhanced.png index ea14cac..d1c6ec0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_belt_enhanced.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_belt_enhanced.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_bulge.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_bulge.png index cf95d82..cfae709 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_bulge.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_bulge.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer1.png index f832de0..5e74ee9 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer2.png index e54f6aa..c9c1bc2 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer3.png index dd4b08a..69e02dd 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/torpedo_computer3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery1.png index a3df928..d136d0e 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery2.png index 08f3212..b0c7709 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery3.png index 0cb9210..229dba6 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery4.png index a0e4d2f..fdb9d00 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery5.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery5.png index 9b14527..791a2f0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery5.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery5.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery6.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery6.png index 8bdd60f..78f6694 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery6.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery6.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery7.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery7.png index 7571335..d5c1fc0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery7.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery7.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery8.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery8.png index e3dc8af..da47c8f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery8.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery8.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery9.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery9.png index df5fdff..1b826f5 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery9.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_heavy_battery9.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery1.png index 627ba0e..35f271b 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery2.png index f7eca03..e9e6eff 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery3.png index 2e25273..f01400e 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery4.png index 2387de0..b37fbe3 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_light_medium_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery1.png index c3206d0..20a3154 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery2.png index 1ed7d73..b53f3e6 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery3.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery3.png index 642c602..618a55f 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery3.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery3.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery4.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery4.png index 79e2dc4..7d7fd20 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery4.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_battery4.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_heavy_battery1.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_heavy_battery1.png index f0efd73..e07ac88 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_heavy_battery1.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_heavy_battery1.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_heavy_battery2.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_heavy_battery2.png index e9208db..700b7a0 100755 Binary files a/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_heavy_battery2.png and b/src/gfx/interface/equipmentdesigner/naval/modules/icons/triple_medium_heavy_battery2.png differ diff --git a/src/gfx/interface/equipmentdesigner/naval/topviews/extra/carrier_hull_angled_deck.dds b/src/gfx/interface/equipmentdesigner/naval/topviews/extra/carrier_hull_angled_deck.dds new file mode 100755 index 0000000..68fcd3a Binary files /dev/null and b/src/gfx/interface/equipmentdesigner/naval/topviews/extra/carrier_hull_angled_deck.dds differ diff --git a/src/gfx/interface/equipmentdesigner/naval/topviews/extra/carrier_hull_angled_deck@highlight.dds b/src/gfx/interface/equipmentdesigner/naval/topviews/extra/carrier_hull_angled_deck@highlight.dds new file mode 100755 index 0000000..d4b80de Binary files /dev/null and b/src/gfx/interface/equipmentdesigner/naval/topviews/extra/carrier_hull_angled_deck@highlight.dds differ diff --git a/src/gfx/interface/ideas/vnr_navy_spirits/lack_maintainence_facilities.png b/src/gfx/interface/ideas/vnr_navy_spirits/lack_maintenance_facilities.png similarity index 100% rename from src/gfx/interface/ideas/vnr_navy_spirits/lack_maintainence_facilities.png rename to src/gfx/interface/ideas/vnr_navy_spirits/lack_maintenance_facilities.png diff --git a/src/gfx/interface/technologies/extra/GER_submarine_Type_IX.png b/src/gfx/interface/technologies/extra/GER_submarine_Type_IX.png new file mode 100755 index 0000000..1cfd67f Binary files /dev/null and b/src/gfx/interface/technologies/extra/GER_submarine_Type_IX.png differ diff --git a/src/gfx/interface/technologies/extra/GER_submarine_Type_X.png b/src/gfx/interface/technologies/extra/GER_submarine_Type_X.png new file mode 100755 index 0000000..8f27ca5 Binary files /dev/null and b/src/gfx/interface/technologies/extra/GER_submarine_Type_X.png differ diff --git a/src/gfx/interface/technologies/extra/SOV_submarine_Hotel.png b/src/gfx/interface/technologies/extra/SOV_submarine_Hotel.png new file mode 100755 index 0000000..440f205 Binary files /dev/null and b/src/gfx/interface/technologies/extra/SOV_submarine_Hotel.png differ diff --git a/src/gfx/interface/technologies/extra/SOV_submarine_Zulu.png b/src/gfx/interface/technologies/extra/SOV_submarine_Zulu.png new file mode 100755 index 0000000..be4a8bb Binary files /dev/null and b/src/gfx/interface/technologies/extra/SOV_submarine_Zulu.png differ diff --git a/src/gfx/interface/technologies/extra/USA_carrier_Midway.png b/src/gfx/interface/technologies/extra/USA_carrier_Midway.png new file mode 100755 index 0000000..017d194 Binary files /dev/null and b/src/gfx/interface/technologies/extra/USA_carrier_Midway.png differ diff --git a/src/gfx/interface/technologies/extra/USA_submarine_Nautilus.png b/src/gfx/interface/technologies/extra/USA_submarine_Nautilus.png new file mode 100755 index 0000000..f288686 Binary files /dev/null and b/src/gfx/interface/technologies/extra/USA_submarine_Nautilus.png differ diff --git a/src/gfx/interface/technologies/navy_techtree/symmetric_key_algorithm.png b/src/gfx/interface/technologies/navy_techtree/cryptography_revolution.png similarity index 100% rename from src/gfx/interface/technologies/navy_techtree/symmetric_key_algorithm.png rename to src/gfx/interface/technologies/navy_techtree/cryptography_revolution.png diff --git a/src/gfx/interface/technologies/navy_techtree/landing_aid_system.png b/src/gfx/interface/technologies/navy_techtree/landing_aid_system.png index 02687b1..2231a65 100755 Binary files a/src/gfx/interface/technologies/navy_techtree/landing_aid_system.png and b/src/gfx/interface/technologies/navy_techtree/landing_aid_system.png differ diff --git a/src/gfx/interface/technologies/navy_techtree/memory_expansion.png b/src/gfx/interface/technologies/navy_techtree/memory_expansion.png index 4cc91de..87122d2 100755 Binary files a/src/gfx/interface/technologies/navy_techtree/memory_expansion.png and b/src/gfx/interface/technologies/navy_techtree/memory_expansion.png differ diff --git a/src/gfx/interface/vnr_main_menu_bg.dds b/src/gfx/interface/vnr_main_menu_bg.dds index 697369f..589ad7a 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/gfx/introscreen/navy_rework_splash_1.png b/src/gfx/introscreen/navy_rework_splash_1.png new file mode 100755 index 0000000..4c72a4c Binary files /dev/null and b/src/gfx/introscreen/navy_rework_splash_1.png differ diff --git a/src/gfx/introscreen/title.png b/src/gfx/introscreen/title.png new file mode 100755 index 0000000..b92f937 Binary files /dev/null and b/src/gfx/introscreen/title.png differ diff --git a/src/interface/equipmentdesigner/ships/ship_hull_carrier.gui b/src/interface/equipmentdesigner/ships/ship_hull_carrier.gui index 7814da9..df500d4 100755 --- a/src/interface/equipmentdesigner/ships/ship_hull_carrier.gui +++ b/src/interface/equipmentdesigner/ships/ship_hull_carrier.gui @@ -308,6 +308,29 @@ guiTypes = { position = { x=345 y=0 } } } + containerWindowType = { + name = "ship_deck_space_small" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "blueprint" + spriteType = "GFX_SM_carrier_hull_fixed_deck_space" + position = { x=345 y=0 } + } + } + + containerWindowType = { + name = "ship_deck_space_small@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_fixed_deck_space@highlight" + position = { x=345 y=0 } + } + } containerWindowType = { name = "ship_armor_carrier_deck" position = { x=0 y=0 } @@ -362,6 +385,30 @@ guiTypes = { } } + containerWindowType = { + name = "ship_deck_space_small" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "blueprint" + spriteType = "GFX_SM_carrier_hull_fixed_deck_space" + position = { x=300 y=0 } + } + } + + containerWindowType = { + name = "ship_deck_space_small@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_fixed_deck_space@highlight" + position = { x=300 y=0 } + } + } + containerWindowType = { name = "ship_armor_carrier_deck" position = { x=0 y=0 } @@ -446,6 +493,54 @@ guiTypes = { } } + containerWindowType = { + name = "ship_deck_space_small" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_carrier_hull_front1_deck_space" + position = { x=430 y=0 } + } + } + + containerWindowType = { + name = "ship_deck_space_small@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_front1_deck_space@highlight" + position = { x=430 y=0 } + } + } + + containerWindowType = { + name = "carrier_angled_deck" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_carrier_hull_angled_deck" + position = { x=5 y=-20 } + } + } + + containerWindowType = { + name = "carrier_angled_deck@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_angled_deck@highlight" + position = { x=5 y=-20 } + } + } + #### MODULE: Deck Armor #### containerWindowType = { name = "ship_armor_carrier_deck" @@ -545,6 +640,37 @@ guiTypes = { } } + + ################# MODULE SLOT: Custom, Front #2 ################# + containerWindowType = { + name = "front_2_custom_slot" + position = { x=0 y=0 } + size = { width=100% height=100% } + + containerWindowType = { + name = "carrier_angled_deck" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_carrier_hull_angled_deck" + position = { x=5 y=-20 } + } + } + + containerWindowType = { + name = "carrier_angled_deck@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_angled_deck@highlight" + position = { x=5 y=-20 } + } + } + } ################# MODULE SLOT: Custom, Middle #1 ################# containerWindowType = { @@ -575,6 +701,52 @@ guiTypes = { position = { x=193 y=0 } } } + containerWindowType = { + name = "ship_deck_space_small" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_carrier_hull_mid1_deck_space" + position = { x=193 y=0 } + } + } + containerWindowType = { + name = "ship_deck_space_small@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_mid1_deck_space@highlight" + position = { x=193 y=0 } + } + } + + containerWindowType = { + name = "carrier_angled_deck" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_carrier_hull_angled_deck" + position = { x=5 y=-20 } + } + } + + containerWindowType = { + name = "carrier_angled_deck@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_angled_deck@highlight" + position = { x=5 y=-20 } + } + } #### MODULE: Deck Armor #### containerWindowType = { name = "ship_armor_carrier_deck" @@ -677,6 +849,52 @@ guiTypes = { position = { x=120 y=0 } } } + containerWindowType = { + name = "ship_deck_space_small" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_carrier_hull_mid2_deck_space" + position = { x=120 y=0 } + } + } + containerWindowType = { + name = "ship_deck_space_small@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_mid2_deck_space@highlight" + position = { x=120 y=0 } + } + } + + containerWindowType = { + name = "carrier_angled_deck" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_carrier_hull_angled_deck" + position = { x=5 y=-20 } + } + } + + containerWindowType = { + name = "carrier_angled_deck@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_carrier_hull_angled_deck@highlight" + position = { x=5 y=-20 } + } + } #### MODULE: Deck Armor #### containerWindowType = { diff --git a/src/interface/equipmentdesigner/ships/ship_hull_cruiser.gui b/src/interface/equipmentdesigner/ships/ship_hull_cruiser.gui index 1a8edf1..2bc15db 100755 --- a/src/interface/equipmentdesigner/ships/ship_hull_cruiser.gui +++ b/src/interface/equipmentdesigner/ships/ship_hull_cruiser.gui @@ -1308,6 +1308,30 @@ guiTypes = { } } + containerWindowType = { + name = "ship_secondaries_light" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "blueprint" + spriteType = "GFX_SM_cruiser_hull_fixed_secondaries" + position = { x=277 y=0 } + } + } + + containerWindowType = { + name = "ship_secondaries_light@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_cruiser_hull_fixed_secondaries@highlight" + position = { x=277 y=0 } + } + } + containerWindowType = { name = "ship_dp_secondaries" position = { x=0 y=0 } @@ -1660,6 +1684,29 @@ guiTypes = { } } + containerWindowType = { + name = "ship_secondaries_light" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_cruiser_hull_fixed_secondaries" + position = { x=247 y=0 } + } + } + containerWindowType = { + name = "ship_secondaries_light@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_cruiser_hull_fixed_secondaries@highlight" + position = { x=247 y=0 } + } + } + containerWindowType = { name = "ship_dp_secondaries" position = { x=0 y=0 } @@ -1927,6 +1974,29 @@ guiTypes = { } } + containerWindowType = { + name = "ship_secondaries_light" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "image" + spriteType = "GFX_SM_cruiser_hull_fixed_secondaries" + position = { x=231 y=0 } + } + } + containerWindowType = { + name = "ship_secondaries_light@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + iconType = { + name = "highlight" + spriteType = "GFX_SM_cruiser_hull_fixed_secondaries@highlight" + position = { x=231 y=0 } + } + } + containerWindowType = { name = "ship_dp_secondaries" position = { x=0 y=0 } @@ -2355,6 +2425,19 @@ guiTypes = { } + containerWindowType = { + name = "ship_secondaries_light" + position = { x=0 y=0 } + size = { width=100% height=100% } + + } + containerWindowType = { + name = "ship_secondaries_light@highlight" + position = { x=0 y=0 } + size = { width=100% height=100% } + + } + containerWindowType = { name = "ship_dp_secondaries" position = { x=0 y=0 } diff --git a/src/interface/navy_rework_welcome_splash.gui b/src/interface/navy_rework_welcome_splash.gui index 3edb273..3dce0c3 100755 --- a/src/interface/navy_rework_welcome_splash.gui +++ b/src/interface/navy_rework_welcome_splash.gui @@ -8,18 +8,37 @@ guiTypes = { orientation = CENTER origo = center clipping = no - + background = { - name = "KR_logo" - spriteType = "GFX_navy_splash_intro" + name = "background" + spriteType = "GFX_navy_splash_title" position = { x = -40 y = -6 } } + + containerWindowType = { + name = "navy_rework_logo_container" + position = { x = 0 y = 275 } + size = { width = 720 height = 550 } + orientation = CENTER_UP + origo = center + clipping = no + + iconType = { + name = "naval_rework_logo" + spriteType = "GFX_navy_splash_intro" + alwaystransparent = yes + position = { x = -40 y = -6 } + } + } + + containerWindowType = { name = "splash_backfill" position = { x = 0 y = 356 } size = { width = 728 height = 448 } orientation = CENTER_UP + moveable = yes origo = center_up clipping = no diff --git a/src/interface/vnr_user_interface_assets.gfx b/src/interface/vnr_user_interface_assets.gfx index 72f651a..3e6e340 100755 --- a/src/interface/vnr_user_interface_assets.gfx +++ b/src/interface/vnr_user_interface_assets.gfx @@ -137,6 +137,14 @@ spriteTypes = { name = "GFX_navy_splash_intro" textureFile = "gfx/introscreen/navy_rework_splash.png" } + spriteType = { + name = "GFX_navy_splash_intro_1" + textureFile = "gfx/introscreen/navy_rework_splash_1.png" + } + spriteType = { + name = "GFX_navy_splash_title" + textureFile = "gfx/introscreen/title.png" + } ### ship role icons definition in ship designer, right next to ship icon diff --git a/src/interface/z_navy_techtree.gfx b/src/interface/z_navy_techtree.gfx index 5ae463d..3edf71a 100755 --- a/src/interface/z_navy_techtree.gfx +++ b/src/interface/z_navy_techtree.gfx @@ -689,8 +689,8 @@ spriteTypes = { textureFile = "gfx/interface/technologies/navy_techtree/wave_resistance_design.png" } spriteType = { - name = "GFX_symmetric_key_algorithm_medium" - textureFile = "gfx/interface/technologies/navy_techtree/symmetric_key_algorithm.png" + name = "GFX_cryptography_revolution_medium" + textureFile = "gfx/interface/technologies/navy_techtree/cryptography_revolution.png" } spriteType = { name = "GFX_luneburg_lens_medium" diff --git a/src/interface/z_ship_modules.gfx b/src/interface/z_ship_modules.gfx index 32e26ec..00aa8e1 100755 --- a/src/interface/z_ship_modules.gfx +++ b/src/interface/z_ship_modules.gfx @@ -24,6 +24,10 @@ spriteTypes = { name = "GFX_EMSI_fixed_ship_torpedo_defense_system_slot" textureFile = "gfx/interface/equipmentdesigner/naval/module_slots/icons/armor.dds" } + spriteType = { + name = "GFX_EMSI_fixed_ship_extra_electronics_slot" + textureFile = "gfx/interface/equipmentdesigner/naval/module_slots/icons/radar.dds" + } # category spriteType = { @@ -206,6 +210,10 @@ spriteTypes = { name = "GFX_SMI_carrier_ship_engine" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/steam_engine_large.png" } + spriteType = { + name = "GFX_SMI_carrier_miscellaneous" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_miscellaneous.png" + } # topview images spriteType = { @@ -340,6 +348,14 @@ spriteTypes = { name = "GFX_SM_cruiser_hull_rear_missile_launcher@highlight" textureFile = "gfx/interface/equipmentdesigner/naval/topviews/extra/cruiser_hull_rear_missile_launcher@highlight.dds" } + spriteType = { + name = "GFX_SM_carrier_hull_angled_deck" + textureFile = "gfx/interface/equipmentdesigner/naval/topviews/extra/carrier_hull_angled_deck.dds" + } + spriteType = { + name = "GFX_SM_carrier_hull_angled_deck@highlight" + textureFile = "gfx/interface/equipmentdesigner/naval/topviews/extra/carrier_hull_angled_deck@highlight.dds" + } # double heavy battery @@ -751,6 +767,10 @@ spriteTypes = { name = "GFX_SMI_dp_ship_secondaries_4" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries6.png" } + spriteType = { + name = "GFX_SMI_dp_ship_secondaries_5" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries9.png" + } spriteType = { name = "GFX_SMI_ship_secondaries_3" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries7.png" @@ -1597,4 +1617,9 @@ spriteTypes = { name = "GFX_SMI_coldwar_upgrade_cv" textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/coldwar_upgrade_cv.png" } + + spriteType = { + name = "GFX_SMI_ship_asw_battery_1" + textureFile = "gfx/interface/equipmentdesigner/naval/modules/icons/ship_asw_battery_1.png" + } } diff --git a/src/localisation/english/replace/navy_rework_welcome_l_english.yml b/src/localisation/english/replace/navy_rework_welcome_l_english.yml index 6624803..1a000ad 100755 --- a/src/localisation/english/replace/navy_rework_welcome_l_english.yml +++ b/src/localisation/english/replace/navy_rework_welcome_l_english.yml @@ -4,7 +4,7 @@ navy_rework_welcome_splash_tab_3: "额外信息" navy_rework_welcome_splash_tab_4: "致谢" navy_rework_options_button_text: "继续" - navy_rework_welcome_splash_tab_1_content: "§Hv2.1 “珊瑚海”§!\n\n§C重要新增：§!\n\n-新模块：冷战战列舰改装，冷战航母改装\n-新角色：舰队航母，轻型航母\n-重做海军将领技能和特质的效果\n-为开局大国的海军生产队列添加MIO\n-增加一条规则允许AI使用更强的舰载机设计模板（默认为关）\n\n§C更新：§!\n\n-重做全部轻型和重型引擎图标\n-为一些无法灵活更改的舰船角色增加了高额的拆除成本，从而使改装它们的性价比极低\n-为无法灵活更改的舰船角色添加了小贴士\n-更新开局的轻型航母设计\n-法国的暴风雪级现在被归类为战后船体\n-为法国添加大胆级驱逐舰的设计\n-轻型航母可以使用巡洋舰引擎\n-1944航母无法再被改装为超级航母，但可以使用冷战改装模块\n-降低所有巡洋舰和全导弹布局的可靠性\n-加强潜艇的撤退速度和隐蔽性\n-舰队堆叠的最高阵位惩罚上调到100%\n-装甲舰的初始装甲下调到5\n-装甲舰科技现在需要战后重型船体作为前提\n-超级航母现在默认使用装甲飞行甲板\n-超级航母的装甲带现在可以正常由4级重型航母装甲带升级而来\n-削弱第二舰岛的效果\n-平衡所有重中型火炮的效果\n\n§C修复：§!\n\n-修复过热器和额外装甲模块没有UI中种类图标的问题\n-修复教程中的一些错误信息\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv2.2 “决战中途岛”§!\n\n§C重要新增：§!\n\n-重做所有模块图标上的罗马数字，和原版风格一致\n-增加一个舰队collection的彩蛋\n-新模块：带RAT发射器的轻型火炮，5级高平副炮\n-新立绘：中途岛（SCB-110改装），鹦鹉螺（SSN-571），IX型U艇，XB型U艇，611型潜艇，658型潜艇\n-在设计器中为航母添加斜角甲板的俯视图\n\n§C更新：§!\n\n-巡洋舰和驱逐舰现在有三个电子设备槽位，可以同时安装雷达、声呐和火控\n-重新平衡鱼雷模块的数值\n-冷战鱼雷现在可以进行反潜\n-加强柴油引擎对可靠性和航程的增益\n-民用引擎的航程更远\n-后期的轻中型火炮会有更高的速度和可靠性惩罚\n-开局拥有战后重型船体的国家默认拥有重油锅炉科技\n-由于AI难以管理舰载CAS，因此暂时移除相关的模板\n-1940年及之后的航母可以额外安装一个杂项模块\n-加强预警机的效果\n-降低主力舰的补给消耗\n-为冷战时期的高平火炮添加一些独特的国别名称\n-更新AI的战列舰模板\n-重做诱饵发射器的图标\n-重做4级声呐的图标\n-对称密钥加密算法现在改名为密码学革命，并且可以减低泄露的陆军和空军情报\n-火控计算机内存扩容现在改名为磁芯存储器阵列\n-重做辅助降落系统和磁芯存储器阵列地科技图标\n-3级和4级的战巡装甲对速度有更高的惩罚\n-削弱俯冲轰炸机研究的效果\n-消声瓦模块会消耗1点橡胶\n-结构化铝合金材料现在不能和巡洋舰装甲共存\n\n§C修复：§!\n\n-修复航母重型装甲无法正常升级的问题\n-修复设计器俯视图中，巡洋舰的副炮不会显示的问题\n-修复小型机库在俯视图上不显示的问题\n-修复双联改进型超重主炮的可靠性损失较高的问题\n-修复中途补给原型迭代环节中部分文本缺失的问题\n-优化一部分科技的描述\n\n感谢你的游玩！" navy_rework_welcome_splash_tab_2_content: "§H这里包含了你想知道的关于海军重置的一切。§!\n\n§C设计器-§!\n£white_dot 在设计§Y驱逐舰§!、§Y巡洋舰§!或§Y战列舰§!的时候，§Y主炮§!是和历史唯一的一一对应的装备。由于它们的火力和穿甲据此做了平衡，§R请确保它们的数量和现实中接近§!。诸如§Y副炮§!和§Y鱼雷§!等装备则与原版没有区别。\n£white_dot 一些在原版受限的装备在本模组中是开放的，比如你可以建造超重炮战列舰，轻炮重巡，无甲巡洋舰等等。\n£white_dot 舰船角色在驱逐舰和巡洋舰上是必须的，它们可以提供不同的增益并解锁特殊的部件。\n£white_dot 巡洋舰的主力屏卫之分不由主炮口径为标准。所有巡洋舰（除装甲舰外）都初始默认为屏卫舰，且需要特殊的角色才能让它们成为主力舰。\n£white_dot §Y导弹§!可以安装在晚期的重型或巡洋舰船体上，不过后者需要专门的导弹巡洋舰角色来安装。\n£white_dot 此模组中实现最大屏卫效率的屏卫/主力比例为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%，但优势的水面探测数值可以带来最多20%的阵位奖励。\n£white_dot 水上飞机弹射器、航母和声呐在反潜战中的表现都更加有用和强力，而§Y潜艇§!基础的§Y可见度§!相较原版被§R增加§!了，在面对有良好反潜能力的舰队时，潜艇不再拥有优势。\n£white_dot AI的设计模板是刻意默认设置为§Y史实向§!的。尽管这些模板比原版要强一些，但是过去的最优设计仍然是有效的。\n\n§C其他-§!\n£white_dot 玩家和AI都享有§G-15%§!海军燃料消耗减免。\n£white_dot 单个船厂的产出已被提高到§G160%§!，一般在没有加成的情况下，建造一艘满配战列舰的时间在1-2年之间。\n£white_dot AI控制的主要国家会分别在1940年，1943年，1945年和冷战时期（如果没有投降的话）获得一批海军科技和独特的舰船设计。\n£white_dot AI会根据历史上的学说选择和战争情况选择不同的海军建造策略（包括舰载机）。例如，原版的§g德国§!会更加专注于潜艇，而§B美国§!则会重视航母。" navy_rework_welcome_splash_tab_3_content: "§H这里罗列关于海军重置的其他信息。§!\n\n§C兼容性-§!\n£white_dot 除非有§Y兼容包§!，本模组与修改科技树的模组不兼容，已有的兼容包链接都会在创意工坊界面列出。\n£white_dot §R所有生成舰船设计的国策/事件/决议都会失效，这是为了兼容性的考量和必要牺牲。§!\n\n§C二次创作-§!\n£white_dot 除了56之路外，不会再有其他的官方兼容包发布，希望社区可以更多地参与此事。目前日共重置与日本史实国策重做已完全兼容本模组。\n£white_dot 所有人都可以随意利用本模组的资源（代码/图标/文本），但在使用中请标明出处并通知我。感谢你的理解。" navy_rework_welcome_splash_tab_4_content: "大家好，海军重置已经走过了艰难的开发阶段，如今史实设计器、初始海军编制和设计、图标和科技树都已经基本完成，整个大框架完成后，剩余的工作便是进一步丰富和扩充，而这相比之前的开拓等等都要简单一些。借此机会我想和大家讲讲这个mod的过去和未来。\n\n我是2016年入的钢4坑，在加里波第的噩梦版本，也就是0.6时期接触到的KR，当时就被它详实有趣的世界观所吸引，之后几年KR一直是我玩的最多的mod之一。KR在0.8发布了海军重做，也是我最喜欢最兴奋的一个版本，由此我开始对海军感兴趣，也越发经常地想象KR世界观中的海军和军舰会是什么样子的。\n\n2021年春节前夕的一个周五下午，我在办公室摸鱼逛reddit，看到了一位外国网友写的对KR中加拿大和日本海军的战舰原型考证，这篇文章深深吸引了我，我用了一个下午翻译后发布到了贴吧上，收获了很多人的支持。尽管后来因为屏蔽的问题我转战知乎，但我始终将KR海军考据的系列坚持了下来，从海军大国到一些特色小国我都查阅了大量资料，也为这个mod打下了基础。\n\n在KR0.22更新之前，开发因为一些原因多次削减了海军的内容，我一直感到很遗憾，0.22的大改给了我这个动力去做之前我不敢想的事情。虽然写代码是我的老本行，但是美工、文案和汉译英等等我都是从头开始学，一次次试错，一个人陆陆续续弄了大半年，发布了KR和KX两版，才做到现在这个地步，我从中也学到了很多。如今，我们也终于迎来了原版海军重置的发布。\n\n我想借这个机会感谢所有在这个过程中帮助我的朋友和玩家，包括启发我的reddit网友Tragic-tragedy，贴吧上对我的史料斧正的朋友，在知乎上追更的朋友，还有许多订阅海军重置的玩家，没有你们的支持就没有这个mod，谢谢你们！\n\n最后，我还想借此机会感谢我的外公，他曾在中国人民解放军海军服役了几十年，在我的孩提时代启发了我对海军的认识。上世纪七八十年代，我的外公分别在几艘海军科考船上服役，担任过气象专家和部门政委等职务，他的大部分军旅生涯是在向阳红10号船上度过的，这也是当时中国自主设计建造的吨位最大的远洋科考船。1980年，向阳红10号作为新中国历史上最大规模远洋舰队的一员参加了中国第一次洲际弹道导弹发射试验，这就是大家熟知的580任务。我的外公当时负责气象部门，为回收导弹黑匣子的时间窗口提供预报支持。四年后，他随船参加了中国第一次南极科考任务，并在乔治王岛参与了长城站的建设。向阳红10号船之后被改装成了远望4号，在2007年遇到事故损坏，最后成了东风21D的靶子，每每说起来，他还是有些惋惜。我能看出来他对曾经的海军生涯有着复杂的情感，一方面为对国家做出贡献而感到骄傲光荣，而另一方面又为错过了孩子们的成长感到缺憾。不过尽管如此，他从小给我讲述的故事仍然点燃了我对海军的兴趣，为这个mod播下了一颗种子。\n\n随着我现在工作生活越来越忙，不知道海军重置还能维持多久，所以我在此也希望成立一个小团队，用半做半学的方式，把这个mod延续下去。\n\n有兴趣加我qq：1245385638，或海军重置群：162239327" \ No newline at end of file diff --git a/src/localisation/english/replace/research_l_english.yml b/src/localisation/english/replace/research_l_english.yml index 24e1837..ad26040 100755 --- a/src/localisation/english/replace/research_l_english.yml +++ b/src/localisation/english/replace/research_l_english.yml @@ -246,7 +246,7 @@ nuclear_engine_research_desc: "核船舶推进是利用核反应堆提供的热量来推进船舶。这股热能会加热水，从而带动涡轮机产生蒸汽，该涡轮机通过齿轮箱或发电机和电动机将机械能传递给船舶的螺旋桨。" integrated_combat_system: "综合作战系统" integrated_combat_system_desc: "综合作战系统是一个可扩展的网络作战管理系统，其依托于通用软件和多种计算设备，快速将水面舰队的所有单位、人员与指挥控制中枢纳入完全同步和信息共享的统一系统之中。" - memory_expansion: "火控计算机内存扩容" + memory_expansion: "磁芯存储器阵列" memory_expansion_desc: "半导体器件在战后革命性的技术突破使得在现存的计算机上扩充内存成为可能。更大的内存可以极大地加快计算速度，使得火控计算机更有效率也更加精准。" comprehensive_display_system: "综合显示系统" comprehensive_display_system_desc: "综合显示系统是一个集成了舰船指挥、控制和协调的大型系统。系统操作员可以为雷达上的各类目标标注ID，再将它们统一输出到单个的显示设备上。该系统使得操作员可以轻松引导友方战斗机进入未知目标的拦截路线，并且后续版本还可以自动计算最佳拦截点。" @@ -364,8 +364,6 @@ close_in_area_air_defense_desc: "在第二次世界大战期间，海军舰队经常面临着自杀式飞机和无线电制导巡航导弹等低空目标带来的威胁。通过对战时建造的驱逐舰进行修缮和现代化改装，它们将成为抵御这些威胁的最后一道屏障。" wave_resistance_design: "抗波设计" wave_resistance_design_desc: "公海上的巨浪在过去几个世纪以来一直都是船舶面临的最大挑战，对于诸如驱逐舰之类的轻型舰艇尤其是如此。通过使用更加尖锐的船首，船体推开波浪的过程将更有延续性，由于节省了克服整体阻力所需的动能，舰船的适航性被大大提高了。" - symmetric_key_algorithm: "对称密钥加密算法" - symmetric_key_algorithm_desc: "自从通信加密技术发明以来，对称密钥算法就一直是最主流的加密算法之一，这种密钥管理方案使用统一的加密和解密密钥来处理电子数据。对称密钥加密技术在战后得到了一些改进，这包括了随机化且频繁更新的密钥，可以让数据传输的过程更加安全。" luneburg_lens: "龙勃透镜" luneburg_lens_desc: "龙勃透镜是一种内部对称的球体梯度折射率透镜，被广泛地应用于处理从可见光到微波在内的所有电磁辐射。这一技术最早由鲁道夫·龙勃教授提出，在微波天线的生产中有着至关重要的作用。和传统的抛物面天线相比，使用了龙勃透镜的探测天线有着无与伦比的优势，其可以通过在透镜周围移动馈电来操纵而不需要转动天线本身，这在相控阵雷达和预警机的发展中拥有重要的地位。" converted_super_heavy_carrier: "超重型改装航母" @@ -374,4 +372,6 @@ advanced_missile_system: "主动雷达制导导弹" advanced_missile_system_desc: "电子器件在战后的革命性突破使得在导弹上安装体积更小的制导装置成为可能。采用主动雷达制导技术的导弹通常带有一个雷达收发器以及相应所需的电子元器件，可以自主地发现并跟踪目标，这一发明也成为了未来的射后不理技术的雏形。" heavy_armor_research_tt: "§H在重型装甲上的技术进步可以使巡洋舰装甲技术受益。§!" - cruiser_armor_research_tt: "§H在巡洋舰装甲上的技术进步可以使重型装甲技术受益。§!" \ No newline at end of file + cruiser_armor_research_tt: "§H在巡洋舰装甲上的技术进步可以使重型装甲技术受益。§!" + cryptography_revolution: "密码学革命" + cryptography_revolution_desc: "受战后算力突飞猛进的电子计算机推动，密码学取得了在加密算法和通讯技术等多方面的重大突破。工程方面的进步包括了电子加密机、升级的加密算法以及跳频通讯技术，在对军事机密的保护上已经趋于完美。" \ No newline at end of file diff --git a/src/localisation/english/replace/ship_modules_country_specific_l_english.yml b/src/localisation/english/replace/ship_modules_country_specific_l_english.yml index b26caf5..71ec473 100755 --- a/src/localisation/english/replace/ship_modules_country_specific_l_english.yml +++ b/src/localisation/english/replace/ship_modules_country_specific_l_english.yml @@ -1892,4 +1892,58 @@ SOV_ship_secondaries_1_light: "102mm/60 Pattern 1911火炮" SOV_ship_secondaries_2_light: "130mm/50 B13 Ptn 1936, B-13-2 mt火炮" ITA_ship_secondaries_1_light: "102mm/35 Model 1914火炮" - ITA_ship_secondaries_2_light: "120mm/50 安萨尔多 Model 1936火炮" \ No newline at end of file + ITA_ship_secondaries_2_light: "120mm/50 安萨尔多 Model 1936火炮" + USA_dp_light_battery_5: "5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_short: "双联5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_single: "5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_single_short: "单装5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + GER_dp_light_battery_5: "10cm SK L/55火炮" + GER_dp_light_battery_5_short: "双联10cm SK L/55火炮" + GER_dp_light_battery_5_single: "10cm SK L/55火炮" + GER_dp_light_battery_5_single_short: "单装10cm SK L/55火炮" + ENG_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + FRA_dp_light_battery_5: "127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_short: "双联127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_single: "127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_single_short: "单装127mm/54 Model 1948火炮" + JAP_dp_light_battery_5: "九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_short: "双联九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_single: "九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_single_short: "单装九八式改 10cm/65 火炮" + ITA_dp_light_battery_5: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_short: "双联127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_single: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_single_short: "单装127mm/54 奥托-梅莱拉火炮" + SOV_dp_light_battery_5: "76mm/59 AK-726火炮" + SOV_dp_light_battery_5_short: "双联76mm/59 AK-726火炮" + SOV_dp_light_battery_5_single: "76mm/59 AK-726火炮" + SOV_dp_light_battery_5_single_short: "单装76mm/59 AK-726火炮" + USA_dp_ship_secondaries_5: "5英寸/54 Mk 18火炮（代培Mk42型炮塔）" + USA_dp_ship_secondaries_5_bb: "5英寸/54 Mk 18火炮（代培Mk42型炮塔）" + GER_dp_ship_secondaries_5: "10cm SK L/55火炮" + GER_dp_ship_secondaries_5_bb: "10cm SK L/55火炮" + ENG_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + ENG_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + AST_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + AST_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + CAN_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + CAN_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + FRA_dp_ship_secondaries_5: "127mm/54 Model 1948火炮" + FRA_dp_ship_secondaries_5_bb: "127mm/54 Model 1948火炮" + JAP_dp_ship_secondaries_5: "九八式改 10cm/65 火炮" + JAP_dp_ship_secondaries_5_bb: "九八式改 10cm/65 火炮" + ITA_dp_ship_secondaries_5: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_ship_secondaries_5_bb: "127mm/54 奥托-梅莱拉火炮" + SOV_dp_ship_secondaries_5: "76mm/59 AK-726火炮" + SOV_dp_ship_secondaries_5_bb: "76mm/59 AK-726火炮" \ 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 926c2e8..0091478 100755 --- a/src/localisation/english/replace/ship_modules_l_english.yml +++ b/src/localisation/english/replace/ship_modules_l_english.yml @@ -1169,4 +1169,14 @@ EQ_MOD_CAT_cv_role_TITLE: "航母角色" EQ_MOD_CAT_ship_carrier_armor_shbb_TITLE: "航母超重型装甲带" carrier_helipad_asw_short: "反潜直升机" - carrier_helipad_aew_short: "预警直升机" \ No newline at end of file + carrier_helipad_aew_short: "预警直升机" + dp_ship_secondaries_5: "127mm自动化高平两用速射副炮" + dp_ship_secondaries_5_short: "高平两用副炮5" + dp_ship_secondaries_5_desc: "这种火炮已经被集成到舰船的火控和防空系统之中。" + dp_ship_secondaries_5_bb: "127mm自动化高平两用速射副炮" + dp_ship_secondaries_5_bb_short: "高平两用副炮5" + dp_ship_secondaries_5_bb_desc: "这种火炮已经被集成到舰船的火控和防空系统之中。" + ship_asw_battery_1: "76mm火炮（搭配RAT发射器）" + ship_asw_battery_1_short: "76mm火炮（搭配RAT发射器）" + ship_asw_battery_1_desc: "一座安装在可旋转炮塔上的小口径火炮，在其两侧装有火箭助推鱼雷发射器。" + EQ_MOD_SLOT_fixed_ship_extra_electronics_slot_TITLE: "电子设备槽位" \ 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 6624803..1a000ad 100755 --- a/src/localisation/replace/navy_rework_welcome_l_english.yml +++ b/src/localisation/replace/navy_rework_welcome_l_english.yml @@ -4,7 +4,7 @@ navy_rework_welcome_splash_tab_3: "额外信息" navy_rework_welcome_splash_tab_4: "致谢" navy_rework_options_button_text: "继续" - navy_rework_welcome_splash_tab_1_content: "§Hv2.1 “珊瑚海”§!\n\n§C重要新增：§!\n\n-新模块：冷战战列舰改装，冷战航母改装\n-新角色：舰队航母，轻型航母\n-重做海军将领技能和特质的效果\n-为开局大国的海军生产队列添加MIO\n-增加一条规则允许AI使用更强的舰载机设计模板（默认为关）\n\n§C更新：§!\n\n-重做全部轻型和重型引擎图标\n-为一些无法灵活更改的舰船角色增加了高额的拆除成本，从而使改装它们的性价比极低\n-为无法灵活更改的舰船角色添加了小贴士\n-更新开局的轻型航母设计\n-法国的暴风雪级现在被归类为战后船体\n-为法国添加大胆级驱逐舰的设计\n-轻型航母可以使用巡洋舰引擎\n-1944航母无法再被改装为超级航母，但可以使用冷战改装模块\n-降低所有巡洋舰和全导弹布局的可靠性\n-加强潜艇的撤退速度和隐蔽性\n-舰队堆叠的最高阵位惩罚上调到100%\n-装甲舰的初始装甲下调到5\n-装甲舰科技现在需要战后重型船体作为前提\n-超级航母现在默认使用装甲飞行甲板\n-超级航母的装甲带现在可以正常由4级重型航母装甲带升级而来\n-削弱第二舰岛的效果\n-平衡所有重中型火炮的效果\n\n§C修复：§!\n\n-修复过热器和额外装甲模块没有UI中种类图标的问题\n-修复教程中的一些错误信息\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv2.2 “决战中途岛”§!\n\n§C重要新增：§!\n\n-重做所有模块图标上的罗马数字，和原版风格一致\n-增加一个舰队collection的彩蛋\n-新模块：带RAT发射器的轻型火炮，5级高平副炮\n-新立绘：中途岛（SCB-110改装），鹦鹉螺（SSN-571），IX型U艇，XB型U艇，611型潜艇，658型潜艇\n-在设计器中为航母添加斜角甲板的俯视图\n\n§C更新：§!\n\n-巡洋舰和驱逐舰现在有三个电子设备槽位，可以同时安装雷达、声呐和火控\n-重新平衡鱼雷模块的数值\n-冷战鱼雷现在可以进行反潜\n-加强柴油引擎对可靠性和航程的增益\n-民用引擎的航程更远\n-后期的轻中型火炮会有更高的速度和可靠性惩罚\n-开局拥有战后重型船体的国家默认拥有重油锅炉科技\n-由于AI难以管理舰载CAS，因此暂时移除相关的模板\n-1940年及之后的航母可以额外安装一个杂项模块\n-加强预警机的效果\n-降低主力舰的补给消耗\n-为冷战时期的高平火炮添加一些独特的国别名称\n-更新AI的战列舰模板\n-重做诱饵发射器的图标\n-重做4级声呐的图标\n-对称密钥加密算法现在改名为密码学革命，并且可以减低泄露的陆军和空军情报\n-火控计算机内存扩容现在改名为磁芯存储器阵列\n-重做辅助降落系统和磁芯存储器阵列地科技图标\n-3级和4级的战巡装甲对速度有更高的惩罚\n-削弱俯冲轰炸机研究的效果\n-消声瓦模块会消耗1点橡胶\n-结构化铝合金材料现在不能和巡洋舰装甲共存\n\n§C修复：§!\n\n-修复航母重型装甲无法正常升级的问题\n-修复设计器俯视图中，巡洋舰的副炮不会显示的问题\n-修复小型机库在俯视图上不显示的问题\n-修复双联改进型超重主炮的可靠性损失较高的问题\n-修复中途补给原型迭代环节中部分文本缺失的问题\n-优化一部分科技的描述\n\n感谢你的游玩！" navy_rework_welcome_splash_tab_2_content: "§H这里包含了你想知道的关于海军重置的一切。§!\n\n§C设计器-§!\n£white_dot 在设计§Y驱逐舰§!、§Y巡洋舰§!或§Y战列舰§!的时候，§Y主炮§!是和历史唯一的一一对应的装备。由于它们的火力和穿甲据此做了平衡，§R请确保它们的数量和现实中接近§!。诸如§Y副炮§!和§Y鱼雷§!等装备则与原版没有区别。\n£white_dot 一些在原版受限的装备在本模组中是开放的，比如你可以建造超重炮战列舰，轻炮重巡，无甲巡洋舰等等。\n£white_dot 舰船角色在驱逐舰和巡洋舰上是必须的，它们可以提供不同的增益并解锁特殊的部件。\n£white_dot 巡洋舰的主力屏卫之分不由主炮口径为标准。所有巡洋舰（除装甲舰外）都初始默认为屏卫舰，且需要特殊的角色才能让它们成为主力舰。\n£white_dot §Y导弹§!可以安装在晚期的重型或巡洋舰船体上，不过后者需要专门的导弹巡洋舰角色来安装。\n£white_dot 此模组中实现最大屏卫效率的屏卫/主力比例为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%，但优势的水面探测数值可以带来最多20%的阵位奖励。\n£white_dot 水上飞机弹射器、航母和声呐在反潜战中的表现都更加有用和强力，而§Y潜艇§!基础的§Y可见度§!相较原版被§R增加§!了，在面对有良好反潜能力的舰队时，潜艇不再拥有优势。\n£white_dot AI的设计模板是刻意默认设置为§Y史实向§!的。尽管这些模板比原版要强一些，但是过去的最优设计仍然是有效的。\n\n§C其他-§!\n£white_dot 玩家和AI都享有§G-15%§!海军燃料消耗减免。\n£white_dot 单个船厂的产出已被提高到§G160%§!，一般在没有加成的情况下，建造一艘满配战列舰的时间在1-2年之间。\n£white_dot AI控制的主要国家会分别在1940年，1943年，1945年和冷战时期（如果没有投降的话）获得一批海军科技和独特的舰船设计。\n£white_dot AI会根据历史上的学说选择和战争情况选择不同的海军建造策略（包括舰载机）。例如，原版的§g德国§!会更加专注于潜艇，而§B美国§!则会重视航母。" navy_rework_welcome_splash_tab_3_content: "§H这里罗列关于海军重置的其他信息。§!\n\n§C兼容性-§!\n£white_dot 除非有§Y兼容包§!，本模组与修改科技树的模组不兼容，已有的兼容包链接都会在创意工坊界面列出。\n£white_dot §R所有生成舰船设计的国策/事件/决议都会失效，这是为了兼容性的考量和必要牺牲。§!\n\n§C二次创作-§!\n£white_dot 除了56之路外，不会再有其他的官方兼容包发布，希望社区可以更多地参与此事。目前日共重置与日本史实国策重做已完全兼容本模组。\n£white_dot 所有人都可以随意利用本模组的资源（代码/图标/文本），但在使用中请标明出处并通知我。感谢你的理解。" navy_rework_welcome_splash_tab_4_content: "大家好，海军重置已经走过了艰难的开发阶段，如今史实设计器、初始海军编制和设计、图标和科技树都已经基本完成，整个大框架完成后，剩余的工作便是进一步丰富和扩充，而这相比之前的开拓等等都要简单一些。借此机会我想和大家讲讲这个mod的过去和未来。\n\n我是2016年入的钢4坑，在加里波第的噩梦版本，也就是0.6时期接触到的KR，当时就被它详实有趣的世界观所吸引，之后几年KR一直是我玩的最多的mod之一。KR在0.8发布了海军重做，也是我最喜欢最兴奋的一个版本，由此我开始对海军感兴趣，也越发经常地想象KR世界观中的海军和军舰会是什么样子的。\n\n2021年春节前夕的一个周五下午，我在办公室摸鱼逛reddit，看到了一位外国网友写的对KR中加拿大和日本海军的战舰原型考证，这篇文章深深吸引了我，我用了一个下午翻译后发布到了贴吧上，收获了很多人的支持。尽管后来因为屏蔽的问题我转战知乎，但我始终将KR海军考据的系列坚持了下来，从海军大国到一些特色小国我都查阅了大量资料，也为这个mod打下了基础。\n\n在KR0.22更新之前，开发因为一些原因多次削减了海军的内容，我一直感到很遗憾，0.22的大改给了我这个动力去做之前我不敢想的事情。虽然写代码是我的老本行，但是美工、文案和汉译英等等我都是从头开始学，一次次试错，一个人陆陆续续弄了大半年，发布了KR和KX两版，才做到现在这个地步，我从中也学到了很多。如今，我们也终于迎来了原版海军重置的发布。\n\n我想借这个机会感谢所有在这个过程中帮助我的朋友和玩家，包括启发我的reddit网友Tragic-tragedy，贴吧上对我的史料斧正的朋友，在知乎上追更的朋友，还有许多订阅海军重置的玩家，没有你们的支持就没有这个mod，谢谢你们！\n\n最后，我还想借此机会感谢我的外公，他曾在中国人民解放军海军服役了几十年，在我的孩提时代启发了我对海军的认识。上世纪七八十年代，我的外公分别在几艘海军科考船上服役，担任过气象专家和部门政委等职务，他的大部分军旅生涯是在向阳红10号船上度过的，这也是当时中国自主设计建造的吨位最大的远洋科考船。1980年，向阳红10号作为新中国历史上最大规模远洋舰队的一员参加了中国第一次洲际弹道导弹发射试验，这就是大家熟知的580任务。我的外公当时负责气象部门，为回收导弹黑匣子的时间窗口提供预报支持。四年后，他随船参加了中国第一次南极科考任务，并在乔治王岛参与了长城站的建设。向阳红10号船之后被改装成了远望4号，在2007年遇到事故损坏，最后成了东风21D的靶子，每每说起来，他还是有些惋惜。我能看出来他对曾经的海军生涯有着复杂的情感，一方面为对国家做出贡献而感到骄傲光荣，而另一方面又为错过了孩子们的成长感到缺憾。不过尽管如此，他从小给我讲述的故事仍然点燃了我对海军的兴趣，为这个mod播下了一颗种子。\n\n随着我现在工作生活越来越忙，不知道海军重置还能维持多久，所以我在此也希望成立一个小团队，用半做半学的方式，把这个mod延续下去。\n\n有兴趣加我qq：1245385638，或海军重置群：162239327" \ No newline at end of file diff --git a/src/localisation/replace/research_l_english.yml b/src/localisation/replace/research_l_english.yml index 24e1837..ad26040 100755 --- a/src/localisation/replace/research_l_english.yml +++ b/src/localisation/replace/research_l_english.yml @@ -246,7 +246,7 @@ nuclear_engine_research_desc: "核船舶推进是利用核反应堆提供的热量来推进船舶。这股热能会加热水，从而带动涡轮机产生蒸汽，该涡轮机通过齿轮箱或发电机和电动机将机械能传递给船舶的螺旋桨。" integrated_combat_system: "综合作战系统" integrated_combat_system_desc: "综合作战系统是一个可扩展的网络作战管理系统，其依托于通用软件和多种计算设备，快速将水面舰队的所有单位、人员与指挥控制中枢纳入完全同步和信息共享的统一系统之中。" - memory_expansion: "火控计算机内存扩容" + memory_expansion: "磁芯存储器阵列" memory_expansion_desc: "半导体器件在战后革命性的技术突破使得在现存的计算机上扩充内存成为可能。更大的内存可以极大地加快计算速度，使得火控计算机更有效率也更加精准。" comprehensive_display_system: "综合显示系统" comprehensive_display_system_desc: "综合显示系统是一个集成了舰船指挥、控制和协调的大型系统。系统操作员可以为雷达上的各类目标标注ID，再将它们统一输出到单个的显示设备上。该系统使得操作员可以轻松引导友方战斗机进入未知目标的拦截路线，并且后续版本还可以自动计算最佳拦截点。" @@ -364,8 +364,6 @@ close_in_area_air_defense_desc: "在第二次世界大战期间，海军舰队经常面临着自杀式飞机和无线电制导巡航导弹等低空目标带来的威胁。通过对战时建造的驱逐舰进行修缮和现代化改装，它们将成为抵御这些威胁的最后一道屏障。" wave_resistance_design: "抗波设计" wave_resistance_design_desc: "公海上的巨浪在过去几个世纪以来一直都是船舶面临的最大挑战，对于诸如驱逐舰之类的轻型舰艇尤其是如此。通过使用更加尖锐的船首，船体推开波浪的过程将更有延续性，由于节省了克服整体阻力所需的动能，舰船的适航性被大大提高了。" - symmetric_key_algorithm: "对称密钥加密算法" - symmetric_key_algorithm_desc: "自从通信加密技术发明以来，对称密钥算法就一直是最主流的加密算法之一，这种密钥管理方案使用统一的加密和解密密钥来处理电子数据。对称密钥加密技术在战后得到了一些改进，这包括了随机化且频繁更新的密钥，可以让数据传输的过程更加安全。" luneburg_lens: "龙勃透镜" luneburg_lens_desc: "龙勃透镜是一种内部对称的球体梯度折射率透镜，被广泛地应用于处理从可见光到微波在内的所有电磁辐射。这一技术最早由鲁道夫·龙勃教授提出，在微波天线的生产中有着至关重要的作用。和传统的抛物面天线相比，使用了龙勃透镜的探测天线有着无与伦比的优势，其可以通过在透镜周围移动馈电来操纵而不需要转动天线本身，这在相控阵雷达和预警机的发展中拥有重要的地位。" converted_super_heavy_carrier: "超重型改装航母" @@ -374,4 +372,6 @@ advanced_missile_system: "主动雷达制导导弹" advanced_missile_system_desc: "电子器件在战后的革命性突破使得在导弹上安装体积更小的制导装置成为可能。采用主动雷达制导技术的导弹通常带有一个雷达收发器以及相应所需的电子元器件，可以自主地发现并跟踪目标，这一发明也成为了未来的射后不理技术的雏形。" heavy_armor_research_tt: "§H在重型装甲上的技术进步可以使巡洋舰装甲技术受益。§!" - cruiser_armor_research_tt: "§H在巡洋舰装甲上的技术进步可以使重型装甲技术受益。§!" \ No newline at end of file + cruiser_armor_research_tt: "§H在巡洋舰装甲上的技术进步可以使重型装甲技术受益。§!" + cryptography_revolution: "密码学革命" + cryptography_revolution_desc: "受战后算力突飞猛进的电子计算机推动，密码学取得了在加密算法和通讯技术等多方面的重大突破。工程方面的进步包括了电子加密机、升级的加密算法以及跳频通讯技术，在对军事机密的保护上已经趋于完美。" \ No newline at end of file diff --git a/src/localisation/replace/ship_modules_country_specific_l_english.yml b/src/localisation/replace/ship_modules_country_specific_l_english.yml index b26caf5..71ec473 100755 --- a/src/localisation/replace/ship_modules_country_specific_l_english.yml +++ b/src/localisation/replace/ship_modules_country_specific_l_english.yml @@ -1892,4 +1892,58 @@ SOV_ship_secondaries_1_light: "102mm/60 Pattern 1911火炮" SOV_ship_secondaries_2_light: "130mm/50 B13 Ptn 1936, B-13-2 mt火炮" ITA_ship_secondaries_1_light: "102mm/35 Model 1914火炮" - ITA_ship_secondaries_2_light: "120mm/50 安萨尔多 Model 1936火炮" \ No newline at end of file + ITA_ship_secondaries_2_light: "120mm/50 安萨尔多 Model 1936火炮" + USA_dp_light_battery_5: "5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_short: "双联5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_single: "5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_single_short: "单装5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + GER_dp_light_battery_5: "10cm SK L/55火炮" + GER_dp_light_battery_5_short: "双联10cm SK L/55火炮" + GER_dp_light_battery_5_single: "10cm SK L/55火炮" + GER_dp_light_battery_5_single_short: "单装10cm SK L/55火炮" + ENG_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + FRA_dp_light_battery_5: "127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_short: "双联127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_single: "127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_single_short: "单装127mm/54 Model 1948火炮" + JAP_dp_light_battery_5: "九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_short: "双联九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_single: "九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_single_short: "单装九八式改 10cm/65 火炮" + ITA_dp_light_battery_5: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_short: "双联127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_single: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_single_short: "单装127mm/54 奥托-梅莱拉火炮" + SOV_dp_light_battery_5: "76mm/59 AK-726火炮" + SOV_dp_light_battery_5_short: "双联76mm/59 AK-726火炮" + SOV_dp_light_battery_5_single: "76mm/59 AK-726火炮" + SOV_dp_light_battery_5_single_short: "单装76mm/59 AK-726火炮" + USA_dp_ship_secondaries_5: "5英寸/54 Mk 18火炮（代培Mk42型炮塔）" + USA_dp_ship_secondaries_5_bb: "5英寸/54 Mk 18火炮（代培Mk42型炮塔）" + GER_dp_ship_secondaries_5: "10cm SK L/55火炮" + GER_dp_ship_secondaries_5_bb: "10cm SK L/55火炮" + ENG_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + ENG_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + AST_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + AST_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + CAN_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + CAN_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + FRA_dp_ship_secondaries_5: "127mm/54 Model 1948火炮" + FRA_dp_ship_secondaries_5_bb: "127mm/54 Model 1948火炮" + JAP_dp_ship_secondaries_5: "九八式改 10cm/65 火炮" + JAP_dp_ship_secondaries_5_bb: "九八式改 10cm/65 火炮" + ITA_dp_ship_secondaries_5: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_ship_secondaries_5_bb: "127mm/54 奥托-梅莱拉火炮" + SOV_dp_ship_secondaries_5: "76mm/59 AK-726火炮" + SOV_dp_ship_secondaries_5_bb: "76mm/59 AK-726火炮" \ 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 926c2e8..0091478 100755 --- a/src/localisation/replace/ship_modules_l_english.yml +++ b/src/localisation/replace/ship_modules_l_english.yml @@ -1169,4 +1169,14 @@ EQ_MOD_CAT_cv_role_TITLE: "航母角色" EQ_MOD_CAT_ship_carrier_armor_shbb_TITLE: "航母超重型装甲带" carrier_helipad_asw_short: "反潜直升机" - carrier_helipad_aew_short: "预警直升机" \ No newline at end of file + carrier_helipad_aew_short: "预警直升机" + dp_ship_secondaries_5: "127mm自动化高平两用速射副炮" + dp_ship_secondaries_5_short: "高平两用副炮5" + dp_ship_secondaries_5_desc: "这种火炮已经被集成到舰船的火控和防空系统之中。" + dp_ship_secondaries_5_bb: "127mm自动化高平两用速射副炮" + dp_ship_secondaries_5_bb_short: "高平两用副炮5" + dp_ship_secondaries_5_bb_desc: "这种火炮已经被集成到舰船的火控和防空系统之中。" + ship_asw_battery_1: "76mm火炮（搭配RAT发射器）" + ship_asw_battery_1_short: "76mm火炮（搭配RAT发射器）" + ship_asw_battery_1_desc: "一座安装在可旋转炮塔上的小口径火炮，在其两侧装有火箭助推鱼雷发射器。" + EQ_MOD_SLOT_fixed_ship_extra_electronics_slot_TITLE: "电子设备槽位" \ 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 9625121..de93bbb 100755 --- a/src/localisation/simp_chinese/replace/navy_rework_welcome_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/navy_rework_welcome_l_simp_chinese.yml @@ -4,7 +4,7 @@ navy_rework_welcome_splash_tab_3: "额外信息" navy_rework_welcome_splash_tab_4: "致谢" navy_rework_options_button_text: "继续" - navy_rework_welcome_splash_tab_1_content: "§Hv2.1 “珊瑚海”§!\n\n§C重要新增：§!\n\n-新模块：冷战战列舰改装，冷战航母改装\n-新角色：舰队航母，轻型航母\n-重做海军将领技能和特质的效果\n-为开局大国的海军生产队列添加MIO\n-增加一条规则允许AI使用更强的舰载机设计模板（默认为关）\n\n§C更新：§!\n\n-重做全部轻型和重型引擎图标\n-为一些无法灵活更改的舰船角色增加了高额的拆除成本，从而使改装它们的性价比极低\n-为无法灵活更改的舰船角色添加了小贴士\n-更新开局的轻型航母设计\n-法国的暴风雪级现在被归类为战后船体\n-为法国添加大胆级驱逐舰的设计\n-轻型航母可以使用巡洋舰引擎\n-1944航母无法再被改装为超级航母，但可以使用冷战改装模块\n-降低所有巡洋舰和全导弹布局的可靠性\n-加强潜艇的撤退速度和隐蔽性\n-舰队堆叠的最高阵位惩罚上调到100%\n-装甲舰的初始装甲下调到5\n-装甲舰科技现在需要战后重型船体作为前提\n-超级航母现在默认使用装甲飞行甲板\n-超级航母的装甲带现在可以正常由4级重型航母装甲带升级而来\n-削弱第二舰岛的效果\n-平衡所有重中型火炮的效果\n\n§C修复：§!\n\n-修复过热器和额外装甲模块没有UI中种类图标的问题\n-修复教程中的一些错误信息\n\n感谢你的游玩！" + navy_rework_welcome_splash_tab_1_content: "§Hv2.2 “决战中途岛”§!\n\n§C重要新增：§!\n\n-重做所有模块图标上的罗马数字，和原版风格一致\n-增加一个舰队collection的彩蛋\n-新模块：带RAT发射器的轻型火炮，5级高平副炮\n-新立绘：中途岛（SCB-110改装），鹦鹉螺（SSN-571），IX型U艇，XB型U艇，611型潜艇，658型潜艇\n-在设计器中为航母添加斜角甲板的俯视图\n\n§C更新：§!\n\n-巡洋舰和驱逐舰现在有三个电子设备槽位，可以同时安装雷达、声呐和火控\n-重新平衡鱼雷模块的数值\n-冷战鱼雷现在可以进行反潜\n-加强柴油引擎对可靠性和航程的增益\n-民用引擎的航程更远\n-后期的轻中型火炮会有更高的速度和可靠性惩罚\n-开局拥有战后重型船体的国家默认拥有重油锅炉科技\n-由于AI难以管理舰载CAS，因此暂时移除相关的模板\n-1940年及之后的航母可以额外安装一个杂项模块\n-加强预警机的效果\n-降低主力舰的补给消耗\n-为冷战时期的高平火炮添加一些独特的国别名称\n-更新AI的战列舰模板\n-重做诱饵发射器的图标\n-重做4级声呐的图标\n-对称密钥加密算法现在改名为密码学革命，并且可以减低泄露的陆军和空军情报\n-火控计算机内存扩容现在改名为磁芯存储器阵列\n-重做辅助降落系统和磁芯存储器阵列地科技图标\n-3级和4级的战巡装甲对速度有更高的惩罚\n-削弱俯冲轰炸机研究的效果\n-消声瓦模块会消耗1点橡胶\n-结构化铝合金材料现在不能和巡洋舰装甲共存\n\n§C修复：§!\n\n-修复航母重型装甲无法正常升级的问题\n-修复设计器俯视图中，巡洋舰的副炮不会显示的问题\n-修复小型机库在俯视图上不显示的问题\n-修复双联改进型超重主炮的可靠性损失较高的问题\n-修复中途补给原型迭代环节中部分文本缺失的问题\n-优化一部分科技的描述\n\n感谢你的游玩！" navy_rework_welcome_splash_tab_2_content: "§H这里包含了你想知道的关于海军重置的一切。§!\n\n§C设计器-§!\n£white_dot 在设计§Y驱逐舰§!、§Y巡洋舰§!或§Y战列舰§!的时候，§Y主炮§!是和历史唯一的一一对应的装备。由于它们的火力和穿甲据此做了平衡，§R请确保它们的数量和现实中接近§!。诸如§Y副炮§!和§Y鱼雷§!等装备则与原版没有区别。\n£white_dot 一些在原版受限的装备在本模组中是开放的，比如你可以建造超重炮战列舰，轻炮重巡，无甲巡洋舰等等。\n£white_dot 舰船角色在驱逐舰和巡洋舰上是必须的，它们可以提供不同的增益并解锁特殊的部件。\n£white_dot 巡洋舰的主力屏卫之分不由主炮口径为标准。所有巡洋舰（除装甲舰外）都初始默认为屏卫舰，且需要特殊的角色才能让它们成为主力舰。\n£white_dot §Y导弹§!可以安装在晚期的重型或巡洋舰船体上，不过后者需要专门的导弹巡洋舰角色来安装。\n£white_dot 此模组中实现最大屏卫效率的屏卫/主力比例为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%，但优势的水面探测数值可以带来最多20%的阵位奖励。\n£white_dot 水上飞机弹射器、航母和声呐在反潜战中的表现都更加有用和强力，而§Y潜艇§!基础的§Y可见度§!相较原版被§R增加§!了，在面对有良好反潜能力的舰队时，潜艇不再拥有优势。\n£white_dot AI的设计模板是刻意默认设置为§Y史实向§!的。尽管这些模板比原版要强一些，但是过去的最优设计仍然是有效的。\n\n§C其他-§!\n£white_dot 玩家和AI都享有§G-15%§!海军燃料消耗减免。\n£white_dot 单个船厂的产出已被提高到§G160%§!，一般在没有加成的情况下，建造一艘满配战列舰的时间在1-2年之间。\n£white_dot AI控制的主要国家会分别在1940年，1943年，1945年和冷战时期（如果没有投降的话）获得一批海军科技和独特的舰船设计。\n£white_dot AI会根据历史上的学说选择和战争情况选择不同的海军建造策略（包括舰载机）。例如，原版的§g德国§!会更加专注于潜艇，而§B美国§!则会重视航母。" navy_rework_welcome_splash_tab_3_content: "§H这里罗列关于海军重置的其他信息。§!\n\n§C兼容性-§!\n£white_dot 除非有§Y兼容包§!，本模组与修改科技树的模组不兼容，已有的兼容包链接都会在创意工坊界面列出。\n£white_dot §R所有生成舰船设计的国策/事件/决议都会失效，这是为了兼容性的考量和必要牺牲。§!\n\n§C二次创作-§!\n£white_dot 除了56之路外，不会再有其他的官方兼容包发布，希望社区可以更多地参与此事。目前日共重置与日本史实国策重做已完全兼容本模组。\n£white_dot 所有人都可以随意利用本模组的资源（代码/图标/文本），但在使用中请标明出处并通知我。感谢你的理解。" navy_rework_welcome_splash_tab_4_content: "大家好，海军重置已经走过了艰难的开发阶段，如今史实设计器、初始海军编制和设计、图标和科技树都已经基本完成，整个大框架完成后，剩余的工作便是进一步丰富和扩充，而这相比之前的开拓等等都要简单一些。借此机会我想和大家讲讲这个mod的过去和未来。\n\n我是2016年入的钢4坑，在加里波第的噩梦版本，也就是0.6时期接触到的KR，当时就被它详实有趣的世界观所吸引，之后几年KR一直是我玩的最多的mod之一。KR在0.8发布了海军重做，也是我最喜欢最兴奋的一个版本，由此我开始对海军感兴趣，也越发经常地想象KR世界观中的海军和军舰会是什么样子的。\n\n2021年春节前夕的一个周五下午，我在办公室摸鱼逛reddit，看到了一位外国网友写的对KR中加拿大和日本海军的战舰原型考证，这篇文章深深吸引了我，我用了一个下午翻译后发布到了贴吧上，收获了很多人的支持。尽管后来因为屏蔽的问题我转战知乎，但我始终将KR海军考据的系列坚持了下来，从海军大国到一些特色小国我都查阅了大量资料，也为这个mod打下了基础。\n\n在KR0.22更新之前，开发因为一些原因多次削减了海军的内容，我一直感到很遗憾，0.22的大改给了我这个动力去做之前我不敢想的事情。虽然写代码是我的老本行，但是美工、文案和汉译英等等我都是从头开始学，一次次试错，一个人陆陆续续弄了大半年，发布了KR和KX两版，才做到现在这个地步，我从中也学到了很多。如今，我们也终于迎来了原版海军重置的发布。\n\n我想借这个机会感谢所有在这个过程中帮助我的朋友和玩家，包括启发我的reddit网友Tragic-tragedy，贴吧上对我的史料斧正的朋友，在知乎上追更的朋友，还有许多订阅海军重置的玩家，没有你们的支持就没有这个mod，谢谢你们！\n\n最后，我还想借此机会感谢我的外公，他曾在中国人民解放军海军服役了几十年，在我的孩提时代启发了我对海军的认识。上世纪七八十年代，我的外公分别在几艘海军科考船上服役，担任过气象专家和部门政委等职务，他的大部分军旅生涯是在向阳红10号船上度过的，这也是当时中国自主设计建造的吨位最大的远洋科考船。1980年，向阳红10号作为新中国历史上最大规模远洋舰队的一员参加了中国第一次洲际弹道导弹发射试验，这就是大家熟知的580任务。我的外公当时负责气象部门，为回收导弹黑匣子的时间窗口提供预报支持。四年后，他随船参加了中国第一次南极科考任务，并在乔治王岛参与了长城站的建设。向阳红10号船之后被改装成了远望4号，在2007年遇到事故损坏，最后成了东风21D的靶子，每每说起来，他还是有些惋惜。我能看出来他对曾经的海军生涯有着复杂的情感，一方面为对国家做出贡献而感到骄傲光荣，而另一方面又为错过了孩子们的成长感到缺憾。不过尽管如此，他从小给我讲述的故事仍然点燃了我对海军的兴趣，为这个mod播下了一颗种子。\n\n随着我现在工作生活越来越忙，不知道海军重置还能维持多久，所以我在此也希望成立一个小团队，用半做半学的方式，把这个mod延续下去。\n\n有兴趣加我qq：1245385638，或海军重置群：162239327" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml index 54abf92..cbb9b6f 100755 --- a/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/research_l_simp_chinese.yml @@ -246,7 +246,7 @@ nuclear_engine_research_desc: "核船舶推进是利用核反应堆提供的热量来推进船舶。这股热能会加热水，从而带动涡轮机产生蒸汽，该涡轮机通过齿轮箱或发电机和电动机将机械能传递给船舶的螺旋桨。" integrated_combat_system: "综合作战系统" integrated_combat_system_desc: "综合作战系统是一个可扩展的网络作战管理系统，其依托于通用软件和多种计算设备，快速将水面舰队的所有单位、人员与指挥控制中枢纳入完全同步和信息共享的统一系统之中。" - memory_expansion: "火控计算机内存扩容" + memory_expansion: "磁芯存储器阵列" memory_expansion_desc: "半导体器件在战后革命性的技术突破使得在现存的计算机上扩充内存成为可能。更大的内存可以极大地加快计算速度，使得火控计算机更有效率也更加精准。" comprehensive_display_system: "综合显示系统" comprehensive_display_system_desc: "综合显示系统是一个集成了舰船指挥、控制和协调的大型系统。系统操作员可以为雷达上的各类目标标注ID，再将它们统一输出到单个的显示设备上。该系统使得操作员可以轻松引导友方战斗机进入未知目标的拦截路线，并且后续版本还可以自动计算最佳拦截点。" @@ -364,8 +364,6 @@ close_in_area_air_defense_desc: "在第二次世界大战期间，海军舰队经常面临着自杀式飞机和无线电制导巡航导弹等低空目标带来的威胁。通过对战时建造的驱逐舰进行修缮和现代化改装，它们将成为抵御这些威胁的最后一道屏障。" wave_resistance_design: "抗波设计" wave_resistance_design_desc: "公海上的巨浪在过去几个世纪以来一直都是船舶面临的最大挑战，对于诸如驱逐舰之类的轻型舰艇尤其是如此。通过使用更加尖锐的船首，船体推开波浪的过程将更有延续性，由于节省了克服整体阻力所需的动能，舰船的适航性被大大提高了。" - symmetric_key_algorithm: "对称密钥加密算法" - symmetric_key_algorithm_desc: "自从通信加密技术发明以来，对称密钥算法就一直是最主流的加密算法之一，这种密钥管理方案使用统一的加密和解密密钥来处理电子数据。对称密钥加密技术在战后得到了一些改进，这包括了随机化且频繁更新的密钥，可以让数据传输的过程更加安全。" luneburg_lens: "龙勃透镜" luneburg_lens_desc: "龙勃透镜是一种内部对称的球体梯度折射率透镜，被广泛地应用于处理从可见光到微波在内的所有电磁辐射。这一技术最早由鲁道夫·龙勃教授提出，在微波天线的生产中有着至关重要的作用。和传统的抛物面天线相比，使用了龙勃透镜的探测天线有着无与伦比的优势，其可以通过在透镜周围移动馈电来操纵而不需要转动天线本身，这在相控阵雷达和预警机的发展中拥有重要的地位。" converted_super_heavy_carrier: "超重型改装航母" @@ -374,4 +372,6 @@ advanced_missile_system: "主动雷达制导导弹" advanced_missile_system_desc: "电子器件在战后的革命性突破使得在导弹上安装体积更小的制导装置成为可能。采用主动雷达制导技术的导弹通常带有一个雷达收发器以及相应所需的电子元器件，可以自主地发现并跟踪目标，这一发明也成为了未来的射后不理技术的雏形。" heavy_armor_research_tt: "§H在重型装甲上的技术进步可以使巡洋舰装甲技术受益。§!" - cruiser_armor_research_tt: "§H在巡洋舰装甲上的技术进步可以使重型装甲技术受益。§!" \ No newline at end of file + cruiser_armor_research_tt: "§H在巡洋舰装甲上的技术进步可以使重型装甲技术受益。§!" + cryptography_revolution: "密码学革命" + cryptography_revolution_desc: "受战后算力突飞猛进的电子计算机推动，密码学取得了在加密算法和通讯技术等多方面的重大突破。工程方面的进步包括了电子加密机、升级的加密算法以及跳频通讯技术，在对军事机密的保护上已经趋于完美。" \ No newline at end of file diff --git a/src/localisation/simp_chinese/replace/ship_modules_country_specific_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/ship_modules_country_specific_l_simp_chinese.yml index 46ca1f6..76e0b53 100755 --- a/src/localisation/simp_chinese/replace/ship_modules_country_specific_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/ship_modules_country_specific_l_simp_chinese.yml @@ -1892,4 +1892,58 @@ SOV_ship_secondaries_1_light: "102mm/60 Pattern 1911火炮" SOV_ship_secondaries_2_light: "130mm/50 B13 Ptn 1936, B-13-2 mt火炮" ITA_ship_secondaries_1_light: "102mm/35 Model 1914火炮" - ITA_ship_secondaries_2_light: "120mm/50 安萨尔多 Model 1936火炮" \ No newline at end of file + ITA_ship_secondaries_2_light: "120mm/50 安萨尔多 Model 1936火炮" + USA_dp_light_battery_5: "5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_short: "双联5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_single: "5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + USA_dp_light_battery_5_single_short: "单装5英寸/54 Mk 16火炮（代培Mk42型炮塔）" + GER_dp_light_battery_5: "10cm SK L/55火炮" + GER_dp_light_battery_5_short: "双联10cm SK L/55火炮" + GER_dp_light_battery_5_single: "10cm SK L/55火炮" + GER_dp_light_battery_5_single_short: "单装10cm SK L/55火炮" + ENG_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + ENG_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + AST_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5: "4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_short: "双联4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_single: "4.7英寸 MK VI 速射炮" + CAN_dp_light_battery_5_single_short: "单装4.7英寸 MK VI 速射炮" + FRA_dp_light_battery_5: "127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_short: "双联127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_single: "127mm/54 Model 1948火炮" + FRA_dp_light_battery_5_single_short: "单装127mm/54 Model 1948火炮" + JAP_dp_light_battery_5: "九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_short: "双联九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_single: "九八式改 10cm/65 火炮" + JAP_dp_light_battery_5_single_short: "单装九八式改 10cm/65 火炮" + ITA_dp_light_battery_5: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_short: "双联127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_single: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_light_battery_5_single_short: "单装127mm/54 奥托-梅莱拉火炮" + SOV_dp_light_battery_5: "76mm/59 AK-726火炮" + SOV_dp_light_battery_5_short: "双联76mm/59 AK-726火炮" + SOV_dp_light_battery_5_single: "76mm/59 AK-726火炮" + SOV_dp_light_battery_5_single_short: "单装76mm/59 AK-726火炮" + USA_dp_ship_secondaries_5: "5英寸/54 Mk 18火炮（代培Mk42型炮塔）" + USA_dp_ship_secondaries_5_bb: "5英寸/54 Mk 18火炮（代培Mk42型炮塔）" + GER_dp_ship_secondaries_5: "10cm SK L/55火炮" + GER_dp_ship_secondaries_5_bb: "10cm SK L/55火炮" + ENG_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + ENG_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + AST_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + AST_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + CAN_dp_ship_secondaries_5: "4.7英寸 MK VI 速射炮" + CAN_dp_ship_secondaries_5_bb: "4.7英寸 MK VI 速射炮" + FRA_dp_ship_secondaries_5: "127mm/54 Model 1948火炮" + FRA_dp_ship_secondaries_5_bb: "127mm/54 Model 1948火炮" + JAP_dp_ship_secondaries_5: "九八式改 10cm/65 火炮" + JAP_dp_ship_secondaries_5_bb: "九八式改 10cm/65 火炮" + ITA_dp_ship_secondaries_5: "127mm/54 奥托-梅莱拉火炮" + ITA_dp_ship_secondaries_5_bb: "127mm/54 奥托-梅莱拉火炮" + SOV_dp_ship_secondaries_5: "76mm/59 AK-726火炮" + SOV_dp_ship_secondaries_5_bb: "76mm/59 AK-726火炮" \ 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 810612a..fa285ef 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 @@ -1169,4 +1169,14 @@ EQ_MOD_CAT_cv_role_TITLE: "航母角色" EQ_MOD_CAT_ship_carrier_armor_shbb_TITLE: "航母超重型装甲带" carrier_helipad_asw_short: "反潜直升机" - carrier_helipad_aew_short: "预警直升机" \ No newline at end of file + carrier_helipad_aew_short: "预警直升机" + dp_ship_secondaries_5: "127mm自动化高平两用速射副炮" + dp_ship_secondaries_5_short: "高平两用副炮5" + dp_ship_secondaries_5_desc: "这种火炮已经被集成到舰船的火控和防空系统之中。" + dp_ship_secondaries_5_bb: "127mm自动化高平两用速射副炮" + dp_ship_secondaries_5_bb_short: "高平两用副炮5" + dp_ship_secondaries_5_bb_desc: "这种火炮已经被集成到舰船的火控和防空系统之中。" + ship_asw_battery_1: "76mm火炮（搭配RAT发射器）" + ship_asw_battery_1_short: "76mm火炮（搭配RAT发射器）" + ship_asw_battery_1_desc: "一座安装在可旋转炮塔上的小口径火炮，在其两侧装有火箭助推鱼雷发射器。" + EQ_MOD_SLOT_fixed_ship_extra_electronics_slot_TITLE: "电子设备槽位" \ No newline at end of file