diff --git a/databases/units/aircraftdatabase.json b/databases/units/aircraftdatabase.json index 1754cd37..0e3975f4 100644 --- a/databases/units/aircraftdatabase.json +++ b/databases/units/aircraftdatabase.json @@ -2793,6 +2793,48 @@ "canTargetPoint": false, "canRearm": false }, + "KJ-2000": { + "name": "KJ-2000", + "coalition": "red", + "label": "KJ-2000", + "era": "Late Cold War", + "shortLabel": "KJ2k", + "loadouts": [ + { + "items": [], + "enabled": true, + "code": "", + "name": "Empty loadout", + "roles": [ + "No task", + "AWACS" + ] + } + ], + "filename": "a-50.png", + "enabled": true, + "liveries": { + "china air force kj-2000 (parade 93)": { + "name": "china air force kj-2000 (parade 93)", + "countries": [ + "CHN" + ] + }, + "china air force kj-2000": { + "name": "china air force kj-2000", + "countries": [ + "CHN" + ] + } + }, + "type": "Aircraft", + "description": "4 jet engine, swept wing, 15 crew. NATO reporting name: Mainring", + "abilities": "AEW", + "acquisitionRange": "", + "engagementRange": "", + "canTargetPoint": false, + "canRearm": false + }, "AJS37": { "name": "AJS37", "coalition": "blue", @@ -17730,7 +17772,8 @@ "acquisitionRange": "", "engagementRange": "", "canTargetPoint": false, - "canRearm": false + "canRearm": false, + "cost": null }, "KC135MPRS": { "name": "KC135MPRS", @@ -32958,13 +33001,32 @@ }, "KC130": { "name": "KC130", - "coalition": "", - "era": "", - "label": "KC130", - "shortLabel": "130", - "type": "KC130", - "enabled": false, - "liveries": {} + "coalition": "blue", + "label": "KC-130", + "era": "Early Cold War", + "shortLabel": "K130", + "loadouts": [ + { + "items": [], + "enabled": true, + "code": "", + "name": "Empty loadout", + "roles": [ + "No task", + "Tanker" + ] + } + ], + "filename": "c-130.png", + "enabled": true, + "liveries": {}, + "type": "Aircraft", + "description": "4 turboprop, stright wing, 3 crew. Tanker/transport aircraft. Hercules", + "abilities": "Tanker, Drogue AAR", + "acquisitionRange": "", + "engagementRange": "", + "canTargetPoint": false, + "canRearm": false }, "C-101EB": { "name": "C-101EB", @@ -32976,16 +33038,6 @@ "enabled": false, "liveries": {} }, - "KJ-2000": { - "name": "KJ-2000", - "coalition": "", - "era": "", - "label": "KJ-2000", - "shortLabel": "KJ-2000", - "type": "KJ_2000", - "enabled": false, - "liveries": {} - }, "WingLoong-I": { "name": "WingLoong-I", "coalition": "", diff --git a/databases/units/default/aircraftdatabase.json b/databases/units/default/aircraftdatabase.json index 1754cd37..9e58a66b 100644 --- a/databases/units/default/aircraftdatabase.json +++ b/databases/units/default/aircraftdatabase.json @@ -2793,6 +2793,48 @@ "canTargetPoint": false, "canRearm": false }, + "KJ-2000": { + "name": "KJ-2000", + "coalition": "red", + "label": "KJ-2000", + "era": "Late Cold War", + "shortLabel": "KJ2k", + "loadouts": [ + { + "items": [], + "enabled": true, + "code": "", + "name": "Empty loadout", + "roles": [ + "No task", + "AWACS" + ] + } + ], + "filename": "a-50.png", + "enabled": true, + "liveries": { + "china air force kj-2000 (parade 93)": { + "name": "china air force kj-2000 (parade 93)", + "countries": [ + "CHN" + ] + }, + "china air force kj-2000": { + "name": "china air force kj-2000", + "countries": [ + "CHN" + ] + } + }, + "type": "Aircraft", + "description": "4 jet engine, swept wing, 15 crew. NATO reporting name: Mainring", + "abilities": "AEW", + "acquisitionRange": "", + "engagementRange": "", + "canTargetPoint": false, + "canRearm": false + }, "AJS37": { "name": "AJS37", "coalition": "blue", @@ -17730,12 +17772,13 @@ "acquisitionRange": "", "engagementRange": "", "canTargetPoint": false, - "canRearm": false + "canRearm": false, + "cost": null }, "KC135MPRS": { "name": "KC135MPRS", "coalition": "blue", - "label": "KC-135 MPRS Stratotanker", + "label": "KC-135 MPRS StratotankerXXXXXXXXXX", "era": "Early Cold War", "shortLabel": "135M", "loadouts": [ @@ -32958,13 +33001,32 @@ }, "KC130": { "name": "KC130", - "coalition": "", - "era": "", - "label": "KC130", - "shortLabel": "130", - "type": "KC130", - "enabled": false, - "liveries": {} + "coalition": "blue", + "label": "KC-130", + "era": "Early Cold War", + "shortLabel": "K130", + "loadouts": [ + { + "items": [], + "enabled": true, + "code": "", + "name": "Empty loadout", + "roles": [ + "No task", + "Tanker" + ] + } + ], + "filename": "c-130.png", + "enabled": true, + "liveries": {}, + "type": "Aircraft", + "description": "4 turboprop, stright wing, 3 crew. Tanker/transport aircraft. Hercules", + "abilities": "Tanker, Drogue AAR", + "acquisitionRange": "", + "engagementRange": "", + "canTargetPoint": false, + "canRearm": false }, "C-101EB": { "name": "C-101EB", @@ -32976,16 +33038,6 @@ "enabled": false, "liveries": {} }, - "KJ-2000": { - "name": "KJ-2000", - "coalition": "", - "era": "", - "label": "KJ-2000", - "shortLabel": "KJ-2000", - "type": "KJ_2000", - "enabled": false, - "liveries": {} - }, "WingLoong-I": { "name": "WingLoong-I", "coalition": "", diff --git a/databases/units/default/groundunitdatabase.json b/databases/units/default/groundunitdatabase.json index 7082996f..5d735eab 100644 --- a/databases/units/default/groundunitdatabase.json +++ b/databases/units/default/groundunitdatabase.json @@ -9061,10 +9061,10 @@ "type": "AAA", "enabled": true, "liveries": {}, - "aimTime": 18, - "shotsToFire": 5, - "acquisitionRange": 8000, - "engagementRange": 1000, + "aimTime": 25, + "shotsToFire": 2, + "acquisitionRange": 15000, + "engagementRange": 12000, "description": "The flak 88. Fixed anti aircraft gun famously also used as an anti-tank gun. 88mm flak gun.", "abilities": "AA", "canTargetPoint": true, @@ -9074,11 +9074,11 @@ "cost": 40000, "markerFile": "groundunit-aaa", "canAAA": true, - "shotsBaseInterval": 5, + "shotsBaseInterval": 10, "shotsBaseScatter": 5, - "aimMethodRange": 100, - "targetingRange": 7000, - "alertnessTimeConstant": 5 + "aimMethodRange": 15000, + "targetingRange": 200, + "alertnessTimeConstant": 15 }, "Pz_IV_H": { "name": "Pz_IV_H", diff --git a/databases/units/groundunitdatabase.json b/databases/units/groundunitdatabase.json index 7082996f..5d735eab 100644 --- a/databases/units/groundunitdatabase.json +++ b/databases/units/groundunitdatabase.json @@ -9061,10 +9061,10 @@ "type": "AAA", "enabled": true, "liveries": {}, - "aimTime": 18, - "shotsToFire": 5, - "acquisitionRange": 8000, - "engagementRange": 1000, + "aimTime": 25, + "shotsToFire": 2, + "acquisitionRange": 15000, + "engagementRange": 12000, "description": "The flak 88. Fixed anti aircraft gun famously also used as an anti-tank gun. 88mm flak gun.", "abilities": "AA", "canTargetPoint": true, @@ -9074,11 +9074,11 @@ "cost": 40000, "markerFile": "groundunit-aaa", "canAAA": true, - "shotsBaseInterval": 5, + "shotsBaseInterval": 10, "shotsBaseScatter": 5, - "aimMethodRange": 100, - "targetingRange": 7000, - "alertnessTimeConstant": 5 + "aimMethodRange": 15000, + "targetingRange": 200, + "alertnessTimeConstant": 15 }, "Pz_IV_H": { "name": "Pz_IV_H", diff --git a/scripts/lua/backend/unitPayloads.lua b/scripts/lua/backend/unitPayloads.lua index 26b2c4bc..063b5944 100644 --- a/scripts/lua/backend/unitPayloads.lua +++ b/scripts/lua/backend/unitPayloads.lua @@ -10901,6 +10901,7 @@ Olympus.unitPayloads = { } }, ["A-50"] = {}, + ["KJ-2000"] = {}, ["AH-1W"] = { ["14xHYDRA-70 WP"] = { [2] = {["CLSID"] = "M260_HYDRA_WP"}, @@ -12769,6 +12770,7 @@ Olympus.unitPayloads = { }, ["KC-10A"] = {}, ["KC-135"] = {}, + ["KC130"] = {}, ["Mi-24V"] = { ["2xFAB-500"] = { [3] = {["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}"}, diff --git a/scripts/python/.gitignore b/scripts/python/.gitignore new file mode 100644 index 00000000..b694934f --- /dev/null +++ b/scripts/python/.gitignore @@ -0,0 +1 @@ +.venv \ No newline at end of file diff --git a/scripts/python/addMissingUnits.py b/scripts/python/addMissingUnits.py index f4f5f794..f9eb5a34 100644 --- a/scripts/python/addMissingUnits.py +++ b/scripts/python/addMissingUnits.py @@ -6,8 +6,6 @@ from slpp import slpp as lua SEARCH_FOLDER = "D:\\Eagle Dynamics\\DCS World OpenBeta" -sys.path.append("..\\..\\..\\dcs-master\\dcs-master") - from dcs.vehicles import * from dcs.ships import * from dcs.planes import *