weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename UnitType.name what it is: the variant ID.

Browse Source 
This property affects safe compat because the ID is what gets preserved
in the save, but it's unfortunately also used as the display name, which
means changing the display name breaks save compat. It also prevents us
from changing display names without breaking faction definitions.

This is the first step in fixing that. The next is adding a separate
display_name property that can be updated without breaking either of
those.
This commit is contained in:
Dan Albert
2023-08-09 20:50:01 -07:00
parent 09f1af37fd
commit 0be6952a93
22 changed files with 88 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qt_ui/windows/AirWingConfigurationDialog.py
View File

@@ -594,12 +594,12 @@ class AircraftTypeList(QListView):
self.add_aircraft_type(aircraft)
def remove_aircraft_type(self, aircraft: AircraftType):
for item in self.item_model.findItems(aircraft.name):
for item in self.item_model.findItems(aircraft.variant_id):
self.item_model.removeRow(item.row())
self.page_index_changed.emit(self.selectionModel().currentIndex().row())
def add_aircraft_type(self, aircraft: AircraftType):
aircraft_item = QStandardItem(aircraft.name)
aircraft_item = QStandardItem(aircraft.variant_id)
icon = self.icon_for(aircraft)
if icon is not None:
aircraft_item.setIcon(icon)
@@ -767,7 +767,7 @@ class AirWingConfigurationTab(QWidget):
)
# Add Squadron
if not self.type_list.item_model.findItems(selected_type.name):
if not self.type_list.item_model.findItems(selected_type.variant_id):
self.type_list.add_aircraft_type(selected_type)
# TODO Select the newly added type
self.squadrons_panel.add_squadron_to_panel(squadron)
@@ -893,8 +893,8 @@ class SquadronAircraftTypeSelector(QComboBox):
super().__init__()
self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
for type in sorted(types, key=lambda type: type.name):
self.addItem(type.name, type)
for type in sorted(types, key=lambda type: type.variant_id):
self.addItem(type.variant_id, type)
if selected_aircraft:
self.setCurrentText(selected_aircraft)

6
qt_ui/windows/AirWingDialog.py
View File

@@ -44,7 +44,7 @@ class SquadronDelegate(TwoColumnRowDelegate):
nickname = ""
return f"{squadron.name}{nickname}"
elif (row, column) == (0, 1):
return squadron.aircraft.name
return squadron.aircraft.variant_id
elif (row, column) == (1, 0):
return squadron.location.name
elif (row, column) == (1, 1):
@@ -134,7 +134,7 @@ class AircraftInventoryData:
player = "Player" if pilot.player else "AI"
yield AircraftInventoryData(
flight.departure.name,
flight.unit_type.name,
flight.unit_type.variant_id,
flight_type,
target,
pilot_name,
@@ -147,7 +147,7 @@ class AircraftInventoryData:
) -> Iterator[AircraftInventoryData]:
for _ in range(0, squadron.untasked_aircraft):
yield AircraftInventoryData(
squadron.name, squadron.aircraft.name, "Idle", "N/A", "N/A", "N/A"
squadron.name, squadron.aircraft.variant_id, "Idle", "N/A", "N/A", "N/A"
)

4
qt_ui/windows/QDebriefingWindow.py
View File

@@ -22,7 +22,9 @@ class LossGrid(QGridLayout):
def __init__(self, debriefing: Debriefing, player: bool) -> None:
super().__init__()
self.add_loss_rows(debriefing.air_losses.by_type(player), lambda u: u.name)
self.add_loss_rows(
debriefing.air_losses.by_type(player), lambda u: u.variant_id
)
self.add_loss_rows(
debriefing.front_line_losses_by_type(player), lambda u: str(u)
)

4
qt_ui/windows/QUnitInfoWindow.py
View File

@@ -51,7 +51,7 @@ class QUnitInfoWindow(QDialog):
self.setModal(True)
self.game = game
self.unit_type = unit_type
self.name = unit_type.name
self.name = unit_type.variant_id
self.setWindowTitle(f"Unit Info: {self.name}")
self.setWindowIcon(QIcon("./resources/icon.png"))
self.setMinimumHeight(570)
@@ -78,7 +78,7 @@ class QUnitInfoWindow(QDialog):
self.details_grid_layout.setContentsMargins(0, 0, 0, 0)
self.name_box = QLabel(
f"<b>Name:</b> {unit_type.manufacturer} {unit_type.name}"
f"<b>Name:</b> {unit_type.manufacturer} {unit_type.variant_id}"
)
self.name_box.setProperty("style", "info-element")

4
qt_ui/windows/basemenu/DepartingConvoysMenu.py
View File

@@ -33,11 +33,11 @@ class DepartingConvoyInfo(QGroupBox):
if unit_type.dcs_id in VEHICLES_ICONS.keys():
icon.setPixmap(VEHICLES_ICONS[unit_type.dcs_id])
else:
icon.setText("<b>" + unit_type.name + "</b>")
icon.setText("<b>" + unit_type.variant_id + "</b>")
icon.setProperty("style", "icon-armor")
unit_layout.addWidget(icon, idx, 0)
unit_layout.addWidget(
QLabel(f"{count} x <strong>{unit_type.name}</strong>"),
QLabel(f"{count} x <strong>{unit_type.variant_id}</strong>"),
idx,
1,
)

6
qt_ui/windows/basemenu/NewUnitTransferDialog.py
View File

@@ -62,7 +62,7 @@ class UnitTransferList(QFrame):
task_box_layout = QGridLayout()
scroll_content.setLayout(task_box_layout)
units_column = sorted(cp.base.armor, key=lambda u: u.name)
units_column = sorted(cp.base.armor, key=lambda u: u.variant_id)
count = 0
for count, unit_type in enumerate(units_column):
@@ -171,7 +171,7 @@ class ScrollingUnitTransferGrid(QFrame):
unit_types = set(self.game_model.game.faction_for(player=True).ground_units)
sorted_units = sorted(
{u for u in unit_types if self.cp.base.total_units_of_type(u)},
key=lambda u: u.name,
key=lambda u: u.variant_id,
)
for row, unit_type in enumerate(sorted_units):
self.add_unit_row(unit_type, task_box_layout, row)
@@ -203,7 +203,7 @@ class ScrollingUnitTransferGrid(QFrame):
origin_inventory = self.cp.base.total_units_of_type(unit_type)
unit_name = QLabel(f"<b>{unit_type.name}</b>")
unit_name = QLabel(f"<b>{unit_type.variant_id}</b>")
unit_name.setSizePolicy(
QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
)

6
qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py
View File

@@ -11,12 +11,12 @@ from PySide6.QtWidgets import (
)
from game.dcs.aircrafttype import AircraftType
from game.purchaseadapter import AircraftPurchaseAdapter
from game.squadrons import Squadron
from game.theater import ControlPoint
from qt_ui.models import GameModel
from qt_ui.uiconstants import ICONS
from qt_ui.windows.basemenu.UnitTransactionFrame import UnitTransactionFrame
from game.purchaseadapter import AircraftPurchaseAdapter
class QAircraftRecruitmentMenu(UnitTransactionFrame[Squadron]):
@@ -44,7 +44,9 @@ class QAircraftRecruitmentMenu(UnitTransactionFrame[Squadron]):
for squadron in cp.squadrons:
unit_types.add(squadron.aircraft)
sorted_squadrons = sorted(cp.squadrons, key=lambda s: (s.aircraft.name, s.name))
sorted_squadrons = sorted(
cp.squadrons, key=lambda s: (s.aircraft.variant_id, s.name)
)
for row, squadron in enumerate(sorted_squadrons):
self.add_purchase_row(squadron, task_box_layout, row)

4
qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py
View File

@@ -2,10 +2,10 @@ from PySide6.QtCore import Qt
from PySide6.QtWidgets import QGridLayout, QScrollArea, QVBoxLayout, QWidget
from game.dcs.groundunittype import GroundUnitType
from game.purchaseadapter import GroundUnitPurchaseAdapter
from game.theater import ControlPoint
from qt_ui.models import GameModel
from qt_ui.windows.basemenu.UnitTransactionFrame import UnitTransactionFrame
from game.purchaseadapter import GroundUnitPurchaseAdapter
class QArmorRecruitmentMenu(UnitTransactionFrame[GroundUnitType]):
@@ -32,7 +32,7 @@ class QArmorRecruitmentMenu(UnitTransactionFrame[GroundUnitType]):
unit_types = list(
set(self.game_model.game.faction_for(player=True).ground_units)
)
unit_types.sort(key=lambda u: u.name)
unit_types.sort(key=lambda u: u.variant_id)
for row, unit_type in enumerate(unit_types):
self.add_purchase_row(unit_type, task_box_layout, row)
stretch = QVBoxLayout()

4
qt_ui/windows/basemenu/intel/QIntelInfo.py
View File

@@ -27,7 +27,7 @@ class QIntelInfo(QFrame):
for unit_type, count in self.cp.allocated_aircraft().present.items():
if count:
task_type = unit_type.dcs_unit_type.task_default.name
units_by_task[task_type][unit_type.name] += count
units_by_task[task_type][unit_type.variant_id] += count
units_by_task = {
task: units_by_task[task] for task in sorted(units_by_task.keys())
@@ -36,7 +36,7 @@ class QIntelInfo(QFrame):
front_line_units = defaultdict(int)
for unit_type, count in self.cp.base.armor.items():
if count:
front_line_units[unit_type.name] += count
front_line_units[unit_type.variant_id] += count
units_by_task["Front line units"] = front_line_units
for task, unit_types in units_by_task.items():

2
qt_ui/windows/groundobject/QGroundObjectBuyMenu.py
View File

@@ -76,7 +76,7 @@ class QTgoLayoutGroupRow(QWidget):
# Add all possible units with the price
for unit_type in force_group.unit_types_for_group(group):
self.unit_selector.addItem(
f"{unit_type.name} [${unit_type.price}M]",
f"{unit_type.variant_id} [${unit_type.price}M]",
userData=(unit_type.dcs_unit_type, unit_type.price),
)
# Add all possible statics with price = 0

8
qt_ui/windows/intel.py
View File

@@ -84,11 +84,11 @@ class AircraftIntelLayout(IntelTableLayout):
continue
self.add_header(f"{control_point.name} ({base_total})")
for airframe in sorted(allocation.present, key=lambda k: k.name):
for airframe in sorted(allocation.present, key=lambda k: k.variant_id):
count = allocation.present[airframe]
if not count:
continue
self.add_row(f" {airframe.name}", count)
self.add_row(f" {airframe.variant_id}", count)
self.add_row("")
self.add_row("<b>Total</b>", total)
@@ -113,11 +113,11 @@ class ArmyIntelLayout(IntelTableLayout):
continue
self.add_header(f"{control_point.name} ({base.total_armor})")
for vehicle in sorted(base.armor, key=lambda k: k.name):
for vehicle in sorted(base.armor, key=lambda k: k.variant_id):
count = base.armor[vehicle]
if not count:
continue
self.add_row(f" {vehicle.name}", count)
self.add_row(f" {vehicle.variant_id}", count)
self.add_row("")
self.add_row("<b>Total</b>", total)