diff --git a/addons/flashlights/CfgWeapons.hpp b/addons/flashlights/CfgWeapons.hpp
index 64c833cf1d..70853a0046 100644
--- a/addons/flashlights/CfgWeapons.hpp
+++ b/addons/flashlights/CfgWeapons.hpp
@@ -1,5 +1,49 @@
class CfgWeapons {
+ class Pistol_Base_F;
+ class ACE_Flashlight_Maglite_ML300L: Pistol_Base_F {
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(Maglite_ML300L_DisplayName);
+ descriptionShort = CSTRING(Maglite_ML300L_Description);
+ model = QPATHTOF(data\maglite_ml300l.p3d);
+ picture = QPATHTOF(UI\maglite_ml300l_ca.paa);
+ scope = 2;
+
+ magazines[] = {};
+ recoil = "";
+ recoilProne = "";
+ distanceZoomMin = 50;
+ distanceZoomMax = 50;
+ autoFire = 0;
+
+ class FlashLight
+ {
+ color[] = {180,180,190};
+ ambient[] = {0.9,0.81,0.7};
+ intensity = 85;
+ size = 1;
+ innerAngle = 5;
+ outerAngle = 60;
+ coneFadeCoef = 8;
+ position = "flash dir";
+ direction = "flash";
+ useFlare = 1;
+ flareSize = 1.4;
+ flareMaxDistance = 100;
+ dayLight = 1;
+ class Attenuation {
+ start = 0;
+ constant = 0.7;
+ linear = 0.5;
+ quadratic = 0.6;
+ hardLimitStart = 45;
+ hardLimitEnd = 60;
+ };
+ scale[] = {0};
+ };
+ };
+
+
class ACE_ItemCore;
class CBA_MiscItem_ItemInfo;
diff --git a/addons/flashlights/UI/maglite_ml300l_ca.paa b/addons/flashlights/UI/maglite_ml300l_ca.paa
new file mode 100644
index 0000000000..4a0440724f
Binary files /dev/null and b/addons/flashlights/UI/maglite_ml300l_ca.paa differ
diff --git a/addons/flashlights/data/maglite_300l.rvmat b/addons/flashlights/data/maglite_300l.rvmat
deleted file mode 100644
index 0fe99e3ddf..0000000000
--- a/addons/flashlights/data/maglite_300l.rvmat
+++ /dev/null
@@ -1,68 +0,0 @@
-ambient[] = {1.0,1.0,1.0,1};
-diffuse[] = {1.0,1.0,1.0,1};
-forcedDiffuse[] = {0,0,0,1};
-emmisive[] = {0,0,0,1};
-specular[] = {0.15599996,0.15599996,0.15599996,1};
-specularPower = 25;
-PixelShaderID = "Super";
-VertexShaderID = "Super";
-class Stage1 {
- texture = "z\sobassets\addons\training\data\textures\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,1 };
- pos[] = { 0,0,1 };
- };
-};
-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 = "z\sobassets\addons\training\data\textures\maglite_as.paa";
- uvSource = "tex";
- class uvTransform {
- aside[] = { 1,0,0 };
- up[] = { 0,1,0 };
- dir[] = { 0,0,1 };
- pos[] = { 0,0,1 };
- };
-};
-class Stage5 {
- texture = "z\sobassets\addons\training\data\textures\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 };
- };
-};
diff --git a/addons/flashlights/data/maglite_300l.p3d b/addons/flashlights/data/maglite_ml300l.p3d
similarity index 59%
rename from addons/flashlights/data/maglite_300l.p3d
rename to addons/flashlights/data/maglite_ml300l.p3d
index aed75d8adf..8d46eea3be 100644
Binary files a/addons/flashlights/data/maglite_300l.p3d and b/addons/flashlights/data/maglite_ml300l.p3d differ
diff --git a/addons/flashlights/data/maglite_ml300l.rvmat b/addons/flashlights/data/maglite_ml300l.rvmat
new file mode 100644
index 0000000000..a1750b294a
--- /dev/null
+++ b/addons/flashlights/data/maglite_ml300l.rvmat
@@ -0,0 +1,69 @@
+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\textures\maglite_ml300l_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="z\ace\addons\flashlights\data\textures\maglite_ml300l_as.paa";
+ 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\textures\maglite_ml300l_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};
+ };
+};
diff --git a/addons/flashlights/data/textures/maglite_ml300l_as.paa b/addons/flashlights/data/textures/maglite_ml300l_as.paa
new file mode 100644
index 0000000000..6dc466f969
Binary files /dev/null and b/addons/flashlights/data/textures/maglite_ml300l_as.paa differ
diff --git a/addons/flashlights/data/textures/maglite_ml300l_ca.paa b/addons/flashlights/data/textures/maglite_ml300l_ca.paa
new file mode 100644
index 0000000000..2a2368b6e3
Binary files /dev/null and b/addons/flashlights/data/textures/maglite_ml300l_ca.paa differ
diff --git a/addons/flashlights/data/textures/maglite_ml300l_nohq.paa b/addons/flashlights/data/textures/maglite_ml300l_nohq.paa
new file mode 100644
index 0000000000..4a08ff5925
Binary files /dev/null and b/addons/flashlights/data/textures/maglite_ml300l_nohq.paa differ
diff --git a/addons/flashlights/data/textures/maglite_ml300l_smdi.paa b/addons/flashlights/data/textures/maglite_ml300l_smdi.paa
new file mode 100644
index 0000000000..32cab82188
Binary files /dev/null and b/addons/flashlights/data/textures/maglite_ml300l_smdi.paa differ
diff --git a/addons/flashlights/stringtable.xml b/addons/flashlights/stringtable.xml
index bd87c4e847..ac0ac8cbc3 100644
--- a/addons/flashlights/stringtable.xml
+++ b/addons/flashlights/stringtable.xml
@@ -103,5 +103,13 @@
Цвет подсветки карты
Cor da lanterna no mapa
+
+ Maglite ML300L
+ Maglite ML300L
+
+
+ Powerful LED flashlight.
+ Stark leuchtende LED Taschenlampe.
+