diff --git a/qt_ui/main.py b/qt_ui/main.py index a70dd89f..b8984a2a 100644 --- a/qt_ui/main.py +++ b/qt_ui/main.py @@ -75,6 +75,7 @@ def run_ui(game: Optional[Game] = None) -> None: uiconstants.load_aircraft_icons() uiconstants.load_vehicle_icons() uiconstants.load_aircraft_banners() + uiconstants.load_vehicle_banners() # Replace DCS Mission scripting file to allow DCS Liberation to work try: diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index 1a888dde..066add27 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -74,6 +74,7 @@ CP_SIZE = 12 AIRCRAFT_BANNERS: Dict[str, QPixmap] = {} AIRCRAFT_ICONS: Dict[str, QPixmap] = {} +VEHICLE_BANNERS: Dict[str, QPixmap] = {} VEHICLES_ICONS: Dict[str, QPixmap] = {} ICONS: Dict[str, QPixmap] = {} @@ -181,11 +182,16 @@ def load_aircraft_icons(): def load_vehicle_icons(): - for vehicle in os.listdir("./resources/ui/units/vehicles/"): + for vehicle in os.listdir("./resources/ui/units/vehicles/icons/"): if vehicle.endswith(".jpg"): - VEHICLES_ICONS[vehicle[:-7]] = QPixmap(os.path.join("./resources/ui/units/vehicles/", vehicle)) + VEHICLES_ICONS[vehicle[:-7]] = QPixmap(os.path.join("./resources/ui/units/vehicles/icons/", vehicle)) def load_aircraft_banners(): for aircraft in os.listdir("./resources/ui/units/aircrafts/banners/"): if aircraft.endswith(".jpg"): - AIRCRAFT_BANNERS[aircraft[:-7]] = QPixmap(os.path.join("./resources/ui/units/aircrafts/banners/", aircraft)) \ No newline at end of file + AIRCRAFT_BANNERS[aircraft[:-7]] = QPixmap(os.path.join("./resources/ui/units/aircrafts/banners/", aircraft)) + +def load_vehicle_banners(): + for aircraft in os.listdir("./resources/ui/units/vehicles/banners/"): + if aircraft.endswith(".jpg"): + VEHICLE_BANNERS[aircraft[:-7]] = QPixmap(os.path.join("./resources/ui/units/vehicles/banners/", aircraft)) \ No newline at end of file diff --git a/qt_ui/windows/QUnitInfoWindow.py b/qt_ui/windows/QUnitInfoWindow.py index 4f7c7777..71735496 100644 --- a/qt_ui/windows/QUnitInfoWindow.py +++ b/qt_ui/windows/QUnitInfoWindow.py @@ -16,12 +16,16 @@ from PySide2.QtWidgets import ( QFrame, ) from jinja2 import Environment, FileSystemLoader, select_autoescape -from dcs.unittype import UnitType -from qt_ui.uiconstants import AIRCRAFT_BANNERS +from dcs.unittype import UnitType, FlyingType, VehicleType +import dcs +from qt_ui.uiconstants import AIRCRAFT_BANNERS, VEHICLE_BANNERS from game.game import Game from game import db +import gen.flights.ai_flight_planner_db +from gen.flights.flight import FlightType + class QUnitInfoWindow(QDialog): @@ -43,7 +47,10 @@ class QUnitInfoWindow(QDialog): header = QLabel(self) header.setGeometry(0, 0, 720, 360) - pixmap = AIRCRAFT_BANNERS.get(self.unit_type.id) + if dcs.planes.plane_map.get(self.unit_type.id) is not None or dcs.helicopters.helicopter_map.get(self.unit_type.id) is not None: + pixmap = AIRCRAFT_BANNERS.get(self.unit_type.id) + elif dcs.vehicles.vehicle_map.get(self.unit_type.id) is not None: + pixmap = VEHICLE_BANNERS.get(self.unit_type.id) if pixmap is None: pixmap = AIRCRAFT_BANNERS.get("Missing") header.setPixmap(pixmap.scaled(header.width(), header.height())) @@ -51,8 +58,10 @@ class QUnitInfoWindow(QDialog): self.gridLayout = QGridLayout() + # Build the topmost details grid. self.details_grid = QFrame() self.details_grid_layout = QGridLayout() + self.details_grid_layout.setMargin(0) self.name_box = QLabel(f"Name: {db.unit_get_expanded_info(self.game.player_country, self.unit_type, 'manufacturer')} {db.unit_get_expanded_info(self.game.player_country, self.unit_type, 'name')}") self.name_box.setProperty("style", "info-element") @@ -73,12 +82,37 @@ class QUnitInfoWindow(QDialog): self.details_grid.setLayout(self.details_grid_layout) + self.gridLayout.addWidget(self.details_grid, 1, 0) + + # If it's an aircraft, include the task list. + if dcs.planes.plane_map.get(self.unit_type.id) is not None or dcs.helicopters.helicopter_map.get(self.unit_type.id) is not None: + self.tasks_box = QLabel(f"In-Game Tasks: {self.generateAircraftTasks()}") + self.tasks_box.setProperty("style", "info-element") + self.gridLayout.addWidget(self.tasks_box, 2, 0) + + # Finally, add the description box. self.details_text = QTextBrowser() self.details_text.setProperty("style", "info-desc") self.details_text.setText(db.unit_get_expanded_info(self.game.player_country, self.unit_type, "text")) - - self.gridLayout.addWidget(self.details_grid, 1, 0) - self.gridLayout.addWidget(self.details_text, 2, 0) + self.gridLayout.addWidget(self.details_text, 3, 0) self.layout.addLayout(self.gridLayout, 1, 0) - self.setLayout(self.layout) \ No newline at end of file + self.setLayout(self.layout) + + def generateAircraftTasks(self) -> str: + aircraft_tasks = "" + if self.unit_type in gen.flights.ai_flight_planner_db.CAP_CAPABLE: + aircraft_tasks = aircraft_tasks + f"{FlightType.BARCAP}, {FlightType.ESCORT}, {FlightType.INTERCEPTION}, {FlightType.SWEEP}, {FlightType.TARCAP}, " + if self.unit_type in gen.flights.ai_flight_planner_db.CAS_CAPABLE or self.unit_type in gen.flights.ai_flight_planner_db.TRANSPORT_CAPABLE: + aircraft_tasks = aircraft_tasks + f"{FlightType.CAS}, {FlightType.BAI}, {FlightType.OCA_AIRCRAFT}, " + if self.unit_type in gen.flights.ai_flight_planner_db.SEAD_CAPABLE: + aircraft_tasks = aircraft_tasks + f"{FlightType.SEAD}, " + if self.unit_type in gen.flights.ai_flight_planner_db.DEAD_CAPABLE: + aircraft_tasks = aircraft_tasks + f"{FlightType.DEAD}, " + if self.unit_type in gen.flights.ai_flight_planner_db.ANTISHIP_CAPABLE: + aircraft_tasks = aircraft_tasks + f"{FlightType.ANTISHIP}, " + if self.unit_type in gen.flights.ai_flight_planner_db.RUNWAY_ATTACK_CAPABLE: + aircraft_tasks = aircraft_tasks + f"{FlightType.OCA_RUNWAY}, " + if self.unit_type in gen.flights.ai_flight_planner_db.STRIKE_CAPABLE or self.unit_type in gen.flights.ai_flight_planner_db.TRANSPORT_CAPABLE: + aircraft_tasks = aircraft_tasks + f"{FlightType.STRIKE}, " + return aircraft_tasks[:-2] \ No newline at end of file diff --git a/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py b/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py index 14801ba4..3f089036 100644 --- a/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py +++ b/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py @@ -44,7 +44,7 @@ class QArmorRecruitmentMenu(QFrame, QRecruitBehaviour): for task_type in units.keys(): units_column = list(set(units[task_type])) if len(units_column) == 0: continue - units_column.sort(key=lambda x: db.PRICES[x]) + units_column.sort(key=lambda u: db.unit_get_expanded_info(self.game_model.game.player_country, u, 'name')) for unit_type in units_column: row = self.add_purchase_row(unit_type, task_box_layout, row) stretch = QVBoxLayout() diff --git a/resources/ui/units/aircrafts/banners/A-4E-C_24.jpg b/resources/ui/units/aircrafts/banners/A-4E-C_24.jpg new file mode 100644 index 00000000..5a9d34c6 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/A-4E-C_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/AH-1W_24.jpg b/resources/ui/units/aircrafts/banners/AH-1W_24.jpg new file mode 100644 index 00000000..90cbc755 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/AH-1W_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/AV8BNA_24.jpg b/resources/ui/units/aircrafts/banners/AV8BNA_24.jpg new file mode 100644 index 00000000..57d3f5e9 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/AV8BNA_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/F-4E_24.jpg b/resources/ui/units/aircrafts/banners/F-4E_24.jpg new file mode 100644 index 00000000..a880fcdc Binary files /dev/null and b/resources/ui/units/aircrafts/banners/F-4E_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/F-5E-3_24.jpg b/resources/ui/units/aircrafts/banners/F-5E-3_24.jpg new file mode 100644 index 00000000..75985e55 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/F-5E-3_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/Ju-88A4_24.jpg b/resources/ui/units/aircrafts/banners/Ju-88A4_24.jpg new file mode 100644 index 00000000..00fe95a7 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/Ju-88A4_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/OH-58D_24.jpg b/resources/ui/units/aircrafts/banners/OH-58D_24.jpg new file mode 100644 index 00000000..b81d698b Binary files /dev/null and b/resources/ui/units/aircrafts/banners/OH-58D_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/SpitfireLFMkIX_24.jpg b/resources/ui/units/aircrafts/banners/SpitfireLFMkIX_24.jpg new file mode 100644 index 00000000..03a44f9e Binary files /dev/null and b/resources/ui/units/aircrafts/banners/SpitfireLFMkIX_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/Tornado GR4_24.jpg b/resources/ui/units/aircrafts/banners/Tornado GR4_24.jpg new file mode 100644 index 00000000..01ac443d Binary files /dev/null and b/resources/ui/units/aircrafts/banners/Tornado GR4_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/Tornado IDS_24.jpg b/resources/ui/units/aircrafts/banners/Tornado IDS_24.jpg new file mode 100644 index 00000000..38ba26f6 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/Tornado IDS_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/Tu-95MS_24.jpg b/resources/ui/units/aircrafts/banners/Tu-95MS_24.jpg index f4e301b7..39230aed 100644 Binary files a/resources/ui/units/aircrafts/banners/Tu-95MS_24.jpg and b/resources/ui/units/aircrafts/banners/Tu-95MS_24.jpg differ diff --git a/resources/ui/units/aircrafts/banners/UH-1H_24.jpg b/resources/ui/units/aircrafts/banners/UH-1H_24.jpg new file mode 100644 index 00000000..0b3508a7 Binary files /dev/null and b/resources/ui/units/aircrafts/banners/UH-1H_24.jpg differ diff --git a/resources/ui/units/vehicles/banners/Smerch_HE_24.jpg b/resources/ui/units/vehicles/banners/Smerch_HE_24.jpg new file mode 100644 index 00000000..7d0fbb88 Binary files /dev/null and b/resources/ui/units/vehicles/banners/Smerch_HE_24.jpg differ diff --git a/resources/ui/units/vehicles/banners/Uragan_BM-27_24.jpg b/resources/ui/units/vehicles/banners/Uragan_BM-27_24.jpg new file mode 100644 index 00000000..becf020b Binary files /dev/null and b/resources/ui/units/vehicles/banners/Uragan_BM-27_24.jpg differ diff --git a/resources/ui/units/vehicles/2S6 Tunguska_24.jpg b/resources/ui/units/vehicles/icons/2S6 Tunguska_24.jpg similarity index 100% rename from resources/ui/units/vehicles/2S6 Tunguska_24.jpg rename to resources/ui/units/vehicles/icons/2S6 Tunguska_24.jpg diff --git a/resources/ui/units/vehicles/5p73 s-125 ln_24.jpg b/resources/ui/units/vehicles/icons/5p73 s-125 ln_24.jpg similarity index 100% rename from resources/ui/units/vehicles/5p73 s-125 ln_24.jpg rename to resources/ui/units/vehicles/icons/5p73 s-125 ln_24.jpg diff --git a/resources/ui/units/vehicles/AAV-7_24.jpg b/resources/ui/units/vehicles/icons/AAV-7_24.jpg similarity index 100% rename from resources/ui/units/vehicles/AAV-7_24.jpg rename to resources/ui/units/vehicles/icons/AAV-7_24.jpg diff --git a/resources/ui/units/vehicles/BMD-1_24.jpg b/resources/ui/units/vehicles/icons/BMD-1_24.jpg similarity index 100% rename from resources/ui/units/vehicles/BMD-1_24.jpg rename to resources/ui/units/vehicles/icons/BMD-1_24.jpg diff --git a/resources/ui/units/vehicles/BMP-1_24.jpg b/resources/ui/units/vehicles/icons/BMP-1_24.jpg similarity index 100% rename from resources/ui/units/vehicles/BMP-1_24.jpg rename to resources/ui/units/vehicles/icons/BMP-1_24.jpg diff --git a/resources/ui/units/vehicles/BMP-2_24.jpg b/resources/ui/units/vehicles/icons/BMP-2_24.jpg similarity index 100% rename from resources/ui/units/vehicles/BMP-2_24.jpg rename to resources/ui/units/vehicles/icons/BMP-2_24.jpg diff --git a/resources/ui/units/vehicles/BMP-3_24.jpg b/resources/ui/units/vehicles/icons/BMP-3_24.jpg similarity index 100% rename from resources/ui/units/vehicles/BMP-3_24.jpg rename to resources/ui/units/vehicles/icons/BMP-3_24.jpg diff --git a/resources/ui/units/vehicles/BRDM-2_24.jpg b/resources/ui/units/vehicles/icons/BRDM-2_24.jpg similarity index 100% rename from resources/ui/units/vehicles/BRDM-2_24.jpg rename to resources/ui/units/vehicles/icons/BRDM-2_24.jpg diff --git a/resources/ui/units/vehicles/BTR-80_24.jpg b/resources/ui/units/vehicles/icons/BTR-80_24.jpg similarity index 100% rename from resources/ui/units/vehicles/BTR-80_24.jpg rename to resources/ui/units/vehicles/icons/BTR-80_24.jpg diff --git a/resources/ui/units/vehicles/BTR-82A_24.jpg b/resources/ui/units/vehicles/icons/BTR-82A_24.jpg similarity index 100% rename from resources/ui/units/vehicles/BTR-82A_24.jpg rename to resources/ui/units/vehicles/icons/BTR-82A_24.jpg diff --git a/resources/ui/units/vehicles/BTR-RD_24.jpg b/resources/ui/units/vehicles/icons/BTR-RD_24.jpg similarity index 100% rename from resources/ui/units/vehicles/BTR-RD_24.jpg rename to resources/ui/units/vehicles/icons/BTR-RD_24.jpg diff --git a/resources/ui/units/vehicles/Bedford_MWD_24.jpg b/resources/ui/units/vehicles/icons/Bedford_MWD_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Bedford_MWD_24.jpg rename to resources/ui/units/vehicles/icons/Bedford_MWD_24.jpg diff --git a/resources/ui/units/vehicles/Blitz_36-6700A_24.jpg b/resources/ui/units/vehicles/icons/Blitz_36-6700A_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Blitz_36-6700A_24.jpg rename to resources/ui/units/vehicles/icons/Blitz_36-6700A_24.jpg diff --git a/resources/ui/units/vehicles/CCKW 353_24.jpg b/resources/ui/units/vehicles/icons/CCKW 353_24.jpg similarity index 100% rename from resources/ui/units/vehicles/CCKW 353_24.jpg rename to resources/ui/units/vehicles/icons/CCKW 353_24.jpg diff --git a/resources/ui/units/vehicles/Centaur_IV_24.jpg b/resources/ui/units/vehicles/icons/Centaur_IV_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Centaur_IV_24.jpg rename to resources/ui/units/vehicles/icons/Centaur_IV_24.jpg diff --git a/resources/ui/units/vehicles/Challenger 2_24.jpg b/resources/ui/units/vehicles/icons/Challenger 2_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Challenger 2_24.jpg rename to resources/ui/units/vehicles/icons/Challenger 2_24.jpg diff --git a/resources/ui/units/vehicles/Churchill_VII_24.jpg b/resources/ui/units/vehicles/icons/Churchill_VII_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Churchill_VII_24.jpg rename to resources/ui/units/vehicles/icons/Churchill_VII_24.jpg diff --git a/resources/ui/units/vehicles/Cobra_24.jpg b/resources/ui/units/vehicles/icons/Cobra_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Cobra_24.jpg rename to resources/ui/units/vehicles/icons/Cobra_24.jpg diff --git a/resources/ui/units/vehicles/Cromwell_IV_24.jpg b/resources/ui/units/vehicles/icons/Cromwell_IV_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Cromwell_IV_24.jpg rename to resources/ui/units/vehicles/icons/Cromwell_IV_24.jpg diff --git a/resources/ui/units/vehicles/Daimler_AC_24.jpg b/resources/ui/units/vehicles/icons/Daimler_AC_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Daimler_AC_24.jpg rename to resources/ui/units/vehicles/icons/Daimler_AC_24.jpg diff --git a/resources/ui/units/vehicles/Elefant_SdKfz_184_24.jpg b/resources/ui/units/vehicles/icons/Elefant_SdKfz_184_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Elefant_SdKfz_184_24.jpg rename to resources/ui/units/vehicles/icons/Elefant_SdKfz_184_24.jpg diff --git a/resources/ui/units/vehicles/Flakscheinwerfer_37_24.jpg b/resources/ui/units/vehicles/icons/Flakscheinwerfer_37_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Flakscheinwerfer_37_24.jpg rename to resources/ui/units/vehicles/icons/Flakscheinwerfer_37_24.jpg diff --git a/resources/ui/units/vehicles/FuMG-401_24.jpg b/resources/ui/units/vehicles/icons/FuMG-401_24.jpg similarity index 100% rename from resources/ui/units/vehicles/FuMG-401_24.jpg rename to resources/ui/units/vehicles/icons/FuMG-401_24.jpg diff --git a/resources/ui/units/vehicles/Gepard_24.jpg b/resources/ui/units/vehicles/icons/Gepard_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Gepard_24.jpg rename to resources/ui/units/vehicles/icons/Gepard_24.jpg diff --git a/resources/ui/units/vehicles/Grad-Ural.jpg b/resources/ui/units/vehicles/icons/Grad-Ural.jpg similarity index 100% rename from resources/ui/units/vehicles/Grad-Ural.jpg rename to resources/ui/units/vehicles/icons/Grad-Ural.jpg diff --git a/resources/ui/units/vehicles/HQ-7 Mobile Launcher_24.jpg b/resources/ui/units/vehicles/icons/HQ-7 Mobile Launcher_24.jpg similarity index 100% rename from resources/ui/units/vehicles/HQ-7 Mobile Launcher_24.jpg rename to resources/ui/units/vehicles/icons/HQ-7 Mobile Launcher_24.jpg diff --git a/resources/ui/units/vehicles/HQ-7 Mobile Radar_24.jpg b/resources/ui/units/vehicles/icons/HQ-7 Mobile Radar_24.jpg similarity index 100% rename from resources/ui/units/vehicles/HQ-7 Mobile Radar_24.jpg rename to resources/ui/units/vehicles/icons/HQ-7 Mobile Radar_24.jpg diff --git a/resources/ui/units/vehicles/Hawk ln_24.jpg b/resources/ui/units/vehicles/icons/Hawk ln_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Hawk ln_24.jpg rename to resources/ui/units/vehicles/icons/Hawk ln_24.jpg diff --git a/resources/ui/units/vehicles/Hawk sr_24.jpg b/resources/ui/units/vehicles/icons/Hawk sr_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Hawk sr_24.jpg rename to resources/ui/units/vehicles/icons/Hawk sr_24.jpg diff --git a/resources/ui/units/vehicles/Hawk tr_24.jpg b/resources/ui/units/vehicles/icons/Hawk tr_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Hawk tr_24.jpg rename to resources/ui/units/vehicles/icons/Hawk tr_24.jpg diff --git a/resources/ui/units/vehicles/JagdPz_IV_24.jpg b/resources/ui/units/vehicles/icons/JagdPz_IV_24.jpg similarity index 100% rename from resources/ui/units/vehicles/JagdPz_IV_24.jpg rename to resources/ui/units/vehicles/icons/JagdPz_IV_24.jpg diff --git a/resources/ui/units/vehicles/Jagdpanther_G1_24.jpg b/resources/ui/units/vehicles/icons/Jagdpanther_G1_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Jagdpanther_G1_24.jpg rename to resources/ui/units/vehicles/icons/Jagdpanther_G1_24.jpg diff --git a/resources/ui/units/vehicles/KAMAZ Truck_24.jpg b/resources/ui/units/vehicles/icons/KAMAZ Truck_24.jpg similarity index 100% rename from resources/ui/units/vehicles/KAMAZ Truck_24.jpg rename to resources/ui/units/vehicles/icons/KAMAZ Truck_24.jpg diff --git a/resources/ui/units/vehicles/KDO_Mod40_24.jpg b/resources/ui/units/vehicles/icons/KDO_Mod40_24.jpg similarity index 100% rename from resources/ui/units/vehicles/KDO_Mod40_24.jpg rename to resources/ui/units/vehicles/icons/KDO_Mod40_24.jpg diff --git a/resources/ui/units/vehicles/Kub 1S91 str_24.jpg b/resources/ui/units/vehicles/icons/Kub 1S91 str_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Kub 1S91 str_24.jpg rename to resources/ui/units/vehicles/icons/Kub 1S91 str_24.jpg diff --git a/resources/ui/units/vehicles/Kub 2P25 ln_24.jpg b/resources/ui/units/vehicles/icons/Kub 2P25 ln_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Kub 2P25 ln_24.jpg rename to resources/ui/units/vehicles/icons/Kub 2P25 ln_24.jpg diff --git a/resources/ui/units/vehicles/Kubelwagen_82_24.jpg b/resources/ui/units/vehicles/icons/Kubelwagen_82_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Kubelwagen_82_24.jpg rename to resources/ui/units/vehicles/icons/Kubelwagen_82_24.jpg diff --git a/resources/ui/units/vehicles/LAV-25_24.jpg b/resources/ui/units/vehicles/icons/LAV-25_24.jpg similarity index 100% rename from resources/ui/units/vehicles/LAV-25_24.jpg rename to resources/ui/units/vehicles/icons/LAV-25_24.jpg diff --git a/resources/ui/units/vehicles/Leclerc_24.jpg b/resources/ui/units/vehicles/icons/Leclerc_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Leclerc_24.jpg rename to resources/ui/units/vehicles/icons/Leclerc_24.jpg diff --git a/resources/ui/units/vehicles/Leopard 1A3_24.jpg b/resources/ui/units/vehicles/icons/Leopard 1A3_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Leopard 1A3_24.jpg rename to resources/ui/units/vehicles/icons/Leopard 1A3_24.jpg diff --git a/resources/ui/units/vehicles/Leopard-2_24.jpg b/resources/ui/units/vehicles/icons/Leopard-2_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Leopard-2_24.jpg rename to resources/ui/units/vehicles/icons/Leopard-2_24.jpg diff --git a/resources/ui/units/vehicles/M 818_24.jpg b/resources/ui/units/vehicles/icons/M 818_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M 818_24.jpg rename to resources/ui/units/vehicles/icons/M 818_24.jpg diff --git a/resources/ui/units/vehicles/M-1 Abrams_24.jpg b/resources/ui/units/vehicles/icons/M-1 Abrams_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M-1 Abrams_24.jpg rename to resources/ui/units/vehicles/icons/M-1 Abrams_24.jpg diff --git a/resources/ui/units/vehicles/M-113_24.jpg b/resources/ui/units/vehicles/icons/M-113_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M-113_24.jpg rename to resources/ui/units/vehicles/icons/M-113_24.jpg diff --git a/resources/ui/units/vehicles/M-163 Vulcan_24.jpg b/resources/ui/units/vehicles/icons/M-163 Vulcan_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M-163 Vulcan_24.jpg rename to resources/ui/units/vehicles/icons/M-163 Vulcan_24.jpg diff --git a/resources/ui/units/vehicles/M-2 Bradley_24.jpg b/resources/ui/units/vehicles/icons/M-2 Bradley_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M-2 Bradley_24.jpg rename to resources/ui/units/vehicles/icons/M-2 Bradley_24.jpg diff --git a/resources/ui/units/vehicles/M-60_24.jpg b/resources/ui/units/vehicles/icons/M-60_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M-60_24.jpg rename to resources/ui/units/vehicles/icons/M-60_24.jpg diff --git a/resources/ui/units/vehicles/M1043 HMMWV Armament_24.jpg b/resources/ui/units/vehicles/icons/M1043 HMMWV Armament_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M1043 HMMWV Armament_24.jpg rename to resources/ui/units/vehicles/icons/M1043 HMMWV Armament_24.jpg diff --git a/resources/ui/units/vehicles/M1045 HMMWV TOW_24.jpg b/resources/ui/units/vehicles/icons/M1045 HMMWV TOW_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M1045 HMMWV TOW_24.jpg rename to resources/ui/units/vehicles/icons/M1045 HMMWV TOW_24.jpg diff --git a/resources/ui/units/vehicles/M1097 Avenger_24.jpg b/resources/ui/units/vehicles/icons/M1097 Avenger_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M1097 Avenger_24.jpg rename to resources/ui/units/vehicles/icons/M1097 Avenger_24.jpg diff --git a/resources/ui/units/vehicles/M109_24.jpg b/resources/ui/units/vehicles/icons/M109_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M109_24.jpg rename to resources/ui/units/vehicles/icons/M109_24.jpg diff --git a/resources/ui/units/vehicles/M10_GMC_24.jpg b/resources/ui/units/vehicles/icons/M10_GMC_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M10_GMC_24.jpg rename to resources/ui/units/vehicles/icons/M10_GMC_24.jpg diff --git a/resources/ui/units/vehicles/M1126 Stryker ICV_24.jpg b/resources/ui/units/vehicles/icons/M1126 Stryker ICV_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M1126 Stryker ICV_24.jpg rename to resources/ui/units/vehicles/icons/M1126 Stryker ICV_24.jpg diff --git a/resources/ui/units/vehicles/M1128 Stryker MGS_24.jpg b/resources/ui/units/vehicles/icons/M1128 Stryker MGS_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M1128 Stryker MGS_24.jpg rename to resources/ui/units/vehicles/icons/M1128 Stryker MGS_24.jpg diff --git a/resources/ui/units/vehicles/M1134 Stryker ATGM_24.jpg b/resources/ui/units/vehicles/icons/M1134 Stryker ATGM_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M1134 Stryker ATGM_24.jpg rename to resources/ui/units/vehicles/icons/M1134 Stryker ATGM_24.jpg diff --git a/resources/ui/units/vehicles/M12_GMC_24.jpg b/resources/ui/units/vehicles/icons/M12_GMC_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M12_GMC_24.jpg rename to resources/ui/units/vehicles/icons/M12_GMC_24.jpg diff --git a/resources/ui/units/vehicles/M1A2_24.jpg b/resources/ui/units/vehicles/icons/M1A2_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M1A2_24.jpg rename to resources/ui/units/vehicles/icons/M1A2_24.jpg diff --git a/resources/ui/units/vehicles/M1_37mm_24.jpg b/resources/ui/units/vehicles/icons/M1_37mm_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M1_37mm_24.jpg rename to resources/ui/units/vehicles/icons/M1_37mm_24.jpg diff --git a/resources/ui/units/vehicles/M2A1_halftrack_24.jpg b/resources/ui/units/vehicles/icons/M2A1_halftrack_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M2A1_halftrack_24.jpg rename to resources/ui/units/vehicles/icons/M2A1_halftrack_24.jpg diff --git a/resources/ui/units/vehicles/M2A2_24.jpg b/resources/ui/units/vehicles/icons/M2A2_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M2A2_24.jpg rename to resources/ui/units/vehicles/icons/M2A2_24.jpg diff --git a/resources/ui/units/vehicles/M30_CC_24.jpg b/resources/ui/units/vehicles/icons/M30_CC_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M30_CC_24.jpg rename to resources/ui/units/vehicles/icons/M30_CC_24.jpg diff --git a/resources/ui/units/vehicles/M45_Quadmount_24.jpg b/resources/ui/units/vehicles/icons/M45_Quadmount_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M45_Quadmount_24.jpg rename to resources/ui/units/vehicles/icons/M45_Quadmount_24.jpg diff --git a/resources/ui/units/vehicles/M48 Chaparral_24.jpg b/resources/ui/units/vehicles/icons/M48 Chaparral_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M48 Chaparral_24.jpg rename to resources/ui/units/vehicles/icons/M48 Chaparral_24.jpg diff --git a/resources/ui/units/vehicles/M4A4_Sherman_FF_24.jpg b/resources/ui/units/vehicles/icons/M4A4_Sherman_FF_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M4A4_Sherman_FF_24.jpg rename to resources/ui/units/vehicles/icons/M4A4_Sherman_FF_24.jpg diff --git a/resources/ui/units/vehicles/M4_Sherman_24.jpg b/resources/ui/units/vehicles/icons/M4_Sherman_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M4_Sherman_24.jpg rename to resources/ui/units/vehicles/icons/M4_Sherman_24.jpg diff --git a/resources/ui/units/vehicles/M4_Tractor_24.jpg b/resources/ui/units/vehicles/icons/M4_Tractor_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M4_Tractor_24.jpg rename to resources/ui/units/vehicles/icons/M4_Tractor_24.jpg diff --git a/resources/ui/units/vehicles/M6 Linebacker_24.jpg b/resources/ui/units/vehicles/icons/M6 Linebacker_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M6 Linebacker_24.jpg rename to resources/ui/units/vehicles/icons/M6 Linebacker_24.jpg diff --git a/resources/ui/units/vehicles/M818_24.jpg b/resources/ui/units/vehicles/icons/M818_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M818_24.jpg rename to resources/ui/units/vehicles/icons/M818_24.jpg diff --git a/resources/ui/units/vehicles/M8_Greyhound_24.jpg b/resources/ui/units/vehicles/icons/M8_Greyhound_24.jpg similarity index 100% rename from resources/ui/units/vehicles/M8_Greyhound_24.jpg rename to resources/ui/units/vehicles/icons/M8_Greyhound_24.jpg diff --git a/resources/ui/units/vehicles/MCV-80 Warrior_24.jpg b/resources/ui/units/vehicles/icons/MCV-80 Warrior_24.jpg similarity index 100% rename from resources/ui/units/vehicles/MCV-80 Warrior_24.jpg rename to resources/ui/units/vehicles/icons/MCV-80 Warrior_24.jpg diff --git a/resources/ui/units/vehicles/MTLB_24.jpg b/resources/ui/units/vehicles/icons/MTLB_24.jpg similarity index 100% rename from resources/ui/units/vehicles/MTLB_24.jpg rename to resources/ui/units/vehicles/icons/MTLB_24.jpg diff --git a/resources/ui/units/vehicles/Marder_24.jpg b/resources/ui/units/vehicles/icons/Marder_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Marder_24.jpg rename to resources/ui/units/vehicles/icons/Marder_24.jpg diff --git a/resources/ui/units/vehicles/Maschinensatz_33_24.jpg b/resources/ui/units/vehicles/icons/Maschinensatz_33_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Maschinensatz_33_24.jpg rename to resources/ui/units/vehicles/icons/Maschinensatz_33_24.jpg diff --git a/resources/ui/units/vehicles/Merkava Mk4_24.jpg b/resources/ui/units/vehicles/icons/Merkava Mk4_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Merkava Mk4_24.jpg rename to resources/ui/units/vehicles/icons/Merkava Mk4_24.jpg diff --git a/resources/ui/units/vehicles/Osa 9A33 ln_24.jpg b/resources/ui/units/vehicles/icons/Osa 9A33 ln_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Osa 9A33 ln_24.jpg rename to resources/ui/units/vehicles/icons/Osa 9A33 ln_24.jpg diff --git a/resources/ui/units/vehicles/Patriot AMG_24.jpg b/resources/ui/units/vehicles/icons/Patriot AMG_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Patriot AMG_24.jpg rename to resources/ui/units/vehicles/icons/Patriot AMG_24.jpg diff --git a/resources/ui/units/vehicles/Patriot ECS_24.jpg b/resources/ui/units/vehicles/icons/Patriot ECS_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Patriot ECS_24.jpg rename to resources/ui/units/vehicles/icons/Patriot ECS_24.jpg diff --git a/resources/ui/units/vehicles/Patriot EPP_24.jpg b/resources/ui/units/vehicles/icons/Patriot EPP_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Patriot EPP_24.jpg rename to resources/ui/units/vehicles/icons/Patriot EPP_24.jpg diff --git a/resources/ui/units/vehicles/Patriot ICC_24.jpg b/resources/ui/units/vehicles/icons/Patriot ICC_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Patriot ICC_24.jpg rename to resources/ui/units/vehicles/icons/Patriot ICC_24.jpg diff --git a/resources/ui/units/vehicles/Patriot ln_24.jpg b/resources/ui/units/vehicles/icons/Patriot ln_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Patriot ln_24.jpg rename to resources/ui/units/vehicles/icons/Patriot ln_24.jpg diff --git a/resources/ui/units/vehicles/Patriot str_24.jpg b/resources/ui/units/vehicles/icons/Patriot str_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Patriot str_24.jpg rename to resources/ui/units/vehicles/icons/Patriot str_24.jpg diff --git a/resources/ui/units/vehicles/Pz_IV_H_24.jpg b/resources/ui/units/vehicles/icons/Pz_IV_H_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Pz_IV_H_24.jpg rename to resources/ui/units/vehicles/icons/Pz_IV_H_24.jpg diff --git a/resources/ui/units/vehicles/Pz_V_Panther_G_24.jpg b/resources/ui/units/vehicles/icons/Pz_V_Panther_G_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Pz_V_Panther_G_24.jpg rename to resources/ui/units/vehicles/icons/Pz_V_Panther_G_24.jpg diff --git a/resources/ui/units/vehicles/QF_37_AA_24.jpg b/resources/ui/units/vehicles/icons/QF_37_AA_24.jpg similarity index 100% rename from resources/ui/units/vehicles/QF_37_AA_24.jpg rename to resources/ui/units/vehicles/icons/QF_37_AA_24.jpg diff --git a/resources/ui/units/vehicles/Roland ADS_24.jpg b/resources/ui/units/vehicles/icons/Roland ADS_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Roland ADS_24.jpg rename to resources/ui/units/vehicles/icons/Roland ADS_24.jpg diff --git a/resources/ui/units/vehicles/Roland Radar_24.jpg b/resources/ui/units/vehicles/icons/Roland Radar_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Roland Radar_24.jpg rename to resources/ui/units/vehicles/icons/Roland Radar_24.jpg diff --git a/resources/ui/units/vehicles/S-300PS 40B6M tr_24.jpg b/resources/ui/units/vehicles/icons/S-300PS 40B6M tr_24.jpg similarity index 100% rename from resources/ui/units/vehicles/S-300PS 40B6M tr_24.jpg rename to resources/ui/units/vehicles/icons/S-300PS 40B6M tr_24.jpg diff --git a/resources/ui/units/vehicles/S-300PS 40B6MD sr_24.jpg b/resources/ui/units/vehicles/icons/S-300PS 40B6MD sr_24.jpg similarity index 100% rename from resources/ui/units/vehicles/S-300PS 40B6MD sr_24.jpg rename to resources/ui/units/vehicles/icons/S-300PS 40B6MD sr_24.jpg diff --git a/resources/ui/units/vehicles/S-300PS 54K6 cp_24.jpg b/resources/ui/units/vehicles/icons/S-300PS 54K6 cp_24.jpg similarity index 100% rename from resources/ui/units/vehicles/S-300PS 54K6 cp_24.jpg rename to resources/ui/units/vehicles/icons/S-300PS 54K6 cp_24.jpg diff --git a/resources/ui/units/vehicles/S-300PS 5P85C ln_24.jpg b/resources/ui/units/vehicles/icons/S-300PS 5P85C ln_24.jpg similarity index 100% rename from resources/ui/units/vehicles/S-300PS 5P85C ln_24.jpg rename to resources/ui/units/vehicles/icons/S-300PS 5P85C ln_24.jpg diff --git a/resources/ui/units/vehicles/S-300PS 5P85D ln_24.jpg b/resources/ui/units/vehicles/icons/S-300PS 5P85D ln_24.jpg similarity index 100% rename from resources/ui/units/vehicles/S-300PS 5P85D ln_24.jpg rename to resources/ui/units/vehicles/icons/S-300PS 5P85D ln_24.jpg diff --git a/resources/ui/units/vehicles/S-300PS 64H6E sr_24.jpg b/resources/ui/units/vehicles/icons/S-300PS 64H6E sr_24.jpg similarity index 100% rename from resources/ui/units/vehicles/S-300PS 64H6E sr_24.jpg rename to resources/ui/units/vehicles/icons/S-300PS 64H6E sr_24.jpg diff --git a/resources/ui/units/vehicles/SAO 2-C9_24.jpg b/resources/ui/units/vehicles/icons/SAO 2-C9_24.jpg similarity index 100% rename from resources/ui/units/vehicles/SAO 2-C9_24.jpg rename to resources/ui/units/vehicles/icons/SAO 2-C9_24.jpg diff --git a/resources/ui/units/vehicles/SAU 2S3 Akatsia_24.jpg b/resources/ui/units/vehicles/icons/SAU 2S3 Akatsia_24.jpg similarity index 100% rename from resources/ui/units/vehicles/SAU 2S3 Akatsia_24.jpg rename to resources/ui/units/vehicles/icons/SAU 2S3 Akatsia_24.jpg diff --git a/resources/ui/units/vehicles/SAU Gvozdika_24.jpg b/resources/ui/units/vehicles/icons/SAU Gvozdika_24.jpg similarity index 100% rename from resources/ui/units/vehicles/SAU Gvozdika_24.jpg rename to resources/ui/units/vehicles/icons/SAU Gvozdika_24.jpg diff --git a/resources/ui/units/vehicles/SAU Msta_24.jpg b/resources/ui/units/vehicles/icons/SAU Msta_24.jpg similarity index 100% rename from resources/ui/units/vehicles/SAU Msta_24.jpg rename to resources/ui/units/vehicles/icons/SAU Msta_24.jpg diff --git a/resources/ui/units/vehicles/SNR_75V_24.jpg b/resources/ui/units/vehicles/icons/SNR_75V_24.jpg similarity index 100% rename from resources/ui/units/vehicles/SNR_75V_24.jpg rename to resources/ui/units/vehicles/icons/SNR_75V_24.jpg diff --git a/resources/ui/units/vehicles/S_75M_Volhov_24.jpg b/resources/ui/units/vehicles/icons/S_75M_Volhov_24.jpg similarity index 100% rename from resources/ui/units/vehicles/S_75M_Volhov_24.jpg rename to resources/ui/units/vehicles/icons/S_75M_Volhov_24.jpg diff --git a/resources/ui/units/vehicles/Sd_Kfz_234_2_Puma_24.jpg b/resources/ui/units/vehicles/icons/Sd_Kfz_234_2_Puma_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Sd_Kfz_234_2_Puma_24.jpg rename to resources/ui/units/vehicles/icons/Sd_Kfz_234_2_Puma_24.jpg diff --git a/resources/ui/units/vehicles/Sd_Kfz_251_24.jpg b/resources/ui/units/vehicles/icons/Sd_Kfz_251_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Sd_Kfz_251_24.jpg rename to resources/ui/units/vehicles/icons/Sd_Kfz_251_24.jpg diff --git a/resources/ui/units/vehicles/Sd_Kfz_2_24.jpg b/resources/ui/units/vehicles/icons/Sd_Kfz_2_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Sd_Kfz_2_24.jpg rename to resources/ui/units/vehicles/icons/Sd_Kfz_2_24.jpg diff --git a/resources/ui/units/vehicles/Sd_Kfz_7_24.jpg b/resources/ui/units/vehicles/icons/Sd_Kfz_7_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Sd_Kfz_7_24.jpg rename to resources/ui/units/vehicles/icons/Sd_Kfz_7_24.jpg diff --git a/resources/ui/units/vehicles/ShKH vz. 77 DANA_24.jpg b/resources/ui/units/vehicles/icons/ShKH vz. 77 DANA_24.jpg similarity index 100% rename from resources/ui/units/vehicles/ShKH vz. 77 DANA_24.jpg rename to resources/ui/units/vehicles/icons/ShKH vz. 77 DANA_24.jpg diff --git a/resources/ui/units/vehicles/Shilka ZSU-23-4_24.jpg b/resources/ui/units/vehicles/icons/Shilka ZSU-23-4_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Shilka ZSU-23-4_24.jpg rename to resources/ui/units/vehicles/icons/Shilka ZSU-23-4_24.jpg diff --git a/resources/ui/units/vehicles/Strela-10M3_24.jpg b/resources/ui/units/vehicles/icons/Strela-10M3_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Strela-10M3_24.jpg rename to resources/ui/units/vehicles/icons/Strela-10M3_24.jpg diff --git a/resources/ui/units/vehicles/Stug_III_24.jpg b/resources/ui/units/vehicles/icons/Stug_III_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Stug_III_24.jpg rename to resources/ui/units/vehicles/icons/Stug_III_24.jpg diff --git a/resources/ui/units/vehicles/Stug_IV_24.jpg b/resources/ui/units/vehicles/icons/Stug_IV_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Stug_IV_24.jpg rename to resources/ui/units/vehicles/icons/Stug_IV_24.jpg diff --git a/resources/ui/units/vehicles/Sturmpanzer IV_24.jpg b/resources/ui/units/vehicles/icons/Sturmpanzer IV_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Sturmpanzer IV_24.jpg rename to resources/ui/units/vehicles/icons/Sturmpanzer IV_24.jpg diff --git a/resources/ui/units/vehicles/T-55_24.jpg b/resources/ui/units/vehicles/icons/T-55_24.jpg similarity index 100% rename from resources/ui/units/vehicles/T-55_24.jpg rename to resources/ui/units/vehicles/icons/T-55_24.jpg diff --git a/resources/ui/units/vehicles/T-72B3_24.jpg b/resources/ui/units/vehicles/icons/T-72B3_24.jpg similarity index 100% rename from resources/ui/units/vehicles/T-72B3_24.jpg rename to resources/ui/units/vehicles/icons/T-72B3_24.jpg diff --git a/resources/ui/units/vehicles/T-72B_24.jpg b/resources/ui/units/vehicles/icons/T-72B_24.jpg similarity index 100% rename from resources/ui/units/vehicles/T-72B_24.jpg rename to resources/ui/units/vehicles/icons/T-72B_24.jpg diff --git a/resources/ui/units/vehicles/T-80UD_24.jpg b/resources/ui/units/vehicles/icons/T-80UD_24.jpg similarity index 100% rename from resources/ui/units/vehicles/T-80UD_24.jpg rename to resources/ui/units/vehicles/icons/T-80UD_24.jpg diff --git a/resources/ui/units/vehicles/T-80U_24.jpg b/resources/ui/units/vehicles/icons/T-80U_24.jpg similarity index 100% rename from resources/ui/units/vehicles/T-80U_24.jpg rename to resources/ui/units/vehicles/icons/T-80U_24.jpg diff --git a/resources/ui/units/vehicles/T-90_24.jpg b/resources/ui/units/vehicles/icons/T-90_24.jpg similarity index 100% rename from resources/ui/units/vehicles/T-90_24.jpg rename to resources/ui/units/vehicles/icons/T-90_24.jpg diff --git a/resources/ui/units/vehicles/TPZ_24.jpg b/resources/ui/units/vehicles/icons/TPZ_24.jpg similarity index 100% rename from resources/ui/units/vehicles/TPZ_24.jpg rename to resources/ui/units/vehicles/icons/TPZ_24.jpg diff --git a/resources/ui/units/vehicles/Tetrarch_24.jpg b/resources/ui/units/vehicles/icons/Tetrarch_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Tetrarch_24.jpg rename to resources/ui/units/vehicles/icons/Tetrarch_24.jpg diff --git a/resources/ui/units/vehicles/Tiger_II_H_24.jpg b/resources/ui/units/vehicles/icons/Tiger_II_H_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Tiger_II_H_24.jpg rename to resources/ui/units/vehicles/icons/Tiger_II_H_24.jpg diff --git a/resources/ui/units/vehicles/Tiger_I_24.jpg b/resources/ui/units/vehicles/icons/Tiger_I_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Tiger_I_24.jpg rename to resources/ui/units/vehicles/icons/Tiger_I_24.jpg diff --git a/resources/ui/units/vehicles/Tor 9A331_24.jpg b/resources/ui/units/vehicles/icons/Tor 9A331_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Tor 9A331_24.jpg rename to resources/ui/units/vehicles/icons/Tor 9A331_24.jpg diff --git a/resources/ui/units/vehicles/Tunguska 2C6M_24.jpg b/resources/ui/units/vehicles/icons/Tunguska 2C6M_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Tunguska 2C6M_24.jpg rename to resources/ui/units/vehicles/icons/Tunguska 2C6M_24.jpg diff --git a/resources/ui/units/vehicles/UAZ-469_24.jpg b/resources/ui/units/vehicles/icons/UAZ-469_24.jpg similarity index 100% rename from resources/ui/units/vehicles/UAZ-469_24.jpg rename to resources/ui/units/vehicles/icons/UAZ-469_24.jpg diff --git a/resources/ui/units/vehicles/Ural-375 ZU-23_24.jpg b/resources/ui/units/vehicles/icons/Ural-375 ZU-23_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Ural-375 ZU-23_24.jpg rename to resources/ui/units/vehicles/icons/Ural-375 ZU-23_24.jpg diff --git a/resources/ui/units/vehicles/Ural-375_24.jpg b/resources/ui/units/vehicles/icons/Ural-375_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Ural-375_24.jpg rename to resources/ui/units/vehicles/icons/Ural-375_24.jpg diff --git a/resources/ui/units/vehicles/Vulcan_24.jpg b/resources/ui/units/vehicles/icons/Vulcan_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Vulcan_24.jpg rename to resources/ui/units/vehicles/icons/Vulcan_24.jpg diff --git a/resources/ui/units/vehicles/Willys_MB_24.jpg b/resources/ui/units/vehicles/icons/Willys_MB_24.jpg similarity index 100% rename from resources/ui/units/vehicles/Willys_MB_24.jpg rename to resources/ui/units/vehicles/icons/Willys_MB_24.jpg diff --git a/resources/ui/units/vehicles/ZBD-04A_24.jpg b/resources/ui/units/vehicles/icons/ZBD-04A_24.jpg similarity index 100% rename from resources/ui/units/vehicles/ZBD-04A_24.jpg rename to resources/ui/units/vehicles/icons/ZBD-04A_24.jpg diff --git a/resources/ui/units/vehicles/ZSU-23-4 Shilka_24.jpg b/resources/ui/units/vehicles/icons/ZSU-23-4 Shilka_24.jpg similarity index 100% rename from resources/ui/units/vehicles/ZSU-23-4 Shilka_24.jpg rename to resources/ui/units/vehicles/icons/ZSU-23-4 Shilka_24.jpg diff --git a/resources/ui/units/vehicles/ZSU-57-2_24.jpg b/resources/ui/units/vehicles/icons/ZSU-57-2_24.jpg similarity index 100% rename from resources/ui/units/vehicles/ZSU-57-2_24.jpg rename to resources/ui/units/vehicles/icons/ZSU-57-2_24.jpg diff --git a/resources/ui/units/vehicles/ZU-23 Emplacement Closed_24.jpg b/resources/ui/units/vehicles/icons/ZU-23 Emplacement Closed_24.jpg similarity index 100% rename from resources/ui/units/vehicles/ZU-23 Emplacement Closed_24.jpg rename to resources/ui/units/vehicles/icons/ZU-23 Emplacement Closed_24.jpg diff --git a/resources/ui/units/vehicles/ZU-23_24.jpg b/resources/ui/units/vehicles/icons/ZU-23_24.jpg similarity index 100% rename from resources/ui/units/vehicles/ZU-23_24.jpg rename to resources/ui/units/vehicles/icons/ZU-23_24.jpg diff --git a/resources/ui/units/vehicles/bofors40_24.jpg b/resources/ui/units/vehicles/icons/bofors40_24.jpg similarity index 100% rename from resources/ui/units/vehicles/bofors40_24.jpg rename to resources/ui/units/vehicles/icons/bofors40_24.jpg diff --git a/resources/ui/units/vehicles/flak18_24.jpg b/resources/ui/units/vehicles/icons/flak18_24.jpg similarity index 100% rename from resources/ui/units/vehicles/flak18_24.jpg rename to resources/ui/units/vehicles/icons/flak18_24.jpg diff --git a/resources/ui/units/vehicles/flak30_24.jpg b/resources/ui/units/vehicles/icons/flak30_24.jpg similarity index 100% rename from resources/ui/units/vehicles/flak30_24.jpg rename to resources/ui/units/vehicles/icons/flak30_24.jpg diff --git a/resources/ui/units/vehicles/flak36_24.jpg b/resources/ui/units/vehicles/icons/flak36_24.jpg similarity index 100% rename from resources/ui/units/vehicles/flak36_24.jpg rename to resources/ui/units/vehicles/icons/flak36_24.jpg diff --git a/resources/ui/units/vehicles/flak37_24.jpg b/resources/ui/units/vehicles/icons/flak37_24.jpg similarity index 100% rename from resources/ui/units/vehicles/flak37_24.jpg rename to resources/ui/units/vehicles/icons/flak37_24.jpg diff --git a/resources/ui/units/vehicles/flak38_24.jpg b/resources/ui/units/vehicles/icons/flak38_24.jpg similarity index 100% rename from resources/ui/units/vehicles/flak38_24.jpg rename to resources/ui/units/vehicles/icons/flak38_24.jpg diff --git a/resources/ui/units/vehicles/flak41_24.jpg b/resources/ui/units/vehicles/icons/flak41_24.jpg similarity index 100% rename from resources/ui/units/vehicles/flak41_24.jpg rename to resources/ui/units/vehicles/icons/flak41_24.jpg diff --git a/resources/ui/units/vehicles/p-19 s-125 sr_24.jpg b/resources/ui/units/vehicles/icons/p-19 s-125 sr_24.jpg similarity index 100% rename from resources/ui/units/vehicles/p-19 s-125 sr_24.jpg rename to resources/ui/units/vehicles/icons/p-19 s-125 sr_24.jpg diff --git a/resources/ui/units/vehicles/snr s-125 tr_24.jpg b/resources/ui/units/vehicles/icons/snr s-125 tr_24.jpg similarity index 100% rename from resources/ui/units/vehicles/snr s-125 tr_24.jpg rename to resources/ui/units/vehicles/icons/snr s-125 tr_24.jpg diff --git a/resources/units/unit_info_text.json b/resources/units/unit_info_text.json index a448c26a..dd8e88d7 100644 --- a/resources/units/unit_info_text.json +++ b/resources/units/unit_info_text.json @@ -570,7 +570,7 @@ "year-of-variant-introduction": "1981" } }], - "OH_58D": [{ + "OH-58D": [{ "default": { "name": "OH-58D Kiowa Warrior", "country-of-origin": "USA", @@ -909,5 +909,130 @@ "Germany": { "name": "UH-1D Iroquois" } + }], + "MLRS 9A52 Smerch": [{ + "default": { + "name": "BM-30 Smerch (9M55K Cluster Rockets)", + "country-of-origin": "USSR/Russia", + "manufacturer": "Splav", + "role": "Multiple-Launch Rocket System", + "year-of-variant-introduction": "1989" + } + }], + "MLRS 9A52 Smerch HE": [{ + "default": { + "name": "BM-30 Smerch (9M55K5 HE Rockets)", + "country-of-origin": "USSR/Russia", + "manufacturer": "Splav", + "role": "Multiple-Launch Rocket System", + "year-of-variant-introduction": "1989" + } + }], + "MLRS 9K57 Uragan BM-27": [{ + "default": { + "name": "BM-27 Uragan", + "country-of-origin": "USSR/Russia", + "manufacturer": "Splav", + "role": "Multiple-Launch Rocket System", + "year-of-variant-introduction": "1975" + } + }], + "MLRS BM-21 Grad": [{ + "default": { + "name": "BM-21 Grad", + "country-of-origin": "USSR/Russia", + "manufacturer": "Splav", + "role": "Multiple-Launch Rocket System", + "year-of-variant-introduction": "1963" + } + }], + "MLRS FDDM": [{ + "default": { + "name": "M1043 HMMWV with Fire Direction Data Manager", + "country-of-origin": "USA", + "role": "Fire Control Vehicle", + "year-of-variant-introduction": "1993" + } + }], + "MLRS M270": [{ + "default": { + "name": "M270 Multiple Launch Rocket System", + "country-of-origin": "USA", + "manufacturer": "Vought", + "role": "Multiple-Launch Rocket System", + "year-of-variant-introduction": "1983" + } + }], + "M12 GMC": [{ + "default": { + "name": "M12 Gun Motor Carriage", + "country-of-origin": "USA", + "manufacturer": "Pressed Steel Car Company", + "role": "Self-Propelled Gun", + "year-of-variant-introduction": "1942" + } + }], + "SpGH Dana": [{ + "default": { + "name": "SpGH DANA", + "country-of-origin": "Czechoslovakia", + "manufacturer": "ZTS", + "role": "Self-Propelled Gun", + "year-of-variant-introduction": "1980" + } + }], + "SPH 2S9 Nona": [{ + "default": { + "name": "2S9 Nona-S", + "country-of-origin": "USSR/Russia", + "manufacturer": "Motovilikha", + "role": "Self-Propelled Mortar", + "year-of-variant-introduction": "1981" + } + }], + "SPH 2S3 Akatsia": [{ + "default": { + "name": "2S3 Akatsiya", + "country-of-origin": "USSR/Russia", + "manufacturer": "Uraltransmash", + "role": "Self-Propelled Gun", + "year-of-variant-introduction": "1971" + } + }], + "SPH 2S1 Gvozdika": [{ + "default": { + "name": "2S1 Gvozdika", + "country-of-origin": "USSR/Russia", + "manufacturer": "Kharkiv", + "role": "Self-Propelled Gun", + "year-of-variant-introduction": "1972" + } + }], + "SPH 2S19 Msta": [{ + "default": { + "name": "2S19 Msta-S", + "country-of-origin": "USSR/Russia", + "manufacturer": "Uraltransmash", + "role": "Self-Propelled Gun", + "year-of-variant-introduction": "1989" + } + }], + "SPH M109 Paladin": [{ + "default": { + "name": "M109A6 Paladin", + "country-of-origin": "USA", + "manufacturer": "United Defense", + "role": "Self-Propelled Gun", + "year-of-variant-introduction": "1994" + } + }], + "Sturmpanzer IV Brummbär": [{ + "default": { + "name": "Sturmpanzer IV Brummbär", + "country-of-origin": "Germany", + "manufacturer": "Vienna Arsenal", + "role": "Self-Propelled Gun", + "year-of-variant-introduction": "1943" + } }] }