Added PyDCS as a submodule

Update QWaitingForMissionResultWindow.py

.github/workflows/release.yml

@@ -0,0 +1,107 @@
+name: Release Pipeline
+
+on:
+  push:
+    tags: [ '*' ]
+
+jobs:
+  
+  build:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install environment
+      run: |
+        py -m venv ./venv
+
+    - name: Install dependencies
+      run: |
+        ./venv/scripts/activate
+        pip install -r requirements.txt
+        # For some reason the shiboken2.abi3.dll is not found properly, so I copy it instead
+        Copy-Item .\venv\Lib\site-packages\shiboken2\shiboken2.abi3.dll .\venv\Lib\site-packages\PySide2\ -Force
+
+    - name: Build binaries
+      run: |
+        ./venv/scripts/activate
+        $env:PYTHONPATH=".;./pydcs"
+        pyinstaller pyinstaller.spec
+
+    - name: Create Installer
+      env:
+        TAG_NAME: ${{ github.ref }}
+      run: |
+        $version = ($env:TAG_NAME -split "/") | Select-Object -Last 1
+        (Get-Content .\installer\dcs_liberation.iss) -replace "{{version}}",$version | Out-File .\build\installer.iss
+        cd .\installer
+        iscc.exe ..\build\installer.iss
+        cd ..
+        Copy-Item .\changelog.md .\dist
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: dcs_liberation
+        path: dist/
+
+  release:
+    needs: [ build ]
+    runs-on: windows-latest
+    steps:
+    - uses: actions/download-artifact@v2
+      with:
+        name: dcs_liberation
+
+    - name: "Get Version"
+      id: version        
+      env:
+        TAG_NAME: ${{ github.ref }}
+      run: |
+        Get-ChildItem -Recurse -Depth 1
+        $version = ($env:TAG_NAME -split "/") | Select-Object -Last 1
+        $prerelease = ("2.1.1-alpha3" -match '[^\.\d]').ToString().ToLower()
+        Write-Host $version
+        Write-Host $prerelease
+        Write-Output "::set-output name=number::$version"
+        Write-Output "::set-output name=prerelease::$prerelease"
+        $changelog = Get-Content .\changelog.md
+        $last_change = ($changelog | Select-String -Pattern "^#\s" | Select-Object -Skip 1 -First 1).LineNumber - 2
+        ($changelog | Select-Object -First $last_change) -join "`n" | Out-File .\releasenotes.md
+        Compress-Archive -Path .\dcs_liberation -DestinationPath "dcs_liberation.$version.zip" -Compression Optimal
+    
+    - uses: actions/create-release@v1
+      id: create_release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: ${{ github.ref }}
+        body_path: releasenotes.md
+        draft: false
+        prerelease: ${{ steps.version.outputs.prerelease }}
+    
+    - uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./dcs_liberation.exe
+        asset_name: dcs_liberation.${{ steps.version.outputs.number }}.exe
+        asset_content_type: application/exe
+
+    - uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./dcs_liberation.${{ steps.version.outputs.number }}.zip
+        asset_name: dcs_liberation.${{ steps.version.outputs.number }}.zip
+        asset_content_type: application/zip
+      

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "pydcs"]
+	path = pydcs
+	url = https://github.com/pydcs/dcs
+	branch = master

changelog.md

@@ -1,3 +1,15 @@
+# 2.1.1
+
+## Features/Imrpovements :
+* **[Other]** Added an installer option
+
+## Fixed issues :
+* **[UI/UX]** Spelling issues
+* **[Campaign Generator]** Tarawa was placed on land in Syrian Civil War campaign
+* **[Campaign Generator]** Fixed inverted configuration for Syria full map
+* **[Units/Factions]** Minor changes to USA 1990
+* **[Units/Factions]** AH-64A now has default payloads. AH-64D has payloads for more mission types. 
+
 # 2.1.0
 
 ## Features/Improvements :

game/data/building_data.py

@@ -1,5 +1,5 @@
 import inspect
-import dcs
+from pydcs import dcs
 
 DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick', 'aa']
 

game/db.py

@@ -959,10 +959,8 @@ PLANE_PAYLOAD_OVERRIDES = {
     RQ_1A_Predator: COMMON_OVERRIDE,
     WingLoong_I: COMMON_OVERRIDE,
     AH_1W: COMMON_OVERRIDE,
-
-    AH_64D:{
-        CAS: "AGM-114K*16"
-    },
+    AH_64D: COMMON_OVERRIDE,
+    AH_64A: COMMON_OVERRIDE,
 
     Su_25TM: {
         SEAD: "Kh-31P*2_Kh-25ML*4_R-73*2_L-081_MPS410",

game/factions/syria.py

@@ -7,14 +7,20 @@ Syria_2011 = {
     "side": "red",
     "units": [
 
-        MiG_29S,
+        MiG_21Bis,
+        MiG_23MLD,
         MiG_25PD,
-        L_39ZA,
-        Su_24M,
+        MiG_29S,
+
         Su_17M4,
+        Su_24M,
+
+        L_39ZA,
+
         Mi_24V,
-        SA342M,
         Mi_8MT,
+        SA342M,
+        SA342L,
 
         IL_76MD,
         IL_78M,

game/factions/usa_1990.py

@@ -11,12 +11,11 @@ USA_1990 = {
         F_15E,
         F_14B,
         FA_18C_hornet,
+        F_16C_50,
 
         A_10A,
         AV8BNA,
 
-        B_1B,
-
         KC_135,
         KC130,
         C_130,
@@ -24,7 +23,6 @@ USA_1990 = {
 
         UH_1H,
         AH_64A,
-        OH_58D,
 
         Armor.MBT_M1A2_Abrams,
         Armor.IFV_LAV_25,

game/factions/usa_2005.py

@@ -14,6 +14,7 @@ USA_2005 = {
         F_16C_50,
         A_10C,
         AV8BNA,
+        MQ_9_Reaper,
 
         KC_135,
         KC130,
@@ -22,7 +23,6 @@ USA_2005 = {
 
         UH_1H,
         AH_64D,
-        OH_58D,
 
         Armor.MBT_M1A2_Abrams,
         Armor.ATGM_M1134_Stryker,

gen/aircraft.py

@@ -316,10 +316,10 @@ class AircraftConflictGenerator:
         detection_zone = self.m.triggers.add_triggerzone(flight.from_cp.position, radius=25000, hidden=False, name="ITZ")
         if flight.from_cp.captured:
             activation_trigger.add_condition(PartOfCoalitionInZone(self.game.get_enemy_color(), detection_zone.id)) # TODO : support unit type in part of coalition
-            activation_trigger.add_action(MessageToAll(String("WARNING : Enemy aircrafts have been detected in the vicinity of " + flight.from_cp.name + ". Interceptors are taking off."), 20))
+            activation_trigger.add_action(MessageToAll(String("WARNING : Enemy aircraft have been detected in the vicinity of " + flight.from_cp.name + ". Interceptors are taking off."), 20))
         else:
             activation_trigger.add_condition(PartOfCoalitionInZone(self.game.get_player_color(), detection_zone.id))
-            activation_trigger.add_action(MessageToAll(String("WARNING : We have detected that enemy aircrafts are scrambling for an interception on " + flight.from_cp.name + " airbase."), 20))
+            activation_trigger.add_action(MessageToAll(String("WARNING : We have detected that enemy aircraft are scrambling for an interception on " + flight.from_cp.name + " airbase."), 20))
 
     def generate_planned_flight(self, cp, country, flight:Flight):
         try:

gen/conflictgen.py

@@ -1,7 +1,7 @@
 import logging
 import typing
 import pdb
-import dcs
+from pydcs import dcs
 
 from random import randint
 from dcs import Mission

gen/flights/ai_flight_planner.py

@@ -7,7 +7,8 @@ from game.data.doctrine import MODERN_DOCTRINE
 from game.data.radar_db import UNITS_WITH_RADAR
 from game.utils import meter_to_feet, nm_to_meter
 from gen import Conflict
-from gen.flights.ai_flight_planner_db import INTERCEPT_CAPABLE, CAP_CAPABLE, CAS_CAPABLE, SEAD_CAPABLE, STRIKE_CAPABLE
+from gen.flights.ai_flight_planner_db import INTERCEPT_CAPABLE, CAP_CAPABLE, CAS_CAPABLE, SEAD_CAPABLE, STRIKE_CAPABLE, \
+    DRONES
 from gen.flights.flight import Flight, FlightType, FlightWaypoint, FlightWaypointType
 
 
@@ -245,8 +246,13 @@ class FlightPlanner:
                 except IndexError:
                     break
 
-                inventory[unit] = inventory[unit] - 2
-                flight = Flight(unit, 2, self.from_cp, FlightType.STRIKE)
+                if unit in DRONES:
+                    count = 1
+                else:
+                    count = 2
+
+                inventory[unit] = inventory[unit] - count
+                flight = Flight(unit, count, self.from_cp, FlightType.STRIKE)
 
                 flight.points = []
                 flight.scheduled_in = offset + i*random.randint(self.doctrine["STRIKE_EVERY_X_MINUTES"] - 5, self.doctrine["STRIKE_EVERY_X_MINUTES"] + 5)

gen/flights/ai_flight_planner_db.py

@@ -74,7 +74,7 @@ CAP_CAPABLE = [
     Rafale_M,
 ]
 
-# USed for CAS (Close air support) and BAI (Battlefield Interdiction)
+# Used for CAS (Close air support) and BAI (Battlefield Interdiction)
 CAS_CAPABLE = [
 
     MiG_15bis,
@@ -117,6 +117,8 @@ CAS_CAPABLE = [
 
     AH_64A,
     AH_64D,
+    AH_1W,
+
 
     UH_1H,
 

installer/dcs_liberation.iss

@@ -0,0 +1,51 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "DCS Liberation"
+#define MyAppVersion "{{version}}"
+#define MyAppPublisher "Khopa"
+#define MyAppURL "https://github.com/Khopa/dcs_liberation/wiki"
+#define MyAppExeName "liberation_main.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{6753B352-D281-42CB-9AFA-5E93EB90AA5A}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+AllowNoIcons=yes
+; Remove the following line to run in administrative install mode (install for all users.)
+PrivilegesRequired=lowest
+PrivilegesRequiredOverridesAllowed=dialog
+OutputDir=..\dist
+OutputBaseFilename=dcs_liberation
+SetupIconFile=..\resources\icon.ico
+UninstallDisplayIcon={app}\liberation_main.exe
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "..\dist\dcs_liberation\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

qt_ui/main.py

@@ -4,7 +4,7 @@ import logging
 import os
 import sys
 
-import dcs
+from pydcs import dcs
 from PySide2 import QtWidgets
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QApplication, QSplashScreen

qt_ui/windows/QWaitingForMissionResultWindow.py

@@ -121,7 +121,7 @@ class QWaitingForMissionResultWindow(QDialog):
         updateBox.setLayout(updateLayout)
         self.debriefing = debriefing
 
-        updateLayout.addWidget(QLabel("<b>Aircrafts destroyed</b>"), 0, 0)
+        updateLayout.addWidget(QLabel("<b>Aircraft destroyed</b>"), 0, 0)
         updateLayout.addWidget(QLabel(str(len(debriefing.killed_aircrafts))), 0, 1)
 
         updateLayout.addWidget(QLabel("<b>Ground units destroyed</b>"), 1, 0)

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

@@ -24,7 +24,11 @@ class QLoadoutEditor(QGroupBox):
             label = QLabel("<b>{}</b>".format(pylon.__name__[len("Pylon"):]))
             label.setSizePolicy(QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed))
             layout.addWidget(label, i, 0)
-            layout.addWidget(QPylonEditor(flight, pylon, i+1), i, 1)
+            try:
+                pylon_number = int(pylon.__name__.split("Pylon")[1])
+            except:
+                pylon_number = i+1
+            layout.addWidget(QPylonEditor(flight, pylon, pylon_number), i, 1)
 
         hboxLayout.addLayout(layout)
         hboxLayout.addStretch()

requirements.txt

@@ -1,4 +1,4 @@
-pydcs>=0.9.10
+#pydcs>=0.9.10
 Pyside2>=5.13.0
 pyinstaller==3.6
 pyproj==2.6.1.post1

resources/customized_payloads/AH-64A.lua

@@ -0,0 +1,118 @@
+local unitPayloads = {
+	["name"] = "AH-64A",
+	["payloads"] = {
+		[1] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{FD90A1DC-9147-49FA-BF56-CB83EF0BD32B}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FD90A1DC-9147-49FA-BF56-CB83EF0BD32B}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+		[2] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+		[3] = {
+			["name"] = "CAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+		[4] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 3,
+				},
+				[3] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+		[5] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+	},
+	["unitType"] = "AH-64A",
+}
+return unitPayloads

resources/customized_payloads/AH-64D.lua

@@ -0,0 +1,110 @@
+local unitPayloads = {
+	["name"] = "AH-64D",
+	["payloads"] = {
+		[1] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+		[2] = {
+			["name"] = "CAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+		[3] = {
+			["name"] = "ANTISHIP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 2,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+		[4] = {
+			["name"] = "SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+		[5] = {
+			["name"] = "STRIKE",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 4,
+				},
+				[2] = {
+					["CLSID"] = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 18,
+				[2] = 31,
+				[3] = 32,
+				[4] = 30,
+			},
+		},
+	},
+	["unitType"] = "AH-64D",
+}
+return unitPayloads

resources/customized_payloads/F-16C_50.lua

@@ -2,53 +2,6 @@ local unitPayloads = {
 	["name"] = "F-16C_50",
 	["payloads"] = {
 		[1] = {
-			["name"] = "CAS",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{8A0BE8AE-58D4-4572-9263-3144C0D06364}",
-					["num"] = 5,
-				},
-				[2] = {
-					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
-					["num"] = 7,
-				},
-				[3] = {
-					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
-					["num"] = 2,
-				},
-				[5] = {
-					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
-					["num"] = 1,
-				},
-				[6] = {
-					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
-					["num"] = 8,
-				},
-				[7] = {
-					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
-					["num"] = 9,
-				},
-				[8] = {
-					["CLSID"] = "{5335D97A-35A5-4643-9D9B-026C75961E52}",
-					["num"] = 4,
-				},
-				[9] = {
-					["CLSID"] = "{5335D97A-35A5-4643-9D9B-026C75961E52}",
-					["num"] = 6,
-				},
-				[10] = {
-					["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
-					["num"] = 11,
-				},
-			},
-			["tasks"] = {
-			},
-		},
-		[2] = {
 			["name"] = "ANTISHIP",
 			["pylons"] = {
 				[1] = {
@@ -91,7 +44,7 @@ local unitPayloads = {
 			["tasks"] = {
 			},
 		},
-		[3] = {
+		[2] = {
 			["name"] = "CAP",
 			["pylons"] = {
 				[1] = {
@@ -134,6 +87,53 @@ local unitPayloads = {
 			["tasks"] = {
 			},
 		},
+		[3] = {
+			["name"] = "CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{8A0BE8AE-58D4-4572-9263-3144C0D06364}",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 7,
+				},
+				[3] = {
+					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[5] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 1,
+				},
+				[6] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[7] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 9,
+				},
+				[8] = {
+					["CLSID"] = "{5335D97A-35A5-4643-9D9B-026C75961E52}",
+					["num"] = 4,
+				},
+				[9] = {
+					["CLSID"] = "{5335D97A-35A5-4643-9D9B-026C75961E52}",
+					["num"] = 6,
+				},
+				[11] = {
+					["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
+					["num"] = 11,
+				},
+			},
+			["tasks"] = {
+			},
+		},
 		[4] = {
 			["name"] = "STRIKE",
 			["pylons"] = {
@@ -173,6 +173,10 @@ local unitPayloads = {
 					["CLSID"] = "{8A0BE8AE-58D4-4572-9263-3144C0D06364}",
 					["num"] = 5,
 				},
+				[11] = {
+					["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
+					["num"] = 11,
+				},
 			},
 			["tasks"] = {
 			},

resources/tools/generate_loadout_check.py

@@ -1,6 +1,6 @@
 import os
 import sys
-import dcs
+from pydcs import dcs
 
 from game import db
 from gen.aircraft import AircraftConflictGenerator

theater/conflicttheater.py

@@ -1,6 +1,6 @@
 import typing
 
-import dcs
+from pydcs import dcs
 from dcs.mapping import Point
 
 from .controlpoint import ControlPoint

theater/syria.py

@@ -110,7 +110,7 @@ class SyrianCivilWar(SyriaTheater):
         self.palmyra = ControlPoint.from_airport(syria.Palmyra, LAND, SIZE_REGULAR, IMPORTANCE_LOW)
 
         self.carrier = ControlPoint.carrier("Carrier", Point(18537, -52000), 1001)
-        self.lha = ControlPoint.lha("LHA", Point(116000, 30000), 1002)
+        self.lha = ControlPoint.lha("LHA", Point(116000, -30000), 1002)
 
         self.add_controlpoint(self.basselAlAssad, connected_to=[self.hama])
         self.add_controlpoint(self.marjruhayyil, connected_to=[self.aldumayr])
@@ -140,6 +140,7 @@ class InherentResolve(SyriaTheater):
         super(InherentResolve, self).__init__()
 
         self.kinghussein = ControlPoint.from_airport(syria.King_Hussein_Air_College, LAND, SIZE_REGULAR, IMPORTANCE_HIGH)
+        self.incirlik = ControlPoint.from_airport(syria.Incirlik, LAND, SIZE_REGULAR, IMPORTANCE_HIGH)
         self.khalkhala = ControlPoint.from_airport(syria.Khalkhalah, LAND, SIZE_REGULAR, IMPORTANCE_MEDIUM)
         self.palmyra = ControlPoint.from_airport(syria.Palmyra, LAND, SIZE_REGULAR, IMPORTANCE_LOW)
         self.jirah = ControlPoint.from_airport(syria.Jirah, LAND, SIZE_REGULAR, IMPORTANCE_LOW)
@@ -149,6 +150,7 @@ class InherentResolve(SyriaTheater):
         self.lha = ControlPoint.lha("LHA", Point(-131000, -161000), 1002)
 
         self.add_controlpoint(self.kinghussein, connected_to=[self.khalkhala])
+        self.add_controlpoint(self.incirlik, connected_to=[self.incirlik])
         self.add_controlpoint(self.khalkhala, connected_to=[self.kinghussein, self.palmyra])
         self.add_controlpoint(self.palmyra, connected_to=[self.khalkhala, self.tabqa])
         self.add_controlpoint(self.tabqa, connected_to=[self.palmyra, self.jirah])
@@ -158,10 +160,12 @@ class InherentResolve(SyriaTheater):
         self.add_controlpoint(self.lha)
 
         self.kinghussein.captured = True
+        self.incirlik.captured = True
         self.carrier.captured = True
         self.lha.captured = True
 
         self.jirah.captured_invert = True
+        self.incirlik.captured_invert = True
         self.carrier.captured_invert = True
         self.lha.captured_invert = True
 
@@ -214,7 +218,7 @@ class SyriaFullMap(SyriaTheater):
         self.carrier.captured = True
         self.lha.captured = True
 
-        self.hatay.captured_invert = True
+        self.incirlik.captured_invert = True
         self.carrier.captured_invert = True
         self.lha.captured_invert = True
 

userdata/liberation_install.py

@@ -2,7 +2,7 @@ import json
 import os
 from shutil import copyfile
 
-import dcs
+from pydcs import dcs
 
 from userdata import persistency