diff --git a/addons/flashlights/CfgWeapons.hpp b/addons/flashlights/CfgWeapons.hpp index b10a052570..64c833cf1d 100644 --- a/addons/flashlights/CfgWeapons.hpp +++ b/addons/flashlights/CfgWeapons.hpp @@ -7,8 +7,8 @@ class CfgWeapons { author = ECSTRING(common,ACETeam); displayName = CSTRING(MX991_DisplayName); descriptionShort = CSTRING(MX991_Description); - model = QPATHTOF(data\MX_991.p3d); - picture = QPATHTOF(UI\mx991_ca.paa); + model = QPATHTOF(data\mx_991.p3d); + picture = QPATHTOF(UI\mx_991_ca.paa); scope = 2; class ItemInfo: CBA_MiscItem_ItemInfo { mass = 1; diff --git a/addons/flashlights/UI/mx991_ca.paa b/addons/flashlights/UI/mx_991_ca.paa similarity index 100% rename from addons/flashlights/UI/mx991_ca.paa rename to addons/flashlights/UI/mx_991_ca.paa diff --git a/addons/flashlights/data/maglite_300l.p3d b/addons/flashlights/data/maglite_300l.p3d new file mode 100644 index 0000000000..aed75d8adf Binary files /dev/null and b/addons/flashlights/data/maglite_300l.p3d differ diff --git a/addons/flashlights/data/maglite_300l.rvmat b/addons/flashlights/data/maglite_300l.rvmat new file mode 100644 index 0000000000..0fe99e3ddf --- /dev/null +++ b/addons/flashlights/data/maglite_300l.rvmat @@ -0,0 +1,68 @@ +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/mx_991.rvmat b/addons/flashlights/data/mx_991.rvmat index 0268d4903c..040b3ea8c6 100644 --- a/addons/flashlights/data/mx_991.rvmat +++ b/addons/flashlights/data/mx_991.rvmat @@ -8,7 +8,7 @@ PixelShaderID="Super"; VertexShaderID="Super"; class Stage1 { - texture="z\ace\addons\flashlights\data\MX_991_nohq.paa"; + texture="z\ace\addons\flashlights\data\textures\mx_991_nohq.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; diff --git a/addons/flashlights/data/mx_991_co.paa b/addons/flashlights/data/textures/mx_991_co.paa similarity index 100% rename from addons/flashlights/data/mx_991_co.paa rename to addons/flashlights/data/textures/mx_991_co.paa diff --git a/addons/flashlights/data/MX_991_nohq.paa b/addons/flashlights/data/textures/mx_991_nohq.paa similarity index 100% rename from addons/flashlights/data/MX_991_nohq.paa rename to addons/flashlights/data/textures/mx_991_nohq.paa