W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a few weapon attachment bugs

Browse Source
This commit is contained in:
AirwavesMan
2020-06-28 22:41:41 +02:00
parent 09c368b938
commit e58001a8dd
8 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp
View File

@@ -15,5 +15,10 @@ class Attachment_FL_Pist : CA_Magazine
text = $STR_DZ_ATT_ACT_TO_SECONDARY; text = $STR_DZ_ATT_ACT_TO_SECONDARY;
script = "; [_id,0] call player_attachAttachment"; script = "; [_id,0] call player_attachAttachment";
}; };
class AttachToPrimary
{
text = $STR_DZ_ATT_ACT_TO_PRIMARY;
script = "; [_id,1] call player_attachAttachment";
};
}; };
}; };

5
SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp
View File

@@ -15,5 +15,10 @@ class Attachment_MFL_Pist : CA_Magazine
text = $STR_DZ_ATT_ACT_TO_SECONDARY; text = $STR_DZ_ATT_ACT_TO_SECONDARY;
script = "; [_id,0] call player_attachAttachment"; script = "; [_id,0] call player_attachAttachment";
}; };
class AttachToPrimary
{
text = $STR_DZ_ATT_ACT_TO_PRIMARY;
script = "; [_id,1] call player_attachAttachment";
};
}; };
}; };

2
SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp
View File

@@ -46,7 +46,7 @@ class MK22_SD_DZ: M9SD
class RemoveSuppressor class RemoveSuppressor
{ {
text = $STR_ATTACHMENT_RMVE_Silencer; text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup9',_id,'MK22_SD_DZ'] call player_removeAttachment"; script = "; ['Attachment_Sup9',_id,'MK22_DZ'] call player_removeAttachment";
}; };
}; };
}; };

1
SQF/dayz_code/Configs/CfgWeapons/Rifles/HK417.hpp
View File

@@ -548,6 +548,7 @@ class HK417_Sniper_SD_DZ: HK417_SD_DZ
discreteDistanceInitIndex = 2; discreteDistanceInitIndex = 2;
}; };
}; };
class ItemActions {};
}; };
#undef HK417_M203 #undef HK417_M203

5
SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp
View File

@@ -81,7 +81,7 @@ class MK14_DZ: M14_EP1
class MK14_CCO_DZ: MK14_DZ 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"; model = "\RH_mgswp\RH_mk14aim.p3d";
picture = "\RH_mgswp\inv\mk14aim.paa"; picture = "\RH_mgswp\inv\mk14aim.paa";
handAnim[] = {"OFP2_ManSkeleton","\RH_mgswp\anim\RH_M4cs.rtm"}; 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 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<br/>Caliber: 7.62x51mm NATO<br/>Scope power: 4X<br/>Vertical grip"; descriptionShort = "Suppressed assault rifle<br/>Caliber: 7.62x51mm NATO<br/>Scope power: 4X<br/>Vertical grip";
model = "\RH_mgswp\RH_mk14sdacog.p3d"; model = "\RH_mgswp\RH_mk14sdacog.p3d";
picture = "\RH_mgswp\inv\mk14sdacog.paa"; picture = "\RH_mgswp\inv\mk14sdacog.paa";
@@ -309,6 +309,7 @@ class MK14_Sniper_SD_DZ: MK14_SD_DZ
weaponInfoType = "RscWeaponZeroing"; weaponInfoType = "RscWeaponZeroing";
discreteDistance[] = {100,200,300,400,500,600,700,800}; discreteDistance[] = {100,200,300,400,500,600,700,800};
discreteDistanceInitIndex = 2; discreteDistanceInitIndex = 2;
class ItemActions {};
}; };
#undef MK14_ACOG #undef MK14_ACOG

13
SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp
View File

@@ -144,7 +144,7 @@ class MP7_FL_DZ: MP7_DZ
class Attachments class Attachments
{ {
Attachment_CCO = "MP7_CCO_FL_DZ"; Attachment_CCO = "MP7_CCO_FL_DZ";
Attachment_Holo = "MP7_Holo_DZ"; Attachment_Holo = "MP7_Holo_FL_DZ";
Attachment_ACOG = "MP7_ACOG_FL_DZ"; Attachment_ACOG = "MP7_ACOG_FL_DZ";
Attachment_Sup9 = "MP7_SD_FL_DZ"; Attachment_Sup9 = "MP7_SD_FL_DZ";
}; };
@@ -170,7 +170,7 @@ class MP7_MFL_DZ: MP7_DZ
class Attachments class Attachments
{ {
Attachment_CCO = "MP7_CCO_MFL_DZ"; Attachment_CCO = "MP7_CCO_MFL_DZ";
Attachment_Holo = "MP7_Holo_DZ"; Attachment_Holo = "MP7_Holo_MFL_DZ";
Attachment_ACOG = "MP7_ACOG_MFL_DZ"; Attachment_ACOG = "MP7_ACOG_MFL_DZ";
Attachment_Sup9 = "MP7_SD_MFL_DZ"; Attachment_Sup9 = "MP7_SD_MFL_DZ";
}; };
@@ -467,6 +467,15 @@ class MP7_SD_DZ: MP7_base
magazines[] = {"40Rnd_46x30_sd_mp7"}; magazines[] = {"40Rnd_46x30_sd_mp7"};
descriptionShort = $STR_DZ_WPN_MP7_SD_DESC; 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 ItemActions
{ {
class RemoveSuppressor class RemoveSuppressor

4
SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp
View File

@@ -77,6 +77,8 @@ class SVD_DZ : SVD_PSO1_DZ
Attachment_PSO1 = "SVD_PSO1_DZ"; Attachment_PSO1 = "SVD_PSO1_DZ";
Attachment_NSPU = "SVD_NSPU_DZ"; Attachment_NSPU = "SVD_NSPU_DZ";
}; };
class ItemActions {};
}; };
class SVD_Gh_DZ : SVD_DZ class SVD_Gh_DZ : SVD_DZ
@@ -167,4 +169,6 @@ class SVD_Gold_DZ : SVD_PSO1_DZ {
displayname = $STR_DZ_WPN_SVD_GOLD_NAME; displayname = $STR_DZ_WPN_SVD_GOLD_NAME;
model = "\RH_aks\RH_svdg.p3d"; model = "\RH_aks\RH_svdg.p3d";
picture = "\RH_aks\inv\svdg.paa"; picture = "\RH_aks\inv\svdg.paa";
class ItemActions {};
}; };

1
SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp
View File

@@ -6,4 +6,5 @@ class SVU_PSO1_DZ: SVD_PSO1_DZ {
begin1[] = {"\RH_aks\Sound\SVU.wss",1.778279,1,1200}; begin1[] = {"\RH_aks\Sound\SVU.wss",1.778279,1,1200};
soundBegin[] = {"begin1",1}; soundBegin[] = {"begin1",1};
magazines[] = {"10Rnd_762x54_SVD"}; magazines[] = {"10Rnd_762x54_SVD"};
class ItemActions {};
}; };