Git fix #3.

addons/flashlights/$PBOPREFIX$

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

addons/flashlights/CfgEventHandlers.hpp

@@ -0,0 +1,5 @@
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient) );
+    };
+};

addons/flashlights/CfgSounds.hpp

@@ -0,0 +1,7 @@
+class CfgSounds {
+    class ACE_flashlights_flashlightClick {
+        name = "ACE_flashlights_flashlightClick";
+        sound[] = {"\a3\sounds_f\weapons\Other\dry4.wss", 0.2, 2};
+        titles[] = {};
+    };
+};

addons/flashlights/CfgVehicles.hpp

@@ -0,0 +1,89 @@
+class CfgVehicles {
+    class Man;
+    class CAManBase: Man {
+        class ACE_SelfActions {
+            //todo: add flashlight attach actions
+        };
+    };
+
+    class Item_Base_F;
+
+    class ACE_Flashlight_MX991Item: Item_Base_F {
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(MX991_DisplayName);
+        author = ECSTRING(common,ACETeam);
+        vehicleClass = "WeaponAccessories";
+        class TransportItems {
+            class ACE_Flashlight_MX991 {
+                name = "ACE_Flashlight_MX991";
+                count = 1;
+            };
+        };
+    };
+
+    class ACE_Flashlight_KSF1Item: Item_Base_F {
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(KSF1_DisplayName);
+        author = ECSTRING(common,ACETeam);
+        vehicleClass = "WeaponAccessories";
+        class TransportItems {
+            class ACE_Flashlight_KSF1 {
+                name = "ACE_Flashlight_KSF1";
+                count = 1;
+            };
+        };
+    };
+
+    class ACE_Flashlight_XL50Item: Item_Base_F {
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(XL50_DisplayName);
+        author = ECSTRING(common,ACETeam);
+        vehicleClass = "WeaponAccessories";
+        class TransportItems {
+            class ACE_Flashlight_XL50 {
+                name = "ACE_Flashlight_XL50";
+                count = 1;
+            };
+        };
+    };
+
+    class NATO_Box_Base;
+    class EAST_Box_Base;
+    class IND_Box_Base;
+    class FIA_Box_Base_F;
+
+    class Box_NATO_Support_F: NATO_Box_Base {
+        class TransportItems {
+            MACRO_ADDITEM(ACE_Flashlight_MX991,12);
+        };
+    };
+
+    class Box_East_Support_F: EAST_Box_Base {
+        class TransportItems {
+            MACRO_ADDITEM(ACE_Flashlight_KSF1,12);
+        };
+    };
+
+    class Box_IND_Support_F: IND_Box_Base {
+        class TransportItems {
+            MACRO_ADDITEM(ACE_Flashlight_XL50,12);
+        };
+    };
+
+    class Box_FIA_Support_F: FIA_Box_Base_F {
+        class TransportItems {
+            MACRO_ADDITEM(ACE_Flashlight_MX991,12);
+        };
+    };
+
+    class ACE_Box_Misc: Box_NATO_Support_F {
+        class TransportItems {
+            MACRO_ADDITEM(ACE_Flashlight_MX991,12);
+            MACRO_ADDITEM(ACE_Flashlight_KSF1,12);
+            MACRO_ADDITEM(ACE_Flashlight_XL50,12);
+        };
+    };
+};

addons/flashlights/CfgWeapons.hpp

@@ -0,0 +1,61 @@
+class CfgWeapons {
+
+    class ItemCore;
+    class ACE_ItemCore;
+    class InventoryItem_Base_F;
+    class InventoryFlashlightItem_Base_F;
+
+    class acc_flashlight: ItemCore {
+        class ItemInfo: InventoryFlashlightItem_Base_F {
+            class Flashlight {
+                ACE_Flashlight_Colour = "white";
+                ACE_Flashlight_Size = 2.75;
+            };
+        };
+    };
+
+    class ACE_Flashlight_MX991: ACE_ItemCore {
+        displayName = CSTRING(MX991_DisplayName);
+        descriptionShort = CSTRING(MX991_Description);
+        model = QUOTE(PATHTOF(data\MX_991.p3d));
+        picture = PATHTOF(UI\mx991_ca.paa);
+        scope = 2;
+        class ItemInfo: InventoryItem_Base_F {
+            mass = 1;
+            class FlashLight {
+                ACE_Flashlight_Colour = "red";
+                ACE_Flashlight_Size = 1.75;
+            };
+        };
+    };
+
+    class ACE_Flashlight_KSF1: ACE_ItemCore {
+        displayName = CSTRING(KSF1_DisplayName);
+        descriptionShort = CSTRING(KSF1_Description);
+        model = QUOTE(PATHTOF(data\KSF_1.p3d));
+        picture = PATHTOF(UI\ksf1_ca.paa);
+        scope = 2;
+        class ItemInfo: InventoryItem_Base_F {
+            mass = 1;
+            class FlashLight {
+                ACE_Flashlight_Colour = "red";
+                ACE_Flashlight_Size = 1.5;
+            };
+        };
+    };
+
+    class ACE_Flashlight_XL50: ACE_ItemCore {
+        displayName = CSTRING(XL50_DisplayName);
+        descriptionShort = CSTRING(XL50_Description);
+        model = QUOTE(PATHTOF(data\Maglight.p3d));
+        picture = PATHTOF(UI\xl50_ca.paa);
+        scope = 2;
+        class ItemInfo: InventoryItem_Base_F {
+            mass = 1;
+            class FlashLight {
+                ACE_Flashlight_Colour = "white";
+                ACE_Flashlight_Size = 2.15;
+            };
+        };
+    };
+};

addons/flashlights/README.md

@@ -0,0 +1,11 @@
+ace_flashlights
+=======
+
+Flashlights for use on map and to attach to player.
+
+
+## Maintainers
+
+The people responsible for merging changes to this component or answering potential questions.
+
+- [voiper](https://github.com/voiperr)

addons/flashlights/XEH_postInitClient.sqf

@@ -0,0 +1,8 @@
+#include "script_component.hpp"
+
+// Exit on Headless as well
+if !(hasInterface) exitWith {};
+
+LOG(MSG_INIT);
+
+//todo: make flashlights attachable to players

addons/flashlights/config.cpp

@@ -0,0 +1,18 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        units[] = {};
+        weapons[] = {"ACE_Flashlight_MX991", "ACE_Flashlight_KSF1", "ACE_Flashlight_XL50"};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"ace_interaction"};
+        author[] = {"voiper"};
+        authorUrl = "https://github.com/voiperr/";
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
+#include "CfgVehicles.hpp"
+#include "CfgWeapons.hpp"
+#include "CfgSounds.hpp"

addons/flashlights/data/KSF_1.rvmat

@@ -0,0 +1,79 @@
+ambient[]={1,1,1,1};
+diffuse[]={1,1,1,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.6,0.6,0.6,1}; //amount of glossiness - the higher the number, the higher the glossiness
+specularPower=700; //area of glossiness - the higher the number, the smaller the area
+PixelShaderID="Super";
+VertexShaderID="Super";
+
+class Stage1 {
+	texture="z\ace\addons\flashlights\data\KSF_1_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="#(argb,8,8,3)color(0.5,0.5,0.5,1,dt)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,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[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage4 {
+	texture="#(argb,8,8,3)color(1,1,1,1,as)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,1};
+	};
+};
+class Stage5 {
+	texture="z\ace\addons\flashlights\data\KSF_1_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,64,64,1)fresnel(4.7,1.2)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage7 {
+	texture="a3\data_f\env_land_ca.paa";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};

addons/flashlights/data/MX_991.rvmat

@@ -0,0 +1,79 @@
+ambient[]={1,1,1,1};
+diffuse[]={1,1,1,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.6,0.6,0.6,1}; //amount of glossiness - the higher the number, the higher the glossiness
+specularPower=700; //area of glossiness - the higher the number, the smaller the area
+PixelShaderID="Super";
+VertexShaderID="Super";
+
+class Stage1 {
+	texture="z\ace\addons\flashlights\data\MX_991_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="#(argb,8,8,3)color(0.5,0.5,0.5,1,dt)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,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[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage4 {
+	texture="#(argb,8,8,3)color(1,1,1,1,as)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,1};
+	};
+};
+class Stage5 {
+	texture="#(rgb,1,1,1)color(0.2,0.2,1,1)";
+	uvSource="tex";
+	class uvTransform	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage6 {
+	texture="#(ai,64,64,1)fresnel(4.7,1.2)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage7 {
+	texture="a3\data_f\env_land_ca.paa";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};

addons/flashlights/data/Maglite.rvmat

@@ -0,0 +1,79 @@
+ambient[]={1,1,1,1};
+diffuse[]={1,1,1,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.6,0.6,0.6,1}; //amount of glossiness - the higher the number, the higher the glossiness
+specularPower=700; //area of glossiness - the higher the number, the smaller the area
+PixelShaderID="Super";
+VertexShaderID="Super";
+
+class Stage1 {
+	texture="z\ace\addons\flashlights\data\Maglite_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="#(argb,8,8,3)color(0.5,0.5,0.5,1,dt)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,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[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage4 {
+	texture="#(argb,8,8,3)color(1,1,1,1,as)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,1};
+	};
+};
+class Stage5 {
+	texture="z\ace\addons\flashlights\data\Maglite_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,64,64,1)fresnel(4.7,1.2)";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage7 {
+	texture="a3\data_f\env_land_ca.paa";
+	uvSource="tex";
+	class uvTransform {
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};

addons/flashlights/script_component.hpp

@@ -0,0 +1,12 @@
+#define COMPONENT flashlights
+#include "\z\ace\addons\main\script_mod.hpp"
+
+#ifdef DEBUG_ENABLED_FLASHLIGHTS
+    #define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_SETTINGS_FLASHLIGHTS
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_FLASHLIGHTS
+#endif
+
+#include "\z\ace\addons\main\script_macros.hpp"

addons/flashlights/stringtable.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="ACE">
+    <Package name="Flashlights">
+        <Key ID="STR_ACE_Flashlights_MX991_DisplayName">
+            <English>Fulton MX-991</English>
+            <Polish>Fulton MX-991</Polish>
+        </Key>
+        <Key ID="STR_ACE_Flashlights_MX991_Description">
+            <English>Flashlight with red filter. For use on map.</English>
+            <Polish>Latarka z czerwonym filtrem. Używana do podświetlania mapy.</Polish>
+        </Key>
+        <Key ID="STR_ACE_Flashlights_XL50_DisplayName">
+            <English>Maglite XL50</English>
+            <Polish>Maglite XL50</Polish>
+        </Key>
+        <Key ID="STR_ACE_Flashlights_XL50_Description">
+            <English>White mini flashlight. For use on map.</English>
+            <Polish>Mini latarka. Światło białe. Używana do podświetlania mapy.</Polish>
+        </Key>
+        <Key ID="STR_ACE_Flashlights_KSF1_DisplayName">
+            <English>KSF-1</English>
+            <Polish>KSF-1</Polish>
+        </Key>
+        <Key ID="STR_ACE_Flashlights_KSF1_Description">
+            <English>Flashlight with red filter. For use on map.</English>
+            <Polish>Latarka z czerwonym filtrem. Używana do podświetlania mapy.</Polish>
+        </Key>
+    </Package>
+</Project>