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.

Sign up for GitHub

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

Jump to bottom

G36 bugfixes #124

Merged
merged 2 commits into from Apr 2, 2019
Merged

G36 bugfixes #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b702fe
G36: Fixed tracer counts, fixed typo in subsonics
Blutze Dec 27, 2018
66db9ff
G36: added subsonic mag to macro
Blutze Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hlc_core/script_macros.hpp
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@
#define __762FN_MAGS "hlc_10Rnd_762x51_B_fal", "hlc_10Rnd_762x51_mk316_fal", "hlc_10Rnd_762x51_Barrier_fal", "hlc_10Rnd_762x51_t_fal", "hlc_10Rnd_762x51_TDim_fal", "hlc_10Rnd_762x51_S_fal"
#define __300WM_MAGS "hlc_5rnd_300WM_FMJ_AWM", "hlc_5rnd_300WM_mk248_AWM", "hlc_5rnd_300WM_BTSP_AWM", "hlc_5rnd_300WM_AP_AWM", "hlc_5rnd_300WM_SBT_AWM", "hlc_5rnd_300WM_T_AWM"

#define __556G36_MAGS "hlc_30rnd_556x45_EPR_G36", "hlc_30rnd_556x45_SOST_G36", "hlc_100rnd_556x45_EPR_G36", "hlc_30rnd_556x45_SPR_G36", "hlc_30rnd_556x45_Tracers_G36","hlc_30rnd_556x45_MDIM_G36", "hlc_30rnd_556x45_TDIM_G36", "hlc_100rnd_556x45_M_G36" ,"hlc_100rnd_556x45_Mdim_G36"
#define __556G36_MAGS "hlc_30rnd_556x45_EPR_G36", "hlc_30rnd_556x45_SOST_G36", "hlc_100rnd_556x45_EPR_G36", "hlc_30rnd_556x45_SPR_G36", "hlc_30rnd_556x45_Tracers_G36","hlc_30rnd_556x45_MDIM_G36", "hlc_30rnd_556x45_TDIM_G36", "hlc_100rnd_556x45_M_G36", "hlc_100rnd_556x45_Mdim_G36", "hlc_30rnd_556x45_S_G36"
#define __556G36_CUP_MAGS "CUP_30Rnd_556x45_G36", "CUP_30Rnd_TE1_Red_Tracer_556x45_G36", "CUP_30Rnd_TE1_Green_Tracer_556x45_G36", "CUP_30Rnd_TE1_Yellow_Tracer_556x45_G36", "CUP_100Rnd_556x45_BetaCMag", "CUP_100Rnd_TE1_Red_Tracer_556x45_BetaCMag", "CUP_100Rnd_TE1_Green_Tracer_556x45_BetaCMag", "CUP_100Rnd_TE1_Yellow_Tracer_556x45_BetaCMag"
#define __556G36_BWA3_MAGS "BWA3_30Rnd_556x45_G36", "BWA3_30Rnd_556x45_G36_Tracer", "BWA3_30Rnd_556x45_G36_Tracer_Dim", "BWA3_30Rnd_556x45_G36_SD", "BWA3_30Rnd_556x45_G36_AP", "BWA3_100Rnd_556x45_G36", "BWA3_100Rnd_556x45_G36_Tracer"
#define __556G36_RHS_MAGS "rhssaf_30rnd_556x45_EPR_G36", "rhssaf_30rnd_556x45_SOST_G36", "rhssaf_30rnd_556x45_SPR_G36", "rhssaf_100rnd_556x45_EPR_G36", "rhssaf_30rnd_556x45_Tracers_G36", "rhssaf_30rnd_556x45_TDIM_G36", "rhssaf_30rnd_556x45_MDIM_G36"
Expand Down
6 changes: 3 additions & 3 deletions hlc_wp_g36/config.cpp
View file
Open in desktop
Expand Up @@ -420,7 +420,7 @@ class CfgMagazines {
mass = 46;
lastroundstracer = 5;
scope = 2;
tracersevery = 0;
tracersevery = 4;
displaynameshort = "EPR/Tracer";
model = "\hlc_wp_g36\mesh\magazine\magazine_cmag.p3d";
picture = "\hlc_wp_g36\tex\ui\m_g36_CMAG_ca.paa";
Expand All @@ -436,7 +436,7 @@ class CfgMagazines {
mass = 46;
lastroundstracer = 5;
scope = 2;
tracersevery = 0;
tracersevery = 4;
displaynameshort = "EPR/IR-DIM";
model = "\hlc_wp_g36\mesh\magazine\magazine_cmag.p3d";
picture = "\hlc_wp_g36\tex\ui\m_g36_CMAG_ca.paa";
Expand All @@ -445,7 +445,7 @@ class CfgMagazines {
author = "Toadie";
initspeed = 340;
descriptionshort = "Caliber: 5.56x45mm NATO Cold-load M855A1<br />Type: Reverse Drawn Full Metal Jacket Exposed Penetrator (Enhanced Performance Round)<br />Rounds: 30";
displayname = "5.56mm Subsonioc 30Rnd G36 Magazine";
displayname = "5.56mm Subsonic 30Rnd G36 Magazine";
};
class hlc_30rnd_556x45_Tracers_G36 : 30Rnd_556x45_Stanag {
dlc = "Niarms_G36";
Expand Down