From 06e1435a56500138f956f8f4f2d9f44c33118868 Mon Sep 17 00:00:00 2001 From: ulteq Date: Tue, 19 May 2015 17:25:27 +0200 Subject: [PATCH] Reverted the renaming: balltracers -> tracers --- optionals/balltracers/$PBOPREFIX$ | 1 - optionals/balltracers/script_component.hpp | 12 ------------ optionals/tracers/$PBOPREFIX$ | 1 + optionals/{balltracers => tracers}/CfgAmmo.hpp | 17 ++++++++++++++++- optionals/{balltracers => tracers}/README.md | 0 .../ace_40mm_tracer_red.p3d | Bin .../ace_TracerGreen2.p3d | Bin .../ace_TracerRed2.p3d | Bin .../ace_TracerYellow2.p3d | Bin .../ace_shell_tracer_green.p3d | Bin .../ace_shell_tracer_red.p3d | Bin .../ace_shell_tracer_yellow.p3d | Bin optionals/{balltracers => tracers}/config.cpp | 0 .../data/SLX_GreenTracer_Material.rvmat | 0 .../data/SLX_RedTracer_Material.rvmat | 0 .../data/SLX_YellowTracer_Material.rvmat | 0 .../data/TracerGreen.paa | Bin .../data/TracerRed.paa | Bin .../data/TracerYellow.paa | Bin .../data/clear_empty.paa | Bin .../data/tracer_green.rvmat | 0 .../data/tracer_green1_ca.paa | Bin .../data/tracer_red.rvmat | 0 .../data/tracer_red1_ca.paa | Bin .../data/tracer_yellow.rvmat | 0 .../data/tracer_yellow1_ca.paa | Bin optionals/{balltracers => tracers}/model.cfg | 0 optionals/tracers/script_component.hpp | 12 ++++++++++++ .../tracer_green_2.p3d | Bin .../{balltracers => tracers}/tracer_red_2.p3d | Bin .../tracer_yellow_2.p3d | Bin 31 files changed, 29 insertions(+), 14 deletions(-) delete mode 100644 optionals/balltracers/$PBOPREFIX$ delete mode 100644 optionals/balltracers/script_component.hpp create mode 100644 optionals/tracers/$PBOPREFIX$ rename optionals/{balltracers => tracers}/CfgAmmo.hpp (90%) rename optionals/{balltracers => tracers}/README.md (100%) rename optionals/{balltracers => tracers}/ace_40mm_tracer_red.p3d (100%) rename optionals/{balltracers => tracers}/ace_TracerGreen2.p3d (100%) rename optionals/{balltracers => tracers}/ace_TracerRed2.p3d (100%) rename optionals/{balltracers => tracers}/ace_TracerYellow2.p3d (100%) rename optionals/{balltracers => tracers}/ace_shell_tracer_green.p3d (100%) rename optionals/{balltracers => tracers}/ace_shell_tracer_red.p3d (100%) rename optionals/{balltracers => tracers}/ace_shell_tracer_yellow.p3d (100%) rename optionals/{balltracers => tracers}/config.cpp (100%) rename optionals/{balltracers => tracers}/data/SLX_GreenTracer_Material.rvmat (100%) rename optionals/{balltracers => tracers}/data/SLX_RedTracer_Material.rvmat (100%) rename optionals/{balltracers => tracers}/data/SLX_YellowTracer_Material.rvmat (100%) rename optionals/{balltracers => tracers}/data/TracerGreen.paa (100%) rename optionals/{balltracers => tracers}/data/TracerRed.paa (100%) rename optionals/{balltracers => tracers}/data/TracerYellow.paa (100%) rename optionals/{balltracers => tracers}/data/clear_empty.paa (100%) rename optionals/{balltracers => tracers}/data/tracer_green.rvmat (100%) rename optionals/{balltracers => tracers}/data/tracer_green1_ca.paa (100%) rename optionals/{balltracers => tracers}/data/tracer_red.rvmat (100%) rename optionals/{balltracers => tracers}/data/tracer_red1_ca.paa (100%) rename optionals/{balltracers => tracers}/data/tracer_yellow.rvmat (100%) rename optionals/{balltracers => tracers}/data/tracer_yellow1_ca.paa (100%) rename optionals/{balltracers => tracers}/model.cfg (100%) create mode 100644 optionals/tracers/script_component.hpp rename optionals/{balltracers => tracers}/tracer_green_2.p3d (100%) rename optionals/{balltracers => tracers}/tracer_red_2.p3d (100%) rename optionals/{balltracers => tracers}/tracer_yellow_2.p3d (100%) diff --git a/optionals/balltracers/$PBOPREFIX$ b/optionals/balltracers/$PBOPREFIX$ deleted file mode 100644 index 3bb61dd773..0000000000 --- a/optionals/balltracers/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ace\addons\balltracers \ No newline at end of file diff --git a/optionals/balltracers/script_component.hpp b/optionals/balltracers/script_component.hpp deleted file mode 100644 index eed05135ce..0000000000 --- a/optionals/balltracers/script_component.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#define COMPONENT balltracers -#include "\z\ace\addons\main\script_mod.hpp" - -#ifdef DEBUG_ENABLED_SYS_BALLTRACERS - #define DEBUG_MODE_FULL -#endif - -#ifdef DEBUG_SETTINGS_SYS_BALLTRACERS - #define DEBUG_SETTINGS DEBUG_SETTINGS_SYS_BALLTRACERS -#endif - -#include "\z\ace\addons\main\script_macros.hpp" diff --git a/optionals/tracers/$PBOPREFIX$ b/optionals/tracers/$PBOPREFIX$ new file mode 100644 index 0000000000..0b2ee2511f --- /dev/null +++ b/optionals/tracers/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\tracers \ No newline at end of file diff --git a/optionals/balltracers/CfgAmmo.hpp b/optionals/tracers/CfgAmmo.hpp similarity index 90% rename from optionals/balltracers/CfgAmmo.hpp rename to optionals/tracers/CfgAmmo.hpp index 64d530f427..2d6bafb0a5 100644 --- a/optionals/balltracers/CfgAmmo.hpp +++ b/optionals/tracers/CfgAmmo.hpp @@ -86,42 +86,57 @@ class CfgAmmo { }; class B_30mm_HE; class B_30mm_HE_Tracer_Red: B_30mm_HE { + model = PATHTOF(tracer_red_2.p3d); }; class B_30mm_HE_Tracer_Green: B_30mm_HE { + model = PATHTOF(tracer_green_2.p3d); }; class B_30mm_HE_Tracer_Yellow: B_30mm_HE { + model = PATHTOF(tracer_yellow_2.p3d); }; class B_40mm_GPR; class B_40mm_GPR_Tracer_Red: B_40mm_GPR { - model = PATHTOF(ace_40mm_tracer_red.p3d); + model = PATHTOF(tracer_red_2.p3d); }; class B_40mm_GPR_Tracer_Green: B_40mm_GPR { + model = PATHTOF(tracer_green_2.p3d); }; class B_40mm_GPR_Tracer_Yellow: B_40mm_GPR { + model = PATHTOF(tracer_yellow_2.p3d); }; class B_20mm; class B_20mm_Tracer_Red: B_20mm { + model = PATHTOF(tracer_red_2.p3d); }; class B_30mm_AP; class B_30mm_AP_Tracer_Red: B_30mm_AP { + model = PATHTOF(tracer_red_2.p3d); }; class B_30mm_AP_Tracer_Green: B_30mm_AP { + model = PATHTOF(tracer_green_2.p3d); }; class B_30mm_AP_Tracer_Yellow: B_30mm_AP { + model = PATHTOF(tracer_yellow_2.p3d); }; class B_30mm_APFSDS; class B_30mm_APFSDS_Tracer_Red: B_30mm_APFSDS { + model = PATHTOF(tracer_red_2.p3d); }; class B_30mm_APFSDS_Tracer_Green: B_30mm_APFSDS { + model = PATHTOF(tracer_green_2.p3d); }; class B_30mm_APFSDS_Tracer_Yellow: B_30mm_APFSDS { + model = PATHTOF(tracer_yellow_2.p3d); }; class B_35mm_AA; class B_35mm_AA_Tracer_Red: B_35mm_AA { + model = PATHTOF(tracer_red_2.p3d); }; class B_35mm_AA_Tracer_Green: B_35mm_AA { + model = PATHTOF(tracer_green_2.p3d); }; class B_35mm_AA_Tracer_Yellow: B_35mm_AA { + model = PATHTOF(tracer_yellow_2.p3d); }; class Sh_120mm_HE; class Sh_120mm_HE_Tracer_Red: Sh_120mm_HE { diff --git a/optionals/balltracers/README.md b/optionals/tracers/README.md similarity index 100% rename from optionals/balltracers/README.md rename to optionals/tracers/README.md diff --git a/optionals/balltracers/ace_40mm_tracer_red.p3d b/optionals/tracers/ace_40mm_tracer_red.p3d similarity index 100% rename from optionals/balltracers/ace_40mm_tracer_red.p3d rename to optionals/tracers/ace_40mm_tracer_red.p3d diff --git a/optionals/balltracers/ace_TracerGreen2.p3d b/optionals/tracers/ace_TracerGreen2.p3d similarity index 100% rename from optionals/balltracers/ace_TracerGreen2.p3d rename to optionals/tracers/ace_TracerGreen2.p3d diff --git a/optionals/balltracers/ace_TracerRed2.p3d b/optionals/tracers/ace_TracerRed2.p3d similarity index 100% rename from optionals/balltracers/ace_TracerRed2.p3d rename to optionals/tracers/ace_TracerRed2.p3d diff --git a/optionals/balltracers/ace_TracerYellow2.p3d b/optionals/tracers/ace_TracerYellow2.p3d similarity index 100% rename from optionals/balltracers/ace_TracerYellow2.p3d rename to optionals/tracers/ace_TracerYellow2.p3d diff --git a/optionals/balltracers/ace_shell_tracer_green.p3d b/optionals/tracers/ace_shell_tracer_green.p3d similarity index 100% rename from optionals/balltracers/ace_shell_tracer_green.p3d rename to optionals/tracers/ace_shell_tracer_green.p3d diff --git a/optionals/balltracers/ace_shell_tracer_red.p3d b/optionals/tracers/ace_shell_tracer_red.p3d similarity index 100% rename from optionals/balltracers/ace_shell_tracer_red.p3d rename to optionals/tracers/ace_shell_tracer_red.p3d diff --git a/optionals/balltracers/ace_shell_tracer_yellow.p3d b/optionals/tracers/ace_shell_tracer_yellow.p3d similarity index 100% rename from optionals/balltracers/ace_shell_tracer_yellow.p3d rename to optionals/tracers/ace_shell_tracer_yellow.p3d diff --git a/optionals/balltracers/config.cpp b/optionals/tracers/config.cpp similarity index 100% rename from optionals/balltracers/config.cpp rename to optionals/tracers/config.cpp diff --git a/optionals/balltracers/data/SLX_GreenTracer_Material.rvmat b/optionals/tracers/data/SLX_GreenTracer_Material.rvmat similarity index 100% rename from optionals/balltracers/data/SLX_GreenTracer_Material.rvmat rename to optionals/tracers/data/SLX_GreenTracer_Material.rvmat diff --git a/optionals/balltracers/data/SLX_RedTracer_Material.rvmat b/optionals/tracers/data/SLX_RedTracer_Material.rvmat similarity index 100% rename from optionals/balltracers/data/SLX_RedTracer_Material.rvmat rename to optionals/tracers/data/SLX_RedTracer_Material.rvmat diff --git a/optionals/balltracers/data/SLX_YellowTracer_Material.rvmat b/optionals/tracers/data/SLX_YellowTracer_Material.rvmat similarity index 100% rename from optionals/balltracers/data/SLX_YellowTracer_Material.rvmat rename to optionals/tracers/data/SLX_YellowTracer_Material.rvmat diff --git a/optionals/balltracers/data/TracerGreen.paa b/optionals/tracers/data/TracerGreen.paa similarity index 100% rename from optionals/balltracers/data/TracerGreen.paa rename to optionals/tracers/data/TracerGreen.paa diff --git a/optionals/balltracers/data/TracerRed.paa b/optionals/tracers/data/TracerRed.paa similarity index 100% rename from optionals/balltracers/data/TracerRed.paa rename to optionals/tracers/data/TracerRed.paa diff --git a/optionals/balltracers/data/TracerYellow.paa b/optionals/tracers/data/TracerYellow.paa similarity index 100% rename from optionals/balltracers/data/TracerYellow.paa rename to optionals/tracers/data/TracerYellow.paa diff --git a/optionals/balltracers/data/clear_empty.paa b/optionals/tracers/data/clear_empty.paa similarity index 100% rename from optionals/balltracers/data/clear_empty.paa rename to optionals/tracers/data/clear_empty.paa diff --git a/optionals/balltracers/data/tracer_green.rvmat b/optionals/tracers/data/tracer_green.rvmat similarity index 100% rename from optionals/balltracers/data/tracer_green.rvmat rename to optionals/tracers/data/tracer_green.rvmat diff --git a/optionals/balltracers/data/tracer_green1_ca.paa b/optionals/tracers/data/tracer_green1_ca.paa similarity index 100% rename from optionals/balltracers/data/tracer_green1_ca.paa rename to optionals/tracers/data/tracer_green1_ca.paa diff --git a/optionals/balltracers/data/tracer_red.rvmat b/optionals/tracers/data/tracer_red.rvmat similarity index 100% rename from optionals/balltracers/data/tracer_red.rvmat rename to optionals/tracers/data/tracer_red.rvmat diff --git a/optionals/balltracers/data/tracer_red1_ca.paa b/optionals/tracers/data/tracer_red1_ca.paa similarity index 100% rename from optionals/balltracers/data/tracer_red1_ca.paa rename to optionals/tracers/data/tracer_red1_ca.paa diff --git a/optionals/balltracers/data/tracer_yellow.rvmat b/optionals/tracers/data/tracer_yellow.rvmat similarity index 100% rename from optionals/balltracers/data/tracer_yellow.rvmat rename to optionals/tracers/data/tracer_yellow.rvmat diff --git a/optionals/balltracers/data/tracer_yellow1_ca.paa b/optionals/tracers/data/tracer_yellow1_ca.paa similarity index 100% rename from optionals/balltracers/data/tracer_yellow1_ca.paa rename to optionals/tracers/data/tracer_yellow1_ca.paa diff --git a/optionals/balltracers/model.cfg b/optionals/tracers/model.cfg similarity index 100% rename from optionals/balltracers/model.cfg rename to optionals/tracers/model.cfg diff --git a/optionals/tracers/script_component.hpp b/optionals/tracers/script_component.hpp new file mode 100644 index 0000000000..b5dd507dcb --- /dev/null +++ b/optionals/tracers/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT tracers +#include "\z\ace\addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_SYS_TRACERS + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_SYS_TRACERS + #define DEBUG_SETTINGS DEBUG_SETTINGS_SYS_TRACERS +#endif + +#include "\z\ace\addons\main\script_macros.hpp" diff --git a/optionals/balltracers/tracer_green_2.p3d b/optionals/tracers/tracer_green_2.p3d similarity index 100% rename from optionals/balltracers/tracer_green_2.p3d rename to optionals/tracers/tracer_green_2.p3d diff --git a/optionals/balltracers/tracer_red_2.p3d b/optionals/tracers/tracer_red_2.p3d similarity index 100% rename from optionals/balltracers/tracer_red_2.p3d rename to optionals/tracers/tracer_red_2.p3d diff --git a/optionals/balltracers/tracer_yellow_2.p3d b/optionals/tracers/tracer_yellow_2.p3d similarity index 100% rename from optionals/balltracers/tracer_yellow_2.p3d rename to optionals/tracers/tracer_yellow_2.p3d