diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp index a3ddef155e..396d80b5c1 100644 --- a/addons/common/CfgVehicles.hpp +++ b/addons/common/CfgVehicles.hpp @@ -147,4 +147,32 @@ class CfgVehicles { scope = 1; maximumLoad = 1E6; }; + + class FlagCarrier_Asym; + class ACE_Flag_Black: FlagCarrier_Asym { + author = CSTRING(ACETeam); + displayName = CSTRING(FlagBlack); + scope = 2; + scopeCurator = 2; + editorPreview = QPATHTOF(data\ace_flag_black_preview.jpg); + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture QUOTE(QPATHTOF(data\ace_flag_black_ca.paa))); + }; + class ACE_Actions { + class ACE_MainActions { + displayName = ECSTRING(interaction,MainAction); + condition = "true"; + position = "[-0.1, -0.35, -2.6]"; + distance = 2; + }; + }; + }; + class ACE_Flag_White: ACE_Flag_Black { + author = CSTRING(ACETeam); + displayName = CSTRING(FlagWhite); + editorPreview = QPATHTOF(data\ace_flag_white_preview.jpg); + class EventHandlers { + init = QUOTE((_this select 0) setFlagTexture QUOTE(QPATHTOF(data\ace_flag_white_ca.paa))); + }; + }; }; diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 72e3f78621..44af1ee7ce 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { class ADDON { name = COMPONENT_NAME; - units[] = {"ACE_Box_Misc", "ACE_bananaItem"}; + units[] = {"ACE_Box_Misc", "ACE_bananaItem", "ACE_Flag_Black", "ACE_Flag_White"}; weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_main","ace_modules"}; diff --git a/addons/common/data/ace_flag_black_ca.paa b/addons/common/data/ace_flag_black_ca.paa new file mode 100644 index 0000000000..54d314bd84 Binary files /dev/null and b/addons/common/data/ace_flag_black_ca.paa differ diff --git a/addons/common/data/ace_flag_black_preview.jpg b/addons/common/data/ace_flag_black_preview.jpg new file mode 100644 index 0000000000..fd997b356a Binary files /dev/null and b/addons/common/data/ace_flag_black_preview.jpg differ diff --git a/addons/common/data/ace_flag_white_ca.paa b/addons/common/data/ace_flag_white_ca.paa new file mode 100644 index 0000000000..5c665922b4 Binary files /dev/null and b/addons/common/data/ace_flag_white_ca.paa differ diff --git a/addons/common/data/ace_flag_white_preview.jpg b/addons/common/data/ace_flag_white_preview.jpg new file mode 100644 index 0000000000..3dba63e190 Binary files /dev/null and b/addons/common/data/ace_flag_white_preview.jpg differ diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index acbf73d2e7..b164112e71 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1179,5 +1179,11 @@ 允许ACE脚本去控制音乐的音量。 ACE スプリントへ音量低下を許可します。 + + Flag (ACE - Black) + + + Flag (ACE - White) +