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

Merge pull request #1739 from AirwavesMan/master

Browse Source 
Updating CfgWeapons and harvest Wood
This commit is contained in:
ebaydayz
2016-08-15 18:56:15 -04:00
committed by GitHub
parent ae8329e55b ad1e54af58
commit b7ec9fc5aa
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,13 +3,13 @@ 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;
/*
magazines[] = magazines[] =
{ {
30Rnd_556x45_G36, 30Rnd_556x45_G36,
30Rnd_556x45_G36SD 30Rnd_556x45_G36SD
}; };
*/
//G36 Optic //G36 Optic
optics = true; optics = true;
opticsDisablePeripherialVision = 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"; 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
}; };
*/
//G36 Optic //G36 Optic
optics = true; optics = true;
opticsDisablePeripherialVision = true; opticsDisablePeripherialVision = true;

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

@@ -41,13 +41,13 @@ 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;
/*
magazines[] = magazines[] =
{ {
30Rnd_556x45_G36, 30Rnd_556x45_G36,
30Rnd_556x45_G36SD 30Rnd_556x45_G36SD
}; };
*/
class Attachments class Attachments
{ {
Attachment_CCO = "G36C_CCO_DZ"; 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"; 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
}; };
*/
class Attachments class Attachments
{ {
Attachment_CCO = "G36C_CCO_SD_DZ"; Attachment_CCO = "G36C_CCO_SD_DZ";

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

@@ -1,8 +1,10 @@
class L85_Holo_DZ : BAF_L85A2_RIS_Holo class L85_Holo_DZ : BAF_L85A2_RIS_Holo
{ {
/*
magazines[] = magazines[] =
{ {
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
}; };
*/
}; };

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

@@ -1,11 +1,13 @@
//no attachments on either of the M16A2s. //no attachments on either of the M16A2s.
class M16A2_DZ : M16A2 class M16A2_DZ : M16A2
{ {
/*
magazines[] = magazines[] =
{ {
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
}; };
*/
class Attachments class Attachments
{ {
Attachment_M203 = "M16A2_GL_DZ"; Attachment_M203 = "M16A2_GL_DZ";
@@ -14,11 +16,13 @@ class M16A2_DZ : M16A2
class M16A2_GL_DZ : M16A2GL class M16A2_GL_DZ : M16A2GL
{ {
/*
magazines[] = magazines[] =
{ {
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
}; };
*/
class ItemActions class ItemActions
{ {
class RemoveGL class RemoveGL

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

@@ -53,13 +53,13 @@ class M16A4_DZ : M16A2
model = "z\addons\dayz_communityweapons\m16a4\m16a4.p3d"; model = "z\addons\dayz_communityweapons\m16a4\m16a4.p3d";
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[] =
{ {
30Rnd_556x45_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
}; };
*/
class Attachments class Attachments
{ {
Attachment_CCO = "M16A4_CCO_DZ"; Attachment_CCO = "M16A4_CCO_DZ";

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

@@ -59,13 +59,13 @@ class M4A1_DZ : M4A1
displayName = $STR_DZ_WPN_M4A1_NAME; displayName = $STR_DZ_WPN_M4A1_NAME;
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_Stanag, 30Rnd_556x45_Stanag,
30Rnd_556x45_StanagSD 30Rnd_556x45_StanagSD
}; };
*/
class Attachments class Attachments
{ {
Attachment_CCO = "M4A1_CCO_DZ"; Attachment_CCO = "M4A1_CCO_DZ";
@@ -117,13 +117,13 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo
displayName = $STR_DZ_WPN_M4A1_SD_NAME; displayName = $STR_DZ_WPN_M4A1_SD_NAME;
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
}; };
*/
class Attachments class Attachments
{ {
Attachment_CCO = "M4A1_CCO_SD_DZ"; Attachment_CCO = "M4A1_CCO_SD_DZ";

2
SQF/dayz_code/compile/player_harvest.sqf
View File

@@ -29,7 +29,7 @@ if (_ammo isKindOf "Hatchet_Swing_Ammo" || _ammo isKindOf "Chainsaw_Swing_Ammo")
// damage must be going down // damage must be going down
_damage = damage _tree; _damage = damage _tree;
if (DZE_TEMP_treedmg < _damage) then { 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 PVDZ_objgather_Knockdown = [_tree,player]; // Ask server to setDamage on tree
publicVariableServer "PVDZ_objgather_Knockdown"; publicVariableServer "PVDZ_objgather_Knockdown";
}; };