Merge branch 'develop' into faction_refactor

changelog.md

@@ -11,7 +11,7 @@
 
 ## Fixes :
 * **[Campaign generator]** Ship group and offshore buildings should not be generated on land anymore 
-
+* **[UI]** Missing TER weapons in custom payload now selectable.
 
 # 2.1.5
 

qt_ui/dialogs.py

@@ -37,7 +37,7 @@ class Dialog:
     def open_new_package_dialog(cls, mission_target: MissionTarget):
         """Opens the dialog to create a new package with the given target."""
         cls.new_package_dialog = QNewPackageDialog(
-            cls.game_model.game,
+            cls.game_model,
             cls.game_model.ato_model,
             mission_target
         )
@@ -47,7 +47,7 @@ class Dialog:
     def open_edit_package_dialog(cls, package_model: PackageModel):
         """Opens the dialog to edit the given package."""
         cls.edit_package_dialog = QEditPackageDialog(
-            cls.game_model.game,
+            cls.game_model,
             cls.game_model.ato_model,
             package_model
         )

qt_ui/windows/mission/QPackageDialog.py

@@ -187,9 +187,9 @@ class QNewPackageDialog(QPackageDialog):
     New packages do not affect the ATO model until they are saved.
     """
 
-    def __init__(self, game: Game, model: AtoModel,
+    def __init__(self, game_model: GameModel, model: AtoModel,
                  target: MissionTarget) -> None:
-        super().__init__(game, PackageModel(Package(target)))
+        super().__init__(game_model, PackageModel(Package(target)))
         self.ato_model = model
 
         self.save_button = QPushButton("Save")
@@ -218,9 +218,9 @@ class QEditPackageDialog(QPackageDialog):
     Changes to existing packages occur immediately.
     """
 
-    def __init__(self, game: Game, model: AtoModel,
+    def __init__(self, game_model: GameModel, model: AtoModel,
                  package: PackageModel) -> None:
-        super().__init__(game, package)
+        super().__init__(game_model, package)
         self.ato_model = model
 
         self.delete_button = QPushButton("Delete package")

qt_ui/windows/mission/flight/payload/QPylonEditor.py

@@ -11,7 +11,7 @@ class QPylonEditor(QComboBox):
         self.pylon_number = pylon_number
         self.flight = flight
 
-        self.possible_loadout = [i for i in self.pylon.__dict__.keys() if i[:1] != '_']
+        self.possible_loadout = [i for i in self.pylon.__dict__.keys() if i[:2] != '__']
 
         if not str(self.pylon_number) in self.flight.loadout.keys():
             self.flight.loadout[str(self.pylon_number)] = ""