diff --git a/.vscode/launch.json b/.vscode/launch.json index fde0564f..fe3618fa 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,6 +4,7 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ + { "name": "Python: Main", "type": "python", @@ -15,6 +16,17 @@ }, "preLaunchTask": "Prepare Environment" }, + { + "name": "Python: build ground objects templates", + "type": "python", + "request": "launch", + "program": "resources\\tools\\generate_groundobject_templates.py", + "console": "integratedTerminal", + "env": { + "PYTHONPATH": ".;./pydcs" + }, + "preLaunchTask": "Prepare Environment" + }, { "name": "Python: Make Release", "type": "python", diff --git a/game/data/building_data.py b/game/data/building_data.py index bd6ab666..3c837f7c 100644 --- a/game/data/building_data.py +++ b/game/data/building_data.py @@ -1,7 +1,7 @@ import inspect import dcs -DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick', 'aa'] +DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick', 'aa', 'iads-controlcenter', 'iads-ewr', 'iads-commnode', 'iads-power'] WW2_GERMANY_BUILDINGS = ['fuel', 'factory', 'ww2bunker', 'ww2bunker', 'ww2bunker', 'allycamp', 'allycamp', 'aa'] WW2_ALLIES_BUILDINGS = ['fuel', 'factory', 'allycamp', 'allycamp', 'allycamp', 'allycamp', 'allycamp', 'aa'] diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index fcf8ef32..590df229 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -109,6 +109,10 @@ def load_icons(): ICONS["ship"] = QPixmap("./resources/ui/ground_assets/ship.png") ICONS["ship_blue"] = QPixmap("./resources/ui/ground_assets/ship_blue.png") + ICONS["iads-controlcenter"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/iads-controlcenter.png") + ICONS["iads-commnode"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/iads-commnode.png") + ICONS["iads-ewr"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/iads-ewr.png") + ICONS["iads-power"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/iads-power.png") ICONS["Generator"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/generator.png") ICONS["Missile"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/missile.png") ICONS["Cheat"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/cheat.png") diff --git a/resources/groundobject_templates.p b/resources/groundobject_templates.p index eb39274b..b62793ed 100644 Binary files a/resources/groundobject_templates.p and b/resources/groundobject_templates.p differ diff --git a/resources/tools/groundobject_templates.miz b/resources/tools/groundobject_templates.miz index b4fe1437..aae8ac8b 100644 Binary files a/resources/tools/groundobject_templates.miz and b/resources/tools/groundobject_templates.miz differ diff --git a/resources/ui/misc/light/iads-commnode.png b/resources/ui/misc/light/iads-commnode.png new file mode 100644 index 00000000..b60a4c23 Binary files /dev/null and b/resources/ui/misc/light/iads-commnode.png differ diff --git a/resources/ui/misc/light/iads-controlcenter.png b/resources/ui/misc/light/iads-controlcenter.png new file mode 100644 index 00000000..b5415b52 Binary files /dev/null and b/resources/ui/misc/light/iads-controlcenter.png differ diff --git a/resources/ui/misc/light/iads-ewr.png b/resources/ui/misc/light/iads-ewr.png new file mode 100644 index 00000000..5781af3f Binary files /dev/null and b/resources/ui/misc/light/iads-ewr.png differ diff --git a/resources/ui/misc/light/iads-power.png b/resources/ui/misc/light/iads-power.png new file mode 100644 index 00000000..14d239a1 Binary files /dev/null and b/resources/ui/misc/light/iads-power.png differ