diff --git a/changelog.md b/changelog.md index 44b41989..3c5a898d 100644 --- a/changelog.md +++ b/changelog.md @@ -18,7 +18,7 @@ * **[Options]** New option in Settings: Default start type for Player flights. * **[AirWing]** Expose OPFOR Squadrons, giving the ability to change liveries, auto-assignable mission types & an easy way to retrieve debug information. * **[ATO]** Allow planning as OPFOR -* **[Campaign Design]** Support for Kola map by Orbx +* **[Campaign Design]** Support for latest maps (Kola, Afghanistan, Iraq) * **[UI]** Zoom level retained when switching campaigns * **[UX]** Allow changing squadrons in flight's edit dialog * **[Cheats]** Sink/Resurrect carriers instead of showing an error during cheat-capture (use AWCD-cheat to add squadrons upon resurrection) diff --git a/game/theater/theaterloader.py b/game/theater/theaterloader.py index 087dee0d..dc8d1e0c 100644 --- a/game/theater/theaterloader.py +++ b/game/theater/theaterloader.py @@ -19,6 +19,7 @@ from dcs.terrain import ( Sinai, Kola, Afghanistan, + Iraq, ) from .conflicttheater import ConflictTheater @@ -38,6 +39,7 @@ ALL_TERRAINS = [ Sinai(), Kola(), Afghanistan(), + Iraq(), ] TERRAINS_BY_NAME = {t.name: t for t in ALL_TERRAINS} diff --git a/resources/dcs/beacons/iraq.json b/resources/dcs/beacons/iraq.json new file mode 100644 index 00000000..426bc706 --- /dev/null +++ b/resources/dcs/beacons/iraq.json @@ -0,0 +1,296 @@ +{ + "airfield1_0": { + "name": "RAA", + "callsign": "RAA", + "beacon_type": 4, + "hertz": null, + "channel": 80 + }, + "airfield1_1": { + "name": "IRAA", + "callsign": "IRAA", + "beacon_type": 14, + "hertz": 108800000, + "channel": null + }, + "airfield1_2": { + "name": "ISAD", + "callsign": "ISAD", + "beacon_type": 14, + "hertz": 108900000, + "channel": null + }, + "airfield1_3": { + "name": "IRAA", + "callsign": "IRAA", + "beacon_type": 13, + "hertz": 108800000, + "channel": null + }, + "airfield1_4": { + "name": "ISAD", + "callsign": "ISAD", + "beacon_type": 13, + "hertz": 108900000, + "channel": null + }, + "airfield12_0": { + "name": "ALSAHRAAAF", + "callsign": "TKT", + "beacon_type": 8, + "hertz": 1669000, + "channel": null + }, + "airfield9_0": { + "name": "AlTajiAirport", + "callsign": "TAJI", + "beacon_type": 8, + "hertz": 1650000, + "channel": null + }, + "airfield13_0": { + "name": "Al Taquddum", + "callsign": "MAT", + "beacon_type": 4, + "hertz": null, + "channel": 70 + }, + "airfield2_0": { + "name": "BGD", + "callsign": "BGD", + "beacon_type": 3, + "hertz": 112900000, + "channel": 76 + }, + "airfield2_1": { + "name": "", + "callsign": "ORBI", + "beacon_type": 7, + "hertz": 118700000, + "channel": null + }, + "airfield2_2": { + "name": "IYCA", + "callsign": "IYCA", + "beacon_type": 14, + "hertz": 110100000, + "channel": null + }, + "airfield2_3": { + "name": "IYDB", + "callsign": "IYDB", + "beacon_type": 14, + "hertz": 110700000, + "channel": null + }, + "airfield2_4": { + "name": "IYCA", + "callsign": "IYCA", + "beacon_type": 13, + "hertz": 110100000, + "channel": null + }, + "airfield2_5": { + "name": "IYDB", + "callsign": "IYDB", + "beacon_type": 13, + "hertz": 110700000, + "channel": null + }, + "airfield2_6": { + "name": "BAP", + "callsign": "BAP", + "beacon_type": 4, + "hertz": 121700000, + "channel": 64 + }, + "airfield2_7": { + "name": "ITAK", + "callsign": "ITAK", + "beacon_type": 14, + "hertz": 110900000, + "channel": null + }, + "airfield2_8": { + "name": "INHA", + "callsign": "INHA", + "beacon_type": 14, + "hertz": 110300000, + "channel": null + }, + "airfield2_9": { + "name": "INHA", + "callsign": "INHA", + "beacon_type": 13, + "hertz": 110300000, + "channel": null + }, + "airfield2_10": { + "name": "ITAK", + "callsign": "ITAK", + "beacon_type": 13, + "hertz": 110900000, + "channel": null + }, + "airfield8_0": { + "name": "BLD", + "callsign": "BLD", + "beacon_type": 5, + "hertz": 114600000, + "channel": 93 + }, + "airfield8_1": { + "name": "BaladAirbase", + "callsign": "IANC", + "beacon_type": 13, + "hertz": 109950000, + "channel": null + }, + "airfield8_2": { + "name": "BaladAirbase", + "callsign": "IANC", + "beacon_type": 14, + "hertz": 109950000, + "channel": null + }, + "airfield8_3": { + "name": "BaladAirbase", + "callsign": "IBLD", + "beacon_type": 13, + "hertz": 109900000, + "channel": null + }, + "airfield8_4": { + "name": "BaladAirbase", + "callsign": "IBLD", + "beacon_type": 14, + "hertz": 109900000, + "channel": null + }, + "airfield5_0": { + "name": "ORB", + "callsign": "ORB", + "beacon_type": 4, + "hertz": null, + "channel": 47 + }, + "airfield4_0": { + "name": "RER", + "callsign": "RER", + "beacon_type": 3, + "hertz": 116300000, + "channel": 110 + }, + "airfield4_1": { + "name": "ErbilInternationalAirport", + "callsign": "IREB", + "beacon_type": 14, + "hertz": 109700000, + "channel": null + }, + "airfield4_2": { + "name": "ErbilInternationalAirport", + "callsign": "IREA", + "beacon_type": 14, + "hertz": 109200000, + "channel": null + }, + "airfield4_3": { + "name": "ErbilInternationalAirport", + "callsign": "IREB", + "beacon_type": 13, + "hertz": 109700000, + "channel": null + }, + "airfield4_4": { + "name": "ErbilInternationalAirport", + "callsign": "IREA", + "beacon_type": 13, + "hertz": 109200000, + "channel": null + }, + "airfield4_5": { + "name": "ErbilInternationalAirport", + "callsign": "IRER", + "beacon_type": 13, + "hertz": 109300000, + "channel": null + }, + "airfield4_6": { + "name": "ErbilInternationalAirport", + "callsign": "IRER", + "beacon_type": 14, + "hertz": 109300000, + "channel": null + }, + "airfield10_0": { + "name": "KIR", + "callsign": "KIR", + "beacon_type": 3, + "hertz": 111200000, + "channel": 49 + }, + "airfield10_1": { + "name": "KRK", + "callsign": "KRK", + "beacon_type": 4, + "hertz": null, + "channel": 86 + }, + "airfield10_2": { + "name": "ISAD", + "callsign": "ISAD", + "beacon_type": 14, + "hertz": 109100000, + "channel": null + }, + "airfield10_3": { + "name": "ISAD", + "callsign": "ISAD", + "beacon_type": 13, + "hertz": 109100000, + "channel": null + }, + "airfield6_0": { + "name": "QYW", + "callsign": "QYW", + "beacon_type": 4, + "hertz": null, + "channel": 72 + }, + "airfield7_0": { + "name": "", + "callsign": "SUL", + "beacon_type": 13, + "hertz": 111700000, + "channel": null + }, + "airfield7_1": { + "name": "", + "callsign": "NGA", + "beacon_type": 13, + "hertz": 111100000, + "channel": null + }, + "airfield7_2": { + "name": "", + "callsign": "NGA", + "beacon_type": 14, + "hertz": 111100000, + "channel": null + }, + "airfield7_3": { + "name": "", + "callsign": "SUL", + "beacon_type": 14, + "hertz": 111700000, + "channel": null + }, + "airfield7_4": { + "name": "SUL", + "callsign": "SUL", + "beacon_type": 3, + "hertz": 117000000, + "channel": 117 + } +} \ No newline at end of file diff --git a/resources/theaters/iraq/icon.gif b/resources/theaters/iraq/icon.gif new file mode 100644 index 00000000..7c1ce022 Binary files /dev/null and b/resources/theaters/iraq/icon.gif differ diff --git a/resources/theaters/iraq/info.yaml b/resources/theaters/iraq/info.yaml new file mode 100644 index 00000000..b506f4c0 --- /dev/null +++ b/resources/theaters/iraq/info.yaml @@ -0,0 +1,48 @@ +--- +name: Iraq +timezone: +3 +daytime: + dawn: [5, 7] + day: [7, 17] + dusk: [17, 19] + night: [20, 4] +climate: + day_night_temperature_difference: 15.26 + seasons: + winter: + average_pressure: 30.02 + average_temperature: 13.6 + weather: + thunderstorm: 1 + raining: 15 + cloudy: 40 + clear: 40 + spring: + average_pressure: 29.73 + average_temperature: 28.6 + weather: + thunderstorm: 1 + raining: 10 + cloudy: 30 + clear: 20 + summer: + average_pressure: 29.56 + average_temperature: 34.1 + weather: + thunderstorm: 1 + raining: 1 + cloudy: 20 + clear: 40 + fall: + average_pressure: 30.01 + average_temperature: 18.2 + weather: + thunderstorm: 1 + raining: 7 + cloudy: 40 + clear: 30 + turbulence: + high_avg_yearly_turbulence_per_10cm: 11 + low_avg_yearly_turbulence_per_10cm: 2.3 + solar_noon_turbulence_per_10cm: 1.5 + midnight_turbulence_per_10cm: -2.5 \ No newline at end of file diff --git a/resources/theaters/iraq/landmap.p b/resources/theaters/iraq/landmap.p new file mode 100644 index 00000000..d5a122b2 Binary files /dev/null and b/resources/theaters/iraq/landmap.p differ diff --git a/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.cpg b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.cpg new file mode 100644 index 00000000..3ad133c0 --- /dev/null +++ b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.dbf b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.dbf new file mode 100644 index 00000000..c7a342eb Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.dbf differ diff --git a/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.prj b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.prj new file mode 100644 index 00000000..34428ef2 --- /dev/null +++ b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.prj @@ -0,0 +1 @@ +PROJCS["WGS_1984_UTM_Zone_38N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",45.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.shp b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.shp new file mode 100644 index 00000000..80561398 Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.shp differ diff --git a/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.shx b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.shx new file mode 100644 index 00000000..750541d6 Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/exclusion/exclusion.shx differ diff --git a/unshipped_data/arcgis_maps/iraq/land/landmap.cpg b/unshipped_data/arcgis_maps/iraq/land/landmap.cpg new file mode 100644 index 00000000..3ad133c0 --- /dev/null +++ b/unshipped_data/arcgis_maps/iraq/land/landmap.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/unshipped_data/arcgis_maps/iraq/land/landmap.dbf b/unshipped_data/arcgis_maps/iraq/land/landmap.dbf new file mode 100644 index 00000000..c7a342eb Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/land/landmap.dbf differ diff --git a/unshipped_data/arcgis_maps/iraq/land/landmap.prj b/unshipped_data/arcgis_maps/iraq/land/landmap.prj new file mode 100644 index 00000000..34428ef2 --- /dev/null +++ b/unshipped_data/arcgis_maps/iraq/land/landmap.prj @@ -0,0 +1 @@ +PROJCS["WGS_1984_UTM_Zone_38N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",45.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/unshipped_data/arcgis_maps/iraq/land/landmap.shp b/unshipped_data/arcgis_maps/iraq/land/landmap.shp new file mode 100644 index 00000000..8245b218 Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/land/landmap.shp differ diff --git a/unshipped_data/arcgis_maps/iraq/land/landmap.shx b/unshipped_data/arcgis_maps/iraq/land/landmap.shx new file mode 100644 index 00000000..7980ec87 Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/land/landmap.shx differ diff --git a/unshipped_data/arcgis_maps/iraq/sea/sea_zones.cpg b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.cpg new file mode 100644 index 00000000..3ad133c0 --- /dev/null +++ b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/unshipped_data/arcgis_maps/iraq/sea/sea_zones.dbf b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.dbf new file mode 100644 index 00000000..185fbada Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.dbf differ diff --git a/unshipped_data/arcgis_maps/iraq/sea/sea_zones.prj b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.prj new file mode 100644 index 00000000..34428ef2 --- /dev/null +++ b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.prj @@ -0,0 +1 @@ +PROJCS["WGS_1984_UTM_Zone_38N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",45.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/unshipped_data/arcgis_maps/iraq/sea/sea_zones.shp b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.shp new file mode 100644 index 00000000..a852f743 Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.shp differ diff --git a/unshipped_data/arcgis_maps/iraq/sea/sea_zones.shx b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.shx new file mode 100644 index 00000000..ba695be9 Binary files /dev/null and b/unshipped_data/arcgis_maps/iraq/sea/sea_zones.shx differ