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 66dca2a..76fb724 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 @@ -641,636 +641,4 @@ USA = { } -} - - -USA = { - - vnr_ship_hull_light_1 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_2 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_light_2_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_light_1_medium - } - } - - } - - vnr_ship_hull_light_3 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_light_3_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_light_1_medium - GFX_USA_vnr_ship_hull_light_2_medium - } - } - - } - - vnr_ship_hull_light_4 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_light_4_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_light_1_medium - GFX_USA_vnr_ship_hull_light_2_medium - GFX_USA_vnr_ship_hull_light_3_medium - } - } - - } - - vnr_ship_hull_light_5 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_light_5_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_light_1_medium - GFX_USA_vnr_ship_hull_light_2_medium - GFX_USA_vnr_ship_hull_light_3_medium - GFX_USA_vnr_ship_hull_light_4_medium - "gfx/interface/technologies/extra/USA_destroyer_Sumner.png" - } - } - - } - - vnr_ship_hull_light_6 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_light_6_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_light_1_medium - GFX_USA_vnr_ship_hull_light_2_medium - GFX_USA_vnr_ship_hull_light_3_medium - GFX_USA_vnr_ship_hull_light_4_medium - GFX_USA_vnr_ship_hull_light_5_medium - "gfx/interface/technologies/extra/USA_destroyer_Sumner.png" - } - } - - } - - vnr_ship_hull_cruiser_1 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_1_capital_medium - GFX_USA_vnr_ship_hull_cruiser_1_medium - } - } - - } - - vnr_ship_hull_cruiser_2 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_2_capital_medium - GFX_USA_vnr_ship_hull_cruiser_2_medium - } - } - - 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 - } - } - - } - - vnr_ship_hull_cruiser_3 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_3_capital_medium - GFX_USA_vnr_ship_hull_cruiser_3_medium - } - } - - 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_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" - } - } - - } - - vnr_ship_hull_cruiser_4 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_4_capital_medium - GFX_USA_vnr_ship_hull_cruiser_4_medium - } - } - - 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_USA_vnr_ship_hull_cruiser_2_capital_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" - } - } - - } - - vnr_ship_hull_cruiser_5 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_5_capital_medium - GFX_USA_vnr_ship_hull_cruiser_5_medium - } - } - - 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_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/interface/technologies/extra/USA_heavy_cruiser_Alaska.png" - } - } - - } - - vnr_ship_hull_cruiser_6 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_6_capital_medium - GFX_USA_vnr_ship_hull_cruiser_6_medium - } - } - - 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_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/interface/technologies/extra/USA_heavy_cruiser_Alaska.png" - "gfx/interface/technologies/extra/USA_heavy_cruiser_Long_Beach.png" - } - } - - } - - vnr_ship_hull_cruiser_coastal_defense_ship = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_coastal_defense_ship_medium - } - } - - } - - vnr_ship_hull_cruiser_panzerschiff = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_panzerschiff_medium - } - } - - 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_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" - } - } - - } - - vnr_ship_hull_pre_dreadnought = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_pre_dreadnought_medium - } - } - - } - - vnr_ship_hull_heavy_1 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_super_heavy_1_medium - GFX_USA_vnr_ship_hull_heavy_1_medium - } - } - - pool = { - icons = { - "gfx/interface/technologies/USA/USA_battleship_Nevada.png" - "gfx/interface/technologies/USA/USA_battleship_New_York.png" - "gfx/interface/technologies/USA/USA_battleship_Tennessee.png" - } - } - - } - - vnr_ship_hull_heavy_2 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_heavy_2_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_super_heavy_1_medium - GFX_USA_vnr_ship_hull_heavy_1_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" - } - } - - } - - vnr_ship_hull_heavy_3 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_heavy_3_medium - } - } - - pool = { - 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" - } - } - - } - - vnr_ship_hull_heavy_4 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_heavy_4_medium - } - } - - pool = { - 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" - } - } - - } - - vnr_ship_hull_heavy_5 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_heavy_5_medium - } - } - - pool = { - 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/interface/technologies/extra/USA_battleship_Iowa.png" - } - } - - } - - vnr_ship_hull_super_heavy_1 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_super_heavy_1_medium - } - } - - } - - vnr_ship_hull_carrier_conversion_ca = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_carrier_conversion_ca_medium - } - } - - } - - vnr_ship_hull_carrier_conversion_bb = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_carrier_conversion_bb_medium - } - } - - } - - vnr_ship_hull_carrier_1 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_carrier_1_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_carrier_conversion_ca_medium - GFX_USA_vnr_ship_hull_carrier_conversion_bb_medium - "gfx/interface/technologies/extra/USA_carrier_Bogue.png" - "gfx/interface/technologies/USA/USA_carrier_Ranger.png" - } - } - - } - - vnr_ship_hull_carrier_2 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_carrier_2_medium - } - } - - pool = { - 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/extra/USA_carrier_Bogue.png" - "gfx/interface/technologies/USA/USA_carrier_Ranger.png" - } - } - - } - - vnr_ship_hull_carrier_3 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_carrier_3_medium - } - } - - pool = { - 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_USA_vnr_ship_hull_carrier_2_medium - "gfx/interface/technologies/extra/USA_carrier_Bogue.png" - "gfx/interface/technologies/USA/USA_carrier_Ranger.png" - } - } - - } - - vnr_ship_hull_super_carrier = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_super_carrier_medium - } - } - - pool = { - 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_USA_vnr_ship_hull_carrier_2_medium - GFX_USA_vnr_ship_hull_carrier_3_medium - "gfx/interface/technologies/extra/USA_carrier_Bogue.png" - "gfx/interface/technologies/USA/USA_carrier_Ranger.png" - "gfx/interface/technologies/extra/USA_carrier_Enterprise.png" - "gfx/interface/technologies/extra/USA_carrier_Forrestal.png" - } - } - - } - - vnr_ship_hull_submarine_1 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_submarine_1_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_cruiser_submarine_medium - } - } - - } - - vnr_ship_hull_submarine_2 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_submarine_2_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_submarine_1_medium - GFX_USA_vnr_ship_hull_cruiser_submarine_medium - } - } - - } - - vnr_ship_hull_submarine_3 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_submarine_3_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_submarine_1_medium - GFX_USA_vnr_ship_hull_submarine_2_medium - GFX_USA_vnr_ship_hull_cruiser_submarine_medium - } - } - - } - - vnr_ship_hull_submarine_4 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_submarine_4_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_submarine_1_medium - GFX_USA_vnr_ship_hull_submarine_2_medium - GFX_USA_vnr_ship_hull_submarine_3_medium - GFX_USA_vnr_ship_hull_cruiser_submarine_medium - } - } - - } - - vnr_ship_hull_submarine_5 = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_submarine_5_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_submarine_1_medium - GFX_USA_vnr_ship_hull_submarine_2_medium - GFX_USA_vnr_ship_hull_submarine_3_medium - GFX_USA_vnr_ship_hull_submarine_4_medium - GFX_USA_vnr_ship_hull_cruiser_submarine_medium - } - } - - } - - vnr_ship_hull_cruiser_submarine = { - pool = { - weight = 5 - icons = { - GFX_USA_vnr_ship_hull_cruiser_submarine_medium - } - } - - pool = { - icons = { - GFX_USA_vnr_ship_hull_submarine_1_medium - GFX_USA_vnr_ship_hull_submarine_2_medium - GFX_USA_vnr_ship_hull_submarine_3_medium - GFX_USA_vnr_ship_hull_cruiser_submarine_medium - } - } - - } - - vnr_ship_hull_cruiser_coastal_defense_ship = { - pool = { - weight = 5 - icons = { - - } - } - - pool = { - icons = { - "gfx/interface/technologies/USA/USA_light_cruiser_Oglala.png" - GFX_USA_vnr_ship_hull_cruiser_1_medium - GFX_USA_vnr_ship_hull_cruiser_1_capital_medium - } - } - - } - -} +} \ No newline at end of file diff --git a/src/gfx/interface/navalcombat/ships/arsenal_ship.dds b/src/gfx/interface/navalcombat/ships/arsenal_ship.dds new file mode 100755 index 0000000..5f73b51 Binary files /dev/null and b/src/gfx/interface/navalcombat/ships/arsenal_ship.dds differ diff --git a/src/interface/vnr_user_interface_assets.gfx b/src/interface/vnr_user_interface_assets.gfx index 07a62d8..0333981 100755 --- a/src/interface/vnr_user_interface_assets.gfx +++ b/src/interface/vnr_user_interface_assets.gfx @@ -26,13 +26,14 @@ spriteTypes = { spriteType = { name = "GFX_unit_battle_cruiser_4_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battlecruiser_III.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battle_cruiser_5_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battlecruiser_IV.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battle_cruiser_6_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battlecruiser_V.dds" noOfFrames = 2 } + spriteType = { name = "GFX_unit_battle_cruiser_7_icon_medium" texturefile = "gfx/interface/navalcombat/ships/arsenal_ship.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battleship_1_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_0.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battleship_2_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_I.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battleship_3_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_II.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battleship_4_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_III.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battleship_5_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_IV.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_battleship_6_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_V.dds" noOfFrames = 2 } - spriteType = { name = "GFX_unit_battleship_7_icon_medium" texturefile = "gfx/interface/navalcombat/ships/battleship_V.dds" noOfFrames = 2 } + spriteType = { name = "GFX_unit_battleship_7_icon_medium" texturefile = "gfx/interface/navalcombat/ships/arsenal_ship.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_heavy_cruiser_1_icon_medium" texturefile = "gfx/interface/navalcombat/ships/heavy_cruiser_0.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_heavy_cruiser_2_icon_medium" texturefile = "gfx/interface/navalcombat/ships/panzerschiff.dds" noOfFrames = 2 } spriteType = { name = "GFX_unit_heavy_cruiser_3_icon_medium" texturefile = "gfx/interface/navalcombat/ships/heavy_cruiser_I.dds" noOfFrames = 2 }