From 53aab70701ad19c2a14a9ea5775a6bd2bbe9b003 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Sat, 27 Sep 2025 04:02:42 +0000 Subject: [PATCH] 2025-09-27 04:02:42 --- src/common/ai_strategy/naval_production.txt | 12 +- src/common/ai_strategy/vnr_naval_strategy.txt | 127 +- .../critical_parts/00_critical_parts.txt | 12 +- .../modules/00_ship_modules_aviation.txt | 2 +- .../modules/00_ship_modules_electronics.txt | 6 +- .../equipment/modules/00_ship_modules_gun.txt | 26 +- .../modules/00_ship_modules_propulsion.txt | 8 +- .../modules/00_ship_modules_protection.txt | 3 +- .../modules/00_ship_modules_role.txt | 23 +- .../modules/00_ship_modules_support.txt | 15 +- .../graphic_db/01_China_ship_icons.txt | 1236 ++++++++++------- .../graphic_db/01_Commonwealth_ship_icons.txt | 728 +++++----- .../graphic_db/01_Germany_ship_icons.txt | 66 +- .../graphic_db/01_USA_ship_icons.txt | 79 +- .../graphic_db/02_east_asia_ship_icons.txt | 144 +- .../graphic_db/02_east_europe_ship_icons.txt | 29 +- .../graphic_db/02_south_europe_ship_icons.txt | 57 +- .../graphic_db/02_west_europe_ship_icons.txt | 73 +- .../replace/ship_modules_l_english.yml | 8 +- .../replace/ship_modules_l_english.yml | 8 +- .../replace/ship_modules_l_simp_chinese.yml | 8 +- 21 files changed, 1532 insertions(+), 1138 deletions(-) diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt index 467762c..0915d23 100755 --- a/src/common/ai_strategy/naval_production.txt +++ b/src/common/ai_strategy/naval_production.txt @@ -1495,7 +1495,7 @@ naval_unit_role_ratios_USA_go_to_war = { tag = USA } enable = { - date > 1937.12.31 + date > 1937.3.1 has_war_with_major = no } abort_when_not_enabled = yes @@ -1539,6 +1539,11 @@ naval_unit_role_ratios_USA_go_to_war = { type = dockyard_to_military_factory_ratio value = 200 } + ai_strategy = { + type = building_target + id = dockyard + value = 150 + } } naval_unit_role_ratios_USA_atwar = { @@ -1588,6 +1593,11 @@ naval_unit_role_ratios_USA_atwar = { type = dockyard_to_military_factory_ratio value = 250 } + ai_strategy = { + type = building_target + id = dockyard + value = 250 + } } naval_unit_role_ratios_ITA_prewar_build_battleships = { diff --git a/src/common/ai_strategy/vnr_naval_strategy.txt b/src/common/ai_strategy/vnr_naval_strategy.txt index 485d35f..9124dfb 100755 --- a/src/common/ai_strategy/vnr_naval_strategy.txt +++ b/src/common/ai_strategy/vnr_naval_strategy.txt @@ -15,12 +15,12 @@ ENG_protect_home_waters = { ai_strategy = { type = strike_force_home_base id = 18 - value = 1000 + value = 9999 } ai_strategy = { type = strike_force_home_base id = 16 - value = 1000 + value = 9999 } ai_strategy = { type = naval_avoid_region @@ -39,6 +39,9 @@ ENG_secure_mediterranean = { ITA = { has_navy_size = { size > 30 } } + all_core_state = { + is_controlled_by_ROOT_or_ally = yes + } enable_vnr_naval_ai = yes } abort_when_not_enabled = yes @@ -64,6 +67,41 @@ ENG_secure_mediterranean = { } } +ENG_avoid_mediterranean = { + allowed = { + has_dlc = "Man the Guns" + original_tag = ENG + } + enable = { + has_war = yes + any_core_state = { + is_controlled_by_ROOT_or_ally = no + } + enable_vnr_naval_ai = yes + } + abort_when_not_enabled = yes + ai_strategy = { + type = naval_avoid_region + id = 29 + value = 1000 + } + ai_strategy = { + type = naval_avoid_region + id = 68 + value = 1000 + } + ai_strategy = { + type = naval_avoid_region + id = 69 + value = 1000 + } + ai_strategy = { + type = naval_avoid_region + id = 168 + value = 1000 + } +} + ENG_avoid_pacific = { allowed = { has_dlc = "Man the Guns" @@ -77,6 +115,9 @@ ENG_avoid_pacific = { tag = JAP months < 24 } + any_core_state = { + is_controlled_by_ROOT_or_ally = no + } enable_vnr_naval_ai = yes } abort_when_not_enabled = yes @@ -118,6 +159,9 @@ ENG_reinforce_pacific = { 336 = { is_controlled_by_ROOT_or_ally = yes } + all_core_state = { + is_controlled_by_ROOT_or_ally = yes + } enable_vnr_naval_ai = yes } abort_when_not_enabled = yes @@ -315,6 +359,16 @@ USA_pacific_war_naval_avoid_first = { enable_vnr_naval_ai = yes } abort_when_not_enabled = yes + + ai_strategy = { + type = put_unit_buffer + ratio = 0.15 + states = { + 629 + } + subtract_invasions_from_need = yes + } + ai_strategy = { type = naval_avoid_region id = 75 @@ -379,7 +433,7 @@ USA_pacific_war_naval_avoid_first = { ai_strategy = { type = strike_force_home_base id = 105 - value = 500 + value = 9999 } ai_strategy = { type = strike_force_home_base @@ -451,6 +505,16 @@ USA_pacific_war_naval_counterattack_1 = { enable_vnr_naval_ai = yes } abort_when_not_enabled = yes + + ai_strategy = { + type = put_unit_buffer + ratio = 0.15 + states = { + 629 + } + subtract_invasions_from_need = yes + } + ai_strategy = { type = naval_avoid_region id = 75 @@ -515,7 +579,7 @@ USA_pacific_war_naval_counterattack_1 = { ai_strategy = { type = strike_force_home_base id = 105 - value = 500 + value = 9999 } ai_strategy = { type = strike_force_home_base @@ -558,6 +622,13 @@ USA_pacific_war_naval_counterattack_1 = { state = 684 value = 500 } + + ai_strategy = { + type = front_control + area = pacific + ordertype = invasion + execute_order = yes + } } USA_pacific_war_naval_counterattack_2 = { @@ -684,6 +755,20 @@ USA_pacific_war_naval_counterattack_2 = { state = 645 value = 500 } + + ai_strategy = { + type = front_control + area = pacific + ordertype = invasion + execute_order = yes + } + + ai_strategy = { + type = front_control + area = pacific + ordertype = home_islands + execute_order = yes + } } USA_pacific_war_naval_counterattack_3 = { @@ -773,6 +858,20 @@ USA_pacific_war_naval_counterattack_3 = { state = 526 value = 500 } + + ai_strategy = { + type = front_control + area = pacific + ordertype = invasion + execute_order = yes + } + + ai_strategy = { + type = front_control + area = pacific + ordertype = home_islands + execute_order = yes + } } ### ITA ### @@ -955,4 +1054,24 @@ GER_avoid_mediterranean = { id = 169 value = 1000 } +} + +GER_invade_norway = { + allowed = { + has_dlc = "Man the Guns" + original_tag = GER + } + enable = { + has_war_with = NOR + NOR = { + has_capitulated = no + } + } + abort_when_not_enabled = yes + + ai_strategy = { + type = invade + id = NOR + value = 1000 + } } \ No newline at end of file diff --git a/src/common/units/critical_parts/00_critical_parts.txt b/src/common/units/critical_parts/00_critical_parts.txt index 452f885..841f59b 100755 --- a/src/common/units/critical_parts/00_critical_parts.txt +++ b/src/common/units/critical_parts/00_critical_parts.txt @@ -36,7 +36,7 @@ critical_parts = { icon = "GFX_default_critical_damage_icons" frame = 2 stat_penalties = { - hg_attack = -0.5 + hg_attack = -0.33 } base_damage_instance = 1 damage_instance_per_added_module = 1 @@ -47,7 +47,7 @@ critical_parts = { icon = "GFX_default_critical_damage_icons" frame = 3 stat_penalties = { - lg_attack = -0.5 + lg_attack = -0.25 } base_damage_instance = 1 damage_instance_per_added_module = 1 @@ -57,7 +57,8 @@ critical_parts = { icon = "GFX_default_critical_damage_icons" frame = 3 stat_penalties = { - lg_attack = -0.25 + lg_attack = -0.1 + anti_air_attack = -0.33 } base_damage_instance = 1 damage_instance_per_added_module = 1 @@ -140,6 +141,7 @@ critical_parts = { stat_penalties = { naval_light_gun_hit_chance_factor = -0.5 naval_heavy_gun_hit_chance_factor = -0.5 + naval_torpedo_gun_hit_chance_factor = -0.5 } chance = 0.15 org_damage_multiplier = 0.25 @@ -158,7 +160,7 @@ critical_parts = { navy_org_factor = -0.3 } chance = 0.75 - org_damage_multiplier = 1.25 + org_damage_multiplier = 1.5 str_damage_multiplier = 1.25 base_damage_instance = 1 damage_instance_per_added_module = 1 @@ -174,7 +176,7 @@ critical_parts = { navy_org_factor = -0.15 } chance = 0.5 - org_damage_multiplier = 1 + org_damage_multiplier = 1.25 str_damage_multiplier = 1 base_damage_instance = 1 damage_instance_per_added_module = 1 diff --git a/src/common/units/equipment/modules/00_ship_modules_aviation.txt b/src/common/units/equipment/modules/00_ship_modules_aviation.txt index 58617e3..7567e1b 100755 --- a/src/common/units/equipment/modules/00_ship_modules_aviation.txt +++ b/src/common/units/equipment/modules/00_ship_modules_aviation.txt @@ -480,7 +480,7 @@ equipment_modules = { gui_category = carrier_miscellaneous multiply_stats = { - build_cost_ic = 0.15 + build_cost_ic = 0.1 surface_detection = 0.1 sub_detection = 0.1 max_strength = 0.05 diff --git a/src/common/units/equipment/modules/00_ship_modules_electronics.txt b/src/common/units/equipment/modules/00_ship_modules_electronics.txt index e99117b..ee33e55 100755 --- a/src/common/units/equipment/modules/00_ship_modules_electronics.txt +++ b/src/common/units/equipment/modules/00_ship_modules_electronics.txt @@ -267,7 +267,7 @@ equipment_modules = { sfx = sfx_ui_sd_module_sonar add_stats = { - build_cost_ic = 200 + build_cost_ic = 80 naval_torpedo_hit_chance_factor = 0.075 } can_convert_from = { @@ -282,7 +282,7 @@ equipment_modules = { sfx = sfx_ui_sd_module_sonar add_stats = { - build_cost_ic = 250 + build_cost_ic = 120 naval_torpedo_hit_chance_factor = 0.1 } can_convert_from = { @@ -301,7 +301,7 @@ equipment_modules = { sfx = sfx_ui_sd_module_sonar add_stats = { - build_cost_ic = 300 + build_cost_ic = 180 naval_torpedo_hit_chance_factor = 0.125 fuel_consumption = 3 } 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 f215153..ab4a1e0 100755 --- a/src/common/units/equipment/modules/00_ship_modules_gun.txt +++ b/src/common/units/equipment/modules/00_ship_modules_gun.txt @@ -445,7 +445,7 @@ equipment_modules = { } dismantle_cost_ic = 180 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_2 = { abbreviation = "sao" @@ -472,7 +472,7 @@ equipment_modules = { } dismantle_cost_ic = 210 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_3 = { abbreviation = "sap" @@ -499,7 +499,7 @@ equipment_modules = { } dismantle_cost_ic = 240 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_4 = { abbreviation = "saq" @@ -526,7 +526,7 @@ equipment_modules = { } dismantle_cost_ic = 270 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_1_double = { @@ -552,7 +552,7 @@ equipment_modules = { } dismantle_cost_ic = 135 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_2_double = { abbreviation = "saod" @@ -579,7 +579,7 @@ equipment_modules = { } dismantle_cost_ic = 165 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_3_double = { abbreviation = "sapd" @@ -606,7 +606,7 @@ equipment_modules = { } dismantle_cost_ic = 195 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_4_double = { abbreviation = "saqd" @@ -633,7 +633,7 @@ equipment_modules = { } dismantle_cost_ic = 225 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } # single medium battery @@ -659,7 +659,7 @@ equipment_modules = { } dismantle_cost_ic = 90 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_2_single = { category = ship_medium_battery_single @@ -685,7 +685,7 @@ equipment_modules = { } dismantle_cost_ic = 120 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_3_single = { category = ship_medium_battery_single @@ -711,7 +711,7 @@ equipment_modules = { } dismantle_cost_ic = 150 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } ship_medium_battery_4_single = { category = ship_medium_battery_single @@ -737,7 +737,7 @@ equipment_modules = { } dismantle_cost_ic = 180 - critical_parts = { damaged_heavy_guns } + critical_parts = { damaged_light_guns } } # double medium heavy battery @@ -1573,7 +1573,7 @@ equipment_modules = { } multiply_stats = { build_cost_ic = 0.042 - naval_speed = -0.05 + naval_speed = -0.055 } add_average_stats = { hg_armor_piercing = 43 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 6463c6a..6e726e0 100755 --- a/src/common/units/equipment/modules/00_ship_modules_propulsion.txt +++ b/src/common/units/equipment/modules/00_ship_modules_propulsion.txt @@ -773,7 +773,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = 0.55 + naval_speed = 0.5 } can_convert_from = { @@ -803,7 +803,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = 0.6 + naval_speed = 0.55 } can_convert_from = { @@ -891,7 +891,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = 0.5 + naval_speed = 0.45 naval_range = 0.8 } @@ -921,7 +921,7 @@ equipment_modules = { } multiply_stats = { - naval_speed = 0.65 + naval_speed = 0.6 naval_range = -0.2 } diff --git a/src/common/units/equipment/modules/00_ship_modules_protection.txt b/src/common/units/equipment/modules/00_ship_modules_protection.txt index 1cff19e..0934241 100755 --- a/src/common/units/equipment/modules/00_ship_modules_protection.txt +++ b/src/common/units/equipment/modules/00_ship_modules_protection.txt @@ -1315,7 +1315,7 @@ equipment_modules = { ship_light_medium_battery_double } } - ship_cruiser_camo_2 = { # civilian ship disguise, merchant raider/auxiliary cruiser + ship_cruiser_camo_2 = { category = raider_kit multiply_stats = { @@ -1326,7 +1326,6 @@ equipment_modules = { anti_air_attack = -0.5 torpedo_attack = -0.8 surface_visibility = -0.2 - max_strength = -0.25 build_cost_ic = 0.02 } 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 3b118b2..cd11034 100755 --- a/src/common/units/equipment/modules/00_ship_modules_role.txt +++ b/src/common/units/equipment/modules/00_ship_modules_role.txt @@ -41,12 +41,11 @@ equipment_modules = { category = dd_role multiply_stats = { lg_attack = -0.1 - max_strength = -0.15 + max_strength = -0.05 naval_speed = -0.3 sub_detection = 0.1 torpedo_attack = -0.6 surface_visibility = -0.05 - naval_range = -0.1 build_cost_ic = -0.2 } dismantle_cost_ic = 3000 @@ -64,7 +63,7 @@ equipment_modules = { lg_attack = -0.15 lg_armor_piercing = -0.1 anti_air_attack = -0.15 - max_strength = -0.25 + max_strength = -0.1 naval_speed = -0.4 surface_visibility = -0.1 torpedo_attack = -0.8 @@ -169,10 +168,6 @@ equipment_modules = { ship_hull_cruiser_role_ca = { category = c_role add_equipment_type = capital_ship - add_stats = { - naval_heavy_gun_hit_chance_factor = 0.05 - naval_light_gun_hit_chance_factor = 0.05 - } forbid_module_categories = { ship_medium_heavy_battery_triple ship_medium_heavy_battery_double @@ -205,10 +200,6 @@ equipment_modules = { ship_light_medium_battery ship_light_medium_battery_double ship_light_medium_battery_single - ship_light_battery - ship_light_battery_double - dp_light_battery - dp_light_battery_single ship_missile ship_missile_aa raider_kit @@ -354,10 +345,6 @@ equipment_modules = { naval_range = 0.5 } dismantle_cost_ic = 3000 - forbid_module_categories = { - ship_medium_heavy_battery_double - ship_medium_heavy_battery_triple - } } ship_hull_cruiser_role_cd = { category = cds_role @@ -368,8 +355,6 @@ equipment_modules = { dismantle_cost_ic = 3000 forbid_module_categories = { ship_cruiser_heavy_armor - ship_medium_heavy_battery_double - ship_medium_heavy_battery_triple } } ship_hull_cruiser_role_mo = { @@ -383,10 +368,6 @@ equipment_modules = { build_cost_ic = 0.1 naval_range = 0.5 } - forbid_module_categories = { - ship_medium_heavy_battery_double - ship_medium_heavy_battery_triple - } } 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 da542d7..6a4a60d 100755 --- a/src/common/units/equipment/modules/00_ship_modules_support.txt +++ b/src/common/units/equipment/modules/00_ship_modules_support.txt @@ -823,11 +823,10 @@ equipment_modules = { sub_detection = 2 sub_attack = 1.5 build_cost_ic = 150 - surface_visibility = 0.5 } multiply_stats = { naval_speed = -0.003 - surface_visibility = 0.025 + surface_detection = -0.03 } } ship_airplane_launcher_2 = { @@ -840,7 +839,6 @@ equipment_modules = { sub_detection = 3.5 sub_attack = 2.5 build_cost_ic = 250 - surface_visibility = 1 } can_convert_from = { module_category = ship_airplane_launcher @@ -848,7 +846,7 @@ equipment_modules = { } multiply_stats = { naval_speed = -0.004 - surface_visibility = 0.05 + surface_detection = -0.04 } } ship_helipad = { @@ -859,10 +857,10 @@ equipment_modules = { sub_detection = 4.5 sub_attack = 6 build_cost_ic = 200 - surface_visibility = 0.025 } multiply_stats = { naval_speed = -0.005 + surface_detection = -0.035 } } recon_drone_1 = { @@ -872,6 +870,9 @@ equipment_modules = { sub_detection = 3 build_cost_ic = 10 } + multiply_stats = { + surface_detection = -0.01 + } } seaplane_hangar = { category = seaplane_hangar @@ -894,12 +895,10 @@ equipment_modules = { add_stats = { surface_detection = 2 naval_torpedo_hit_chance_factor = 0.01 - reliability = -0.05 build_cost_ic = 150 } multiply_stats = { naval_speed = -0.003 - sub_visibility = 0.05 } } sub_airplane_launcher_2 = { @@ -910,7 +909,6 @@ equipment_modules = { naval_torpedo_hit_chance_factor = 0.02 hg_attack = 2 lg_attack = 1 - reliability = -0.05 build_cost_ic = 250 } can_convert_from = { @@ -919,7 +917,6 @@ equipment_modules = { } multiply_stats = { naval_speed = -0.004 - sub_visibility = 0.05 } } diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/01_China_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/01_China_ship_icons.txt index 4471172..1e45547 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/01_China_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/01_China_ship_icons.txt @@ -1,76 +1,5 @@ PRC = { - vnr_ship_hull_light_1 = { - pool = { - weight = 5 - icons = { - GFX_PRC_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_6 = { - pool = { - weight = 5 - icons = { - GFX_PRC_vnr_ship_hull_light_6_medium - } - } - - } - - vnr_ship_hull_cruiser_1 = { - pool = { - weight = 5 - icons = { - GFX_PRC_vnr_ship_hull_cruiser_1_capital_medium - GFX_PRC_vnr_ship_hull_cruiser_1_medium - } - } - - } - - vnr_ship_hull_cruiser_2 = { - pool = { - weight = 5 - icons = { - GFX_PRC_vnr_ship_hull_cruiser_2_medium - } - } - - pool = { - icons = { - GFX_PRC_vnr_ship_hull_cruiser_1_medium - GFX_PRC_vnr_ship_hull_cruiser_1_capital_medium - } - } - - } - - vnr_ship_hull_cruiser_6 = { - pool = { - weight = 5 - icons = { - GFX_PRC_vnr_ship_hull_cruiser_6_medium - } - } - - pool = { - icons = { - GFX_PRC_vnr_ship_hull_cruiser_1_medium - GFX_PRC_vnr_ship_hull_cruiser_1_capital_medium - GFX_PRC_vnr_ship_hull_cruiser_2_medium - } - } - - } - -} - - -CHI = { - vnr_ship_hull_light_1 = { pool = { weight = 5 @@ -91,6 +20,7 @@ CHI = { pool = { weight = 5 icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" GFX_CHI_vnr_ship_hull_light_6_medium } } @@ -124,9 +54,9 @@ CHI = { pool = { icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" GFX_CHI_vnr_ship_hull_cruiser_1_medium GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium - "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" } } @@ -142,6 +72,112 @@ CHI = { pool = { icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Zhaohe.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + +} + + +CHI = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + GFX_CHI_vnr_ship_hull_light_6_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" GFX_CHI_vnr_ship_hull_cruiser_1_medium GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium GFX_CHI_vnr_ship_hull_cruiser_2_medium @@ -174,430 +210,6 @@ CHI = { XSM = { - vnr_ship_hull_light_1 = { - pool = { - weight = 5 - icons = { - GFX_XSM_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_6 = { - pool = { - weight = 5 - icons = { - GFX_XSM_vnr_ship_hull_light_6_medium - } - } - - } - - vnr_ship_hull_cruiser_1 = { - pool = { - weight = 5 - icons = { - GFX_XSM_vnr_ship_hull_cruiser_1_capital_medium - GFX_XSM_vnr_ship_hull_cruiser_1_medium - } - } - - } - - vnr_ship_hull_cruiser_2 = { - pool = { - weight = 5 - icons = { - GFX_XSM_vnr_ship_hull_cruiser_2_medium - } - } - - pool = { - icons = { - GFX_XSM_vnr_ship_hull_cruiser_1_medium - GFX_XSM_vnr_ship_hull_cruiser_1_capital_medium - } - } - - } - - vnr_ship_hull_cruiser_6 = { - pool = { - weight = 5 - icons = { - GFX_XSM_vnr_ship_hull_cruiser_6_medium - } - } - - pool = { - icons = { - GFX_XSM_vnr_ship_hull_cruiser_1_medium - GFX_XSM_vnr_ship_hull_cruiser_1_capital_medium - GFX_XSM_vnr_ship_hull_cruiser_2_medium - } - } - - } - -} - - -SHX = { - - vnr_ship_hull_light_1 = { - pool = { - weight = 5 - icons = { - GFX_SHX_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_6 = { - pool = { - weight = 5 - icons = { - GFX_SHX_vnr_ship_hull_light_6_medium - } - } - - } - - vnr_ship_hull_cruiser_1 = { - pool = { - weight = 5 - icons = { - GFX_SHX_vnr_ship_hull_cruiser_1_capital_medium - GFX_SHX_vnr_ship_hull_cruiser_1_medium - } - } - - } - - vnr_ship_hull_cruiser_2 = { - pool = { - weight = 5 - icons = { - GFX_SHX_vnr_ship_hull_cruiser_2_medium - } - } - - pool = { - icons = { - GFX_SHX_vnr_ship_hull_cruiser_1_medium - GFX_SHX_vnr_ship_hull_cruiser_1_capital_medium - } - } - - } - - vnr_ship_hull_cruiser_6 = { - pool = { - weight = 5 - icons = { - GFX_SHX_vnr_ship_hull_cruiser_6_medium - } - } - - pool = { - icons = { - GFX_SHX_vnr_ship_hull_cruiser_1_medium - GFX_SHX_vnr_ship_hull_cruiser_1_capital_medium - GFX_SHX_vnr_ship_hull_cruiser_2_medium - } - } - - } - -} - - -GXC = { - - vnr_ship_hull_light_1 = { - pool = { - weight = 5 - icons = { - GFX_GXC_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_6 = { - pool = { - weight = 5 - icons = { - GFX_GXC_vnr_ship_hull_light_6_medium - } - } - - } - - vnr_ship_hull_cruiser_1 = { - pool = { - weight = 5 - icons = { - GFX_GXC_vnr_ship_hull_cruiser_1_capital_medium - GFX_GXC_vnr_ship_hull_cruiser_1_medium - } - } - - } - - vnr_ship_hull_cruiser_2 = { - pool = { - weight = 5 - icons = { - GFX_GXC_vnr_ship_hull_cruiser_2_medium - } - } - - pool = { - icons = { - GFX_GXC_vnr_ship_hull_cruiser_1_medium - GFX_GXC_vnr_ship_hull_cruiser_1_capital_medium - } - } - - } - - vnr_ship_hull_cruiser_6 = { - pool = { - weight = 5 - icons = { - GFX_GXC_vnr_ship_hull_cruiser_6_medium - } - } - - pool = { - icons = { - GFX_GXC_vnr_ship_hull_cruiser_1_medium - GFX_GXC_vnr_ship_hull_cruiser_1_capital_medium - GFX_GXC_vnr_ship_hull_cruiser_2_medium - } - } - - } - -} - - -YUN = { - - vnr_ship_hull_light_1 = { - pool = { - weight = 5 - icons = { - GFX_YUN_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_6 = { - pool = { - weight = 5 - icons = { - GFX_YUN_vnr_ship_hull_light_6_medium - } - } - - } - - vnr_ship_hull_cruiser_1 = { - pool = { - weight = 5 - icons = { - GFX_YUN_vnr_ship_hull_cruiser_1_capital_medium - GFX_YUN_vnr_ship_hull_cruiser_1_medium - } - } - - } - - vnr_ship_hull_cruiser_2 = { - pool = { - weight = 5 - icons = { - GFX_YUN_vnr_ship_hull_cruiser_2_medium - } - } - - pool = { - icons = { - GFX_YUN_vnr_ship_hull_cruiser_1_medium - GFX_YUN_vnr_ship_hull_cruiser_1_capital_medium - } - } - - } - - vnr_ship_hull_cruiser_6 = { - pool = { - weight = 5 - icons = { - GFX_YUN_vnr_ship_hull_cruiser_6_medium - } - } - - pool = { - icons = { - GFX_YUN_vnr_ship_hull_cruiser_1_medium - GFX_YUN_vnr_ship_hull_cruiser_1_capital_medium - GFX_YUN_vnr_ship_hull_cruiser_2_medium - } - } - - } - -} - -SIK = { - - vnr_ship_hull_light_1 = { - pool = { - weight = 5 - icons = { - GFX_SIK_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_6 = { - pool = { - weight = 5 - icons = { - GFX_SIK_vnr_ship_hull_light_6_medium - } - } - - } - - vnr_ship_hull_cruiser_1 = { - pool = { - weight = 5 - icons = { - GFX_SIK_vnr_ship_hull_cruiser_1_capital_medium - GFX_SIK_vnr_ship_hull_cruiser_1_medium - } - } - - } - - vnr_ship_hull_cruiser_2 = { - pool = { - weight = 5 - icons = { - GFX_SIK_vnr_ship_hull_cruiser_2_medium - } - } - - pool = { - icons = { - GFX_SIK_vnr_ship_hull_cruiser_1_medium - GFX_SIK_vnr_ship_hull_cruiser_1_capital_medium - } - } - - } - - vnr_ship_hull_cruiser_6 = { - pool = { - weight = 5 - icons = { - GFX_SIK_vnr_ship_hull_cruiser_6_medium - } - } - - pool = { - icons = { - GFX_SIK_vnr_ship_hull_cruiser_1_medium - GFX_SIK_vnr_ship_hull_cruiser_1_capital_medium - GFX_SIK_vnr_ship_hull_cruiser_2_medium - } - } - - } - -} - - -MAN = { - - vnr_ship_hull_light_1 = { - pool = { - weight = 5 - icons = { - GFX_MAN_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_6 = { - pool = { - weight = 5 - icons = { - GFX_MAN_vnr_ship_hull_light_6_medium - } - } - - } - - vnr_ship_hull_cruiser_1 = { - pool = { - weight = 5 - icons = { - GFX_MAN_vnr_ship_hull_cruiser_1_capital_medium - GFX_MAN_vnr_ship_hull_cruiser_1_medium - } - } - - } - - vnr_ship_hull_cruiser_2 = { - pool = { - weight = 5 - icons = { - GFX_MAN_vnr_ship_hull_cruiser_2_medium - } - } - - pool = { - icons = { - GFX_MAN_vnr_ship_hull_cruiser_1_medium - GFX_MAN_vnr_ship_hull_cruiser_1_capital_medium - } - } - - } - - vnr_ship_hull_cruiser_6 = { - pool = { - weight = 5 - icons = { - GFX_MAN_vnr_ship_hull_cruiser_6_medium - } - } - - pool = { - icons = { - GFX_MAN_vnr_ship_hull_cruiser_1_medium - GFX_MAN_vnr_ship_hull_cruiser_1_capital_medium - GFX_MAN_vnr_ship_hull_cruiser_2_medium - } - } - - } - -} - -TIB = { - vnr_ship_hull_light_1 = { pool = { weight = 5 @@ -618,6 +230,7 @@ TIB = { pool = { weight = 5 icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" GFX_CHI_vnr_ship_hull_light_6_medium } } @@ -651,9 +264,9 @@ TIB = { pool = { icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" GFX_CHI_vnr_ship_hull_cruiser_1_medium GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium - "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" } } @@ -669,6 +282,635 @@ TIB = { pool = { icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Zhaohe.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + +} + + +SHX = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + GFX_CHI_vnr_ship_hull_light_6_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Zhaohe.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + +} + + +GXC = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + GFX_CHI_vnr_ship_hull_light_6_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Zhaohe.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + +} + + +YUN = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + GFX_CHI_vnr_ship_hull_light_6_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Zhaohe.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + +} + +SIK = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + GFX_CHI_vnr_ship_hull_light_6_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Zhaohe.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + +} + + +MAN = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + GFX_CHI_vnr_ship_hull_light_6_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + } + + vnr_ship_hull_cruiser_coastal_defense_ship = { + pool = { + weight = 5 + icons = { + + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Zhaohe.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + +} + +TIB = { + + vnr_ship_hull_light_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_light_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + } + } + + } + + vnr_ship_hull_light_6 = { + pool = { + weight = 5 + icons = { + "gfx/interface/technologies/China/CHI_destroyer_Zhongshan.png" + GFX_CHI_vnr_ship_hull_light_6_medium + } + } + + } + + vnr_ship_hull_cruiser_1 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + GFX_CHI_vnr_ship_hull_cruiser_1_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + } + } + + } + + vnr_ship_hull_cruiser_2 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_2_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" + GFX_CHI_vnr_ship_hull_cruiser_1_medium + GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium + } + } + + } + + vnr_ship_hull_cruiser_6 = { + pool = { + weight = 5 + icons = { + GFX_CHI_vnr_ship_hull_cruiser_6_medium + } + } + + pool = { + icons = { + "gfx/interface/technologies/China/CHI_light_cruiser_Yixian.png" GFX_CHI_vnr_ship_hull_cruiser_1_medium GFX_CHI_vnr_ship_hull_cruiser_1_capital_medium GFX_CHI_vnr_ship_hull_cruiser_2_medium 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 d48e629..2fd29e5 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 @@ -95,8 +95,8 @@ 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_ENG_vnr_ship_hull_light_5_medium "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" + GFX_ENG_vnr_ship_hull_light_5_medium } } @@ -124,10 +124,10 @@ ENG = { pool = { icons = { - "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" - "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" } } @@ -144,13 +144,13 @@ ENG = { pool = { icons = { - "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" } } @@ -168,14 +168,14 @@ ENG = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } @@ -195,18 +195,18 @@ ENG = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium } } @@ -224,20 +224,20 @@ ENG = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium - GFX_ENG_vnr_ship_hull_cruiser_5_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium } } @@ -299,11 +299,11 @@ ENG = { pool = { icons = { - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" } } @@ -319,12 +319,12 @@ ENG = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium } } @@ -341,12 +341,12 @@ ENG = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium GFX_ENG_vnr_ship_hull_heavy_3_medium } @@ -364,12 +364,12 @@ ENG = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_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 @@ -429,6 +429,8 @@ ENG = { } pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } @@ -445,6 +447,8 @@ ENG = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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 @@ -464,11 +468,13 @@ ENG = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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" GFX_ENG_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -484,14 +490,14 @@ ENG = { pool = { icons = { - GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + 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_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" 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" } } @@ -716,8 +722,8 @@ CAN = { 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" + GFX_ENG_vnr_ship_hull_light_5_medium } } @@ -745,10 +751,10 @@ CAN = { pool = { icons = { - "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" - "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" } } @@ -765,13 +771,13 @@ CAN = { pool = { icons = { - "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" } } @@ -789,14 +795,14 @@ CAN = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } @@ -816,18 +822,18 @@ CAN = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium } } @@ -845,20 +851,20 @@ CAN = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium - GFX_ENG_vnr_ship_hull_cruiser_5_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium } } @@ -920,11 +926,11 @@ CAN = { pool = { icons = { - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" } } @@ -940,12 +946,12 @@ CAN = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium } } @@ -962,12 +968,12 @@ CAN = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium GFX_ENG_vnr_ship_hull_heavy_3_medium } @@ -985,12 +991,12 @@ CAN = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_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 @@ -1050,6 +1056,8 @@ CAN = { } pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } @@ -1066,6 +1074,8 @@ CAN = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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 @@ -1085,11 +1095,13 @@ CAN = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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" GFX_ENG_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -1105,14 +1117,14 @@ CAN = { pool = { icons = { - GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + 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_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" 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" } } @@ -1336,8 +1348,8 @@ RAJ = { 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" + GFX_ENG_vnr_ship_hull_light_5_medium } } @@ -1365,10 +1377,10 @@ RAJ = { pool = { icons = { - "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" - "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" } } @@ -1385,13 +1397,13 @@ RAJ = { pool = { icons = { - "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" } } @@ -1409,14 +1421,14 @@ RAJ = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } @@ -1436,18 +1448,18 @@ RAJ = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium } } @@ -1465,20 +1477,20 @@ RAJ = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium - GFX_ENG_vnr_ship_hull_cruiser_5_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium } } @@ -1540,11 +1552,11 @@ RAJ = { pool = { icons = { - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" } } @@ -1560,12 +1572,12 @@ RAJ = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium } } @@ -1582,12 +1594,12 @@ RAJ = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium GFX_ENG_vnr_ship_hull_heavy_3_medium } @@ -1605,12 +1617,12 @@ RAJ = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_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 @@ -1670,6 +1682,8 @@ RAJ = { } pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } @@ -1686,6 +1700,8 @@ RAJ = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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 @@ -1705,11 +1721,13 @@ RAJ = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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" GFX_ENG_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -1725,14 +1743,14 @@ RAJ = { pool = { icons = { - GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + 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_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" 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" } } @@ -1956,8 +1974,8 @@ SAF = { 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" + GFX_ENG_vnr_ship_hull_light_5_medium } } @@ -1985,10 +2003,10 @@ SAF = { pool = { icons = { - "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" - "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" } } @@ -2005,13 +2023,13 @@ SAF = { pool = { icons = { - "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" } } @@ -2029,14 +2047,14 @@ SAF = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } @@ -2056,18 +2074,18 @@ SAF = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium } } @@ -2085,20 +2103,20 @@ SAF = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium - GFX_ENG_vnr_ship_hull_cruiser_5_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium } } @@ -2160,11 +2178,11 @@ SAF = { pool = { icons = { - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" } } @@ -2180,12 +2198,12 @@ SAF = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium } } @@ -2202,12 +2220,12 @@ SAF = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium GFX_ENG_vnr_ship_hull_heavy_3_medium } @@ -2225,12 +2243,12 @@ SAF = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_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 @@ -2290,6 +2308,8 @@ SAF = { } pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } @@ -2306,6 +2326,8 @@ SAF = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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 @@ -2325,11 +2347,13 @@ SAF = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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" GFX_ENG_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -2345,14 +2369,14 @@ SAF = { pool = { icons = { - GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + 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_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" 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" } } @@ -2576,8 +2600,8 @@ AST = { 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" + GFX_ENG_vnr_ship_hull_light_5_medium } } @@ -2605,10 +2629,10 @@ AST = { pool = { icons = { - "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" - "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" } } @@ -2625,13 +2649,13 @@ AST = { pool = { icons = { - "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" } } @@ -2649,14 +2673,14 @@ AST = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } @@ -2676,18 +2700,18 @@ AST = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium } } @@ -2705,20 +2729,20 @@ AST = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium - GFX_ENG_vnr_ship_hull_cruiser_5_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium } } @@ -2780,11 +2804,11 @@ AST = { pool = { icons = { - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" } } @@ -2800,12 +2824,12 @@ AST = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium } } @@ -2822,12 +2846,12 @@ AST = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium GFX_ENG_vnr_ship_hull_heavy_3_medium } @@ -2845,12 +2869,12 @@ AST = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_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 @@ -2910,6 +2934,8 @@ AST = { } pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } @@ -2926,6 +2952,8 @@ AST = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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 @@ -2945,11 +2973,13 @@ AST = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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" GFX_ENG_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -2965,14 +2995,14 @@ AST = { pool = { icons = { - GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + 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_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" 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" } } @@ -3196,8 +3226,8 @@ NZL = { 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" + GFX_ENG_vnr_ship_hull_light_5_medium } } @@ -3225,10 +3255,10 @@ NZL = { pool = { icons = { - "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" - "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" } } @@ -3245,13 +3275,13 @@ NZL = { pool = { icons = { - "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" } } @@ -3269,14 +3299,14 @@ NZL = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } @@ -3296,18 +3326,18 @@ NZL = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium } } @@ -3325,20 +3355,20 @@ NZL = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium - GFX_ENG_vnr_ship_hull_cruiser_5_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium } } @@ -3400,11 +3430,11 @@ NZL = { pool = { icons = { - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" } } @@ -3420,12 +3450,12 @@ NZL = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium } } @@ -3442,12 +3472,12 @@ NZL = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium GFX_ENG_vnr_ship_hull_heavy_3_medium } @@ -3465,12 +3495,12 @@ NZL = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_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 @@ -3530,6 +3560,8 @@ NZL = { } pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } @@ -3546,6 +3578,8 @@ NZL = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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 @@ -3565,11 +3599,13 @@ NZL = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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" GFX_ENG_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -3585,14 +3621,14 @@ NZL = { pool = { icons = { - GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + 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_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" 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" } } @@ -3816,8 +3852,8 @@ 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_ENG_vnr_ship_hull_light_5_medium "gfx/interface/technologies/extra/ENG_destroyer_Daring.png" + GFX_ENG_vnr_ship_hull_light_5_medium } } @@ -3845,10 +3881,10 @@ MAL = { pool = { icons = { - "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" - "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" } } @@ -3865,13 +3901,13 @@ MAL = { pool = { icons = { - "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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" + "gfx/interface/technologies/England/ENG_light_cruiser_Arethusa.png" } } @@ -3889,14 +3925,14 @@ MAL = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" } @@ -3916,18 +3952,18 @@ MAL = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium } } @@ -3945,20 +3981,20 @@ MAL = { pool = { icons = { GFX_ENG_vnr_ship_hull_cruiser_1_medium - GFX_ENG_vnr_ship_hull_cruiser_2_medium - GFX_ENG_vnr_ship_hull_cruiser_3_medium - GFX_ENG_vnr_ship_hull_cruiser_4_medium - GFX_ENG_vnr_ship_hull_cruiser_5_medium GFX_ENG_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/England/ENG_light_cruiser_Adventure.png" + "gfx/interface/technologies/England/ENG_heavy_cruiser_York.png" + GFX_ENG_vnr_ship_hull_cruiser_2_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_ENG_vnr_ship_hull_cruiser_3_medium + GFX_ENG_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/ENG_light_cruiser_Tiger.png" "gfx/interface/technologies/extra/ENG_light_cruiser_Black_Prince.png" + GFX_ENG_vnr_ship_hull_cruiser_4_medium + GFX_ENG_vnr_ship_hull_cruiser_4_capital_medium + GFX_ENG_vnr_ship_hull_cruiser_5_medium + GFX_ENG_vnr_ship_hull_cruiser_5_capital_medium } } @@ -4020,11 +4056,11 @@ MAL = { pool = { icons = { - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" } } @@ -4040,12 +4076,12 @@ MAL = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium } } @@ -4062,12 +4098,12 @@ MAL = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_heavy_1_medium GFX_ENG_vnr_ship_hull_heavy_2_medium GFX_ENG_vnr_ship_hull_heavy_3_medium } @@ -4085,12 +4121,12 @@ MAL = { pool = { icons = { - GFX_ENG_vnr_ship_hull_super_heavy_1_medium - GFX_ENG_vnr_ship_hull_heavy_1_medium - "gfx/interface/technologies/England/ENG_battleship_Admiral.png" - "gfx/interface/technologies/England/ENG_battleship_Renown.png" + "gfx/interface/technologies/England/ENG_battleship_Renown.png" "gfx/interface/technologies/England/ENG_battleship_Revenge.png" "gfx/interface/technologies/extra/ENG_battleship_Queen.png" + GFX_ENG_vnr_ship_hull_heavy_1_medium + "gfx/interface/technologies/England/ENG_battleship_Admiral.png" + GFX_ENG_vnr_ship_hull_super_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 @@ -4150,6 +4186,8 @@ MAL = { } pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium GFX_ENG_vnr_ship_hull_carrier_conversion_bb_medium } @@ -4166,6 +4204,8 @@ MAL = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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 @@ -4185,11 +4225,13 @@ MAL = { pool = { icons = { + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" 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" GFX_ENG_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" } } @@ -4205,14 +4247,14 @@ MAL = { pool = { icons = { - GFX_ENG_vnr_ship_hull_carrier_conversion_ca_medium + "gfx/interface/technologies/England/ENG_carrier_Hermes.png" + "gfx/interface/technologies/England/ENG_carrier_Furious.png" + 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_1_medium + "gfx/interface/technologies/extra/ENG_carrier_Colossus.png" 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" } } diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt index 4eec2dc..b970c30 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/01_Germany_ship_icons.txt @@ -160,8 +160,8 @@ GER = { pool = { icons = { GFX_GER_vnr_ship_hull_cruiser_1_medium + GFX_GER_vnr_ship_hull_cruiser_1_capital_medium GFX_GER_vnr_ship_hull_cruiser_2_medium - GFX_GER_vnr_ship_hull_cruiser_1_capital_medium GFX_GER_vnr_ship_hull_cruiser_2_capital_medium } } @@ -180,10 +180,10 @@ GER = { pool = { icons = { GFX_GER_vnr_ship_hull_cruiser_1_medium + GFX_GER_vnr_ship_hull_cruiser_1_capital_medium GFX_GER_vnr_ship_hull_cruiser_2_medium - GFX_GER_vnr_ship_hull_cruiser_3_medium - GFX_GER_vnr_ship_hull_cruiser_1_capital_medium GFX_GER_vnr_ship_hull_cruiser_2_capital_medium + GFX_GER_vnr_ship_hull_cruiser_3_medium GFX_GER_vnr_ship_hull_cruiser_3_capital_medium } } @@ -202,12 +202,12 @@ GER = { pool = { icons = { GFX_GER_vnr_ship_hull_cruiser_1_medium + GFX_GER_vnr_ship_hull_cruiser_1_capital_medium GFX_GER_vnr_ship_hull_cruiser_2_medium - GFX_GER_vnr_ship_hull_cruiser_3_medium - GFX_GER_vnr_ship_hull_cruiser_4_medium - GFX_GER_vnr_ship_hull_cruiser_1_capital_medium GFX_GER_vnr_ship_hull_cruiser_2_capital_medium + GFX_GER_vnr_ship_hull_cruiser_3_medium GFX_GER_vnr_ship_hull_cruiser_3_capital_medium + GFX_GER_vnr_ship_hull_cruiser_4_medium GFX_GER_vnr_ship_hull_cruiser_4_capital_medium } } @@ -225,14 +225,14 @@ GER = { pool = { icons = { GFX_GER_vnr_ship_hull_cruiser_1_medium + GFX_GER_vnr_ship_hull_cruiser_1_capital_medium GFX_GER_vnr_ship_hull_cruiser_2_medium - GFX_GER_vnr_ship_hull_cruiser_3_medium - GFX_GER_vnr_ship_hull_cruiser_4_medium - GFX_GER_vnr_ship_hull_cruiser_5_medium - GFX_GER_vnr_ship_hull_cruiser_1_capital_medium GFX_GER_vnr_ship_hull_cruiser_2_capital_medium + GFX_GER_vnr_ship_hull_cruiser_3_medium GFX_GER_vnr_ship_hull_cruiser_3_capital_medium + GFX_GER_vnr_ship_hull_cruiser_4_medium GFX_GER_vnr_ship_hull_cruiser_4_capital_medium + GFX_GER_vnr_ship_hull_cruiser_5_medium GFX_GER_vnr_ship_hull_cruiser_5_capital_medium } } @@ -272,12 +272,17 @@ GER = { pool = { weight = 5 icons = { - GFX_GER_vnr_ship_hull_super_heavy_1_medium + GFX_GER_vnr_ship_hull_heavy_1_medium + } + } + + pool = { + icons = { "gfx/interface/technologies/Fun/GER_battleship_Von.png" "gfx/interface/technologies/Fun/GER_battleship_Moltke.png" "gfx/interface/technologies/Fun/GER_battleship_Derfflinger.png" - GFX_GER_vnr_ship_hull_heavy_1_medium } + } } @@ -292,10 +297,10 @@ GER = { pool = { icons = { - GFX_GER_vnr_ship_hull_super_heavy_1_medium "gfx/interface/technologies/Fun/GER_battleship_Von.png" "gfx/interface/technologies/Fun/GER_battleship_Moltke.png" "gfx/interface/technologies/Fun/GER_battleship_Derfflinger.png" + GFX_GER_vnr_ship_hull_super_heavy_1_medium GFX_GER_vnr_ship_hull_heavy_1_medium "gfx/interface/technologies/Fun/Yorck.png" "gfx/interface/technologies/Fun/L20e.png" @@ -314,10 +319,10 @@ GER = { pool = { icons = { - GFX_GER_vnr_ship_hull_super_heavy_1_medium "gfx/interface/technologies/Fun/GER_battleship_Von.png" "gfx/interface/technologies/Fun/GER_battleship_Moltke.png" "gfx/interface/technologies/Fun/GER_battleship_Derfflinger.png" + GFX_GER_vnr_ship_hull_super_heavy_1_medium GFX_GER_vnr_ship_hull_heavy_1_medium "gfx/interface/technologies/Fun/Yorck.png" "gfx/interface/technologies/Fun/L20e.png" @@ -337,10 +342,10 @@ GER = { pool = { icons = { - GFX_GER_vnr_ship_hull_super_heavy_1_medium "gfx/interface/technologies/Fun/GER_battleship_Von.png" "gfx/interface/technologies/Fun/GER_battleship_Moltke.png" "gfx/interface/technologies/Fun/GER_battleship_Derfflinger.png" + GFX_GER_vnr_ship_hull_super_heavy_1_medium GFX_GER_vnr_ship_hull_heavy_1_medium "gfx/interface/technologies/Fun/Yorck.png" "gfx/interface/technologies/Fun/L20e.png" @@ -361,10 +366,10 @@ GER = { pool = { icons = { - GFX_GER_vnr_ship_hull_super_heavy_1_medium "gfx/interface/technologies/Fun/GER_battleship_Von.png" "gfx/interface/technologies/Fun/GER_battleship_Moltke.png" "gfx/interface/technologies/Fun/GER_battleship_Derfflinger.png" + GFX_GER_vnr_ship_hull_super_heavy_1_medium GFX_GER_vnr_ship_hull_heavy_1_medium "gfx/interface/technologies/Fun/Yorck.png" "gfx/interface/technologies/Fun/L20e.png" @@ -418,7 +423,6 @@ GER = { icons = { GFX_GER_vnr_ship_hull_carrier_conversion_ca_medium GFX_GER_vnr_ship_hull_carrier_conversion_bb_medium - "gfx/interface/technologies/Germany/GER_carrier_conversion_bb.png" } } @@ -437,7 +441,6 @@ GER = { GFX_GER_vnr_ship_hull_carrier_conversion_ca_medium GFX_GER_vnr_ship_hull_carrier_conversion_bb_medium GFX_GER_vnr_ship_hull_carrier_1_medium - "gfx/interface/technologies/Germany/GER_carrier_conversion_bb.png" } } @@ -457,7 +460,6 @@ GER = { GFX_GER_vnr_ship_hull_carrier_conversion_bb_medium GFX_GER_vnr_ship_hull_carrier_1_medium GFX_GER_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/Germany/GER_carrier_conversion_bb.png" } } @@ -489,10 +491,10 @@ GER = { pool = { icons = { - "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" - "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" GFX_GER_vnr_ship_hull_submarine_1_medium GFX_GER_vnr_ship_hull_cruiser_submarine_medium + "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" } } @@ -509,10 +511,10 @@ GER = { pool = { icons = { GFX_GER_vnr_ship_hull_submarine_1_medium + "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" GFX_GER_vnr_ship_hull_submarine_2_medium GFX_GER_vnr_ship_hull_cruiser_submarine_medium - "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" - "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" "gfx/interface/technologies/extra/GER_submarine_Type_X.png" } } @@ -530,12 +532,12 @@ GER = { pool = { icons = { GFX_GER_vnr_ship_hull_submarine_1_medium + "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" GFX_GER_vnr_ship_hull_submarine_2_medium + "gfx/interface/technologies/extra/GER_submarine_Type_X.png" GFX_GER_vnr_ship_hull_submarine_3_medium GFX_GER_vnr_ship_hull_cruiser_submarine_medium - "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" - "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" - "gfx/interface/technologies/extra/GER_submarine_Type_X.png" } } @@ -552,13 +554,13 @@ GER = { pool = { icons = { GFX_GER_vnr_ship_hull_submarine_1_medium - GFX_GER_vnr_ship_hull_submarine_2_medium - GFX_GER_vnr_ship_hull_submarine_3_medium - GFX_GER_vnr_ship_hull_submarine_4_medium - GFX_GER_vnr_ship_hull_cruiser_submarine_medium - "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" + "gfx/interface/technologies/Germany/GER_submarine_TypeI.png" "gfx/interface/technologies/extra/GER_submarine_Type_IX.png" - "gfx/interface/technologies/extra/GER_submarine_Type_X.png" + GFX_GER_vnr_ship_hull_submarine_2_medium + "gfx/interface/technologies/extra/GER_submarine_Type_X.png" + GFX_GER_vnr_ship_hull_submarine_3_medium + GFX_GER_vnr_ship_hull_submarine_4_medium + GFX_GER_vnr_ship_hull_cruiser_submarine_medium } } 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 5e9a9c7..4718e9d 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 @@ -128,9 +128,9 @@ USA = { pool = { icons = { - "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" GFX_USA_vnr_ship_hull_cruiser_1_medium GFX_USA_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" } } @@ -148,11 +148,11 @@ USA = { pool = { icons = { GFX_USA_vnr_ship_hull_cruiser_1_medium - GFX_USA_vnr_ship_hull_cruiser_2_medium GFX_USA_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" + GFX_USA_vnr_ship_hull_cruiser_2_medium GFX_USA_vnr_ship_hull_cruiser_2_capital_medium "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" - "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" } } @@ -170,14 +170,14 @@ USA = { pool = { icons = { GFX_USA_vnr_ship_hull_cruiser_1_medium - GFX_USA_vnr_ship_hull_cruiser_2_medium - GFX_USA_vnr_ship_hull_cruiser_3_medium GFX_USA_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" + GFX_USA_vnr_ship_hull_cruiser_2_medium GFX_USA_vnr_ship_hull_cruiser_2_capital_medium + "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" + GFX_USA_vnr_ship_hull_cruiser_3_medium GFX_USA_vnr_ship_hull_cruiser_3_capital_medium "gfx/interface/technologies/extra/USA_light_cruiser_Fargo.png" - "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" - "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" "gfx/interface/technologies/extra/USA_heavy_cruiser_Alaska.png" } } @@ -196,17 +196,17 @@ USA = { pool = { icons = { GFX_USA_vnr_ship_hull_cruiser_1_medium - GFX_USA_vnr_ship_hull_cruiser_2_medium - GFX_USA_vnr_ship_hull_cruiser_3_medium - GFX_USA_vnr_ship_hull_cruiser_4_medium GFX_USA_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" + GFX_USA_vnr_ship_hull_cruiser_2_medium GFX_USA_vnr_ship_hull_cruiser_2_capital_medium - GFX_USA_vnr_ship_hull_cruiser_3_capital_medium - GFX_USA_vnr_ship_hull_cruiser_4_capital_medium - "gfx/interface/technologies/extra/USA_light_cruiser_Fargo.png" "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" - "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" + GFX_USA_vnr_ship_hull_cruiser_3_medium + GFX_USA_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/extra/USA_light_cruiser_Fargo.png" "gfx/interface/technologies/extra/USA_heavy_cruiser_Alaska.png" + GFX_USA_vnr_ship_hull_cruiser_4_medium + GFX_USA_vnr_ship_hull_cruiser_4_capital_medium } } @@ -224,19 +224,19 @@ USA = { pool = { icons = { GFX_USA_vnr_ship_hull_cruiser_1_medium - GFX_USA_vnr_ship_hull_cruiser_2_medium - GFX_USA_vnr_ship_hull_cruiser_3_medium - GFX_USA_vnr_ship_hull_cruiser_4_medium - GFX_USA_vnr_ship_hull_cruiser_5_medium GFX_USA_vnr_ship_hull_cruiser_1_capital_medium + "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" + GFX_USA_vnr_ship_hull_cruiser_2_medium GFX_USA_vnr_ship_hull_cruiser_2_capital_medium - GFX_USA_vnr_ship_hull_cruiser_3_capital_medium - GFX_USA_vnr_ship_hull_cruiser_4_capital_medium - GFX_USA_vnr_ship_hull_cruiser_5_capital_medium - "gfx/interface/technologies/extra/USA_light_cruiser_Fargo.png" "gfx/interface/technologies/USA/USA_light_cruiser_Atlanta.png" - "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" + GFX_USA_vnr_ship_hull_cruiser_3_medium + GFX_USA_vnr_ship_hull_cruiser_3_capital_medium + "gfx/interface/technologies/extra/USA_light_cruiser_Fargo.png" "gfx/interface/technologies/extra/USA_heavy_cruiser_Alaska.png" + GFX_USA_vnr_ship_hull_cruiser_4_medium + GFX_USA_vnr_ship_hull_cruiser_4_capital_medium + GFX_USA_vnr_ship_hull_cruiser_5_medium + GFX_USA_vnr_ship_hull_cruiser_5_capital_medium "gfx/interface/technologies/extra/USA_heavy_cruiser_Long_Beach.png" "gfx/interface/technologies/extra/USA_heavy_cruiser_Albany.png" } @@ -268,7 +268,6 @@ USA = { GFX_USA_vnr_ship_hull_cruiser_2_medium GFX_USA_vnr_ship_hull_cruiser_1_capital_medium GFX_USA_vnr_ship_hull_cruiser_2_capital_medium - "gfx/interface/technologies/USA/USA_heavy_cruiser_Pensacola.png" "gfx/interface/technologies/extra/USA_heavy_cruiser_Alaska.png" } } @@ -289,7 +288,6 @@ USA = { pool = { weight = 5 icons = { - GFX_USA_vnr_ship_hull_super_heavy_1_medium GFX_USA_vnr_ship_hull_heavy_1_medium } } @@ -336,10 +334,10 @@ USA = { icons = { GFX_USA_vnr_ship_hull_super_heavy_1_medium GFX_USA_vnr_ship_hull_heavy_1_medium - GFX_USA_vnr_ship_hull_heavy_2_medium "gfx/interface/technologies/USA/USA_battleship_Tennessee.png" "gfx/interface/technologies/USA/USA_battleship_Nevada.png" "gfx/interface/technologies/USA/USA_battleship_New_York.png" + GFX_USA_vnr_ship_hull_heavy_2_medium } } @@ -357,11 +355,11 @@ USA = { icons = { GFX_USA_vnr_ship_hull_super_heavy_1_medium GFX_USA_vnr_ship_hull_heavy_1_medium - GFX_USA_vnr_ship_hull_heavy_2_medium - GFX_USA_vnr_ship_hull_heavy_3_medium "gfx/interface/technologies/USA/USA_battleship_Tennessee.png" "gfx/interface/technologies/USA/USA_battleship_Nevada.png" "gfx/interface/technologies/USA/USA_battleship_New_York.png" + GFX_USA_vnr_ship_hull_heavy_2_medium + GFX_USA_vnr_ship_hull_heavy_3_medium } } @@ -379,12 +377,12 @@ USA = { icons = { GFX_USA_vnr_ship_hull_super_heavy_1_medium GFX_USA_vnr_ship_hull_heavy_1_medium - GFX_USA_vnr_ship_hull_heavy_2_medium - GFX_USA_vnr_ship_hull_heavy_3_medium - GFX_USA_vnr_ship_hull_heavy_4_medium "gfx/interface/technologies/USA/USA_battleship_Tennessee.png" "gfx/interface/technologies/USA/USA_battleship_Nevada.png" "gfx/interface/technologies/USA/USA_battleship_New_York.png" + GFX_USA_vnr_ship_hull_heavy_2_medium + GFX_USA_vnr_ship_hull_heavy_3_medium + GFX_USA_vnr_ship_hull_heavy_4_medium "gfx/interface/technologies/extra/USA_battleship_Iowa.png" } } @@ -451,9 +449,9 @@ USA = { icons = { GFX_USA_vnr_ship_hull_carrier_conversion_ca_medium GFX_USA_vnr_ship_hull_carrier_conversion_bb_medium + "gfx/interface/technologies/USA/USA_carrier_Ranger.png" 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,10 +469,12 @@ USA = { icons = { GFX_USA_vnr_ship_hull_carrier_conversion_ca_medium GFX_USA_vnr_ship_hull_carrier_conversion_bb_medium + "gfx/interface/technologies/USA/USA_carrier_Ranger.png" 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" + GFX_USA_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/extra/USA_carrier_Oriskany.png" + "gfx/interface/technologies/extra/USA_carrier_Midway.png" } } @@ -492,14 +492,15 @@ USA = { icons = { 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/USA/USA_carrier_Ranger.png" + GFX_USA_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/extra/USA_carrier_Princeton.png" GFX_USA_vnr_ship_hull_carrier_2_medium - GFX_USA_vnr_ship_hull_carrier_3_medium - "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_USA_vnr_ship_hull_carrier_3_medium "gfx/interface/technologies/extra/USA_carrier_Oriskany.png" "gfx/interface/technologies/extra/USA_carrier_Midway.png" + "gfx/interface/technologies/extra/USA_carrier_Enterprise.png" + "gfx/interface/technologies/extra/USA_carrier_Forrestal.png" } } diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt index 21ebbae..03db9b8 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/02_east_asia_ship_icons.txt @@ -26,8 +26,8 @@ JAP = { pool = { icons = { + "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" GFX_JAP_vnr_ship_hull_light_1_medium - "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" } } @@ -43,11 +43,11 @@ JAP = { pool = { icons = { + "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" + GFX_JAP_vnr_ship_hull_light_1_medium "gfx/interface/technologies/Japan/JAP_destroyer_Chidori.png" "gfx/interface/technologies/Japan/JAP_destroyer_Otori.png" - GFX_JAP_vnr_ship_hull_light_1_medium GFX_JAP_vnr_ship_hull_light_2_medium - "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" } } @@ -63,12 +63,12 @@ JAP = { pool = { icons = { + "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" GFX_JAP_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Japan/JAP_destroyer_Chidori.png" + "gfx/interface/technologies/Japan/JAP_destroyer_Otori.png" GFX_JAP_vnr_ship_hull_light_2_medium GFX_JAP_vnr_ship_hull_light_3_medium - "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" - "gfx/interface/technologies/Japan/JAP_destroyer_Otori.png" - "gfx/interface/technologies/Japan/JAP_destroyer_Chidori.png" } } @@ -84,13 +84,13 @@ JAP = { pool = { icons = { + "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" GFX_JAP_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Japan/JAP_destroyer_Chidori.png" + "gfx/interface/technologies/Japan/JAP_destroyer_Otori.png" GFX_JAP_vnr_ship_hull_light_2_medium GFX_JAP_vnr_ship_hull_light_3_medium GFX_JAP_vnr_ship_hull_light_4_medium - "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" - "gfx/interface/technologies/Japan/JAP_destroyer_Otori.png" - "gfx/interface/technologies/Japan/JAP_destroyer_Chidori.png" } } @@ -106,14 +106,14 @@ JAP = { pool = { icons = { + "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" GFX_JAP_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Japan/JAP_destroyer_Chidori.png" + "gfx/interface/technologies/Japan/JAP_destroyer_Otori.png" GFX_JAP_vnr_ship_hull_light_2_medium GFX_JAP_vnr_ship_hull_light_3_medium GFX_JAP_vnr_ship_hull_light_4_medium GFX_JAP_vnr_ship_hull_light_5_medium - "gfx/interface/technologies/Japan/JAP_destroyer_Momo.png" - "gfx/interface/technologies/Japan/JAP_destroyer_Otori.png" - "gfx/interface/technologies/Japan/JAP_destroyer_Chidori.png" } } @@ -147,10 +147,10 @@ JAP = { pool = { icons = { - "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" GFX_JAP_vnr_ship_hull_cruiser_1_medium GFX_JAP_vnr_ship_hull_cruiser_1_capital_medium "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" } } @@ -167,14 +167,14 @@ JAP = { pool = { icons = { - "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" GFX_JAP_vnr_ship_hull_cruiser_1_medium - GFX_JAP_vnr_ship_hull_cruiser_2_medium GFX_JAP_vnr_ship_hull_cruiser_1_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium - "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" - "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" + "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" + GFX_JAP_vnr_ship_hull_cruiser_2_medium + GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium } } @@ -192,15 +192,15 @@ JAP = { pool = { icons = { GFX_JAP_vnr_ship_hull_cruiser_1_medium - GFX_JAP_vnr_ship_hull_cruiser_2_medium - GFX_JAP_vnr_ship_hull_cruiser_3_medium GFX_JAP_vnr_ship_hull_cruiser_1_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium - "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" - "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" - "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" + "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" + GFX_JAP_vnr_ship_hull_cruiser_2_medium + GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium + GFX_JAP_vnr_ship_hull_cruiser_3_medium + GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium } } @@ -218,17 +218,17 @@ JAP = { pool = { icons = { GFX_JAP_vnr_ship_hull_cruiser_1_medium - GFX_JAP_vnr_ship_hull_cruiser_2_medium - GFX_JAP_vnr_ship_hull_cruiser_3_medium - GFX_JAP_vnr_ship_hull_cruiser_4_medium GFX_JAP_vnr_ship_hull_cruiser_1_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_4_capital_medium - "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" - "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" - "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" + "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" + GFX_JAP_vnr_ship_hull_cruiser_2_medium + GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium + GFX_JAP_vnr_ship_hull_cruiser_3_medium + GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium + GFX_JAP_vnr_ship_hull_cruiser_4_medium + GFX_JAP_vnr_ship_hull_cruiser_4_capital_medium } } @@ -246,19 +246,19 @@ JAP = { pool = { icons = { GFX_JAP_vnr_ship_hull_cruiser_1_medium - GFX_JAP_vnr_ship_hull_cruiser_2_medium - GFX_JAP_vnr_ship_hull_cruiser_3_medium - GFX_JAP_vnr_ship_hull_cruiser_4_medium - GFX_JAP_vnr_ship_hull_cruiser_5_medium GFX_JAP_vnr_ship_hull_cruiser_1_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_4_capital_medium - GFX_JAP_vnr_ship_hull_cruiser_5_capital_medium - "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" - "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" - "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" + "gfx/interface/technologies/Japan/JAP_light_cruiser_Katori.png" + "gfx/interface/technologies/extra/JAP_auxiliary_ship_Nisshin.png" + GFX_JAP_vnr_ship_hull_cruiser_2_medium + GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium + GFX_JAP_vnr_ship_hull_cruiser_3_medium + GFX_JAP_vnr_ship_hull_cruiser_3_capital_medium + GFX_JAP_vnr_ship_hull_cruiser_4_medium + GFX_JAP_vnr_ship_hull_cruiser_4_capital_medium + GFX_JAP_vnr_ship_hull_cruiser_5_medium + GFX_JAP_vnr_ship_hull_cruiser_5_capital_medium } } @@ -297,8 +297,6 @@ JAP = { GFX_JAP_vnr_ship_hull_cruiser_2_medium GFX_JAP_vnr_ship_hull_cruiser_1_capital_medium GFX_JAP_vnr_ship_hull_cruiser_2_capital_medium - "gfx/interface/technologies/Japan/JAP_light_cruiser_Yubari.png" - "gfx/interface/technologies/Japan/JAP_cruiser_Itsukushima.png" } } @@ -308,7 +306,6 @@ JAP = { pool = { weight = 5 icons = { - GFX_JAP_vnr_ship_hull_super_heavy_1_medium GFX_JAP_vnr_ship_hull_heavy_1_medium } } @@ -356,9 +353,9 @@ JAP = { "gfx/interface/technologies/extra/JAP_battlecarrier_Ise.png" GFX_JAP_vnr_ship_hull_super_heavy_1_medium GFX_JAP_vnr_ship_hull_heavy_1_medium - GFX_JAP_vnr_ship_hull_heavy_2_medium "gfx/interface/technologies/Japan/JAP_battleship_Ise.png" "gfx/interface/technologies/Japan/JAP_battleship_Kongo.png" + GFX_JAP_vnr_ship_hull_heavy_2_medium "gfx/interface/technologies/extra/JAP_battleship_A140.png" } } @@ -378,11 +375,11 @@ JAP = { "gfx/interface/technologies/extra/JAP_battlecarrier_Ise.png" GFX_JAP_vnr_ship_hull_super_heavy_1_medium GFX_JAP_vnr_ship_hull_heavy_1_medium - GFX_JAP_vnr_ship_hull_heavy_2_medium - GFX_JAP_vnr_ship_hull_heavy_3_medium "gfx/interface/technologies/Japan/JAP_battleship_Ise.png" "gfx/interface/technologies/Japan/JAP_battleship_Kongo.png" + GFX_JAP_vnr_ship_hull_heavy_2_medium "gfx/interface/technologies/extra/JAP_battleship_A140.png" + GFX_JAP_vnr_ship_hull_heavy_3_medium } } @@ -401,12 +398,12 @@ JAP = { "gfx/interface/technologies/extra/JAP_battlecarrier_Ise.png" GFX_JAP_vnr_ship_hull_super_heavy_1_medium GFX_JAP_vnr_ship_hull_heavy_1_medium - GFX_JAP_vnr_ship_hull_heavy_2_medium - GFX_JAP_vnr_ship_hull_heavy_3_medium - GFX_JAP_vnr_ship_hull_heavy_4_medium "gfx/interface/technologies/Japan/JAP_battleship_Ise.png" "gfx/interface/technologies/Japan/JAP_battleship_Kongo.png" + GFX_JAP_vnr_ship_hull_heavy_2_medium "gfx/interface/technologies/extra/JAP_battleship_A140.png" + GFX_JAP_vnr_ship_hull_heavy_3_medium + GFX_JAP_vnr_ship_hull_heavy_4_medium "gfx/interface/technologies/extra/JAP_battleship_Yamato_1965.png" } } @@ -478,10 +475,11 @@ JAP = { icons = { GFX_JAP_vnr_ship_hull_carrier_conversion_ca_medium GFX_JAP_vnr_ship_hull_carrier_conversion_bb_medium + "gfx/interface/technologies/Japan/JAP_carrier_Shinano.png" + "gfx/interface/technologies/Japan/JAP_carrier_Kaga.png" "gfx/interface/technologies/extra/JAP_carrier_Zuiho.png" "gfx/interface/technologies/extra/JAP_carrier_Shinyo.png" "gfx/interface/technologies/Japan/JAP_carrier_Hiryu.png" - "gfx/interface/technologies/Japan/JAP_carrier_conversion_ca.png" "gfx/interface/technologies/extra/JAP_carrier_Hiyo.png" } } @@ -500,12 +498,13 @@ JAP = { icons = { GFX_JAP_vnr_ship_hull_carrier_conversion_ca_medium GFX_JAP_vnr_ship_hull_carrier_conversion_bb_medium - GFX_JAP_vnr_ship_hull_carrier_1_medium + "gfx/interface/technologies/Japan/JAP_carrier_Shinano.png" + "gfx/interface/technologies/Japan/JAP_carrier_Kaga.png" "gfx/interface/technologies/extra/JAP_carrier_Zuiho.png" "gfx/interface/technologies/extra/JAP_carrier_Shinyo.png" - "gfx/interface/technologies/Japan/JAP_carrier_Hiryu.png" - "gfx/interface/technologies/Japan/JAP_carrier_conversion_ca.png" + "gfx/interface/technologies/Japan/JAP_carrier_Hiryu.png" "gfx/interface/technologies/extra/JAP_carrier_Hiyo.png" + GFX_JAP_vnr_ship_hull_carrier_1_medium "gfx/interface/technologies/extra/JAP_carrier_Unryu.png" } } @@ -524,14 +523,15 @@ JAP = { icons = { GFX_JAP_vnr_ship_hull_carrier_conversion_ca_medium GFX_JAP_vnr_ship_hull_carrier_conversion_bb_medium - GFX_JAP_vnr_ship_hull_carrier_1_medium - GFX_JAP_vnr_ship_hull_carrier_2_medium + "gfx/interface/technologies/Japan/JAP_carrier_Shinano.png" + "gfx/interface/technologies/Japan/JAP_carrier_Kaga.png" "gfx/interface/technologies/extra/JAP_carrier_Zuiho.png" "gfx/interface/technologies/extra/JAP_carrier_Shinyo.png" - "gfx/interface/technologies/Japan/JAP_carrier_Hiryu.png" - "gfx/interface/technologies/Japan/JAP_carrier_conversion_ca.png" + "gfx/interface/technologies/Japan/JAP_carrier_Hiryu.png" "gfx/interface/technologies/extra/JAP_carrier_Hiyo.png" + GFX_JAP_vnr_ship_hull_carrier_1_medium "gfx/interface/technologies/extra/JAP_carrier_Unryu.png" + GFX_JAP_vnr_ship_hull_carrier_2_medium } } @@ -549,17 +549,16 @@ JAP = { icons = { GFX_JAP_vnr_ship_hull_carrier_conversion_ca_medium GFX_JAP_vnr_ship_hull_carrier_conversion_bb_medium - GFX_JAP_vnr_ship_hull_carrier_1_medium - GFX_JAP_vnr_ship_hull_carrier_2_medium - GFX_JAP_vnr_ship_hull_carrier_3_medium + "gfx/interface/technologies/Japan/JAP_carrier_Shinano.png" + "gfx/interface/technologies/Japan/JAP_carrier_Kaga.png" "gfx/interface/technologies/extra/JAP_carrier_Zuiho.png" "gfx/interface/technologies/extra/JAP_carrier_Shinyo.png" - "gfx/interface/technologies/Japan/JAP_carrier_Hiryu.png" - "gfx/interface/technologies/Japan/JAP_carrier_Shinano.png" - "gfx/interface/technologies/Japan/JAP_carrier_Kaga.png" - "gfx/interface/technologies/Japan/JAP_carrier_conversion_ca.png" + "gfx/interface/technologies/Japan/JAP_carrier_Hiryu.png" "gfx/interface/technologies/extra/JAP_carrier_Hiyo.png" + GFX_JAP_vnr_ship_hull_carrier_1_medium "gfx/interface/technologies/extra/JAP_carrier_Unryu.png" + GFX_JAP_vnr_ship_hull_carrier_2_medium + GFX_JAP_vnr_ship_hull_carrier_3_medium } } @@ -573,6 +572,13 @@ JAP = { } } + pool = { + icons = { + "gfx/interface/technologies/extra/JAP_carrier_Shinyo.png" + } + + } + } vnr_ship_hull_submarine_1 = { 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 4d23382..e9b8466 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 @@ -575,8 +575,8 @@ SOV = { pool = { icons = { GFX_SOV_vnr_ship_hull_light_1_medium - GFX_SOV_vnr_ship_hull_light_2_medium "gfx/interface/technologies/Soviet/SOV_destroyer_Novik.png" + GFX_SOV_vnr_ship_hull_light_2_medium } } @@ -593,9 +593,9 @@ SOV = { pool = { icons = { GFX_SOV_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Soviet/SOV_destroyer_Novik.png" GFX_SOV_vnr_ship_hull_light_2_medium GFX_SOV_vnr_ship_hull_light_3_medium - "gfx/interface/technologies/Soviet/SOV_destroyer_Novik.png" } } @@ -612,10 +612,10 @@ SOV = { pool = { icons = { GFX_SOV_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Soviet/SOV_destroyer_Novik.png" GFX_SOV_vnr_ship_hull_light_2_medium GFX_SOV_vnr_ship_hull_light_3_medium GFX_SOV_vnr_ship_hull_light_4_medium - "gfx/interface/technologies/Soviet/SOV_destroyer_Novik.png" } } @@ -632,11 +632,11 @@ SOV = { pool = { icons = { GFX_SOV_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Soviet/SOV_destroyer_Novik.png" GFX_SOV_vnr_ship_hull_light_2_medium GFX_SOV_vnr_ship_hull_light_3_medium 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" } } @@ -684,8 +684,8 @@ SOV = { pool = { icons = { GFX_SOV_vnr_ship_hull_cruiser_1_medium - GFX_SOV_vnr_ship_hull_cruiser_2_medium GFX_SOV_vnr_ship_hull_cruiser_1_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_2_medium GFX_SOV_vnr_ship_hull_cruiser_2_capital_medium } } @@ -704,10 +704,10 @@ SOV = { pool = { icons = { GFX_SOV_vnr_ship_hull_cruiser_1_medium - GFX_SOV_vnr_ship_hull_cruiser_2_medium - GFX_SOV_vnr_ship_hull_cruiser_3_medium GFX_SOV_vnr_ship_hull_cruiser_1_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_2_medium GFX_SOV_vnr_ship_hull_cruiser_2_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_3_medium GFX_SOV_vnr_ship_hull_cruiser_3_capital_medium } } @@ -726,12 +726,12 @@ SOV = { pool = { icons = { GFX_SOV_vnr_ship_hull_cruiser_1_medium - GFX_SOV_vnr_ship_hull_cruiser_2_medium - GFX_SOV_vnr_ship_hull_cruiser_3_medium - GFX_SOV_vnr_ship_hull_cruiser_4_medium GFX_SOV_vnr_ship_hull_cruiser_1_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_2_medium GFX_SOV_vnr_ship_hull_cruiser_2_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_3_medium GFX_SOV_vnr_ship_hull_cruiser_3_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_4_medium GFX_SOV_vnr_ship_hull_cruiser_4_capital_medium } } @@ -750,14 +750,14 @@ SOV = { pool = { icons = { GFX_SOV_vnr_ship_hull_cruiser_1_medium - GFX_SOV_vnr_ship_hull_cruiser_2_medium - GFX_SOV_vnr_ship_hull_cruiser_3_medium - GFX_SOV_vnr_ship_hull_cruiser_4_medium - GFX_SOV_vnr_ship_hull_cruiser_5_medium GFX_SOV_vnr_ship_hull_cruiser_1_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_2_medium GFX_SOV_vnr_ship_hull_cruiser_2_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_3_medium GFX_SOV_vnr_ship_hull_cruiser_3_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_4_medium GFX_SOV_vnr_ship_hull_cruiser_4_capital_medium + GFX_SOV_vnr_ship_hull_cruiser_5_medium GFX_SOV_vnr_ship_hull_cruiser_5_capital_medium "gfx/interface/technologies/extra/SOV_heavy_cruiser_Moskva.png" "gfx/interface/technologies/extra/SOV_heavy_cruiser_Frunze.png" @@ -817,7 +817,6 @@ SOV = { pool = { weight = 5 icons = { - GFX_SOV_vnr_ship_hull_super_heavy_1_medium GFX_SOV_vnr_ship_hull_heavy_1_medium } } diff --git a/src/gfx/interface/equipmentdesigner/graphic_db/02_south_europe_ship_icons.txt b/src/gfx/interface/equipmentdesigner/graphic_db/02_south_europe_ship_icons.txt index fcf31e2..ad151fe 100755 --- a/src/gfx/interface/equipmentdesigner/graphic_db/02_south_europe_ship_icons.txt +++ b/src/gfx/interface/equipmentdesigner/graphic_db/02_south_europe_ship_icons.txt @@ -26,10 +26,10 @@ ITA = { pool = { icons = { + "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" + GFX_ITA_vnr_ship_hull_light_1_medium "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" "gfx/interface/technologies/Italy/ITA_destroyer_Spica.png" - GFX_ITA_vnr_ship_hull_light_1_medium - "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" } } @@ -45,11 +45,11 @@ ITA = { pool = { icons = { - GFX_ITA_vnr_ship_hull_light_1_medium - GFX_ITA_vnr_ship_hull_light_2_medium - "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" + "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" + GFX_ITA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" "gfx/interface/technologies/Italy/ITA_destroyer_Spica.png" - "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" + GFX_ITA_vnr_ship_hull_light_2_medium } } @@ -65,12 +65,12 @@ ITA = { pool = { icons = { - GFX_ITA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" + GFX_ITA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" + "gfx/interface/technologies/Italy/ITA_destroyer_Spica.png" GFX_ITA_vnr_ship_hull_light_2_medium GFX_ITA_vnr_ship_hull_light_3_medium - "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" - "gfx/interface/technologies/Italy/ITA_destroyer_Spica.png" - "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" } } @@ -86,13 +86,13 @@ ITA = { pool = { icons = { - GFX_ITA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" + GFX_ITA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" + "gfx/interface/technologies/Italy/ITA_destroyer_Spica.png" GFX_ITA_vnr_ship_hull_light_2_medium GFX_ITA_vnr_ship_hull_light_3_medium GFX_ITA_vnr_ship_hull_light_4_medium - "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" - "gfx/interface/technologies/Italy/ITA_destroyer_Spica.png" - "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" } } @@ -108,14 +108,14 @@ ITA = { pool = { icons = { - GFX_ITA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" + GFX_ITA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" + "gfx/interface/technologies/Italy/ITA_destroyer_Spica.png" GFX_ITA_vnr_ship_hull_light_2_medium GFX_ITA_vnr_ship_hull_light_3_medium GFX_ITA_vnr_ship_hull_light_4_medium GFX_ITA_vnr_ship_hull_light_5_medium - "gfx/interface/technologies/Italy/ITA_destroyer_Navigatori.png" - "gfx/interface/technologies/Italy/ITA_destroyer_Spica.png" - "gfx/interface/technologies/Italy/ITA_destroyer_Pilo.png" } } @@ -162,8 +162,8 @@ ITA = { pool = { icons = { GFX_ITA_vnr_ship_hull_cruiser_1_medium - GFX_ITA_vnr_ship_hull_cruiser_2_medium GFX_ITA_vnr_ship_hull_cruiser_1_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_2_medium GFX_ITA_vnr_ship_hull_cruiser_2_capital_medium } } @@ -182,10 +182,10 @@ ITA = { pool = { icons = { GFX_ITA_vnr_ship_hull_cruiser_1_medium - GFX_ITA_vnr_ship_hull_cruiser_2_medium - GFX_ITA_vnr_ship_hull_cruiser_3_medium GFX_ITA_vnr_ship_hull_cruiser_1_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_2_medium GFX_ITA_vnr_ship_hull_cruiser_2_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_3_medium GFX_ITA_vnr_ship_hull_cruiser_3_capital_medium } } @@ -204,12 +204,12 @@ ITA = { pool = { icons = { GFX_ITA_vnr_ship_hull_cruiser_1_medium - GFX_ITA_vnr_ship_hull_cruiser_2_medium - GFX_ITA_vnr_ship_hull_cruiser_3_medium - GFX_ITA_vnr_ship_hull_cruiser_4_medium GFX_ITA_vnr_ship_hull_cruiser_1_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_2_medium GFX_ITA_vnr_ship_hull_cruiser_2_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_3_medium GFX_ITA_vnr_ship_hull_cruiser_3_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_4_medium GFX_ITA_vnr_ship_hull_cruiser_4_capital_medium } } @@ -228,14 +228,14 @@ ITA = { pool = { icons = { GFX_ITA_vnr_ship_hull_cruiser_1_medium - GFX_ITA_vnr_ship_hull_cruiser_2_medium - GFX_ITA_vnr_ship_hull_cruiser_3_medium - GFX_ITA_vnr_ship_hull_cruiser_4_medium - GFX_ITA_vnr_ship_hull_cruiser_5_medium GFX_ITA_vnr_ship_hull_cruiser_1_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_2_medium GFX_ITA_vnr_ship_hull_cruiser_2_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_3_medium GFX_ITA_vnr_ship_hull_cruiser_3_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_4_medium GFX_ITA_vnr_ship_hull_cruiser_4_capital_medium + GFX_ITA_vnr_ship_hull_cruiser_5_medium GFX_ITA_vnr_ship_hull_cruiser_5_capital_medium } } @@ -293,7 +293,6 @@ ITA = { pool = { weight = 5 icons = { - GFX_ITA_vnr_ship_hull_super_heavy_1_medium GFX_ITA_vnr_ship_hull_heavy_1_medium } } 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 3e1a071..a42d224 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 @@ -37,10 +37,10 @@ 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/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_2_medium + "gfx/interface/technologies/France/FRA_destroyer_Bourrasque.png" } } @@ -56,11 +56,11 @@ FRA = { pool = { icons = { - "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_2_medium + "gfx/interface/technologies/France/FRA_destroyer_Bourrasque.png" GFX_FRA_vnr_ship_hull_light_3_medium - "gfx/interface/technologies/France/FRA_destroyer_Bourrasque.png" } } @@ -76,12 +76,12 @@ FRA = { pool = { icons = { - "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_2_medium + "gfx/interface/technologies/France/FRA_destroyer_Bourrasque.png" GFX_FRA_vnr_ship_hull_light_3_medium GFX_FRA_vnr_ship_hull_light_4_medium - "gfx/interface/technologies/France/FRA_destroyer_Bourrasque.png" } } @@ -97,13 +97,13 @@ FRA = { pool = { icons = { - "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_1_medium + "gfx/interface/technologies/extra/FRA_destroyer_Le_Hardi.png" GFX_FRA_vnr_ship_hull_light_2_medium + "gfx/interface/technologies/France/FRA_destroyer_Bourrasque.png" GFX_FRA_vnr_ship_hull_light_3_medium GFX_FRA_vnr_ship_hull_light_4_medium GFX_FRA_vnr_ship_hull_light_5_medium - "gfx/interface/technologies/France/FRA_destroyer_Bourrasque.png" } } @@ -131,11 +131,11 @@ FRA = { pool = { icons = { + GFX_FRA_vnr_ship_hull_cruiser_1_medium + GFX_FRA_vnr_ship_hull_cruiser_1_capital_medium "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Jeanne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Pluton.png" - GFX_FRA_vnr_ship_hull_cruiser_1_medium - GFX_FRA_vnr_ship_hull_cruiser_1_capital_medium } } @@ -153,12 +153,12 @@ FRA = { pool = { icons = { GFX_FRA_vnr_ship_hull_cruiser_1_medium - GFX_FRA_vnr_ship_hull_cruiser_2_medium GFX_FRA_vnr_ship_hull_cruiser_1_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium - "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" + "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Jeanne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Pluton.png" + GFX_FRA_vnr_ship_hull_cruiser_2_medium + GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium } } @@ -176,14 +176,14 @@ FRA = { pool = { icons = { GFX_FRA_vnr_ship_hull_cruiser_1_medium - GFX_FRA_vnr_ship_hull_cruiser_2_medium - GFX_FRA_vnr_ship_hull_cruiser_3_medium GFX_FRA_vnr_ship_hull_cruiser_1_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_3_capital_medium - "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" + "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Jeanne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Pluton.png" + GFX_FRA_vnr_ship_hull_cruiser_2_medium + GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium + GFX_FRA_vnr_ship_hull_cruiser_3_medium + GFX_FRA_vnr_ship_hull_cruiser_3_capital_medium } } @@ -201,16 +201,16 @@ FRA = { pool = { icons = { GFX_FRA_vnr_ship_hull_cruiser_1_medium - GFX_FRA_vnr_ship_hull_cruiser_2_medium - GFX_FRA_vnr_ship_hull_cruiser_3_medium - GFX_FRA_vnr_ship_hull_cruiser_4_medium GFX_FRA_vnr_ship_hull_cruiser_1_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_3_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_4_capital_medium - "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" + "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Jeanne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Pluton.png" + GFX_FRA_vnr_ship_hull_cruiser_2_medium + GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium + GFX_FRA_vnr_ship_hull_cruiser_3_medium + GFX_FRA_vnr_ship_hull_cruiser_3_capital_medium + GFX_FRA_vnr_ship_hull_cruiser_4_medium + GFX_FRA_vnr_ship_hull_cruiser_4_capital_medium } } @@ -228,18 +228,18 @@ FRA = { pool = { icons = { GFX_FRA_vnr_ship_hull_cruiser_1_medium - GFX_FRA_vnr_ship_hull_cruiser_2_medium - GFX_FRA_vnr_ship_hull_cruiser_3_medium - GFX_FRA_vnr_ship_hull_cruiser_4_medium - GFX_FRA_vnr_ship_hull_cruiser_5_medium GFX_FRA_vnr_ship_hull_cruiser_1_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_3_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_4_capital_medium - GFX_FRA_vnr_ship_hull_cruiser_5_capital_medium - "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" + "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Jeanne.png" "gfx/interface/technologies/France/FRA_light_cruiser_Pluton.png" + GFX_FRA_vnr_ship_hull_cruiser_2_medium + GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium + GFX_FRA_vnr_ship_hull_cruiser_3_medium + GFX_FRA_vnr_ship_hull_cruiser_3_capital_medium + GFX_FRA_vnr_ship_hull_cruiser_4_medium + GFX_FRA_vnr_ship_hull_cruiser_4_capital_medium + GFX_FRA_vnr_ship_hull_cruiser_5_medium + GFX_FRA_vnr_ship_hull_cruiser_5_capital_medium "gfx/interface/technologies/extra/FRA_light_cruiser_Colbert.png" } } @@ -278,9 +278,6 @@ FRA = { GFX_FRA_vnr_ship_hull_cruiser_2_medium GFX_FRA_vnr_ship_hull_cruiser_1_capital_medium GFX_FRA_vnr_ship_hull_cruiser_2_capital_medium - "gfx/interface/technologies/France/FRA_heavy_cruiser_Duquesne.png" - "gfx/interface/technologies/France/FRA_light_cruiser_Jeanne.png" - "gfx/interface/technologies/France/FRA_light_cruiser_Pluton.png" } } @@ -290,7 +287,6 @@ FRA = { pool = { weight = 5 icons = { - GFX_FRA_vnr_ship_hull_super_heavy_1_medium GFX_FRA_vnr_ship_hull_heavy_1_medium } } @@ -580,7 +576,6 @@ FRA = { pool = { icons = { - "gfx/interface/technologies/France/FRA_submarine_Surcouf.png" GFX_FRA_vnr_ship_hull_submarine_1_medium GFX_FRA_vnr_ship_hull_submarine_2_medium GFX_FRA_vnr_ship_hull_submarine_3_medium diff --git a/src/localisation/english/replace/ship_modules_l_english.yml b/src/localisation/english/replace/ship_modules_l_english.yml index 38c4ecb..d574984 100755 --- a/src/localisation/english/replace/ship_modules_l_english.yml +++ b/src/localisation/english/replace/ship_modules_l_english.yml @@ -598,9 +598,9 @@ ship_sub_snorkel_2: "改进型通气管" ship_sub_snorkel_2_desc: "对通气管设计进行改进可以减少在高海况下引擎运行面临的问题，同时减少了被雷达发现的风险。" ship_airplane_launcher_1: "水上飞机弹射器" - ship_airplane_launcher_1_desc: "一个小型飞机弹射器可以把一架小型侦察机送上天。" + ship_airplane_launcher_1_desc: "A simple airplane launcher propels a small scout plane into the air.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_airplane_launcher_2: "改进型水上飞机弹射器" - ship_airplane_launcher_2_desc: "改进过的弹射装置可以让舰艇弹射更大的、航程更远航速更快的飞机。" + ship_airplane_launcher_2_desc: "An improved launch mechanism that allows the ship to launch a larger plane with greater range and speed.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_sonar_1: "水听器" ship_sonar_1_desc: "一套简单的水听装置，通过声音来追踪水下目标。" ship_sonar_2: "主动式声呐" @@ -716,7 +716,7 @@ EQ_MOD_CAT_ship_miscellaneous_TITLE: "杂项" EQ_MOD_CAT_ship_missile_aa_TITLE: "舰空导弹" ship_helipad: "通用直升机" - ship_helipad_desc: "一种可以执行多种任务的通用直升机。" + ship_helipad_desc: "A general-purpose helicopter that can carry out a wide variety of missions.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_armor_shbb_2: "480mm主装甲/230mm甲板装甲" ship_armor_shbb_2_short: "改进超重型装甲" ship_armor_shbb_2_desc: "最新的装甲设计方案，目的是抵御所有已知的主炮炮弹，并让一艘装备如此精良的战列舰能够接触并击沉当今世界上的任何其他战列舰。" @@ -889,7 +889,7 @@ ship_display_system_desc: "罗列并可视化所有战术信息和数据的显示系统。\n\n§G最大组织度加成：+10%§!" recon_drone_1: "侦察无人机" recon_drone_1_short: "UAV" - recon_drone_1_desc: "一架可以执行侦察或反潜任务的无人飞行器。" + recon_drone_1_desc: "An unmanned aerial vehicle with recon or anti-submarine capabilities.\n\n§YThis module has debuff to simulate marginal effects.§!" carrier_tracing_unit: "空中预警机队" carrier_tracing_unit_short: "空中预警机队" carrier_tracing_unit_desc: "一队装有雷达和先进追踪系统的飞机。" diff --git a/src/localisation/replace/ship_modules_l_english.yml b/src/localisation/replace/ship_modules_l_english.yml index 38c4ecb..d574984 100755 --- a/src/localisation/replace/ship_modules_l_english.yml +++ b/src/localisation/replace/ship_modules_l_english.yml @@ -598,9 +598,9 @@ ship_sub_snorkel_2: "改进型通气管" ship_sub_snorkel_2_desc: "对通气管设计进行改进可以减少在高海况下引擎运行面临的问题，同时减少了被雷达发现的风险。" ship_airplane_launcher_1: "水上飞机弹射器" - ship_airplane_launcher_1_desc: "一个小型飞机弹射器可以把一架小型侦察机送上天。" + ship_airplane_launcher_1_desc: "A simple airplane launcher propels a small scout plane into the air.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_airplane_launcher_2: "改进型水上飞机弹射器" - ship_airplane_launcher_2_desc: "改进过的弹射装置可以让舰艇弹射更大的、航程更远航速更快的飞机。" + ship_airplane_launcher_2_desc: "An improved launch mechanism that allows the ship to launch a larger plane with greater range and speed.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_sonar_1: "水听器" ship_sonar_1_desc: "一套简单的水听装置，通过声音来追踪水下目标。" ship_sonar_2: "主动式声呐" @@ -716,7 +716,7 @@ EQ_MOD_CAT_ship_miscellaneous_TITLE: "杂项" EQ_MOD_CAT_ship_missile_aa_TITLE: "舰空导弹" ship_helipad: "通用直升机" - ship_helipad_desc: "一种可以执行多种任务的通用直升机。" + ship_helipad_desc: "A general-purpose helicopter that can carry out a wide variety of missions.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_armor_shbb_2: "480mm主装甲/230mm甲板装甲" ship_armor_shbb_2_short: "改进超重型装甲" ship_armor_shbb_2_desc: "最新的装甲设计方案，目的是抵御所有已知的主炮炮弹，并让一艘装备如此精良的战列舰能够接触并击沉当今世界上的任何其他战列舰。" @@ -889,7 +889,7 @@ ship_display_system_desc: "罗列并可视化所有战术信息和数据的显示系统。\n\n§G最大组织度加成：+10%§!" recon_drone_1: "侦察无人机" recon_drone_1_short: "UAV" - recon_drone_1_desc: "一架可以执行侦察或反潜任务的无人飞行器。" + recon_drone_1_desc: "An unmanned aerial vehicle with recon or anti-submarine capabilities.\n\n§YThis module has debuff to simulate marginal effects.§!" carrier_tracing_unit: "空中预警机队" carrier_tracing_unit_short: "空中预警机队" carrier_tracing_unit_desc: "一队装有雷达和先进追踪系统的飞机。" diff --git a/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml b/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml index df94728..2614ff6 100755 --- a/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/replace/ship_modules_l_simp_chinese.yml @@ -598,9 +598,9 @@ ship_sub_snorkel_2: "改进型通气管" ship_sub_snorkel_2_desc: "对通气管设计进行改进可以减少在高海况下引擎运行面临的问题，同时减少了被雷达发现的风险。" ship_airplane_launcher_1: "水上飞机弹射器" - ship_airplane_launcher_1_desc: "一个小型飞机弹射器可以把一架小型侦察机送上天。" + ship_airplane_launcher_1_desc: "A simple airplane launcher propels a small scout plane into the air.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_airplane_launcher_2: "改进型水上飞机弹射器" - ship_airplane_launcher_2_desc: "改进过的弹射装置可以让舰艇弹射更大的、航程更远航速更快的飞机。" + ship_airplane_launcher_2_desc: "An improved launch mechanism that allows the ship to launch a larger plane with greater range and speed.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_sonar_1: "水听器" ship_sonar_1_desc: "一套简单的水听装置，通过声音来追踪水下目标。" ship_sonar_2: "主动式声呐" @@ -716,7 +716,7 @@ EQ_MOD_CAT_ship_miscellaneous_TITLE: "杂项" EQ_MOD_CAT_ship_missile_aa_TITLE: "舰空导弹" ship_helipad: "通用直升机" - ship_helipad_desc: "一种可以执行多种任务的通用直升机。" + ship_helipad_desc: "A general-purpose helicopter that can carry out a wide variety of missions.\n\n§YThis module has debuff to simulate marginal effects.§!" ship_armor_shbb_2: "480mm主装甲/230mm甲板装甲" ship_armor_shbb_2_short: "改进超重型装甲" ship_armor_shbb_2_desc: "最新的装甲设计方案，目的是抵御所有已知的主炮炮弹，并让一艘装备如此精良的战列舰能够接触并击沉当今世界上的任何其他战列舰。" @@ -889,7 +889,7 @@ ship_display_system_desc: "罗列并可视化所有战术信息和数据的显示系统。\n\n§G最大组织度加成：+10%§!" recon_drone_1: "侦察无人机" recon_drone_1_short: "UAV" - recon_drone_1_desc: "一架可以执行侦察或反潜任务的无人飞行器。" + recon_drone_1_desc: "An unmanned aerial vehicle with recon or anti-submarine capabilities.\n\n§YThis module has debuff to simulate marginal effects.§!" carrier_tracing_unit: "空中预警机队" carrier_tracing_unit_short: "空中预警机队" carrier_tracing_unit_desc: "一队装有雷达和先进追踪系统的飞机。"