Convert to new unit APIs, remove old APIs.

There are probably plenty of raw ints around that never used the old
conversion APIs, but we'll just need to fix those when we see them.

Fixes https://github.com/Khopa/dcs_liberation/issues/558

game/data/doctrine.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from datetime import timedelta
 
-from game.utils import Distance, feet, nm_to_meter, feet_to_meter
+from game.utils import Distance, feet, nautical_miles
 
 
 @dataclass(frozen=True)
@@ -12,31 +12,28 @@ class Doctrine:
     strike: bool
     antiship: bool
 
-    strike_max_range: int
-    sead_max_range: int
-
     rendezvous_altitude: Distance
-    hold_distance: int
-    push_distance: int
-    join_distance: int
-    split_distance: int
-    ingress_egress_distance: int
+    hold_distance: Distance
+    push_distance: Distance
+    join_distance: Distance
+    split_distance: Distance
+    ingress_egress_distance: Distance
     ingress_altitude: Distance
-    egress_altitude: int
+    egress_altitude: Distance
 
-    min_patrol_altitude: int
-    max_patrol_altitude: int
-    pattern_altitude: int
+    min_patrol_altitude: Distance
+    max_patrol_altitude: Distance
+    pattern_altitude: Distance
 
     cap_duration: timedelta
-    cap_min_track_length: int
-    cap_max_track_length: int
-    cap_min_distance_from_cp: int
-    cap_max_distance_from_cp: int
+    cap_min_track_length: Distance
+    cap_max_track_length: Distance
+    cap_min_distance_from_cp: Distance
+    cap_max_distance_from_cp: Distance
 
     cas_duration: timedelta
 
-    sweep_distance: int
+    sweep_distance: Distance
 
 
 MODERN_DOCTRINE = Doctrine(
@@ -45,26 +42,24 @@ MODERN_DOCTRINE = Doctrine(
     sead=True,
     strike=True,
     antiship=True,
-    strike_max_range=1500000,
-    sead_max_range=1500000,
     rendezvous_altitude=feet(25000),
-    hold_distance=nm_to_meter(15),
-    push_distance=nm_to_meter(20),
-    join_distance=nm_to_meter(20),
-    split_distance=nm_to_meter(20),
-    ingress_egress_distance=nm_to_meter(45),
+    hold_distance=nautical_miles(15),
+    push_distance=nautical_miles(20),
+    join_distance=nautical_miles(20),
+    split_distance=nautical_miles(20),
+    ingress_egress_distance=nautical_miles(45),
     ingress_altitude=feet(20000),
-    egress_altitude=feet_to_meter(20000),
-    min_patrol_altitude=feet_to_meter(15000),
-    max_patrol_altitude=feet_to_meter(33000),
-    pattern_altitude=feet_to_meter(5000),
+    egress_altitude=feet(20000),
+    min_patrol_altitude=feet(15000),
+    max_patrol_altitude=feet(33000),
+    pattern_altitude=feet(5000),
     cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nm_to_meter(15),
-    cap_max_track_length=nm_to_meter(40),
-    cap_min_distance_from_cp=nm_to_meter(10),
-    cap_max_distance_from_cp=nm_to_meter(40),
+    cap_min_track_length=nautical_miles(15),
+    cap_max_track_length=nautical_miles(40),
+    cap_min_distance_from_cp=nautical_miles(10),
+    cap_max_distance_from_cp=nautical_miles(40),
     cas_duration=timedelta(minutes=30),
-    sweep_distance=nm_to_meter(60),
+    sweep_distance=nautical_miles(60),
 )
 
 COLDWAR_DOCTRINE = Doctrine(
@@ -73,26 +68,24 @@ COLDWAR_DOCTRINE = Doctrine(
     sead=True,
     strike=True,
     antiship=True,
-    strike_max_range=1500000,
-    sead_max_range=1500000,
     rendezvous_altitude=feet(22000),
-    hold_distance=nm_to_meter(10),
-    push_distance=nm_to_meter(10),
-    join_distance=nm_to_meter(10),
-    split_distance=nm_to_meter(10),
-    ingress_egress_distance=nm_to_meter(30),
+    hold_distance=nautical_miles(10),
+    push_distance=nautical_miles(10),
+    join_distance=nautical_miles(10),
+    split_distance=nautical_miles(10),
+    ingress_egress_distance=nautical_miles(30),
     ingress_altitude=feet(18000),
-    egress_altitude=feet_to_meter(18000),
-    min_patrol_altitude=feet_to_meter(10000),
-    max_patrol_altitude=feet_to_meter(24000),
-    pattern_altitude=feet_to_meter(5000),
+    egress_altitude=feet(18000),
+    min_patrol_altitude=feet(10000),
+    max_patrol_altitude=feet(24000),
+    pattern_altitude=feet(5000),
     cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nm_to_meter(12),
-    cap_max_track_length=nm_to_meter(24),
-    cap_min_distance_from_cp=nm_to_meter(8),
-    cap_max_distance_from_cp=nm_to_meter(25),
+    cap_min_track_length=nautical_miles(12),
+    cap_max_track_length=nautical_miles(24),
+    cap_min_distance_from_cp=nautical_miles(8),
+    cap_max_distance_from_cp=nautical_miles(25),
     cas_duration=timedelta(minutes=30),
-    sweep_distance=nm_to_meter(40),
+    sweep_distance=nautical_miles(40),
 )
 
 WWII_DOCTRINE = Doctrine(
@@ -101,24 +94,22 @@ WWII_DOCTRINE = Doctrine(
     sead=False,
     strike=True,
     antiship=True,
-    strike_max_range=1500000,
-    sead_max_range=1500000,
-    hold_distance=nm_to_meter(5),
-    push_distance=nm_to_meter(5),
-    join_distance=nm_to_meter(5),
-    split_distance=nm_to_meter(5),
+    hold_distance=nautical_miles(5),
+    push_distance=nautical_miles(5),
+    join_distance=nautical_miles(5),
+    split_distance=nautical_miles(5),
     rendezvous_altitude=feet(10000),
-    ingress_egress_distance=nm_to_meter(7),
+    ingress_egress_distance=nautical_miles(7),
     ingress_altitude=feet(8000),
-    egress_altitude=feet_to_meter(8000),
-    min_patrol_altitude=feet_to_meter(4000),
-    max_patrol_altitude=feet_to_meter(15000),
-    pattern_altitude=feet_to_meter(5000),
+    egress_altitude=feet(8000),
+    min_patrol_altitude=feet(4000),
+    max_patrol_altitude=feet(15000),
+    pattern_altitude=feet(5000),
     cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nm_to_meter(8),
-    cap_max_track_length=nm_to_meter(18),
-    cap_min_distance_from_cp=nm_to_meter(0),
-    cap_max_distance_from_cp=nm_to_meter(5),
+    cap_min_track_length=nautical_miles(8),
+    cap_max_track_length=nautical_miles(18),
+    cap_min_distance_from_cp=nautical_miles(0),
+    cap_max_distance_from_cp=nautical_miles(5),
     cas_duration=timedelta(minutes=30),
-    sweep_distance=nm_to_meter(10),
+    sweep_distance=nautical_miles(10),
 )

game/procurement.py

@@ -6,11 +6,12 @@ import random
 from typing import Iterator, List, Optional, TYPE_CHECKING, Type
 
 from dcs.task import CAP, CAS
-from dcs.unittype import FlyingType, UnitType, VehicleType
+from dcs.unittype import FlyingType, VehicleType
 
 from game import db
 from game.factions.faction import Faction
 from game.theater import ControlPoint, MissionTarget
+from game.utils import Distance
 from gen.flights.ai_flight_planner_db import (
     capable_aircraft_for_task,
     preferred_aircraft_for_task,
@@ -25,7 +26,7 @@ if TYPE_CHECKING:
 @dataclass(frozen=True)
 class AircraftProcurementRequest:
     near: MissionTarget
-    range: int
+    range: Distance
     task_capability: FlightType
     number: int
 

game/theater/conflicttheater.py

@@ -55,7 +55,7 @@ from .controlpoint import (
     Fob,
 )
 from .landmap import Landmap, load_landmap, poly_contains
-from ..utils import nm_to_meter
+from ..utils import Distance, meters, nautical_miles
 
 Numeric = Union[int, float]
 
@@ -115,7 +115,7 @@ class MizCampaignLoader:
         AirDefence.SAM_SA_3_S_125_LN_5P73.id,
     }
 
-    BASE_DEFENSE_RADIUS = nm_to_meter(2)
+    BASE_DEFENSE_RADIUS = nautical_miles(2)
 
     def __init__(self, miz: Path, theater: ConflictTheater) -> None:
         self.theater = theater
@@ -317,9 +317,9 @@ class MizCampaignLoader:
                 self.control_points[origin.id])
         return front_lines
 
-    def objective_info(self, group: Group) -> Tuple[ControlPoint, int]:
+    def objective_info(self, group: Group) -> Tuple[ControlPoint, Distance]:
         closest = self.theater.closest_control_point(group.position)
-        distance = closest.position.distance_to_point(group.position)
+        distance = meters(closest.position.distance_to_point(group.position))
         return closest, distance
 
     def add_preset_locations(self) -> None:

game/utils.py

@@ -29,38 +29,6 @@ def opposite_heading(h):
     return heading_sum(h, 180)
 
 
-def meter_to_feet(value: float) -> int:
-    return int(meters(value).feet)
-
-
-def feet_to_meter(value: float) -> int:
-    return int(feet(value).meters)
-
-
-def meter_to_nm(value: float) -> int:
-    return int(meters(value).nautical_miles)
-
-
-def nm_to_meter(value: float) -> int:
-    return int(nautical_miles(value).meters)
-
-
-def knots_to_kph(value: float) -> int:
-    return int(knots(value).kph)
-
-
-def kph_to_mps(value: float) -> int:
-    return int(kph(value).meters_per_second)
-
-
-def mps_to_kph(value: float) -> int:
-    return int(mps(value).kph)
-
-
-def mps_to_knots(value: float) -> int:
-    return int(mps(value).knots)
-
-
 @dataclass(frozen=True, order=True)
 class Distance:
     distance_in_meters: float
@@ -89,14 +57,20 @@ class Distance:
     def from_nautical_miles(cls, value: float) -> Distance:
         return cls(value * NM_TO_METERS)
 
+    def __add__(self, other: Distance) -> Distance:
+        return meters(self.meters + other.meters)
+
+    def __sub__(self, other: Distance) -> Distance:
+        return meters(self.meters - other.meters)
+
     def __mul__(self, other: Union[float, int]) -> Distance:
-        return Distance(self.meters * other)
+        return meters(self.meters * other)
 
     def __truediv__(self, other: Union[float, int]) -> Distance:
-        return Distance(self.meters / other)
+        return meters(self.meters / other)
 
     def __floordiv__(self, other: Union[float, int]) -> Distance:
-        return Distance(self.meters // other)
+        return meters(self.meters // other)
 
 
 def feet(value: float) -> Distance:
@@ -165,14 +139,20 @@ class Speed:
         c_sound = math.sqrt(heat_capacity_ratio * gas_constant * temperature_k)
         return mps(c_sound) * value
 
+    def __add__(self, other: Speed) -> Speed:
+        return kph(self.kph + other.kph)
+
+    def __sub__(self, other: Speed) -> Speed:
+        return kph(self.kph - other.kph)
+
     def __mul__(self, other: Union[float, int]) -> Speed:
-        return Speed(self.kph * other)
+        return kph(self.kph * other)
 
     def __truediv__(self, other: Union[float, int]) -> Speed:
-        return Speed(self.kph / other)
+        return kph(self.kph / other)
 
     def __floordiv__(self, other: Union[float, int]) -> Speed:
-        return Speed(self.kph // other)
+        return kph(self.kph // other)
 
 
 def knots(value: float) -> Speed:

game/weather.py

@@ -10,6 +10,7 @@ from typing import Optional, TYPE_CHECKING
 from dcs.weather import Weather as PydcsWeather, Wind
 
 from game.settings import Settings
+from game.utils import Distance, meters
 
 if TYPE_CHECKING:
     from game.theater import ConflictTheater
@@ -39,7 +40,7 @@ class Clouds:
 
 @dataclass(frozen=True)
 class Fog:
-    visibility: int
+    visibility: Distance
     thickness: int
 
 
@@ -56,7 +57,7 @@ class Weather:
         if random.randrange(5) != 0:
             return None
         return Fog(
-            visibility=random.randint(2500, 5000),
+            visibility=meters(random.randint(2500, 5000)),
             thickness=random.randint(100, 500)
         )