From 3f289ebdb33b03edf0a0885702356e581e6aed13 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 1 May 2025 04:03:52 +0000 Subject: [PATCH] 2025-05-01 04:03:52 --- src/common/ai_equipment/vnr_DD_cruiser.txt | 3 + src/common/ai_equipment/vnr_DD_leader.txt | 4 + src/common/ai_equipment/vnr_DD_screens.txt | 17 +- src/common/ai_equipment/vnr_auxiliary.txt | 3 + .../ai_equipment/vnr_battlecruisers.txt | 3 + src/common/ai_equipment/vnr_battleships.txt | 9 + src/common/ai_equipment/vnr_carriers.txt | 40 +- .../ai_equipment/vnr_carriers_light.txt | 8 +- .../ai_equipment/vnr_heavy_cruisers.txt | 9 +- .../ai_equipment/vnr_large_cruisers.txt | 3 + .../ai_equipment/vnr_light_cruisers.txt | 13 +- .../ai_equipment/vnr_medium_cruiser.txt | 9 +- src/common/ai_equipment/vnr_panzerschiff.txt | 3 + src/common/ai_equipment/vnr_submarines.txt | 10 + src/common/ai_strategy/naval_production.txt | 10 +- src/common/defines/VNR_naval_defines.lua | 16 +- .../scripted_effects/_add_naval_variants.txt | 131 +- .../scripted_effects/_add_never_built.txt | 2 +- .../_delete_starting_naval.txt | 19 +- .../projects/naval_projects.txt | 62 + src/common/technologies/MTG_naval.txt | 72 +- src/common/technologies/MTG_naval_Support.txt | 2 + .../critical_parts/00_critical_parts.txt | 22 +- .../modules/00_ship_modules_aviation.txt | 2 +- .../equipment/modules/00_ship_modules_gun.txt | 91 +- .../modules/00_ship_modules_propulsion.txt | 8 +- .../modules/00_ship_modules_role.txt | 23 + .../modules/00_ship_modules_support.txt | 27 +- .../units/equipment/ship_hull_carrier.txt | 4 +- .../units/equipment/ship_hull_cruiser.txt | 16 +- .../units/equipment/ship_hull_heavy.txt | 9 +- .../units/equipment/ship_hull_light.txt | 2 +- .../units/equipment/ship_hull_submarine.txt | 6 +- src/descriptor.mod | 2 +- src/documentation/Guide.md | 84 +- .../graphic_db/01_Commonwealth_ship_icons.txt | 1635 ++++++++++------- .../graphic_db/01_USA_ship_icons.txt | 14 + .../graphic_db/02_east_europe_ship_icons.txt | 1 + .../02_south_america_ship_icons.txt | 15 + .../graphic_db/02_west_europe_ship_icons.txt | 7 + .../icons/ship_hull_cruiser_role_cgaa.png | Bin 0 -> 3822 bytes .../modules/icons/ship_secondaries_light1.png | Bin 0 -> 4983 bytes .../modules/icons/ship_secondaries_light2.png | Bin 0 -> 5464 bytes .../naval/modules/icons/ship_superheater.png | Bin 0 -> 7830 bytes .../sp_high_speed_light_engine.png | Bin 0 -> 12163 bytes .../Fun/GER_battleship_Derfflinger.png | Bin 0 -> 15322 bytes .../Fun/GER_battleship_Moltke.png | Bin 0 -> 16794 bytes .../technologies/Fun/GER_battleship_Von.png | Bin 0 -> 20134 bytes .../technologies/Fun/GER_destroyer_G7.png | Bin 0 -> 15071 bytes .../technologies/Fun/GER_destroyer_V25.png | Bin 0 -> 17647 bytes .../technologies/Fun/GER_pre_dreadnought.png | Bin 0 -> 21935 bytes .../MEX_cruiser_coastal_defense_ship.png | Bin 0 -> 20590 bytes .../extra/ENG_destroyer_Daring.png | Bin 0 -> 19563 bytes .../extra/ENG_light_cruiser_Black_Prince.png | Bin 0 -> 18970 bytes .../extra/FRA_battleship_Richelieu.png | Bin 0 -> 17016 bytes .../extra/FRA_destroyer_Le_Hardi.png | Bin 0 -> 16500 bytes .../extra/SOV_destroyer_Kanin.png | Bin 0 -> 17703 bytes .../extra/USA_carrier_Long_Island.png | Bin 0 -> 29880 bytes .../extra/USA_carrier_Oriskany.png | Bin 0 -> 17204 bytes .../extra/USA_carrier_Princeton.png | Bin 0 -> 38341 bytes .../extra/USA_heavy_cruiser_Albany.png | Bin 0 -> 19602 bytes src/gfx/interface/vnr_main_menu_bg.dds | Bin 14745596 -> 14745596 bytes src/interface/equipmentdesignerview.gui | 78 +- src/interface/vnr_user_interface_assets.gfx | 7 + src/interface/z_navy_icons_hull.gfx | 9 +- src/interface/z_navy_techtree.gfx | 4 + src/interface/z_ship_modules.gfx | 21 + .../english/replace/equip_naval_l_english.yml | 4 +- .../replace/navy_rework_welcome_l_english.yml | 4 +- .../english/replace/research_l_english.yml | 4 +- ...hip_modules_country_specific_l_english.yml | 229 ++- .../replace/ship_modules_l_english.yml | 17 +- .../replace/vnr_naval_develop_l_english.yml | 4 +- .../replace/equip_naval_l_english.yml | 4 +- .../replace/navy_rework_welcome_l_english.yml | 4 +- .../replace/research_l_english.yml | 4 +- ...hip_modules_country_specific_l_english.yml | 229 ++- .../replace/ship_modules_l_english.yml | 17 +- .../replace/vnr_naval_develop_l_english.yml | 4 +- .../replace/equip_naval_l_simp_chinese.yml | 4 +- .../navy_rework_welcome_l_simp_chinese.yml | 4 +- .../replace/research_l_simp_chinese.yml | 4 +- ...odules_country_specific_l_simp_chinese.yml | 229 ++- .../replace/ship_modules_l_simp_chinese.yml | 17 +- .../vnr_naval_develop_l_simp_chinese.yml | 4 +- 85 files changed, 2298 insertions(+), 1023 deletions(-) create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_hull_cruiser_role_cgaa.png create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light1.png create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_secondaries_light2.png create mode 100755 src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_superheater.png create mode 100755 src/gfx/interface/special_project/project_icons/sp_high_speed_light_engine.png create mode 100755 src/gfx/interface/technologies/Fun/GER_battleship_Derfflinger.png create mode 100755 src/gfx/interface/technologies/Fun/GER_battleship_Moltke.png create mode 100755 src/gfx/interface/technologies/Fun/GER_battleship_Von.png create mode 100755 src/gfx/interface/technologies/Fun/GER_destroyer_G7.png create mode 100755 src/gfx/interface/technologies/Fun/GER_destroyer_V25.png create mode 100755 src/gfx/interface/technologies/Fun/GER_pre_dreadnought.png create mode 100755 src/gfx/interface/technologies/South_America/MEX_cruiser_coastal_defense_ship.png create mode 100755 src/gfx/interface/technologies/extra/ENG_destroyer_Daring.png create mode 100755 src/gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png create mode 100755 src/gfx/interface/technologies/extra/FRA_battleship_Richelieu.png create mode 100755 src/gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png create mode 100755 src/gfx/interface/technologies/extra/SOV_destroyer_Kanin.png create mode 100755 src/gfx/interface/technologies/extra/USA_carrier_Long_Island.png create mode 100755 src/gfx/interface/technologies/extra/USA_carrier_Oriskany.png create mode 100755 src/gfx/interface/technologies/extra/USA_carrier_Princeton.png create mode 100755 src/gfx/interface/technologies/extra/USA_heavy_cruiser_Albany.png diff --git a/src/common/ai_equipment/vnr_DD_cruiser.txt b/src/common/ai_equipment/vnr_DD_cruiser.txt index a747286..8e65b88 100755 --- a/src/common/ai_equipment/vnr_DD_cruiser.txt +++ b/src/common/ai_equipment/vnr_DD_cruiser.txt @@ -14,6 +14,7 @@ naval_screen_cruiser = { modifier = { factor = 0.1 has_tech = improved_ship_hull_light } } + is_history = yes target_variant = { match_value = 500.0 @@ -45,6 +46,7 @@ naval_screen_cruiser = { modifier = { factor = 0.1 has_tech = advanced_ship_hull_light } } + is_history = yes target_variant = { match_value = 600.0 @@ -76,6 +78,7 @@ naval_screen_cruiser = { modifier = { add = 100 has_tech = advanced_ship_hull_light } } + is_history = yes target_variant = { match_value = 800.0 diff --git a/src/common/ai_equipment/vnr_DD_leader.txt b/src/common/ai_equipment/vnr_DD_leader.txt index 90ac7c1..da856d4 100755 --- a/src/common/ai_equipment/vnr_DD_leader.txt +++ b/src/common/ai_equipment/vnr_DD_leader.txt @@ -17,6 +17,7 @@ naval_screen_leader = { not = { has_tech = interwar_ship_hull_light } # WK-era DD has very low HP, they are not worth producing or refitting } + is_history = yes target_variant = { match_value = 500.0 @@ -50,6 +51,7 @@ naval_screen_leader = { modifier = { factor = 0.1 has_tech = improved_ship_hull_light } } + is_history = yes target_variant = { match_value = 600.0 @@ -83,6 +85,7 @@ naval_screen_leader = { modifier = { factor = 0.1 has_tech = advanced_ship_hull_light } } + is_history = yes target_variant = { match_value = 800.0 @@ -115,6 +118,7 @@ naval_screen_leader = { modifier = { factor = 25 tag = FRA } } + is_history = yes target_variant = { match_value = 1000.0 diff --git a/src/common/ai_equipment/vnr_DD_screens.txt b/src/common/ai_equipment/vnr_DD_screens.txt index ef31754..22825d6 100755 --- a/src/common/ai_equipment/vnr_DD_screens.txt +++ b/src/common/ai_equipment/vnr_DD_screens.txt @@ -18,6 +18,7 @@ naval_screen = { not = { has_tech = basic_ship_hull_light } # WK-era DD has very low HP, they are not worth producing or refitting } + is_history = yes target_variant = { match_value = 2000.0 @@ -53,6 +54,7 @@ naval_screen = { not = { has_tech = interwar_ship_hull_light } # WK-era DD has very low HP, they are not worth producing or refitting } + is_history = yes target_variant = { match_value = 3000.0 @@ -62,7 +64,7 @@ naval_screen = { fixed_ship_battery_slot = ship_light_battery fixed_ship_torpedo_slot = ship_torpedo fixed_ship_fire_control_system_slot = ship_fire_control_system - fixed_ship_radar_slot = ship_mast + fixed_ship_radar_slot = ship_sonar fixed_ship_anti_air_slot = ship_anti_air fixed_ship_role_slot = ship_hull_light_role_dd fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } } @@ -85,6 +87,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 4000.0 @@ -94,7 +97,7 @@ naval_screen = { fixed_ship_battery_slot = ship_light_battery_double fixed_ship_torpedo_slot = ship_torpedo fixed_ship_fire_control_system_slot = ship_fire_control_system - fixed_ship_radar_slot = ship_mast + fixed_ship_radar_slot = ship_sonar fixed_ship_anti_air_slot = ship_anti_air fixed_ship_role_slot = ship_hull_light_role_dd fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous generic_miscellaneous } } @@ -117,6 +120,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 5000.0 @@ -149,6 +153,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 6500.0 @@ -181,6 +186,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 8000.0 @@ -216,6 +222,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 4000.0 @@ -225,7 +232,7 @@ naval_screen = { fixed_ship_battery_slot = ship_light_battery_double fixed_ship_torpedo_slot = ship_torpedo fixed_ship_fire_control_system_slot = ship_fire_control_system - fixed_ship_radar_slot = { upgrade > current any_of = { ship_sonar ship_mast } } + fixed_ship_radar_slot = ship_sonar fixed_ship_anti_air_slot = ship_anti_air fixed_ship_role_slot = ship_hull_light_role_dd front_1_custom_slot = ship_light_battery_double @@ -246,6 +253,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 5000.0 @@ -277,6 +285,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 6500.0 @@ -307,6 +316,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 7000.0 @@ -338,6 +348,7 @@ naval_screen = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 8000.0 diff --git a/src/common/ai_equipment/vnr_auxiliary.txt b/src/common/ai_equipment/vnr_auxiliary.txt index afa8fe2..88da0eb 100755 --- a/src/common/ai_equipment/vnr_auxiliary.txt +++ b/src/common/ai_equipment/vnr_auxiliary.txt @@ -13,6 +13,7 @@ naval_auxiliary = { base = 0 } + is_history = yes target_variant = { match_value = 10.0 @@ -36,6 +37,7 @@ naval_auxiliary = { base = 0 } + is_history = yes target_variant = { match_value = 10.0 @@ -59,6 +61,7 @@ naval_auxiliary = { base = 0 } + is_history = yes target_variant = { match_value = 10.0 diff --git a/src/common/ai_equipment/vnr_battlecruisers.txt b/src/common/ai_equipment/vnr_battlecruisers.txt index d84530b..5241e4e 100755 --- a/src/common/ai_equipment/vnr_battlecruisers.txt +++ b/src/common/ai_equipment/vnr_battlecruisers.txt @@ -13,6 +13,7 @@ naval_capital_battlecruiser = { base = 0 } + is_history = yes target_variant = { match_value = 10.0 @@ -46,6 +47,7 @@ naval_capital_battlecruiser = { base = 0 } + is_history = yes target_variant = { match_value = 10.0 @@ -80,6 +82,7 @@ naval_capital_battlecruiser = { base = 0 } + is_history = yes target_variant = { match_value = 10.0 diff --git a/src/common/ai_equipment/vnr_battleships.txt b/src/common/ai_equipment/vnr_battleships.txt index 54fe082..8822eb2 100755 --- a/src/common/ai_equipment/vnr_battleships.txt +++ b/src/common/ai_equipment/vnr_battleships.txt @@ -15,6 +15,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 2000.0 @@ -50,6 +51,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 3000.0 @@ -85,6 +87,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 3500.0 @@ -121,6 +124,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 5000.0 @@ -157,6 +161,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 5500.0 @@ -194,6 +199,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 2500.0 @@ -232,6 +238,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 3000.0 @@ -263,6 +270,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 3500.0 @@ -296,6 +304,7 @@ naval_capital_battleship = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 5000.0 diff --git a/src/common/ai_equipment/vnr_carriers.txt b/src/common/ai_equipment/vnr_carriers.txt index 2818499..93224d5 100755 --- a/src/common/ai_equipment/vnr_carriers.txt +++ b/src/common/ai_equipment/vnr_carriers.txt @@ -33,6 +33,7 @@ naval_carrier = { role_icon_index = 9 priority = { base = 0 } + is_history = yes target_variant = { type = vnr_ship_hull_carrier_conversion_ca modules = { @@ -51,6 +52,7 @@ naval_carrier = { role_icon_index = 9 priority = { base = 0 } + is_history = yes target_variant = { type = vnr_ship_hull_carrier_conversion_bb modules = { @@ -60,8 +62,8 @@ naval_carrier = { fixed_ship_engine_slot = carrier_ship_engine fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } } mid_1_custom_slot = ship_deck_space - fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit - fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous + fixed_ship_carrier_miscellaneous_slot_1 = empty + fixed_ship_carrier_miscellaneous_slot_2 = empty fixed_ship_flight_deck_slot = carrier_wooden_deck } } @@ -76,6 +78,7 @@ naval_carrier = { modifier = { factor = 0.1 has_tech = improved_ship_hull_carrier } modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 1000.0 type = vnr_ship_hull_carrier_1 @@ -87,8 +90,8 @@ naval_carrier = { fixed_ship_armor_slot = ship_carrier_armor fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } } fixed_ship_radar_slot = ship_radar - fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit - fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous + fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad + fixed_ship_carrier_miscellaneous_slot_2 = empty fixed_ship_flight_deck_slot = carrier_wooden_deck front_1_custom_slot = ship_deck_space } @@ -105,6 +108,7 @@ naval_carrier = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 1000.0 @@ -117,8 +121,8 @@ naval_carrier = { fixed_ship_armor_slot = ship_carrier_armor fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } } fixed_ship_radar_slot = ship_radar - fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit - fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous + fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad + fixed_ship_carrier_miscellaneous_slot_2 = empty fixed_ship_flight_deck_slot = carrier_wooden_deck front_1_custom_slot = ship_deck_space front_2_custom_slot = carrier_side_lift @@ -138,6 +142,7 @@ naval_carrier = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 1000.0 @@ -150,8 +155,8 @@ naval_carrier = { fixed_ship_armor_slot = ship_carrier_armor fixed_ship_secondaries_slot = { any_of = { ship_secondaries ship_dp_secondaries_bb } } fixed_ship_radar_slot = ship_radar - fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit - fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous + fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad + fixed_ship_carrier_miscellaneous_slot_2 = empty fixed_ship_flight_deck_slot = carrier_armor_deck front_1_custom_slot = ship_deck_space front_2_custom_slot = carrier_side_lift @@ -172,6 +177,7 @@ naval_carrier = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 2000.0 @@ -184,8 +190,8 @@ naval_carrier = { fixed_ship_engine_slot = { upgrade = current any_of = { carrier_ship_engine_4 carrier_ship_engine_3 carrier_ship_engine_2 carrier_ship_engine_1 } } fixed_ship_secondaries_slot = ship_dp_secondaries_bb fixed_ship_radar_slot = ship_radar - fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit - fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous + fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad + fixed_ship_carrier_miscellaneous_slot_2 = carrier_strength_deck fixed_ship_flight_deck_slot = carrier_armor_deck front_1_custom_slot = steam_catapult front_2_custom_slot = carrier_angled_deck @@ -206,6 +212,7 @@ naval_carrier = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 2000.0 @@ -218,8 +225,8 @@ naval_carrier = { fixed_ship_engine_slot = carrier_ship_engine_nuclear fixed_ship_secondaries_slot = ship_dp_secondaries_bb fixed_ship_radar_slot = ship_radar - fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit - fixed_ship_carrier_miscellaneous_slot_2 = economical_nuclear_reactor_carrier + fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad + fixed_ship_carrier_miscellaneous_slot_2 = { any_of = { economical_nuclear_reactor_carrier carrier_strength_deck } } fixed_ship_flight_deck_slot = carrier_armor_deck front_1_custom_slot = steam_catapult front_2_custom_slot = carrier_angled_deck @@ -241,6 +248,7 @@ naval_carrier = { modifier = { factor = 0.1 has_tech = improved_ship_hull_carrier } modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 2000.0 type = vnr_ship_hull_carrier_1 @@ -253,7 +261,7 @@ naval_carrier = { fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } } fixed_ship_radar_slot = ship_radar fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island + fixed_ship_carrier_miscellaneous_slot_2 = empty fixed_ship_flight_deck_slot = carrier_wooden_deck front_1_custom_slot = ship_deck_space mid_1_custom_slot = ship_deck_space @@ -270,6 +278,7 @@ naval_carrier = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 3000.0 @@ -283,7 +292,7 @@ naval_carrier = { fixed_ship_secondaries_slot = { upgrade > current any_of = { ship_dp_secondaries_bb } } fixed_ship_radar_slot = ship_radar fixed_ship_carrier_miscellaneous_slot_1 = carrier_spared_squad - fixed_ship_carrier_miscellaneous_slot_2 = carrier_secondary_island + fixed_ship_carrier_miscellaneous_slot_2 = empty fixed_ship_flight_deck_slot = carrier_wooden_deck front_1_custom_slot = ship_deck_space front_2_custom_slot = carrier_side_lift @@ -302,6 +311,7 @@ naval_carrier = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 5500.0 @@ -335,6 +345,7 @@ naval_carrier = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 6500.0 @@ -368,6 +379,7 @@ naval_carrier = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 8000.0 diff --git a/src/common/ai_equipment/vnr_carriers_light.txt b/src/common/ai_equipment/vnr_carriers_light.txt index 153e2e3..07a6533 100755 --- a/src/common/ai_equipment/vnr_carriers_light.txt +++ b/src/common/ai_equipment/vnr_carriers_light.txt @@ -53,6 +53,7 @@ naval_light_carrier = { priority = { base = 0 } + is_history = yes target_variant = { match_value = 100.0 type = vnr_ship_hull_carrier_1 @@ -78,6 +79,7 @@ naval_light_carrier = { base = 0 } + is_history = yes target_variant = { match_value = 300.0 @@ -90,7 +92,7 @@ naval_light_carrier = { fixed_ship_secondaries_slot = ship_secondaries fixed_ship_radar_slot = ship_radar fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit - fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous + fixed_ship_carrier_miscellaneous_slot_2 = empty fixed_ship_flight_deck_slot = carrier_wooden_deck } } @@ -104,6 +106,7 @@ naval_light_carrier = { base = 0 } + is_history = yes target_variant = { match_value = 800.0 @@ -116,7 +119,7 @@ naval_light_carrier = { fixed_ship_secondaries_slot = ship_secondaries fixed_ship_radar_slot = ship_radar fixed_ship_carrier_miscellaneous_slot_1 = carrier_unit - fixed_ship_carrier_miscellaneous_slot_2 = carrier_miscellaneous + fixed_ship_carrier_miscellaneous_slot_2 = empty fixed_ship_flight_deck_slot = carrier_wooden_deck } } @@ -130,6 +133,7 @@ naval_light_carrier = { base = 0 } + is_history = yes target_variant = { match_value = 10.0 diff --git a/src/common/ai_equipment/vnr_heavy_cruisers.txt b/src/common/ai_equipment/vnr_heavy_cruisers.txt index c07d238..983603a 100755 --- a/src/common/ai_equipment/vnr_heavy_cruisers.txt +++ b/src/common/ai_equipment/vnr_heavy_cruisers.txt @@ -13,6 +13,7 @@ naval_cruiser_heavy = { base = 0 } + is_history = yes target_variant = { match_value = 100.0 type = vnr_ship_hull_cruiser_coastal_defense_ship @@ -26,7 +27,7 @@ naval_cruiser_heavy = { module = empty } fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_cruiser_1 } } - fixed_ship_secondaries_slot = ship_secondaries + fixed_ship_secondaries_slot = ship_secondaries_light fixed_ship_role_slot = ship_hull_cruiser_role_ca mid_1_custom_slot = ship_anti_air mid_2_custom_slot = ship_torpedo @@ -44,6 +45,7 @@ naval_cruiser_heavy = { modifier = { factor = 0.1 has_tech = interwar_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 500.0 type = vnr_ship_hull_cruiser_2 @@ -57,7 +59,7 @@ naval_cruiser_heavy = { module = empty } fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_cruiser_2 ship_armor_cruiser_1 } } - fixed_ship_secondaries_slot = ship_secondaries + fixed_ship_secondaries_slot = ship_secondaries_light fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery @@ -78,6 +80,7 @@ naval_cruiser_heavy = { modifier = { factor = 0.1 has_tech = improved_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 800.0 type = vnr_ship_hull_cruiser_3 @@ -113,6 +116,7 @@ naval_cruiser_heavy = { modifier = { factor = 0.1 has_tech = advanced_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 2500.0 @@ -147,6 +151,7 @@ naval_cruiser_heavy = { modifier = { factor = 0.1 has_tech = modern_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 5000.0 diff --git a/src/common/ai_equipment/vnr_large_cruisers.txt b/src/common/ai_equipment/vnr_large_cruisers.txt index 769148b..541aeeb 100755 --- a/src/common/ai_equipment/vnr_large_cruisers.txt +++ b/src/common/ai_equipment/vnr_large_cruisers.txt @@ -14,6 +14,7 @@ naval_cruiser_large = { modifier = { factor = 0.1 has_tech = improved_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 500.0 type = vnr_ship_hull_cruiser_3 @@ -49,6 +50,7 @@ naval_cruiser_large = { modifier = { factor = 0.1 has_tech = advanced_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 1000.0 @@ -82,6 +84,7 @@ naval_cruiser_large = { modifier = { add = 50 has_tech = advanced_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 1000.0 diff --git a/src/common/ai_equipment/vnr_light_cruisers.txt b/src/common/ai_equipment/vnr_light_cruisers.txt index 9287ab2..663dfc2 100755 --- a/src/common/ai_equipment/vnr_light_cruisers.txt +++ b/src/common/ai_equipment/vnr_light_cruisers.txt @@ -15,6 +15,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 1000.0 type = vnr_ship_hull_cruiser_1 @@ -25,7 +26,7 @@ naval_cruiser_light = { fixed_ship_engine_slot = { upgrade = current module = cruiser_ship_engine_1 } fixed_ship_radar_slot = { module = empty } fixed_ship_armor_slot = { upgrade = current module = ship_armor_cruiser_1 } - fixed_ship_secondaries_slot = ship_secondaries + fixed_ship_secondaries_slot = ship_secondaries_light fixed_ship_role_slot = ship_hull_cruiser_role_c fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } mid_1_custom_slot = ship_torpedo @@ -45,6 +46,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 1500.0 type = vnr_ship_hull_cruiser_2 @@ -55,7 +57,7 @@ naval_cruiser_light = { fixed_ship_engine_slot = { upgrade = current any_of = { cruiser_ship_engine_2 cruiser_ship_engine_1 } } fixed_ship_radar_slot = { any_of = { ship_radar ship_sonar } } fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_cruiser_2 ship_armor_cruiser_1 } } - fixed_ship_secondaries_slot = ship_secondaries + fixed_ship_secondaries_slot = ship_secondaries_light fixed_ship_role_slot = ship_hull_cruiser_role_c fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } front_1_custom_slot > ship_light_medium_battery_1 @@ -77,6 +79,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 2000.0 type = vnr_ship_hull_cruiser_3 @@ -110,6 +113,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 4000.0 @@ -144,6 +148,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 6000.0 @@ -178,6 +183,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 7000.0 @@ -217,6 +223,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 2000.0 type = vnr_ship_hull_cruiser_3 @@ -249,6 +256,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 4000.0 @@ -284,6 +292,7 @@ naval_cruiser_light = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 6000.0 diff --git a/src/common/ai_equipment/vnr_medium_cruiser.txt b/src/common/ai_equipment/vnr_medium_cruiser.txt index cd66081..2a42e36 100755 --- a/src/common/ai_equipment/vnr_medium_cruiser.txt +++ b/src/common/ai_equipment/vnr_medium_cruiser.txt @@ -14,6 +14,7 @@ naval_cruiser_medium = { modifier = { factor = 0.1 has_tech = interwar_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 500.0 type = vnr_ship_hull_cruiser_2 @@ -27,7 +28,7 @@ naval_cruiser_medium = { module = empty } fixed_ship_armor_slot = { upgrade = current any_of = { ship_armor_cruiser_2 ship_armor_cruiser_1 } } - fixed_ship_secondaries_slot = ship_secondaries + fixed_ship_secondaries_slot = ship_secondaries_light fixed_ship_extra_secondaries_slot = { any_of = { light_miscellaneous heavy_miscellaneous generic_miscellaneous } } front_1_custom_slot = ship_medium_battery mid_1_custom_slot = ship_anti_air @@ -47,6 +48,7 @@ naval_cruiser_medium = { modifier = { factor = 0.1 has_tech = improved_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 800.0 type = vnr_ship_hull_cruiser_3 @@ -81,6 +83,7 @@ naval_cruiser_medium = { modifier = { factor = 0.1 has_tech = advanced_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 2500.0 @@ -114,6 +117,7 @@ naval_cruiser_medium = { modifier = { factor = 0.1 has_tech = modern_ship_hull_cruiser } } + is_history = yes target_variant = { match_value = 5000.0 @@ -149,6 +153,7 @@ naval_cruiser_medium = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 9000.0 @@ -189,6 +194,7 @@ naval_cruiser_medium = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 7000.0 @@ -219,6 +225,7 @@ naval_cruiser_medium = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 9000.0 diff --git a/src/common/ai_equipment/vnr_panzerschiff.txt b/src/common/ai_equipment/vnr_panzerschiff.txt index 7bb7e39..1b9abc2 100755 --- a/src/common/ai_equipment/vnr_panzerschiff.txt +++ b/src/common/ai_equipment/vnr_panzerschiff.txt @@ -13,6 +13,7 @@ naval_cruiser_armor = { base = 0 } + is_history = yes target_variant = { match_value = 500.0 type = vnr_ship_hull_cruiser_panzerschiff @@ -43,6 +44,7 @@ naval_cruiser_armor = { base = 0 } + is_history = yes target_variant = { match_value = 1000.0 @@ -71,6 +73,7 @@ naval_cruiser_armor = { base = 0 } + is_history = yes target_variant = { match_value = 1000.0 diff --git a/src/common/ai_equipment/vnr_submarines.txt b/src/common/ai_equipment/vnr_submarines.txt index 39158e6..4d8f60f 100755 --- a/src/common/ai_equipment/vnr_submarines.txt +++ b/src/common/ai_equipment/vnr_submarines.txt @@ -10,6 +10,7 @@ naval_sub = { role_icon_index = 37 priority = { base = 1 } + is_history = yes target_variant = { type = vnr_ship_hull_cruiser_submarine modules = { @@ -35,6 +36,7 @@ naval_sub = { } + is_history = yes target_variant = { match_value = 2000.0 type = vnr_ship_hull_submarine_1 @@ -59,6 +61,7 @@ naval_sub = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 4000.0 @@ -84,6 +87,7 @@ naval_sub = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { match_value = 4500.0 @@ -111,6 +115,7 @@ naval_sub = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { type = vnr_ship_hull_submarine_4 match_value = 5000.0 @@ -139,6 +144,7 @@ naval_sub = { modifier = { factor = 0 expert_ai_style = yes } } + is_history = yes target_variant = { type = vnr_ship_hull_submarine_5 match_value = 5500.0 @@ -171,6 +177,7 @@ naval_sub = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 4000.0 @@ -196,6 +203,7 @@ naval_sub = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { match_value = 4500.0 @@ -222,6 +230,7 @@ naval_sub = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { type = vnr_ship_hull_submarine_4 match_value = 5000.0 @@ -249,6 +258,7 @@ naval_sub = { modifier = { factor = 0 expert_ai_style = no } } + is_history = yes target_variant = { type = vnr_ship_hull_submarine_5 match_value = 5500.0 diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt index 977c2f2..2cc5c08 100755 --- a/src/common/ai_strategy/naval_production.txt +++ b/src/common/ai_strategy/naval_production.txt @@ -754,7 +754,7 @@ naval_unit_role_ratios_ENG_prewar_late = { ai_strategy = { type = role_ratio id = vnr_naval_submarine - value = 80 + value = 50 } ai_strategy = { @@ -772,7 +772,7 @@ naval_unit_role_ratios_ENG_prewar_late = { ai_strategy = { type = role_ratio id = vnr_naval_cruiser_light - value = 70 + value = 150 } ai_strategy = { @@ -818,7 +818,7 @@ naval_unit_role_ratios_ENG_atwar = { ai_strategy = { type = role_ratio id = vnr_naval_cruiser_light - value = 50 + value = 150 } ai_strategy = { @@ -1522,7 +1522,7 @@ naval_unit_role_ratios_USA_go_to_war = { ai_strategy = { type = role_ratio id = vnr_naval_cruiser_light - value = 40 + value = 120 } ai_strategy = { @@ -1572,7 +1572,7 @@ naval_unit_role_ratios_USA_atwar = { ai_strategy = { type = role_ratio id = vnr_naval_cruiser_light - value = 80 + value = 150 } ai_strategy = { type = role_ratio diff --git a/src/common/defines/VNR_naval_defines.lua b/src/common/defines/VNR_naval_defines.lua index 47b64b1..8e92178 100755 --- a/src/common/defines/VNR_naval_defines.lua +++ b/src/common/defines/VNR_naval_defines.lua @@ -5,11 +5,13 @@ NDefines.NAI.DOCKYARDS_PER_NAVAL_DESIRE_EFFECT = 10; NDefines.NAI.PRODUCTION_MAX_PROGRESS_TO_SWITCH_NAVAL = 0; NDefines.NAI.PRODUCTION_WAIT_TO_FINISH_IF_EXPENSIVE = 0.02; NDefines.NAI.CARRIER_TASKFORCE_MAX_CARRIER_COUNT = 6; -NDefines.NAI.SCREENS_TO_CAPITAL_RATIO = 4; -NDefines.NAI.REPAIR_TASKFORCE_SIZE = 25; +NDefines.NAI.SCREENS_TO_CAPITAL_RATIO = 3; +NDefines.NAI.REPAIR_TASKFORCE_SIZE = 8; NDefines.NAI.WANTED_CARRIER_PLANES_PER_CARRIER_CAPACITY_FACTOR = 2; NDefines.NAI.WANTED_CARRIER_PLANES_PER_CARRIER_CAPACITY_IN_PRODUCTION_FACTOR = 1.5; NDefines.NAI.AI_WANTED_CARRIER_BASED_PLANES_FACTOR = 1.5; +NDefines.NAI.MAX_ALLOWED_NAVAL_DANGER = 100; +NDefines.NAI.CONVOY_ESCORT_SCORE_FROM_CONVOYS = 25; NDefines.NNavy.SCREEN_RATIO_FOR_FULL_SCREENING_FOR_CAPITALS = 2.0; NDefines.NNavy.ESCAPE_SPEED_PER_COMBAT_DAY = 0.03; @@ -20,7 +22,7 @@ NDefines.NNavy.NAVAL_INVASION_SPOTTING_SPEED_MULT = 30; NDefines.NNavy.SPOTTING_SPEED_EFFECT_FOR_INITIAL_UNIT_TRANSFER_SPOTTING = 0.5; NDefines.NNavy.SPOTTING_SPEED_EFFECT_FOR_INITIAL_NAVAL_INVASION_SPOTTING = 0.5; NDefines.NNavy.CONVOY_EFFICIENCY_MIN_VALUE = 0; -NDefines.NNavy.CONVOY_HIT_PROFILE = 110; +NDefines.NNavy.CONVOY_HIT_PROFILE = 95; NDefines.NNavy.NAVY_PIERCING_THRESHOLDS = { 2.0, 1.0, 0.85, 0.75, 0.6, 0.5, 0.3, 0.1, 0.0 } NDefines.NNavy.NAVY_PIERCING_THRESHOLD_CRITICAL_VALUES = { 3.0, 1.0, 0.65, 0.55, 0.4, 0.3, 0.15, 0.1, 0.0 } NDefines.NNavy.NAVY_PIERCING_THRESHOLD_DAMAGE_VALUES = { 1.0, 1.0, 0.7, 0.6, 0.45, 0.35, 0.2, 0.1, 0.01 } @@ -35,8 +37,9 @@ NDefines.NNavy.COMBAT_CHASE_RESIGNATION_HOURS = 4; NDefines.NNavy.ANTI_AIR_TARGETING = 0.93; NDefines.NNavy.MAX_ANTI_AIR_REDUCTION_EFFECT_ON_INCOMING_AIR_DAMAGE = 0.6; NDefines.NNavy.TRAINING_MAX_DAILY_COUNTRY_EXP = 2; -NDefines.NNavy.SUBMARINE_REVEAL_BASE_CHANCE = 14; -NDefines.NNavy.SUBMARINE_BASE_TORPEDO_REVEAL_CHANCE = 0.05; +NDefines.NNavy.SUBMARINE_REVEAL_BASE_CHANCE = 16; +NDefines.NNavy.SUBMARINE_REVEAL_POW = 4.0; +NDefines.NNavy.SUBMARINE_BASE_TORPEDO_REVEAL_CHANCE = 0.35; NDefines.NNavy.WAR_SCORE_GAIN_FOR_SUNK_SHIP_MANPOWER_FACTOR = 0.01; NDefines.NNavy.WAR_SCORE_GAIN_FOR_SUNK_SHIP_PRODUCTION_COST_FACTOR = 0.04; NDefines.NNavy.SHORE_BOMBARDMENT_CAP = 0.5; @@ -54,6 +57,7 @@ NDefines.NNavy.MANPOWER_LOSS_RATIO_ON_STR_LOSS = 0.1; NDefines.NNavy.MANPOWER_LOSS_RATIO_ON_SUNK = 0.25; NDefines.NNavy.BASE_GUN_COOLDOWNS = { 1.0, 8.0, 1.0 }; NDefines.NNavy.COMBAT_TORPEDO_CRITICAL_DAMAGE_MULT = 3.0; +NDefines.NNavy.COMBAT_CRITICAL_DAMAGE_MULT = 8; NDefines.NNavy.PRIDE_OF_THE_FLEET_UNASSIGN_COST = 25; NDefines.NNavy.SUBMARINE_ESCAPE_RATIOS = { 90, 15, 3.0, 1.0, 0.1 } NDefines.NNavy.CONVOY_ATTACK_BASE_FACTOR = 0.3 @@ -108,7 +112,7 @@ NDefines.NAI.HIGH_PRIO_NAVAL_MISSION_SCORES = { 10000, -- PATROL 8000, -- STRIKE FORCE 2000, -- CONVOY RAIDING - 1000, -- CONVOY ESCORT + 6000, -- CONVOY ESCORT 100, -- MINES PLANTING 300, -- MINES SWEEPING 0, -- TRAIN diff --git a/src/common/scripted_effects/_add_naval_variants.txt b/src/common/scripted_effects/_add_naval_variants.txt index b736719..37fd057 100755 --- a/src/common/scripted_effects/_add_naval_variants.txt +++ b/src/common/scripted_effects/_add_naval_variants.txt @@ -238,7 +238,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_torpedo_2 @@ -258,7 +258,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_anti_air_2 @@ -280,7 +280,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_torpedo_2 @@ -301,7 +301,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_anti_air_1 @@ -323,7 +323,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_1_single mid_2_custom_slot = ship_torpedo_1 @@ -366,7 +366,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_2 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light front_1_custom_slot = ship_light_medium_battery_2_double mid_1_custom_slot = ship_airplane_launcher_1 mid_2_custom_slot = ship_anti_air_2 @@ -407,7 +407,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_1_single mid_2_custom_slot = ship_torpedo_1 rear_1_custom_slot = ship_light_medium_battery_1_single @@ -427,7 +427,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light mid_1_custom_slot = ship_light_medium_battery_1_single mid_2_custom_slot = ship_torpedo_1 rear_1_custom_slot = ship_light_medium_battery_1_single @@ -446,7 +446,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light mid_2_custom_slot = ship_torpedo_1 rear_1_custom_slot = ship_light_medium_battery_1_single } @@ -465,7 +465,7 @@ ENG_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_battery_2 mid_1_custom_slot = empty mid_2_custom_slot = ship_mine_layer_1 @@ -681,8 +681,9 @@ GER_start_naval_variants = { fixed_ship_deck_slot_1 = ship_deck_space fixed_ship_deck_slot_2 = ship_deck_space fixed_ship_anti_air_slot = ship_anti_air_2 - fixed_ship_engine_slot = carrier_ship_engine_2 fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_engine_slot = carrier_ship_engine_2 + fixed_ship_armor_slot = ship_armor_carrier_2 } } create_equipment_variant = { @@ -784,7 +785,7 @@ GER_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_2 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_torpedo_2 @@ -805,7 +806,7 @@ GER_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2_diesel fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_anti_air_1 mid_1_custom_slot = ship_airplane_launcher_1 mid_2_custom_slot = ship_torpedo_2 @@ -827,7 +828,7 @@ GER_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2_diesel fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light mid_2_custom_slot = ship_torpedo_2 mid_3_custom_slot = ship_mine_layer_1 rear_1_custom_slot = ship_light_medium_battery_2 @@ -847,7 +848,7 @@ GER_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_1_single mid_2_custom_slot = ship_torpedo_1 rear_1_custom_slot = ship_light_medium_battery_1_single @@ -1135,7 +1136,7 @@ FRA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_2 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_torpedo_2 @@ -1157,7 +1158,7 @@ FRA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_torpedo_2 @@ -1179,7 +1180,7 @@ FRA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_torpedo_1 @@ -1201,7 +1202,7 @@ FRA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_2 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light front_1_custom_slot = ship_light_medium_battery_2 mid_2_custom_slot = ship_torpedo_2 mid_3_custom_slot = ship_airplane_launcher_1 @@ -1220,7 +1221,7 @@ FRA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light front_1_custom_slot = ship_light_medium_battery_2 mid_2_custom_slot = ship_torpedo_2 mid_3_custom_slot = ship_airplane_launcher_1 @@ -1241,7 +1242,7 @@ FRA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_1_double mid_2_custom_slot = ship_torpedo_1 mid_3_custom_slot = ship_airplane_launcher_1 @@ -1261,7 +1262,7 @@ FRA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_1_double mid_1_custom_slot = ship_torpedo_1 mid_2_custom_slot = ship_torpedo_1 @@ -1307,6 +1308,7 @@ FRA_start_naval_variants = { fixed_ship_engine_slot = light_ship_engine_6 fixed_ship_torpedo_slot = ship_torpedo_2 fixed_ship_role_slot = ship_hull_light_role_dl + fixed_ship_extra_secondaries_slot = ship_superheater front_1_custom_slot = ship_light_battery_2_double mid_1_custom_slot = ship_torpedo_2 mid_2_custom_slot = ship_depth_charge_1 @@ -1327,6 +1329,7 @@ FRA_start_naval_variants = { fixed_ship_engine_slot = light_ship_engine_6 fixed_ship_torpedo_slot = ship_torpedo_2 fixed_ship_role_slot = ship_hull_light_role_dl + fixed_ship_extra_secondaries_slot = ship_superheater front_1_custom_slot = ship_light_battery_2 mid_1_custom_slot = ship_depth_charge_1 mid_2_custom_slot = ship_light_battery_2 @@ -1797,7 +1800,7 @@ JAP_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_2 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double front_2_custom_slot = ship_medium_battery_2_double @@ -1821,7 +1824,7 @@ JAP_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double front_2_custom_slot = ship_medium_battery_2_double @@ -1845,7 +1848,7 @@ JAP_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double front_2_custom_slot = ship_medium_battery_2_double @@ -1869,7 +1872,7 @@ JAP_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_1_custom_slot = ship_airplane_launcher_1 @@ -1935,9 +1938,9 @@ JAP_start_naval_variants = { fixed_ship_battery_slot = ship_light_medium_battery_2 fixed_ship_anti_air_slot = ship_anti_air_2 fixed_ship_fire_control_system_slot = ship_fire_control_system_1 - fixed_ship_engine_slot = cruiser_ship_engine_2 + fixed_ship_engine_slot = cruiser_ship_engine_3 fixed_ship_armor_slot = ship_armor_cruiser_2 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light front_1_custom_slot = ship_light_medium_battery_2 front_2_custom_slot = ship_light_medium_battery_2 mid_1_custom_slot = ship_airplane_launcher_1 @@ -1958,9 +1961,10 @@ JAP_start_naval_variants = { fixed_ship_battery_slot = ship_light_medium_battery_1_double fixed_ship_anti_air_slot = ship_anti_air_1 fixed_ship_fire_control_system_slot = ship_fire_control_system_0 - fixed_ship_engine_slot = cruiser_ship_engine_1 - fixed_ship_armor_slot = ship_armor_cruiser_1 + fixed_ship_engine_slot = civilian_ship_engine_1 + fixed_ship_armor_slot = empty fixed_ship_secondaries_slot = empty + fixed_ship_role_slot = ship_hull_cruiser_role_pc front_1_custom_slot = empty mid_1_custom_slot = ship_airplane_launcher_1 mid_2_custom_slot = ship_torpedo_1 @@ -1979,7 +1983,7 @@ JAP_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_airplane_launcher_slot = ship_airplane_launcher_1 front_1_custom_slot = empty mid_1_custom_slot = ship_light_medium_battery_1_single @@ -2000,8 +2004,8 @@ JAP_start_naval_variants = { fixed_ship_battery_slot = ship_light_medium_battery_1_double fixed_ship_anti_air_slot = ship_anti_air_1 fixed_ship_fire_control_system_slot = ship_fire_control_system_0 - fixed_ship_engine_slot = cruiser_ship_engine_2 - fixed_ship_armor_slot = ship_armor_cruiser_1 + fixed_ship_engine_slot = cruiser_ship_engine_1 + fixed_ship_armor_slot = empty fixed_ship_secondaries_slot = empty fixed_ship_airplane_launcher_slot = ship_airplane_launcher_1 front_1_custom_slot = ship_light_battery_2 @@ -2024,7 +2028,7 @@ JAP_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = empty mid_1_custom_slot = ship_light_medium_battery_1_single mid_2_custom_slot = ship_torpedo_1 @@ -2045,7 +2049,7 @@ JAP_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = empty mid_1_custom_slot = empty mid_2_custom_slot = ship_torpedo_1 @@ -2068,6 +2072,7 @@ JAP_start_naval_variants = { fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_role_slot = ship_hull_cruiser_role_ac front_1_custom_slot = ship_light_medium_battery_1_single mid_1_custom_slot = empty mid_2_custom_slot = ship_torpedo_1 @@ -2106,8 +2111,8 @@ JAP_start_naval_variants = { fixed_ship_battery_slot = ship_light_medium_battery_1_single fixed_ship_anti_air_slot = ship_anti_air_1 fixed_ship_fire_control_system_slot = ship_fire_control_system_0 - fixed_ship_engine_slot = cruiser_ship_engine_1 - fixed_ship_armor_slot = ship_armor_cruiser_1 + fixed_ship_engine_slot = civilian_ship_engine_1 + fixed_ship_armor_slot = empty fixed_ship_secondaries_slot = empty fixed_ship_role_slot = ship_hull_cruiser_role_pc mid_1_custom_slot = empty @@ -2531,7 +2536,7 @@ ITA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_2_double mid_1_custom_slot = ship_torpedo_1 @@ -2554,7 +2559,7 @@ ITA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_2 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light fixed_ship_role_slot = ship_hull_cruiser_role_ca fixed_ship_extra_secondaries_slot = ship_armor_extra front_1_custom_slot = ship_medium_battery_2_double @@ -2578,7 +2583,7 @@ ITA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_2 + fixed_ship_secondaries_slot = ship_secondaries_2_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_1_double front_2_custom_slot = ship_anti_air_1 @@ -2623,7 +2628,7 @@ ITA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_3 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_2 mid_1_custom_slot = ship_torpedo_2 mid_2_custom_slot = ship_airplane_launcher_1 @@ -2644,7 +2649,7 @@ ITA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_3 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_2_double mid_2_custom_slot = ship_torpedo_2 mid_3_custom_slot = ship_airplane_launcher_1 @@ -2665,7 +2670,7 @@ ITA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_3 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_2_double mid_2_custom_slot = ship_torpedo_1 mid_3_custom_slot = ship_airplane_launcher_1 @@ -2686,7 +2691,7 @@ ITA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_1_single mid_2_custom_slot = ship_torpedo_1 mid_3_custom_slot = ship_mine_layer_1 @@ -3219,6 +3224,7 @@ SOV_start_naval_variants = { fixed_ship_engine_slot = light_ship_engine_6 fixed_ship_torpedo_slot = ship_torpedo_2 fixed_ship_role_slot = ship_hull_light_role_dl + fixed_ship_extra_secondaries_slot = ship_superheater front_1_custom_slot = ship_light_battery_2 front_2_custom_slot = ship_light_battery_2 mid_1_custom_slot = ship_light_battery_2 @@ -3745,7 +3751,7 @@ USA_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_1_double mid_1_custom_slot = ship_anti_air_1 @@ -4138,7 +4144,7 @@ AST_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_medium_battery_2_double mid_2_custom_slot = ship_anti_air_1 mid_3_custom_slot = ship_torpedo_2 @@ -4179,7 +4185,7 @@ AST_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_1_single mid_1_custom_slot = empty mid_2_custom_slot = empty @@ -5009,9 +5015,9 @@ HOL_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_1_double - mid_1_custom_slot = ship_secondaries_1 + mid_1_custom_slot = ship_secondaries_1_light mid_2_custom_slot = ship_torpedo_1 mid_3_custom_slot = ship_torpedo_1 rear_1_custom_slot = ship_light_medium_battery_1_double @@ -5030,7 +5036,7 @@ HOL_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_1 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_2 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_2_double mid_1_custom_slot = ship_anti_air_1 mid_2_custom_slot = ship_airplane_launcher_1 @@ -5051,7 +5057,7 @@ HOL_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_1_single mid_1_custom_slot = ship_anti_air_1 mid_2_custom_slot = ship_light_medium_battery_1_single @@ -5410,7 +5416,7 @@ SPR_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light fixed_ship_role_slot = ship_hull_cruiser_role_ca front_1_custom_slot = ship_medium_battery_1_double mid_1_custom_slot = ship_torpedo_1 @@ -5431,7 +5437,7 @@ SPR_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_2 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_medium_battery_2_single mid_1_custom_slot = ship_torpedo_1 mid_2_custom_slot = ship_light_medium_battery_2_double @@ -5451,7 +5457,7 @@ SPR_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = empty mid_1_custom_slot = ship_torpedo_1 mid_2_custom_slot = ship_light_medium_battery_1_single @@ -5472,7 +5478,7 @@ SPR_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light mid_1_custom_slot = empty mid_2_custom_slot = ship_light_medium_battery_1_single mid_3_custom_slot = empty @@ -5634,17 +5640,16 @@ SWE_start_naval_variants = { type = vnr_ship_hull_cruiser_coastal_defense_ship name_group = SWE_CA_HISTORICAL modules = { - fixed_ship_battery_slot = ship_light_medium_battery_1_single - fixed_ship_anti_air_slot = ship_anti_air_1 + fixed_ship_battery_slot = ship_light_medium_battery_1_double + fixed_ship_anti_air_slot = empty fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = empty - front_1_custom_slot = ship_light_medium_battery_1_single - mid_1_custom_slot = ship_light_medium_battery_1_single + fixed_ship_secondaries_slot = ship_secondaries_1 + front_1_custom_slot = ship_light_medium_battery_1_double + mid_1_custom_slot = ship_light_medium_battery_1_double mid_2_custom_slot = ship_torpedo_1 - rear_1_custom_slot = ship_light_medium_battery_1_single - rear_2_custom_slot = ship_depth_charge_1 + rear_1_custom_slot = ship_light_medium_battery_1_double } } create_equipment_variant = { @@ -5659,7 +5664,7 @@ SWE_start_naval_variants = { fixed_ship_fire_control_system_slot = ship_fire_control_system_0 fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = ship_armor_cruiser_1 - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light mid_1_custom_slot = ship_airplane_launcher_1 mid_2_custom_slot = ship_airplane_launcher_1 mid_3_custom_slot = ship_light_medium_battery_1_single diff --git a/src/common/scripted_effects/_add_never_built.txt b/src/common/scripted_effects/_add_never_built.txt index 9a54547..fd0b6b3 100755 --- a/src/common/scripted_effects/_add_never_built.txt +++ b/src/common/scripted_effects/_add_never_built.txt @@ -580,7 +580,7 @@ KuK_never_built_blueprints = { fixed_ship_radar_slot = empty fixed_ship_engine_slot = cruiser_ship_engine_1 fixed_ship_armor_slot = empty - fixed_ship_secondaries_slot = ship_secondaries_1 + fixed_ship_secondaries_slot = ship_secondaries_1_light front_1_custom_slot = ship_light_battery_1 front_2_custom_slot = ship_light_battery_1 mid_1_custom_slot = ship_torpedo_1 diff --git a/src/common/scripted_effects/_delete_starting_naval.txt b/src/common/scripted_effects/_delete_starting_naval.txt index 4438ad9..24a1682 100755 --- a/src/common/scripted_effects/_delete_starting_naval.txt +++ b/src/common/scripted_effects/_delete_starting_naval.txt @@ -12,13 +12,20 @@ delete_starting_naval_oob = { special_project_workaround = { USA = { - complete_special_project = { - project = sp:sp_naval_cruiser_submarine - } + complete_special_project = sp:sp_naval_cruiser_submarine + complete_special_project = sp:sp_super_heavy_guns } JAP = { - complete_special_project = { - project = sp:sp_naval_super_heavy_battleship - } + complete_special_project = sp_naval_super_heavy_battleship + complete_special_project = sp:sp_super_heavy_guns + } + ENG = { + complete_special_project = sp:sp_super_heavy_guns + } + FRA = { + complete_special_project = sp:sp_high_speed_light_engine + } + SOV = { + complete_special_project = sp:sp_high_speed_light_engine } } \ 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 6fbd171..5eff5c4 100755 --- a/src/common/special_projects/projects/naval_projects.txt +++ b/src/common/special_projects/projects/naval_projects.txt @@ -826,6 +826,68 @@ sp_early_informatization_system = { } } + generic_prototype_rewards = { + sp_naval_generic_reward_scientist_xp_1 + sp_naval_generic_reward_scientist_xp_2 + sp_naval_generic_reward_scientist_xp_3 + sp_naval_generic_reward_navy_xp_1 + sp_naval_generic_reward_navy_xp_2 + sp_naval_generic_reward_navy_xp_3 + sp_naval_generic_reward_major_progress_1 + sp_naval_generic_reward_major_progress_2 + sp_naval_generic_reward_major_progress_3 + sp_naval_generic_reward_test_failure_1 + sp_naval_generic_reward_test_failure_2 + sp_naval_generic_reward_test_failure_3 + } +} + +sp_high_speed_light_engine = { + specialization = specialization_naval + project_tags = { sp_tag_surface_ship } + allowed = { + has_dlc = "Man the Guns" + } + available = { + FROM = { + has_tech = basic_ship_hull_light + has_tech = fuel_oil_boiler + } + } + resource_cost = { + resources = { + steel = 6 + tungsten = 4 + chromium = 4 + } + } + breakthrough_cost = { + specialization_naval = 1 + } + + prototype_time = sp_time.prototype.short + + complexity = sp_complexity.small + + project_output = { + enable_equipment_modules = { + ship_superheater + } + country_effects = { + custom_effect_tooltip = { + localization_key = SP_UNLOCK_TECH + TECH = high_speed_light_engine + } + custom_override_tooltip = { + tooltip = tech_effect|high_speed_light_engine + set_technology = { + high_speed_light_engine = 1 + popup = no + } + } + } + } + generic_prototype_rewards = { sp_naval_generic_reward_scientist_xp_1 sp_naval_generic_reward_scientist_xp_2 diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt index 23c56c9..34054d2 100755 --- a/src/common/technologies/MTG_naval.txt +++ b/src/common/technologies/MTG_naval.txt @@ -760,7 +760,13 @@ technologies = { } high_speed_light_engine = { - research_cost = 0.6 + is_special_project_tech = yes + allow = { + ROOT = { + is_special_project_completed = sp:sp_high_speed_light_engine + } + } + research_cost = 0.8 enable_equipment_modules = { light_ship_engine_6 } @@ -1698,9 +1704,6 @@ technologies = { ship_armor_cruiser_1 ship_armor_cruiser_heavy_1 } - on_research_complete = { - custom_effect_tooltip = cruiser_armor_advice_tt - } xp_research_type = navy xp_boost_cost = 20 @@ -1741,8 +1744,18 @@ technologies = { ship_armor_cruiser_2 ship_armor_cruiser_heavy_2 } + on_research_complete_limit = { + NOT = { + has_tech = basic_heavy_armor + } + } on_research_complete = { - custom_effect_tooltip = cruiser_armor_advice_tt + custom_effect_tooltip = cruiser_armor_research_tt + add_tech_bonus = { + bonus = 0.5 + uses = 1 + technology = basic_heavy_armor + } } xp_research_type = navy @@ -1787,8 +1800,18 @@ technologies = { ship_armor_cruiser_3 ship_armor_cruiser_heavy_3 } + on_research_complete_limit = { + NOT = { + has_tech = improved_heavy_armor + } + } on_research_complete = { - custom_effect_tooltip = cruiser_armor_advice_tt + custom_effect_tooltip = cruiser_armor_research_tt + add_tech_bonus = { + bonus = 0.5 + uses = 1 + technology = improved_heavy_armor + } } xp_research_type = navy @@ -1833,8 +1856,18 @@ technologies = { ship_armor_cruiser_4 ship_armor_cruiser_heavy_4 } + on_research_complete_limit = { + NOT = { + has_tech = advanced_heavy_armor + } + } on_research_complete = { - custom_effect_tooltip = cruiser_armor_advice_tt + custom_effect_tooltip = cruiser_armor_research_tt + add_tech_bonus = { + bonus = 0.5 + uses = 1 + technology = advanced_heavy_armor + } } xp_research_type = navy @@ -2111,6 +2144,7 @@ technologies = { start_year = 1946 enable_equipment_modules = { ship_hull_cruiser_role_cg + ship_hull_cruiser_role_cgaa } dependencies = { ship_to_ship_missile = 1 @@ -2912,8 +2946,14 @@ technologies = { ship_armor_bc_2 } + on_research_complete_limit = { + NOT = { + has_tech = basic_cruiser_armor + } + } on_research_complete = { - custom_effect_tooltip = heavy_armor_advice_tt + custom_effect_tooltip = heavy_armor_research_tt + set_technology = { basic_cruiser_armor = 1 } } xp_research_type = navy @@ -2953,8 +2993,14 @@ technologies = { ship_armor_bc_3 } + on_research_complete_limit = { + NOT = { + has_tech = improved_cruiser_armor + } + } on_research_complete = { - custom_effect_tooltip = heavy_armor_advice_tt + custom_effect_tooltip = heavy_armor_research_tt + set_technology = { improved_cruiser_armor = 1 } } start_year = 1936 @@ -2998,8 +3044,14 @@ technologies = { ship_armor_shbb_2 } + on_research_complete_limit = { + NOT = { + has_tech = advanced_cruiser_armor + } + } on_research_complete = { - custom_effect_tooltip = heavy_armor_advice_tt + custom_effect_tooltip = heavy_armor_research_tt + set_technology = { advanced_cruiser_armor = 1 } } xp_research_type = navy diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt index c1079e7..db1dbbc 100755 --- a/src/common/technologies/MTG_naval_Support.txt +++ b/src/common/technologies/MTG_naval_Support.txt @@ -34,6 +34,7 @@ technologies = { ship_heavy_battery_big_1 ship_heavy_battery_small_1 ship_secondaries_1 + ship_secondaries_1_light ship_civilian_light_battery_1 ship_anti_air_1_h @@ -176,6 +177,7 @@ technologies = { dp_light_battery_1_single dp_ship_secondaries_1 dp_ship_secondaries_1_bb + ship_secondaries_2_light ship_anti_air_2_h } diff --git a/src/common/units/critical_parts/00_critical_parts.txt b/src/common/units/critical_parts/00_critical_parts.txt index 56f05ae..e5149c3 100755 --- a/src/common/units/critical_parts/00_critical_parts.txt +++ b/src/common/units/critical_parts/00_critical_parts.txt @@ -136,13 +136,16 @@ critical_parts = { damaged_fire_control = { icon = "GFX_default_critical_damage_icons" - frame = 6 + frame = 3 stat_penalties = { naval_light_gun_hit_chance_factor = -0.5 naval_heavy_gun_hit_chance_factor = -0.5 } chance = 0.15 + org_damage_multiplier = 0.25 + str_damage_multiplier = 0.25 base_damage_instance = 1 + damage_instance_per_added_module = 1 max_damage_instance = 1 } damaged_wooden_flight_deck = { @@ -154,8 +157,12 @@ critical_parts = { modifier = { navy_org_factor = -0.3 } - org_damage_multiplier = 1.25 - str_damage_multiplier = 1.25 + chance = 0.75 + org_damage_multiplier = 1 + str_damage_multiplier = 1 + base_damage_instance = 1 + damage_instance_per_added_module = 1 + max_damage_instance = 1 } damaged_armored_flight_deck = { icon = "GFX_default_critical_damage_icons" @@ -166,9 +173,12 @@ critical_parts = { modifier = { navy_org_factor = -0.15 } - chance = 0.75 - org_damage_multiplier = 1 - str_damage_multiplier = 1 + chance = 0.5 + org_damage_multiplier = 0.75 + str_damage_multiplier = 0.75 + base_damage_instance = 1 + damage_instance_per_added_module = 1 + max_damage_instance = 1 } gas_leakage = { icon = "GFX_default_critical_damage_icons" 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 a3a56f4..7530d82 100755 --- a/src/common/units/equipment/modules/00_ship_modules_aviation.txt +++ b/src/common/units/equipment/modules/00_ship_modules_aviation.txt @@ -17,7 +17,7 @@ equipment_modules = { carrier_size = 3 build_cost_ic = 1800 reliability = -0.1 - max_organisation = -0.1 + max_organisation = -0.2 surface_detection = 5 supply_consumption = 0.02 } 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 9f1f305..12c1215 100755 --- a/src/common/units/equipment/modules/00_ship_modules_gun.txt +++ b/src/common/units/equipment/modules/00_ship_modules_gun.txt @@ -17,7 +17,7 @@ equipment_modules = { add_stats = { lg_attack = 0.5 - build_cost_ic = 10 + build_cost_ic = 30 } multiply_stats = { naval_speed = -0.001 @@ -39,7 +39,7 @@ equipment_modules = { add_stats = { lg_attack = 1 - build_cost_ic = 20 + build_cost_ic = 40 } multiply_stats = { @@ -62,7 +62,7 @@ equipment_modules = { add_stats = { lg_attack = 1.5 - build_cost_ic = 30 + build_cost_ic = 50 } add_average_stats = { @@ -84,8 +84,8 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - lg_attack = 2.5 - build_cost_ic = 40 + lg_attack = 2 + build_cost_ic = 60 } multiply_stats = { naval_speed = -0.01 @@ -106,7 +106,7 @@ equipment_modules = { add_stats = { lg_attack = 1 - build_cost_ic = 20 + build_cost_ic = 45 } multiply_stats = { naval_speed = -0.001 @@ -128,7 +128,7 @@ equipment_modules = { add_stats = { lg_attack = 1.5 - build_cost_ic = 40 + build_cost_ic = 60 } multiply_stats = { @@ -151,7 +151,7 @@ equipment_modules = { add_stats = { lg_attack = 2.5 - build_cost_ic = 60 + build_cost_ic = 80 } add_average_stats = { @@ -172,8 +172,8 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - lg_attack = 4 - build_cost_ic = 80 + lg_attack = 3.5 + build_cost_ic = 100 } multiply_stats = { naval_speed = -0.01 @@ -219,7 +219,7 @@ equipment_modules = { add_stats = { lg_attack = 1.5 anti_air_attack = 0.75 - build_cost_ic = 100 + build_cost_ic = 85 } multiply_stats = { naval_speed = -0.01 @@ -243,7 +243,7 @@ equipment_modules = { add_stats = { lg_attack = 2.5 anti_air_attack = 1 - build_cost_ic = 150 + build_cost_ic = 100 } multiply_stats = { naval_speed = -0.015 @@ -265,9 +265,9 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - lg_attack = 4 + lg_attack = 3.5 anti_air_attack = 1.25 - build_cost_ic = 200 + build_cost_ic = 130 } multiply_stats = { naval_speed = -0.02 @@ -288,10 +288,10 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - lg_attack = 6 + lg_attack = 5 anti_air_attack = 1.75 naval_light_gun_hit_chance_factor = 0.01 - build_cost_ic = 140 + build_cost_ic = 200 } multiply_stats = { naval_speed = -0.02 @@ -312,7 +312,7 @@ equipment_modules = { add_stats = { lg_attack = 0.5 anti_air_attack = 0.25 - build_cost_ic = 25 + build_cost_ic = 40 } multiply_stats = { naval_speed = -0.005 @@ -335,7 +335,7 @@ equipment_modules = { add_stats = { lg_attack = 1 anti_air_attack = 0.5 - build_cost_ic = 50 + build_cost_ic = 65 } multiply_stats = { naval_speed = -0.01 @@ -358,7 +358,7 @@ equipment_modules = { add_stats = { lg_attack = 1.5 anti_air_attack = 0.75 - build_cost_ic = 75 + build_cost_ic = 80 } multiply_stats = { naval_speed = -0.015 @@ -379,9 +379,9 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - lg_attack = 2.5 + lg_attack = 2 anti_air_attack = 1 - build_cost_ic = 100 + build_cost_ic = 110 } multiply_stats = { naval_speed = -0.02 @@ -402,10 +402,10 @@ equipment_modules = { sfx = sfx_ui_sd_module_turret add_stats = { - lg_attack = 4 + lg_attack = 3.5 anti_air_attack = 1.5 naval_light_gun_hit_chance_factor = 0.01 - build_cost_ic = 100 + build_cost_ic = 160 } multiply_stats = { naval_speed = -0.015 @@ -2009,6 +2009,51 @@ equipment_modules = { critical_parts = { damaged_secondaries } } + ship_secondaries_1_light = { + category = ship_secondaries_light + gui_category = ship_secondaries + sfx = sfx_ui_sd_module_turret + + + add_stats = { + lg_attack = 1.5 + build_cost_ic = 180 + } + + multiply_stats = { + naval_speed = -0.01 + } + + add_average_stats = { + lg_armor_piercing = 5 + } + + dismantle_cost_ic = 54 + critical_parts = { damaged_secondaries } + } + + ship_secondaries_2_light = { + category = ship_secondaries_light + gui_category = ship_secondaries + parent = ship_secondaries_1_light + sfx = sfx_ui_sd_module_turret + + add_stats = { + lg_attack = 2.5 + build_cost_ic = 240 + } + multiply_stats = { + naval_speed = -0.015 + } + + add_average_stats = { + lg_armor_piercing = 7 + } + + dismantle_cost_ic = 72 + critical_parts = { damaged_secondaries } + } + dp_ship_secondaries_1 = { abbreviation = "sax" category = ship_dp_secondaries 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 e402f09..a078fd8 100755 --- a/src/common/units/equipment/modules/00_ship_modules_propulsion.txt +++ b/src/common/units/equipment/modules/00_ship_modules_propulsion.txt @@ -150,20 +150,18 @@ equipment_modules = { } light_ship_engine_6 = { abbreviation = "sbq1" - category = light_ship_engine - parent = light_ship_engine_2 + category = light_ship_engine_high_speed sfx = sfx_ui_sd_module_engine - add_stats = { #naval_speed = 5 fuel_consumption = 23 - build_cost_ic = 200 + build_cost_ic = 450 reliability = -0.1 } multiply_stats = { - naval_speed = 0.45 + naval_speed = 0.35 } can_convert_from = { diff --git a/src/common/units/equipment/modules/00_ship_modules_role.txt b/src/common/units/equipment/modules/00_ship_modules_role.txt index af6873b..40b52a0 100755 --- a/src/common/units/equipment/modules/00_ship_modules_role.txt +++ b/src/common/units/equipment/modules/00_ship_modules_role.txt @@ -158,6 +158,7 @@ equipment_modules = { ship_missile ship_missile_aa raider_kit + heavy_miscellaneous } } ship_hull_cruiser_role_ca = { @@ -211,6 +212,7 @@ equipment_modules = { ship_missile ship_missile_aa raider_kit + heavy_miscellaneous } } ship_hull_cruiser_role_clc = { @@ -231,6 +233,7 @@ equipment_modules = { ship_missile ship_missile_aa raider_kit + heavy_miscellaneous } } ship_hull_cruiser_role_rc = { @@ -261,6 +264,7 @@ equipment_modules = { ship_missile ship_missile_aa ship_airplane_launcher + heavy_miscellaneous } } ship_hull_cruiser_role_cg = { @@ -279,6 +283,24 @@ equipment_modules = { raider_kit } } + ship_hull_cruiser_role_cgaa = { + category = c_role_missile + gui_category = c_role + multiply_stats = { + anti_air_attack = 0.1 + build_cost_ic = 0.15 + } + add_stats = { + max_strength = 65 + } + forbid_module_categories = { + ship_medium_heavy_battery_triple + ship_medium_heavy_battery_double + ship_cruiser_heavy_armor + ship_missile + raider_kit + } + } ship_hull_cruiser_role_csr = { category = c_role add_stats = { @@ -293,6 +315,7 @@ equipment_modules = { raider_kit ship_missile ship_missile_aa + heavy_miscellaneous } } ship_hull_cruiser_role_ac = { 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 fe02f81..ef9cb57 100755 --- a/src/common/units/equipment/modules/00_ship_modules_support.txt +++ b/src/common/units/equipment/modules/00_ship_modules_support.txt @@ -451,7 +451,7 @@ equipment_modules = { } multiply_stats = { - sub_visibility = 0.045 + sub_visibility = 0.055 naval_speed = -0.02 } @@ -479,7 +479,7 @@ equipment_modules = { } multiply_stats = { - sub_visibility = 0.04 + sub_visibility = 0.06 naval_speed = -0.03 } @@ -504,7 +504,7 @@ equipment_modules = { } multiply_stats = { - sub_visibility = 0.035 + sub_visibility = 0.065 naval_speed = -0.04 } @@ -523,13 +523,13 @@ equipment_modules = { add_stats = { torpedo_attack = 30 - sub_attack = 5 + sub_attack = 2.5 build_cost_ic = 180 naval_torpedo_hit_chance_factor = 0.05 } multiply_stats = { - sub_visibility = 0.03 + sub_visibility = 0.07 naval_speed = -0.05 } @@ -1377,4 +1377,21 @@ equipment_modules = { armor_value = 3 } } + ship_superheater = { + category = light_miscellaneous + + add_stats = { + build_cost_ic = 350 + reliability = -0.05 + } + multiply_stats = { + naval_speed = 0.1 + } + dismantle_cost_ic = 50 + forbid_module_categories = { + light_ship_engine + civilian_ship_engine + cruiser_ship_engine + } + } } \ No newline at end of file diff --git a/src/common/units/equipment/ship_hull_carrier.txt b/src/common/units/equipment/ship_hull_carrier.txt index 60fb132..1cf9c87 100755 --- a/src/common/units/equipment/ship_hull_carrier.txt +++ b/src/common/units/equipment/ship_hull_carrier.txt @@ -207,7 +207,7 @@ equipments = { } fixed_ship_armor_slot = { required = no - allowed_module_categories = { ship_carrier_armor ship_carrier_armor_heavy ship_armor_carrier_shbb } + allowed_module_categories = { ship_carrier_armor ship_carrier_armor_heavy ship_carrier_armor_shbb } } fixed_ship_carrier_miscellaneous_slot_1 = inherit fixed_ship_carrier_miscellaneous_slot_2 = inherit @@ -619,7 +619,7 @@ equipments = { archetype = ship_hull_carrier model = ship_hull_super_carrier priority = 1000 - can_convert_from = { vnr_ship_hull_super_carrier } + can_convert_from = { vnr_ship_hull_super_carrier vnr_ship_hull_carrier_3 } parent = vnr_ship_hull_carrier_3 module_slots = { fixed_ship_deck_slot_1 = { diff --git a/src/common/units/equipment/ship_hull_cruiser.txt b/src/common/units/equipment/ship_hull_cruiser.txt index 1194145..92683d7 100755 --- a/src/common/units/equipment/ship_hull_cruiser.txt +++ b/src/common/units/equipment/ship_hull_cruiser.txt @@ -50,7 +50,7 @@ equipments = { } fixed_ship_secondaries_slot = { required = no - allowed_module_categories = { ship_secondaries ship_dp_secondaries } + allowed_module_categories = { ship_secondaries_light ship_dp_secondaries } } fixed_ship_armor_slot = { required = no @@ -104,7 +104,7 @@ equipments = { dp_light_battery_single ship_medium_heavy_battery_triple ship_medium_heavy_battery_double - ship_secondaries + ship_secondaries_light ship_dp_secondaries ship_airplane_launcher ship_mine_layer @@ -606,7 +606,7 @@ equipments = { } fixed_ship_secondaries_slot = { required = no - allowed_module_categories = { ship_secondaries ship_dp_secondaries } + allowed_module_categories = { ship_secondaries_light ship_dp_secondaries } } fixed_ship_armor_slot = { required = no @@ -660,7 +660,7 @@ equipments = { dp_light_battery_single ship_medium_heavy_battery_triple ship_medium_heavy_battery_double - ship_secondaries + ship_secondaries_light ship_dp_secondaries ship_airplane_launcher ship_mine_layer @@ -853,7 +853,7 @@ equipments = { allowed_module_categories = { ship_torpedo ship_anti_air - ship_secondaries + ship_secondaries_light ship_dp_secondaries ship_airplane_launcher ship_mine_layer @@ -917,7 +917,7 @@ equipments = { priority = 1900 parent = vnr_ship_hull_cruiser_5 naval_speed = 34 - reliability = 1.25 + reliability = 1 manpower = 1800 build_cost_ic = 2500 naval_range = 5000 @@ -990,7 +990,7 @@ equipments = { allowed_module_categories = { ship_torpedo ship_anti_air - ship_secondaries + ship_secondaries_light ship_dp_secondaries ship_airplane_launcher ship_mine_layer @@ -1112,7 +1112,7 @@ equipments = { ship_light_battery_double dp_light_battery dp_light_battery_single - ship_secondaries + ship_secondaries_light ship_dp_secondaries ship_airplane_launcher ship_mine_layer diff --git a/src/common/units/equipment/ship_hull_heavy.txt b/src/common/units/equipment/ship_hull_heavy.txt index b376250..a48422b 100755 --- a/src/common/units/equipment/ship_hull_heavy.txt +++ b/src/common/units/equipment/ship_hull_heavy.txt @@ -229,7 +229,7 @@ equipments = { } fixed_ship_radar_slot = { required = no - allowed_module_categories = { ship_radar ship_mast } + allowed_module_categories = { ship_mast } } fixed_ship_engine_slot = { required = yes @@ -293,10 +293,10 @@ equipments = { } naval_range = 2000 - max_strength = 180 + max_strength = 120 naval_speed = 21 fuel_consumption = 67 - reliability = 0.65 + reliability = 0.5 build_cost_ic = 2000 resources = { steel = 2 @@ -306,6 +306,7 @@ equipments = { manpower = 1500 } + vnr_ship_hull_heavy_1 = { derived_variant_name = battleship_equipment_1 year = 1914 @@ -874,7 +875,7 @@ equipments = { naval_speed = 32 fuel_consumption = 70 surface_visibility = 30 - reliability = 1.4 + reliability = 1.25 build_cost_ic = 3500 resources = { steel = 4 diff --git a/src/common/units/equipment/ship_hull_light.txt b/src/common/units/equipment/ship_hull_light.txt index 6ff1e57..928cf2d 100755 --- a/src/common/units/equipment/ship_hull_light.txt +++ b/src/common/units/equipment/ship_hull_light.txt @@ -52,7 +52,7 @@ equipments = { } fixed_ship_engine_slot = { required = yes - allowed_module_categories = { light_ship_engine } + allowed_module_categories = { light_ship_engine light_ship_engine_high_speed } } fixed_ship_role_slot = { required = yes diff --git a/src/common/units/equipment/ship_hull_submarine.txt b/src/common/units/equipment/ship_hull_submarine.txt index 88b915f..fc212fa 100755 --- a/src/common/units/equipment/ship_hull_submarine.txt +++ b/src/common/units/equipment/ship_hull_submarine.txt @@ -244,7 +244,7 @@ equipments = { fixed_ship_armor_slot = pressure_hull_3 } - sub_visibility = 18 + sub_visibility = 19 naval_speed = 18 reliability = 0.75 @@ -296,7 +296,7 @@ equipments = { fixed_ship_armor_slot = pressure_hull_4 } - sub_visibility = 15 + sub_visibility = 16 naval_speed = 18 reliability = 0.80 @@ -356,7 +356,7 @@ equipments = { fixed_ship_armor_slot = pressure_hull_4 } - sub_visibility = 11 + sub_visibility = 13 naval_speed = 18 reliability = 1.5 diff --git a/src/descriptor.mod b/src/descriptor.mod index 4f989ab..0c0853b 100755 --- a/src/descriptor.mod +++ b/src/descriptor.mod @@ -1,4 +1,4 @@ -version="v1.20 - Nuclear Might" +version="v2.0 - Hunt For Red October" tags={ "Military" "Translation" diff --git a/src/documentation/Guide.md b/src/documentation/Guide.md index e1f8787..da6b3a4 100755 --- a/src/documentation/Guide.md +++ b/src/documentation/Guide.md @@ -1,7 +1,7 @@ # A Simple Guide to Vanilla Navy Rework # ## Preface ## -Hi, this is the author of VNR, MrPunk. VNR is a naval overhaul mod with a huge amount of new contents and mechanisms, though its core is still similar to vanilla. I bet most people, whether experienced in navy or not, might face a hard time adjusting to a fresh style of naval game. I'm not an expert, but I want to write down this guide with insights during my modding process, in an attempt to relieve players from duplicate learning. +Welcome aboard, admirals! This is the author of VNR, MrPunk. VNR is a naval overhaul mod with a huge amount of new contents and mechanisms, though its core is still similar to vanilla. I bet most people, whether experienced in navy or not, might face a hard time adjusting to a fresh style of naval game. I'm not an expert, but I want to write down this guide with insights during my modding process, in an attempt to relieve players from duplicate learning. You can play VNR in different ways. Stick to history if you want to do it in a realistic style, or create meta designs to simply be a winner. It's up to you which style to pick, and VNR always offers numerous things for you to achieve that. @@ -13,38 +13,41 @@ Designer is the basic of VNR and the most important components you deal with. To **Firepower** Firepower in HOI4 is split into 3 types of attacks, light, heavy and torpedo. +- Light attack is provided by light or light-medium batteries on destroyers and cruisers, and secondary batteries on capital ships. It's very effective against light ships in terms of accuracy. +- Heavy attack is the damage done by heavy batteries on battleships or battlecruisers, and medium guns on heavy cruisers by a very small amount. Heavy guns usually have better piercing effects against heavy armor, but will be rendered ineffective in the face of screen ships. +- Torpedo has a different way to cause damage than guns, which it simply ignores armor. Despite great power and high critical chance, torpedo is fired in a slower pace and suffers a great penalty on precision against fleet with good screen efficiency. -Light attack is provided by batteries on destroyers and cruisers, and secondary batteries on capital ships. Heavy attack is the damage done by heavy batteries on battleships or battlecruisers, and medium guns on heavy cruisers by a very small amount. While damage caused by guns is affected by armor of target which their ratio leads to very different damage and critical chance, torpedo simply ignores armor and can cause great damage and score more critical hits, but it's fired more slowly and suffers a great penalty on hit chance when screen efficiency is good. Given that enemy's screen efficiency is one vital factor in the equation, swiftly eliminating its screen ships paves the way to a grand victory because low screen efficiency of the other side will make dynamics at sea more favorable to your side. +A conclusion can be drawn here. With the other side's screen efficiency totally crushed, your fleet will have an upper hand in hitting and evasion. Light attack is one of the most important factors you should secure in the design, but that's not the whole picture. Diversity can still be useful sometimes, leaving you with other options when light gun is unable to fully complete the mission. Undoutedly, heavy gun and torpedo are not main sources of damage since they are limited by internal and external factors, but they have a higher chance to sink a capital ship rather than just leave a scratch on it. -A conclusion can be drawn here. Light gun is very efficient against light ships, with the other side's screen efficiency totally crushed, your fleet will have an upper hand in hitting and evasion. Heavy gun can do more damage to heavy ships due to its heavy armor piercing effects, though it's not common to see battleships sunk by it. Torpedo have a higher critical chance against heavy ships and carriers which often deals triple or even quadruple damages, but its setbacks are long loading time and low hit chance. +Given that enemy's screen efficiency is one vital factor in the equation, swiftly eliminating its screen ships paves the way to a grand victory. -Carrier, on the other hand, is very different from all the firepowers mentioned above. Its damage relies on your air variants and sortie efficiency, and is only affected by weather, anti-air and night. +Carrier, on the other hand, is very different from all kinds of firepower mentioned above. Its damage depends on your air variants and sortie efficiency, and is only affected by weather, anti-air and night. **Protection** -The protection of ships varies on different hulls. For example, destroyer has close to zero protection, cruiser has armor plates, while battleship possesses armor, scheme and torpedo defense systems. +Protection varies on different hulls. For example, destroyer has close to zero protection, cruiser has armor plates, while battleship possesses armor plates, armor schemes and torpedo defense systems. -When HP gets reduced to 0, the ship will be sunk. Typically, the two ways to avoid it will be enhancing your ship in terms of HP and armor strength. Having more HP brings obvious benefits that the ship can take more damage before sunk. Armor improves survivability with a different approach to reduce damage received each time it's hit. Based on the formula listed in intro panel, if armor piercing of a gun is lower than half of the armor, its damage is reduced to 20% of its original value. As a result, armor is extremely useful against guns. +When HP gets reduced to 0, the ship will be sunk. Typically, there are two ways to avoid it. Having more HP brings obvious benefits to the ship, and allows it to take more damage before sunk. Armor improves survivability with a different approach by reducing damage received each time it's hit. Based on the formula listed in intro panel, if armor piercing of a gun is lower than half of the armor, its damage is reduced to 20% of its original value. In a scenario where battleships fight toe-to-toe combat, armor is extremely useful against guns. -Torpedo completely ignores armor and can cause great damage. Even torpedo defense system is not effective enough to save the ship if it gets hit by torpedo. But luckily, with a good escort force, torpedo will have a hard time penetrating the screen line to get your capital ships. +However, armor is not invincible if you take other types of firepower into consideration. For example, torpedo completely ignore armor, and it can do so much damage that even torpedo defense system is not effective enough to save the ship when it's hit. Luckily, with a good escort force, torpedo will have a hard time penetrating the screen line to get your capital ships. -Contrary to most people's impression, anti-air is also a part of protection facing aircrafts and carriers. Good AA provides damage reduction or even evasion when attacked by planes, and it gets more bonus from the overall AA from your fleet, factored to align with the ship's. That means a ship without anti-air gun can also benefit from other ships' AA, but anti-air guns are mandatory if you want to shoot down the plane. +Contrary to most people's impression, anti-air is also a part of protection facing aircrafts and carriers. Strong AA offers damage reduction or even evasion when attacked by planes, and it can get more bonus from the overall AA of your fleet, factored to align with the ship's. That means a ship without anti-air gun can also benefit from other ships' AA, but anti-air guns are mandatory if you want to shoot down the plane. **Speed** -Besides stacking armor, another way to improve your ship's survivability is to increase its speed. Higher speed helps reduce ship's hit profile which is compared with hit chance of guns to determine whether your ship is hit or not. As an effective measure to evade gun fires, however, speed is useless against planes. In order to get a higher speed, avoid stacking too many guns or armors on a hull. Generally speaking, you'd better make capital ships around 30kn, light ships 35-40kn. +Besides stacking armor, another way to improve your ship's survivability is to increase its speed. Higher speed helps reduce ship's hit profile, a value that is compared with hit chance of guns to determine whether your ship is hit or not (lower hit profile means the ship is harder to hit). As an effective measure to evade gun fires and torpedoes, however, speed is useless against planes. In order to get a higher speed, you should avoid stacking too many guns or armors on a ship. Generally speaking, you'd better make capital ships around 30kn, light ships 35-40kn. **Reliability** -The impact of reliability is not superficial, but it determines how likely the ship may suffer a critical hit or damaged in accidents. Many immature or complex modules such as quad guns and missiles will cause loss of reliability, making the ship very vulnerable in combat and training, just like the Swedish warship Wasa. In my opinion, low reliability is somewhat tolerable on platforms with higher HP, but it's definitely not recommended on light hulls. +The impact of reliability is not superficial, but it determines how likely the ship may suffer a critical hit or damaged in accidents. Moreover, ships with low reliability get a damage multiplier when they are hit, which it's 8 times higher at 0% reliability. Many immature or complex modules, such as quad guns and missiles, will cause loss of reliability, making the ship very vulnerable in combat and training, just like the Swedish warship Wasa. In my opinion, low reliability is somewhat tolerable on platforms with higher HP, but it's definitely not recommended on light hulls. **Detection** -Detection, or recon, is a very important factor to gain initiativeness in naval combat. It is divided into surface detection and sub detection, with influence on spotting enemy fleet or submarines. Greater detection is always good, but it's also expensive, so only vanguard fleet is usually composed of fast and dedicated recon ships. +Detection, or recon, is a very important factor in initiativeness on the sea. It is divided into surface detection and sub detection, with influence on spotting enemy fleets or submarines respectively. Greater detection is always good, but it's also too expensive to make the advantage universal. Only vanguard fleet is usually composed of fast and dedicated scout ships. Other than that, a set of radar will be all you need. **Cost** -Unless you are playing as US or UK, building a large fleet takes too much time and IC, and it may hamper your army production. This is especially true for countries like Germany or Soviet Union which requires army focus more than anyone else. As a result, keeping the cost of shipbuilding programs under control can make the whole experience of your game smoother. +Unless you are playing as US or UK, building a large fleet takes too much time and IC, and it may hamper your army production as well. This is especially true for countries like Germany or Soviet Union which require army focus more than anyone else. As a result, keeping the cost of shipbuilding programs under control can make the whole experience of your game smoother. ### How to Design Your Ship ### @@ -52,31 +55,38 @@ If you can fully understand the six dimensions, now it's time to design your fir **Carrier** -Carrier serves as the main source of damage in battle, and it's heavily relied on its aircrafts. The most important thing about it is the capacity, which requires you to mount as many hangars as possible. However, having too many hangars will certainly degrade speed and other metrics, especially that organisation and HP will impact sortie efficiency. Thus, you should keep the degradation under control. +Carrier serves as the main source of damage in battle, and it heavily relies on its aircrafts. Despite CV plane templates, the most important thing about a carrier is its capacity, which requires you to mount as many hangars as possible. However, having too many hangars will certainly degrade speed and other metrics, especially that organisation and HP will impact sortie efficiency. Thus you should keep the degradation under control, and take caution in the usage of large open hangar which harms these stats to a large extent. **Heavy Ship** -You can't skip heavy ships, such as battleships and battlecruisers, in your fleet. While screen ships escort capital ships, these heavy ships will escort carriers and boost their survivability by drawing aircrafts' attack. It's hard to summarize the key to such ship because it literally needs every aspect to be perfectly balanced. Firepower may not be the keypoint on battleships since their maximum HP is almost immortal compared to guns' heavy attack, but armor and AA are needed to protect itself and other ships, especially carriers. In that case, a historical battleship is more than sufficient to be included in a strike taskforce. +You can't skip heavy ships in your fleet, such as battleships and battlecruisers. While screen ships escort capital ships, these heavy ships will escort carriers and boost their survivability by drawing attacks from aircrafts. It's hard to summarize the key to this type of ship because it literally needs every aspect to be perfectly balanced. Among them, firepower could be the most irrelevant factor in battleship designs since their maximum HP is almost immortal compared to guns' heavy attack, but armor and AA are definitely needed to protect itself and other ships, especially carriers. In that case, a historical battleship is more than sufficient to fit in any taskforce in the mod. -On the other hand, battlecruiser is not a good option despite its advantage of speed. Its chance to receive critical hit is higher than battleship, which battleship with high speed engine is already fast enough. +On the contrary, battlecruiser is not a good option despite its advantage of speed. Except a higher chance to receive critical hits, battlecruiser in 1936 is starting to show marginal utilities (positive effect from speed gradually reduces as you keep investing in it). As for super heavy battleships, you can mount one gun on it to fully utilize its high HP, but normally it's not recommended. **Cruiser** -Unlike vanilla, heavy cruiser and light cruiser in VNR are not defined by its gun caliber but by role. Yet there are still differences between cruiser guns. Light medium guns are similar to their origins, but medium guns have bonus on HP and armor to simulate a linear relation between survivability and tonnage. In VNR, heavy cruiser plays the role of cruiser killer instead of being useless in capital line, it's more flexible and can perform actions in both capital line and screen line based on the role you give it. As mentioned above, cruisers use light attack to eliminate screen ships and crush enemy's screen efficiency, creating a more favorable situation for your fleet to fire on the enemy. To achieve that, you need to pursue a fast and light-gun-centric design in order to keep up with destroyers and wipe out enemy's screen line as fast as you can. +Unlike vanilla, the traditional definition of light or heavy cruiser has been replaced by a role system, but caliber still has some influence, which it roughly puts all cruisers into 3 categories: +- Heavy capital cruiser is the same as heavy cruiser in basegame with a capital ship related role. +- Heavy fleet cruiser is a screen ship version of heavy cruiser with medium guns and a screen ship related role. +- Light cruiser is the same as its origin in basegame with light medium guns and a screen ship related role. -Cruiser is not only used for attack, but also some supporting jobs, such as scouting, and sometimes it can be a luxurious option for anti-submarine and mine warfare. That's where the role system gonna help you to fully dig out all its potentials. Radar picket cruiser is perfect for spotting enemy fleet. Colonial cruiser is cheaper, good supplement to colonial empire like UK and also a second best choice for minor countries. Then you have large cruiser and missile cruiser if there are sufficient IC power within your nation. The list goes on, but one thing for sure is that cruiser offers the most possibilities in all kinds of ships. +In VNR, heavy cruiser can play role of either cruiser killer (heavy fleet cruiser) or economical capital ship (heavy capital cruiser), it's more flexible and can perform actions in both capital line and screen line based on the role you give it. + +While light medium guns are similar to their origins, medium guns have bonus on HP and armor to simulate a linear relation between survivability and tonnage. As mentioned above, cruisers use light attack to eliminate screen ships and crush enemy's screen efficiency, creating a more favorable situation for your fleet to fire on the enemy. To achieve that, you need to pursue a fast and light-gun-centric design in order to keep up with destroyers and wipe out enemy's screen line as fast as you can. + +Cruiser is not only used for attacking, but also some supporting jobs, such as reconnaissance, and sometimes it can be a luxurious option for anti-submarine and mine warfare. That's where the role system gonna help you fully dig out the potential. Radar picket cruiser is perfect for spotting enemy fleet. Colonial cruiser is cheaper, good supplement to colonial empire like UK and also a second best choice for minor countries. Then you have large cruiser and missile cruiser if there are sufficient IC power within your nation. The list goes on, but one thing for sure is that cruiser offers the most possibilities in all kinds of ships. **Destroyer** -Destroyer is weak at the first glance, but it has the best speed and visibility in the game. Since destroyer's gun is almost useless against any ships but itself, torpedo is often used as the main weapon of destroyer, making destroyer heavily depending on the diminishment of your enemy's screen efficiency. Besides, destroyers also shoulder the most important mission in the fleet, which is to maintain screen efficiency by their numbers. Therefore, cost should always be the top priority when designing a destroyer, and there are a series of roles to achieve that. +Destroyer is weak at the first glance, but it has the best speed and visibility in the game. Since destroyer's gun is almost useless against anything but itself, torpedo is often used as its main weapon, a source of damage that heavily depends on the diminishment of your enemy's screen efficiency. Besides, destroyers also shoulder the most important mission in the fleet, which is to maintain screen efficiency by their numbers. Therefore, cost should always be the top priority when designing a destroyer, and there are a series of roles to achieve that. -Typically, the generic destroyer role can handle most scenarios. Escort destroyer is cheaper and expert at anti-submarine, and frigate can reduce the cost even more with numerous degradations in other aspects. Of course, you can also try to go another way to improve quality of your destroyer. Roles like destroyer leader and super destroyer can both enhance its performance in terms of firepower and protection at the cost of a sharp increase in IC. Destroyer leader may look redundant in the list, you are correct, that's also the reason why this type of ships was eventually outdated in history. +Typically, the generic destroyer role can handle most scenarios. Escort destroyer is cheaper and expert at anti-submarine, and frigate can reduce the cost even more with numerous degradations in other aspects. Of course, you can also try other ways to improve quality of destroyer. Roles like destroyer leader and super destroyer can both enhance its performance in terms of firepower and protection at the cost of a sharp increase in IC. Destroyer leader may look redundant in the list, you are correct, that's also the reason why this type of ship eventually disappeared in history. **Submarine** -Subs are greatly nerfed compared to vanilla in terms of competing with a proper fleet, but they are still lethal towards convoys. There isn't much choice for each slot on submarine like other ships, and that makes the design of submarines quite linear and easier since all you have to do is updating it with new hulls or new modules. +Subs are greatly nerfed compared to vanilla in terms of competing with a proper fleet, but they are still lethal towards convoys. There aren't many choices for each slot on submarine like other ships, and that makes the design of submarines quite linear and easier since all you have to do is updating it with new hulls or new modules. AI in VNR has been enhanced to carry more depth charges and sonars, which is a major challenge to sub-centric games. As a result, you should try to lower your sub visibility as much as possible. Mount every useful module, including snorkel and pressure hull, on your sub and keep them updated to the latest. @@ -86,7 +96,7 @@ Special hulls are ships that can't be simply represented by generic ship hulls. **Battlecarrier** -Battlecarrier is a hybrid ship with features from both battleship and carrier, you can make one by putting conversion deck on rear slots of the heavy hull. Although it has heavy guns, battlecarrier is considered as carrier and is in the carrier line, and it's restricted by the max carrier limit. Furthermore, battlecarrier can't get any bonus from doctrines, and its high conversion cost also blocks the possibility to build the fleet around it. +Battlecarrier is a hybrid ship with features from both battleship and carrier. To make one, you will have to unlock it through special projects, and then put conversion decks on rear slots of a heavy ship hull. Although it has heavy guns, battlecarrier is considered as carrier and is in the carrier line, which means it's restricted by the max carrier limit. Furthermore, battlecarrier can't get any bonus from doctrines, and its high conversion cost also blocks the possibility to build the fleet around it. **Super Heavy Battleship** @@ -94,7 +104,7 @@ In fact, super heavy battleship has no fundamental difference from ordinary batt **Arsenal Ship** -Basically a super expensive shore bombardment ship. Arsenal ship can carry all types of missiles including anti-ship, anti-air and ballistic missiles, which makes it the core of a battlefleet, only if you are wealthy enough to build one. +Basically a super expensive shore bombardment ship. Arsenal ship can carry all types of missiles including anti-ship, anti-air and ballistic missiles. It has the ability to be the core of battlefleet, only if you are wealthy enough to build one. **Escort Carrier** @@ -106,19 +116,19 @@ Merchant carrier is an even cheaper option than escort carrier. In reality, it w **Super Carrier** -Just like Essex or Midway post-refit, super carrier is a weapon with no shortcoming. By combining with modern carrier modules such as large armored hangar, steamed catapult and side lifts, a super carrier can possess a capacity of 130-150 planes. Except for its incredible cost, super carrier is the best type of carrier in the mod. +Just like Essex or Midway post-refit, super carrier is a weapon with no shortcoming. By combining it with modern carrier modules such as large armored hangar, steamed catapult and side lifts, a super carrier can possess a capacity of 130-150 planes. Except for its incredible cost, super carrier is the best type of carrier in the mod. **Strategic Strike Carrier** -An equivalent to ice carrier in vanilla but with an actual historical background. The strategic strike carrier is based on USS United States planned right after WWII, it can carry 20 heavy jet bombers to carry out intercontinental nuclear strike. The design of this ship also reflects its duty in history. Its capacity might not be impressive in naval battle, but still useful if you need a sea-based airport against countries across the ocean. +An equivalent to ice carrier in vanilla but with an actual historical background. The strategic strike carrier is based on USS United States planned right after WWII, it can carry 20 heavy jet bombers to carry out intercontinental nuclear strike. The design of this ship also reflects its duty in history. Its capacity might not be impressive, but it has access to all kinds of land-based aircrafts in the arsenal and can be useful if you need a sea-based airport against countries across the ocean. **Panzerschiff** -Panzerschiff in VNR or revived armored cruiser in KRNR, is basically a cruiser with heavy guns, though there is a limit set to prevent super heavy guns being installed on it. Just like the real armored ship in history, it has some advantages in one-on-one combat against cruisers, such as better guns and armor, making it an intermediate option between battlecruiser and heavy cruiser. The problem is, panzerschiff is stuck in the middle, so it can't fully cover either's job. +Panzerschiff in VNR or revived armored cruiser in KRNR, is basically a cruiser with heavy guns, though there is a limit set to prevent super heavy guns being used. Just like the real armored ship in history, it has some advantages in one-on-one combat against cruisers, such as better guns and armor, making it an intermediate option between battlecruiser and heavy cruiser. The problem is, panzerschiff is stuck in the middle, so it can't fully cover either's job. **Auxiliary Ship** -The max range of the fleet is calculated by average range of all ships within, so mathematically speaking you can boost it by adding long-range ships to your fleet. However, if you know maths very well, you may notice once the average surpass a certain value, it will bring the increase rate to a stagnation, so it's unwise to put too many auxiliary ships together because the range bonus is reaching the upper limit. +Max range of the fleet is calculated by average range of all ships within, so mathematically speaking you can boost it by adding long-range ships to your fleet. However, if you know maths very well, you may notice once the average has surpassed a certain value, it will bring the increase rate to a stagnation (also known as margin utilities). As a result, it's unwise to put too many auxiliary ships together because the range bonus is reaching the upper limit. To keep it away from the frontline, auxiliary ship is considered as capital ship, which means it can provide escort efficiency for your carrier just like battleship does. It's weak without doubt, but really really cheap. @@ -130,27 +140,27 @@ Techtree is the soul of VNR and also the most interesting part of the game. Comp **Destroyer Branch** -Destroyer is the fundation of any navies, so there is no reason that you should skip this part of the tree, unless you don't want to play navy at all. As I mentioned in designing section, cost is the key element of destroyer variants, so any tech that lowers IC cost of a ship is certainly a must. The research on destroyer should be centered around the job you give them in your fleet. Anti-submarine is one of the most common tasks handled by destroyer, making depth charge and sonar technologies become the theme of this branch. Typically, that's all you need to have to make a decent destroyer. When I say "decent", it stands for "a ship that works under most circumstances regardless of which country you are playing", but there are exceptions that you will be against different enemies. +Destroyer is the fundation of any navies, so there is no reason that you should skip this part of the tree, unless you don't want to play navy at all. As I mentioned in designing section, cost is the key element of destroyer variants, so any tech that lowers IC cost is certainly a must. The research on destroyer should be centered around the job you give them in your fleet. Anti-submarine is one of the most common tasks handled by destroyer, promoting depth charge and sonar technologies as the theme of this branch. Typically, that's all you need to make a decent destroyer. When I say "decent", it stands for "a ship that works under most circumstances regardless of which country you are playing", but there are exceptions that you will be against different enemies. **Cruiser Branch** -Cruiser can make incredible damage on light ships in the battle when it gets into close combat stage. Therefore, if you want to build a nice surface fleet, don't hesitate to give your cruiser the best guns and armors. Although you have many options in cruiser's tree, the process becomes easier that you only have to choose those improve it in terms of things you really need, including firepower, speed and armor. +Cruiser can make incredible damage on light ships in the battle when it gets into close combat stage. Therefore, if you want to build a nice surface fleet, don't hesitate to give your cruiser the best guns and armors. Although you have many options in cruiser's tree, the process becomes easier that you only have to choose things boosting firepower, speed and armor. **Heavy Armor Branch** -This branch is composed of battleship armor scheme and armor processing technologies. The necessity depends on whether you are going to include heavy ships in your fleet and when you want to exclude them. If heavy ships still hold a place in your fleet, you should update these techs to the latest whenever there's a chance, otherwise just leave it alone. +This branch is composed of battleship armor schemes and armor processing technologies. The necessity depends on whether you are going to include heavy ships in your fleet and when you want to exclude them. If heavy ships still hold a place in your fleet, you should update these techs to the latest whenever there's a chance, otherwise just leave them alone. **Battleship Branch** -Battleship branch is actually quite flexible because you can drop it from anywhere if it's no longer needed in your fleet. But if you want a good cold war era experience, at least research hulls to gain access to cold war fire-control/nuclear-fleet technologies. Back to the base tree, battleship techs prior to the 1930s are very useful despite not being mandatory. Its sub techs during the early 1940s are not recommended for their crummy bonus unless it's out of roleplay. After all, not many people will need excellent battleships but just-okay ones. +Battleship branch is actually quite flexible because you can drop it from anywhere if it's no longer needed in your fleet. But if you want a good cold war era experience, at least research hulls to gain access to cold war fire-control/nuclear-fleet technologies. Back to the base tree, battleship techs prior to the 1930s are very useful despite not being mandatory. Its sub-techs during the early 1940s are not recommended for their crummy bonus unless it's out of roleplay. After all, not many people will need excellent battleships but just-okay ones. **Carrier Branch** -I can't stress more about the dominating power of carrier in reality and mod. Except for some early sub techs of carrier which only apply little bonus, most carrier techs are extremely useful and will definitely give you an upper hand in the battle. My suggestion is to skip techs before 1932, and get all of them after that. +I can't stress more about the dominating power of carrier in reality and mod. Except for some early sub-techs which only offer little bonus, most carrier techs are extremely useful and will definitely give you an upper hand in the battle. My suggestion is to skip techs before 1932, and get all of them after that. **Submarine Branch** -Submarine is useless against anything but convoys because of AI's ASW improvements. Submarine research should be centered around lowering visibility and improving torpedo attack, other techs remain optional no matter what bonus they offer. +Submarine is useless against anything but convoys because of AI's ASW improvements. Its research should be centered around visibility and torpedo, and other techs remain optional no matter what bonus they offer. ### Naval Support Tree ### @@ -160,13 +170,13 @@ You need guns everywhere, so there is basically no reason to skip this branch. E **Torpedo Branch** -Torpedo techs are needed by both submarines and torpedo ships, and overall torpedo weapons are nerfed in accuracy but buffed in damage. Keep it up to date if your fleet is heavily relied on torpedo. +Torpedo techs are needed by both submarines and torpedo ships. In general, torpedo weapons are nerfed in accuracy and buffed in damage, but they are still considered as poor damage sources in the mod. Only keep it up to date if your fleet is heavily relied on torpedo. **Auxiliary Branch** The auxiliary branch is split into three sub-branches, port facilities, auxiliary ships and fuel silos. Basically designed for immersion, you can just skip the whole branch without need to worry about missing important bonus or modules. Of course, if you want to experience this part of the mod, there are some useful techs. -The branch of port facilities aims at accelerating building and repairing speed of naval infrastructure such as shipyard and naval base, but I won't recommended you to finish this line due to poor bonus. +The branch of port facilities aims at accelerating building and repairing of naval infrastructure such as shipyard and naval base, but I won't recommended you to finish this line due to poor bonus. Auxiliary ship branch is centered around the debate over "range or speed". Speed branch is relatively better since it's one of the six dimensions of ship designs and it offers some exclusive modules like raider cruiser. @@ -194,9 +204,11 @@ One of the major roles that navy plays in the game is securing sea supremacy to Type of ship also affects efficiency in this area. Decent ships are required in the action, that means you can't secure the sea just with submarines. +Above all, the supremacy weight of each ship is calculated by a formula between IC and manpower. Big and expensive ships will always have an edge in the fight for sea supremacy. + ### Combat Duration ### -To simulate carrier's capability to send over the horizon strikes, the duration of combat is made longer in the mod, but I still kept it under control so that other ships still hold a place in navy. Carrier can send air strikes every 2-3 hour (based on your sortie efficiency) in different squadron size (based on carrier traffic and some other factors). 20 hours after the battle begins, fleet will have a chance to retreat both automatically and manually. Only 22 hours into the battle, battleship got to fire its first salvo, while light ships still have to wait to the 30th hour to fire. +To simulate carrier's capability to send over the horizon strikes, the duration of combat is made longer in the mod, but I still kept it under control so that other ships still hold a place in navy. Carrier can send air strikes every 2-3 hour (based on your sortie efficiency) in different squadron size (based on carrier traffic and some other factors). 20 hours after the battle begins, fleet will have a chance to retreat both automatically and manually. Only 22 hours into the battle, battleship gets to fire its first salvo, while light ships still have to wait to the 30th hour to fire. ### Positioning ### @@ -206,6 +218,6 @@ Positioning is affected by several factors including relative size of fleet, spe ### Supply Consumption ### -Ever since the supply system was added in NSB, navy will also be influenced by port facilities. In vanilla, you rarely feel the consequence of running out of supply in naval combat because ships' supply consumption is too low compared to how much a naval base can provide. To begin with, don't confuse supply consumption with fuel consumption, they are different but will cause similar penalties on your fleet. Fuel is only consumed when your fleet is in action, but supply is a static resource that you can't store. +Ever since the supply system was added in NSB, navy will also be influenced by port facilities. In vanilla, you rarely feel the consequence of running out of supply in naval combat because ships' supply consumption is too low compared to how much a naval base can provide. To begin with, don't confuse supply consumption with fuel consumption, they are different but will cause similar penalties on your fleet. Fuel is only consumed when your fleet is in action, while supply is a static resource that you can't store. In the mod, supply consumption of ships are greatly increased, especially on capital ships. This has made strategic islands and frontline engineering corps far more important in simulating the Pacific War. Take US as an example, a large fleet making a sortie from the Midway will definitely suffer heavy attrition during maneuvering and combat. Instead, launching attacks from Hawaii or Australia is a wiser choice. \ No newline at end of file diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt index 20b2d6f..81aea6e 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/01_Commonwealth_ship_icons.txt @@ -75,6 +75,7 @@ ENG = { GFX_ENG_vnr_ship_hull_light_2_medium GFX_ENG_vnr_ship_hull_light_3_medium GFX_ENG_vnr_ship_hull_light_4_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -95,6 +96,7 @@ ENG = { GFX_ENG_vnr_ship_hull_light_3_medium GFX_ENG_vnr_ship_hull_light_4_medium GFX_ENG_vnr_ship_hull_light_5_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -175,6 +177,7 @@ ENG = { "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -203,6 +206,7 @@ ENG = { "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -233,6 +237,7 @@ ENG = { "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -615,7 +620,7 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -625,13 +630,13 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -641,14 +646,14 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_light_1_medium - GFX_CAN_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } @@ -658,15 +663,15 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_4_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_light_1_medium - GFX_CAN_vnr_ship_hull_light_2_medium - GFX_CAN_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } @@ -676,16 +681,17 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_5_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_light_1_medium - GFX_CAN_vnr_ship_hull_light_2_medium - GFX_CAN_vnr_ship_hull_light_3_medium - GFX_CAN_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -695,17 +701,18 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_light_6_medium + GFX_ENG_vnr_ship_hull_light_6_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_light_1_medium - GFX_CAN_vnr_ship_hull_light_2_medium - GFX_CAN_vnr_ship_hull_light_3_medium - GFX_CAN_vnr_ship_hull_light_4_medium - GFX_CAN_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_5_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -715,8 +722,8 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_cruiser_1_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium } } @@ -726,15 +733,17 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_cruiser_2_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_cruiser_1_medium - GFX_CAN_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -744,17 +753,20 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_cruiser_3_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_cruiser_1_medium - GFX_CAN_vnr_ship_hull_cruiser_2_medium - GFX_CAN_vnr_ship_hull_cruiser_1_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" } } @@ -764,19 +776,24 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_cruiser_4_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_cruiser_1_medium - GFX_CAN_vnr_ship_hull_cruiser_2_medium - GFX_CAN_vnr_ship_hull_cruiser_3_medium - GFX_CAN_vnr_ship_hull_cruiser_1_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_2_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -786,21 +803,26 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_cruiser_5_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_cruiser_1_medium - GFX_CAN_vnr_ship_hull_cruiser_2_medium - GFX_CAN_vnr_ship_hull_cruiser_3_medium - GFX_CAN_vnr_ship_hull_cruiser_4_medium - GFX_CAN_vnr_ship_hull_cruiser_1_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_2_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_3_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -810,23 +832,28 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_cruiser_6_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_6_medium + GFX_ENG_vnr_ship_hull_cruiser_6_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_6_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_cruiser_1_medium - GFX_CAN_vnr_ship_hull_cruiser_2_medium - GFX_CAN_vnr_ship_hull_cruiser_3_medium - GFX_CAN_vnr_ship_hull_cruiser_4_medium - GFX_CAN_vnr_ship_hull_cruiser_5_medium - GFX_CAN_vnr_ship_hull_cruiser_1_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_2_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_3_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_4_capital_medium - GFX_CAN_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -836,14 +863,14 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_cruiser_coastal_defense_ship_medium + GFX_ENG_vnr_ship_hull_cruiser_coastal_defense_ship_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_cruiser_1_medium - GFX_CAN_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -853,7 +880,7 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_pre_dreadnought_medium + GFX_ENG_vnr_ship_hull_pre_dreadnought_medium } } @@ -863,8 +890,15 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_super_heavy_1_medium - GFX_CAN_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -874,14 +908,16 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_super_heavy_1_medium - GFX_CAN_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -891,15 +927,18 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_super_heavy_1_medium - GFX_CAN_vnr_ship_hull_heavy_1_medium - GFX_CAN_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -909,16 +948,19 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_super_heavy_1_medium - GFX_CAN_vnr_ship_hull_heavy_1_medium - GFX_CAN_vnr_ship_hull_heavy_2_medium - GFX_CAN_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -928,17 +970,20 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_heavy_5_medium + GFX_ENG_vnr_ship_hull_heavy_5_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_super_heavy_1_medium - GFX_CAN_vnr_ship_hull_heavy_1_medium - GFX_CAN_vnr_ship_hull_heavy_2_medium - GFX_CAN_vnr_ship_hull_heavy_3_medium - GFX_CAN_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -948,7 +993,7 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium } } @@ -958,7 +1003,13 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" } } @@ -968,7 +1019,13 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Furious.png" } } @@ -978,13 +1035,13 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_carrier_conversion_ca_medium - GFX_CAN_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } } } @@ -993,15 +1050,16 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_carrier_conversion_ca_medium - GFX_CAN_vnr_ship_hull_carrier_conversion_bb_medium - GFX_CAN_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -1011,16 +1069,17 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_carrier_conversion_ca_medium - GFX_CAN_vnr_ship_hull_carrier_conversion_bb_medium - GFX_CAN_vnr_ship_hull_carrier_1_medium - GFX_CAN_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -1030,17 +1089,20 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_super_carrier_medium + GFX_ENG_vnr_ship_hull_super_carrier_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_carrier_conversion_ca_medium - GFX_CAN_vnr_ship_hull_carrier_conversion_bb_medium - GFX_CAN_vnr_ship_hull_carrier_1_medium - GFX_CAN_vnr_ship_hull_carrier_2_medium - GFX_CAN_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -1050,7 +1112,7 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_escort_carrier_medium + GFX_ENG_vnr_ship_hull_escort_carrier_medium } } @@ -1060,13 +1122,13 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1076,14 +1138,14 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_submarine_1_medium - GFX_CAN_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1093,15 +1155,15 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_submarine_1_medium - GFX_CAN_vnr_ship_hull_submarine_2_medium - GFX_CAN_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1111,16 +1173,16 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_submarine_1_medium - GFX_CAN_vnr_ship_hull_submarine_2_medium - GFX_CAN_vnr_ship_hull_submarine_3_medium - GFX_CAN_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1130,17 +1192,17 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_submarine_5_medium + GFX_ENG_vnr_ship_hull_submarine_5_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_submarine_1_medium - GFX_CAN_vnr_ship_hull_submarine_2_medium - GFX_CAN_vnr_ship_hull_submarine_3_medium - GFX_CAN_vnr_ship_hull_submarine_4_medium - GFX_CAN_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1150,16 +1212,16 @@ CAN = { pool = { weight = 5 icons = { - GFX_CAN_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } pool = { icons = { - GFX_CAN_vnr_ship_hull_submarine_1_medium - GFX_CAN_vnr_ship_hull_submarine_2_medium - GFX_CAN_vnr_ship_hull_submarine_3_medium - GFX_CAN_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1174,7 +1236,7 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -1184,13 +1246,13 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -1200,14 +1262,14 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_light_1_medium - GFX_RAJ_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } @@ -1217,15 +1279,15 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_4_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_light_1_medium - GFX_RAJ_vnr_ship_hull_light_2_medium - GFX_RAJ_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } @@ -1235,16 +1297,17 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_5_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_light_1_medium - GFX_RAJ_vnr_ship_hull_light_2_medium - GFX_RAJ_vnr_ship_hull_light_3_medium - GFX_RAJ_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -1254,17 +1317,18 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_light_6_medium + GFX_ENG_vnr_ship_hull_light_6_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_light_1_medium - GFX_RAJ_vnr_ship_hull_light_2_medium - GFX_RAJ_vnr_ship_hull_light_3_medium - GFX_RAJ_vnr_ship_hull_light_4_medium - GFX_RAJ_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_5_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -1274,8 +1338,8 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_cruiser_1_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium } } @@ -1285,15 +1349,17 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_cruiser_2_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_cruiser_1_medium - GFX_RAJ_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -1303,17 +1369,20 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_cruiser_3_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_cruiser_1_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_medium - GFX_RAJ_vnr_ship_hull_cruiser_1_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" } } @@ -1323,19 +1392,24 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_cruiser_4_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_cruiser_1_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_medium - GFX_RAJ_vnr_ship_hull_cruiser_3_medium - GFX_RAJ_vnr_ship_hull_cruiser_1_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -1345,21 +1419,26 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_cruiser_5_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_cruiser_1_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_medium - GFX_RAJ_vnr_ship_hull_cruiser_3_medium - GFX_RAJ_vnr_ship_hull_cruiser_4_medium - GFX_RAJ_vnr_ship_hull_cruiser_1_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_3_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -1369,23 +1448,28 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_cruiser_6_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_6_medium + GFX_ENG_vnr_ship_hull_cruiser_6_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_6_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_cruiser_1_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_medium - GFX_RAJ_vnr_ship_hull_cruiser_3_medium - GFX_RAJ_vnr_ship_hull_cruiser_4_medium - GFX_RAJ_vnr_ship_hull_cruiser_5_medium - GFX_RAJ_vnr_ship_hull_cruiser_1_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_2_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_3_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_4_capital_medium - GFX_RAJ_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -1395,14 +1479,14 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_cruiser_coastal_defense_ship_medium + GFX_ENG_vnr_ship_hull_cruiser_coastal_defense_ship_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_cruiser_1_medium - GFX_RAJ_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -1412,7 +1496,7 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_pre_dreadnought_medium + GFX_ENG_vnr_ship_hull_pre_dreadnought_medium } } @@ -1422,8 +1506,15 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_super_heavy_1_medium - GFX_RAJ_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -1433,14 +1524,16 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_super_heavy_1_medium - GFX_RAJ_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -1450,15 +1543,18 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_super_heavy_1_medium - GFX_RAJ_vnr_ship_hull_heavy_1_medium - GFX_RAJ_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -1468,16 +1564,19 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_super_heavy_1_medium - GFX_RAJ_vnr_ship_hull_heavy_1_medium - GFX_RAJ_vnr_ship_hull_heavy_2_medium - GFX_RAJ_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -1487,17 +1586,20 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_heavy_5_medium + GFX_ENG_vnr_ship_hull_heavy_5_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_super_heavy_1_medium - GFX_RAJ_vnr_ship_hull_heavy_1_medium - GFX_RAJ_vnr_ship_hull_heavy_2_medium - GFX_RAJ_vnr_ship_hull_heavy_3_medium - GFX_RAJ_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -1507,7 +1609,7 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium } } @@ -1517,7 +1619,13 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" } } @@ -1527,7 +1635,13 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Furious.png" } } @@ -1537,13 +1651,13 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_carrier_conversion_ca_medium - GFX_RAJ_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } } } @@ -1552,15 +1666,16 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_carrier_conversion_ca_medium - GFX_RAJ_vnr_ship_hull_carrier_conversion_bb_medium - GFX_RAJ_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -1570,16 +1685,17 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_carrier_conversion_ca_medium - GFX_RAJ_vnr_ship_hull_carrier_conversion_bb_medium - GFX_RAJ_vnr_ship_hull_carrier_1_medium - GFX_RAJ_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -1589,17 +1705,20 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_super_carrier_medium + GFX_ENG_vnr_ship_hull_super_carrier_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_carrier_conversion_ca_medium - GFX_RAJ_vnr_ship_hull_carrier_conversion_bb_medium - GFX_RAJ_vnr_ship_hull_carrier_1_medium - GFX_RAJ_vnr_ship_hull_carrier_2_medium - GFX_RAJ_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -1609,7 +1728,7 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_escort_carrier_medium + GFX_ENG_vnr_ship_hull_escort_carrier_medium } } @@ -1619,13 +1738,13 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1635,14 +1754,14 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_submarine_1_medium - GFX_RAJ_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1652,15 +1771,15 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_submarine_1_medium - GFX_RAJ_vnr_ship_hull_submarine_2_medium - GFX_RAJ_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1670,16 +1789,16 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_submarine_1_medium - GFX_RAJ_vnr_ship_hull_submarine_2_medium - GFX_RAJ_vnr_ship_hull_submarine_3_medium - GFX_RAJ_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1689,17 +1808,17 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_submarine_5_medium + GFX_ENG_vnr_ship_hull_submarine_5_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_submarine_1_medium - GFX_RAJ_vnr_ship_hull_submarine_2_medium - GFX_RAJ_vnr_ship_hull_submarine_3_medium - GFX_RAJ_vnr_ship_hull_submarine_4_medium - GFX_RAJ_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1709,16 +1828,16 @@ RAJ = { pool = { weight = 5 icons = { - GFX_RAJ_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } pool = { icons = { - GFX_RAJ_vnr_ship_hull_submarine_1_medium - GFX_RAJ_vnr_ship_hull_submarine_2_medium - GFX_RAJ_vnr_ship_hull_submarine_3_medium - GFX_RAJ_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -1733,7 +1852,7 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -1743,13 +1862,13 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -1759,14 +1878,14 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_light_1_medium - GFX_SAF_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } @@ -1776,15 +1895,15 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_4_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_light_1_medium - GFX_SAF_vnr_ship_hull_light_2_medium - GFX_SAF_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } @@ -1794,16 +1913,17 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_5_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_light_1_medium - GFX_SAF_vnr_ship_hull_light_2_medium - GFX_SAF_vnr_ship_hull_light_3_medium - GFX_SAF_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -1813,17 +1933,18 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_light_6_medium + GFX_ENG_vnr_ship_hull_light_6_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_light_1_medium - GFX_SAF_vnr_ship_hull_light_2_medium - GFX_SAF_vnr_ship_hull_light_3_medium - GFX_SAF_vnr_ship_hull_light_4_medium - GFX_SAF_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_5_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -1833,8 +1954,8 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_cruiser_1_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium } } @@ -1844,15 +1965,17 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_cruiser_2_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_cruiser_1_medium - GFX_SAF_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -1862,17 +1985,20 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_cruiser_3_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_cruiser_1_medium - GFX_SAF_vnr_ship_hull_cruiser_2_medium - GFX_SAF_vnr_ship_hull_cruiser_1_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" } } @@ -1882,19 +2008,24 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_cruiser_4_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_cruiser_1_medium - GFX_SAF_vnr_ship_hull_cruiser_2_medium - GFX_SAF_vnr_ship_hull_cruiser_3_medium - GFX_SAF_vnr_ship_hull_cruiser_1_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_2_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -1904,21 +2035,26 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_cruiser_5_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_cruiser_1_medium - GFX_SAF_vnr_ship_hull_cruiser_2_medium - GFX_SAF_vnr_ship_hull_cruiser_3_medium - GFX_SAF_vnr_ship_hull_cruiser_4_medium - GFX_SAF_vnr_ship_hull_cruiser_1_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_2_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_3_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -1928,23 +2064,28 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_cruiser_6_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_6_medium + GFX_ENG_vnr_ship_hull_cruiser_6_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_6_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_cruiser_1_medium - GFX_SAF_vnr_ship_hull_cruiser_2_medium - GFX_SAF_vnr_ship_hull_cruiser_3_medium - GFX_SAF_vnr_ship_hull_cruiser_4_medium - GFX_SAF_vnr_ship_hull_cruiser_5_medium - GFX_SAF_vnr_ship_hull_cruiser_1_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_2_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_3_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_4_capital_medium - GFX_SAF_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -1954,14 +2095,14 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_cruiser_coastal_defense_ship_medium + GFX_ENG_vnr_ship_hull_cruiser_coastal_defense_ship_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_cruiser_1_medium - GFX_SAF_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -1971,7 +2112,7 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_pre_dreadnought_medium + GFX_ENG_vnr_ship_hull_pre_dreadnought_medium } } @@ -1981,8 +2122,15 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_super_heavy_1_medium - GFX_SAF_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -1992,14 +2140,16 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_super_heavy_1_medium - GFX_SAF_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2009,15 +2159,18 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_super_heavy_1_medium - GFX_SAF_vnr_ship_hull_heavy_1_medium - GFX_SAF_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2027,16 +2180,19 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_super_heavy_1_medium - GFX_SAF_vnr_ship_hull_heavy_1_medium - GFX_SAF_vnr_ship_hull_heavy_2_medium - GFX_SAF_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2046,17 +2202,20 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_heavy_5_medium + GFX_ENG_vnr_ship_hull_heavy_5_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_super_heavy_1_medium - GFX_SAF_vnr_ship_hull_heavy_1_medium - GFX_SAF_vnr_ship_hull_heavy_2_medium - GFX_SAF_vnr_ship_hull_heavy_3_medium - GFX_SAF_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2066,7 +2225,7 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium } } @@ -2076,7 +2235,13 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" } } @@ -2086,7 +2251,13 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Furious.png" } } @@ -2096,13 +2267,13 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_carrier_conversion_ca_medium - GFX_SAF_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } } } @@ -2111,15 +2282,16 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_carrier_conversion_ca_medium - GFX_SAF_vnr_ship_hull_carrier_conversion_bb_medium - GFX_SAF_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -2129,16 +2301,17 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_carrier_conversion_ca_medium - GFX_SAF_vnr_ship_hull_carrier_conversion_bb_medium - GFX_SAF_vnr_ship_hull_carrier_1_medium - GFX_SAF_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -2148,17 +2321,20 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_super_carrier_medium + GFX_ENG_vnr_ship_hull_super_carrier_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_carrier_conversion_ca_medium - GFX_SAF_vnr_ship_hull_carrier_conversion_bb_medium - GFX_SAF_vnr_ship_hull_carrier_1_medium - GFX_SAF_vnr_ship_hull_carrier_2_medium - GFX_SAF_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -2168,7 +2344,7 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_escort_carrier_medium + GFX_ENG_vnr_ship_hull_escort_carrier_medium } } @@ -2178,13 +2354,13 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2194,14 +2370,14 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_submarine_1_medium - GFX_SAF_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2211,15 +2387,15 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_submarine_1_medium - GFX_SAF_vnr_ship_hull_submarine_2_medium - GFX_SAF_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2229,16 +2405,16 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_submarine_1_medium - GFX_SAF_vnr_ship_hull_submarine_2_medium - GFX_SAF_vnr_ship_hull_submarine_3_medium - GFX_SAF_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2248,17 +2424,17 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_submarine_5_medium + GFX_ENG_vnr_ship_hull_submarine_5_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_submarine_1_medium - GFX_SAF_vnr_ship_hull_submarine_2_medium - GFX_SAF_vnr_ship_hull_submarine_3_medium - GFX_SAF_vnr_ship_hull_submarine_4_medium - GFX_SAF_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2268,16 +2444,16 @@ SAF = { pool = { weight = 5 icons = { - GFX_SAF_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } pool = { icons = { - GFX_SAF_vnr_ship_hull_submarine_1_medium - GFX_SAF_vnr_ship_hull_submarine_2_medium - GFX_SAF_vnr_ship_hull_submarine_3_medium - GFX_SAF_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2292,7 +2468,7 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -2302,13 +2478,13 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -2318,14 +2494,14 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_light_1_medium - GFX_AST_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } @@ -2335,15 +2511,15 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_4_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_light_1_medium - GFX_AST_vnr_ship_hull_light_2_medium - GFX_AST_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } @@ -2353,16 +2529,17 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_5_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_light_1_medium - GFX_AST_vnr_ship_hull_light_2_medium - GFX_AST_vnr_ship_hull_light_3_medium - GFX_AST_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -2372,17 +2549,18 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_light_6_medium + GFX_ENG_vnr_ship_hull_light_6_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_light_1_medium - GFX_AST_vnr_ship_hull_light_2_medium - GFX_AST_vnr_ship_hull_light_3_medium - GFX_AST_vnr_ship_hull_light_4_medium - GFX_AST_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_5_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -2392,8 +2570,8 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_cruiser_1_capital_medium - GFX_AST_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium } } @@ -2403,15 +2581,17 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_cruiser_2_capital_medium - GFX_AST_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_cruiser_1_medium - GFX_AST_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -2421,17 +2601,20 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_cruiser_3_capital_medium - GFX_AST_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_cruiser_1_medium - GFX_AST_vnr_ship_hull_cruiser_2_medium - GFX_AST_vnr_ship_hull_cruiser_1_capital_medium - GFX_AST_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" } } @@ -2441,19 +2624,24 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_cruiser_4_capital_medium - GFX_AST_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_cruiser_1_medium - GFX_AST_vnr_ship_hull_cruiser_2_medium - GFX_AST_vnr_ship_hull_cruiser_3_medium - GFX_AST_vnr_ship_hull_cruiser_1_capital_medium - GFX_AST_vnr_ship_hull_cruiser_2_capital_medium - GFX_AST_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -2463,21 +2651,26 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_cruiser_5_capital_medium - GFX_AST_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_cruiser_1_medium - GFX_AST_vnr_ship_hull_cruiser_2_medium - GFX_AST_vnr_ship_hull_cruiser_3_medium - GFX_AST_vnr_ship_hull_cruiser_4_medium - GFX_AST_vnr_ship_hull_cruiser_1_capital_medium - GFX_AST_vnr_ship_hull_cruiser_2_capital_medium - GFX_AST_vnr_ship_hull_cruiser_3_capital_medium - GFX_AST_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -2487,23 +2680,28 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_cruiser_6_capital_medium - GFX_AST_vnr_ship_hull_cruiser_6_medium + GFX_ENG_vnr_ship_hull_cruiser_6_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_6_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_cruiser_1_medium - GFX_AST_vnr_ship_hull_cruiser_2_medium - GFX_AST_vnr_ship_hull_cruiser_3_medium - GFX_AST_vnr_ship_hull_cruiser_4_medium - GFX_AST_vnr_ship_hull_cruiser_5_medium - GFX_AST_vnr_ship_hull_cruiser_1_capital_medium - GFX_AST_vnr_ship_hull_cruiser_2_capital_medium - GFX_AST_vnr_ship_hull_cruiser_3_capital_medium - GFX_AST_vnr_ship_hull_cruiser_4_capital_medium - GFX_AST_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -2513,14 +2711,14 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_cruiser_coastal_defense_ship_medium + GFX_ENG_vnr_ship_hull_cruiser_coastal_defense_ship_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_cruiser_1_medium - GFX_AST_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -2530,7 +2728,7 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_pre_dreadnought_medium + GFX_ENG_vnr_ship_hull_pre_dreadnought_medium } } @@ -2540,8 +2738,15 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_super_heavy_1_medium - GFX_AST_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2551,14 +2756,16 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_super_heavy_1_medium - GFX_AST_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2568,15 +2775,18 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_super_heavy_1_medium - GFX_AST_vnr_ship_hull_heavy_1_medium - GFX_AST_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2586,16 +2796,19 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_super_heavy_1_medium - GFX_AST_vnr_ship_hull_heavy_1_medium - GFX_AST_vnr_ship_hull_heavy_2_medium - GFX_AST_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2605,17 +2818,20 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_heavy_5_medium + GFX_ENG_vnr_ship_hull_heavy_5_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_super_heavy_1_medium - GFX_AST_vnr_ship_hull_heavy_1_medium - GFX_AST_vnr_ship_hull_heavy_2_medium - GFX_AST_vnr_ship_hull_heavy_3_medium - GFX_AST_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -2625,7 +2841,7 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium } } @@ -2635,7 +2851,13 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" } } @@ -2645,7 +2867,13 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Furious.png" } } @@ -2655,13 +2883,13 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_carrier_conversion_ca_medium - GFX_AST_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } } } @@ -2670,15 +2898,16 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_carrier_conversion_ca_medium - GFX_AST_vnr_ship_hull_carrier_conversion_bb_medium - GFX_AST_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -2688,16 +2917,17 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_carrier_conversion_ca_medium - GFX_AST_vnr_ship_hull_carrier_conversion_bb_medium - GFX_AST_vnr_ship_hull_carrier_1_medium - GFX_AST_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -2707,17 +2937,20 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_super_carrier_medium + GFX_ENG_vnr_ship_hull_super_carrier_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_carrier_conversion_ca_medium - GFX_AST_vnr_ship_hull_carrier_conversion_bb_medium - GFX_AST_vnr_ship_hull_carrier_1_medium - GFX_AST_vnr_ship_hull_carrier_2_medium - GFX_AST_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -2727,7 +2960,7 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_escort_carrier_medium + GFX_ENG_vnr_ship_hull_escort_carrier_medium } } @@ -2737,13 +2970,13 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2753,14 +2986,14 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_submarine_1_medium - GFX_AST_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2770,15 +3003,15 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_submarine_1_medium - GFX_AST_vnr_ship_hull_submarine_2_medium - GFX_AST_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2788,16 +3021,16 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_submarine_1_medium - GFX_AST_vnr_ship_hull_submarine_2_medium - GFX_AST_vnr_ship_hull_submarine_3_medium - GFX_AST_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2807,17 +3040,17 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_submarine_5_medium + GFX_ENG_vnr_ship_hull_submarine_5_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_submarine_1_medium - GFX_AST_vnr_ship_hull_submarine_2_medium - GFX_AST_vnr_ship_hull_submarine_3_medium - GFX_AST_vnr_ship_hull_submarine_4_medium - GFX_AST_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2827,16 +3060,16 @@ AST = { pool = { weight = 5 icons = { - GFX_AST_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } pool = { icons = { - GFX_AST_vnr_ship_hull_submarine_1_medium - GFX_AST_vnr_ship_hull_submarine_2_medium - GFX_AST_vnr_ship_hull_submarine_3_medium - GFX_AST_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -2851,7 +3084,7 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -2861,13 +3094,13 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_1_medium } } @@ -2877,14 +3110,14 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_light_1_medium - GFX_NZL_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium } } @@ -2894,15 +3127,15 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_4_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_light_1_medium - GFX_NZL_vnr_ship_hull_light_2_medium - GFX_NZL_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium } } @@ -2912,16 +3145,17 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_5_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_light_1_medium - GFX_NZL_vnr_ship_hull_light_2_medium - GFX_NZL_vnr_ship_hull_light_3_medium - GFX_NZL_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -2931,17 +3165,18 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_light_6_medium + GFX_ENG_vnr_ship_hull_light_6_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_light_1_medium - GFX_NZL_vnr_ship_hull_light_2_medium - GFX_NZL_vnr_ship_hull_light_3_medium - GFX_NZL_vnr_ship_hull_light_4_medium - GFX_NZL_vnr_ship_hull_light_5_medium + GFX_ENG_vnr_ship_hull_light_1_medium + GFX_ENG_vnr_ship_hull_light_2_medium + GFX_ENG_vnr_ship_hull_light_3_medium + GFX_ENG_vnr_ship_hull_light_4_medium + GFX_ENG_vnr_ship_hull_light_5_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -2951,8 +3186,8 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_cruiser_1_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium } } @@ -2962,15 +3197,17 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_cruiser_2_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_cruiser_1_medium - GFX_NZL_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -2980,17 +3217,20 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_cruiser_3_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_cruiser_1_medium - GFX_NZL_vnr_ship_hull_cruiser_2_medium - GFX_NZL_vnr_ship_hull_cruiser_1_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" } } @@ -3000,19 +3240,24 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_cruiser_4_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_cruiser_1_medium - GFX_NZL_vnr_ship_hull_cruiser_2_medium - GFX_NZL_vnr_ship_hull_cruiser_3_medium - GFX_NZL_vnr_ship_hull_cruiser_1_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_2_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -3022,21 +3267,26 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_cruiser_5_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_cruiser_1_medium - GFX_NZL_vnr_ship_hull_cruiser_2_medium - GFX_NZL_vnr_ship_hull_cruiser_3_medium - GFX_NZL_vnr_ship_hull_cruiser_4_medium - GFX_NZL_vnr_ship_hull_cruiser_1_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_2_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_3_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -3046,23 +3296,28 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_cruiser_6_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_6_medium + GFX_ENG_vnr_ship_hull_cruiser_6_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_6_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_cruiser_1_medium - GFX_NZL_vnr_ship_hull_cruiser_2_medium - GFX_NZL_vnr_ship_hull_cruiser_3_medium - GFX_NZL_vnr_ship_hull_cruiser_4_medium - GFX_NZL_vnr_ship_hull_cruiser_5_medium - GFX_NZL_vnr_ship_hull_cruiser_1_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_2_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_3_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_4_capital_medium - GFX_NZL_vnr_ship_hull_cruiser_5_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_2_medium + GFX_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_2_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -3072,14 +3327,14 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_cruiser_coastal_defense_ship_medium + GFX_ENG_vnr_ship_hull_cruiser_coastal_defense_ship_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_cruiser_1_medium - GFX_NZL_vnr_ship_hull_cruiser_1_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_1_medium + GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium } } @@ -3089,7 +3344,7 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_pre_dreadnought_medium + GFX_ENG_vnr_ship_hull_pre_dreadnought_medium } } @@ -3099,8 +3354,15 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_super_heavy_1_medium - GFX_NZL_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -3110,14 +3372,16 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_super_heavy_1_medium - GFX_NZL_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -3127,15 +3391,18 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_super_heavy_1_medium - GFX_NZL_vnr_ship_hull_heavy_1_medium - GFX_NZL_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -3145,16 +3412,19 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_super_heavy_1_medium - GFX_NZL_vnr_ship_hull_heavy_1_medium - GFX_NZL_vnr_ship_hull_heavy_2_medium - GFX_NZL_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -3164,17 +3434,20 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_heavy_5_medium + GFX_ENG_vnr_ship_hull_heavy_5_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_super_heavy_1_medium - GFX_NZL_vnr_ship_hull_heavy_1_medium - GFX_NZL_vnr_ship_hull_heavy_2_medium - GFX_NZL_vnr_ship_hull_heavy_3_medium - GFX_NZL_vnr_ship_hull_heavy_4_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_1_medium + GFX_ENG_vnr_ship_hull_heavy_2_medium + GFX_ENG_vnr_ship_hull_heavy_3_medium + GFX_ENG_vnr_ship_hull_heavy_4_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Revenge.png" } } @@ -3184,7 +3457,7 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_super_heavy_1_medium + GFX_ENG_vnr_ship_hull_super_heavy_1_medium } } @@ -3194,7 +3467,13 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" } } @@ -3204,7 +3483,13 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/England/ENG_carrier_Furious.png" } } @@ -3214,13 +3499,13 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_carrier_conversion_ca_medium - GFX_NZL_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } } } @@ -3229,15 +3514,16 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_carrier_conversion_ca_medium - GFX_NZL_vnr_ship_hull_carrier_conversion_bb_medium - GFX_NZL_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -3247,16 +3533,17 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_carrier_conversion_ca_medium - GFX_NZL_vnr_ship_hull_carrier_conversion_bb_medium - GFX_NZL_vnr_ship_hull_carrier_1_medium - GFX_NZL_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -3266,17 +3553,20 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_super_carrier_medium + GFX_ENG_vnr_ship_hull_super_carrier_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_carrier_conversion_ca_medium - GFX_NZL_vnr_ship_hull_carrier_conversion_bb_medium - GFX_NZL_vnr_ship_hull_carrier_1_medium - GFX_NZL_vnr_ship_hull_carrier_2_medium - GFX_NZL_vnr_ship_hull_carrier_3_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium + GFX_ENG_vnr_ship_hull_carrier_1_medium + GFX_ENG_vnr_ship_hull_carrier_2_medium + GFX_ENG_vnr_ship_hull_carrier_3_medium + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -3286,7 +3576,7 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_escort_carrier_medium + GFX_ENG_vnr_ship_hull_escort_carrier_medium } } @@ -3296,13 +3586,13 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -3312,14 +3602,14 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_submarine_1_medium - GFX_NZL_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -3329,15 +3619,15 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_submarine_1_medium - GFX_NZL_vnr_ship_hull_submarine_2_medium - GFX_NZL_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -3347,16 +3637,16 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_submarine_1_medium - GFX_NZL_vnr_ship_hull_submarine_2_medium - GFX_NZL_vnr_ship_hull_submarine_3_medium - GFX_NZL_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -3366,17 +3656,17 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_submarine_5_medium + GFX_ENG_vnr_ship_hull_submarine_5_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_submarine_1_medium - GFX_NZL_vnr_ship_hull_submarine_2_medium - GFX_NZL_vnr_ship_hull_submarine_3_medium - GFX_NZL_vnr_ship_hull_submarine_4_medium - GFX_NZL_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_submarine_4_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -3386,16 +3676,16 @@ NZL = { pool = { weight = 5 icons = { - GFX_NZL_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } pool = { icons = { - GFX_NZL_vnr_ship_hull_submarine_1_medium - GFX_NZL_vnr_ship_hull_submarine_2_medium - GFX_NZL_vnr_ship_hull_submarine_3_medium - GFX_NZL_vnr_ship_hull_cruiser_submarine_medium + GFX_ENG_vnr_ship_hull_submarine_1_medium + GFX_ENG_vnr_ship_hull_submarine_2_medium + GFX_ENG_vnr_ship_hull_submarine_3_medium + GFX_ENG_vnr_ship_hull_cruiser_submarine_medium } } @@ -3481,6 +3771,7 @@ MAL = { GFX_ENG_vnr_ship_hull_light_2_medium GFX_ENG_vnr_ship_hull_light_3_medium GFX_ENG_vnr_ship_hull_light_4_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -3501,6 +3792,7 @@ MAL = { GFX_ENG_vnr_ship_hull_light_3_medium GFX_ENG_vnr_ship_hull_light_4_medium GFX_ENG_vnr_ship_hull_light_5_medium + "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" } } @@ -3581,6 +3873,7 @@ MAL = { "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -3609,6 +3902,7 @@ MAL = { "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } } @@ -3639,6 +3933,7 @@ MAL = { "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" + "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.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 635256e..66dca2a 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 @@ -238,6 +238,7 @@ USA = { "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" "gfx/interface/technologies/extra/USA_heavy_cruiser_Alaska.png" "gfx/interface/technologies/extra/USA_heavy_cruiser_Long_Beach.png" + "gfx/interface/technologies/extra/USA_heavy_cruiser_Albany.png" } } @@ -451,6 +452,7 @@ USA = { GFX_USA_vnr_ship_hull_carrier_conversion_ca_medium GFX_USA_vnr_ship_hull_carrier_conversion_bb_medium GFX_USA_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/extra/USA_carrier_Princeton.png" "gfx/interface/technologies/USA/USA_carrier_Ranger.png" } } @@ -471,6 +473,7 @@ USA = { GFX_USA_vnr_ship_hull_carrier_conversion_bb_medium GFX_USA_vnr_ship_hull_carrier_1_medium GFX_USA_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/extra/USA_carrier_Princeton.png" "gfx/interface/technologies/USA/USA_carrier_Ranger.png" } } @@ -495,6 +498,17 @@ USA = { "gfx/interface/technologies/USA/USA_carrier_Ranger.png" "gfx/interface/technologies/extra/USA_carrier_Enterprise.png" "gfx/interface/technologies/extra/USA_carrier_Forrestal.png" + "gfx/interface/technologies/extra/USA_carrier_Oriskany.png" + } + } + + } + + vnr_ship_hull_escort_carrier = { + pool = { + icons = { + "gfx/interface/technologies/extra/USA_carrier_Princeton.png" + "gfx/interface/technologies/extra/USA_carrier_Long_Island.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 7a44a46..9c31382 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 @@ -637,6 +637,7 @@ SOV = { GFX_SOV_vnr_ship_hull_light_4_medium GFX_SOV_vnr_ship_hull_light_5_medium "gfx/interface/technologies/Soviet/SOV_destroyer_Novik.png" + "gfx/interface/technologies/extra/SOV_destroyer_Kanin.png" } } diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/02_south_america_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/02_south_america_ship_icons.txt index 9f007b5..0af8e51 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/02_south_america_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/02_south_america_ship_icons.txt @@ -176,3 +176,18 @@ CHL = { } } + + +MEX = { + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + GFX_MEX_vnr_ship_hull_cruiser_coastal_defense_ship_medium + } + } + + } + +} \ No newline at end of file diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/02_west_europe_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/02_west_europe_ship_icons.txt index 2164b8f..f64e292 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/02_west_europe_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/02_west_europe_ship_icons.txt @@ -21,6 +21,7 @@ FRA = { pool = { icons = { GFX_FRA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" } } @@ -37,6 +38,7 @@ FRA = { pool = { icons = { "gfx/interface/technologies/France/FRA_destroyer_Bourrasque.png" + "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_1_medium GFX_FRA_vnr_ship_hull_light_2_medium } @@ -54,6 +56,7 @@ FRA = { pool = { icons = { + "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_1_medium GFX_FRA_vnr_ship_hull_light_2_medium GFX_FRA_vnr_ship_hull_light_3_medium @@ -73,6 +76,7 @@ FRA = { pool = { icons = { + "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_1_medium GFX_FRA_vnr_ship_hull_light_2_medium GFX_FRA_vnr_ship_hull_light_3_medium @@ -93,6 +97,7 @@ FRA = { pool = { icons = { + "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_1_medium GFX_FRA_vnr_ship_hull_light_2_medium GFX_FRA_vnr_ship_hull_light_3_medium @@ -340,6 +345,7 @@ FRA = { GFX_FRA_vnr_ship_hull_heavy_1_medium GFX_FRA_vnr_ship_hull_heavy_2_medium GFX_FRA_vnr_ship_hull_heavy_3_medium + "gfx/interface/technologies/extra/FRA_battleship_Richelieu.png" } } @@ -360,6 +366,7 @@ FRA = { GFX_FRA_vnr_ship_hull_heavy_2_medium GFX_FRA_vnr_ship_hull_heavy_3_medium GFX_FRA_vnr_ship_hull_heavy_4_medium + "gfx/interface/technologies/extra/FRA_battleship_Richelieu.png" } } diff --git a/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_hull_cruiser_role_cgaa.png b/src/gfx/interface/equipmentdesigner/naval/modules/icons/ship_hull_cruiser_role_cgaa.png new file mode 100755 index 0000000000000000000000000000000000000000..8a236f4c61cd90aafc542e018e6edef53894b9c7 GIT binary patch literal 3822 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 literal 0 HcmV?d00001 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 new file mode 100755 index 0000000000000000000000000000000000000000..f79e4dfe3176fd1763cf49c42b044c28bbd806ec GIT binary patch literal 4983 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 Bw#Wbg literal 0 HcmV?d00001 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 new file mode 100755 index 0000000000000000000000000000000000000000..f56db3aa40198137c16dc8cadd2084323e60732f GIT binary patch literal 5464 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 O0000K4zxpK6Yn!X73A&T^s};fB->?Bq)j^ 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/special_project/project_icons/sp_high_speed_light_engine.png b/src/gfx/interface/special_project/project_icons/sp_high_speed_light_engine.png new file mode 100755 index 0000000000000000000000000000000000000000..0974b385cd8776680b319082be8454c96d6f4092 GIT binary patch literal 12163 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 literal 0 HcmV?d00001 diff --git a/src/gfx/interface/technologies/Fun/GER_battleship_Moltke.png b/src/gfx/interface/technologies/Fun/GER_battleship_Moltke.png new file mode 100755 index 0000000000000000000000000000000000000000..8856c3085718713e22032749682e756265553fe6 GIT binary patch literal 16794 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