Merge pull request #6060 from Drofseh/tracer_adjustment

ACE Tracer adjustment, fix nighttime visibility, add white tracers

AUTHORS.txt

@@ -63,6 +63,7 @@ Dimaslg <dimaslg@telecable.es>
 dixon13 <dixonbegay@gmail.com>
 Drill <drill87@gmail.com>
 Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
+Drofseh <drofseh@gmail.com>
 Dslyecxi <dslyecxi@gmail.com>
 ElTyranos
 eRazeri

optionals/tracers/CfgAmmo.hpp

@@ -5,21 +5,34 @@ class CfgAmmo {
     class SubmunitionBullet;
 
     //No idea
-    class B_56x15_dual: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
+    class B_56x15_dual: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
 
     //Pistol
-    class B_9x21_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
+    class B_9x21_Ball: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
     class B_9x21_Ball_Tracer_Green: B_9x21_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
+    class B_9x21_Ball_Tracer_Red: B_9x21_Ball_Tracer_Green {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
+    class B_9x21_Ball_Tracer_Yellow: B_9x21_Ball_Tracer_Green {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
+    class Sub_F_Signal_Green: B_9x21_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
+    class Sub_F_Signal_Red: Sub_F_Signal_Green {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
 
     class B_45ACP_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
     class B_45ACP_Ball_Green: B_45ACP_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
     class B_45ACP_Ball_Yellow: B_45ACP_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
 
     //Assault rifle
+
+    class B_50BW_Ball_F: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);};
+
+    class B_545x39_Ball_F: BulletBase {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
+    class B_545x39_Ball_Green_F: B_545x39_Ball_F {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
+
     class B_556x45_Ball: BulletBase {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
     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_580x42_Ball_F: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);};
 
     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
@@ -34,8 +47,11 @@ class CfgAmmo {
     class B_65x39_Minigun_Caseless_Yellow_splash: B_65x39_Minigun_Caseless_Red_splash {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
     class B_65x39_Minigun_Caseless_Green_splash: B_65x39_Minigun_Caseless_Red_splash {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
 
+    class B_762x39_Ball_F: BulletBase {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
+    class B_762x39_Ball_Green_F: B_762x39_Ball_F {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
+
     //Battle rifle
-    class B_762x51_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
+    class B_762x51_Ball: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
     class B_762x51_Tracer_Red: B_762x51_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
     class B_762x51_Tracer_Green: B_762x51_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
     class B_762x51_Tracer_Yellow: B_762x51_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
@@ -52,7 +68,7 @@ class CfgAmmo {
     class B_762x54_Tracer_Yellow: B_762x54_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
 
     //Sniper rifle
-    class B_127x99_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
+    class B_127x99_Ball: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
     class B_127x99_Ball_Tracer_Red: B_127x99_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
     class B_127x99_Ball_Tracer_Green: B_127x99_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
     class B_127x99_Ball_Tracer_Yellow: B_127x99_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
@@ -76,7 +92,7 @@ class CfgAmmo {
     class B_93x64_Ball: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
 
     //Autocannon
-    class B_19mm_HE: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
+    class B_19mm_HE: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
 
     class B_30mm_HE;
     class B_30mm_HE_Tracer_Red: B_30mm_HE {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
@@ -96,9 +112,9 @@ class CfgAmmo {
     class B_20mm: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
     class B_20mm_Tracer_Red: B_20mm {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
 
-    class B_25mm: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
+    class B_25mm: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
 
-    class B_30mm_AP: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
+    class B_30mm_AP: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
     class B_30mm_AP_Tracer_Red: B_30mm_AP {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
     class B_30mm_AP_Tracer_Green: B_30mm_AP {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
     class B_30mm_AP_Tracer_Yellow: B_30mm_AP {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
@@ -113,7 +129,7 @@ class CfgAmmo {
     class B_40mm_APFSDS_Tracer_Green: B_40mm_APFSDS {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
     class B_40mm_APFSDS_Tracer_Yellow: B_40mm_APFSDS {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
 
-    class B_35mm_AA: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
+    class B_35mm_AA: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white
     class B_35mm_AA_Tracer_Red: B_35mm_AA {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red
     class B_35mm_AA_Tracer_Green: B_35mm_AA {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green
     class B_35mm_AA_Tracer_Yellow: B_35mm_AA {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow
@@ -122,12 +138,12 @@ class CfgAmmo {
     class Cannon_30mm_HE_Plane_CAS_02_F: Gatling_30mm_HE_Plane_CAS_01_F {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green.p3d
 
     //Cannon
-    class Sh_120mm_HE: ShellBase {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_white
+    class Sh_120mm_HE: ShellBase {model = PATHTOF(ace_shell_tracer_white.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_white
     class Sh_120mm_HE_Tracer_Red: Sh_120mm_HE {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red
     class Sh_120mm_HE_Tracer_Green: Sh_120mm_HE {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green
     class Sh_120mm_HE_Tracer_Yellow: Sh_120mm_HE {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow
 
-    class Sh_120mm_APFSDS: ShellBase {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_white
+    class Sh_120mm_APFSDS: ShellBase {model = PATHTOF(ace_shell_tracer_white.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_white
     class Sh_120mm_APFSDS_Tracer_Red: Sh_120mm_APFSDS {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red
     class Sh_120mm_APFSDS_Tracer_Green: Sh_120mm_APFSDS {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green
     class Sh_120mm_APFSDS_Tracer_Yellow: Sh_120mm_APFSDS {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow

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

optionals/tracers/data/SLX_GreenTracer_Material.rvmat

@@ -1,8 +1,8 @@
 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[] = {0.2, 0.8, 0.1, 1};
+emmisive[] = {100, 400, 100, 1};
-specular[] = {0.0, 0.0, 0.0, 0.0};
+specular[] = {0, 0, 0, 0};
 specularPower = 0.0;
 renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
 PixelShaderID = "Normal";

optionals/tracers/data/SLX_RedTracer_Material.rvmat

@@ -1,8 +1,8 @@
 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[] = {0.8, 0.1, 0.1, 1};
+emmisive[] = {1000, 100, 10, 1};
-specular[] = {0.0, 0.0, 0.0, 0.0};
+specular[] = {0, 0, 0, 0};
 specularPower = 0.0;
 renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
 PixelShaderID = "Normal";

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

optionals/tracers/data/SLX_YellowTracer_Material.rvmat

@@ -1,8 +1,8 @@
 ambient[] = {1, 0.98, 0.137, 1};
 diffuse[] = {1, 0.98, 0.137, 1};
 forcedDiffuse[] = {1, 0.98, 0.137, 1};
-emmisive[] = {1, 0.98, 0.137, 1};
+emmisive[] = {500, 500, 0, 1};
-specular[] = {0.0, 0.0, 0.0, 0.0};
+specular[] = {0, 0, 0, 0};
 specularPower = 0.0;
 renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
 PixelShaderID = "Normal";

optionals/tracers/data/tracer_green.rvmat

@@ -1,18 +1,9 @@
-////////////////////////////////////////////////////////////////////
+ambient[] = {1,1,1,3.25};
-//Produced from mikero's Dos Tools using dll 3.17
+diffuse[] = {1,1,1,1};
-//http://dev-heaven.net/projects/list_files/mikero-pbodll
+forcedDiffuse[] = {0,0,0,0};
-////////////////////////////////////////////////////////////////////
+emmisive[] = {100, 400, 100, 1};
-
+specular[] = {0,0,0,1};
-#define _ARMA_
-
-//Class weapons : Data\bullettracer\Data\tracer_green.rvmat{
-ambient[] = {1.0,1.0,1.0,3.25};
-diffuse[] = {1.0,1.0,1.0,1.0};
-forcedDiffuse[] = {0.0,0.0,0.0,0.0};
-emmisive[] = {1.0,1.0,1.0,1.0};
-specular[] = {0.0,0.0,0.0,1.0};
 specularPower = 1.0;
-renderFlags[] = {"NoZWrite","AddBlend"};
+renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
 PixelShaderID = "Normal";
 VertexShaderID = "Basic";
-//};

optionals/tracers/data/tracer_red.rvmat

@@ -1,18 +1,9 @@
-////////////////////////////////////////////////////////////////////
+ambient[] = {1,1,1,3.25};
-//Produced from mikero's Dos Tools using dll 3.17
+diffuse[] = {1,1,1,1};
-//http://dev-heaven.net/projects/list_files/mikero-pbodll
+forcedDiffuse[] = {0,0,0,0};
-////////////////////////////////////////////////////////////////////
+emmisive[] = {1000, 100, 10, 1};
-
+specular[] = {0,0,0,1};
-#define _ARMA_
-
-//Class weapons : Data\bullettracer\Data\tracer_red.rvmat{
-ambient[] = {1.0,1.0,1.0,3.25};
-diffuse[] = {1.0,1.0,1.0,1.0};
-forcedDiffuse[] = {0.0,0.0,0.0,0.0};
-emmisive[] = {1.0,1.0,1.0,1.0};
-specular[] = {0.0,0.0,0.0,1.0};
 specularPower = 1.0;
-renderFlags[] = {"NoZWrite","AddBlend"};
+renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
 PixelShaderID = "Normal";
 VertexShaderID = "Basic";
-//};

optionals/tracers/data/tracer_white.rvmat

@@ -0,0 +1,9 @@
+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";

optionals/tracers/data/tracer_yellow.rvmat

@@ -1,18 +1,9 @@
-////////////////////////////////////////////////////////////////////
+ambient[] = {1,1,1,3.25};
-//Produced from mikero's Dos Tools using dll 3.17
+diffuse[] = {1,1,1,1};
-//http://dev-heaven.net/projects/list_files/mikero-pbodll
+forcedDiffuse[] = {0,0,0,0};
-////////////////////////////////////////////////////////////////////
+emmisive[] = {500, 500, 0, 1};
-
+specular[] = {0,0,0,1};
-#define _ARMA_
-
-//Class weapons : Data\bullettracer\Data\tracer_yellow.rvmat{
-ambient[] = {1.0,1.0,1.0,3.25};
-diffuse[] = {1.0,1.0,1.0,1.0};
-forcedDiffuse[] = {0.0,0.0,0.0,0.0};
-emmisive[] = {1.0,1.0,1.0,1.0};
-specular[] = {0.0,0.0,0.0,1.0};
 specularPower = 1.0;
-renderFlags[] = {"NoZWrite","AddBlend"};
+renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
 PixelShaderID = "Normal";
 VertexShaderID = "Basic";
-//};