Indiciated gripen support version

- Fixes #1519 as the Opel Blitz unit generator was using the index without incrementing it

changelog.md

@@ -1,27 +1,3 @@
-# 4.1.2
-
-Saves from 4.1.1 are compatible with 4.1.2.
-
-## Features/Improvements
-
-* **[Mission Generation]** EWRs are now also headed towards the center of the conflict
-* **[UI]** Sell Button for aircraft will be disabled if there are no units available to be sold or all are already assigned to a mission
-
-## Fixes
-
-* **[UI]** Selling of Units is now visible again in the UI dialog and shows the correct amount of sold units
-* **[Mission Generation]** Mission results and other files will now be opened with enforced utf-8 encoding to prevent an issue where destroyed ground units were untracked because of special characters in their names.
-
-# 4.1.1
-
-Saves from 4.1.0 are compatible with 4.1.1.
-
-## Fixes
-
-* **[Campaign]** Fixed broken support for Mariana Islands map.
-* **[Mission Generation]** Fix SAM sites pointing towards the center of the conflict.
-* **[Flight Planning]** No longer using Su-34 for CAP missions.
-
 # 4.1.0
 
 Saves from 4.0.0 are compatible with 4.1.0.
@@ -36,7 +12,6 @@ Saves from 4.0.0 are compatible with 4.1.0.
 * **[Flight Planning]** CAP patrol speeds are now set per-aircraft to be more suitable/sensible. By default the speed will be set based on the aircraft's maximum speed.
 * **[Mission Generation]** Improvements for better support of the Skynet Plugin and long range SAMs are now acting as EWR
 * **[Mods]** Support for version v1.5.0-Beta of Gripen mod. In-progress campaigns may need to re-plan Gripen flights to pick up updated loadouts.
-* **[Mission Generation]** SAM sites are now headed towards the center of the conflict
 * **[Plugins]** Increased time JTAC Autolase messages stay visible on the UI.
 * **[Plugins]** Updated SkynetIADS to 2.2.0 (adds NASAMS support).  
 * **[UI]** Added ability to take notes and have those notes appear as a kneeboard page.

game/dcs/aircrafttype.py

@@ -288,7 +288,7 @@ class AircraftType(UnitType[Type[FlyingType]]):
             logging.warning(f"No data for {aircraft.id}; it will not be available")
             return
 
-        with data_path.open(encoding="utf-8") as data_file:
+        with data_path.open() as data_file:
             data = yaml.safe_load(data_file)
 
         try:

game/dcs/groundunittype.py

@@ -67,7 +67,7 @@ class GroundUnitType(UnitType[Type[VehicleType]]):
             logging.warning(f"No data for {vehicle.id}; it will not be available")
             return
 
-        with data_path.open(encoding="utf-8") as data_file:
+        with data_path.open() as data_file:
             data = yaml.safe_load(data_file)
 
         try:

game/debriefing.py

@@ -389,7 +389,7 @@ class PollDebriefingFileThread(threading.Thread):
                     os.path.isfile("state.json")
                     and os.path.getmtime("state.json") > last_modified
                 ):
-                    with open("state.json", "r", encoding="utf-8") as json_file:
+                    with open("state.json", "r") as json_file:
                         json_data = json.load(json_file)
                         debriefing = Debriefing(json_data, self.game, self.unit_map)
                         self.callback(debriefing)

game/operation/operation.py

@@ -63,7 +63,7 @@ class Operation:
 
     @classmethod
     def prepare(cls, game: Game) -> None:
-        with open("resources/default_options.lua", "r", encoding="utf-8") as f:
+        with open("resources/default_options.lua", "r") as f:
             options_dict = loads(f.read())["options"]
         cls._set_mission(Mission(game.theater.terrain))
         cls.game = game

game/theater/conflicttheater.py

@@ -704,7 +704,6 @@ class ConflictTheater:
             "Normandy": NormandyTheater,
             "The Channel": TheChannelTheater,
             "Syria": SyriaTheater,
-            "MarianaIslands": MarianaIslandsTheater,
         }
         theater = theaters[data["theater"]]
         t = theater()

game/unitdelivery.py

@@ -39,8 +39,9 @@ class PendingUnitDeliveries:
 
     def sell(self, units: dict[UnitType[Any], int]) -> None:
         for k, v in units.items():
-            self.units[k] -= v
-            if self.units[k] == 0:
+            if self.units[k] > v:
+                self.units[k] -= v
+            else:
                 del self.units[k]
 
     def refund_all(self, game: Game) -> None:

game/version.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 MAJOR_VERSION = 4
 MINOR_VERSION = 1
-MICRO_VERSION = 2
+MICRO_VERSION = 0
 
 
 def _build_version_string() -> str:
@@ -12,7 +12,7 @@ def _build_version_string() -> str:
     ]
     build_number_path = Path("resources/buildnumber")
     if build_number_path.exists():
-        with build_number_path.open("r", encoding="utf-8") as build_number_file:
+        with build_number_path.open("r") as build_number_file:
             components.append(build_number_file.readline())
 
     if not Path("resources/final").exists():

gen/flights/ai_flight_planner_db.py

@@ -129,6 +129,7 @@ CAP_CAPABLE = [
     F_14B,
     F_14A_135_GR,
     Su_33,
+    Su_34,
     J_11A,
     Su_30,
     Su_27,

gen/sam/airdefensegroupgenerator.py

@@ -48,7 +48,6 @@ class AirDefenseGroupGenerator(VehicleGroupGenerator[SamGroundObject], ABC):
 
         self.vg.name = self.group_name_for_role(self.vg.id, self.primary_group_role())
         self.auxiliary_groups: List[VehicleGroup] = []
-        self.heading = self.heading_to_conflict()
 
     def add_auxiliary_group(self, role: SkynetRole) -> VehicleGroup:
         gid = self.game.next_group_id()

gen/sam/ewrs.py

@@ -16,11 +16,7 @@ class EwrGenerator(VehicleGroupGenerator[EwrGroundObject]):
 
     def generate(self) -> None:
         self.add_unit(
-            self.unit_type,
-            "EWR",
-            self.position.x,
-            self.position.y,
-            self.heading_to_conflict(),
+            self.unit_type, "EWR", self.position.x, self.position.y, self.heading
         )
 
 

gen/sam/group_generator.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import logging
 import math
-import operator
 import random
 from collections import Iterable
 from typing import TYPE_CHECKING, Type, TypeVar, Generic, Any
@@ -16,7 +15,6 @@ from dcs.unittype import VehicleType, UnitType, ShipType
 
 from game.dcs.groundunittype import GroundUnitType
 from game.factions.faction import Faction
-from game.theater import MissionTarget
 from game.theater.theatergroundobject import TheaterGroundObject, NavalGroundObject
 
 if TYPE_CHECKING:
@@ -71,27 +69,6 @@ class GroupGenerator(Generic[GroupT, UnitT, UnitTypeT, TgoT]):
     ) -> UnitT:
         raise NotImplementedError
 
-    def heading_to_conflict(self) -> int:
-        # Heading for a Group to the enemy.
-        # Should be the point between the nearest and the most distant conflict
-        conflicts: dict[MissionTarget, float] = {}
-
-        for conflict in self.game.theater.conflicts():
-            conflicts[conflict] = conflict.distance_to(self.go)
-
-        if len(conflicts) == 0:
-            return self.heading
-
-        closest_conflict = min(conflicts.items(), key=operator.itemgetter(1))[0]
-        most_distant_conflict = max(conflicts.items(), key=operator.itemgetter(1))[0]
-
-        conflict_center = Point(
-            (closest_conflict.position.x + most_distant_conflict.position.x) / 2,
-            (closest_conflict.position.y + most_distant_conflict.position.y) / 2,
-        )
-
-        return int(self.go.position.heading_between_point(conflict_center))
-
 
 class VehicleGroupGenerator(
     Generic[TgoT], GroupGenerator[VehicleGroup, Vehicle, Type[VehicleType], TgoT]

qt_ui/main.py

@@ -68,8 +68,7 @@ def run_ui(game: Optional[Game]) -> None:
     # init the theme and load the stylesheet based on the theme index
     liberation_theme.init()
     with open(
-        "./resources/stylesheets/" + liberation_theme.get_theme_css_file(),
-        encoding="utf-8",
+        "./resources/stylesheets/" + liberation_theme.get_theme_css_file()
     ) as stylesheet:
         logging.info("Loading stylesheet: %s", liberation_theme.get_theme_css_file())
         app.setStyleSheet(stylesheet.read())

qt_ui/uiconstants.py

@@ -68,7 +68,7 @@ def load_icons():
     ICONS["Terrain_Normandy"] = QPixmap("./resources/ui/terrain_normandy.gif")
     ICONS["Terrain_TheChannel"] = QPixmap("./resources/ui/terrain_channel.gif")
     ICONS["Terrain_Syria"] = QPixmap("./resources/ui/terrain_syria.gif")
-    ICONS["Terrain_MarianaIslands"] = QPixmap("./resources/ui/terrain_marianas.gif")
+    ICONS["Terrain_Mariana"] = QPixmap("./resources/ui/terrain_mariana.gif")
 
     ICONS["Dawn"] = QPixmap("./resources/ui/conditions/timeofday/dawn.png")
     ICONS["Day"] = QPixmap("./resources/ui/conditions/timeofday/day.png")

qt_ui/windows/QWaitingForMissionResultWindow.py

@@ -228,7 +228,7 @@ class QWaitingForMissionResultWindow(QDialog):
         )
         print(file)
         try:
-            with open(file[0], "r", encoding="utf-8") as json_file:
+            with open(file[0], "r") as json_file:
                 json_data = json.load(json_file)
                 json_data["mission_ended"] = True
                 debriefing = Debriefing(json_data, self.game, self.unit_map)

qt_ui/windows/basemenu/QRecruitBehaviour.py

@@ -80,13 +80,7 @@ class PurchaseGroup(QGroupBox):
 
     def update_state(self) -> None:
         self.buy_button.setEnabled(self.recruiter.enable_purchase(self.unit_type))
-        self.buy_button.setToolTip(
-            self.recruiter.purchase_tooltip(self.buy_button.isEnabled())
-        )
         self.sell_button.setEnabled(self.recruiter.enable_sale(self.unit_type))
-        self.sell_button.setToolTip(
-            self.recruiter.sell_tooltip(self.sell_button.isEnabled())
-        )
         self.amount_bought.setText(f"<b>{self.pending_units}</b>")
 
 
@@ -229,18 +223,6 @@ class QRecruitBehaviour:
     def enable_sale(self, unit_type: UnitType) -> bool:
         return True
 
-    def purchase_tooltip(self, is_enabled: bool) -> str:
-        if is_enabled:
-            return "Buy unit. Use Shift or Ctrl key to buy multiple units at once."
-        else:
-            return "Unit can not be bought."
-
-    def sell_tooltip(self, is_enabled: bool) -> str:
-        if is_enabled:
-            return "Sell unit. Use Shift or Ctrl key to buy multiple units at once."
-        else:
-            return "Unit can not be sold."
-
     def info(self, unit_type: UnitType) -> None:
         self.info_window = QUnitInfoWindow(self.game_model.game, unit_type)
         self.info_window.show()

qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py

@@ -85,13 +85,9 @@ class QAircraftRecruitmentMenu(QFrame, QRecruitBehaviour):
         return True
 
     def enable_sale(self, unit_type: AircraftType) -> bool:
-        return self.can_be_sold(unit_type)
-
-    def sell_tooltip(self, is_enabled: bool) -> str:
-        if is_enabled:
-            return "Sell unit. Use Shift or Ctrl key to sell multiple units at once."
-        else:
-            return "Can not be sold because either no aircraft are available or are already assigned to a mission."
+        if not self.cp.can_operate(unit_type):
+            return False
+        return True
 
     def buy(self, unit_type: AircraftType) -> bool:
         if self.maximum_units > 0:
@@ -116,32 +112,24 @@ class QAircraftRecruitmentMenu(QFrame, QRecruitBehaviour):
         self.hangar_status.update_label()
         return True
 
-    def can_be_sold(self, unit_type: AircraftType) -> bool:
-        inventory = self.game_model.game.aircraft_inventory.for_control_point(self.cp)
-        pending_deliveries = self.pending_deliveries.units.get(unit_type, 0)
-        return self.cp.can_operate(unit_type) and (
-            pending_deliveries > 0 or inventory.available(unit_type) > 0
-        )
-
     def sell(self, unit_type: AircraftType) -> bool:
         # Don't need to remove aircraft from the inventory if we're canceling
         # orders.
-        if not self.can_be_sold(unit_type):
-            QMessageBox.critical(
-                self,
-                "Could not sell aircraft",
-                f"Attempted to sell one {unit_type} at {self.cp.name} "
-                "but none are available. Are all aircraft currently "
-                "assigned to a mission?",
-                QMessageBox.Ok,
-            )
-            return False
-
-        inventory = self.game_model.game.aircraft_inventory.for_control_point(self.cp)
-        pending_deliveries = self.pending_deliveries.units.get(unit_type, 0)
-        if pending_deliveries <= 0 < inventory.available(unit_type):
-            inventory.remove_aircraft(unit_type, 1)
-
+        if self.pending_deliveries.units.get(unit_type, 0) <= 0:
+            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} at {self.cp.name} "
+                    "but none are available. Are all aircraft currently "
+                    "assigned to a mission?",
+                    QMessageBox.Ok,
+                )
+                return False
         super().sell(unit_type)
         self.hangar_status.update_label()
 

qt_ui/windows/newgame/QCampaignList.py

@@ -42,7 +42,7 @@ class Campaign:
 
     @classmethod
     def from_json(cls, path: Path) -> Campaign:
-        with path.open(encoding="utf-8") as campaign_file:
+        with path.open() as campaign_file:
             data = json.load(campaign_file)
 
         sanitized_theater = data["theater"].replace(" ", "")