diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp index 625057f03..def3ea7ca 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp @@ -15,5 +15,10 @@ class Attachment_FL_Pist : CA_Magazine text = $STR_DZ_ATT_ACT_TO_SECONDARY; script = "; [_id,0] call player_attachAttachment"; }; + class AttachToPrimary + { + text = $STR_DZ_ATT_ACT_TO_PRIMARY; + script = "; [_id,1] call player_attachAttachment"; + }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp index ae5d43f41..9f37589a4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp @@ -15,5 +15,10 @@ class Attachment_MFL_Pist : CA_Magazine text = $STR_DZ_ATT_ACT_TO_SECONDARY; script = "; [_id,0] call player_attachAttachment"; }; + class AttachToPrimary + { + text = $STR_DZ_ATT_ACT_TO_PRIMARY; + script = "; [_id,1] call player_attachAttachment"; + }; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp index cc3010114..9a2e0640a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp @@ -46,7 +46,7 @@ class MK22_SD_DZ: M9SD class RemoveSuppressor { text = $STR_ATTACHMENT_RMVE_Silencer; - script = "; ['Attachment_Sup9',_id,'MK22_SD_DZ'] call player_removeAttachment"; + script = "; ['Attachment_Sup9',_id,'MK22_DZ'] call player_removeAttachment"; }; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK417.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK417.hpp index c22d3c119..e7cfd931a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK417.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK417.hpp @@ -548,6 +548,7 @@ class HK417_Sniper_SD_DZ: HK417_SD_DZ discreteDistanceInitIndex = 2; }; }; + class ItemActions {}; }; #undef HK417_M203 diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp index 86d78372d..1e1019f93 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp @@ -81,7 +81,7 @@ class MK14_DZ: M14_EP1 class MK14_CCO_DZ: MK14_DZ { - displayName = $STR_DZ_WPN_MK14_CCO_SD_NAME; + displayName = $STR_DZ_WPN_MK14_CCO_NAME; model = "\RH_mgswp\RH_mk14aim.p3d"; picture = "\RH_mgswp\inv\mk14aim.paa"; handAnim[] = {"OFP2_ManSkeleton","\RH_mgswp\anim\RH_M4cs.rtm"}; @@ -266,7 +266,7 @@ class MK14_Holo_SD_DZ: MK14_SD_DZ class MK14_ACOG_SD_DZ: MK14_SD_DZ { - displayName = $STR_DZ_WPN_MK14_HOLO_SD_NAME; + displayName = $STR_DZ_WPN_MK14_ACOG_SD_NAME; descriptionShort = "Suppressed assault rifle
Caliber: 7.62x51mm NATO
Scope power: 4X
Vertical grip"; model = "\RH_mgswp\RH_mk14sdacog.p3d"; picture = "\RH_mgswp\inv\mk14sdacog.paa"; @@ -309,6 +309,7 @@ class MK14_Sniper_SD_DZ: MK14_SD_DZ weaponInfoType = "RscWeaponZeroing"; discreteDistance[] = {100,200,300,400,500,600,700,800}; discreteDistanceInitIndex = 2; + class ItemActions {}; }; #undef MK14_ACOG \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp index df3ede469..3891a916a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp @@ -144,7 +144,7 @@ class MP7_FL_DZ: MP7_DZ class Attachments { Attachment_CCO = "MP7_CCO_FL_DZ"; - Attachment_Holo = "MP7_Holo_DZ"; + Attachment_Holo = "MP7_Holo_FL_DZ"; Attachment_ACOG = "MP7_ACOG_FL_DZ"; Attachment_Sup9 = "MP7_SD_FL_DZ"; }; @@ -170,7 +170,7 @@ class MP7_MFL_DZ: MP7_DZ class Attachments { Attachment_CCO = "MP7_CCO_MFL_DZ"; - Attachment_Holo = "MP7_Holo_DZ"; + Attachment_Holo = "MP7_Holo_MFL_DZ"; Attachment_ACOG = "MP7_ACOG_MFL_DZ"; Attachment_Sup9 = "MP7_SD_MFL_DZ"; }; @@ -467,6 +467,15 @@ class MP7_SD_DZ: MP7_base magazines[] = {"40Rnd_46x30_sd_mp7"}; descriptionShort = $STR_DZ_WPN_MP7_SD_DESC; + class Attachments + { + Attachment_CCO = "MP7_CCO_SD_DZ"; + Attachment_Holo = "MP7_Holo_SD_DZ"; + Attachment_ACOG = "MP7_ACOG_SD_DZ"; + Attachment_FL_Pist = "MP7_SD_FL_DZ"; + Attachment_MFL_Pist = "MP7_SD_MFL_DZ"; + }; + class ItemActions { class RemoveSuppressor diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp index 229dc455b..c31893b96 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp @@ -77,6 +77,8 @@ class SVD_DZ : SVD_PSO1_DZ Attachment_PSO1 = "SVD_PSO1_DZ"; Attachment_NSPU = "SVD_NSPU_DZ"; }; + + class ItemActions {}; }; class SVD_Gh_DZ : SVD_DZ @@ -167,4 +169,6 @@ class SVD_Gold_DZ : SVD_PSO1_DZ { displayname = $STR_DZ_WPN_SVD_GOLD_NAME; model = "\RH_aks\RH_svdg.p3d"; picture = "\RH_aks\inv\svdg.paa"; + + class ItemActions {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp index 3826c6a44..9daed7a28 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp @@ -6,4 +6,5 @@ class SVU_PSO1_DZ: SVD_PSO1_DZ { begin1[] = {"\RH_aks\Sound\SVU.wss",1.778279,1,1200}; soundBegin[] = {"begin1",1}; magazines[] = {"10Rnd_762x54_SVD"}; + class ItemActions {}; }; \ No newline at end of file