Refactor the sell unit changes as requested.

It works more simply now, and also doesn't immediately sell the unit.

Also adds a matching UI dialog popup for selling too many ground units.

game/event/event.py

@@ -342,6 +342,8 @@ class UnitsDeliveryEvent:
     def __init__(self, control_point: ControlPoint) -> None:
         self.to_cp = control_point
         self.units: Dict[Type[UnitType], int] = {}
+        self.bought_units = {}
+        self.sold_units = {}
 
     def __str__(self) -> str:
         return "Pending delivery to {}".format(self.to_cp)
@@ -350,6 +352,10 @@ class UnitsDeliveryEvent:
         for k, v in units.items():
             self.units[k] = self.units.get(k, 0) + v
 
+    def sell(self, units: Dict[Type[UnitType], int]) -> None:
+        for k, v in units.items():
+            self.units[k] = self.units.get(k, 0) - v
+
     def consume_each_order(self) -> Iterator[Tuple[Type[UnitType], int]]:
         while self.units:
             yield self.units.popitem()
@@ -371,7 +377,16 @@ class UnitsDeliveryEvent:
             coalition = "Ally" if self.to_cp.captured else "Enemy"
             aircraft = unit_type.id
             name = self.to_cp.name
+            if count >= 0:
+                self.bought_units[unit_type] = count 
                 game.message(
                     f"{coalition} reinforcements: {aircraft} x {count} at {name}")
-        self.to_cp.base.commision_units(self.units)
+            else:
+                self.sold_units[unit_type] = 0 - count
+                game.message(
+                    f"{coalition} sold: {aircraft} x {0 - count} at {name}")
+        self.to_cp.base.commision_units(self.bought_units)
+        self.to_cp.base.commit_losses(self.sold_units)
         self.units = {}
+        self.bought_units = {}
+        self.sold_units = {}

game/inventory.py

@@ -98,7 +98,6 @@ class GlobalAircraftInventory:
         inventory = self.inventories[control_point]
         for aircraft, count in control_point.base.aircraft.items():
             inventory.add_aircraft(aircraft, count)
-            control_point.base.sold_units[aircraft] = 0
 
     def for_control_point(
             self,

game/theater/base.py

@@ -29,7 +29,6 @@ class Base:
         self.aa: Dict[AirDefence, int] = {}
         self.commision_points: Dict[Type, float] = {}
         self.strength = 1
-        self.sold_units = {}
 
     @property
     def total_aircraft(self) -> int:

gen/ground_forces/ai_ground_planner.py

@@ -117,7 +117,6 @@ class GroundPlanner:
                 print(key)
                 continue
 
-            self.cp.base.sold_units[key] = 0
             available = self.cp.base.armor[key]
             while available > 0:
 

qt_ui/windows/basemenu/QRecruitBehaviour.py

@@ -61,12 +61,6 @@ class QRecruitBehaviour:
         unitName = QLabel("<b>" + db.unit_type_name_2(unit_type) + "</b>")
         unitName.setSizePolicy(QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding))
 
-        sold_count = self.cp.base.sold_units.get(unit_type)
-        if sold_count is None:
-            sold_count = 0
-        if sold_count > 0:
-            existing_units = QLabel("<b>{} (-{})</b>".format(existing_units, sold_count))
-        else:
         existing_units = QLabel(str(existing_units))
         existing_units.setSizePolicy(QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed))
 
@@ -123,14 +117,6 @@ class QRecruitBehaviour:
             unit_type in self.pending_deliveries.units and "{}".format(self.pending_deliveries.units[unit_type]) or "0"
         ))
 
-        sold_count = self.cp.base.sold_units.get(unit_type)
-        if sold_count is None:
-            sold_count = 0
-        if sold_count > 0:
-            self.existing_units_labels[unit_type].setText("<b>{} (-{})</b>".format(
-                self.cp.base.total_units_of_type(unit_type), self.cp.base.sold_units[unit_type]
-            ))
-        else: 
         self.existing_units_labels[unit_type].setText("<b>{}</b>".format(
             self.cp.base.total_units_of_type(unit_type)
         ))
@@ -141,14 +127,6 @@ class QRecruitBehaviour:
     def buy(self, unit_type: Type[UnitType]):
         price = db.PRICES[unit_type]
         if self.budget >= price:
-            sold_count = self.cp.base.sold_units.get(unit_type)
-            if sold_count is None:
-                sold_count = 0
-            if sold_count > 0:
-                self.cp.base.sold_units[unit_type] -= 1
-                self.cp.base.commision_units({unit_type: 1})
-                self.budget -= price
-            else:
             self.pending_deliveries.order({unit_type: 1})
             self.budget -= price
         else:
@@ -158,18 +136,12 @@ class QRecruitBehaviour:
         self.update_available_budget()
 
     def sell(self, unit_type):
-        if self.pending_deliveries.units.get(unit_type, 0) > 0:
+        if self.pending_deliveries.units.get(unit_type, 0) > 0 or self.cp.base.total_units_of_type(unit_type) > 0:
             price = db.PRICES[unit_type]
             self.budget += price
-            self.pending_deliveries.units[unit_type] = self.pending_deliveries.units[unit_type] - 1
+            self.pending_deliveries.sell({unit_type: 1})
             if self.pending_deliveries.units[unit_type] == 0:
                 del self.pending_deliveries.units[unit_type]
-        elif self.cp.base.total_units_of_type(unit_type) > 0:
-            price = db.PRICES[unit_type]
-            self.budget += price
-            self.cp.base.commit_losses({unit_type: 1})
-            self.cp.base.sold_units[unit_type] += 1
-
         self._update_count_label(unit_type)
         self.update_available_budget()
 

qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py

@@ -85,8 +85,6 @@ class QAircraftRecruitmentMenu(QFrame, QRecruitBehaviour):
         self.setLayout(main_layout)
 
     def buy(self, unit_type):
-        global_inventory = self.game_model.game.aircraft_inventory
-        inventory = global_inventory.for_control_point(self.cp)
         if self.maximum_units > 0:
             if self.cp.unclaimed_parking(self.game_model.game) <= 0:
                 logging.debug(f"No space for additional aircraft at {self.cp}.")
@@ -94,23 +92,13 @@ class QAircraftRecruitmentMenu(QFrame, QRecruitBehaviour):
                     self, "No space for additional aircraft",
                     f"There is no parking space left at {self.cp.name} to accommodate another plane.", QMessageBox.Ok)
                 return
-        sold_count = self.cp.base.sold_units.get(unit_type)
-        if sold_count is None:
-            sold_count = 0
-        if sold_count > 0:
-            inventory.add_aircraft(unit_type, 1)
         super().buy(unit_type)
         self.hangar_status.update_label()
 
     def sell(self, unit_type: UnitType):
         # Don't need to remove aircraft from the inventory if we're canceling
         # orders.
-        if self.pending_deliveries.units.get(unit_type, 0) <= 0:
+        if self.pending_deliveries.units.get(unit_type, 0) <= 0 - self.cp.base.total_units_of_type(unit_type):
-            global_inventory = self.game_model.game.aircraft_inventory
-            inventory = global_inventory.for_control_point(self.cp)
-            try:
-                inventory.remove_aircraft(unit_type, 1)
-            except ValueError:
             QMessageBox.critical(
                 self, "Could not sell aircraft",
                 f"Attempted to sell one {unit_type.id} at {self.cp.name} "

qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py

@@ -5,8 +5,10 @@ from PySide2.QtWidgets import (
     QScrollArea,
     QVBoxLayout,
     QWidget,
+    QMessageBox,
 )
 from dcs.task import PinpointStrike
+from dcs.unittype import FlyingType, UnitType
 
 from game import db
 from game.theater import ControlPoint
@@ -57,3 +59,15 @@ class QArmorRecruitmentMenu(QFrame, QRecruitBehaviour):
         scroll.setWidget(scroll_content)
         main_layout.addWidget(scroll)
         self.setLayout(main_layout)
+
+    def sell(self, unit_type: UnitType):
+        # Don't need to remove aircraft from the inventory if we're canceling
+        # orders.
+        if self.pending_deliveries.units.get(unit_type, 0) <= 0 - self.cp.base.total_units_of_type(unit_type):
+            QMessageBox.critical(
+                self, "Could not sell ground unit",
+                f"Attempted to sell one {unit_type.id} at {self.cp.name} "
+                "but none are available.", QMessageBox.Ok)
+            return
+        super().sell(unit_type)
+        self.hangar_status.update_label()