From 074ea5c719d2671bcecea8c2f3a6bf32bd67dfd5 Mon Sep 17 00:00:00 2001
From: Khopa <clemguip@gmail.com>
Date: Mon, 9 Dec 2019 02:09:50 +0100
Subject: [PATCH] JF-17 Support (Require pydcs own data export)

---
 game/db.py                                |  10 ++++++
 game/factions/pakistan_2015.py            |  38 ++++++++++++++++++++++
 gen/flights/ai_flight_planner_db.py       |   7 ++++
 resources/ui/units/aircrafts/JF-17_24.jpg | Bin 0 -> 1089 bytes
 theater/caucasus.py                       |   1 +
 5 files changed, 56 insertions(+)
 create mode 100644 game/factions/pakistan_2015.py
 create mode 100644 resources/ui/units/aircrafts/JF-17_24.jpg

diff --git a/game/db.py b/game/db.py
index 4ac5539c..f8318923 100644
--- a/game/db.py
+++ b/game/db.py
@@ -22,6 +22,7 @@ from game.factions.israel_2000 import Israel_2000
 from game.factions.italy_1990 import Italy_1990
 from game.factions.netherlands_1990 import Netherlands_1990
 from game.factions.north_korea_2000 import NorthKorea_2000
+from game.factions.pakistan_2015 import Pakistan_2015
 from game.factions.russia_1975 import Russia_1975
 from game.factions.germany_1944 import Germany_1944
 from game.factions.india_2010 import India_2010
@@ -78,6 +79,7 @@ PRICES = {
     MiG_29G: 18,
     MiG_31: 30,
     J_11A: 26,
+    JF_17: 20,
     Su_30: 24,
     SpitfireLFMkIX:3,
     SpitfireLFMkIXCW:3,
@@ -272,6 +274,7 @@ UNIT_BY_TASK = {
         MiG_29G,
         Su_30,
         J_11A,
+        JF_17,
         F_4E,
         C_101CC,
         Bf_109K_4,
@@ -564,6 +567,7 @@ FACTIONS = {
     "Sweden 1990": Sweden_1990,
     "Ukraine 2010": Ukraine_2010,
     "India 2010": India_2010,
+    "Pakistan 2015": Pakistan_2015,
     "Israel 2000": Israel_2000,
     "Turkey 2005": Turkey_2005,
     "United Arab Emirates 2005": UAE_2005,
@@ -609,6 +613,12 @@ PLANE_PAYLOAD_OVERRIDES = {
         SEAD: "AGM-88*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3"
     },
 
+    JF_17: {
+        CAS: "PL-5Ex2, 2*SD-10x2, 800L Tank",
+        CAP: "PL-5Ex2, 2*GBU-12x2, BRM1x2, WMD7",
+        SEAD: "PL-5Ex2, LD-10x2, 1100L Tankx2, WMD7"
+    },
+
     F_14B: {
         CAP: "AIM-54A-MK47*4, AIM-7M*2, AIM-9M*2, XT*2",
         Escort: "AIM-54A-MK47*4, AIM-7M*2, AIM-9M*2, XT*2",
diff --git a/game/factions/pakistan_2015.py b/game/factions/pakistan_2015.py
new file mode 100644
index 00000000..5e8fa737
--- /dev/null
+++ b/game/factions/pakistan_2015.py
@@ -0,0 +1,38 @@
+from dcs.vehicles import *
+from dcs.ships import *
+from dcs.planes import *
+from dcs.helicopters import *
+
+Pakistan_2015 = {
+    "country": "Pakistan",
+    "side": "blue",
+    "units": [
+        JF_17,
+        F_16C_50,
+        MiG_21Bis, # Standing as J-7
+        MiG_19P, # Standing as J-6
+        IL_78M,
+        E_3A,
+
+        UH_1H,
+        AH_1W,
+
+        Armor.MBT_T_80U,
+        Armor.MBT_T_55, # Standing as Al-Zarrar / Type 59 MBT
+        Armor.ZBD_04A,
+        Armor.APC_BTR_80,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_SA_2_LN_SM_90,          # Standing as HQ-2
+        AirDefence.SAM_SA_10_S_300PS_LN_5P85C, # Standing as HQ-9
+
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.AAA_ZU_23_Insurgent_on_Ural_375,
+        AirDefence.AAA_ZU_23_Closed
+    ]
+}
diff --git a/gen/flights/ai_flight_planner_db.py b/gen/flights/ai_flight_planner_db.py
index 4ea54af4..1795cd0d 100644
--- a/gen/flights/ai_flight_planner_db.py
+++ b/gen/flights/ai_flight_planner_db.py
@@ -28,6 +28,7 @@ CAP_CAPABLE = [
 
     Su_27,
     J_11A,
+    JF_17,
     Su_30,
     Su_33,
 
@@ -72,6 +73,8 @@ CAS_CAPABLE = [
     Su_25TM,
     Su_34,
 
+    JF_17,
+
     M_2000C,
 
     A_10A,
@@ -118,6 +121,7 @@ SEAD_CAPABLE = [
     FA_18C_hornet,
     F_16C_50,
     AV8BNA,
+    JF_17,
 
     Su_24M,
     Su_25T,
@@ -142,6 +146,8 @@ STRIKE_CAPABLE = [
     Su_25T,
     Su_34,
 
+    JF_17,
+
     M_2000C,
 
     A_10A,
@@ -175,4 +181,5 @@ ANTISHIP_CAPABLE = [
     Su_24M,
     F_A_18C,
     AV8BNA,
+    JF_17
 ]
\ No newline at end of file
diff --git a/resources/ui/units/aircrafts/JF-17_24.jpg b/resources/ui/units/aircrafts/JF-17_24.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e336ddd58a9bde0148c54770c3b8616953c602bb
GIT binary patch
literal 1089
zcmex=<NpH&0WUXCHwH#V1_nkTWcYuZ!I^=Bjg6g+m4ls~os*M;i${c)hnt&6Qb?Fz
zL{>^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<<Uft5x!pKI?*u)5A2qPyaCl5D|1TU|I
zk)n*E5y{~H0R}-11__2}W=16jCP7AKLB{__803NOWMu>c1}I=;VrF4wW9Q)H;sz?%
zD!{<R$jr>d!pzFb!U9xX3zTPI5o8roG<0MW4oqZMDikqloVbuf*=gfJ(V&YTRE(2~
znmD<{#3dx9RMpfqG__1j&CD$<t(;w4-P}Dqy@EqR!@?sXqmoln)6z3Cvx-Yf%gQS%
ztD0L{+uA!iyCzMZGIiSY88c@sTD)ZGvgIpQuG+MD%hqk%ckJAC=<t!F$Bv&kdFs;T
zD_5^wzj5={!$*&wJbm{3#miS8KYjl4_1pI!KYxMz#mK-6@fMJTcnr;7f<S*Uv9K_+
zu!H=?$W#u*%z`YeiiT`Lj)Clng~CckjT|CQ6Blkg$f;}`^g%SK=pvVxipfLOk07ss
zeMX$en#l4Q++zrT-D2QjW&}navmk>#!}WjXzO9RS-J~1(_IWQ0r?O%xdl}=g>>XE4
zvvsx3+&Qbm1&pUn9f#!|{Hs1a&e+v@WV+es;~Jkib=DbhKHvF#ZFzOrIgU&2wX(B(
zrA`X7yGe!xPjI#VZGCI!U#@4LJtk*XJl&QTr>yY$6<>wv<@!V3OV_cqUfgS8f8yfX
zh`o*c-^#bj-~4yg{Ex~n_wP&WKM4Lanebz}@6?+fg-vA>*p;uZ7pYE@JJ9{x=2y^v
zhV=PfTmSA|_I&j}=RcXfk8Dk4^rx2;|MBEZuoraSmiUIle)IXI`rqoeX1cD-{B-WZ
zn$yqpKg?U+^YL|9&FT90T(+ylH^!cc-%uU&xB1q#niKYWG(m*Mw@v&hyXS=dihMO;
zP56b*iP1$(h0T%gm)&w=*tBh1fB(-6$^C0Z!rsk^+ol*Y>7v1w?G-oA9x3aczl*8B
zerm+0g|EL=$NYL@|JYSz?-Z|Zo1~K2Exbd2Isa$4z9e*-&6{Zq{!5tuWGw1W6|DB;
zIQDV6d{#@<zh|qx6F%>#RPQl(H}UPikU;;NF1AZry{%{TC0$wCFMn5U>CCM&b5mMP
z%fer5vP$WjbJ11ZOZnR-u@kQYEX<{D`OUp@oB#QoYsbHJeqGeHl%=C6=l@LrO6$Ia

literal 0
HcmV?d00001

diff --git a/theater/caucasus.py b/theater/caucasus.py
index 16f6e200..c285c5fc 100644
--- a/theater/caucasus.py
+++ b/theater/caucasus.py
@@ -13,6 +13,7 @@ class CaucasusTheater(ConflictTheater):
     overview_image = "caumap.gif"
     reference_points = {(-317948.32727306, 635639.37385346): (278.5*4, 319*4),
                         (-355692.3067714, 617269.96285781): (263*4, 352*4), }
+
     landmap = load_landmap("resources\\caulandmap.p")
     daytime_map = {
         "dawn": (6, 9),