diff --git a/optionals/tracers/CfgAmmo.hpp b/optionals/tracers/CfgAmmo.hpp index a432be3286..998a705143 100644 --- a/optionals/tracers/CfgAmmo.hpp +++ b/optionals/tracers/CfgAmmo.hpp @@ -20,6 +20,7 @@ class CfgAmmo { class B_556x45_Ball_Tracer_Red: B_556x45_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red class B_556x45_Ball_Tracer_Green: B_556x45_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green class B_556x45_Ball_Tracer_Yellow: B_556x45_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + // class B_556x45_Ball_Tracer_White: B_556x45_Ball {model = PATHTOF(ace_TracerWhite2.p3d);}; //New class for testing class B_65x39_Caseless: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red class B_65x39_Caseless_green: B_65x39_Caseless {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green @@ -156,4 +157,4 @@ class CfgAmmo { class Sh_105mm_HEAT_MP_T_Red: Sh_105mm_HEAT_MP {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red class Sh_105mm_HEAT_MP_T_Green: Sh_105mm_HEAT_MP {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green class Sh_105mm_HEAT_MP_T_Yellow: Sh_105mm_HEAT_MP {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow -}; \ No newline at end of file +}; diff --git a/optionals/tracers/ace_TracerWhite2.p3d b/optionals/tracers/ace_TracerWhite2.p3d new file mode 100644 index 0000000000..40b6df46ee Binary files /dev/null and b/optionals/tracers/ace_TracerWhite2.p3d differ diff --git a/optionals/tracers/ace_shell_tracer_white.p3d b/optionals/tracers/ace_shell_tracer_white.p3d new file mode 100644 index 0000000000..8301cf18b1 Binary files /dev/null and b/optionals/tracers/ace_shell_tracer_white.p3d differ diff --git a/optionals/tracers/config.cpp b/optionals/tracers/config.cpp index 8b44cec0d3..200b24cf57 100644 --- a/optionals/tracers/config.cpp +++ b/optionals/tracers/config.cpp @@ -15,3 +15,27 @@ class CfgPatches { }; #include "CfgAmmo.hpp" + +// CfgMagazines and CfgWeapons are included for testing only and may be removed for release version. +// There is also an ammo class B_556x45_Ball_Tracer_White commented out in CfgAmmo +// this should also be uncommented when testing white tracers. +/* +class CfgMagazines { + class 200Rnd_556x45_Box_Tracer_F; + class 200Rnd_556x45_Box_Green_F : 200Rnd_556x45_Box_Tracer_F { + ammo = "B_556x45_Ball_Tracer_Green"; + displayName = "5.56 mm 200Rnd Tracer (Green) Box"; + }; + class 200Rnd_556x45_Box_White_F : 200Rnd_556x45_Box_Tracer_F { + ammo = "B_556x45_Ball_Tracer_White"; + displayName = "5.56 mm 200Rnd Tracer (White) Box"; + }; +}; + +class CfgWeapons { + class LMG_03_base_F; + class LMG_03_F : LMG_03_base_F { + magazines[] = {"200Rnd_556x45_Box_F","200Rnd_556x45_Box_Red_F","200Rnd_556x45_Box_Tracer_F","200Rnd_556x45_Box_Tracer_Red_F","200Rnd_556x45_Box_Green_F","200Rnd_556x45_Box_White_F"}; + }; +}; +*/ diff --git a/optionals/tracers/data/SLX_GreenTracer_Material.rvmat b/optionals/tracers/data/SLX_GreenTracer_Material.rvmat index 37859c254a..f5de615298 100644 --- a/optionals/tracers/data/SLX_GreenTracer_Material.rvmat +++ b/optionals/tracers/data/SLX_GreenTracer_Material.rvmat @@ -1,9 +1,9 @@ -ambient[] = {1, 1, 1, 1}; -diffuse[] = {1, 1, 1, 1}; -forcedDiffuse[] = {0, 0, 0, 0}; -emmisive[] = {100, 500, 100, 1}; -specular[] = {0, 0, 0, 1}; -specularPower = 100; +ambient[] = {0.2, 0.8, 0.1, 1}; +diffuse[] = {0.2, 0.8, 0.1, 1}; +forcedDiffuse[] = {0.2, 0.8, 0.1, 1}; +emmisive[] = {100, 400, 100, 1}; +specular[] = {0, 0, 0, 0}; +specularPower = 0.0; renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"}; PixelShaderID = "Normal"; VertexShaderID = "Basic"; diff --git a/optionals/tracers/data/SLX_RedTracer_Material.rvmat b/optionals/tracers/data/SLX_RedTracer_Material.rvmat index d5ab41788e..7bc0b7c298 100644 --- a/optionals/tracers/data/SLX_RedTracer_Material.rvmat +++ b/optionals/tracers/data/SLX_RedTracer_Material.rvmat @@ -1,9 +1,9 @@ -ambient[] = {1, 1, 1, 0.1}; -diffuse[] = {1, 1, 1, 1}; -forcedDiffuse[] = {0, 0, 0, 0}; +ambient[] = {0.8, 0.1, 0.1, 1}; +diffuse[] = {0.8, 0.1, 0.1, 1}; +forcedDiffuse[] = {0.8, 0.1, 0.1, 1}; emmisive[] = {1000, 100, 10, 1}; -specular[] = {0, 0, 0, 1}; -specularPower = 100; +specular[] = {0, 0, 0, 0}; +specularPower = 0.0; renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"}; PixelShaderID = "Normal"; VertexShaderID = "Basic"; diff --git a/optionals/tracers/data/SLX_WhiteTracer_Material.rvmat b/optionals/tracers/data/SLX_WhiteTracer_Material.rvmat new file mode 100644 index 0000000000..8f2318885c --- /dev/null +++ b/optionals/tracers/data/SLX_WhiteTracer_Material.rvmat @@ -0,0 +1,9 @@ +ambient[] = {1, 0.98, 0.98, 1}; +diffuse[] = {1, 0.98, 0.98, 1}; +forcedDiffuse[] = {1, 0.98, 0.98, 1}; +emmisive[] = {250, 250, 400, 1}; +specular[] = {0, 0, 0, 0}; +specularPower = 0.0; +renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"}; +PixelShaderID = "Normal"; +VertexShaderID = "Basic"; diff --git a/optionals/tracers/data/SLX_YellowTracer_Material.rvmat b/optionals/tracers/data/SLX_YellowTracer_Material.rvmat index ac59da872f..fa810aab32 100644 --- a/optionals/tracers/data/SLX_YellowTracer_Material.rvmat +++ b/optionals/tracers/data/SLX_YellowTracer_Material.rvmat @@ -1,9 +1,9 @@ -ambient[] = {1, 1, 1, 0.1}; -diffuse[] = {1, 1, 1, 1}; -forcedDiffuse[] = {0, 0, 0, 0}; -emmisive[] = {1000, 1000, 0, 1}; -specular[] = {0, 0, 0, 1}; -specularPower = 100; +ambient[] = {1, 0.98, 0.137, 1}; +diffuse[] = {1, 0.98, 0.137, 1}; +forcedDiffuse[] = {1, 0.98, 0.137, 1}; +emmisive[] = {500, 500, 0, 1}; +specular[] = {0, 0, 0, 0}; +specularPower = 0.0; renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"}; PixelShaderID = "Normal"; VertexShaderID = "Basic"; diff --git a/optionals/tracers/data/TracerWhite.paa b/optionals/tracers/data/TracerWhite.paa new file mode 100644 index 0000000000..7388bd20a2 Binary files /dev/null and b/optionals/tracers/data/TracerWhite.paa differ diff --git a/optionals/tracers/data/tracer_green.rvmat b/optionals/tracers/data/tracer_green.rvmat index 56b4854643..2e480a89db 100644 --- a/optionals/tracers/data/tracer_green.rvmat +++ b/optionals/tracers/data/tracer_green.rvmat @@ -6,12 +6,12 @@ #define _ARMA_ //Class weapons : Data\bullettracer\Data\tracer_green.rvmat{ -ambient[] = {1, 1, 1, 1}; -diffuse[] = {1, 1, 1, 1}; -forcedDiffuse[] = {0, 0, 0, 0}; -emmisive[] = {100, 500, 100, 1}; -specular[] = {0, 0, 0, 1}; -specularPower = 100; +ambient[] = {1,1,1,3.25}; +diffuse[] = {1,1,1,1}; +forcedDiffuse[] = {0,0,0,0}; +emmisive[] = {100, 400, 100, 1}; +specular[] = {0,0,0,1}; +specularPower = 1.0; renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"}; PixelShaderID = "Normal"; VertexShaderID = "Basic"; diff --git a/optionals/tracers/data/tracer_red.rvmat b/optionals/tracers/data/tracer_red.rvmat index 20d3329821..1aa988f009 100644 --- a/optionals/tracers/data/tracer_red.rvmat +++ b/optionals/tracers/data/tracer_red.rvmat @@ -6,12 +6,12 @@ #define _ARMA_ //Class weapons : Data\bullettracer\Data\tracer_red.rvmat{ -ambient[] = {1, 1, 1, 0.1}; -diffuse[] = {1, 1, 1, 1}; -forcedDiffuse[] = {0, 0, 0, 0}; +ambient[] = {1,1,1,3.25}; +diffuse[] = {1,1,1,1}; +forcedDiffuse[] = {0,0,0,0}; emmisive[] = {1000, 100, 10, 1}; -specular[] = {0, 0, 0, 1}; -specularPower = 100; +specular[] = {0,0,0,1}; +specularPower = 1.0; renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"}; PixelShaderID = "Normal"; VertexShaderID = "Basic"; diff --git a/optionals/tracers/data/tracer_white.rvmat b/optionals/tracers/data/tracer_white.rvmat new file mode 100644 index 0000000000..8f18130e61 --- /dev/null +++ b/optionals/tracers/data/tracer_white.rvmat @@ -0,0 +1,18 @@ +//////////////////////////////////////////////////////////////////// +//Produced from mikero's Dos Tools using dll 3.17 +//http://dev-heaven.net/projects/list_files/mikero-pbodll +//////////////////////////////////////////////////////////////////// + +#define _ARMA_ + +//Class weapons : Data\bullettracer\Data\tracer_yellow.rvmat{ +ambient[] = {1,1,1,3.25}; +diffuse[] = {1,1,1,1}; +forcedDiffuse[] = {0,0,0,0}; +emmisive[] = {250, 250, 400, 1}; +specular[] = {0,0,0,1}; +specularPower = 1.0; +renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"}; +PixelShaderID = "Normal"; +VertexShaderID = "Basic"; +//}; diff --git a/optionals/tracers/data/tracer_white1_ca.paa b/optionals/tracers/data/tracer_white1_ca.paa new file mode 100644 index 0000000000..5d6c7e96e0 Binary files /dev/null and b/optionals/tracers/data/tracer_white1_ca.paa differ diff --git a/optionals/tracers/data/tracer_yellow.rvmat b/optionals/tracers/data/tracer_yellow.rvmat index d3175bf4da..d8bfbd3f31 100644 --- a/optionals/tracers/data/tracer_yellow.rvmat +++ b/optionals/tracers/data/tracer_yellow.rvmat @@ -6,14 +6,13 @@ #define _ARMA_ //Class weapons : Data\bullettracer\Data\tracer_yellow.rvmat{ -ambient[] = {1, 1, 1, 0.1}; -diffuse[] = {1, 1, 1, 1}; -forcedDiffuse[] = {0, 0, 0, 0}; -emmisive[] = {1000, 1000, 0, 1}; -specular[] = {0, 0, 0, 1}; -specularPower = 100; +ambient[] = {1,1,1,3.25}; +diffuse[] = {1,1,1,1}; +forcedDiffuse[] = {0,0,0,0}; +emmisive[] = {500, 500, 0, 1}; +specular[] = {0,0,0,1}; +specularPower = 1.0; renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"}; PixelShaderID = "Normal"; VertexShaderID = "Basic"; - //};