From 6cbc2b707a9e7c0db4e4b7b1252aa1040026d91b Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Fri, 1 Jan 2021 13:56:33 -0800
Subject: [PATCH] Fix type of `Game.budget`.

This *is* a float, since the income multiplier is a float. The type
annotations were wrong.
---
 game/game.py        |  6 ++++--
 game/procurement.py | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/game/game.py b/game/game.py
index 86d1b41e..a4212d9f 100644
--- a/game/game.py
+++ b/game/game.py
@@ -69,16 +69,18 @@ AWACS_BUDGET_COST = 4
 # Bonus multiplier logarithm base
 PLAYER_BUDGET_IMPORTANCE_LOG = 2
 
+
 class TurnState(Enum):
     WIN = 0
     LOSS = 1
     CONTINUE = 2
 
+
 class Game:
     def __init__(self, player_name: str, enemy_name: str,
                  theater: ConflictTheater, start_date: datetime,
-                 settings: Settings, player_budget: int,
-                 enemy_budget: int) -> None:
+                 settings: Settings, player_budget: float,
+                 enemy_budget: float) -> None:
         self.settings = settings
         self.events: List[Event] = []
         self.theater = theater
diff --git a/game/procurement.py b/game/procurement.py
index 653ddb5b..8d55d82e 100644
--- a/game/procurement.py
+++ b/game/procurement.py
@@ -5,7 +5,6 @@ import random
 from dataclasses import dataclass
 from typing import Iterator, List, Optional, TYPE_CHECKING, Type
 
-from dcs.task import CAP, CAS
 from dcs.unittype import FlyingType, VehicleType
 
 from game import db
@@ -52,8 +51,8 @@ class ProcurementAi:
         self.threat_zones = self.game.threat_zone_for(not self.is_player)
 
     def spend_budget(
-            self, budget: int,
-            aircraft_requests: List[AircraftProcurementRequest]) -> int:
+            self, budget: float,
+            aircraft_requests: List[AircraftProcurementRequest]) -> float:
         if self.manage_runways:
             budget = self.repair_runways(budget)
         if self.manage_front_line:
@@ -69,7 +68,7 @@ class ProcurementAi:
             budget = self.purchase_aircraft(budget, aircraft_requests)
         return budget
 
-    def sell_incomplete_squadrons(self) -> int:
+    def sell_incomplete_squadrons(self) -> float:
         # Selling incomplete squadrons gives us more money to spend on the next
         # turn. This serves as a short term fix for
         # https://github.com/Khopa/dcs_liberation/issues/41.
@@ -80,7 +79,7 @@ class ProcurementAi:
         #
         # This option is only used by the AI since players cannot cancel sales
         # (https://github.com/Khopa/dcs_liberation/issues/365).
-        total = 0
+        total = 0.0
         for cp in self.game.theater.control_points_for(self.is_player):
             inventory = self.game.aircraft_inventory.for_control_point(cp)
             for aircraft, available in inventory.all_aircraft:
@@ -92,7 +91,7 @@ class ProcurementAi:
                 total += db.PRICES[aircraft]
         return total
 
-    def repair_runways(self, budget: int) -> int:
+    def repair_runways(self, budget: float) -> float:
         for control_point in self.owned_points:
             if budget < db.RUNWAY_REPAIR_COST:
                 break
@@ -112,7 +111,8 @@ class ProcurementAi:
         return budget
 
     def random_affordable_ground_unit(
-            self, budget: int, cp: ControlPoint) -> Optional[Type[VehicleType]]:
+            self, budget: float,
+            cp: ControlPoint) -> Optional[Type[VehicleType]]:
         affordable_units = [u for u in self.faction.frontline_units + self.faction.artillery_units if
                             db.PRICES[u] <= budget]
 
@@ -129,7 +129,7 @@ class ProcurementAi:
             return None
         return random.choice(affordable_units)
 
-    def reinforce_front_line(self, budget: int) -> int:
+    def reinforce_front_line(self, budget: float) -> float:
         if not self.faction.frontline_units and not self.faction.artillery_units:
             return budget
 
@@ -151,7 +151,7 @@ class ProcurementAi:
 
     def _affordable_aircraft_of_types(
             self, types: List[Type[FlyingType]], airbase: ControlPoint,
-            number: int, max_price: int) -> Optional[Type[FlyingType]]:
+            number: int, max_price: float) -> Optional[Type[FlyingType]]:
         best_choice: Optional[Type[FlyingType]] = None
         for unit in [u for u in self.faction.aircrafts if u in types]:
             if db.PRICES[unit] * number > max_price:
@@ -169,14 +169,14 @@ class ProcurementAi:
 
     def affordable_aircraft_for(
             self, request: AircraftProcurementRequest,
-            airbase: ControlPoint, budget: int) -> Optional[Type[FlyingType]]:
+            airbase: ControlPoint, budget: float) -> Optional[Type[FlyingType]]:
         return self._affordable_aircraft_of_types(
             aircraft_for_task(request.task_capability),
             airbase, request.number, budget)
 
     def purchase_aircraft(
-            self, budget: int,
-            aircraft_requests: List[AircraftProcurementRequest]) -> int:
+            self, budget: float,
+            aircraft_requests: List[AircraftProcurementRequest]) -> float:
         for request in aircraft_requests:
             for airbase in self.best_airbases_for(request):
                 unit = self.affordable_aircraft_for(request, airbase, budget)