diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6862cda..d7ad65f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -15,7 +15,7 @@ Add a descriptive title and complete the issue template. Pictures or a video of the issue might be helpful in resolving it faster. # Feature Requests -A single issue has been created for tracking [feature requests](https://github.com/Drofseh/WW2_ACE3_Tracer_Compat/issues/3). +A single issue has been created for tracking [feature requests](https://github.com/Drofseh/WW2_ACE3_Tracer_Compat/issues/1). Please post a comment there if you have a feature request. diff --git a/Addons/FOW_ACE3_Tracer_Compat/FOW_Ammo.h b/Addons/FOW_ACE3_Tracer_Compat/FOW_Ammo.h index b590701..385eb42 100644 --- a/Addons/FOW_ACE3_Tracer_Compat/FOW_Ammo.h +++ b/Addons/FOW_ACE3_Tracer_Compat/FOW_Ammo.h @@ -1,13 +1,33 @@ - class fow_B_20mm_AP : BulletBase { - model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + class fow_B_127x99_Ball : BulletBase { + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; // should be white + }; + + class fow_B_127x99_Ball_Tracer_Red : fow_B_127x99_Ball { + model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; + }; + + class fow_B_20mm : BulletBase { + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; // should be white + }; + + class fow_B_20mm_AP : BulletBase { + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; // should be white }; class fow_B_20mm_HE : BulletBase { - model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; // should be white + }; + + class fow_B_20mm_Tracer_Red : fow_B_20mm { + model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; // should be white + }; + + class fow_B_20mm_Tracer_Yellow : fow_B_20mm { + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; // should be white }; class fow_B_303_Ball : BulletBase { - model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; }; class fow_B_45_acp : BulletBase { @@ -20,7 +40,9 @@ class fow_B_65x52_Ball; - class fow_B_762x33_Ball; + class fow_B_762x33_Ball : BulletBase { + model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; + }; class fow_B_762x63_Ball : BulletBase { model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; @@ -28,6 +50,14 @@ class fow_B_765x17_Ball; + class fow_B_77x56_Ball : BulletBase { + model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; // should be white + }; + + class fow_B_77x56_Ball_Tracer_Yellow : fow_B_77x56_Ball { + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + }; + class fow_B_77x58_Ball : BulletBase { model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; }; @@ -115,3 +145,11 @@ class fow_Sh_57mm_APDS : fow_Sh_57mm_HE { model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; + + class fow_Sh_88mm_HE : ShellBase { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class fow_Sh_88mm_AP : fow_Sh_88mm_HE { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; diff --git a/Addons/FOW_ACE3_Tracer_Compat/config.cpp b/Addons/FOW_ACE3_Tracer_Compat/config.cpp index e5f9f98..b56a8db 100644 --- a/Addons/FOW_ACE3_Tracer_Compat/config.cpp +++ b/Addons/FOW_ACE3_Tracer_Compat/config.cpp @@ -14,11 +14,13 @@ class cfgAmmo { model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; model = "\z\ace\addons\tracers\ace_TracerGreen2.p3d"; model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + model = "\z\ace\addons\tracers\ace_TracerWhite2.p3d"; //coming soon (TM) in ACE3 v3.13.0... I hope... // bigger than 30mm model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; model = "\z\ace\addons\tracers\ace_shell_tracer_green.p3d"; model = "\z\ace\addons\tracers\ace_shell_tracer_yellow.p3d"; + model = "\z\ace\addons\tracers\ace_shell_tracer_white.p3d"; //coming soon (TM) in ACE3 v3.13.0... I hope... */ class BulletBase; diff --git a/Addons/IFA3_ACE3_Tracer_Compat/LIB_Ammo.h b/Addons/IFA3_ACE3_Tracer_Compat/LIB_Ammo.h index 59d32cf..5f1d686 100644 --- a/Addons/IFA3_ACE3_Tracer_Compat/LIB_Ammo.h +++ b/Addons/IFA3_ACE3_Tracer_Compat/LIB_Ammo.h @@ -4,6 +4,7 @@ class LIB_Bullet_Plane_base; class LIB_Bullet_Vehicle_base; class LIB_Shell_base; + class LIB_ShellHE_base; class LIB_ShellAPCR_base; class LIB_4x_SprGr_FlaK_38 : LIB_Bullet_AA_base { @@ -11,7 +12,11 @@ }; class LIB_76mm_Shell_Base : LIB_Shell_base { - model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_76mm_Shell_Base_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; class LIB_B_127x108_Ball : LIB_Bullet_Vehicle_base { @@ -43,7 +48,7 @@ }; class LIB_B_37mm_AA : LIB_Bullet_AA_base { - model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; class LIB_B_37mm_AP : LIB_Bullet_Plane_base { @@ -79,7 +84,7 @@ }; class LIB_B_762x63_Ball_t : LIB_B_762x63_Ball { - model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; }; class LIB_B_762x33_Ball : LIB_B_762x63_Ball { @@ -119,15 +124,15 @@ }; class LIB_B_762x54_Ball_t30 : LIB_B_762x54_Ball { - model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; //Should be white }; class LIB_B_762x54_Ball_t30_NoCartridge : LIB_B_762x54_Ball_NoCartridge { - model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; //Should be white }; class LIB_B_762x54_Ball_t30c : LIB_B_762x54_Ball { - model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; //Should be white }; class LIB_B_762x54_Ball_t46 : LIB_B_762x54_Ball { @@ -138,6 +143,8 @@ model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; }; + class LIB_B_763x25_Ball; + class LIB_B_792x33_Ball : LIB_Bullet_base { model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; }; @@ -206,6 +213,10 @@ model = "\z\ace\addons\tracers\ace_shell_tracer_green.p3d"; }; + class LIB_BR365P_APCR : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_green.p3d"; + }; + class LIB_BR471_AP : LIB_Shell_base { model = "\z\ace\addons\tracers\ace_shell_tracer_green.p3d"; }; @@ -214,12 +225,30 @@ model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; - class LIB_M42A1_M1_HE; + class LIB_M42A1_M1_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; class LIB_M61_M1_AP : LIB_Shell_base { model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; + class LIB_O365_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_OF350_HE : LIB_76mm_Shell_Base_HE { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_OF471_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_OF471_HE_Arty : Sh_155mm_AMOS { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + class LIB_PzGr39_KwK36_AP : LIB_Shell_base { model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; @@ -232,22 +261,54 @@ model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; - class LIB_PzGr40_APCR; + class LIB_PzGr40_APCR : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; - class LIB_PzGr40_KwK36_APCR; + class LIB_PzGr40_KwK36_APCR : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; - class LIB_PzGr40_KWK40_APCR; + class LIB_PzGr40_KWK40_APCR : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; - class LIB_PzGr4042_KwK42_APCR; + class LIB_PzGr4042_KwK42_APCR : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; class LIB_PzGr43_AP : LIB_Shell_base { model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; + class LIB_S_105L28_Gr38 : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_S_105L28_Gr39HlC : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + class LIB_S_20L55_PzGr : LIB_Shell_base { model = "\z\ace\addons\tracers\ace_shell_tracer_yellow.p3d"; }; + class LIB_S_20L55_PzGr40 : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_yellow.p3d"; + }; + + class LIB_S_20L55_SprGr : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_yellow.p3d"; + }; + + class LIB_S_37L57_M51 : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_S_37L57_M63 : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + class LIB_S_37L57_M74 : LIB_Shell_base { model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; @@ -256,18 +317,82 @@ model = "\z\ace\addons\tracers\ace_shell_tracer_green.p3d"; }; + class LIB_S_50L60_PzGr40 : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_green.p3d"; + }; + + class LIB_S_50L60_SprGr38 : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_green.p3d"; + }; + + class LIB_S_76L55_APMk3 : LIB_Shell_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_S_76L55_APDSMk1 : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + class LIB_S_76L55_APMk3 : LIB_Shell_base { model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; + class LIB_S_76L55_HEMk1 : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_S_76L55_M42 : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + class LIB_S_76L55_M79 : LIB_Shell_base { model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; }; + class LIB_S_76L55_M93 : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + class LIB_SprGr_FlaK_38 : LIB_4x_SprGr_FlaK_38 { model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; }; + class LIB_SprGr_FlaK_38_APHE_T : LIB_SprGr_FlaK_38 { + model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; + }; + class LIB_SprGr_FlaK_30 : LIB_SprGr_FlaK_38 { model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; }; + + class LIB_SprGr_FlaK_30_APHE_T : LIB_SprGr_FlaK_38_APHE_T { + model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; + }; + + class LIB_SprGr_KwK36_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_SprGr_KwK36_HE_AA : LIB_SprGr_KwK36_HE { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_SprGr34_K51_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_SprGr34_KWK40_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_SprGr39_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_SprGr42_KwK42_HE : LIB_ShellHE_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; + + class LIB_T45_M1_APCR : LIB_ShellAPCR_base { + model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; + }; diff --git a/Addons/IFA3_ACE3_Tracer_Compat/config.cpp b/Addons/IFA3_ACE3_Tracer_Compat/config.cpp index 60b4d2d..42f2166 100644 --- a/Addons/IFA3_ACE3_Tracer_Compat/config.cpp +++ b/Addons/IFA3_ACE3_Tracer_Compat/config.cpp @@ -14,11 +14,13 @@ class cfgAmmo { model = "\z\ace\addons\tracers\ace_TracerRed2.p3d"; model = "\z\ace\addons\tracers\ace_TracerGreen2.p3d"; model = "\z\ace\addons\tracers\ace_TracerYellow2.p3d"; + model = "\z\ace\addons\tracers\ace_TracerWhite2.p3d"; //coming soon (TM) in ACE3 v3.13.0... I hope... // bigger than 30mm model = "\z\ace\addons\tracers\ace_shell_tracer_red.p3d"; model = "\z\ace\addons\tracers\ace_shell_tracer_green.p3d"; model = "\z\ace\addons\tracers\ace_shell_tracer_yellow.p3d"; + model = "\z\ace\addons\tracers\ace_shell_tracer_white.p3d"; //coming soon (TM) in ACE3 v3.13.0... I hope... */ class BulletBase; @@ -28,6 +30,8 @@ class cfgAmmo { class B_45ACP_Ball; class B_9x21_Ball; class B_762x51_Ball; + class Sh_155mm_AMOS; + class ShellBase; #include "LIB_Ammo.h" diff --git a/README.md b/README.md index bf1224e..bac922b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## WW2/ACE3 Tracer Compat

- Haas WWII Rebalance Version + WW2/ACE3 Tracer Compat

@@ -9,9 +9,9 @@ #### Required dependencies: * Required for all: [ACE3](https://github.com/acemod/ACE3) v3.1x.0, Tracers -- IFA3_ACE3_Tracer_Compat.pbo requires [IFA3 Lite](https://forums.bistudio.com/forums/topic/190809-iron-front-in-arm3-lite-preview-versions/) - Preview v25 +- IFA3_ACE3_Tracer_Compat.pbo requires [IFA3 Lite](https://forums.bistudio.com/forums/topic/190809-iron-front-in-arm3-lite-preview-versions/) - Preview v27 - LEN_ACE3_Tracer_Compat.pbo requires [LEN Weapons](https://forums.bistudio.com/forums/topic/200914-len-weapons-pack-for-ifa3-lite/) v1.0 -- FOW_ACE3_Tracer_Compat.pbo requires [FOW](https://forums.bistudio.com/forums/topic/198194-faces-of-war-ww2/) - Release IV +- FOW_ACE3_Tracer_Compat.pbo requires [FOW](https://forums.bistudio.com/forums/topic/198194-faces-of-war-ww2/) - Release V #### Releases Releases can be found [here](https://github.com/Drofseh/WW2_ACE3_Tracer_Compat/releases) diff --git a/mod.cpp b/mod.cpp index e446b0b..d311819 100644 --- a/mod.cpp +++ b/mod.cpp @@ -1,6 +1,6 @@ name = "WW2/ACE3 Tracer Compat"; author = "Wilhelm Haas (2PzD)"; -description = "WW2/ACE3 Tracer Compat - Version 1.0.0"; +description = "WW2/ACE3 Tracer Compat - Version 1.1.0"; overview = "This mod adds ACE3 Tracers to FOW, IFA3, and LEN Weapons ammunition."; logo = "Images\logo.paa"; logoOver = "Images\logo.paa";