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

Handle inventory for changing flight size.

Browse Source
This commit is contained in:
Dan Albert 2020-11-09 21:29:29 -08:00
parent 840b5ce071
commit d2c831c4ee
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/inventory.py
View File

@ -49,7 +49,10 @@ class ControlPointAircraftInventory:
Args: Args:
aircraft: The type of aircraft to query. aircraft: The type of aircraft to query.
""" """
try:
return self.inventory[aircraft] return self.inventory[aircraft]
except KeyError:
return 0
@property @property
def types_available(self) -> Iterator[UnitType]: def types_available(self) -> Iterator[UnitType]:

35
qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py
View File

@ -1,3 +1,5 @@
import logging
from PySide2.QtCore import Signal from PySide2.QtCore import Signal
from PySide2.QtWidgets import QLabel, QHBoxLayout, QGroupBox, QSpinBox, QGridLayout from PySide2.QtWidgets import QLabel, QHBoxLayout, QGroupBox, QSpinBox, QGridLayout
@ -10,30 +12,27 @@ class QFlightSlotEditor(QGroupBox):
super(QFlightSlotEditor, self).__init__("Slots") super(QFlightSlotEditor, self).__init__("Slots")
self.flight = flight self.flight = flight
self.game = game self.game = game
inventory = self.game.aircraft_inventory.for_control_point( self.inventory = self.game.aircraft_inventory.for_control_point(
flight.from_cp flight.from_cp
) )
self.available = inventory.all_aircraft available = self.inventory.available(self.flight.unit_type)
if self.flight.unit_type not in self.available: max_count = self.flight.count + available
max = self.flight.count if max_count > 4:
else: max_count = 4
max = self.flight.count + self.available[self.flight.unit_type]
if max > 4:
max = 4
layout = QGridLayout() layout = QGridLayout()
self.aircraft_count = QLabel("Aircraft count :") self.aircraft_count = QLabel("Aircraft count :")
self.aircraft_count_spinner = QSpinBox() self.aircraft_count_spinner = QSpinBox()
self.aircraft_count_spinner.setMinimum(1) self.aircraft_count_spinner.setMinimum(1)
self.aircraft_count_spinner.setMaximum(max) self.aircraft_count_spinner.setMaximum(max_count)
self.aircraft_count_spinner.setValue(flight.count) self.aircraft_count_spinner.setValue(flight.count)
self.aircraft_count_spinner.valueChanged.connect(self._changed_aircraft_count) self.aircraft_count_spinner.valueChanged.connect(self._changed_aircraft_count)
self.client_count = QLabel("Client slots count :") self.client_count = QLabel("Client slots count :")
self.client_count_spinner = QSpinBox() self.client_count_spinner = QSpinBox()
self.client_count_spinner.setMinimum(0) self.client_count_spinner.setMinimum(0)
self.client_count_spinner.setMaximum(max) self.client_count_spinner.setMaximum(max_count)
self.client_count_spinner.setValue(flight.client_count) self.client_count_spinner.setValue(flight.client_count)
self.client_count_spinner.valueChanged.connect(self._changed_client_count) self.client_count_spinner.valueChanged.connect(self._changed_client_count)
@ -50,9 +49,23 @@ class QFlightSlotEditor(QGroupBox):
self.setLayout(layout) self.setLayout(layout)
def _changed_aircraft_count(self): def _changed_aircraft_count(self):
self.game.aircraft_inventory.return_from_flight(self.flight)
old_count = self.flight.count
self.flight.count = int(self.aircraft_count_spinner.value()) self.flight.count = int(self.aircraft_count_spinner.value())
try:
self.game.aircraft_inventory.claim_for_flight(self.flight)
except ValueError:
# The UI should have prevented this, but if we ran out of aircraft
# then roll back the inventory change.
difference = self.flight.count - old_count
available = self.inventory.available(self.flight.unit_type)
logging.error(
f"Could not add {difference} additional aircraft to "
f"{self.flight} because {self.flight.from_cp} has only "
f"{available} {self.flight.unit_type} remaining")
self.flight.count = old_count
self.game.aircraft_inventory.claim_for_flight(self.flight)
self.changed.emit() self.changed.emit()
# TODO check if enough aircraft are available
def _changed_client_count(self): def _changed_client_count(self):
self.flight.client_count = int(self.client_count_spinner.value()) self.flight.client_count = int(self.client_count_spinner.value())