From 14e4e0ac5a6f71ee16bf511a35af149f7ea01040 Mon Sep 17 00:00:00 2001 From: A Man Date: Tue, 16 Aug 2016 00:35:13 +0200 Subject: [PATCH 1/2] Updating for old magazines --- SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp | 8 ++++---- SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp | 8 ++++---- SQF/dayz_code/Configs/CfgWeapons/Rifles/L85.hpp | 2 ++ SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp | 4 ++++ SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp | 4 ++-- SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp | 8 ++++---- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp index 993dd6c53..a6a2b1285 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp @@ -3,13 +3,13 @@ class G36K_Camo_DZ : G36C model = "z\addons\dayz_communityweapons\g36\g36k_camo.p3d"; picture = "\z\addons\dayz_communityweapons\g36\data\w_g36k_camo_ca.paa"; displayName = $STR_DZ_WPN_G36K_CAMO_NAME; - + /* magazines[] = { 30Rnd_556x45_G36, 30Rnd_556x45_G36SD }; - + */ //G36 Optic optics = true; opticsDisablePeripherialVision = true; @@ -84,13 +84,13 @@ class G36K_Camo_SD_DZ : G36_C_SD_eotech model = "z\addons\dayz_communityweapons\g36\g36k_camo_sd.p3d"; picture = "\z\addons\dayz_communityweapons\g36\data\w_g36k_camo_sd_ca.paa"; displayName = $STR_DZ_WPN_G36K_CAMO_SD_NAME; - + /* magazines[] = { 30Rnd_556x45_G36SD, 30Rnd_556x45_G36 }; - + */ //G36 Optic optics = true; opticsDisablePeripherialVision = true; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp index 8ca077b32..e56fbfb81 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp @@ -41,13 +41,13 @@ class G36C_DZ : G36C model = "z\addons\dayz_communityweapons\g36c\g36c.p3d"; picture = "\z\addons\dayz_communityweapons\g36c\data\w_g36c_ca.paa"; displayName = $STR_DZ_WPN_G36C_NAME; - + /* magazines[] = { 30Rnd_556x45_G36, 30Rnd_556x45_G36SD }; - + */ class Attachments { Attachment_CCO = "G36C_CCO_DZ"; @@ -61,13 +61,13 @@ class G36C_SD_DZ : G36_C_SD_eotech model = "z\addons\dayz_communityweapons\g36c\g36c_sd.p3d"; picture = "\z\addons\dayz_communityweapons\g36c\data\w_g36c_sd_ca.paa"; displayName = $STR_DZ_WPN_G36C_SD_NAME; - + /* magazines[] = { 30Rnd_556x45_G36SD, 30Rnd_556x45_G36 }; - + */ class Attachments { Attachment_CCO = "G36C_CCO_SD_DZ"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85.hpp index ebb851ff0..0c6cf8fed 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85.hpp @@ -1,8 +1,10 @@ class L85_Holo_DZ : BAF_L85A2_RIS_Holo { + /* magazines[] = { 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD }; + */ }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp index a0bfa550a..b3a962300 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp @@ -1,11 +1,13 @@ //no attachments on either of the M16A2s. class M16A2_DZ : M16A2 { + /* magazines[] = { 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD }; + */ class Attachments { Attachment_M203 = "M16A2_GL_DZ"; @@ -14,11 +16,13 @@ class M16A2_DZ : M16A2 class M16A2_GL_DZ : M16A2GL { + /* magazines[] = { 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD }; + */ class ItemActions { class RemoveGL diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp index 03d271df5..55cd898ec 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp @@ -53,13 +53,13 @@ class M16A4_DZ : M16A2 model = "z\addons\dayz_communityweapons\m16a4\m16a4.p3d"; picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_ca.paa"; displayName = $STR_DZ_WPN_M16A4; - + /* magazines[] = { 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD }; - + */ class Attachments { Attachment_CCO = "M16A4_CCO_DZ"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp index bbfcbf2c9..4f4d7ffe3 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp @@ -59,13 +59,13 @@ class M4A1_DZ : M4A1 displayName = $STR_DZ_WPN_M4A1_NAME; handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"}; - + /* magazines[] = { 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD }; - + */ class Attachments { Attachment_CCO = "M4A1_CCO_DZ"; @@ -117,13 +117,13 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo displayName = $STR_DZ_WPN_M4A1_SD_NAME; handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"}; - + /* magazines[] = { 30Rnd_556x45_StanagSD, 30Rnd_556x45_Stanag }; - + */ class Attachments { Attachment_CCO = "M4A1_CCO_SD_DZ"; From ad1e54af583a4432996070a2eb6ebf0178cb005c Mon Sep 17 00:00:00 2001 From: A Man Date: Tue, 16 Aug 2016 00:38:59 +0200 Subject: [PATCH 2/2] Updating for more wood Updating for more wood from trees like in 1051. --- SQF/dayz_code/compile/player_harvest.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/compile/player_harvest.sqf b/SQF/dayz_code/compile/player_harvest.sqf index bc4d42929..5085689f0 100644 --- a/SQF/dayz_code/compile/player_harvest.sqf +++ b/SQF/dayz_code/compile/player_harvest.sqf @@ -29,7 +29,7 @@ if (_ammo isKindOf "Hatchet_Swing_Ammo" || _ammo isKindOf "Chainsaw_Swing_Ammo") // damage must be going down _damage = damage _tree; if (DZE_TEMP_treedmg < _damage) then { - if (_damage < 0.99 && {(random 1) > 0.7}) then { + if (_damage < 0.99 && {(random 1) > 0.9}) then { PVDZ_objgather_Knockdown = [_tree,player]; // Ask server to setDamage on tree publicVariableServer "PVDZ_objgather_Knockdown"; };