Change used ammo for weapons

This commitment changes the type of ammo that can be used in silenced and non-silenced weapons. SD and non-SD ammo can currently be used in all weapon variations. We know this is possible and normal in real life, but arma weapons and ammo work in an unrealistic way. In the current state a SD weapon is almost no longer necessary since all normal weapons can be used with SD ammo to avoid triggering zombies or AIs. This is the same way that regular ammo in SD weapons works. This triggers AI's and zombies but not players. With this commitment we restore the actual and intended purpose of silenced weapons. SD ammo and SD weapons will have more relevance after this change. All silenced weapons can now only be used with SD ammo, and all non-silenced weapons can only be used with regular (non-SD) ammo.
This commit is contained in:
A Man
2020-02-20 16:06:01 +01:00
parent 2a41d122f6
commit 6f4b1706e3
26 changed files with 99 additions and 149 deletions

View File

@@ -2,21 +2,21 @@ class CZ_75_P_07_DUTY;
class CZ75P_DZ: CZ_75_P_07_DUTY {
displayName = $STR_DZ_WPN_CZ75P_NAME;
descriptionShort = $STR_DZ_WPN_CZ75_DESC;
magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"};
magazines[] = {"18Rnd_9x19_Phantom"};
};
class CZ_75_D_COMPACT;
class CZ75D_DZ: CZ_75_D_COMPACT {
displayName = $STR_DZ_WPN_CZ75D_NAME;
descriptionShort = $STR_DZ_WPN_CZ75_DESC;
magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"};
magazines[] = {"18Rnd_9x19_Phantom"};
};
class CZ_75_SP_01_PHANTOM;
class CZ75SP_DZ: CZ_75_SP_01_PHANTOM {
displayName = $STR_DZ_WPN_CZ75SP_NAME;
descriptionShort = $STR_DZ_WPN_CZ75_DESC;
magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"};
magazines[] = {"18Rnd_9x19_Phantom"};
class Attachments
{

View File

@@ -2,15 +2,8 @@ class G17_DZ : glock17_EP1
{
model = "z\addons\dayz_communityweapons\g17\g17.p3d";
picture = "\z\addons\dayz_communityweapons\g17\data\w_g17_ca.paa";
displayName = $STR_DZ_WPN_G17_NAME;
magazines[] =
{
17Rnd_9x19_glock17,
17Rnd_9x19_glock17SD, //not an A2 mag
15Rnd_9x19_M9,
15Rnd_9x19_M9SD
};
displayName = $STR_DZ_WPN_G17_NAME;
magazines[] = {"17Rnd_9x19_glock17"};
delete FlashLight;
@@ -26,7 +19,7 @@ class G17_FL_DZ : G17_DZ
{
model = "z\addons\dayz_communityweapons\g17\g17_fl.p3d";
picture = "\z\addons\dayz_communityweapons\g17\data\w_g17_fl_ca.paa";
displayName = $STR_DZ_WPN_G17_FL_NAME;
displayName = $STR_DZ_WPN_G17_FL_NAME;
class FlashLight
{
@@ -91,14 +84,7 @@ class G17_SD_DZ : M9SD
model = "z\addons\dayz_communityweapons\g17\g17_sd.p3d";
picture = "\z\addons\dayz_communityweapons\g17\data\w_g17_sd_ca.paa";
displayName = $STR_DZ_WPN_G17_SD_NAME;
magazines[] =
{
17Rnd_9x19_glock17SD,
17Rnd_9x19_glock17, //Allow both SD and non-SD
15Rnd_9x19_M9SD,
15Rnd_9x19_M9
};
magazines[] = {"17Rnd_9x19_glock17SD"};
reloadMagazineSound[]={"Ca\Sounds_E\Weapons_E\Glock17\reload1",db0,1, 20};

View File

@@ -4,12 +4,7 @@ class M9_DZ: M9
begin1[] = {"\RH_de\Sound\m93r.wss",0.794328,1,700};
soundBegin[] = {"begin1",1};
magazines[] =
{
15Rnd_9x19_M9,
15Rnd_9x19_M9SD
};
magazines[] = {"15Rnd_9x19_M9"};
class Attachments
{
@@ -25,12 +20,7 @@ class M9_SD_DZ: M9SD
begin1[] = {"\RH_de\Sound\m9sd.wss",0.316228,1,200};
soundBegin[] = {"begin1",1};
magazines[] =
{
15Rnd_9x19_M9SD,
15Rnd_9x19_M9 //Allow both SD and non-SD
};
magazines[] = {"15Rnd_9x19_M9SD"};
class ItemActions
{
@@ -77,11 +67,7 @@ class M93R_DZ: M9
UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
modes[] = {"Single","Burst"};
magazines[] =
{
20Rnd_9x19_M93R,
15Rnd_9x19_M9
};
magazines[] = {"20Rnd_9x19_M93R","15Rnd_9x19_M9"};
class Single: Mode_SemiAuto
{

View File

@@ -1,11 +1,7 @@
class Makarov_DZ : Makarov
{
displayName = $STR_DZ_WPN_PM_NAME;
magazines[] =
{
8Rnd_9x18_Makarov,
8Rnd_9x18_MakarovSD
};
magazines[] = {"8Rnd_9x18_Makarov"};
class Attachments
{
@@ -17,11 +13,7 @@ class Makarov_DZ : Makarov
class Makarov_SD_DZ : MakarovSD
{
displayName = $STR_DZ_WPN_PM_SD_NAME;
magazines[] =
{
8Rnd_9x18_MakarovSD,
8Rnd_9x18_Makarov //Allow both SD and non-SD
};
magazines[] = {"8Rnd_9x18_MakarovSD"};
class ItemActions
{

View File

@@ -6,7 +6,7 @@ class P99_Black_DZ: M9
soundBegin[] = {"begin1",1};
begin1[] = {"\C1987_P99\sound\p99.wss",1.0,1};
reloadMagazineSound[] = {"\C1987_P99\sound\p99_reload.wss",0.1,1,20};
magazines[] = {"15Rnd_10x22_p99","15Rnd_10x22_p99_sd"};
magazines[] = {"15Rnd_10x22_p99"};
descriptionShort = $STR_DZ_WPN_P99_DESC;
class Library
{

View File

@@ -29,6 +29,8 @@ class PDW_DZ : UZI_EP1
maxRange = 50;
maxRangeProbab = 0.02;
};
magazines[] = {"30Rnd_9x19_UZI"};
class Attachments
{
@@ -63,6 +65,8 @@ class PDW_SD_DZ : UZI_SD_EP1
maxRangeProbab = 0.02;
};
magazines[] = {"30Rnd_9x19_UZI_SD"};
class ItemActions
{
class RemoveSuppressor