diff --git a/addons/apl/LWTS_optic.p3d b/addons/apl/LWTS_optic.p3d new file mode 100644 index 0000000000..874bd9051f Binary files /dev/null and b/addons/apl/LWTS_optic.p3d differ diff --git a/addons/apl/data/default.rvmat b/addons/apl/data/default.rvmat new file mode 100644 index 0000000000..f70da1fcf0 --- /dev/null +++ b/addons/apl/data/default.rvmat @@ -0,0 +1,8 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0,0,0,0}; +specularPower=0; +PixelShaderID="Normal"; +VertexShaderID="Basic"; diff --git a/addons/apl/data/optics_bg_blurred_round_ca.paa b/addons/apl/data/optics_bg_blurred_round_ca.paa new file mode 100644 index 0000000000..b449e342c1 Binary files /dev/null and b/addons/apl/data/optics_bg_blurred_round_ca.paa differ diff --git a/addons/apl/data/optics_bg_square_ca.paa b/addons/apl/data/optics_bg_square_ca.paa new file mode 100644 index 0000000000..43c9d97b3c Binary files /dev/null and b/addons/apl/data/optics_bg_square_ca.paa differ diff --git a/addons/apl/data/twis_m16_ca.paa b/addons/apl/data/twis_m16_ca.paa new file mode 100644 index 0000000000..784c3b791e Binary files /dev/null and b/addons/apl/data/twis_m16_ca.paa differ diff --git a/addons/mx2a/$PBOPREFIX$ b/addons/mx2a/$PBOPREFIX$ new file mode 100644 index 0000000000..1042853ad7 --- /dev/null +++ b/addons/mx2a/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\mx2a \ No newline at end of file diff --git a/addons/mx2a/CfgVehicles.hpp b/addons/mx2a/CfgVehicles.hpp new file mode 100644 index 0000000000..d58150ff4b --- /dev/null +++ b/addons/mx2a/CfgVehicles.hpp @@ -0,0 +1,20 @@ +class CfgVehicles { + class Item_Base_F; + class ACE_Item_MX2A: Item_Base_F { + author[] = {"Spooner", "tcp"}; + scope = 2; + scopeCurator = 2; + displayName = "$STR_ACE_MX2A_DisplayName"; + vehicleClass = "Items"; + class TransportWeapons { + MACRO_ADDWEAPON(ACE_MX2A,1); + }; + }; + + class Box_NATO_Support_F; + class ACE_Box_Misc: Box_NATO_Support_F { + class TransportWeapons { + MACRO_ADDWEAPON(ACE_MX2A,6); + }; + }; +}; diff --git a/addons/mx2a/CfgWeapons.hpp b/addons/mx2a/CfgWeapons.hpp new file mode 100644 index 0000000000..0a9dadd85a --- /dev/null +++ b/addons/mx2a/CfgWeapons.hpp @@ -0,0 +1,26 @@ + +class CfgWeapons { + class Binocular; + class ACE_MX2A: Binocular { + author = "$STR_ACE_Common_ACETeam"; + displayName = "$STR_ACE_MX2A_DisplayName"; + descriptionShort = "$STR_ACE_MX2A_Description"; + model = PATHTOF(data\ace_mx2a.p3d); + modelOptics = QUOTE(PATHTOEF(apl,LWTS_optic.p3d)); + picture = PATHTOF(UI\w_mx2a_ca.paa); + opticsZoomMax = 0.1; + distanceZoomMax = 120; + opticsZoomMin = 0.05; + distanceZoomMin = 400; + opticsZoomInit = 0.1; + visionMode[] = {"Ti"}; + thermalMode[] = {0,1}; + discretefov[] = {0.33333/1, 0.33333/2}; // 1x/2x -- http://www.drs.com/Products/RSTA/PDF/MX2A.pdf + discreteInitIndex = 0; + discreteDistance[] = {120,400}; + discreteDistanceInitIndex = 1; + class WeaponSlotsInfo { + mass = 20; + }; + }; +}; diff --git a/addons/mx2a/README.md b/addons/mx2a/README.md new file mode 100644 index 0000000000..cbaf9add1b --- /dev/null +++ b/addons/mx2a/README.md @@ -0,0 +1,10 @@ +ace_mx2a +========== + +Adds the MX-2A thermal imaging device. + +## Maintainers + +The people responsible for merging changes to this component or answering potential questions. + +- [Ruthberg] (http://github.com/Ulteq) diff --git a/addons/mx2a/UI/w_mx2a_ca.paa b/addons/mx2a/UI/w_mx2a_ca.paa new file mode 100644 index 0000000000..748a01d5f4 Binary files /dev/null and b/addons/mx2a/UI/w_mx2a_ca.paa differ diff --git a/addons/mx2a/config.cpp b/addons/mx2a/config.cpp new file mode 100644 index 0000000000..85d52ca6b3 --- /dev/null +++ b/addons/mx2a/config.cpp @@ -0,0 +1,15 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + units[] = {"ACE_Item_MX2A"}; + weapons[] = {"ACE_MX2A"}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_main"}; + author[] = {"Spooner", "tcp"}; + VERSION_CONFIG; + }; +}; + +#include "CfgVehicles.hpp" +#include "CfgWeapons.hpp" diff --git a/addons/mx2a/data/ace_mx2a.p3d b/addons/mx2a/data/ace_mx2a.p3d new file mode 100644 index 0000000000..f2664de20b Binary files /dev/null and b/addons/mx2a/data/ace_mx2a.p3d differ diff --git a/addons/mx2a/data/mx2A_ti_ca.paa b/addons/mx2a/data/mx2A_ti_ca.paa new file mode 100644 index 0000000000..1315a56aa8 Binary files /dev/null and b/addons/mx2a/data/mx2A_ti_ca.paa differ diff --git a/addons/mx2a/data/mx2a.rvmat b/addons/mx2a/data/mx2a.rvmat new file mode 100644 index 0000000000..d614433dce --- /dev/null +++ b/addons/mx2a/data/mx2a.rvmat @@ -0,0 +1,81 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.1,0.1,0.1,1}; +specularPower=30; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 { + texture="z\ace\addons\mx2a\data\mx2a_nohq.paa"; + uvSource="tex"; + class uvTransform { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 { + texture="a3\weapons_f\data\detailmaps\metal_detail_dt.paa"; + uvSource="tex"; + class uvTransform { + aside[]={2,-1.568,0}; + up[]={1.568,4,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 { + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform { + aside[]={0.98480773,-0.17364819,0}; + up[]={0.17364819,0.98480773,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 { + texture="z\ace\addons\mx2a\data\mx2a_as.paa"; + uvSource="tex"; + class uvTransform { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 { + texture="z\ace\addons\mx2a\data\mx2a_smdi.paa"; + uvSource="tex"; + class uvTransform { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 { + texture="#(ai,16,2,2)fresnel(1.5,1.22)"; + uvSource="tex"; + class uvTransform { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage7 { + texture="a3\data_f\env_land_co.paa"; + uvSource="tex"; + class uvTransform { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class StageTI { + texture="z\ace\addons\mx2a\data\mx2a_ti_ca.paa"; +}; \ No newline at end of file diff --git a/addons/mx2a/data/mx2a_as.paa b/addons/mx2a/data/mx2a_as.paa new file mode 100644 index 0000000000..4bf1b49b8a Binary files /dev/null and b/addons/mx2a/data/mx2a_as.paa differ diff --git a/addons/mx2a/data/mx2a_co.paa b/addons/mx2a/data/mx2a_co.paa new file mode 100644 index 0000000000..28db7f08b2 Binary files /dev/null and b/addons/mx2a/data/mx2a_co.paa differ diff --git a/addons/mx2a/data/mx2a_nohq.paa b/addons/mx2a/data/mx2a_nohq.paa new file mode 100644 index 0000000000..adff9a6fb0 Binary files /dev/null and b/addons/mx2a/data/mx2a_nohq.paa differ diff --git a/addons/mx2a/data/mx2a_smdi.paa b/addons/mx2a/data/mx2a_smdi.paa new file mode 100644 index 0000000000..9eab8a9cb4 Binary files /dev/null and b/addons/mx2a/data/mx2a_smdi.paa differ diff --git a/addons/mx2a/script_component.hpp b/addons/mx2a/script_component.hpp new file mode 100644 index 0000000000..aabb74660a --- /dev/null +++ b/addons/mx2a/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT mx2a +#include "\z\ace\addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_MX2A + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_MX2A + #define DEBUG_SETTINGS DEBUG_SETTINGS_MX2A +#endif + +#include "\z\ace\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/mx2a/stringtable.xml b/addons/mx2a/stringtable.xml new file mode 100644 index 0000000000..cc881fe20d --- /dev/null +++ b/addons/mx2a/stringtable.xml @@ -0,0 +1,27 @@ + + + + + MX-2A + MX-2A + MX-2A + MX-2A + MX-2A + MX-2A + MX-2A + MX-2A + MX-2A + + + Thermal Scope + Thermal Scope + Thermal Scope + Termální dalekohled + Термальный прицел + Thermal Scope + Termowizor + Thermal Scope + Thermal Scope + + +