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

Update compatible magazines for DZ weapons

Browse Source 
See comments on commit e99d625
This commit is contained in:
ebayShopper
2017-12-20 15:32:29 -05:00
parent e99d6259a2
commit 4561deefa6
21 changed files with 91 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.2.txt
View File

@@ -41,6 +41,7 @@
[UPDATED] Player is no longer set in combat for throwing a flare or chemlight [UPDATED] Player is no longer set in combat for throwing a flare or chemlight
[UPDATED] CSJ_Gyro push script so it no longer spams global setPos. This allows MaxSetPosPerInterval to be filtered in BEServer.cfg. [UPDATED] CSJ_Gyro push script so it no longer spams global setPos. This allows MaxSetPosPerInterval to be filtered in BEServer.cfg.
[UPDATED] Updated DatabaseMySQL.dll to MySQL version 5.7.20, server admins should update to MySQL server 5.7.20 or above. Updated tbb.dll and tbbmalloc.dll to Intel TBB 2017 [UPDATED] Updated DatabaseMySQL.dll to MySQL version 5.7.20, server admins should update to MySQL server 5.7.20 or above. Updated tbb.dll and tbbmalloc.dll to Intel TBB 2017
[UPDATED] Some DZ weapons which had magazine types restricted (AK, G17, M249, PDW) can now use all compatible A2 magazines. Silenced DZ weapons can now use both SD and non-SD magazines again.
[FIXED] Purchased and upgraded vehicles will now spawn quicker and no longer be destroyed by sched_safetyVehicle when server FPS is low. HiveExt.dll and SQL must be updated. See 1.0.6.2_Updates.sql [FIXED] Purchased and upgraded vehicles will now spawn quicker and no longer be destroyed by sched_safetyVehicle when server FPS is low. HiveExt.dll and SQL must be updated. See 1.0.6.2_Updates.sql
[FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc [FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc

10
SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGunAmmo.hpp
View File

@@ -9,6 +9,11 @@ class Category_622 {
buy[] = {4,"ItemGoldBar"}; buy[] = {4,"ItemGoldBar"};
sell[] = {2,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"};
}; };
class 200Rnd_556x45_L110A1 {
type = "trade_items";
buy[] = {4,"ItemGoldBar"};
sell[] = {2,"ItemGoldBar"};
};
class 100Rnd_762x51_M240 { class 100Rnd_762x51_M240 {
type = "trade_items"; type = "trade_items";
buy[] = {2,"ItemGoldBar"}; buy[] = {2,"ItemGoldBar"};
@@ -24,6 +29,11 @@ class Category_622 {
buy[] = {2,"ItemGoldBar"}; buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"};
}; };
class 45Rnd_545x39_RPK {
type = "trade_items";
buy[] = {1,"ItemGoldBar"};
sell[] = {5,"ItemSilverBar10oz"};
};
class 75Rnd_545x39_RPK { class 75Rnd_545x39_RPK {
type = "trade_items"; type = "trade_items";
buy[] = {2,"ItemGoldBar"}; buy[] = {2,"ItemGoldBar"};

8
SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp
View File

@@ -7,7 +7,9 @@ class G17_DZ : glock17_EP1
magazines[] = magazines[] =
{ {
17Rnd_9x19_glock17, 17Rnd_9x19_glock17,
17Rnd_9x19_glock17SD 17Rnd_9x19_glock17SD, //not an A2 mag
15Rnd_9x19_M9,
15Rnd_9x19_M9SD
}; };
delete FlashLight; delete FlashLight;
@@ -93,7 +95,9 @@ class G17_SD_DZ : M9SD
magazines[] = magazines[] =
{ {
17Rnd_9x19_glock17SD, 17Rnd_9x19_glock17SD,
17Rnd_9x19_glock17 17Rnd_9x19_glock17, //Allow both SD and non-SD
15Rnd_9x19_M9SD,
15Rnd_9x19_M9
}; };
reloadMagazineSound[]={"Ca\Sounds_E\Weapons_E\Glock17\reload1",db0,1, 20}; reloadMagazineSound[]={"Ca\Sounds_E\Weapons_E\Glock17\reload1",db0,1, 20};

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

@@ -22,7 +22,7 @@ class M9_SD_DZ : M9SD
magazines[] = magazines[] =
{ {
15Rnd_9x19_M9SD, 15Rnd_9x19_M9SD,
15Rnd_9x19_M9 15Rnd_9x19_M9 //Allow both SD and non-SD
}; };
class ItemActions class ItemActions

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

@@ -20,7 +20,7 @@ class Makarov_SD_DZ : MakarovSD
magazines[] = magazines[] =
{ {
8Rnd_9x18_MakarovSD, 8Rnd_9x18_MakarovSD,
8Rnd_9x18_Makarov 8Rnd_9x18_Makarov //Allow both SD and non-SD
}; };
class ItemActions class ItemActions

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

@@ -1,8 +1,10 @@
class PDW_DZ : UZI_EP1 class PDW_DZ : UZI_EP1
{ {
/* //Allow default A2 mags
magazines[] = magazines[] =
{ {
30Rnd_9x19_UZI, 30Rnd_9x19_UZI,
30Rnd_9x19_UZI_SD 30Rnd_9x19_UZI_SD
}; };
*/
}; };

8
SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp
View File

@@ -5,13 +5,13 @@ class AK74_Kobra_DZ : AK_74
model = "z\addons\dayz_communityweapons\ak74\ak74_kobra.p3d"; model = "z\addons\dayz_communityweapons\ak74\ak74_kobra.p3d";
picture = "\z\addons\dayz_communityweapons\ak74\data\w_ak74_kobra_ca.paa"; picture = "\z\addons\dayz_communityweapons\ak74\data\w_ak74_kobra_ca.paa";
displayName = $STR_DZ_WPN_AK74_KOBRA_NAME; displayName = $STR_DZ_WPN_AK74_KOBRA_NAME;
/* //Allow default A2 mags
magazines[] = magazines[] =
{ {
30Rnd_545x39_AK, 30Rnd_545x39_AK,
30Rnd_545x39_AKSD 30Rnd_545x39_AKSD
}; };
*/
class Attachments class Attachments
{ {
Attachment_GP25 = "AK74_GL_Kobra_DZ"; Attachment_GP25 = "AK74_GL_Kobra_DZ";
@@ -37,7 +37,9 @@ class AK74_Kobra_SD_DZ : AKS_74_UN_kobra
magazines[] = magazines[] =
{ {
30Rnd_545x39_AKSD, 30Rnd_545x39_AKSD,
30Rnd_545x39_AK 30Rnd_545x39_AK, //Allow both SD and non-SD
45Rnd_545x39_RPK,
75Rnd_545x39_RPK
}; };
class Attachments class Attachments

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp
View File

@@ -4,7 +4,7 @@ class AKM_DZ : AK_47_M
picture = "\z\addons\dayz_communityweapons\akm\data\w_akm_ca.paa"; picture = "\z\addons\dayz_communityweapons\akm\data\w_akm_ca.paa";
displayName = $STR_DZ_WPN_AKM_NAME; displayName = $STR_DZ_WPN_AKM_NAME;
magazines[] = {30Rnd_762x39_AK47}; //magazines[] = {30Rnd_762x39_AK47}; //Allow default A2 mags
//iron sight zeroing //iron sight zeroing
weaponInfoType = "RscWeaponZeroing"; weaponInfoType = "RscWeaponZeroing";

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp
View File

@@ -34,7 +34,7 @@ class AKS74U_Kobra_SD_DZ : AKS_74_UN_kobra
magazines[] = magazines[] =
{ {
30Rnd_545x39_AKSD, 30Rnd_545x39_AKSD,
30Rnd_545x39_AK 30Rnd_545x39_AK //Allow both SD and non-SD
}; };
class ItemActions class ItemActions

12
SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
View File

@@ -3,7 +3,7 @@ class G36K_Camo_DZ : G36C
model = "z\addons\dayz_communityweapons\g36\g36k_camo.p3d"; model = "z\addons\dayz_communityweapons\g36\g36k_camo.p3d";
picture = "\z\addons\dayz_communityweapons\g36\data\w_g36k_camo_ca.paa"; picture = "\z\addons\dayz_communityweapons\g36\data\w_g36k_camo_ca.paa";
displayName = $STR_DZ_WPN_G36K_CAMO_NAME; displayName = $STR_DZ_WPN_G36K_CAMO_NAME;
/* /* //Allow default A2 mags
magazines[] = magazines[] =
{ {
30Rnd_556x45_G36, 30Rnd_556x45_G36,
@@ -84,13 +84,17 @@ class G36K_Camo_SD_DZ : G36_C_SD_eotech
model = "z\addons\dayz_communityweapons\g36\g36k_camo_sd.p3d"; model = "z\addons\dayz_communityweapons\g36\g36k_camo_sd.p3d";
picture = "\z\addons\dayz_communityweapons\g36\data\w_g36k_camo_sd_ca.paa"; picture = "\z\addons\dayz_communityweapons\g36\data\w_g36k_camo_sd_ca.paa";
displayName = $STR_DZ_WPN_G36K_CAMO_SD_NAME; displayName = $STR_DZ_WPN_G36K_CAMO_SD_NAME;
/*
magazines[] = magazines[] =
{ {
30Rnd_556x45_G36SD, 30Rnd_556x45_G36SD,
30Rnd_556x45_G36 30Rnd_556x45_G36, //Allow both SD and non-SD
100Rnd_556x45_BetaCMag,
30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD,
20Rnd_556x45_Stanag
}; };
*/
//G36 Optic //G36 Optic
optics = true; optics = true;
opticsDisablePeripherialVision = true; opticsDisablePeripherialVision = true;

12
SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp
View File

@@ -41,7 +41,7 @@ class G36C_DZ : G36C
model = "z\addons\dayz_communityweapons\g36c\g36c.p3d"; model = "z\addons\dayz_communityweapons\g36c\g36c.p3d";
picture = "\z\addons\dayz_communityweapons\g36c\data\w_g36c_ca.paa"; picture = "\z\addons\dayz_communityweapons\g36c\data\w_g36c_ca.paa";
displayName = $STR_DZ_WPN_G36C_NAME; displayName = $STR_DZ_WPN_G36C_NAME;
/* /* //Allow default A2 mags
magazines[] = magazines[] =
{ {
30Rnd_556x45_G36, 30Rnd_556x45_G36,
@@ -62,13 +62,17 @@ class G36C_SD_DZ : G36_C_SD_eotech
model = "z\addons\dayz_communityweapons\g36c\g36c_sd.p3d"; model = "z\addons\dayz_communityweapons\g36c\g36c_sd.p3d";
picture = "\z\addons\dayz_communityweapons\g36c\data\w_g36c_sd_ca.paa"; picture = "\z\addons\dayz_communityweapons\g36c\data\w_g36c_sd_ca.paa";
displayName = $STR_DZ_WPN_G36C_SD_NAME; displayName = $STR_DZ_WPN_G36C_SD_NAME;
/*
magazines[] = magazines[] =
{ {
30Rnd_556x45_G36SD, 30Rnd_556x45_G36SD,
30Rnd_556x45_G36 30Rnd_556x45_G36, //Allow both SD and non-SD
100Rnd_556x45_BetaCMag,
30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD,
20Rnd_556x45_Stanag
}; };
*/
class Attachments class Attachments
{ {
Attachment_CCO = "G36C_CCO_SD_DZ"; Attachment_CCO = "G36C_CCO_SD_DZ";

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

@@ -5,7 +5,7 @@ class L110A1_CCO_DZ : BAF_L110A1_Aim
displayName = $STR_DZ_WPN_L110A1_CCO_NAME; displayName = $STR_DZ_WPN_L110A1_CCO_NAME;
irDistance = 0; irDistance = 0;
type = WeaponSlotPrimary; type = WeaponSlotPrimary;
/* //Allow default A2 mags
magazines[] = magazines[] =
{ {
200Rnd_556x45_M249, 200Rnd_556x45_M249,
@@ -13,7 +13,7 @@ class L110A1_CCO_DZ : BAF_L110A1_Aim
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
}; };
*/
class ItemActions class ItemActions
{ {
class RemoveCCO class RemoveCCO

8
SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp
View File

@@ -68,7 +68,7 @@ class L85A2_DZ : BAF_L85A2_RIS_Holo
irDistance = 0; irDistance = 0;
/* /* //Allow default A2 mags
magazines[] = magazines[] =
{ {
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
@@ -145,8 +145,10 @@ class L85A2_SD_Base : L85A2_DZ
{ {
magazines[] = magazines[] =
{ {
// 30Rnd_556x45_Stanag, "30Rnd_556x45_StanagSD",
30Rnd_556x45_StanagSD "30Rnd_556x45_Stanag", //Allow both SD and non-SD
"30Rnd_556x45_G36SD",
"30Rnd_556x45_G36"
}; };
fireLightDuration = 0; fireLightDuration = 0;
fireLightIntensity = 0; fireLightIntensity = 0;

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

@@ -65,11 +65,11 @@ class M16A4_DZ : M16A2
picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_ca.paa"; picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_ca.paa";
displayName = $STR_DZ_WPN_M16A4; displayName = $STR_DZ_WPN_M16A4;
/*magazines[] = /*magazines[] = //Allow default A2 mags
{ {
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
};*/ //Allow use of G36 mags };*/
class Attachments class Attachments
{ {

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

@@ -6,13 +6,13 @@ class M249_CCO_DZ : M249
type = WeaponSlotPrimary; type = WeaponSlotPrimary;
magazines[] = /*magazines[] = //Allow default A2 mags
{ {
200Rnd_556x45_M249, 200Rnd_556x45_M249,
100Rnd_556x45_M249, 100Rnd_556x45_M249,
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
}; };*/
class ItemActions class ItemActions
{ {

14
SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp
View File

@@ -71,11 +71,11 @@ class M4A1_DZ : M4A1
handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"}; handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"};
/*magazines[] = /*magazines[] = //Allow default A2 mags
{ {
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
};*/ //Allow use of G36 mags };*/
class Attachments class Attachments
{ {
@@ -163,11 +163,15 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo
handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"}; handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"};
/*magazines[] = magazines[] =
{ {
30Rnd_556x45_StanagSD, 30Rnd_556x45_StanagSD,
30Rnd_556x45_Stanag 30Rnd_556x45_Stanag, //Allow both SD and non-SD
};*/ //Allow use of G36 mags 20Rnd_556x45_Stanag,
30Rnd_556x45_G36SD,
30Rnd_556x45_G36,
100Rnd_556x45_BetaCMag
};
class Attachments class Attachments
{ {

16
SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp
View File

@@ -6,7 +6,13 @@ class MP5_DZ : MP5A5
magazines[] = magazines[] =
{ {
30Rnd_9x19_MP5, 30Rnd_9x19_MP5,
30Rnd_9x19_MP5SD 30Rnd_9x19_MP5SD,
30Rnd_9x19_UZI,
30Rnd_9x19_UZI_SD,
15Rnd_9x19_M9,
15Rnd_9x19_M9SD,
17Rnd_9x19_glock17,
17Rnd_9x19_glock17SD //not an A2 mag
}; };
class Attachments class Attachments
@@ -25,7 +31,13 @@ class MP5_SD_DZ : MP5SD
magazines[] = magazines[] =
{ {
30Rnd_9x19_MP5SD, 30Rnd_9x19_MP5SD,
30Rnd_9x19_MP5 30Rnd_9x19_MP5, //Allow both SD and non-SD
30Rnd_9x19_UZI_SD,
30Rnd_9x19_UZI,
15Rnd_9x19_M9SD,
15Rnd_9x19_M9,
17Rnd_9x19_glock17SD,
17Rnd_9x19_glock17
}; };
class ItemActions class ItemActions

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK.hpp
View File

@@ -10,7 +10,8 @@ class RPK_DZ : AK_47_M
magazines[] = magazines[] =
{ {
75Rnd_762x39_RPK, 75Rnd_762x39_RPK,
30Rnd_762x39_AK47 30Rnd_762x39_AK47,
30Rnd_762x39_SA58
}; };
modes[] = {FullAuto,Single}; modes[] = {FullAuto,Single};

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp
View File

@@ -6,7 +6,8 @@ class RPK74_Kobra_DZ : RPK_74
magazines[] = magazines[] =
{ {
75Rnd_545x39_RPK, 75Rnd_545x39_RPK, //75 was moved to first in array
45Rnd_545x39_RPK,
30Rnd_545x39_AK, 30Rnd_545x39_AK,
30Rnd_545x39_AKSD 30Rnd_545x39_AKSD
}; };

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp
View File

@@ -27,7 +27,7 @@ class SA58_DZ : Sa58V_EP1
displayName = $STR_DZ_WPN_SA58_NAME; displayName = $STR_DZ_WPN_SA58_NAME;
modes[] = {Single, FullAuto}; modes[] = {Single, FullAuto};
magazines[] = {30Rnd_762x39_SA58}; //magazines[] = {30Rnd_762x39_SA58}; //Allow default A2 mags
weaponInfoType = "RscWeaponZeroing"; weaponInfoType = "RscWeaponZeroing";
discreteDistance[] = {100,200,300,400,500,600,700,800}; discreteDistance[] = {100,200,300,400,500,600,700,800};

9
SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/LMGAmmo.hpp vendored
View File

@@ -7,7 +7,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
@version 1.00 @version 1.00
@date 20101006 @date 20101006
*****************************************************************************/ *****************************************************************************/
class 200Rnd_556x45_L110A1
{
weight = 10;
};
class 200Rnd_556x45_M249 class 200Rnd_556x45_M249
{ {
weight = 10; weight = 10;
@@ -28,6 +31,10 @@ class 75Rnd_545x39_RPK
{ {
weight = 1.25; weight = 1.25;
}; };
class 45Rnd_545x39_RPK
{
weight = 1;
};
class 75Rnd_762x39_RPK class 75Rnd_762x39_RPK
{ {
weight = 1.5; weight = 1.5;