Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into Yardage450

Conflicts:
	addons/apl/data/default.rvmat

AUTHORS.txt

@@ -47,7 +47,7 @@ Codingboy
 Coren <coren4@gmail.com>
 Crusty
 Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
-Dimaslg <dimaslg@telecable.e>
+Dimaslg <dimaslg@telecable.es>
 eRazeri
 evromalarkey <evromalarkey@gmail.com>
 Falke75

addons/mx2a/$PBOPREFIX$

@@ -0,0 +1 @@
+z\ace\addons\mx2a

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);
+        };
+    };
+};

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;
+        };
+    };
+};

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)

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_apl"};
+        author[] = {"Spooner", "tcp"};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgVehicles.hpp"
+#include "CfgWeapons.hpp"

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";
+};

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"

addons/mx2a/stringtable.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="ACE">
+    <Package name="MX2A">
+        <Key ID="STR_ACE_MX2A_DisplayName">
+            <English>MX-2A</English>
+        </Key>
+        <Key ID="STR_ACE_MX2A_Description">
+            <English>Thermal imaging device</English>
+            <German>Wärmebildgerät</German>
+        </Key>
+    </Package>
+</Project>