Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACE Tracer adjustment, fix nighttime visibility, add white tracers #6060

Merged
merged 23 commits into from
Oct 9, 2018
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Dimaslg <dimaslg@telecable.es>
dixon13 <dixonbegay@gmail.com>
Drill <drill87@gmail.com>
Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
Drosfeh <drofseh@gmail.com>
Drofseh marked this conversation as resolved.
Show resolved Hide resolved
Dslyecxi <dslyecxi@gmail.com>
eRazeri
evromalarkey <evromalarkey@gmail.com>
Expand Down
3 changes: 2 additions & 1 deletion optionals/tracers/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
};
};
Binary file added optionals/tracers/ace_TracerWhite2.p3d
Binary file not shown.
Binary file modified optionals/tracers/ace_shell_tracer_red.p3d
Binary file not shown.
Binary file added optionals/tracers/ace_shell_tracer_white.p3d
Binary file not shown.
24 changes: 24 additions & 0 deletions optionals/tracers/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
};
};
*/
4 changes: 2 additions & 2 deletions optionals/tracers/data/SLX_GreenTracer_Material.rvmat
Original file line number Diff line number Diff line change
@@ -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};
specular[] = {0.0, 0.0, 0.0, 0.0};
emmisive[] = {100, 400, 100, 1};
specular[] = {0, 0, 0, 0};
specularPower = 0.0;
renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
PixelShaderID = "Normal";
Expand Down
4 changes: 2 additions & 2 deletions optionals/tracers/data/SLX_RedTracer_Material.rvmat
Original file line number Diff line number Diff line change
@@ -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};
specular[] = {0.0, 0.0, 0.0, 0.0};
emmisive[] = {1000, 100, 10, 1};
specular[] = {0, 0, 0, 0};
specularPower = 0.0;
renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
PixelShaderID = "Normal";
Expand Down
9 changes: 9 additions & 0 deletions optionals/tracers/data/SLX_WhiteTracer_Material.rvmat
Original file line number Diff line number Diff line change
@@ -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";
4 changes: 2 additions & 2 deletions optionals/tracers/data/SLX_YellowTracer_Material.rvmat
Original file line number Diff line number Diff line change
@@ -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};
specular[] = {0.0, 0.0, 0.0, 0.0};
emmisive[] = {500, 500, 0, 1};
specular[] = {0, 0, 0, 0};
specularPower = 0.0;
renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
PixelShaderID = "Normal";
Expand Down
Binary file added optionals/tracers/data/TracerWhite.paa
Binary file not shown.
12 changes: 6 additions & 6 deletions optionals/tracers/data/tracer_green.rvmat
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#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};
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","AddBlend"};
renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
PixelShaderID = "Normal";
VertexShaderID = "Basic";
//};
12 changes: 6 additions & 6 deletions optionals/tracers/data/tracer_red.rvmat
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#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};
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 = 1.0;
renderFlags[] = {"NoZWrite","AddBlend"};
renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
PixelShaderID = "Normal";
VertexShaderID = "Basic";
//};
18 changes: 18 additions & 0 deletions optionals/tracers/data/tracer_white.rvmat
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
////////////////////////////////////////////////////////////////////
Drofseh marked this conversation as resolved.
Show resolved Hide resolved
//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";
//};
Binary file added optionals/tracers/data/tracer_white1_ca.paa
Binary file not shown.
12 changes: 6 additions & 6 deletions optionals/tracers/data/tracer_yellow.rvmat
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#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};
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","AddBlend"};
renderFlags[] = {"NoZWrite", "NoAlphaWrite", "AddBlend"};
PixelShaderID = "Normal";
VertexShaderID = "Basic";
//};