diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/ACOG.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/ACOG.hpp index 5ca2d7c1c..93e62bd36 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/ACOG.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/ACOG.hpp @@ -1,12 +1,10 @@ class Attachment_ACOG : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\acog\acog.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\acog\data\m_acog_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\acog\data\m_acog_ca.paa"; displayName = $STR_DZ_ATT_ACOG_NAME; descriptionShort = $STR_DZ_ATT_ACOG_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/ANPVS4.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/ANPVS4.hpp index 9acc79108..8dd26e76d 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/ANPVS4.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/ANPVS4.hpp @@ -1,11 +1,13 @@ -class Attachment_ANPVS4 : CA_Magazine { - scope = public; +class Attachment_ANPVS4 : CA_Magazine +{ + scope = 2; count = 1; type = 256; model = "\z\addons\dayz_epoch_w\optic\dze_scope_anpvs4.p3d"; picture = "\dayz_epoch_c\icons\attachments\attachment_anpvs4.paa"; displayName = $STR_DZE_ATTACHMENT_ANPVS4_NAME; descriptionShort = $STR_DZE_ATTACHMENT_ANPVS4_DESC; + class ItemActions { class AttachToPrimary diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/BELT.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/BELT.hpp index 918cf7b39..9acc513d8 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/BELT.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/BELT.hpp @@ -1,12 +1,10 @@ class Attachment_BELT : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\models\attachments\BELT"; - picture = "\z\addons\dayz_communityweapons\models\attachments\BELT.paa"; - + picture = "\z\addons\dayz_communityweapons\models\attachments\BELT.paa"; displayName = $STR_ATTACHMENT_NAME_BELT; descriptionShort = $STR_ATTACHMENT_DESC_BELT; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/CCO.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/CCO.hpp index b0a0aeb02..f96afd8fd 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/CCO.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/CCO.hpp @@ -1,12 +1,10 @@ class Attachment_CCO : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\cco\cco.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\cco\data\m_cco_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\cco\data\m_cco_ca.paa"; displayName = $STR_DZ_ATT_CCO_NAME; descriptionShort = $STR_DZ_ATT_CCO_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL.hpp index 7105047c5..1ee50be05 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL.hpp @@ -1,12 +1,10 @@ class Attachment_FL : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\flashlight_rifle.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\data\m_flashlight_rifle_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\data\m_flashlight_rifle_ca.paa"; displayName = $STR_DZ_ATT_FL_RFL_NAME; descriptionShort = $STR_DZ_ATT_FL_RFL_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp index 4b2ea2377..625057f03 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/FL_Pist.hpp @@ -1,12 +1,10 @@ class Attachment_FL_Pist : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\flashlight_pistol.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\data\m_flashlight_pistol_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\data\m_flashlight_pistol_ca.paa"; displayName = $STR_DZ_ATT_FL_PST_NAME; descriptionShort = $STR_DZ_ATT_FL_PST_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/GP25.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/GP25.hpp index 2a5713910..b5d2f96b3 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/GP25.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/GP25.hpp @@ -1,12 +1,10 @@ class Attachment_GP25 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\gp25\gp25.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\gp25\data\m_gp25_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\gp25\data\m_gp25_ca.paa"; displayName = $STR_DZ_ATT_GP25_NAME; descriptionShort = $STR_DZ_ATT_GP25_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Ghillie.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Ghillie.hpp index f42bab3d6..61ea29438 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Ghillie.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Ghillie.hpp @@ -1,12 +1,10 @@ class Attachment_Ghillie : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "ca\weapons\mag_univ.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\ghillie\data\m_ghillie_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\ghillie\data\m_ghillie_ca.paa"; displayName = $STR_DZ_ATT_GHIL_NAME; descriptionShort = $STR_DZ_ATT_GHIL_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Holo.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Holo.hpp index f898aab8a..e28a2647b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Holo.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Holo.hpp @@ -1,12 +1,10 @@ class Attachment_Holo : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\holo\holo.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\holo\data\m_holo_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\holo\data\m_holo_ca.paa"; displayName = $STR_DZ_ATT_HOLO_NAME; descriptionShort = $STR_DZ_ATT_HOLO_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Kobra.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Kobra.hpp index 745b7f677..06d8ea4ce 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Kobra.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Kobra.hpp @@ -1,12 +1,10 @@ class Attachment_Kobra : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\kobra\kobra.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\kobra\data\m_kobra_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\kobra\data\m_kobra_ca.paa"; displayName = $STR_DZ_ATT_KOBRA_NAME; descriptionShort = $STR_DZ_ATT_KOBRA_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Laser.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Laser.hpp index 27259cf37..75de90bd6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Laser.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Laser.hpp @@ -1,11 +1,13 @@ -class Attachment_Laser : CA_Magazine { - scope = public; +class Attachment_Laser : CA_Magazine +{ + scope = 2; count = 1; type = 256; model = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\flashlight_rifle.p3d"; picture = "\dayz_epoch_c\icons\attachments\attachment_laser.paa"; displayName = $STR_DZE_ATTACHMENT_LASER_NAME; descriptionShort = $STR_DZE_ATTACHMENT_LASER_DESC; + class ItemActions { class AttachToPrimary diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/M203.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/M203.hpp index 609f6ae51..ba50b9a2c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/M203.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/M203.hpp @@ -1,12 +1,10 @@ class Attachment_M203 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\m203\m203.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\m203\data\m_m203_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\m203\data\m_m203_ca.paa"; displayName = $STR_DZ_ATT_M203_NAME; descriptionShort = $STR_DZ_ATT_M203_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL.hpp index f1d3babb8..45c95dd7b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL.hpp @@ -1,12 +1,10 @@ class Attachment_MFL : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\flashlight_rifle.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\data\m_flashlight_rifle_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\data\m_flashlight_rifle_ca.paa"; displayName = $STR_DZ_ATT_MFL_RFL_NAME; descriptionShort = $STR_DZ_ATT_MFL_RFL_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp index 5320650ef..ae5d43f41 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp @@ -1,12 +1,10 @@ class Attachment_MFL_Pist : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\flashlight_pistol.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\data\m_flashlight_pistol_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\data\m_flashlight_pistol_ca.paa"; displayName = $STR_DZ_ATT_MFL_PST_NAME; descriptionShort = $STR_DZ_ATT_MFL_PST_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/NSPU.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/NSPU.hpp index 6f4e2f368..7a4cf0596 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/NSPU.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/NSPU.hpp @@ -1,11 +1,13 @@ -class Attachment_NSPU : CA_Magazine { - scope = public; +class Attachment_NSPU : CA_Magazine +{ + scope = 2; count = 1; type = 256; model = "\z\addons\dayz_epoch_w\optic\dze_scope_nspu.p3d"; picture = "\dayz_epoch_c\icons\attachments\attachment_nspu.paa"; displayName = $STR_DZE_ATTACHMENT_NSPU_NAME; descriptionShort = $STR_DZE_ATTACHMENT_NSPU_DESC; + class ItemActions { class AttachToPrimary diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/NV.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/NV.hpp index 7b4e5b331..a99d8caeb 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/NV.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/NV.hpp @@ -1,11 +1,13 @@ -class Attachment_NV : CA_Magazine { - scope = public; +class Attachment_NV : CA_Magazine +{ + scope = 2; count = 1; type = 256; picture = "\dayz_epoch_c\icons\attachments\attachment_nv.paa"; model = "\z\addons\dayz_epoch_w\optic\dze_scope_generic.p3d"; displayName = $STR_DZE_ATTACHMENT_NV_NAME; descriptionShort = $STR_DZE_ATTACHMENT_NV_DESC; + class ItemActions { class AttachToPrimary diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/PSO1.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/PSO1.hpp index 3dc47ef28..db9b0edb0 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/PSO1.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/PSO1.hpp @@ -1,12 +1,10 @@ class Attachment_PSO1 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\pso\pso.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\pso\data\m_pso_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\pso\data\m_pso_ca.paa"; displayName = $STR_DZ_ATT_PSO1_NAME; descriptionShort = $STR_DZ_ATT_PSO1_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SA58RIS.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SA58RIS.hpp index df928b1fb..717b7b7a8 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SA58RIS.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SA58RIS.hpp @@ -1,12 +1,10 @@ class Attachment_SA58RIS : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "ca\weapons\mag_univ.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\SA58RIS\data\m_sa58ris_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\SA58RIS\data\m_sa58ris_ca.paa"; displayName = $STR_DZ_ATT_SA58RIS_NAME; descriptionShort = $STR_DZ_ATT_SA58RIS_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SCOPED.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SCOPED.hpp index 1da1031de..1baedfbf0 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SCOPED.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SCOPED.hpp @@ -1,6 +1,6 @@ class Attachment_SCOPED : CA_Magazine { - scope = public; + scope = 2; displayName = $STR_ATTACHMENT_NAME_SCOPE; descriptionShort = $STR_ATTACHMENT_DESC_SCOPE; count = 1; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup10.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup10.hpp index 6d93bb0a5..cf81237de 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup10.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup10.hpp @@ -1,12 +1,10 @@ class Attachment_Sup10 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor9\suppressor9.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\suppressor9\data\m_suppressor9_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\suppressor9\data\m_suppressor9_ca.paa"; displayName = $STR_DZ_ATT_SUP10_NAME; descriptionShort = $STR_DZ_ATT_SUP10_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup45.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup45.hpp index cc000b4dc..47e4c2663 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup45.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup45.hpp @@ -1,10 +1,10 @@ -class Attachment_Sup45 : CA_Magazine { - scope = public; +class Attachment_Sup45 : CA_Magazine +{ + scope = 2; count = 1; type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor9\suppressor9.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\suppressor9\data\m_suppressor9_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\suppressor9\data\m_suppressor9_ca.paa"; displayName = $STR_DZE_ATTACHMENT_45SUP_NAME; descriptionShort = $STR_DZE_ATTACHMENT_45SUP_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup545.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup545.hpp index e0a3b6b31..1ad0fe30f 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup545.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup545.hpp @@ -1,12 +1,10 @@ class Attachment_Sup545 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor545\suppressor545.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\suppressor545\data\m_suppressor545_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\suppressor545\data\m_suppressor545_ca.paa"; displayName = $STR_DZ_ATT_SUP545_NAME; descriptionShort = $STR_DZ_ATT_SUP545_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup556.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup556.hpp index 5266093c0..de8de4824 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup556.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup556.hpp @@ -1,12 +1,10 @@ class Attachment_Sup556 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor556\suppressor556.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa"; displayName = $STR_DZ_ATT_SUP556_NAME; descriptionShort = $STR_DZ_ATT_SUP556_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup57.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup57.hpp index 00e6015e0..37d238470 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup57.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup57.hpp @@ -1,12 +1,10 @@ class Attachment_Sup57 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor556\suppressor556.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa"; displayName = $STR_DZ_ATT_SUP57_NAME; descriptionShort = $STR_DZ_ATT_SUP57_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup68.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup68.hpp index 89e86ecbf..5575939a1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup68.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup68.hpp @@ -1,12 +1,10 @@ class Attachment_Sup68 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor556\suppressor556.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa"; displayName = $STR_DZ_ATT_SUP68_NAME; descriptionShort = $STR_DZ_ATT_SUP68_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup762.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup762.hpp index 22b0e904a..630e93ab1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup762.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup762.hpp @@ -1,11 +1,13 @@ -class Attachment_Sup762 : CA_Magazine { - scope = public; +class Attachment_Sup762 : CA_Magazine +{ + scope = 2; count = 1; type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor556\suppressor556.p3d"; picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa"; displayName = $STR_DZ_ATT_SUP762_NAME; descriptionShort = $STR_DZ_ATT_SUP762_DESC; + class ItemActions { class AttachToPrimary diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup9.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup9.hpp index 02449f9fa..5c372df50 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup9.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup9.hpp @@ -1,12 +1,10 @@ class Attachment_Sup9 : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor9\suppressor9.p3d"; - picture = "\z\addons\dayz_communityweapons\attachments\suppressor9\data\m_suppressor9_ca.paa"; - + picture = "\z\addons\dayz_communityweapons\attachments\suppressor9\data\m_suppressor9_ca.paa"; displayName = $STR_DZ_ATT_SUP9_NAME; descriptionShort = $STR_DZ_ATT_SUP9_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup939.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup939.hpp index 58b17c068..7f4117b3e 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup939.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup939.hpp @@ -1,11 +1,13 @@ -class Attachment_Sup939 : CA_Magazine { - scope = public; +class Attachment_Sup939 : CA_Magazine +{ + scope = 2; count = 1; type = 256; model = "\z\addons\dayz_communityweapons\attachments\suppressor556\suppressor556.p3d"; picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa"; displayName = $STR_DZ_ATT_SUP939_NAME; descriptionShort = $STR_DZ_ATT_SUP939_DESC; + class ItemActions { class AttachToPrimary diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp index b958c416e..8d24d80f4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp @@ -1,12 +1,10 @@ class Attachment_SupBizon : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\surpressor.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa"; - + picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa"; displayName = $STR_DZ_ATT_SUP9BIZON_NAME; descriptionShort = $STR_DZ_ATT_SUP9BIZON_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp index 4301b2a3e..aa457269c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp @@ -1,12 +1,10 @@ class Attachment_SupMakarov : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\surpressor.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa"; - + picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa"; displayName = $STR_DZ_ATT_SUP9PM_NAME; descriptionShort = $STR_DZ_ATT_SUP9PM_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/TWS.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/TWS.hpp index 56fff5833..7063a46d9 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/TWS.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/TWS.hpp @@ -1,11 +1,13 @@ -class Attachment_Tws : CA_Magazine { - scope = public; +class Attachment_Tws : CA_Magazine +{ + scope = 2; count = 1; type = 256; model = "\z\addons\dayz_epoch_w\optic\dze_scope_tws.p3d"; picture = "\dayz_epoch_c\icons\attachments\attachment_tws.paa"; displayName = $STR_DZE_ATTACHMENT_TWS_NAME; descriptionShort = $STR_DZE_ATTACHMENT_TWS_DESC; + class ItemActions { class AttachToPrimary diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/BearTrap.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/BearTrap.hpp index 158487295..7ee21b484 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/BearTrap.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/BearTrap.hpp @@ -1,9 +1,8 @@ class TrapBear : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\bear_trap_gear.p3d"; picture = "\dayz_equip\textures\equip_bear_trap_ca.paa"; displayName = $STR_EQUIP_NAME_BEARTRAP; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Camonets.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Camonets.hpp index 0c63216da..39674ec2d 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Camonets.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Camonets.hpp @@ -1,13 +1,13 @@ class desert_large_net_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LARGEDESERTCAMONET; descriptionShort = $STR_EPOCH_LARGECAMONET_DESC; model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa"; - weight = 25; + class ItemActions { class Build @@ -21,14 +21,14 @@ class desert_large_net_kit: CA_Magazine }; class forest_large_net_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LARGEFORESTCAMONET; descriptionShort = $STR_EPOCH_LARGECAMONET_DESC; model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa"; - weight = 25; + class ItemActions { class Build @@ -42,14 +42,14 @@ class forest_large_net_kit: CA_Magazine }; class desert_net_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_DESERTCAMONET; descriptionShort = $STR_EPOCH_CAMONET_DESC; model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa"; - weight = 25; + class ItemActions { class Build @@ -72,14 +72,14 @@ class desert_net_kit: CA_Magazine }; class forest_net_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_FORESTCAMONET; descriptionShort = $STR_EPOCH_CAMONET_DESC; model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa"; - weight = 25; + class ItemActions { class Build diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp index 4f3855bac..e9b3dd0db 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp @@ -1,13 +1,13 @@ class ItemFireBarrel_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_FIREBARRELKIT; descriptionShort = $STR_EPOCH_FIREBARRELKIT_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 45; + class ItemActions { class Build @@ -22,14 +22,14 @@ class ItemFireBarrel_kit: CA_Magazine class workbench_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WORKBENCH; descriptionShort = $STR_EPOCH_WORKBENCH_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 10; + class ItemActions { class Build @@ -45,7 +45,7 @@ class workbench_kit: CA_Magazine // DayZ Mod workbench class ItemWorkBench : CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_BLD_name_ItemWorkBench;//"Work Bench (Packed)" @@ -55,8 +55,10 @@ class ItemWorkBench : CA_Magazine vehicle = "WorkBench"; sfx = "tentunpack"; - class ItemActions { - class Build { + class ItemActions + { + class Build + { text = $STR_BLD_build_ItemWorkBench;//"place WorkBench" script = "; ['ItemWorkBench','Build'] spawn player_buildPlaceables;"; require[] = {}; @@ -68,13 +70,14 @@ class ItemWorkBench : CA_Magazine class wood_ramp_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODRAMP; descriptionShort = $STR_EPOCH_WOODENRAMP_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + class ItemActions { class Build @@ -89,13 +92,14 @@ class wood_ramp_kit: CA_Magazine class plot_pole_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_PLAYER_246; descriptionShort = $STR_EPOCH_PLOT_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + class ItemActions { class Build @@ -110,14 +114,14 @@ class plot_pole_kit: CA_Magazine class metal_panel_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_METALPANEL; descriptionShort = $STR_EPOCH_METALPANEL_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 50; + class ItemActions { class Build @@ -141,16 +145,18 @@ class metal_panel_kit: CA_Magazine class ItemCorrugated : CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CORRUGATEDFENCE; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_CORRUGATEDFENCE_DESC; + class ItemActions { - class Build { + class Build + { text = $STR_EPOCH_PLAYER_214; script = "spawn player_build;"; require[] = {"ItemEtool","ItemToolbox"}; @@ -188,10 +194,9 @@ class ItemCorrugated : CA_Magazine class ItemWire : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\Fence_wire_kit.p3d"; picture = "\dayz_equip\textures\equip_fencewire_kit_CA.paa"; displayName = $STR_EQUIP_NAME_23; @@ -213,10 +218,9 @@ class ItemWire : CA_Magazine class ItemTankTrap : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\tank_trap_kit.p3d"; picture = "\dayz_equip\textures\equip_tanktrap_kit_CA.paa"; displayName = $STR_EQUIP_NAME_22; @@ -238,15 +242,13 @@ class ItemTankTrap : CA_Magazine class ItemGenerator : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\generator_gear.p3d"; picture = "\dayz_equip\textures\equip_generator_ca.paa"; displayName = $STR_EQUIP_NAME_31; descriptionShort = $STR_EQUIP_DESC_31; - weight = 30; // used in R3F weight class ItemActions { @@ -263,14 +265,14 @@ class ItemGenerator : CA_Magazine class fuel_pump_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_FUELPUMP; descriptionShort = $STR_EPOCH_FUELPUMP; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 50; + class ItemActions { class Build @@ -285,14 +287,14 @@ class fuel_pump_kit: CA_Magazine class light_pole_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LIGHTPOLE; descriptionShort = $STR_EPOCH_LIGHTPOLE_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 25; + class ItemActions { class Build @@ -307,14 +309,14 @@ class light_pole_kit: CA_Magazine class deer_stand_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_DEERSTAND; descriptionShort = $STR_EPOCH_DEERSTAND_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 25; + class ItemActions { class Build @@ -329,14 +331,14 @@ class deer_stand_kit: CA_Magazine class m240_nest_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_M240NEST; descriptionShort = $STR_EPOCH_M240NEST; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 125; + class ItemActions { class Build @@ -351,14 +353,14 @@ class m240_nest_kit: CA_Magazine class rusty_gate_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_RUSTYGATE; descriptionShort = $STR_EPOCH_RUSTYGATE_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 25; + class ItemActions { class Build @@ -373,14 +375,14 @@ class rusty_gate_kit: CA_Magazine class stick_fence_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_STICKFENCE; descriptionShort = $STR_EPOCH_STICKFENCE_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 15; + class ItemActions { class Build @@ -395,14 +397,14 @@ class stick_fence_kit: CA_Magazine class sun_shade_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CANVASSUNSHADE; descriptionShort = $STR_EPOCH_CANVASSUNSHADE_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 25; + class ItemActions { class Build @@ -417,14 +419,14 @@ class sun_shade_kit: CA_Magazine class park_bench_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODBENCH; descriptionShort = $STR_EPOCH_WOODBENCH; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 25; + class ItemActions { class Build @@ -439,14 +441,14 @@ class park_bench_kit: CA_Magazine class ItemScaffoldingKit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_SCAFFOLDING; descriptionShort = $STR_EPOCH_SCAFFOLDING; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 80; + class ItemActions { class Build diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/ModularBuilding.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/ModularBuilding.hpp index 09c8347d4..2260ebc77 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/ModularBuilding.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/ModularBuilding.hpp @@ -1,14 +1,17 @@ -class metal_floor_kit: CA_Magazine { - scope = public; +class metal_floor_kit: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_METALFLOOR; descriptionShort = $STR_EPOCH_METALFLOOR; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 325; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -17,17 +20,20 @@ class metal_floor_kit: CA_Magazine { }; }; -class half_cinder_wall_kit: CA_Magazine { - scope = public; +class half_cinder_wall_kit: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CINDERBLOCKWALL_HALF; descriptionShort = $STR_EPOCH_CINDERBLOCKWALL_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 325; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -36,17 +42,20 @@ class half_cinder_wall_kit: CA_Magazine { }; }; -class full_cinder_wall_kit: CA_Magazine { - scope = public; +class full_cinder_wall_kit: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CINDERBLOCKWALL; descriptionShort = $STR_EPOCH_FULLCINDERBLOCKWALL_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 600; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -55,17 +64,20 @@ class full_cinder_wall_kit: CA_Magazine { }; }; -class cinder_door_kit: CA_Magazine { - scope = public; +class cinder_door_kit: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BLOCKDOORWAY; descriptionShort = $STR_EPOCH_BLOCKDOORWAY_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 325; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -74,17 +86,20 @@ class cinder_door_kit: CA_Magazine { }; }; -class cinder_door_kit_locked: CA_Magazine { - scope = public; +class cinder_door_kit_locked: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BLOCKDOORLOCKED; descriptionShort = $STR_EPOCH_BLOCKDOORWAY_LOCKED_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 340; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -93,17 +108,20 @@ class cinder_door_kit_locked: CA_Magazine { }; }; -class cinder_garage_kit: CA_Magazine { - scope = public; +class cinder_garage_kit: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BLOCKGARAGEDOORWAY; descriptionShort = $STR_EPOCH_BLOCKGARAGEDOORWAY_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 325; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -112,17 +130,20 @@ class cinder_garage_kit: CA_Magazine { }; }; -class cinder_garage_kit_locked: CA_Magazine { - scope = public; +class cinder_garage_kit_locked: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BLOCKGARAGEDOORLOCKED; descriptionShort = $STR_EPOCH_BLOCKGARAGEDOORWAY_LOCKED_DESC; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 340; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -131,17 +152,20 @@ class cinder_garage_kit_locked: CA_Magazine { }; }; -class ItemWoodFloor: CA_Magazine { - scope = public; +class ItemWoodFloor: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_FLOORCEILING; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_FLOORCEILING_DESC; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -150,23 +174,27 @@ class ItemWoodFloor: CA_Magazine { }; }; -class ItemWoodFloorHalf: CA_Magazine { - scope = public; +class ItemWoodFloorHalf: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_FLOORCEILINGHALF; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_FLOORCEILING_DESC; - weight = 15; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "WoodFloorHalf_DZ"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_232; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -177,23 +205,27 @@ class ItemWoodFloorHalf: CA_Magazine { }; }; -class ItemWoodFloorQuarter: CA_Magazine { - scope = public; +class ItemWoodFloorQuarter: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_FLOORCEILINGQUARTER; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_FLOORCEILING_DESC; - weight = 10; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "WoodFloorQuarter_DZ"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_232a; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -204,23 +236,27 @@ class ItemWoodFloorQuarter: CA_Magazine { }; }; -class ItemWoodStairs: CA_Magazine { - scope = public; +class ItemWoodStairs: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODSTAIRS; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WOODSTAIRS; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "WoodStairsSans_DZ"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_233; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -231,17 +267,20 @@ class ItemWoodStairs: CA_Magazine { }; }; -class ItemWoodStairsSupport: CA_Magazine { - scope = public; +class ItemWoodStairsSupport: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODSTAIRSWITHSUPPORTS; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WOODSTAIRSWITHSUPPORTS_DESC; - weight = 30; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -250,17 +289,20 @@ class ItemWoodStairsSupport: CA_Magazine { }; }; -class ItemWoodLadder: CA_Magazine { - scope = public; +class ItemWoodLadder: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODLADDER; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WOODLADDER; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -269,23 +311,27 @@ class ItemWoodLadder: CA_Magazine { }; }; -class ItemWoodWall: CA_Magazine { - scope = public; +class ItemWoodWall: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODWALL; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WOODWALL_DESC; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "WoodSmallWall_DZ"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_234; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -293,7 +339,8 @@ class ItemWoodWall: CA_Magazine { output[] = {{"ItemWoodWallDoor",1}}; input[] = {{"ItemWoodWall",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_235; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -301,7 +348,8 @@ class ItemWoodWall: CA_Magazine { output[] = {{"ItemWoodWallWindow",1}}; input[] = {{"ItemWoodWall",1},{"PartGlass",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_236; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -312,23 +360,27 @@ class ItemWoodWall: CA_Magazine { }; }; -class ItemWoodWallThird: CA_Magazine { - scope = public; +class ItemWoodWallThird: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODWALLTHIRDPART; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WOODWALLTHIRDPART_DESC; - weight = 7; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "WoodSmallWallThird_DZ"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_237; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -339,17 +391,20 @@ class ItemWoodWallThird: CA_Magazine { }; }; -class ItemWoodWallWindow: CA_Magazine { - scope = public; +class ItemWoodWallWindow: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WALLWITHWINDOW; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WALLWITHWINDOW_DESC; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -358,23 +413,27 @@ class ItemWoodWallWindow: CA_Magazine { }; }; -class ItemWoodWallDoor: CA_Magazine { - scope = public; +class ItemWoodWallDoor: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WALLWITHDOORWAY; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WALLWITHDOORWAY_DESC; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "WoodSmallWallDoor_DZ"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_238; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -385,23 +444,27 @@ class ItemWoodWallDoor: CA_Magazine { }; }; -class ItemWoodWallWithDoor: CA_Magazine { - scope = public; +class ItemWoodWallWithDoor: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WALLWITHDOOR; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WALLWITHDOOR_DESC; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "Land_DZE_WoodDoor"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_239; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -412,17 +475,20 @@ class ItemWoodWallWithDoor: CA_Magazine { }; }; -class ItemWoodWallWithDoorLocked: CA_Magazine { - scope = public; +class ItemWoodWallWithDoorLocked: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WALLWITHDOORLOCKED; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WALLWITHDOORLOCKED_DESC; - weight = 30; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -431,23 +497,27 @@ class ItemWoodWallWithDoorLocked: CA_Magazine { }; }; -class ItemWoodWallGarageDoor: CA_Magazine { - scope = public; +class ItemWoodWallGarageDoor: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODGARAGEDOOR; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WOODGARAGEDOOR_DESC; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "Land_DZE_GarageWoodDoor"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_240; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -458,17 +528,20 @@ class ItemWoodWallGarageDoor: CA_Magazine { }; }; -class ItemWoodWallGarageDoorLocked: CA_Magazine { - scope = public; +class ItemWoodWallGarageDoorLocked: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODGARAGEDOORLOCKED; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_WOODGARAGEDOORLOCKED_DESC; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -477,17 +550,20 @@ class ItemWoodWallGarageDoorLocked: CA_Magazine { }; }; -class ItemWoodWallLg: CA_Magazine { - scope = public; +class ItemWoodWallLg: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LARGEWOODWALL; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_LARGEWOODWALL_DESC; - weight = 25; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -501,7 +577,8 @@ class ItemWoodWallLg: CA_Magazine { output[] = {{"ItemWoodWallDoorLg",1}}; input[] = {{"ItemWoodWallLg",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_235; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -509,7 +586,8 @@ class ItemWoodWallLg: CA_Magazine { output[] = {{"ItemWoodWallWindowLg",1}}; input[] = {{"ItemWoodWallLg",1},{"PartGlass",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_240; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -520,17 +598,20 @@ class ItemWoodWallLg: CA_Magazine { }; }; -class ItemWoodWallWindowLg: CA_Magazine { - scope = public; +class ItemWoodWallWindowLg: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LARGEWALLWITHWINDOW; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_LARGEWALLWITHWINDOW_DESC; - weight = 30; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; @@ -539,23 +620,27 @@ class ItemWoodWallWindowLg: CA_Magazine { }; }; -class ItemWoodWallDoorLg: CA_Magazine { - scope = public; +class ItemWoodWallDoorLg: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LARGEWALLWITHDOORWAY; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_LARGEWALLWITHDOORWAY_DESC; - weight = 30; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "WoodLargeWallDoor_DZ"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_238; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -566,23 +651,27 @@ class ItemWoodWallDoorLg: CA_Magazine { }; }; -class ItemWoodWallWithDoorLg: CA_Magazine { - scope = public; +class ItemWoodWallWithDoorLg: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LARGEWALLWITHDOOR; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_LARGEWALLWITHDOOR_DESC; - weight = 30; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "Land_DZE_LargeWoodDoor"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_239; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -593,17 +682,20 @@ class ItemWoodWallWithDoorLg: CA_Magazine { }; }; -class ItemWoodWallWithDoorLgLocked: CA_Magazine { - scope = public; +class ItemWoodWallWithDoorLgLocked: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LARGEWALLWITHDOORLOCKED; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_LARGEWALLWITHDOORLOCKED_DESC; - weight = 35; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_ACTIONS_BUILD; script = "spawn player_build;"; require[] = {"ItemToolbox"}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp index 1f9b5b024..578f28988 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp @@ -1,8 +1,8 @@ class ItemSandbag : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; + type = 256; model = "\dayz_equip\models\sandbags.p3d"; picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; displayName = $STR_EQUIP_NAME_21; @@ -50,8 +50,9 @@ class ItemSandbag : CA_Magazine }; }; -class BagFenceRound_DZ_kit : CA_Magazine { - scope = public; +class BagFenceRound_DZ_kit : CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EQUIP_NAME_21_ROUND; @@ -59,8 +60,10 @@ class BagFenceRound_DZ_kit : CA_Magazine { model = "\dayz_equip\models\sandbags.p3d"; picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - class ItemActions { - class Build { + class ItemActions + { + class Build + { text = $STR_EPOCH_PLAYER_299; script = "spawn player_build;"; require[] = {"ItemEtool"}; @@ -78,8 +81,9 @@ class BagFenceRound_DZ_kit : CA_Magazine { }; }; -class ItemSandbagLarge : CA_Magazine { - scope = public; +class ItemSandbagLarge : CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EQUIP_NAME_21_HBARRIER; @@ -87,8 +91,10 @@ class ItemSandbagLarge : CA_Magazine { model = "\dayz_equip\models\sandbags.p3d"; // TODO model picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - class ItemActions { - class Build { + class ItemActions + { + class Build + { text = $STR_EPOCH_PLAYER_273_3; script = "spawn player_build;"; require[] = {"ItemEtool"}; @@ -106,8 +112,9 @@ class ItemSandbagLarge : CA_Magazine { }; }; -class ItemSandbagExLarge : CA_Magazine { - scope = public; +class ItemSandbagExLarge : CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EQUIP_NAME_21_3XHBARRIER; @@ -115,8 +122,10 @@ class ItemSandbagExLarge : CA_Magazine { model = "\dayz_equip\models\sandbags.p3d"; // TODO model picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - class ItemActions { - class Build { + class ItemActions + { + class Build + { text = $STR_EPOCH_PLAYER_273_4; script = "spawn player_build;"; require[] = {"ItemEtool"}; @@ -134,8 +143,9 @@ class ItemSandbagExLarge : CA_Magazine { }; }; -class ItemSandbagExLarge5x : CA_Magazine { - scope = public; +class ItemSandbagExLarge5x : CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EQUIP_NAME_21_5XHBARRIER; @@ -143,8 +153,10 @@ class ItemSandbagExLarge5x : CA_Magazine { model = "\dayz_equip\models\sandbags.p3d"; // TODO model picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - class ItemActions { - class Build { + class ItemActions + { + class Build + { text = $STR_EPOCH_PLAYER_273_5; script = "spawn player_build;"; require[] = {"ItemEtool"}; @@ -155,7 +167,7 @@ class ItemSandbagExLarge5x : CA_Magazine { class sandbag_nest_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EQUIP_NAME_21_NEST; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp index 852f81648..05bfaac86 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp @@ -1,6 +1,6 @@ class outhouse_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_OUTHOUSE; @@ -22,7 +22,7 @@ class outhouse_kit: CA_Magazine class wooden_shed_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_NICEWOODSHED; @@ -44,7 +44,7 @@ class wooden_shed_kit: CA_Magazine class wooden_shed_kit2: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_NICEWOODSHED2; @@ -66,7 +66,7 @@ class wooden_shed_kit2: CA_Magazine class wood_shack_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODSHACK; @@ -88,7 +88,7 @@ class wood_shack_kit: CA_Magazine class wood_shack_kit2: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODSHACK2; @@ -110,7 +110,7 @@ class wood_shack_kit2: CA_Magazine class storage_shed_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_STORAGESHED; @@ -132,7 +132,7 @@ class storage_shed_kit: CA_Magazine class storage_shed_kit2: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_STORAGESHED2; @@ -154,7 +154,7 @@ class storage_shed_kit2: CA_Magazine class ItemGunRackKit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_GUNRACK; @@ -176,7 +176,7 @@ class ItemGunRackKit: CA_Magazine class ItemGunRackKit2: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_GUNRACK2; @@ -199,7 +199,7 @@ class ItemGunRackKit2: CA_Magazine class ItemWoodCrateKit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODCRATE; @@ -221,7 +221,7 @@ class ItemWoodCrateKit: CA_Magazine class ItemWoodCrateKit2: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODCRATE2; @@ -243,7 +243,7 @@ class ItemWoodCrateKit2: CA_Magazine class ItemVault: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_SAFE; @@ -265,7 +265,7 @@ class ItemVault: CA_Magazine class ItemLockbox: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LOCKBOX; @@ -287,7 +287,7 @@ class ItemLockbox: CA_Magazine class StashSmall_kit: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_VEH_NAME_STASH; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp index 910c7b232..28920e701 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp @@ -1,13 +1,13 @@ class ItemTent : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\tentbag_gear.p3d"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_EQUIP_NAME_20; descriptionShort = $STR_EQUIP_DESC_20; + class ItemActions { class Build @@ -42,10 +42,9 @@ class ItemTent : CA_Magazine class ItemDomeTent : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\tentbag_gear.p3d"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_VEH_NAME_DOME_TENT; @@ -74,13 +73,11 @@ class ItemDomeTent : CA_Magazine }; }; -// EPOCH ADDITION - class ItemDesertTent : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; + type = ; model = "\dayz_equip\models\tentbag_gear.p3d"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_VEH_NAME_DESERT_TENT; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/TripWire.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/TripWire.hpp index d1c749922..06315db1a 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/TripWire.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/TripWire.hpp @@ -1,9 +1,8 @@ class ItemTrapTripwireCans : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\trap_tripwire_dropped_can.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_trap_tripwire_can.paa"; displayName = $STR_ITEM_NAME_TRIPWIRE_CANS; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp b/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp index 8acc6e213..87a3aa13f 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp @@ -1,16 +1,14 @@ class SkinBase : CA_Magazine { + scope = 0; count = 1; - type = WeaponSlotItem; + type = 256; sex = "male"; - playerModel = "Survivor2_DZ"; - + playerModel = "Survivor2_DZ"; model = "\dayz_equip\models\cloth_parcel.p3d"; - picture = "\dayz_equip\textures\equip_cloth_parcel_ca.paa"; - + picture = "\dayz_equip\textures\equip_cloth_parcel_ca.paa"; displayName = $STR_EQUIP_NAME_CLOTHES; // Used in Epoch player_craftItem for canvas - descriptionShort = $STR_EQUIP_DESC_CLOTHES; - + descriptionShort = $STR_EQUIP_DESC_CLOTHES; Craftoutput = "equip_rag"; class ItemActions @@ -26,7 +24,8 @@ class SkinBase : CA_Magazine text = $STR_TEAR_CLOTHES; script = "spawn player_tearClothes;"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_269b; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -34,7 +33,8 @@ class SkinBase : CA_Magazine output[] = {{"ItemCanvas",1}}; input[] = {{"SkinBase",2}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_269; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp index cc9419cf1..861474d02 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp @@ -1,201 +1,201 @@ class Skin_Survivor2_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_CIV; descriptionShort = $STR_EQUIP_DESC_CIV; sex = "male"; playerModel = "Survivor2_DZ"; }; class Skin_Camo1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_CAMO; descriptionShort = $STR_EQUIP_DESC_CAMO; sex = "male"; playerModel = "Camo1_DZ"; }; class Skin_Rocket_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_OFFICERSUIT; descriptionShort = $STR_EPOCH_SKINS_OFFICERSUIT; sex = "male"; playerModel = "Rocket_DZ"; }; class Skin_Soldier1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_SOLDIER; descriptionShort = $STR_EQUIP_DESC_SOLDIER; sex = "male"; playerModel = "Soldier1_DZ"; }; class Skin_Sniper1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_GHILLIE; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "Sniper1_DZ"; }; class Skin_RU_Policeman_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_POLICE_OFFICER1; descriptionShort = $STR_EPOCH_SKINS_POLICE_DESC; sex = "male"; playerModel = "RU_Policeman_DZ"; }; class Skin_RU_Policeman2_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_POLICE_OFFICER2; descriptionShort = $STR_EPOCH_SKINS_POLICE_DESC; sex = "male"; playerModel = "RU_Policeman2_DZ"; }; class Skin_Pilot_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_ETHAN; descriptionShort = $STR_EPOCH_SKINS_ETHAN_DESC; sex = "male"; playerModel = "Pilot_EP1_DZ"; }; class Skin_Haris_Press_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_HARRY; descriptionShort = $STR_EPOCH_SKINS_HARRY_DESC; sex = "male"; playerModel = "Haris_Press_EP1_DZ"; }; class Skin_Ins_Soldier_GL_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TERRORISTUNIFORM; descriptionShort = $STR_EPOCH_SKINS_TERRORISTUNIFORM; sex = "male"; playerModel = "Ins_Soldier_GL_DZ"; }; class Skin_GUE_Commander_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_REBELUNIFORM; descriptionShort = $STR_EPOCH_SKINS_REBELUNIFORM; sex = "male"; playerModel = "GUE_Commander_DZ"; }; class Skin_Functionary1_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_DONALD; descriptionShort = $STR_EPOCH_SKINS_DONALD_DESC; sex = "male"; playerModel = "Functionary1_EP1_DZ"; }; class Skin_Priest_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_JAMES; descriptionShort = $STR_EPOCH_SKINS_JAMES_DESC; sex = "male"; playerModel = "Priest_DZ"; }; class Skin_Rocker1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_DUANE; descriptionShort = $STR_EPOCH_SKINS_DUANE_DESC; sex = "male"; playerModel = "Rocker1_DZ"; }; class Skin_Rocker2_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_ROD; descriptionShort = $STR_EPOCH_SKINS_ROD_DESC; sex = "male"; playerModel = "Rocker2_DZ"; }; class Skin_Rocker3_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_VAN; descriptionShort = $STR_EPOCH_SKINS_VAN_DESC; sex = "male"; playerModel = "Rocker3_DZ"; }; class Skin_Rocker4_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BRUCE; descriptionShort = $STR_EPOCH_SKINS_BRUCE_DESC; sex = "male"; playerModel = "Rocker4_DZ"; }; class Skin_Bandit1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITOUTFIT; descriptionShort = $STR_EPOCH_SKINS_BANDITOUTFIT; sex = "male"; playerModel = "Bandit1_DZ"; }; class Skin_Bandit2_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITCAMO; descriptionShort = $STR_EPOCH_SKINS_BANDITCAMO_DESC; sex = "male"; playerModel = "Bandit2_DZ"; }; class Skin_GUE_Soldier_MG_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITGUNNER; descriptionShort = $STR_EPOCH_SKINS_BANDITGUNNER_DESC; sex = "male"; playerModel = "GUE_Soldier_MG_DZ"; }; class Skin_GUE_Soldier_Sniper_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITSNIPER; descriptionShort = $STR_EPOCH_SKINS_BANDITSNIPER_DESC; sex = "male"; playerModel = "GUE_Soldier_Sniper_DZ"; }; class Skin_GUE_Soldier_Crew_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITBAKLAVA; descriptionShort = $STR_EPOCH_SKINS_BANDITBAKLAVA_DESC; sex = "male"; playerModel = "GUE_Soldier_Crew_DZ"; }; class Skin_GUE_Soldier_CO_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITMASK; descriptionShort = $STR_EPOCH_SKINS_BANDITMASK_DESC; sex = "male"; playerModel = "GUE_Soldier_CO_DZ"; }; class Skin_GUE_Soldier_2_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITHAT; descriptionShort = $STR_EPOCH_SKINS_BANDITHAT_DESC; sex = "male"; playerModel = "GUE_Soldier_2_DZ"; }; class Skin_BanditW1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITANNIE; descriptionShort = $STR_EPOCH_SKINS_BANDITANNIE_DESC; sex = "female"; playerModel = "BanditW1_DZ"; }; class Skin_BanditW2_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BANDITJANE; descriptionShort = $STR_EPOCH_SKINS_BANDITJANE_DESC; sex = "female"; playerModel = "BanditW2_DZ"; }; class Skin_SurvivorW3_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_JANE; descriptionShort = $STR_EPOCH_SKINS_JANE_DESC; sex = "female"; playerModel = "SurvivorW3_DZ"; }; class Skin_SurvivorW2_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_ANNIE; descriptionShort = $STR_EPOCH_SKINS_ANNIE_DESC; sex = "female"; playerModel = "SurvivorW2_DZ"; }; class Skin_SurvivorWpink_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_MELLY; descriptionShort = $STR_EPOCH_SKINS_MELLY_DESC; sex = "female"; @@ -203,417 +203,417 @@ class Skin_SurvivorWpink_DZ: SkinBase { }; /* class Skin_SurvivorWsequisha_DZ: SkinBase { - scope = public; + scope = 2; displayName = "Maria (female)"; descriptionShort = "Maria Clothes (female)"; }; class Skin_SurvivorWsequishaD_DZ: SkinBase { - scope = public; + scope = 2; displayName = "Sequisha (female)"; descriptionShort = "Sequisha Clothes (female)"; }; */ class Skin_SurvivorWcombat_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_ALEJANDRIA; descriptionShort = $STR_EPOCH_SKINS_ALEJANDRIA_DESC; sex = "female"; playerModel = "SurvivorWcombat_DZ"; }; class Skin_SurvivorWdesert_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_SAVANNAH; descriptionShort = $STR_EPOCH_SKINS_SAVANNAH_DESC; sex = "female"; playerModel = "SurvivorWdesert_DZ"; }; class Skin_SurvivorWurban_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_SOPHIA; descriptionShort = $STR_EPOCH_SKINS_SOPHIA_DESC; sex = "female"; playerModel = "SurvivorWurban_DZ"; }; class Skin_TK_INS_Warlord_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TAKISTANIWARLORD; descriptionShort = $STR_EPOCH_SKINS_TAKISTANIWARLORD; sex = "male"; playerModel = "TK_INS_Warlord_EP1_DZ"; }; class Skin_TK_INS_Soldier_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TAKISTANISOLDIER; descriptionShort = $STR_EPOCH_SKINS_TAKISTANISOLDIER; sex = "male"; playerModel = "TK_INS_Soldier_EP1_DZ"; }; class Skin_CZ_Special_Forces_GL_DES_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_SPECIALFORCES; descriptionShort = $STR_EPOCH_SKINS_SPECIALFORCES; sex = "male"; playerModel = "CZ_Special_Forces_GL_DES_EP1_DZ"; }; class Skin_Drake_Light_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_DESERTCAMO; descriptionShort = $STR_EPOCH_SKINS_DESERTCAMO; sex = "male"; playerModel = "Drake_Light_DZ"; }; class Skin_Soldier_Bodyguard_AA12_PMC_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BODYGUARD; descriptionShort = $STR_EPOCH_SKINS_BODYGUARD; sex = "male"; playerModel = "Soldier_Bodyguard_AA12_PMC_DZ"; }; class Skin_FR_OHara_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_JUNGLECAMO; descriptionShort = $STR_EPOCH_SKINS_JUNGLECAMO; sex = "male"; playerModel = "FR_OHara_DZ"; }; class Skin_FR_Rodriguez_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_GUNNEROUTFIT; descriptionShort = $STR_EPOCH_SKINS_GUNNEROUTFIT; sex = "male"; playerModel = "FR_Rodriguez_DZ"; }; class Skin_CZ_Soldier_Sniper_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_DESERTGHILLIE; descriptionShort = $STR_EPOCH_SKINS_DESERTGHILLIE; sex = "male"; playerModel = "CZ_Soldier_Sniper_EP1_DZ"; }; class Skin_Graves_Light_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_URBANCAMO; descriptionShort = $STR_EPOCH_SKINS_URBANCAMO; sex = "male"; playerModel = "Graves_Light_DZ"; }; class Skin_Soldier_Sniper_PMC_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_MARKSMAN; descriptionShort = $STR_EPOCH_SKINS_MARKSMAN; sex = "male"; playerModel = "Soldier_Sniper_PMC_DZ"; }; class Skin_Soldier_TL_PMC_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TEAMLEADER; descriptionShort = $STR_EPOCH_SKINS_TEAMLEADER; sex = "male"; playerModel = "Soldier_TL_PMC_DZ"; }; class Skin_TK_Special_Forces_MG_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_SMUGGLER; descriptionShort = $STR_EPOCH_SKINS_SMUGGLER; sex = "male"; playerModel = "TK_Special_Forces_MG_EP1_DZ"; }; class Skin_TK_Soldier_Sniper_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_DESERTSNIPER; descriptionShort = $STR_EPOCH_SKINS_DESERTSNIPER; sex = "male"; playerModel = "TK_Soldier_Sniper_EP1_DZ"; }; class Skin_TK_Commander_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_GENERAL; descriptionShort = $STR_GENERAL; sex = "male"; playerModel = "TK_Commander_EP1_DZ"; }; class Skin_RU_Soldier_Crew_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CREWMAN; descriptionShort = $STR_EPOCH_SKINS_CREWMAN; sex = "male"; playerModel = "RU_Soldier_Crew_DZ"; }; class Skin_INS_Lopotev_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BOSS; descriptionShort = $STR_EPOCH_SKINS_BOSS_DESC; sex = "male"; playerModel = "INS_Lopotev_DZ"; }; class Skin_INS_Soldier_AR_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_COOPER; descriptionShort = $STR_EPOCH_SKINS_COOPER; sex = "male"; playerModel = "INS_Soldier_AR_DZ"; }; class Skin_INS_Soldier_CO_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TRAVIS; descriptionShort = $STR_EPOCH_SKINS_TRAVIS; sex = "male"; playerModel = "INS_Soldier_CO_DZ"; }; class Skin_INS_Bardak_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_PAULO; descriptionShort = $STR_EPOCH_SKINS_PAULO; sex = "male"; playerModel = "INS_Bardak_DZ"; }; class Skin_INS_Worker2_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_STEVE; descriptionShort = $STR_EPOCH_SKINS_STEVE; sex = "male"; playerModel = "INS_Worker2_DZ"; }; class Skin_USMC_Soldier_Officer_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_USMCOFFICER; descriptionShort = $STR_EPOCH_SKINS_USMCOFFICER; sex = "male"; playerModel = "USMC_Soldier_Officer_DZ"; }; class Skin_USMC_Soldier_MG_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_USMCSOLDIER; descriptionShort = $STR_EPOCH_SKINS_USMCSOLDIER; sex = "male"; playerModel = "USMC_Soldier_MG_DZ"; }; class Skin_USMC_Soldier_Pilot_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_USMCPILOT; descriptionShort = $STR_EPOCH_SKINS_USMCPILOT; sex = "male"; playerModel = "USMC_Soldier_Pilot_DZ"; }; class Skin_FR_TL_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CAMOTEAMLEADER; descriptionShort = $STR_EPOCH_SKINS_CAMOTEAMLEADER; sex = "male"; playerModel = "FR_TL_DZ"; }; class Skin_FR_R_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CAMORECON; descriptionShort = $STR_EPOCH_SKINS_CAMORECON; sex = "male"; playerModel = "FR_R_DZ"; }; class Skin_FR_Marksman_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CAMOMARKSMAN; descriptionShort = $STR_EPOCH_SKINS_CAMOMARKSMAN; sex = "male"; playerModel = "FR_Marksman_DZ"; }; class Skin_FR_Assault_R_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CAMOASSAULT; descriptionShort = $STR_EPOCH_SKINS_CAMOASSAULT; sex = "male"; playerModel = "FR_Assault_R_DZ"; }; class Skin_RU_Soldier_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_RUSOLDIER; descriptionShort = $STR_EPOCH_SKINS_RUSOLDIER; sex = "male"; playerModel = "RU_Soldier_DZ"; }; class Skin_RU_Soldier_Officer_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_RUOFFICER; descriptionShort = $STR_EPOCH_SKINS_RUOFFICER; sex = "male"; playerModel = "RU_Soldier_Officer_DZ"; }; class Skin_RUS_Soldier1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_RUCAMO; descriptionShort = $STR_EPOCH_SKINS_RUCAMO; sex = "male"; playerModel = "RUS_Soldier1_DZ"; }; class Skin_RUS_Commander_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_RUCOMMANDER; descriptionShort = $STR_EPOCH_SKINS_RUCOMMANDER; sex = "male"; playerModel = "RUS_Commander_DZ"; }; class Skin_MVD_Soldier_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_MVDSOLDIER; descriptionShort = $STR_EPOCH_SKINS_MVDSOLDIER; sex = "male"; playerModel = "MVD_Soldier_DZ"; }; class Skin_Ins_Soldier_2_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TERRORISTCAMO; descriptionShort = $STR_EPOCH_SKINS_TERRORISTCAMO; sex = "male"; playerModel = "Ins_Soldier_2_DZ"; }; class Skin_Ins_Commander_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_INSCOMMANDER; descriptionShort = $STR_EPOCH_SKINS_INSCOMMANDER; sex = "male"; playerModel = "Ins_Commander_DZ"; }; class Skin_Ins_Soldier_Crew_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_INSCREWMAN; descriptionShort = $STR_EPOCH_SKINS_INSCREWMAN; sex = "male"; playerModel = "Ins_Soldier_Crew_DZ"; }; class Skin_CDF_Soldier_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CDFSOLDIER; descriptionShort = $STR_EPOCH_SKINS_CDFSOLDIER; sex = "male"; playerModel = "CDF_Soldier_DZ"; }; class Skin_Assistant_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_ASSISTANT; descriptionShort = $STR_EPOCH_SKINS_ASSISTANT; sex = "male"; playerModel = "Assistant_DZ"; }; class Skin_Doctor_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_DOCTOR; descriptionShort = $STR_EPOCH_SKINS_DOCTOR; sex = "male"; playerModel = "Doctor_DZ"; }; class Skin_Worker1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_WORKER1; descriptionShort = $STR_EPOCH_SKINS_WORKER1; sex = "male"; playerModel = "Worker1_DZ"; }; class Skin_Worker3_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_WORKER2; descriptionShort = $STR_EPOCH_SKINS_WORKER2; sex = "male"; playerModel = "Worker3_DZ"; }; class Skin_Worker4_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_WORKER3; descriptionShort = $STR_EPOCH_SKINS_WORKER3; sex = "male"; playerModel = "Worker4_DZ"; }; class Skin_TK_CIV_Takistani01_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKCITIZEN1; descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN1; sex = "male"; playerModel = "TK_CIV_Takistani01_EP1_DZ"; }; class Skin_TK_CIV_Takistani03_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKCITIZEN2; descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN2; sex = "male"; playerModel = "TK_CIV_Takistani03_EP1_DZ"; }; class Skin_TK_CIV_Takistani04_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKCITIZEN3; descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN3; sex = "male"; playerModel = "TK_CIV_Takistani04_EP1_DZ"; }; class Skin_TK_CIV_Takistani06_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKCITIZEN4; descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN4; sex = "male"; playerModel = "TK_CIV_Takistani06_EP1_DZ"; }; class Skin_TK_INS_Soldier_AR_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKSOLDIER; descriptionShort = $STR_EPOCH_SKINS_TKSOLDIER; sex = "male"; playerModel = "TK_INS_Soldier_AR_EP1_DZ"; }; class Skin_TK_GUE_Soldier_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKGUESOLDIER; descriptionShort = $STR_EPOCH_SKINS_TKGUESOLDIER; sex = "male"; playerModel = "TK_GUE_Soldier_EP1_DZ"; }; class Skin_CZ_Soldier_SL_DES_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CZSOLDIER; descriptionShort = $STR_EPOCH_SKINS_CZSOLDIER; sex = "male"; playerModel = "CZ_Soldier_SL_DES_EP1_DZ"; }; class Skin_US_Soldier_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_USSOLDIER; descriptionShort = $STR_EPOCH_SKINS_USSOLDIER; sex = "male"; playerModel = "US_Soldier_EP1_DZ"; }; class Skin_UN_CDF_Soldier_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_UNSOLDIER; descriptionShort = $STR_EPOCH_SKINS_UNSOLDIER; sex = "male"; playerModel = "UN_CDF_Soldier_EP1_DZ"; }; class Skin_UN_CDF_Soldier_Guard_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_UNCOMMANDER; descriptionShort = $STR_EPOCH_SKINS_UNCOMMANDER; sex = "male"; playerModel = "UN_CDF_Soldier_Guard_EP1_DZ"; }; class Skin_GER_Soldier_TL_EP1_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_GERRECON; descriptionShort = $STR_EPOCH_SKINS_GERRECON; sex = "male"; playerModel = "GER_Soldier_TL_EP1_DZ"; }; class Skin_BAF_Soldier_Officer_MTP_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BAFOFFICER; descriptionShort = $STR_EPOCH_SKINS_BAFOFFICER; sex = "male"; playerModel = "BAF_Soldier_Officer_MTP_DZ"; }; class Skin_BAF_Soldier_N_MTP_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BAFSOLDIER; descriptionShort = $STR_EPOCH_SKINS_BAFSOLDIER; sex = "male"; playerModel = "BAF_Soldier_N_MTP_DZ"; }; class Skin_FR_Sapper_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_FRSAPPER; descriptionShort = $STR_EPOCH_SKINS_FRSAPPER; sex = "male"; @@ -621,35 +621,35 @@ class Skin_FR_Sapper_DZ: SkinBase { }; //Namalsk Skins class Skin_CamoWinter_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CAMOWINTER; descriptionShort = $STR_DZE_EQUIP_CAMOWINTER_DESC; sex = "male"; playerModel = "CamoWinter_DZ"; }; class Skin_CamoWinterW_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CAMOWINTERW; descriptionShort = $STR_DZE_EQUIP_CAMOWINTER_DESC; sex = "male"; playerModel = "CamoWinterW_DZ"; }; class Skin_Sniper1W_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_SNIPER1W; descriptionShort = $STR_EPOCH_SKINS_SNIPER1W; sex = "male"; playerModel = "Sniper1W_DZ"; }; class Skin_Nac_Soldier_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_NACSOLDIER; descriptionShort = $STR_EPOCH_SKINS_NACSOLDIER; sex = "male"; playerModel = "Nac_Soldier_DZ"; }; class Skin_Tamika_DZ: SkinBase { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TAMIKA; descriptionShort = $STR_EPOCH_SKINS_TAMIKA; sex = "female"; @@ -657,119 +657,119 @@ class Skin_Tamika_DZ: SkinBase { }; //Stalker Skins class Skin_gsc_military_helmet_wdl_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_WDL_MIL_MASK_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_military_helmet_wdl_DZ"; }; class Skin_gsc_military_head_wdl_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_WDL_MIL_HEAD_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_military_head_wdl_DZ"; }; class Skin_gsc_military_helmet_grey_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_URB_MIL_MASK_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_military_helmet_grey_DZ"; }; class Skin_gsc_military_head_grey_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_URB_MIL_HEAD_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_military_head_grey_DZ"; }; class Skin_gsc_scientist1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_SCIENTIST1_MASK_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_SCIENTIST_DESC; sex = "male"; playerModel = "gsc_scientist1_DZ"; }; class Skin_gsc_scientist1_head_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_SCIENTIST1_HEAD_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_SCIENTIST_DESC; sex = "male"; playerModel = "gsc_scientist1_head_DZ"; }; class Skin_gsc_scientist2_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_SCIENTIST2_MASK_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_SCIENTIST_DESC; sex = "male"; playerModel = "gsc_scientist2_DZ"; }; class Skin_gsc_scientist2_head_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_SCIENTIST2_HEAD_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_SCIENTIST_DESC; sex = "male"; playerModel = "gsc_scientist2_head_DZ"; }; class Skin_gsc_cloth_loner_head_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_ROOKIE_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_ROOKIE_DESC; sex = "male"; playerModel = "gsc_cloth_loner_head_DZ"; }; class Skin_gsc_eco_stalker_mask_neutral_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_LONER_MASK_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_eco_stalker_mask_neutral_DZ"; }; class Skin_gsc_eco_stalker_head_neutral_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_LONER_HEAD_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_eco_stalker_head_neutral_DZ"; }; class Skin_gsc_eco_stalker_mask_fred_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_FREEDOM_MASK_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_eco_stalker_mask_fred_DZ"; }; class Skin_gsc_eco_stalker_head_fred_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_FREEDOM_HEAD_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_eco_stalker_head_fred_DZ"; }; class Skin_gsc_eco_stalker_mask_duty_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_DUTY_MASK_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_eco_stalker_mask_duty_DZ"; }; class Skin_gsc_eco_stalker_head_duty_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_DUTY_HEAD_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_eco_stalker_head_duty_DZ"; }; class Skin_gsc_eco_stalker_mask_camo_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_MONOLITH_MASK_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; playerModel = "gsc_eco_stalker_mask_camo_DZ"; }; class Skin_gsc_eco_stalker_head_camo_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_STALKER_MONOLITH_HEAD_NAME; descriptionShort = $STR_DZE_EQUIP_STALKER_DESC; sex = "male"; @@ -777,238 +777,238 @@ class Skin_gsc_eco_stalker_head_camo_DZ : SkinBase { }; //New ghillies skins class Skin_GhillieFull_Desert01_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_DES_1_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Desert01_DZ"; }; class Skin_GhillieFull_Desert02_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_DES_2_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Desert02_DZ"; }; class Skin_GhillieFull_Desert03_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_DES_3_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Desert03_DZ"; }; class Skin_GhillieFull_Desert04_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_DES_4_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Desert04_DZ"; }; class Skin_GhillieFull_Desert05_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_DES_5_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Desert05_DZ"; }; class Skin_GhillieFull_Desert06_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_DES_6_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Desert06_DZ"; }; class Skin_GhillieFull_Desert07_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_DES_7_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Desert07_DZ"; }; class Skin_GhillieFull_Desert08_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_DES_8_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Desert08_DZ"; }; class Skin_GhillieFull_Snow01_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_SNOW_1_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Snow01_DZ"; }; class Skin_GhillieFull_Snow02_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_SNOW_2_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Snow02_DZ"; }; class Skin_GhillieFull_Snow03_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_SNOW_3_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Snow03_DZ"; }; class Skin_GhillieFull_Snow04_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_SNOW_4_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Snow04_DZ"; }; class Skin_GhillieFull_Snow05_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_SNOW_5_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Snow05_DZ"; }; class Skin_GhillieFull_Urban01_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_URB_1_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Urban01_DZ"; }; class Skin_GhillieFull_Wood01_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_1_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood01_DZ"; }; class Skin_GhillieFull_Wood02_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_2_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood02_DZ"; }; class Skin_GhillieFull_Wood03_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_3_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood03_DZ"; }; class Skin_GhillieFull_Wood04_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_4_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood04_DZ"; }; class Skin_GhillieFull_Wood05_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_5_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood05_DZ"; }; class Skin_GhillieFull_Wood06_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_6_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood06_DZ"; }; class Skin_GhillieFull_Wood07_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_7_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood07_DZ"; }; class Skin_GhillieFull_Wood08_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_8_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood08_DZ"; }; class Skin_GhillieFull_Wood09_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_9_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood09_DZ"; }; class Skin_GhillieFull_Wood10_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_10_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood10_DZ"; }; class Skin_GhillieFull_Wood11_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_11_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood11_DZ"; }; class Skin_GhillieFull_Wood12_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_12_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood12_DZ"; }; class Skin_GhillieFull_Wood13_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_13_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood13_DZ"; }; class Skin_GhillieFull_Wood14_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_14_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood14_DZ"; }; class Skin_GhillieFull_Wood15_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_15_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood15_DZ"; }; class Skin_GhillieFull_Wood16_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GHILLIE_WDL_16_NAME; descriptionShort = $STR_EQUIP_DESC_GHILLIE; sex = "male"; playerModel = "GhillieFull_Wood16_DZ"; }; class Skin_GER_Soldier_EP1_des_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GER_SOLDIER_DES_NAME; descriptionShort = $STR_DZE_EQUIP_GER_SOLDIER_DES_DESC; sex = "male"; playerModel = "GER_Soldier_EP1_des_DZ"; }; class Skin_GER_Soldier_TL_EP1_des_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GER_TL_DES_NAME; descriptionShort = $STR_DZE_EQUIP_GER_TL_DES_DESC; sex = "male"; playerModel = "GER_Soldier_TL_EP1_des_DZ"; }; class Skin_GER_Soldier_EP1_wdl_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GER_Soldier_WDL_NAME; descriptionShort = $STR_DZE_EQUIP_GER_Soldier_WDL_DESC; sex = "male"; playerModel = "GER_Soldier_EP1_wdl_DZ"; }; class Skin_GER_Soldier_TL_EP1_wdl_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_GER_TL_WDL_NAME; descriptionShort = $STR_DZE_EQUIP_GER_TL_WDL_DESC; sex = "male"; @@ -1017,7 +1017,7 @@ class Skin_GER_Soldier_TL_EP1_wdl_DZ : SkinBase { //New ice apo skins class Skin_Apo_Rifleman_01_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_APO_RIFLEMAN_1_NAME; descriptionShort = $STR_DZE_EQUIP_APO_RIFLEMAN_DESC; sex = "male"; @@ -1025,7 +1025,7 @@ class Skin_Apo_Rifleman_01_DZ : SkinBase }; class Skin_Apo_Rifleman_02_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_APO_RIFLEMAN_2_NAME; descriptionShort = $STR_DZE_EQUIP_APO_RIFLEMAN_DESC; sex = "male"; @@ -1033,7 +1033,7 @@ class Skin_Apo_Rifleman_02_DZ : SkinBase }; class Skin_Apo_Rifleman_03_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_APO_RIFLEMAN_3_NAME; descriptionShort = $STR_DZE_EQUIP_APO_RIFLEMAN_DESC; sex = "male"; @@ -1041,7 +1041,7 @@ class Skin_Apo_Rifleman_03_DZ : SkinBase }; class Skin_Apo_Rifleman_04_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_APO_RIFLEMAN_4_NAME; descriptionShort = $STR_DZE_EQUIP_APO_RIFLEMAN_DESC; sex = "male"; @@ -1049,7 +1049,7 @@ class Skin_Apo_Rifleman_04_DZ : SkinBase }; class Skin_Apo_Rifleman_05_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_APO_RIFLEMAN_5_NAME; descriptionShort = $STR_DZE_EQUIP_APO_RIFLEMAN_DESC; sex = "male"; @@ -1057,7 +1057,7 @@ class Skin_Apo_Rifleman_05_DZ : SkinBase }; class Skin_Apo_Rifleman_06_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_APO_RIFLEMAN_6_NAME; descriptionShort = $STR_DZE_EQUIP_APO_RIFLEMAN_DESC; sex = "male"; @@ -1065,7 +1065,7 @@ class Skin_Apo_Rifleman_06_DZ : SkinBase }; //New sg_gru skins class Skin_SG_GRU_TL_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_SG_GRU_DT_TL_NAME; descriptionShort = $STR_DZE_EQUIP_SG_GRU_SPEZNAZ_DESC; sex = "male"; @@ -1121,322 +1121,322 @@ class Skin_SG_GRU_MG_D_DZ : Skin_SG_GRU_TL_DZ { }; //ACR Skins class Skin_CZ_Soldier805_DES_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_DES_SOLDIER_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_DES_SOLDIER_NAME; sex = "male"; playerModel = "CZ_Soldier805_DES_ACR_DZ"; }; class Skin_CZ_Soldier_805_Wdl_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_WDL_SOLDIER_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_WDL_SOLDIER_NAME; sex = "male"; playerModel = "CZ_Soldier_805_Wdl_ACR_DZ"; }; class Skin_CZ_Soldier_Crew_Dst_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_CREW_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_CREW_NAME; sex = "male"; playerModel = "CZ_Soldier_Crew_Dst_ACR_DZ"; }; class Skin_CZ_Soldier_Officer_Wdl_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_OFFICER_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_OFFICER_NAME; sex = "male"; playerModel = "CZ_Soldier_Officer_Wdl_ACR_DZ"; }; class Skin_CZ_Soldier_Recon_Wdl_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_SPFORCE_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_SPFORCE_NAME; sex = "male"; playerModel = "CZ_Soldier_Recon_Wdl_ACR_DZ"; }; class Skin_CZ_Soldier_Spec1_Wdl_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_RECON_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_RECON_NAME; sex = "male"; playerModel = "CZ_Soldier_Spec1_Wdl_ACR_DZ"; }; class Skin_CZ_Soldier_Spec2_Wdl_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_SAPPER_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_SAPPER_NAME; sex = "male"; playerModel = "CZ_Soldier_Spec2_Wdl_ACR_DZ"; }; class Skin_CZ_Soldier_Spec3_Wdl_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_ASSAULT_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_ASSAULT_NAME; sex = "male"; playerModel = "CZ_Soldier_Spec3_Wdl_ACR_DZ"; }; class Skin_CZ_Soldier_Spec_Demo_Dst_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_HEAVYSOLDIER_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_HEAVYSOLDIER_NAME; sex = "male"; playerModel = "CZ_Soldier_Spec_Demo_Dst_ACR_DZ"; }; class Skin_CZ_Soldier_Sniper_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_GHILLIE_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_GHILLIE_NAME; sex = "male"; playerModel = "CZ_Soldier_Sniper_ACR_DZ"; }; class Skin_CZ_Soldier_Light_Wdl_ACR_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_LIGHT_SOLDIER_NAME; descriptionShort = $STR_DZE_EQUIP_ACR_LIGHT_SOLDIER_NAME; sex = "male"; playerModel = "CZ_Soldier_Light_Wdl_ACR_DZ"; }; class Skin_Firefighter1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_FIREFIGHTER1_NAME; descriptionShort = $STR_DZE_SKIN_FIREFIGHTER1_NAME; sex = "male"; playerModel = "Firefighter1_DZ"; }; class Skin_Firefighter2_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_FIREFIGHTER2_NAME; descriptionShort = $STR_DZE_SKIN_FIREFIGHTER2_NAME; sex = "male"; playerModel = "Firefighter2_DZ"; }; class Skin_Firefighter3_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_FIREFIGHTER3_NAME; descriptionShort = $STR_DZE_SKIN_FIREFIGHTER3_NAME; sex = "male"; playerModel = "Firefighter3_DZ"; }; class Skin_Firefighter4_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_FIREFIGHTER4_NAME; descriptionShort = $STR_DZE_SKIN_FIREFIGHTER4_NAME; sex = "male"; playerModel = "Firefighter4_DZ"; }; class Skin_Firefighter5_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_FIREFIGHTER5_NAME; descriptionShort = $STR_DZE_SKIN_FIREFIGHTER5_NAME; sex = "male"; playerModel = "Firefighter5_DZ"; }; class Skin_Firefighter_Officer1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_FIREFIGHTER_OFFICER1_NAME; descriptionShort = $STR_DZE_SKIN_FIREFIGHTER_OFFICER1_NAME; sex = "male"; playerModel = "Firefighter_Officer1_DZ"; }; class Skin_Firefighter_Officer2_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_FIREFIGHTER_OFFICER2_NAME; descriptionShort = $STR_DZE_SKIN_FIREFIGHTER_OFFICER2_NAME; sex = "male"; playerModel = "Firefighter_Officer2_DZ"; }; class Skin_Postman1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_POSTMAN1_NAME; descriptionShort = $STR_DZE_SKIN_POSTMAN1_NAME; sex = "male"; playerModel = "Postman1_DZ"; }; class Skin_Postman2_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_POSTMAN2_NAME; descriptionShort = $STR_DZE_SKIN_POSTMAN2_NAME; sex = "male"; playerModel = "Postman2_DZ"; }; class Skin_Postman3_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_POSTMAN3_NAME; descriptionShort = $STR_DZE_SKIN_POSTMAN3_NAME; sex = "male"; playerModel = "Postman3_DZ"; }; class Skin_Postman4_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_POSTMAN4_NAME; descriptionShort = $STR_DZE_SKIN_POSTMAN4_NAME; sex = "male"; playerModel = "Postman4_DZ"; }; class Skin_SchoolTeacher_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_TEACHER_NAME; descriptionShort = $STR_DZE_SKIN_TEACHER_NAME; sex = "male"; playerModel = "SchoolTeacher_DZ"; }; class Skin_Gardener_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_GARDENER_NAME; descriptionShort = $STR_DZE_SKIN_GARDENER_NAME; sex = "male"; playerModel = "Gardener_DZ"; }; class Skin_Hunter_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_HUNTER_NAME; descriptionShort = $STR_DZE_SKIN_HUNTER_NAME; sex = "male"; playerModel = "Hunter_DZ"; }; class Skin_Civilian1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN1_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN1_NAME; sex = "male"; playerModel = "Civilian1_DZ"; }; class Skin_Civilian2_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN2_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN2_NAME; sex = "male"; playerModel = "Civilian2_DZ"; }; class Skin_Civilian3_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN3_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN3_NAME; sex = "male"; playerModel = "Civilian3_DZ"; }; class Skin_Civilian4_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN4_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN4_NAME; sex = "male"; playerModel = "Civilian4_DZ"; }; class Skin_Civilian5_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN5_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN5_NAME; sex = "male"; playerModel = "Civilian5_DZ"; }; class Skin_Civilian6_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN6_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN6_NAME; sex = "male"; playerModel = "Civilian6_DZ"; }; class Skin_Civilian7_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN7_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN7_NAME; sex = "male"; playerModel = "Civilian7_DZ"; }; class Skin_Civilian8_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN8_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN8_NAME; sex = "male"; playerModel = "Civilian8_DZ"; }; class Skin_Civilian9_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN9_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN9_NAME; sex = "male"; playerModel = "Civilian9_DZ"; }; class Skin_Civilian10_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN10_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN10_NAME; sex = "male"; playerModel = "Civilian10_DZ"; }; class Skin_Civilian11_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN11_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN11_NAME; sex = "male"; playerModel = "Civilian11_DZ"; }; class Skin_Civilian12_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN12_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN12_NAME; sex = "male"; playerModel = "Civilian12_DZ"; }; class Skin_Civilian13_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN13_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN13_NAME; sex = "male"; playerModel = "Civilian13_DZ"; }; class Skin_Civilian14_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_CIVILIAN14_NAME; descriptionShort = $STR_DZE_SKIN_CIVILIAN14_NAME; sex = "male"; playerModel = "Civilian14_DZ"; }; class Skin_Prisoner1_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_PRISONER1_NAME; descriptionShort = $STR_DZE_SKIN_PRISONER1_NAME; sex = "male"; playerModel = "Prisoner1_DZ"; }; class Skin_Prisoner2_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_PRISONER2_NAME; descriptionShort = $STR_DZE_SKIN_PRISONER2_NAME; sex = "male"; playerModel = "Prisoner2_DZ"; }; class Skin_Prisoner3_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_PRISONER3_NAME; descriptionShort = $STR_DZE_SKIN_PRISONER3_NAME; sex = "male"; playerModel = "Prisoner3_DZ"; }; class Skin_Reporter_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_REPORTER_NAME; descriptionShort = $STR_DZE_SKIN_REPORTER_NAME; sex = "male"; playerModel = "Reporter_DZ"; }; class Skin_MafiaBoss_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_MAFIABOSS_NAME; descriptionShort = $STR_DZE_SKIN_MAFIABOSS_NAME; sex = "male"; playerModel = "MafiaBoss_DZ"; }; class Skin_Dealer_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_DRUGDEALER_NAME; descriptionShort = $STR_DZE_SKIN_DRUGDEALER_NAME; sex = "male"; playerModel = "Dealer_DZ"; }; class Skin_BusinessMan_DZ : SkinBase { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_BUSINESSMAN_NAME; descriptionShort = $STR_DZE_SKIN_BUSINESSMAN_NAME; sex = "male"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp index 218babe9a..d5d17e1e9 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp @@ -2,7 +2,7 @@ class ConsumableBase : CA_Magazine { count = 1; - type = WeaponSlotItem; + type = 256; //Amount of blood regenerated bloodRegen = 0; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Fish.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Fish.hpp index 9591320c2..17acdd321 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Fish.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Fish.hpp @@ -1,87 +1,69 @@ class FishRawTrout : FoodRaw { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\trout.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_trout_CA.paa"; displayName = $STR_FOOD_NAME_TROUT_RAW; - descriptionShort = $STR_FOOD_EQUIP_TROUT_RAW; - + descriptionShort = $STR_FOOD_EQUIP_TROUT_RAW; bloodRegen = 500; - Nutrition[] = {117,350,0,0}; - + Nutrition[] = {117,350,0,0}; cookOutput = "FishCookedTrout"; }; class FishCookedTrout : FoodCooked { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\trout_cooked.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_trout_cooked_CA.paa"; displayName = $STR_FOOD_NAME_TROUT_COOKED; - descriptionShort = $STR_FOOD_EQUIP_TROUT_COOKED; - + descriptionShort = $STR_FOOD_EQUIP_TROUT_COOKED; bloodRegen = 1000; Nutrition[] = {117,700,0,0}; }; - - class FishRawSeaBass : FoodRaw { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\seabass.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_seabass_CA.paa"; displayName = $STR_FOOD_NAME_SEABASS_RAW; - descriptionShort = $STR_FOOD_EQUIP_SEABASS_RAW; - + descriptionShort = $STR_FOOD_EQUIP_SEABASS_RAW; bloodRegen = 700; - Nutrition[] = {110,450,0,0}; - + Nutrition[] = {110,450,0,0}; cookOutput = "FishCookedSeaBass"; }; class FishCookedSeaBass : FoodCooked { - scope = public; + scope = 2; model = "\z\addons\dayz_communityassets\models\seabass_cooked.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_seabass_cooked_CA.paa"; displayName = $STR_FOOD_NAME_SEABASS_COOKED; - descriptionShort = $STR_FOOD_EQUIP_SEABASS_COOKED; - + descriptionShort = $STR_FOOD_EQUIP_SEABASS_COOKED; bloodRegen = 1400; Nutrition[] = {110,900,0,0}; }; - - class FishRawTuna : FoodRaw { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\tuna.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_tuna_CA.paa"; displayName = $STR_FOOD_NAME_TUNA_RAW; - descriptionShort = $STR_FOOD_EQUIP_TUNA_RAW; - + descriptionShort = $STR_FOOD_EQUIP_TUNA_RAW; bloodRegen = 1000; - Nutrition[] = {123,550,0,0}; - + Nutrition[] = {123,550,0,0}; cookOutput = "FishCookedTuna"; }; class FishCookedTuna : FoodCooked { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\tuna_cooked.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_tuna_cooked_CA.paa"; displayName = $STR_FOOD_NAME_TUNA_COOKED; - descriptionShort = $STR_FOOD_EQUIP_TUNA_COOKED; - + descriptionShort = $STR_FOOD_EQUIP_TUNA_COOKED; bloodRegen = 2000; Nutrition[] = {123,1100,0,0}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp index 15a945306..eac361113 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp @@ -1,203 +1,161 @@ class FoodGoatRaw : FoodRaw { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; displayName = $STR_FOOD_NAME_GOAT_RAW; - descriptionShort = $STR_FOOD_EQUIP_GOAT_RAW; - + descriptionShort = $STR_FOOD_EQUIP_GOAT_RAW; bloodRegen = 300; - Nutrition[] = {143,300,0,0}; - + Nutrition[] = {143,300,0,0}; cookOutput = "FoodGoatCooked"; }; class FoodGoatCooked : FoodCooked { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; displayName = $STR_FOOD_NAME_GOAT_COOKED; - descriptionShort = $STR_FOOD_EQUIP_GOAT_COOKED; - + descriptionShort = $STR_FOOD_EQUIP_GOAT_COOKED; bloodRegen = 600; Nutrition[] = {143,600,0,0}; }; class FoodMuttonRaw : FoodRaw { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\mutton_raw.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_mutton_raw_CA.paa"; displayName = $STR_FOOD_EQUIP_CODE_NAME_1; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_1; - + descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_1; bloodRegen = 400; - Nutrition[] = {294,350,0,0}; - + Nutrition[] = {294,350,0,0}; cookOutput = "FoodMuttonCooked"; }; class FoodMuttonCooked : FoodCooked { - scope = public; + scope = 2; model = "z\addons\dayz_communityassets\models\mutton_cooked.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_mutton_cooked_CA.paa"; displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_1; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_1; - + descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_1; bloodRegen = 800; Nutrition[] = {294,700,0,0}; }; - - class FoodChickenRaw : FoodRaw { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; displayName = $STR_FOOD_EQUIP_CODE_NAME_2; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_2; - + descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_2; bloodRegen = 400; - Nutrition[] = {219,350,0,0}; - + Nutrition[] = {219,350,0,0}; cookOutput = "FoodChickenCooked"; }; class FoodChickenCooked : FoodCooked { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_2; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_2; - + descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_2; bloodRegen = 800; Nutrition[] = {219,700,0,0}; }; - - class FoodBaconRaw : FoodRaw { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\bacon_raw.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_raw_CA.paa"; displayName = $STR_FOOD_EQUIP_CODE_NAME_4; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_4; - + descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_4; bloodRegen = 300; - Nutrition[] = {417,350,0,0}; - + Nutrition[] = {417,350,0,0}; cookOutput = "FoodBaconCooked"; }; class FoodBaconCooked : FoodCooked { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\bacon_fried.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_fried_CA.paa"; displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_4; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_4; - + descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_4; bloodRegen = 600; Nutrition[] = {417,700,0,0}; }; - - class FoodRabbitRaw : FoodRaw { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; displayName = $STR_FOOD_EQUIP_CODE_NAME_3; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_3; - + descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_3; bloodRegen = 500; - Nutrition[] = {517,450,0,0}; - + Nutrition[] = {517,450,0,0}; cookOutput = "FoodRabbitCooked"; }; class FoodRabbitCooked : FoodCooked { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_3; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_3; - + descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_3; bloodRegen = 1000; Nutrition[] = {517,900,0,0}; }; - - class FoodBeefRaw : FoodRaw { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; displayName = $STR_FOOD_EQUIP_CODE_NAME_6; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_6; - + descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_6; bloodRegen = 400; - Nutrition[] = {332,350,0,0}; - + Nutrition[] = {332,350,0,0}; cookOutput = "FoodBeefCooked"; }; class FoodBeefCooked : FoodCooked { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_6; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_6; - + descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_6; bloodRegen = 800; Nutrition[] = {332,700,0,0}; }; class FoodDogRaw : FoodRaw { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; displayName = $STR_FOOD_NAME_DOG_RAW; - descriptionShort = $STR_EQUIP_DESC_47; - + descriptionShort = $STR_EQUIP_DESC_47; bloodRegen = 300; - Nutrition[] = {143,300,0,0}; - + Nutrition[] = {143,300,0,0}; cookOutput = "FoodDogCooked"; }; class FoodDogCooked : FoodCooked { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; displayName = $STR_FOOD_NAME_DOG_COOKED; - descriptionShort = $STR_EQUIP_DESC_25; - + descriptionShort = $STR_EQUIP_DESC_25; bloodRegen = 600; Nutrition[] = {143,600,0,0}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp index a5fbf2ca2..291a38c8a 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp @@ -1,566 +1,439 @@ -/*class AngelCookies : FoodPackaged -{ - scope = public; - - model = "z\addons\dayz_communityassets\models\buiscits_box.p3d"; - picture = "z\addons\dayz_communityassets\CraftingPlaceholders\equip_angel_cookies.paa"; - displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_5; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_5; - - Nutrition[] = {400,100,0,0}; -};*/ - class FoodMRE : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\mre.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_mre_CA.paa"; displayName = $STR_FOOD_NAME_MRE; - descriptionShort = $STR_FOOD_DESC_MRE; - + descriptionShort = $STR_FOOD_DESC_MRE; bloodRegen = 300; Nutrition[] = {150,800,600,0}; }; class FoodPistachio : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\pistachio.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa"; displayName = $STR_FOOD_NAME_PISTACHIO; - descriptionShort = $STR_FOOD_DESC_PISTACHIO; - + descriptionShort = $STR_FOOD_DESC_PISTACHIO; bloodRegen = 100; Nutrition[] = {0,450,0,0}; }; class FoodNutmix : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\nutmix.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_nutmix_CA.paa"; displayName = $STR_FOOD_NAME_NUTMIX; - descriptionShort = $STR_FOOD_DESC_NUTMIX; - + descriptionShort = $STR_FOOD_DESC_NUTMIX; bloodRegen = 100; Nutrition[] = {0,450,0,0}; }; class FoodCanBeef : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_beef_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_beef_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_BEEF; - descriptionShort = $STR_FOOD_DESC_CAN_BEEF; - + descriptionShort = $STR_FOOD_DESC_CAN_BEEF; bloodRegen = 100; - Nutrition[] = {0,600,350,0}; - + Nutrition[] = {0,600,350,0}; consumeOutput = "FoodCanBeefEmpty"; }; class FoodCanPotatoes : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_pots_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_pots_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_POTATOES; - descriptionShort = $STR_FOOD_DESC_CAN_POTATOES; - + descriptionShort = $STR_FOOD_DESC_CAN_POTATOES; bloodRegen = 100; - Nutrition[] = {0,750,450,0}; - + Nutrition[] = {0,750,450,0}; consumeOutput = "FoodCanPotatoesEmpty"; }; class FoodCanGriff : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_griff_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_griff_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_GRIFF; - descriptionShort = $STR_FOOD_DESC_CAN_GRIFF; - + descriptionShort = $STR_FOOD_DESC_CAN_GRIFF; bloodRegen = 100; - Nutrition[] = {0,500,0,0}; - + Nutrition[] = {0,500,0,0}; consumeOutput = "FoodCanGriffEmpty"; }; class FoodCanBadguy : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_badguy_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_badguy_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_BADGUY; - descriptionShort = $STR_FOOD_DESC_CAN_BADGUY; - + descriptionShort = $STR_FOOD_DESC_CAN_BADGUY; bloodRegen = 100; - Nutrition[] = {0,400,0,0}; - + Nutrition[] = {0,400,0,0}; consumeOutput = "FoodCanBadguyEmpty"; }; class FoodCanBoneboy : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_boneboy_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_boneboy_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_BONEBOY; - descriptionShort = $STR_FOOD_DESC_CAN_BONEBOY; - + descriptionShort = $STR_FOOD_DESC_CAN_BONEBOY; bloodRegen = 100; Nutrition[] = {0,400,0,0}; - consumeOutput = "FoodCanBoneboyEmpty"; }; class FoodCanCorn : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_corn_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_corn_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_CORN; - descriptionShort = $STR_FOOD_DESC_CAN_CORN; - + descriptionShort = $STR_FOOD_DESC_CAN_CORN; bloodRegen = 100; - Nutrition[] = {0,600,400,0}; - + Nutrition[] = {0,600,400,0}; consumeOutput = "FoodCanCornEmpty"; }; class FoodCanCurgon : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_curgon_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_curgon_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_CURGON; - descriptionShort = $STR_FOOD_DESC_CAN_CURGON; - + descriptionShort = $STR_FOOD_DESC_CAN_CURGON; bloodRegen = 100; - Nutrition[] = {0,480,0,0}; - + Nutrition[] = {0,480,0,0}; consumeOutput = "FoodCanCurgonEmpty"; }; class FoodCanDemon : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_demon_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_demon_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_DEMON; - descriptionShort = $STR_FOOD_DESC_CAN_DEMON; - + descriptionShort = $STR_FOOD_DESC_CAN_DEMON; bloodRegen = 100; - Nutrition[] = {0,465,0,0}; - + Nutrition[] = {0,465,0,0}; consumeOutput = "FoodCanDemonEmpty"; }; class FoodCanFraggleos : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_fraggleos_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_fraggleos_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_FRAGGLEOS; - descriptionShort = $STR_FOOD_DESC_CAN_FRAGGLEOS; - + descriptionShort = $STR_FOOD_DESC_CAN_FRAGGLEOS; bloodRegen = 100; - Nutrition[] = {0,550,0,0}; - + Nutrition[] = {0,550,0,0}; consumeOutput = "FoodCanFraggleosEmpty"; }; class FoodCanHerpy : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_herpy_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_herpy_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_HERPY; - descriptionShort = $STR_FOOD_DESC_CAN_HERPY; - + descriptionShort = $STR_FOOD_DESC_CAN_HERPY; bloodRegen = 100; - Nutrition[] = {0,600,0,0}; - + Nutrition[] = {0,600,0,0}; consumeOutput = "FoodCanHerpyEmpty"; }; class FoodCanDerpy : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_derpy_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_derpy_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_DERPY; - descriptionShort = $STR_FOOD_DESC_CAN_DERPY; - + descriptionShort = $STR_FOOD_DESC_CAN_DERPY; bloodRegen = 100; - Nutrition[] = {0,410,0,0}; - + Nutrition[] = {0,410,0,0}; consumeOutput = "FoodCanDerpyEmpty"; }; class FoodCanOrlok : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_orlok_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_orlok_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_ORLOK; - descriptionShort = $STR_FOOD_DESC_CAN_ORLOK; - + descriptionShort = $STR_FOOD_DESC_CAN_ORLOK; bloodRegen = 100; - Nutrition[] = {0,460,0,0}; - + Nutrition[] = {0,460,0,0}; consumeOutput = "FoodCanOrlokEmpty"; }; class FoodCanPowell : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_powell_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_powell_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_POWELL; - descriptionShort = $STR_FOOD_DESC_CAN_POWELL; - + descriptionShort = $STR_FOOD_DESC_CAN_POWELL; bloodRegen = 100; - Nutrition[] = {0,600,0,0}; - + Nutrition[] = {0,600,0,0}; consumeOutput = "FoodCanPowellEmpty"; }; class FoodCanTylers : FoodPackaged { - scope = public; + scope = 2; model = "z\addons\dayz_communityassets\models\can_tylers_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_tylers_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_TYLERS; - descriptionShort = $STR_FOOD_DESC_CAN_TYLERS; - + descriptionShort = $STR_FOOD_DESC_CAN_TYLERS; bloodRegen = 100; - Nutrition[] = {0,330,0,0}; - + Nutrition[] = {0,330,0,0}; consumeOutput = "FoodCanTylersEmpty"; }; class FoodCanUnlabeled : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_unlabeled_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_unlabeled_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_UNLABELED; - descriptionShort = $STR_FOOD_DESC_CAN_UNLABELED; - + descriptionShort = $STR_FOOD_DESC_CAN_UNLABELED; bloodRegen = 100; - Nutrition[] = {0,550,0,0}; - + Nutrition[] = {0,550,0,0}; consumeOutput = "FoodCanUnlabeledEmpty"; }; class FoodCanRusUnlabeled : FoodPackaged { - scope = public; + scope = 2; model = "z\addons\dayz_communityassets\models\can_small_unlabeled_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_unlabeled_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_UNLABELED; - descriptionShort = $STR_FOOD_DESC_CAN_UNLABELED; - + descriptionShort = $STR_FOOD_DESC_CAN_UNLABELED; bloodRegen = 100; - Nutrition[] = {0,450,0,0}; - + Nutrition[] = {0,450,0,0}; consumeOutput = "FoodCanRusUnlabeledEmpty"; }; class FoodCanRusStew : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_small_rus_stew_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_stew_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_RUS_STEW; - descriptionShort = $STR_FOOD_DESC_CAN_RUS_STEW; - + descriptionShort = $STR_FOOD_DESC_CAN_RUS_STEW; bloodRegen = 100; - Nutrition[] = {0,700,350,0}; - + Nutrition[] = {0,700,350,0}; consumeOutput = "FoodCanRusStewEmpty"; }; class FoodCanRusPork : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_small_rus_pork_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_pork_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_RUS_PORK; - descriptionShort = $STR_FOOD_DESC_CAN_RUS_PORK; - + descriptionShort = $STR_FOOD_DESC_CAN_RUS_PORK; bloodRegen = 100; - Nutrition[] = {0,700,350,0}; - + Nutrition[] = {0,700,350,0}; consumeOutput = "FoodCanRusPorkEmpty"; }; class FoodCanRusPeas : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_small_rus_peas_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_peas_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_RUS_PEAS; - descriptionShort = $STR_FOOD_DESC_CAN_RUS_PEAS; - + descriptionShort = $STR_FOOD_DESC_CAN_RUS_PEAS; bloodRegen = 100; - Nutrition[] = {0,450,0,0}; - + Nutrition[] = {0,450,0,0}; consumeOutput = "FoodCanRusPeasEmpty"; }; class FoodCanRusMilk : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_small_rus_milk_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_milk_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_RUS_MILK; - descriptionShort = $STR_FOOD_DESC_CAN_RUS_MILK; - + descriptionShort = $STR_FOOD_DESC_CAN_RUS_MILK; bloodRegen = 100; - Nutrition[] = {0,380,320,0}; - + Nutrition[] = {0,380,320,0}; consumeOutput = "FoodCanRusMilkEmpty"; }; class FoodCanRusCorn : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\can_small_rus_corn_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_corn_clean_full_ca.paa"; displayName = $STR_FOOD_NAME_CAN_RUS_CORN; - descriptionShort = $STR_FOOD_DESC_CAN_RUS_CORN; - + descriptionShort = $STR_FOOD_DESC_CAN_RUS_CORN; bloodRegen = 100; - Nutrition[] = {0,380,0,0}; - + Nutrition[] = {0,380,0,0}; consumeOutput = "FoodCanRusCornEmpty"; }; class FoodChipsSulahoops : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\bag_chips_small_sulahoops_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_sulahoops_full_ca.paa"; displayName = $STR_FOOD_NAME_CHIPS_SULAHOOPS; - descriptionShort = $STR_FOOD_DESC_CHIPS_SULAHOOPS; - + descriptionShort = $STR_FOOD_DESC_CHIPS_SULAHOOPS; bloodRegen = 100; - Nutrition[] = {0,450,0,0}; - + Nutrition[] = {0,450,0,0}; consumeOutput = "FoodChipsSulahoopsEmpty"; consumeSound = "eat_chips"; }; class FoodChipsMysticales : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\bag_chips_small_mysticales_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_mysticales_full_ca.paa"; displayName = $STR_FOOD_NAME_CHIPS_MYSTICALES; - descriptionShort = $STR_FOOD_DESC_CHIPS_MYSTICALES; - + descriptionShort = $STR_FOOD_DESC_CHIPS_MYSTICALES; bloodRegen = 100; - Nutrition[] = {0,460,0,0}; - + Nutrition[] = {0,460,0,0}; consumeOutput = "FoodChipsMysticalesEmpty"; consumeSound = "eat_chips"; }; class FoodChipsChocolate : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\bag_chips_small_chocolate_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_chocolate_full_ca.paa"; displayName = $STR_FOOD_NAME_CHIPS_CHOCOLATE; - descriptionShort = $STR_FOOD_DESC_CHIPS_CHOCOLATE; - + descriptionShort = $STR_FOOD_DESC_CHIPS_CHOCOLATE; bloodRegen = 100; - Nutrition[] = {300,500,0,0}; - + Nutrition[] = {300,500,0,0}; consumeSound = "eat_chips"; }; class FoodCandyChubby : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\candybar_chubby_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_candybar_chubby_full_ca.paa"; displayName = $STR_FOOD_NAME_CANDY_CHUBBY; - descriptionShort = $STR_FOOD_DESC_CANDY_CHUBBY; - + descriptionShort = $STR_FOOD_DESC_CANDY_CHUBBY; bloodRegen = 100; - Nutrition[] = {0,400,0,0}; - + Nutrition[] = {0,400,0,0}; //consumeSound = "eat_chips"; }; class FoodCandyAnders : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\candybar_anders_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_candybar_anders_ca.paa"; displayName = $STR_FOOD_NAME_CANDY_ANDERS; - descriptionShort = $STR_FOOD_DESC_CANDY_ANDERS; - + descriptionShort = $STR_FOOD_DESC_CANDY_ANDERS; bloodRegen = 100; - Nutrition[] = {0,400,0,0}; - + Nutrition[] = {0,400,0,0}; //consumeSound = "eat_chips"; }; class FoodCandyLegacys : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\candybar_legacys_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_candybar_legacys_ca.paa"; displayName = $STR_FOOD_NAME_CANDY_LEGACYS; - descriptionShort = $STR_FOOD_DESC_CANDY_LEGACYS; - + descriptionShort = $STR_FOOD_DESC_CANDY_LEGACYS; bloodRegen = 100; - Nutrition[] = {350,380,320,0}; - + Nutrition[] = {350,380,320,0}; //consumeSound = "eat_chips"; }; class FoodCakeCremeCakeClean : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\twinkie.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bag_twinkie_clean.paa"; displayName = $STR_FOOD_NAME_CAKE_Creme_Cake_CLEAN; - descriptionShort = $STR_FOOD_DESC_CAKE_Creme_Cake_CLEAN; - + descriptionShort = $STR_FOOD_DESC_CAKE_Creme_Cake_CLEAN; bloodRegen = 100; - Nutrition[] = {350,380,320,0}; - + Nutrition[] = {350,380,320,0}; //consumeSound = "eat_chips"; }; class FoodCandyMintception : FoodPackaged { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\candybar_mintception_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_candybar_mintception_ca.paa"; displayName = $STR_FOOD_NAME_CANDY_MINTCEPTION; - descriptionShort = $STR_FOOD_DESC_CANDY_MINTCEPTION; - + descriptionShort = $STR_FOOD_DESC_CANDY_MINTCEPTION; bloodRegen = 100; - Nutrition[] = {300,380,340,0}; - + Nutrition[] = {300,380,340,0}; //consumeSound = "eat_chips"; }; -/*class FoodCanLongSprats : FoodPackaged -{ - scope = public; - - model = "z\addons\dayz_communityassets\models\can_long_sprat_clean_full_co.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_can_long_sprat_clean_full_ca.paa"; - displayName = $STR_FOOD_NAME_CAN_LONG_SPRATS; - descriptionShort = $STR_FOOD_DESC_CAN_LONG_SPRATS; - - bloodRegen = 100; - Nutrition[] = {50,100,20,0}; -};*/ - class FoodCanBakedBeans : FoodPackaged { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_bbtin.p3d"; picture = "\dayz_equip\textures\equip_bbtin_ca.paa"; displayName = $STR_EQUIP_NAME_26; - descriptionShort = $STR_EQUIP_DESC_26; - + descriptionShort = $STR_EQUIP_DESC_26; bloodRegen = 100; - Nutrition[] = {0,400,320,0}; - + Nutrition[] = {0,400,320,0}; consumeOutput = "FoodCanUnlabeledEmpty"; }; class FoodCanSardines : FoodPackaged { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_sardinestin.p3d"; picture = "\dayz_equip\textures\equip_Sardinestin_ca.paa"; displayName = $STR_EQUIP_NAME_27; - descriptionShort = $STR_EQUIP_DESC_27; - + descriptionShort = $STR_EQUIP_DESC_27; bloodRegen = 100; - Nutrition[] = {0,450,320,0}; - + Nutrition[] = {0,450,320,0}; consumeOutput = "FoodCanUnlabeledEmpty"; }; class FoodCanFrankBeans : FoodPackaged { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_fbtin.p3d"; picture = "\dayz_equip\textures\equip_fbtin_ca.paa"; displayName = $STR_EQUIP_NAME_28; - descriptionShort = $STR_EQUIP_DESC_28; - + descriptionShort = $STR_EQUIP_DESC_28; bloodRegen = 100; - Nutrition[] = {0,450,320,0}; - + Nutrition[] = {0,450,320,0}; consumeOutput = "FoodCanUnlabeledEmpty"; }; class FoodCanPasta : FoodPackaged { - scope = public; - + scope = 2; model = "\dayz_equip\models\food_pastatin.p3d"; picture = "\dayz_equip\textures\equip_pastatin_ca.paa"; displayName = $STR_EQUIP_NAME_29; - descriptionShort = $STR_EQUIP_DESC_29; - + descriptionShort = $STR_EQUIP_DESC_29; bloodRegen = 100; - Nutrition[] = {0,500,0,0}; - + Nutrition[] = {0,500,0,0}; consumeOutput = "FoodCanUnlabeledEmpty"; }; -class FoodBioMeat: FoodEdible { - scope = public; +class FoodBioMeat: FoodEdible +{ + scope = 2; displayName = $STR_FOOD_NAME_BIOMEAT; model = "\z\addons\dayz_epoch\models\biomeat_can.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_biomeat_CA.paa"; @@ -569,8 +442,9 @@ class FoodBioMeat: FoodEdible { infectionChance = 0.4; }; -class equip_garlic_bulb : FoodEdible { - scope = public; +class equip_garlic_bulb : FoodEdible +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_garlic_bulb; descriptionShort = $STR_ITEM_DESC_equip_garlic_bulb; @@ -580,8 +454,9 @@ class equip_garlic_bulb : FoodEdible { }; // new DZE harvested food -class FoodPumpkin : FoodEdible { - scope = public; +class FoodPumpkin : FoodEdible +{ + scope = 2; count = 1; bloodRegen = 100; displayName = $STR_FOOD_NAME_PUMPKIN; @@ -589,6 +464,7 @@ class FoodPumpkin : FoodEdible { weight = 1; model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa"; + class ItemActions { class Consume @@ -598,7 +474,7 @@ class FoodPumpkin : FoodEdible { }; class Crafting { - text = $STR_FOOD_NAME_PUMPKIN_CRAFT; + text = $STR_FOOD_NAME_PUMPKIN_CRAFT; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {""}; requiretools[] = {"ItemKnife"}; @@ -607,8 +483,9 @@ class FoodPumpkin : FoodEdible { }; }; }; -class FoodSunFlowerSeed : FoodEdible { - scope = public; +class FoodSunFlowerSeed : FoodEdible +{ + scope = 2; count = 1; bloodRegen = 100; displayName = $STR_FOOD_NAME_SUNFLOWER; @@ -616,4 +493,4 @@ class FoodSunFlowerSeed : FoodEdible { weight = 0.1; model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa"; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp index 3418ea6b5..3f9ab7f23 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp @@ -1,9 +1,8 @@ class ItemPlasticWaterbottleUnfilled : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottleEmpty.paa"; displayName = $STR_EQUIP_NAME_WBPET_01; @@ -25,10 +24,9 @@ class ItemPlasticWaterbottleUnfilled : CA_Magazine class ItemPlasticWaterbottleDmg : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\waterbottle_damaged.p3d"; picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottleDamaged.paa"; displayName = $STR_EQUIP_NAME_WBPET_02; @@ -37,7 +35,8 @@ class ItemPlasticWaterbottleDmg : CA_Magazine class ItemActions { - class Crafting { + class Crafting + { text = $STR_ACTIONS_FIX_W; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -48,15 +47,15 @@ class ItemPlasticWaterbottleDmg : CA_Magazine }; }; -class ItemPlasticWaterBottle : ItemWaterBottle { - scope = public; +class ItemPlasticWaterBottle : ItemWaterBottle +{ + scope = 2; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa"; displayName = $STR_EQUIP_NAME_WBPET_03; descriptionShort = $STR_EQUIP_DESC_WBPET_03; Nutrition[] = {0,0,1000,0}; - infectionChance = 0.3; - + infectionChance = 0.3; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; }; @@ -88,8 +87,7 @@ class ItemPlasticWaterBottleBoiled : ItemWaterBottle model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa"; displayName = $STR_EQUIP_NAME_WBPET_04; - descriptionShort = $STR_EQUIP_DESC_WBPET_04; - + descriptionShort = $STR_EQUIP_DESC_WBPET_04; infectionChance = 0; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; @@ -118,14 +116,14 @@ class ItemPlasticWaterBottleHerbal : ItemWaterBottle model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa"; displayName = $STR_EQUIP_NAME_WBPET_05; - descriptionShort = $STR_EQUIP_DESC_WBPET_05; - + descriptionShort = $STR_EQUIP_DESC_WBPET_05; infectionChance = -0.5; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; }; -class ItemPlasticWaterbottle1oz : ItemWaterBottle { +class ItemPlasticWaterbottle1oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE1OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE1OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -138,7 +136,9 @@ class ItemPlasticWaterbottle1oz : ItemWaterBottle { infectionChance = 0.03; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -149,13 +149,15 @@ class ItemPlasticWaterbottle1oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle2oz : ItemWaterBottle { +class ItemPlasticWaterbottle2oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE2OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE2OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -168,7 +170,9 @@ class ItemPlasticWaterbottle2oz : ItemWaterBottle { infectionChance = 0.06; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -179,14 +183,16 @@ class ItemPlasticWaterbottle2oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle3oz : ItemWaterBottle { +class ItemPlasticWaterbottle3oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE3OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE3OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -199,7 +205,9 @@ class ItemPlasticWaterbottle3oz : ItemWaterBottle { infectionChance = 0.09; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -210,14 +218,16 @@ class ItemPlasticWaterbottle3oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle4oz : ItemWaterBottle { +class ItemPlasticWaterbottle4oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE4OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE4OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -230,7 +240,9 @@ class ItemPlasticWaterbottle4oz : ItemWaterBottle { infectionChance = 0.12; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -241,14 +253,16 @@ class ItemPlasticWaterbottle4oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle5oz : ItemWaterBottle { +class ItemPlasticWaterbottle5oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE5OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE5OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -261,7 +275,9 @@ class ItemPlasticWaterbottle5oz : ItemWaterBottle { infectionChance = 0.15; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -272,14 +288,16 @@ class ItemPlasticWaterbottle5oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle6oz : ItemWaterBottle { +class ItemPlasticWaterbottle6oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE6OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE6OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -292,7 +310,9 @@ class ItemPlasticWaterbottle6oz : ItemWaterBottle { infectionChance = 0.18; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -303,14 +323,16 @@ class ItemPlasticWaterbottle6oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle7oz : ItemWaterBottle { +class ItemPlasticWaterbottle7oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE7OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE7OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -323,7 +345,9 @@ class ItemPlasticWaterbottle7oz : ItemWaterBottle { infectionChance = 0.21; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -334,13 +358,15 @@ class ItemPlasticWaterbottle7oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle8oz : ItemWaterBottle { +class ItemPlasticWaterbottle8oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE8OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE8OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -353,7 +379,9 @@ class ItemPlasticWaterbottle8oz : ItemWaterBottle { infectionChance = 0.24; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -364,14 +392,16 @@ class ItemPlasticWaterbottle8oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle9oz : ItemWaterBottle { +class ItemPlasticWaterbottle9oz : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE9OZ; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE9OZ_DESC; model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; @@ -384,7 +414,9 @@ class ItemPlasticWaterbottle9oz : ItemWaterBottle { infectionChance = 0.27; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -395,14 +427,17 @@ class ItemPlasticWaterbottle9oz : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; + //inherit from ItemWaterBottle because that's how the crafting script checks required input -class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE1OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE1OZBOILED_DESC; infectionChance = 0; @@ -415,7 +450,9 @@ class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,100,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -426,13 +463,15 @@ class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE2OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE2OZBOILED_DESC; infectionChance = 0; @@ -445,7 +484,9 @@ class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,200,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -456,13 +497,15 @@ class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE3OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE3OZBOILED_DESC; infectionChance = 0; @@ -475,7 +518,9 @@ class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,300,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -486,13 +531,15 @@ class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE4OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE4OZBOILED_DESC; infectionChance = 0; @@ -505,7 +552,9 @@ class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,400,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -516,13 +565,15 @@ class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE5OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE5OZBOILED_DESC; infectionChance = 0; @@ -535,7 +586,9 @@ class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,500,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -546,13 +599,15 @@ class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE6OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE6OZBOILED_DESC; infectionChance = 0; @@ -565,7 +620,9 @@ class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,600,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -576,13 +633,15 @@ class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE7OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE7OZBOILED_DESC; infectionChance = 0; @@ -595,7 +654,9 @@ class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,700,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -606,13 +667,15 @@ class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE8OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE8OZBOILED_DESC; infectionChance = 0; @@ -625,7 +688,9 @@ class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,800,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -636,13 +701,15 @@ class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle { +class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle +{ displayName = $STR_EPOCH_PET_WATERBOTTLE9OZBOILED; descriptionShort = $STR_EPOCH_PET_WATERBOTTLE9OZBOILED_DESC; infectionChance = 0; @@ -655,7 +722,9 @@ class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle { Nutrition[] = {0,0,900,0}; consumeOutput = "ItemPlasticWaterbottleUnfilled"; containerEmpty = "ItemPlasticWaterbottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -666,7 +735,8 @@ class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp index 94d426465..a50580f3f 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp @@ -1,260 +1,210 @@ class ItemSodaCoke : ItemSoda { - scope = public; - + scope = 2; model = "\dayz_equip\models\soda_coke.p3d"; picture = "\dayz_equip\textures\equip_soda_coke_ca.paa"; displayName = $STR_EQUIP_NAME_36a; - descriptionShort = $STR_EQUIP_DESC_36; - + descriptionShort = $STR_EQUIP_DESC_36; Nutrition[] = {90,0,300,0}; }; class ItemSodaPepsi : ItemSoda { - scope = public; - + scope = 2; model = "\dayz_equip\models\soda_pepsi.p3d"; picture = "\dayz_equip\textures\equip_soda_pepsi_ca.paa"; displayName = $STR_EQUIP_NAME_36b; - descriptionShort = $STR_EQUIP_DESC_36; - + descriptionShort = $STR_EQUIP_DESC_36; Nutrition[] = {90,0,300,0}; }; class ItemSodaMdew : ItemSoda { - scope = public; - + scope = 2; model = "\dayz_equip\models\soda_mdew.p3d"; picture = "\dayz_equip\textures\equip_soda_mdew_ca.paa"; displayName = $STR_EQUIP_NAME_37; - descriptionShort = $STR_EQUIP_NAME_37; - + descriptionShort = $STR_EQUIP_NAME_37; Nutrition[] = {90,0,400,0}; }; class ItemSodaMtngreen : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_mtngreen_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_mtngreen_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_0; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_0; - - Nutrition[] = {90,0,500,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_0; + Nutrition[] = {90,0,500,0}; consumeOutput = "ItemSodaMtngreenEmpty"; }; class ItemSodaR4z0r : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_r4z0r_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_r4z0r_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_1; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_1; - - Nutrition[] = {90,0,350,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_1; + Nutrition[] = {90,0,350,0}; consumeOutput = "ItemSodaR4z0rEmpty"; }; class ItemSodaClays : ItemSoda { - scope = public; + scope = 2; model = "z\addons\dayz_communityassets\models\soda_clays_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_clays_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_2; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_2; - - Nutrition[] = {90,0,320,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_2; + Nutrition[] = {90,0,320,0}; consumeOutput = "ItemSodaClaysEmpty"; }; class ItemSodaSmasht : ItemSoda { - scope = public; + scope = 2; model = "z\addons\dayz_communityassets\models\soda_smasht_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_smasht_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_3; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_3; - - Nutrition[] = {90,0,380,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_3; + Nutrition[] = {90,0,380,0}; consumeOutput = "ItemSodaSmashtEmpty"; }; class ItemSodaDrwaste : ItemSoda { - scope = public; + scope = 2; model = "z\addons\dayz_communityassets\models\soda_drwaste_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_drwaste_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_4; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_4; - - Nutrition[] = {90,0,340,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_4; + Nutrition[] = {90,0,340,0}; consumeOutput = "ItemSodaDrwasteEmpty"; }; class ItemSodaFranka : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_franka_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_franka_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_5; descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_5; - - Nutrition[] = {90,0,340,0}; - + Nutrition[] = {90,0,340,0}; consumeOutput = "ItemSodaFrankaEmpty"; }; class ItemSodaLemonade : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_lemonade_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_lemonade_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_6; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_6; - - Nutrition[] = {90,0,500,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_6; + Nutrition[] = {90,0,500,0}; consumeOutput = "ItemSodaLemonadeEmpty"; }; class ItemSodaLirik : ItemSoda { - scope = public; + scope = 2; model = "z\addons\dayz_communityassets\models\soda_lirik_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_lirik_clean_full_ca.paa"; displayName = $STR_EQUIP_NAME_36a; - descriptionShort = $STR_EQUIP_DESC_36; - - Nutrition[] = {90,0,300,0}; - + descriptionShort = $STR_EQUIP_DESC_36; + Nutrition[] = {90,0,300,0}; consumeOutput = "ItemSodaLirikEmpty"; }; class ItemSodaLvg : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_lvg_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_lvg_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_8; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_8; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_8; Nutrition[] = {90,0,550,0}; - consumeOutput = "ItemSodaLvgEmpty"; }; class ItemSodaMzly : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_mzly_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_mzly_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_9; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_9; - - Nutrition[] = {90,0,380,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_9; + Nutrition[] = {90,0,380,0}; consumeOutput = "ItemSodaMzlyEmpty"; }; class ItemSodaPeppsy : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_peppsy_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_peppsy_clean_full_ca.paa"; displayName = $STR_EQUIP_NAME_36b; - descriptionShort = $STR_EQUIP_DESC_36; - - Nutrition[] = {90,0,300,0}; - + descriptionShort = $STR_EQUIP_DESC_36; + Nutrition[] = {90,0,300,0}; consumeOutput = "ItemSodaPeppsyEmpty"; }; class ItemSodaRabbit : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_rabbit_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_rabbit_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_11; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_11; - - Nutrition[] = {90,0,550,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_11; + Nutrition[] = {90,0,550,0}; consumeOutput = "ItemSodaRabbitEmpty"; }; class ItemSodaSacrite : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_sacrite_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_sacrite_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_12; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_12; - - Nutrition[] = {90,0,550,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_12; + Nutrition[] = {90,0,550,0}; consumeOutput = "ItemSodaSacriteEmpty"; }; class ItemSodaRocketFuel : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_rocket_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_rocket_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_13; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_13; - - Nutrition[] = {90,0,550,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_13; + Nutrition[] = {90,0,550,0}; consumeOutput = "ItemSodaRocketFuelEmpty"; }; class ItemSodaGrapeDrink : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_grape_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_grape_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_14; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_14; - - Nutrition[] = {90,0,700,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_14; + Nutrition[] = {90,0,700,0}; consumeOutput = "ItemSodaGrapeDrinkEmpty"; }; class ItemSherbet : ItemSoda { - scope = public; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_sherbet_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_sherbet_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_15; - - Nutrition[] = {90,0,500,0}; - + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_15; + Nutrition[] = {90,0,500,0}; consumeOutput = "ItemSodaSherbetEmpty"; }; @@ -264,6 +214,7 @@ class ItemSodaRbull : ItemSodaCoke { model = "z\addons\dayz_epoch\models\soda_redbull.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_soda_rbull_CA.paa"; }; + class ItemSodaOrangeSherbet : ItemSodaCoke { displayName = $STR_FOOD_NAME_OSHERBET; descriptionShort = $STR_FOOD_DESC_OSHERBET; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp index a79189bc1..8581f469b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp @@ -1,7 +1,6 @@ class ItemWaterBottle : FoodDrink { - scope = public; - + scope = 2; model = "\dayz_equip\models\waterbottle_gear.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa"; displayName = $STR_EQUIP_NAME_12; @@ -43,8 +42,7 @@ class ItemWaterBottleSafe : ItemWaterBottle class ItemWaterBottleBoiled : ItemWaterBottle { displayName = $STR_ITEMWATERBOTTLEBOILED_CODE_NAME; - descriptionShort = $STR_ITEMWATERBOTTLEBOILED_CODE_DESC; - + descriptionShort = $STR_ITEMWATERBOTTLEBOILED_CODE_DESC; infectionChance = 0; class ItemActions @@ -69,22 +67,19 @@ class ItemWaterBottleBoiled : ItemWaterBottle class ItemWaterBottleHerbal : ItemWaterBottle { displayName = $STR_ITEM_NAME_HerbalDrink; - descriptionShort = $STR_ITEM_DESC_HerbalDrink; - + descriptionShort = $STR_ITEM_DESC_HerbalDrink; infectionChance = -0.5; }; class ItemWaterBottleUnfilled : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\waterbottle_gear.p3d"; picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa"; displayName = $STR_EQUIP_NAME_13; - descriptionShort = $STR_EQUIP_DESC_13; - + descriptionShort = $STR_EQUIP_DESC_13; containerWater = "ItemWaterBottle"; containerWaterSafe = "ItemWaterBottleSafe"; containerWaterInfected = "ItemWaterBottleInfected"; @@ -101,10 +96,9 @@ class ItemWaterBottleUnfilled : CA_Magazine class ItemWaterBottleDmg : CA_Magazine //We don't have a damaged canteen image/model , so the regular bottle image is used for now { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\waterbottle_gear.p3d"; picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa"; displayName = $STR_ITEMWATERBOTTLEDMG_CODE_NAME; @@ -113,7 +107,8 @@ class ItemWaterBottleDmg : CA_Magazine //We don't have a damaged canteen image/m class ItemActions { - class Crafting { + class Crafting + { text = $STR_ACTIONS_FIX_W; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -124,7 +119,8 @@ class ItemWaterBottleDmg : CA_Magazine //We don't have a damaged canteen image/m }; }; -class ItemWaterbottle1oz : ItemWaterbottle { +class ItemWaterbottle1oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE1OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE1OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa"; @@ -136,7 +132,9 @@ class ItemWaterbottle1oz : ItemWaterbottle { infectionChance = 0.03; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -147,13 +145,15 @@ class ItemWaterbottle1oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle2oz : ItemWaterbottle { +class ItemWaterbottle2oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE2OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE2OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa"; @@ -165,7 +165,9 @@ class ItemWaterbottle2oz : ItemWaterbottle { infectionChance = 0.06; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -176,14 +178,16 @@ class ItemWaterbottle2oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle3oz : ItemWaterbottle { +class ItemWaterbottle3oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE3OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE3OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa"; @@ -195,7 +199,9 @@ class ItemWaterbottle3oz : ItemWaterbottle { infectionChance = 0.09; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -206,14 +212,16 @@ class ItemWaterbottle3oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle4oz : ItemWaterbottle { +class ItemWaterbottle4oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE4OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE4OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa"; @@ -225,7 +233,9 @@ class ItemWaterbottle4oz : ItemWaterbottle { infectionChance = 0.12; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -236,14 +246,16 @@ class ItemWaterbottle4oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle5oz : ItemWaterbottle { +class ItemWaterbottle5oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE5OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE5OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa"; @@ -255,7 +267,9 @@ class ItemWaterbottle5oz : ItemWaterbottle { infectionChance = 0.15; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -266,14 +280,16 @@ class ItemWaterbottle5oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle6oz : ItemWaterbottle { +class ItemWaterbottle6oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE6OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE6OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa"; @@ -285,7 +301,9 @@ class ItemWaterbottle6oz : ItemWaterbottle { infectionChance = 0.18; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -296,14 +314,16 @@ class ItemWaterbottle6oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle7oz : ItemWaterbottle { +class ItemWaterbottle7oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE7OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE7OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa"; @@ -315,7 +335,9 @@ class ItemWaterbottle7oz : ItemWaterbottle { infectionChance = 0.21; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -326,13 +348,15 @@ class ItemWaterbottle7oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle8oz : ItemWaterbottle { +class ItemWaterbottle8oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE8OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE8OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa"; @@ -344,7 +368,9 @@ class ItemWaterbottle8oz : ItemWaterbottle { infectionChance = 0.24; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -355,14 +381,16 @@ class ItemWaterbottle8oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle9oz : ItemWaterbottle { +class ItemWaterbottle9oz : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE9OZ; descriptionShort = $STR_EPOCH_WATERBOTTLE9OZ_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa"; @@ -374,7 +402,9 @@ class ItemWaterbottle9oz : ItemWaterbottle { infectionChance = 0.27; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -385,14 +415,17 @@ class ItemWaterbottle9oz : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; + //inherit from ItemWaterbottle because that's how the crafting script checks required input -class ItemWaterbottle1ozBoiled : ItemWaterbottle { +class ItemWaterbottle1ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE1OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE1OZBOILED_DESC; infectionChance = 0; @@ -404,7 +437,9 @@ class ItemWaterbottle1ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,100,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -415,13 +450,15 @@ class ItemWaterbottle1ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle2ozBoiled : ItemWaterbottle { +class ItemWaterbottle2ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE2OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE2OZBOILED_DESC; infectionChance = 0; @@ -433,7 +470,9 @@ class ItemWaterbottle2ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,200,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -444,13 +483,15 @@ class ItemWaterbottle2ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle3ozBoiled : ItemWaterbottle { +class ItemWaterbottle3ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE3OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE3OZBOILED_DESC; infectionChance = 0; @@ -462,7 +503,9 @@ class ItemWaterbottle3ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,300,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -473,13 +516,15 @@ class ItemWaterbottle3ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle4ozBoiled : ItemWaterbottle { +class ItemWaterbottle4ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE4OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE4OZBOILED_DESC; infectionChance = 0; @@ -491,7 +536,9 @@ class ItemWaterbottle4ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,400,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -502,13 +549,15 @@ class ItemWaterbottle4ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle5ozBoiled : ItemWaterbottle { +class ItemWaterbottle5ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE5OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE5OZBOILED_DESC; infectionChance = 0; @@ -520,7 +569,9 @@ class ItemWaterbottle5ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,500,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -531,13 +582,15 @@ class ItemWaterbottle5ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle6ozBoiled : ItemWaterbottle { +class ItemWaterbottle6ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE6OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE6OZBOILED_DESC; infectionChance = 0; @@ -549,7 +602,9 @@ class ItemWaterbottle6ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,600,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -560,13 +615,15 @@ class ItemWaterbottle6ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle7ozBoiled : ItemWaterbottle { +class ItemWaterbottle7ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE7OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE7OZBOILED_DESC; infectionChance = 0; @@ -578,7 +635,9 @@ class ItemWaterbottle7ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,700,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -589,13 +648,15 @@ class ItemWaterbottle7ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle8ozBoiled : ItemWaterbottle { +class ItemWaterbottle8ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE8OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE8OZBOILED_DESC; infectionChance = 0; @@ -607,7 +668,9 @@ class ItemWaterbottle8ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,800,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -618,13 +681,15 @@ class ItemWaterbottle8ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; }; }; -class ItemWaterbottle9ozBoiled : ItemWaterbottle { +class ItemWaterbottle9ozBoiled : ItemWaterbottle +{ displayName = $STR_EPOCH_WATERBOTTLE9OZBOILED; descriptionShort = $STR_EPOCH_WATERBOTTLE9OZBOILED_DESC; infectionChance = 0; @@ -636,7 +701,9 @@ class ItemWaterbottle9ozBoiled : ItemWaterbottle { Nutrition[] = {0,0,900,0}; consumeOutput = "ItemWaterBottleUnfilled"; containerEmpty = "ItemWaterBottleUnfilled"; - class ItemActions { + + class ItemActions + { class Consume { text = $STR_ACTIONS_DRINK2; @@ -647,7 +714,8 @@ class ItemWaterbottle9ozBoiled : ItemWaterbottle { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; - class Fill { + class Fill + { text = "$STR_ACTIONS_FILL_W"; script = "spawn player_fillWater;"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/BarrelsCans.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/BarrelsCans.hpp index ef3aad8cc..33d3f0119 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/BarrelsCans.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/BarrelsCans.hpp @@ -1,14 +1,12 @@ class ItemJerrycanEmpty : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\jerrycan.p3d"; picture = "\dayz_equip\textures\equip_jerrycan_e_ca.paa"; displayName = $STR_ITEM_NAME_JERRYCAN_EMPTY; - descriptionShort = $STR_ITEM_DESC_JERRYCAN_EMPTY; - + descriptionShort = $STR_ITEM_DESC_JERRYCAN_EMPTY; fuelQuantity = 0; fullcan = "ItemJerrycan"; }; @@ -17,16 +15,17 @@ class ItemJerrycan : ItemJerrycanEmpty { picture = "\dayz_equip\textures\equip_jerrycan_ca.paa"; displayName = $STR_ITEM_NAME_JERRYCAN; - descriptionShort = $STR_ITEM_DESC_JERRYCAN; - + descriptionShort = $STR_ITEM_DESC_JERRYCAN; fuelQuantity = 20; containerEmpty = "ItemJerrycanEmpty"; //used for tent burning fireIntensity = 6; - class ItemActions { - class Empty { + class ItemActions + { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; @@ -35,13 +34,11 @@ class ItemJerrycan : ItemJerrycanEmpty class ItemFuelcanEmpty : ItemJerrycanEmpty { - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\fuelcan.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_fuelcan_empty_CA.paa"; displayName = $STR_ITEM_NAME_FUELCAN_EMPTY; - descriptionShort = $STR_ITEM_DESC_FUELCAN_EMPTY; - + descriptionShort = $STR_ITEM_DESC_FUELCAN_EMPTY; fuelQuantity = 0; fullcan = "ItemFuelcan"; }; @@ -50,16 +47,17 @@ class ItemFuelcan : ItemFuelcanEmpty { picture = "\z\addons\dayz_communityassets\pictures\equip_fuelcan_CA.paa"; displayName = $STR_ITEM_NAME_FUELCAN; - descriptionShort = $STR_ITEM_DESC_FUELCAN; - + descriptionShort = $STR_ITEM_DESC_FUELCAN; fuelQuantity = 5; containerEmpty = "ItemFuelcanEmpty"; //used for tent burning fireIntensity = 4; - class ItemActions { - class Empty { + class ItemActions + { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; @@ -68,7 +66,7 @@ class ItemFuelcan : ItemFuelcanEmpty class ItemFuelBarrel: CA_Magazine { - scope = public; + scope = 2; count = 1; fuelQuantity = 210; type = 256; @@ -79,8 +77,10 @@ class ItemFuelBarrel: CA_Magazine fireIntensity = 6; //used for tent burning containerEmpty = "ItemFuelBarrelEmpty"; - class ItemActions { - class Empty { + class ItemActions + { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; @@ -88,7 +88,7 @@ class ItemFuelBarrel: CA_Magazine }; class ItemFuelBarrelEmpty: ItemFuelBarrel { - scope = public; + scope = 2; count = 1; fuelQuantity = 0; type = 256; @@ -96,6 +96,7 @@ class ItemFuelBarrelEmpty: ItemFuelBarrel picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa"; descriptionShort = $STR_EPOCH_EMPTYFUELBARREL_DESC; fullcan = "ItemFuelBarrel"; + class ItemActions { class Crafting @@ -112,28 +113,34 @@ class ItemFuelBarrelEmpty: ItemFuelBarrel class ItemOilBarrel: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_OILBARREL; - model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_oil_drum_model_ca.paa"; descriptionShort = $STR_EPOCH_OILBARREL_DESC; + model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_oil_drum_model_ca.paa"; containerEmpty = "ItemOilBarrelEmpty"; - class ItemActions { - class Empty { + class ItemActions + { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; }; }; -class ItemOilBarrelEmpty : ItemOilBarrel +class ItemOilBarrelEmpty : CA_Magazine { + scope = 2; + count = 1; + type = 256; displayName = $STR_EPOCH_EMPTYOILBARREL; descriptionShort = $STR_EPOCH_EMPTYOILBARREL_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa"; + model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; class ItemActions { @@ -149,11 +156,15 @@ class ItemOilBarrelEmpty : ItemOilBarrel }; }; -class ItemMethylaminBarrelEmpty : ItemOilBarrel +class ItemMethylaminBarrelEmpty : CA_Magazine { + scope = 2; + count = 1; + type = 256; displayName = $STR_EPOCH_EMPTYMETHYLAMINEBARREL; descriptionShort = $STR_EPOCH_EMPTYMETHYLAMINEBARREL_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa"; + model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; class ItemActions { @@ -169,14 +180,21 @@ class ItemMethylaminBarrelEmpty : ItemOilBarrel }; }; -class ItemMethylaminBarrel : ItemOilBarrel +class ItemMethylaminBarrel : CA_Magazine { + scope = 2; + count = 1; + type = 256; + model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_oil_drum_model_ca.paa"; displayName = $STR_EPOCH_METHYLAMINEBARREL; descriptionShort = $STR_EPOCH_METHYLAMINEBARREL_DESC; containerEmpty = "ItemMethylaminBarrelEmpty"; - class ItemActions { - class Empty { + class ItemActions + { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Bulk.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Bulk.hpp index 73492c1e0..2e3c85215 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Bulk.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Bulk.hpp @@ -1,19 +1,23 @@ -class bulk: CA_Magazine { - scope = public; +class bulk: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BULK_NAME; model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = $STR_EPOCH_BULK_DESC; - weight = 5; }; -class bulk_empty: bulk { + +class bulk_empty: bulk +{ displayName = $STR_EPOCH_BULK_DISP_EMPTY; descriptionShort = $STR_EPOCH_BULK_DESC_EMPTY; - weight = 5; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_221; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -21,7 +25,8 @@ class bulk_empty: bulk { output[] = {{"bulk_ItemSodaCoke",1}}; input[] = {{"bulk_empty",1},{"ItemSodaCoke",6}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_222; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -30,7 +35,8 @@ class bulk_empty: bulk { input[] = {{"bulk_empty",1},{"ItemSodaPepsi",6}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_223; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -38,7 +44,8 @@ class bulk_empty: bulk { output[] = {{"bulk_PartGenericHalf",1}}; input[] = {{"bulk_empty",1},{"PartGeneric",6}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_224; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -46,7 +53,8 @@ class bulk_empty: bulk { output[] = {{"bulk_ItemTankTrapHalf",1}}; input[] = {{"bulk_empty",1},{"ItemTankTrap",6}}; }; - class Crafting4 { + class Crafting4 + { text = $STR_EPOCH_PLAYER_225; script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -54,7 +62,8 @@ class bulk_empty: bulk { output[] = {{"bulk_ItemWireHalf",1}}; input[] = {{"bulk_empty",1},{"ItemWire",6}}; }; - class Crafting5 { + class Crafting5 + { text = $STR_EPOCH_PLAYER_226; script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -65,17 +74,21 @@ class bulk_empty: bulk { }; }; -class bulk_ItemSodaCoke: bulk { +class bulk_ItemSodaCoke: bulk +{ displayName = $STR_EPOCH_BULK_DISP_SODACOKE_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_SODACOKE_HALF; - weight = 6; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemSodaCoke",6,"magazine"}; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_221; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -85,12 +98,16 @@ class bulk_ItemSodaCoke: bulk { }; }; }; -class bulk_ItemSodaCokeFull: bulk { + +class bulk_ItemSodaCokeFull: bulk +{ displayName = $STR_EPOCH_BULK_DISP_SODACOKE_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_SODACOKE_FULL; - weight = 7; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemSodaCoke",12,"magazine"}; @@ -98,17 +115,21 @@ class bulk_ItemSodaCokeFull: bulk { }; }; -class bulk_ItemSodaPepsi: bulk { +class bulk_ItemSodaPepsi: bulk +{ displayName = $STR_EPOCH_BULK_DISP_SODAPEPSI_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_SODAPEPSI_HALF; - weight = 6; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemSodaPepsi",6,"magazine"}; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_222; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -118,12 +139,15 @@ class bulk_ItemSodaPepsi: bulk { }; }; }; -class bulk_ItemSodaPepsiFull: bulk { +class bulk_ItemSodaPepsiFull: bulk +{ displayName = $STR_EPOCH_BULK_DISP_SODAPEPSI_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_SODAPEPSI_FULL; - weight = 7; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemSodaPepsi",12,"magazine"}; @@ -131,17 +155,21 @@ class bulk_ItemSodaPepsiFull: bulk { }; }; -class bulk_FoodbaconCooked: bulk { +class bulk_FoodbaconCooked: bulk +{ displayName = $STR_EPOCH_BULK_DISP_BACON_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_BACON_HALF; - weight = 5; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"FoodbaconCooked",6,"magazine"}; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_227; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -154,9 +182,11 @@ class bulk_FoodbaconCooked: bulk { class bulk_FoodbaconCookedFull: bulk { displayName = $STR_EPOCH_BULK_DISP_BACON_FULL; descriptionshort = $STR_EPOCH_BULK_DESC_BACON_FULL; - weight = 5; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"FoodbaconCooked",12,"magazine"}; @@ -165,48 +195,60 @@ class bulk_FoodbaconCookedFull: bulk { }; // Ammo -class bulk_17Rnd_9x19_glock17: bulk { +class bulk_17Rnd_9x19_glock17: bulk +{ displayName = $STR_EPOCH_BULK_DISP_G17; descriptionShort = $STR_EPOCH_BULK_DESC_G17; - weight = 17; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"17Rnd_9x19_glock17",12,"magazine"}; }; }; }; -class bulk_15Rnd_9x19_M9SD: bulk { +class bulk_15Rnd_9x19_M9SD: bulk +{ displayName = $STR_EPOCH_BULK_DISP_M9SD; descriptionShort = $STR_EPOCH_BULK_DESC_M9SD; - weight = 17; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"15Rnd_9x19_M9SD",12,"magazine"}; }; }; }; -class bulk_30Rnd_9x19_MP5SD: bulk { +class bulk_30Rnd_9x19_MP5SD: bulk +{ displayName = $STR_EPOCH_BULK_DISP_MP5SD; descriptionShort = $STR_EPOCH_BULK_DESC_MP5SD; - weight = 18; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"30Rnd_9x19_MP5SD",12,"magazine"}; }; }; }; -class bulk_30Rnd_556x45_StanagSD: bulk { +class bulk_30Rnd_556x45_StanagSD: bulk +{ displayName = $STR_EPOCH_BULK_DISP_STANAGSD; descriptionShort = $STR_EPOCH_BULK_DESC_STANAGSD; - weight = 20; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"30Rnd_556x45_StanagSD",12,"magazine"}; @@ -214,12 +256,15 @@ class bulk_30Rnd_556x45_StanagSD: bulk { }; }; -class bulk_ItemSandbag: bulk { +class bulk_ItemSandbag: bulk +{ displayName = $STR_EPOCH_BULK_DISP_SANDBAG; descriptionShort = $STR_EPOCH_BULK_DESC_SANDBAG; - weight = 60; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemSandbag",12,"magazine"}; @@ -227,29 +272,36 @@ class bulk_ItemSandbag: bulk { }; }; -class bulk_ItemTankTrap: bulk { +class bulk_ItemTankTrap: bulk +{ displayName = $STR_EPOCH_BULK_DISP_TANKTRAP_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_TANKTRAP_FULL; - weight = 25; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemTankTrap",12,"magazine"}; }; }; }; -class bulk_ItemTankTrapHalf: bulk { +class bulk_ItemTankTrapHalf: bulk +{ displayName = $STR_EPOCH_BULK_DISP_TANKTRAP_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_TANKTRAP_HALF; - weight = 12.5; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemTankTrap",6,"magazine"}; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_224; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -260,29 +312,36 @@ class bulk_ItemTankTrapHalf: bulk { }; }; -class bulk_ItemWire: bulk { +class bulk_ItemWire: bulk +{ displayName = $STR_EPOCH_BULK_DISP_WIREKIT_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_WIREKIT_FULL; - weight = 25; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemWire",12,"magazine"}; }; }; }; -class bulk_ItemWireHalf: bulk { +class bulk_ItemWireHalf: bulk +{ displayName = $STR_EPOCH_BULK_DISP_WIREKIT_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_WIREKIT_HALF; - weight = 12.5; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"ItemWire",6,"magazine"}; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_225; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -293,29 +352,36 @@ class bulk_ItemWireHalf: bulk { }; }; -class bulk_PartGeneric: bulk { +class bulk_PartGeneric: bulk +{ displayName = $STR_EPOCH_BULK_DISP_GENERIC_FULL; descriptionShort = $STR_EPOCH_BULK_DESC_GENERIC_FULL; - weight = 60; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"PartGeneric",12,"magazine"}; }; }; }; -class bulk_PartGenericHalf: bulk { +class bulk_PartGenericHalf: bulk +{ displayName = $STR_EPOCH_BULK_DISP_GENERIC_HALF; descriptionShort = $STR_EPOCH_BULK_DESC_GENERIC_HALF; - weight = 30; - class ItemActions { - class CreateMags { + + class ItemActions + { + class CreateMags + { text = $STR_EPOCH_ACTIONS_OPEN; script = "spawn player_loadCrate;"; output[] = {"PartGeneric",6,"magazine"}; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_PLAYER_223; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/ChainsawGas.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/ChainsawGas.hpp index d41b7d9c8..3e70fe167 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/ChainsawGas.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/ChainsawGas.hpp @@ -1,15 +1,19 @@ // For Chainsaw -class ItemMixOil : CA_Magazine { - scope = public; +class ItemMixOil : CA_Magazine +{ + scope = 2; displayName = $STR_EPOCH_CHAINSAW_OIL; model = "\z\addons\dayz_epoch\models\oilmix.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_oilmix_CA.paa"; count = 1; - type = "256"; + type = 256; descriptionShort = $STR_EPOCH_CHAINSAW_OIL; sfx = "refuel"; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_CHAINSAW_MIXGAS_ACTION; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -20,8 +24,9 @@ class ItemMixOil : CA_Magazine { }; }; }; -class CSGAS : CA_Magazine { - scope = public; +class CSGAS : CA_Magazine +{ + scope = 2; type = VSoft; displayName = $STR_EPOCH_CHAINSAW_GAS; descriptionShort = $STR_EPOCH_CHAINSAW_GAS_DESC; @@ -61,8 +66,9 @@ class CSGAS : CA_Magazine { hit_wood = "ImpactWood"; }; }; -class ItemJerryMixed: CA_Magazine { - scope = public; +class ItemJerryMixed: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS20L_CAN; @@ -72,8 +78,10 @@ class ItemJerryMixed: CA_Magazine { sfx = "refuel"; containerEmpty = "ItemJerrycanEmpty"; - class ItemActions { - class Crafting { + class ItemActions + { + class Crafting + { text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -81,14 +89,16 @@ class ItemJerryMixed: CA_Magazine { output[] = {{"CSGAS",1},{"ItemJerryMixed4",1}}; input[] = {{"ItemJerryMixed",1}}; }; - class Empty { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; }; }; -class ItemJerryMixed4: CA_Magazine { - scope = public; +class ItemJerryMixed4: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS16L_CAN; @@ -98,8 +108,10 @@ class ItemJerryMixed4: CA_Magazine { sfx = "refuel"; containerEmpty = "ItemJerrycanEmpty"; - class ItemActions { - class Crafting { + class ItemActions + { + class Crafting + { text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -107,14 +119,16 @@ class ItemJerryMixed4: CA_Magazine { output[] = {{"CSGAS",1},{"ItemJerryMixed3",1}}; input[] = {{"ItemJerryMixed4",1}}; }; - class Empty { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; }; }; -class ItemJerryMixed3: CA_Magazine { - scope = public; +class ItemJerryMixed3: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS12L_CAN; @@ -124,8 +138,10 @@ class ItemJerryMixed3: CA_Magazine { sfx = "refuel"; containerEmpty = "ItemJerrycanEmpty"; - class ItemActions { - class Crafting { + class ItemActions + { + class Crafting + { text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -133,14 +149,16 @@ class ItemJerryMixed3: CA_Magazine { output[] = {{"CSGAS",1},{"ItemJerryMixed2",1}}; input[] = {{"ItemJerryMixed3",1}}; }; - class Empty { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; }; }; -class ItemJerryMixed2: CA_Magazine { - scope = public; +class ItemJerryMixed2: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS8L_CAN; @@ -150,8 +168,10 @@ class ItemJerryMixed2: CA_Magazine { sfx = "refuel"; containerEmpty = "ItemJerrycanEmpty"; - class ItemActions { - class Crafting { + class ItemActions + { + class Crafting + { text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -159,14 +179,16 @@ class ItemJerryMixed2: CA_Magazine { output[] = {{"CSGAS",1},{"ItemJerryMixed1",1}}; input[] = {{"ItemJerryMixed2",1}}; }; - class Empty { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; }; }; -class ItemJerryMixed1: CA_Magazine { - scope = public; +class ItemJerryMixed1: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS4L_CAN; @@ -176,8 +198,10 @@ class ItemJerryMixed1: CA_Magazine { sfx = "refuel"; containerEmpty = "ItemJerrycanEmpty"; - class ItemActions { - class Crafting { + class ItemActions + { + class Crafting + { text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -185,7 +209,8 @@ class ItemJerryMixed1: CA_Magazine { output[] = {{"CSGAS",1},{"ItemJerrycanEmpty",1}}; input[] = {{"ItemJerryMixed1",1}}; }; - class Empty { + class Empty + { text = $STR_EQUIP_NAME_13_EMPTY; script = "spawn player_emptyContainer"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Concrete.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Concrete.hpp index 9fac07426..1125021ba 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Concrete.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Concrete.hpp @@ -1,6 +1,6 @@ class ItemStone: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_BLD_name_ItemStone;//"Rough Stone" @@ -22,14 +22,14 @@ class ItemConcreteBlock: CA_Magazine //Construection,indestrial class CinderBlocks: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CINDERBLOCKS; model = "\z\addons\dayz_epoch\models\cinder_stack.p3d"; picture = "\z\addons\dayz_epoch\pictures\epuip_cinder_blocks_CA.paa"; descriptionShort = $STR_EPOCH_CINDERBLOCKS_DESC; - weight = 100; + class ItemActions { class Crafting @@ -72,22 +72,19 @@ class CinderBlocks: CA_Magazine }; class MortarBucket: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BUCKETOFMORTAR; model = "\z\addons\dayz_epoch\models\mortar.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_mortar_CA.paa"; descriptionShort = $STR_EPOCH_BUCKETOFMORTAR_DESC; - weight = 21; }; class equip_brick : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - model = "\z\addons\dayz_communityassets\models\brick.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_brick.paa"; displayName = $STR_ITEM_NAME_equip_brick; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/AluminumBar.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/AluminumBar.hpp index ca27e8d82..8e88d4bd5 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/AluminumBar.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/AluminumBar.hpp @@ -1,5 +1,6 @@ -class ItemAluminumBar: CA_Magazine { - scope = public; +class ItemAluminumBar: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_ALUMINUM; @@ -8,16 +9,20 @@ class ItemAluminumBar: CA_Magazine { descriptionShort = $STR_EPOCH_ALUMINUM_DESC; }; -class ItemAluminumBar10oz: CA_Magazine { - scope = public; +class ItemAluminumBar10oz: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_10OZALUMINUM; model = "\z\addons\dayz_epoch\models\aluminum_bar.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_alum_bar_10oz_CA.paa"; descriptionShort = $STR_EPOCH_10OZALUMINUM_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/Briefcase.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/Briefcase.hpp index 7bcb011c0..b56a88468 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/Briefcase.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/Briefcase.hpp @@ -1,18 +1,23 @@ -class ItemBriefcase_Base: CA_Magazine { - scope = public; +class ItemBriefcase_Base: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BRIEFCASE; model = "\z\addons\dayz_epoch\models\briefcase.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa"; }; + // Gold -class ItemBriefcaseEmpty: ItemBriefcase_Base { +class ItemBriefcaseEmpty: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_EMPTY; - weight = 1; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -20,7 +25,8 @@ class ItemBriefcaseEmpty: ItemBriefcase_Base { output[] = {{"ItemBriefcase10oz",1}}; input[] = {{"ItemBriefcaseEmpty",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_198; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -28,7 +34,8 @@ class ItemBriefcaseEmpty: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcaseEmpty",1},{"ItemGoldBar10oz",10}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -36,7 +43,8 @@ class ItemBriefcaseEmpty: ItemBriefcase_Base { output[] = {{"ItemBriefcaseS10oz",1}}; input[] = {{"ItemBriefcaseEmpty",1},{"ItemSilverBar10oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_S_198; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -46,13 +54,16 @@ class ItemBriefcaseEmpty: ItemBriefcase_Base { }; }; }; -class ItemBriefcase10oz: ItemBriefcase_Base { +class ItemBriefcase10oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_10oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_1X10OZGOLD; - weight = 1.2; worth = 1000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -60,7 +71,8 @@ class ItemBriefcase10oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase20oz",1}}; input[] = {{"ItemBriefcase10oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_199; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -68,7 +80,8 @@ class ItemBriefcase10oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase10oz",1},{"ItemGoldBar10oz",9}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -78,13 +91,16 @@ class ItemBriefcase10oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase20oz: ItemBriefcase_Base { +class ItemBriefcase20oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_20oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_2X10OZGOLD; - weight = 1.5; worth = 2000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -92,7 +108,8 @@ class ItemBriefcase20oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase30oz",1}}; input[] = {{"ItemBriefcase20oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_202; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -100,7 +117,8 @@ class ItemBriefcase20oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase20oz",1},{"ItemGoldBar10oz",8}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -108,7 +126,8 @@ class ItemBriefcase20oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase10oz",1}}; input[] = {{"ItemBriefcase20oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -118,13 +137,16 @@ class ItemBriefcase20oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase30oz: ItemBriefcase_Base { +class ItemBriefcase30oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_30oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_3X10OZGOLD; - weight = 1.8; worth = 3000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -132,7 +154,8 @@ class ItemBriefcase30oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase40oz",1}}; input[] = {{"ItemBriefcase30oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_203; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -140,7 +163,8 @@ class ItemBriefcase30oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase30oz",1},{"ItemGoldBar10oz",7}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -148,7 +172,8 @@ class ItemBriefcase30oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase20oz",1}}; input[] = {{"ItemBriefcase30oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -158,13 +183,16 @@ class ItemBriefcase30oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase40oz: ItemBriefcase_Base { +class ItemBriefcase40oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_40oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_4X10OZGOLD; - weight = 2.1; worth = 4000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -172,7 +200,8 @@ class ItemBriefcase40oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase50oz",1}}; input[] = {{"ItemBriefcase40oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_204; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -180,7 +209,8 @@ class ItemBriefcase40oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase40oz",1},{"ItemGoldBar10oz",6}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -188,7 +218,8 @@ class ItemBriefcase40oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase30oz",1}}; input[] = {{"ItemBriefcase40oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -198,13 +229,16 @@ class ItemBriefcase40oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase50oz: ItemBriefcase_Base { +class ItemBriefcase50oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_50oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_5X10OZGOLD; - weight = 2.4; worth = 5000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -212,7 +246,8 @@ class ItemBriefcase50oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase60oz",1}}; input[] = {{"ItemBriefcase50oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_205; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -220,7 +255,8 @@ class ItemBriefcase50oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase50oz",1},{"ItemGoldBar10oz",5}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -228,7 +264,8 @@ class ItemBriefcase50oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase40oz",1}}; input[] = {{"ItemBriefcase50oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -238,13 +275,16 @@ class ItemBriefcase50oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase60oz: ItemBriefcase_Base { +class ItemBriefcase60oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_60oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_6X10OZGOLD; - weight = 2.7; worth = 6000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -252,7 +292,8 @@ class ItemBriefcase60oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase70oz",1}}; input[] = {{"ItemBriefcase60oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_206; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -260,7 +301,8 @@ class ItemBriefcase60oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase60oz",1},{"ItemGoldBar10oz",4}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -268,7 +310,8 @@ class ItemBriefcase60oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase50oz",1}}; input[] = {{"ItemBriefcase60oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -278,13 +321,16 @@ class ItemBriefcase60oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase70oz: ItemBriefcase_Base { +class ItemBriefcase70oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_70oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_7X10OZGOLD; - weight = 2.9; worth = 7000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -292,7 +338,8 @@ class ItemBriefcase70oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase80oz",1}}; input[] = {{"ItemBriefcase70oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_207; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -300,7 +347,8 @@ class ItemBriefcase70oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase70oz",1},{"ItemGoldBar10oz",3}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -308,7 +356,8 @@ class ItemBriefcase70oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase60oz",1}}; input[] = {{"ItemBriefcase70oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -318,13 +367,16 @@ class ItemBriefcase70oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase80oz: ItemBriefcase_Base { +class ItemBriefcase80oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_80oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_8X10OZGOLD; - weight = 3.2; worth = 8000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -332,7 +384,8 @@ class ItemBriefcase80oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase90oz",1}}; input[] = {{"ItemBriefcase80oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_208; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -340,7 +393,8 @@ class ItemBriefcase80oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase80oz",1},{"ItemGoldBar10oz",2}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -348,7 +402,8 @@ class ItemBriefcase80oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase70oz",1}}; input[] = {{"ItemBriefcase80oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -358,13 +413,16 @@ class ItemBriefcase80oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase90oz: ItemBriefcase_Base { +class ItemBriefcase90oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_90oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_9X10OZGOLD; - weight = 3.5; worth = 9000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -372,7 +430,8 @@ class ItemBriefcase90oz: ItemBriefcase_Base { output[] = {{"ItemBriefcase100oz",1}}; input[] = {{"ItemBriefcase90oz",1},{"ItemGoldBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -380,7 +439,8 @@ class ItemBriefcase90oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase80oz",1}}; input[] = {{"ItemBriefcase90oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -390,13 +450,16 @@ class ItemBriefcase90oz: ItemBriefcase_Base { }; }; }; -class ItemBriefcase100oz: ItemBriefcase_Base { +class ItemBriefcase100oz: ItemBriefcase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_100oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_10X10OZGOLD; - weight = 3.8; worth = 10000; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_200; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -404,7 +467,8 @@ class ItemBriefcase100oz: ItemBriefcase_Base { output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase90oz",1}}; input[] = {{"ItemBriefcase100oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -415,17 +479,21 @@ class ItemBriefcase100oz: ItemBriefcase_Base { }; }; // Silver -class ItemSilvercase_Base: ItemBriefcase_Base { +class ItemSilvercase_Base: ItemBriefcase_Base +{ model = "\z\addons\dayz_epoch\models\silvercase.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa"; }; -class ItemBriefcaseS10oz: ItemSilvercase_Base { +class ItemBriefcaseS10oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_10oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_1X10OZSILVER; - weight = 1.2; worth = 10; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -433,7 +501,8 @@ class ItemBriefcaseS10oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS20oz",1}}; input[] = {{"ItemBriefcaseS10oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_199; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -441,7 +510,8 @@ class ItemBriefcaseS10oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS10oz",1},{"ItemSilverBar10oz",9}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -451,13 +521,16 @@ class ItemBriefcaseS10oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS20oz: ItemSilvercase_Base { +class ItemBriefcaseS20oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_20oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_2X10OZSILVER; - weight = 1.5; worth = 20; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -465,7 +538,8 @@ class ItemBriefcaseS20oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS30oz",1}}; input[] = {{"ItemBriefcaseS20oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_202; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -473,7 +547,8 @@ class ItemBriefcaseS20oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS20oz",1},{"ItemSilverBar10oz",8}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -481,7 +556,8 @@ class ItemBriefcaseS20oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS10oz",1}}; input[] = {{"ItemBriefcaseS20oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -491,13 +567,16 @@ class ItemBriefcaseS20oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS30oz: ItemSilvercase_Base { +class ItemBriefcaseS30oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_30oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_3X10OZSILVER; - weight = 1.8; worth = 30; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -505,7 +584,8 @@ class ItemBriefcaseS30oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS40oz",1}}; input[] = {{"ItemBriefcaseS30oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_203; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -513,7 +593,8 @@ class ItemBriefcaseS30oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS30oz",1},{"ItemSilverBar10oz",7}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -521,7 +602,8 @@ class ItemBriefcaseS30oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS20oz",1}}; input[] = {{"ItemBriefcaseS30oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -531,13 +613,16 @@ class ItemBriefcaseS30oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS40oz: ItemSilvercase_Base { +class ItemBriefcaseS40oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_40oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_4X10OZSILVER; - weight = 2.1; worth = 40; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -545,7 +630,8 @@ class ItemBriefcaseS40oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS50oz",1}}; input[] = {{"ItemBriefcaseS40oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_204; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -553,7 +639,8 @@ class ItemBriefcaseS40oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS40oz",1},{"ItemSilverBar10oz",6}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -561,7 +648,8 @@ class ItemBriefcaseS40oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS30oz",1}}; input[] = {{"ItemBriefcaseS40oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -571,13 +659,16 @@ class ItemBriefcaseS40oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS50oz: ItemSilvercase_Base { +class ItemBriefcaseS50oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_50oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_5X10OZSILVER; - weight = 2.4; worth = 50; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -585,7 +676,8 @@ class ItemBriefcaseS50oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS60oz",1}}; input[] = {{"ItemBriefcaseS50oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_205; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -593,7 +685,8 @@ class ItemBriefcaseS50oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS50oz",1},{"ItemSilverBar10oz",5}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -601,7 +694,8 @@ class ItemBriefcaseS50oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS40oz",1}}; input[] = {{"ItemBriefcaseS50oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -611,13 +705,16 @@ class ItemBriefcaseS50oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS60oz: ItemSilvercase_Base { +class ItemBriefcaseS60oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_60oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_6X10OZSILVER; - weight = 2.7; worth = 60; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -625,7 +722,8 @@ class ItemBriefcaseS60oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS70oz",1}}; input[] = {{"ItemBriefcaseS60oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_206; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -633,7 +731,8 @@ class ItemBriefcaseS60oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS60oz",1},{"ItemSilverBar10oz",4}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -641,7 +740,8 @@ class ItemBriefcaseS60oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS50oz",1}}; input[] = {{"ItemBriefcaseS60oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -651,13 +751,16 @@ class ItemBriefcaseS60oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS70oz: ItemSilvercase_Base { +class ItemBriefcaseS70oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_70oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_7X10OZSILVER; - weight = 2.9; worth = 70; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -665,7 +768,8 @@ class ItemBriefcaseS70oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS80oz",1}}; input[] = {{"ItemBriefcaseS70oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_207; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -673,7 +777,8 @@ class ItemBriefcaseS70oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS70oz",1},{"ItemSilverBar10oz",3}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -681,7 +786,8 @@ class ItemBriefcaseS70oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS60oz",1}}; input[] = {{"ItemBriefcaseS70oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -691,13 +797,16 @@ class ItemBriefcaseS70oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS80oz: ItemSilvercase_Base { +class ItemBriefcaseS80oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_80oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_8X10OZSILVER; - weight = 3.2; worth = 80; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -705,7 +814,8 @@ class ItemBriefcaseS80oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS90oz",1}}; input[] = {{"ItemBriefcaseS80oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_208; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -713,7 +823,8 @@ class ItemBriefcaseS80oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS80oz",1},{"ItemSilverBar10oz",2}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -721,7 +832,8 @@ class ItemBriefcaseS80oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS70oz",1}}; input[] = {{"ItemBriefcaseS80oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -731,13 +843,16 @@ class ItemBriefcaseS80oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS90oz: ItemSilvercase_Base { +class ItemBriefcaseS90oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_90oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_9X10OZSILVER; - weight = 3.5; worth = 90; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_197; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -745,7 +860,8 @@ class ItemBriefcaseS90oz: ItemSilvercase_Base { output[] = {{"ItemBriefcaseS100oz",1}}; input[] = {{"ItemBriefcaseS90oz",1},{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -753,7 +869,8 @@ class ItemBriefcaseS90oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS80oz",1}}; input[] = {{"ItemBriefcaseS90oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -763,13 +880,16 @@ class ItemBriefcaseS90oz: ItemSilvercase_Base { }; }; }; -class ItemBriefcaseS100oz: ItemSilvercase_Base { +class ItemBriefcaseS100oz: ItemSilvercase_Base +{ picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_100oz_CA.paa"; descriptionShort = $STR_EPOCH_BRIEFCASE_10X10OZSILVER; - weight = 3.8; worth = 100; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_S_200; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -777,7 +897,8 @@ class ItemBriefcaseS100oz: ItemSilvercase_Base { output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS90oz",1}}; input[] = {{"ItemBriefcaseS100oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_201; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/BronzeBar.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/BronzeBar.hpp index f8e89540b..86286656a 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/BronzeBar.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/BronzeBar.hpp @@ -1,5 +1,6 @@ -class ItemBronzeBar: CA_Magazine { - scope = public; +class ItemBronzeBar: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BRONZE; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/CopperBar.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/CopperBar.hpp index 6958d8f5b..2389feeec 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/CopperBar.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/CopperBar.hpp @@ -1,13 +1,17 @@ -class ItemCopperBar: CA_Magazine { - scope = public; +class ItemCopperBar: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_COPPER; model = "\z\addons\dayz_epoch\models\copper_bar.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_copper_bar_CA.paa"; descriptionShort = $STR_EPOCH_COPPER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_9; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -17,16 +21,20 @@ class ItemCopperBar: CA_Magazine { }; }; }; -class ItemCopperBar10oz: CA_Magazine { - scope = public; +class ItemCopperBar10oz: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_10OZCOPPER; model = "\z\addons\dayz_epoch\models\copper_bar_10oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_copper_bar_10oz_CA.paa"; descriptionShort = $STR_EPOCH_10OZCOPPER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/GoldBar.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/GoldBar.hpp index d83fe419b..784c6545c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/GoldBar.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/GoldBar.hpp @@ -1,5 +1,6 @@ -class ItemGoldBar: CA_Magazine { - scope = public; +class ItemGoldBar: CA_Magazine +{ + scope = 2; count = 1; worth = 100; type = 256; @@ -7,8 +8,11 @@ class ItemGoldBar: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar1oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_GOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -17,7 +21,8 @@ class ItemGoldBar: CA_Magazine { input[] = {{"ItemGoldBar",2}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_210_9; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -27,8 +32,9 @@ class ItemGoldBar: CA_Magazine { }; }; }; -class ItemGoldBar2oz: CA_Magazine { - scope = public; +class ItemGoldBar2oz: CA_Magazine +{ + scope = 2; count = 1; worth = 200; type = 256; @@ -36,8 +42,11 @@ class ItemGoldBar2oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar2oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_2OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -46,7 +55,8 @@ class ItemGoldBar2oz: CA_Magazine { input[] = {{"ItemGoldBar2oz",1},{"ItemGoldBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -55,7 +65,8 @@ class ItemGoldBar2oz: CA_Magazine { input[] = {{"ItemGoldBar2oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_8; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -65,8 +76,9 @@ class ItemGoldBar2oz: CA_Magazine { }; }; }; -class ItemGoldBar3oz: CA_Magazine { - scope = public; +class ItemGoldBar3oz: CA_Magazine +{ + scope = 2; count = 1; worth = 300; type = 256; @@ -74,8 +86,11 @@ class ItemGoldBar3oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar3oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_3OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -84,7 +99,8 @@ class ItemGoldBar3oz: CA_Magazine { input[] = {{"ItemGoldBar3oz",1},{"ItemGoldBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -93,7 +109,8 @@ class ItemGoldBar3oz: CA_Magazine { input[] = {{"ItemGoldBar3oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_7; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -101,7 +118,8 @@ class ItemGoldBar3oz: CA_Magazine { output[] = {{"ItemGoldBar10oz",1}}; input[] = {{"ItemGoldBar3oz",1},{"ItemGoldBar",7}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -111,8 +129,9 @@ class ItemGoldBar3oz: CA_Magazine { }; }; }; -class ItemGoldBar4oz: CA_Magazine { - scope = public; +class ItemGoldBar4oz: CA_Magazine +{ + scope = 2; count = 1; worth = 400; type = 256; @@ -120,8 +139,11 @@ class ItemGoldBar4oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar4oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_4OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -130,7 +152,8 @@ class ItemGoldBar4oz: CA_Magazine { input[] = {{"ItemGoldBar4oz",1},{"ItemGoldBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -139,7 +162,8 @@ class ItemGoldBar4oz: CA_Magazine { input[] = {{"ItemGoldBar4oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_6; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -147,7 +171,8 @@ class ItemGoldBar4oz: CA_Magazine { output[] = {{"ItemGoldBar10oz",1}}; input[] = {{"ItemGoldBar4oz",1},{"ItemGoldBar",6}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -157,8 +182,9 @@ class ItemGoldBar4oz: CA_Magazine { }; }; }; -class ItemGoldBar5oz: CA_Magazine { - scope = public; +class ItemGoldBar5oz: CA_Magazine +{ + scope = 2; count = 1; worth = 500; type = 256; @@ -166,8 +192,11 @@ class ItemGoldBar5oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar5oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_5OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -176,7 +205,8 @@ class ItemGoldBar5oz: CA_Magazine { input[] = {{"ItemGoldBar5oz",1},{"ItemGoldBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -185,7 +215,8 @@ class ItemGoldBar5oz: CA_Magazine { input[] = {{"ItemGoldBar5oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_5; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -193,7 +224,8 @@ class ItemGoldBar5oz: CA_Magazine { output[] = {{"ItemGoldBar10oz",1}}; input[] = {{"ItemGoldBar5oz",1},{"ItemGoldBar",5}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -203,8 +235,9 @@ class ItemGoldBar5oz: CA_Magazine { }; }; }; -class ItemGoldBar6oz: CA_Magazine { - scope = public; +class ItemGoldBar6oz: CA_Magazine +{ + scope = 2; count = 1; worth = 600; type = 256; @@ -212,8 +245,11 @@ class ItemGoldBar6oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar6oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_6OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -222,7 +258,8 @@ class ItemGoldBar6oz: CA_Magazine { input[] = {{"ItemGoldBar6oz",1},{"ItemGoldBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -231,7 +268,8 @@ class ItemGoldBar6oz: CA_Magazine { input[] = {{"ItemGoldBar6oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_4; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -239,7 +277,8 @@ class ItemGoldBar6oz: CA_Magazine { output[] = {{"ItemGoldBar10oz",1}}; input[] = {{"ItemGoldBar6oz",1},{"ItemGoldBar",4}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -249,8 +288,9 @@ class ItemGoldBar6oz: CA_Magazine { }; }; }; -class ItemGoldBar7oz: CA_Magazine { - scope = public; +class ItemGoldBar7oz: CA_Magazine +{ + scope = 2; count = 1; worth = 700; type = 256; @@ -258,8 +298,11 @@ class ItemGoldBar7oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar7oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_7OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -268,7 +311,8 @@ class ItemGoldBar7oz: CA_Magazine { input[] = {{"ItemGoldBar7oz",1},{"ItemGoldBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -277,7 +321,8 @@ class ItemGoldBar7oz: CA_Magazine { input[] = {{"ItemGoldBar7oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_3; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -285,7 +330,8 @@ class ItemGoldBar7oz: CA_Magazine { output[] = {{"ItemGoldBar10oz",1}}; input[] = {{"ItemGoldBar7oz",1},{"ItemGoldBar",3}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -295,8 +341,9 @@ class ItemGoldBar7oz: CA_Magazine { }; }; }; -class ItemGoldBar8oz: CA_Magazine { - scope = public; +class ItemGoldBar8oz: CA_Magazine +{ + scope = 2; count = 1; worth = 800; type = 256; @@ -304,8 +351,11 @@ class ItemGoldBar8oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar8oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_8OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -314,7 +364,8 @@ class ItemGoldBar8oz: CA_Magazine { input[] = {{"ItemGoldBar8oz",1},{"ItemGoldBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -323,7 +374,8 @@ class ItemGoldBar8oz: CA_Magazine { input[] = {{"ItemGoldBar8oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_2; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -331,7 +383,8 @@ class ItemGoldBar8oz: CA_Magazine { output[] = {{"ItemGoldBar10oz",1}}; input[] = {{"ItemGoldBar8oz",1},{"ItemGoldBar",2}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -341,8 +394,9 @@ class ItemGoldBar8oz: CA_Magazine { }; }; }; -class ItemGoldBar9oz: CA_Magazine { - scope = public; +class ItemGoldBar9oz: CA_Magazine +{ + scope = 2; count = 1; worth = 900; type = 256; @@ -350,8 +404,11 @@ class ItemGoldBar9oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar9oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = $STR_EPOCH_9OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -360,7 +417,8 @@ class ItemGoldBar9oz: CA_Magazine { input[] = {{"ItemGoldBar9oz",1},{"ItemGoldBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -369,7 +427,8 @@ class ItemGoldBar9oz: CA_Magazine { input[] = {{"ItemGoldBar9oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -379,8 +438,9 @@ class ItemGoldBar9oz: CA_Magazine { }; }; }; -class ItemGoldBar10oz: CA_Magazine { - scope = public; +class ItemGoldBar10oz: CA_Magazine +{ + scope = 2; count = 1; worth = 1000; type = 256; @@ -388,17 +448,20 @@ class ItemGoldBar10oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemGoldBar10oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_10oz_CA.paa"; descriptionShort = $STR_EPOCH_10OZGOLD_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; requiretools[] = {}; output[] = {{"ItemGoldBar9oz",1},{"ItemGoldBar",1}}; input[] = {{"ItemGoldBar10oz",1}}; - }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/SilverBar.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/SilverBar.hpp index e140733bb..a2623b2c7 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/SilverBar.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/SilverBar.hpp @@ -1,5 +1,6 @@ -class ItemSilverBar: CA_Magazine { - scope = public; +class ItemSilverBar: CA_Magazine +{ + scope = 2; count = 1; worth = 1; type = 256; @@ -7,8 +8,11 @@ class ItemSilverBar: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar1oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_SILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -17,7 +21,8 @@ class ItemSilverBar: CA_Magazine { input[] = {{"ItemSilverBar",2}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_210_9; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -27,8 +32,9 @@ class ItemSilverBar: CA_Magazine { }; }; }; -class ItemSilverBar2oz: CA_Magazine { - scope = public; +class ItemSilverBar2oz: CA_Magazine +{ + scope = 2; count = 1; worth = 2; type = 256; @@ -36,8 +42,11 @@ class ItemSilverBar2oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar2oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_2OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -46,7 +55,8 @@ class ItemSilverBar2oz: CA_Magazine { input[] = {{"ItemSilverBar2oz",1},{"ItemSilverBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -55,7 +65,8 @@ class ItemSilverBar2oz: CA_Magazine { input[] = {{"ItemSilverBar2oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_8; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -65,8 +76,9 @@ class ItemSilverBar2oz: CA_Magazine { }; }; }; -class ItemSilverBar3oz: CA_Magazine { - scope = public; +class ItemSilverBar3oz: CA_Magazine +{ + scope = 2; count = 1; worth = 3; type = 256; @@ -74,8 +86,11 @@ class ItemSilverBar3oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar3oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_3OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -84,7 +99,8 @@ class ItemSilverBar3oz: CA_Magazine { input[] = {{"ItemSilverBar3oz",1},{"ItemSilverBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -93,7 +109,8 @@ class ItemSilverBar3oz: CA_Magazine { input[] = {{"ItemSilverBar3oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_7; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -101,7 +118,8 @@ class ItemSilverBar3oz: CA_Magazine { output[] = {{"ItemSilverBar10oz",1}}; input[] = {{"ItemSilverBar3oz",1},{"ItemSilverBar",7}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -111,8 +129,9 @@ class ItemSilverBar3oz: CA_Magazine { }; }; }; -class ItemSilverBar4oz: CA_Magazine { - scope = public; +class ItemSilverBar4oz: CA_Magazine +{ + scope = 2; count = 1; worth = 4; type = 256; @@ -120,8 +139,11 @@ class ItemSilverBar4oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar4oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_4OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -130,7 +152,8 @@ class ItemSilverBar4oz: CA_Magazine { input[] = {{"ItemSilverBar4oz",1},{"ItemSilverBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -139,7 +162,8 @@ class ItemSilverBar4oz: CA_Magazine { input[] = {{"ItemSilverBar4oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_6; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -147,7 +171,8 @@ class ItemSilverBar4oz: CA_Magazine { output[] = {{"ItemSilverBar10oz",1}}; input[] = {{"ItemSilverBar4oz",1},{"ItemSilverBar",6}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -157,8 +182,9 @@ class ItemSilverBar4oz: CA_Magazine { }; }; }; -class ItemSilverBar5oz: CA_Magazine { - scope = public; +class ItemSilverBar5oz: CA_Magazine +{ + scope = 2; count = 1; worth = 5; type = 256; @@ -166,8 +192,11 @@ class ItemSilverBar5oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar5oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_5OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -176,7 +205,8 @@ class ItemSilverBar5oz: CA_Magazine { input[] = {{"ItemSilverBar5oz",1},{"ItemSilverBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -185,7 +215,8 @@ class ItemSilverBar5oz: CA_Magazine { input[] = {{"ItemSilverBar5oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_5; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -193,7 +224,8 @@ class ItemSilverBar5oz: CA_Magazine { output[] = {{"ItemSilverBar10oz",1}}; input[] = {{"ItemSilverBar5oz",1},{"ItemSilverBar",5}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -203,8 +235,9 @@ class ItemSilverBar5oz: CA_Magazine { }; }; }; -class ItemSilverBar6oz: CA_Magazine { - scope = public; +class ItemSilverBar6oz: CA_Magazine +{ + scope = 2; count = 1; worth = 6; type = 256; @@ -212,8 +245,11 @@ class ItemSilverBar6oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar6oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_6OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -222,7 +258,8 @@ class ItemSilverBar6oz: CA_Magazine { input[] = {{"ItemSilverBar6oz",1},{"ItemSilverBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -231,7 +268,8 @@ class ItemSilverBar6oz: CA_Magazine { input[] = {{"ItemSilverBar6oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_4; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -239,7 +277,8 @@ class ItemSilverBar6oz: CA_Magazine { output[] = {{"ItemSilverBar10oz",1}}; input[] = {{"ItemSilverBar6oz",1},{"ItemSilverBar",4}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -249,8 +288,9 @@ class ItemSilverBar6oz: CA_Magazine { }; }; }; -class ItemSilverBar7oz: CA_Magazine { - scope = public; +class ItemSilverBar7oz: CA_Magazine +{ + scope = 2; count = 1; worth = 7; type = 256; @@ -258,8 +298,11 @@ class ItemSilverBar7oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar7oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_7OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -268,7 +311,8 @@ class ItemSilverBar7oz: CA_Magazine { input[] = {{"ItemSilverBar7oz",1},{"ItemSilverBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -277,7 +321,8 @@ class ItemSilverBar7oz: CA_Magazine { input[] = {{"ItemSilverBar7oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_3; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -285,7 +330,8 @@ class ItemSilverBar7oz: CA_Magazine { output[] = {{"ItemSilverBar10oz",1}}; input[] = {{"ItemSilverBar7oz",1},{"ItemSilverBar",3}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -295,8 +341,9 @@ class ItemSilverBar7oz: CA_Magazine { }; }; }; -class ItemSilverBar8oz: CA_Magazine { - scope = public; +class ItemSilverBar8oz: CA_Magazine +{ + scope = 2; count = 1; worth = 8; type = 256; @@ -304,8 +351,11 @@ class ItemSilverBar8oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar8oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_8OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -314,7 +364,8 @@ class ItemSilverBar8oz: CA_Magazine { input[] = {{"ItemSilverBar8oz",1},{"ItemSilverBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -323,7 +374,8 @@ class ItemSilverBar8oz: CA_Magazine { input[] = {{"ItemSilverBar8oz",1}}; }; - class Crafting2 { + class Crafting2 + { text = $STR_EPOCH_PLAYER_210_2; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -331,7 +383,8 @@ class ItemSilverBar8oz: CA_Magazine { output[] = {{"ItemSilverBar10oz",1}}; input[] = {{"ItemSilverBar8oz",1},{"ItemSilverBar",2}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -341,8 +394,9 @@ class ItemSilverBar8oz: CA_Magazine { }; }; }; -class ItemSilverBar9oz: CA_Magazine { - scope = public; +class ItemSilverBar9oz: CA_Magazine +{ + scope = 2; count = 1; worth = 9; type = 256; @@ -350,8 +404,11 @@ class ItemSilverBar9oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar9oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = $STR_EPOCH_9OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_210_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -360,7 +417,8 @@ class ItemSilverBar9oz: CA_Magazine { input[] = {{"ItemSilverBar9oz",1},{"ItemSilverBar",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -369,7 +427,8 @@ class ItemSilverBar9oz: CA_Magazine { input[] = {{"ItemSilverBar9oz",1}}; }; - class Crafting3 { + class Crafting3 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -379,8 +438,9 @@ class ItemSilverBar9oz: CA_Magazine { }; }; }; -class ItemSilverBar10oz: CA_Magazine { - scope = public; +class ItemSilverBar10oz: CA_Magazine +{ + scope = 2; count = 1; worth = 10; type = 256; @@ -388,8 +448,11 @@ class ItemSilverBar10oz: CA_Magazine { model = "\z\addons\dayz_epoch\models\ItemSilverBar10oz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_Silver_bar_10oz_CA.paa"; descriptionShort = $STR_EPOCH_10OZSILVER_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_211_1; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -398,7 +461,8 @@ class ItemSilverBar10oz: CA_Magazine { input[] = {{"ItemSilverBar10oz",1}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/TinBar.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/TinBar.hpp index 57bf2eeb4..1d55251b1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/TinBar.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Currency/TinBar.hpp @@ -1,5 +1,6 @@ -class ItemTinBar: CA_Magazine { - scope = public; +class ItemTinBar: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_TIN; @@ -8,16 +9,20 @@ class ItemTinBar: CA_Magazine { descriptionShort = $STR_EPOCH_TIN_DESC; }; -class ItemTinBar10oz: CA_Magazine { - scope = public; +class ItemTinBar10oz: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_10OZTIN; model = "\z\addons\dayz_epoch\models\tin_bar.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_tin_bar_10oz_CA.paa"; descriptionShort = $STR_EPOCH_10OZTIN_DESC; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_211; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/DocumentsPapers.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/DocumentsPapers.hpp index ddf0aa7b7..a90463bb2 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/DocumentsPapers.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/DocumentsPapers.hpp @@ -1,15 +1,18 @@ -class ItemDocument: CA_Magazine { - scope = public; +class ItemDocument: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_DOCUMENT; model = "\z\addons\dayz_epoch\models\doc_generic.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_doc_generic_ca.paa"; descriptionShort = $STR_EPOCH_DOCUMENT_DESC; - weight = 0.1; sfx = "document"; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_188; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; @@ -21,18 +24,21 @@ class ItemDocument: CA_Magazine { }; }; -class ItemPlotDeed: CA_Magazine { - scope = public; +class ItemPlotDeed: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_PLOTDEED; model = "\z\addons\dayz_epoch\models\doc_generic.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_doc_generic_ca.paa"; descriptionShort = $STR_EPOCH_PLOTDEED_DESC; - weight = 0.1; sfx = "document"; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLOTDEED_ACTION; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -43,70 +49,71 @@ class ItemPlotDeed: CA_Magazine { }; }; -class ItemLetter: CA_Magazine { - scope = public; +class ItemLetter: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LETTER; model = "\z\addons\dayz_epoch\models\doc_letter.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_doc_letter_ca.paa"; descriptionShort = $STR_EPOCH_LETTER_DESC; - weight = 0.1; }; -class ItemBook1: CA_Magazine { - scope = public; +class ItemBook1: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_ROMANCENOVEL; model = "\z\addons\dayz_epoch\models\doc_trashy1.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_trashy1_ca.paa"; descriptionShort = $STR_EPOCH_ROMANCENOVEL_DESC; - weight = 0.1; }; -class ItemBook2: CA_Magazine { - scope = public; +class ItemBook2: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_ROMANCENOVEL; model = "\z\addons\dayz_epoch\models\doc_trashy2.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_trashy2_ca.paa"; descriptionShort = $STR_EPOCH_ROMANCENOVEL_DESC2; - weight = 0.1; }; -class ItemBook3: CA_Magazine { - scope = public; +class ItemBook3: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BOOK; model = "\z\addons\dayz_epoch\models\doc_child1.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa"; descriptionShort = $STR_EPOCH_BOOK_DESC; - weight = 0.1; }; -class ItemBook4: CA_Magazine { - scope = public; +class ItemBook4: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BOOK; model = "\z\addons\dayz_epoch\models\doc_child2.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa"; descriptionShort = $STR_EPOCH_BOOK_DESC; - weight = 0.1; }; -class ItemNewspaper: CA_Magazine { - scope = public; +class ItemNewspaper: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_TORNNEWSPAPER; model = "\z\addons\dayz_epoch\models\doc_deaths.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_deaths_ca.paa"; descriptionShort = $STR_EPOCH_TORNNEWSPAPER_DESC; - weight = 0.1; + class ItemActions { class Obituaries { text = $STR_EPOCH_TORNNEWSPAPER_ACTION; @@ -115,17 +122,20 @@ class ItemNewspaper: CA_Magazine { }; }; -class ItemDocumentRamp: CA_Magazine { - scope = public; +class ItemDocumentRamp: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_WOODRAMP; model = "\z\addons\dayz_epoch\models\doc_ramp.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_doc_ramp_ca.paa"; descriptionShort = $STR_EPOCH_WOODRAMP_DESC; - weight = 0.1; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_189; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -138,10 +148,9 @@ class ItemDocumentRamp: CA_Magazine { class ItemBookBible : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\bible.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bible_CA.paa"; displayName = $STR_BOOK_NAME_BIBLE; @@ -150,10 +159,9 @@ class ItemBookBible : CA_Magazine class ItemTrashPaper : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\paper_sheet_clean_note.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_paper_sheet_note_ca.paa"; displayName = $STR_name_ItemTrashPaper; @@ -162,18 +170,18 @@ class ItemTrashPaper : CA_Magazine class ItemTrashPaperMusic : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\paper_sheet_musical.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_paper_sheet_musical_ca.paa"; displayName = $STR_name_ItemTrashPaperMusic; descriptionShort = $STR_desc_ItemTrashPaperMusic; }; -class equip_paper_sheet : CA_Magazine { - scope = public; +class equip_paper_sheet : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_paper_sheet; descriptionShort = $STR_ITEM_DESC_equip_paper_sheet; @@ -181,8 +189,9 @@ class equip_paper_sheet : CA_Magazine { type = 256; }; -class equip_note : CA_Magazine { - scope = public; +class equip_note : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_note; descriptionShort = $STR_ITEM_DESC_equip_note; @@ -191,90 +200,105 @@ class equip_note : CA_Magazine { }; // Vehicle upgrade parts -class ItemORP: CA_Magazine { - scope = public; +class ItemORP: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_ORP; model = "\z\addons\dayz_epoch\models\doc_Up1.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_docup1_ca.paa"; descriptionShort = $STR_EPOCH_VEHUP_ORP_DESC; - weight = 0.1; sfx = "document"; - class ItemActions { - class Upgrades { + + class ItemActions + { + class Upgrades + { text = $STR_EPOCH_PLAYER_UPGRADEV; script = "spawn player_upgradeVehicle;"; }; }; }; -class ItemAVE: CA_Magazine { - scope = public; +class ItemAVE: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_AVE; model = "\z\addons\dayz_epoch\models\doc_Up2.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_docup2_ca.paa"; descriptionShort = $STR_EPOCH_VEHUP_AVE_DESC; - weight = 0.1; sfx = "document"; - class ItemActions { - class Upgrades { + + class ItemActions + { + class Upgrades + { text = $STR_EPOCH_PLAYER_UPGRADEV; script = "spawn player_upgradeVehicle;"; }; }; }; -class ItemLRK: CA_Magazine { - scope = public; +class ItemLRK: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_LRK; model = "\z\addons\dayz_epoch\models\doc_Up3.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_docup3_ca.paa"; descriptionShort = $STR_EPOCH_VEHUP_LRK_DESC; - weight = 0.1; sfx = "document"; - class ItemActions { - class Upgrades { + + class ItemActions + { + class Upgrades + { text = $STR_EPOCH_PLAYER_UPGRADEV; script = "spawn player_upgradeVehicle;"; }; }; }; -class ItemTNK: CA_Magazine { - scope = public; +class ItemTNK: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_TNK; model = "\z\addons\dayz_epoch\models\doc_Up4.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_docup4_ca.paa"; descriptionShort = $STR_EPOCH_VEHUP_TNK_DESC; - weight = 0.1; sfx = "document"; - class ItemActions { - class Upgrades { + + class ItemActions + { + class Upgrades + { text = $STR_EPOCH_PLAYER_UPGRADEV; script = "spawn player_upgradeVehicle;"; }; }; }; -class ItemARM: CA_Magazine { - scope = public; +class ItemARM: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_VEHUP_ARM; model = "\z\addons\dayz_epoch\models\doc_Up4.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_docup4_ca.paa"; descriptionShort = $STR_EPOCH_VEHUP_ARM_DESC; - weight = 0.1; sfx = "document"; - class ItemActions { - class Upgrades { + + class ItemActions + { + class Upgrades + { text = $STR_EPOCH_PLAYER_UPGRADEV; script = "spawn player_upgradeVehicle;"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Electronics.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Electronics.hpp index 50b011f18..61119a2c3 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Electronics.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Electronics.hpp @@ -1,5 +1,6 @@ -class equip_aa_battery : CA_Magazine { - scope = public; +class equip_aa_battery : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_aa_battery; descriptionShort = $STR_ITEM_DESC_equip_aa_battery; @@ -7,8 +8,9 @@ class equip_aa_battery : CA_Magazine { type = 256; }; -class equip_d_battery : CA_Magazine { - scope = public; +class equip_d_battery : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_d_battery; descriptionShort = $STR_ITEM_DESC_equip_d_battery; @@ -16,8 +18,9 @@ class equip_d_battery : CA_Magazine { type = 256; }; -class equip_floppywire : CA_Magazine { - scope = public; +class equip_floppywire : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_floppywire; descriptionShort = $STR_ITEM_DESC_equip_floppywire; @@ -26,8 +29,9 @@ class equip_floppywire : CA_Magazine { type = 256; }; -class equip_scrapelectronics : CA_Magazine { - scope = public; +class equip_scrapelectronics : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_scrapelectronics; descriptionShort = $STR_ITEM_DESC_equip_scrapelectronics; @@ -38,13 +42,14 @@ class equip_scrapelectronics : CA_Magazine { class ItemLightBulb: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LIGHTBULB; model = "\z\addons\dayz_epoch\models\bulb.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_bulb_CA.paa"; descriptionShort = $STR_EPOCH_LIGHTBULB_DESC; + class ItemActions { class Crafting diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp index a14542031..36a171980 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp @@ -20,7 +20,7 @@ class TimeBomb: CA_Magazine class Mine: TimeBomb { scope = 2; - type = WeaponSlotItem; // Only takes up one gear slot in Epoch + type = 256; displayName = $STR_MN_MINE; picture = "\CA\weapons\data\equip\m_AT15_ca.paa"; ammo = "Mine"; @@ -32,7 +32,7 @@ class Mine: TimeBomb class MineE: TimeBomb { scope = 2; - type = WeaponSlotItem; // Only takes up one gear slot in Epoch + type = 256; displayName = $STR_MN_MINE; picture = "\CA\weapons\data\equip\m_TM46_ca.paa"; ammo = "MineE"; @@ -45,7 +45,7 @@ class PipeBomb: TimeBomb scope = 2; displayName = $STR_DZ_MAG_SATCHEL_NAME; // Singular "Satchel Charge" for death messages "with a x" descriptionShort = $STR_DSS_Pipe_Bomb; - type = WeaponSlotItem; // Only takes up one gear slot in Epoch + type = 256; picture = "\CA\weapons\data\equip\m_satchel_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_satchel.p3d"; value = 5; @@ -61,7 +61,7 @@ class PipeBomb: TimeBomb class ItemC4Charge : CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_C4_CHARGE; @@ -70,16 +70,20 @@ class ItemC4Charge : CA_Magazine picture = "\z\addons\dayz_communityassets\pictures\carbomb.paa"; }; -class ItemCarBomb : CA_Magazine { - scope = public; +class ItemCarBomb : CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_ITEM_NAME_equip_carbomb; model = "\ca\weapons\explosive.p3d"; picture = "\z\addons\dayz_communityassets\pictures\carbomb.paa"; descriptionShort = $STR_ITEM_DESC_equip_carbomb; - class ItemActions { - class Use { + + class ItemActions + { + class Use + { text = $STR_ACTIONS_attach_carbomb; script = "spawn player_attach_bomb;"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp index ed591dde2..0e090f595 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp @@ -1,12 +1,10 @@ class HandRoadFlare : HandGrenade { - scope = public; - + scope = 2; picture = "\dayz_weapons\textures\equip_roadflare_ca.paa"; model = "\dayz_weapons\models\roadflare"; displayName = $STR_MAG_NAME_4; - descriptionShort = $STR_MAG_DESC_4; - + descriptionShort = $STR_MAG_DESC_4; ammo = "RoadFlare"; count = 10; @@ -22,13 +20,11 @@ class HandRoadFlare : HandGrenade class HandChemBlue : HandGrenade { - scope = public; - + scope = 2; picture = "\dayz_weapons\textures\equip_chem_blue_ca.paa"; model = "\dayz_weapons\models\chem_gear_blue"; displayName = $STR_MAG_NAME_7; - descriptionShort = $STR_MAG_DESC_5; - + descriptionShort = $STR_MAG_DESC_5; ammo = "ChemBlue"; count = 10; @@ -44,13 +40,11 @@ class HandChemBlue : HandGrenade class HandChemGreen : HandGrenade { - scope = public; - + scope = 2; picture = "\dayz_weapons\textures\equip_chem_green_ca.paa"; model = "\dayz_weapons\models\chem_gear_green"; displayName = $STR_MAG_NAME_5; - descriptionShort = $STR_MAG_DESC_5; - + descriptionShort = $STR_MAG_DESC_5; ammo = "ChemGreen"; count = 10; @@ -66,13 +60,11 @@ class HandChemGreen : HandGrenade class HandChemRed : HandGrenade { - scope = public; - + scope = 2; picture = "\dayz_weapons\textures\equip_chem_red_ca.paa"; model = "\dayz_weapons\models\chem_gear_red"; displayName = $STR_MAG_NAME_6; - descriptionShort = $STR_MAG_DESC_5; - + descriptionShort = $STR_MAG_DESC_5; ammo = "ChemRed"; count = 10; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Gems.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Gems.hpp index e69bf59e4..32dff4139 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Gems.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Gems.hpp @@ -1,63 +1,70 @@ -class ItemTopaz : CA_Magazine { - scope = public; +class ItemTopaz : CA_Magazine +{ + scope = 2; displayName = $STR_GEM_NAME_TOPAZ; model = "\z\addons\dayz_epoch\models\topaz.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_topaz_CA.paa"; count = 1; - type = "256"; + type = 256; descriptionShort = $STR_GEM_NAME_TOPAZ; }; -class ItemObsidian : CA_Magazine { - scope = public; +class ItemObsidian : CA_Magazine +{ + scope = 2; displayName = $STR_GEM_NAME_OBSIDIAN; model = "\z\addons\dayz_epoch\models\obsidian.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_obsidian_CA.paa"; count = 1; - type = "256"; + type = 256; descriptionShort = $STR_GEM_NAME_OBSIDIAN; }; -class ItemSapphire : CA_Magazine { - scope = public; +class ItemSapphire : CA_Magazine +{ + scope = 2; displayName = $STR_GEM_NAME_SAPPHIRE; model = "\z\addons\dayz_epoch\models\sapphire.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_sapphire_CA.paa"; count = 1; - type = "256"; + type = 256; descriptionShort = $STR_GEM_NAME_SAPPHIRE; }; -class ItemAmethyst : CA_Magazine { - scope = public; +class ItemAmethyst : CA_Magazine +{ + scope = 2; displayName = $STR_GEM_NAME_AMETHYST; model = "\z\addons\dayz_epoch\models\amethyst.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_amethyst_CA.paa"; count = 1; - type = "256"; + type = 256; descriptionShort = $STR_GEM_NAME_AMETHYST; }; -class ItemEmerald : CA_Magazine { - scope = public; +class ItemEmerald : CA_Magazine +{ + scope = 2; displayName = $STR_GEM_NAME_EMERALD; model = "\z\addons\dayz_epoch\models\emerald.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_emerald_CA.paa"; count = 1; - type = "256"; + type = 256; descriptionShort = $STR_GEM_NAME_EMERALD; }; -class ItemCitrine : CA_Magazine { - scope = public; +class ItemCitrine : CA_Magazine +{ + scope = 2; displayName = $STR_GEM_NAME_CITRINE; model = "\z\addons\dayz_epoch\models\citrine.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_citrine_CA.paa"; count = 1; - type = "256"; + type = 256; descriptionShort = $STR_GEM_NAME_CITRINE; }; -class ItemRuby : CA_Magazine { - scope = public; +class ItemRuby : CA_Magazine +{ + scope = 2; displayName = $STR_GEM_NAME_RUBY; model = "\z\addons\dayz_epoch\models\ruby.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_ruby_CA.paa"; count = 1; - type = "256"; + type = 256; descriptionShort = $STR_GEM_NAME_RUBY; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Locks.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Locks.hpp index fb90de89d..586f8414c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Locks.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Locks.hpp @@ -1,19 +1,17 @@ class ItemComboLock: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_COMBINATIONLOCK; - weight = 0.5; model = "\z\addons\dayz_epoch\models\combo_lock_mag.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_combolock_ca.paa"; descriptionShort = $STR_EPOCH_COMBINATIONLOCK_DESC; }; - class ItemPadlock: CA_Magazine //Vanilla lock, left in config for potential admin use, but all scripts changed to use Epoch ItemComboLock { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_BLD_name_ItemPadlock;//"Padlock" diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp index 266123f00..1ecb57fcf 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp @@ -1,15 +1,17 @@ class PartGeneric : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; + type = 256; model = "\dayz_equip\models\genericparts.p3d"; picture = "\dayz_equip\textures\equip_genericparts_ca.paa"; displayName = $STR_EQUIP_NAME_10; descriptionShort = $STR_EQUIP_DESC_10; - class ItemActions { - class Crafting { + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_213; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; @@ -17,7 +19,8 @@ class PartGeneric : CA_Magazine output[] = {{"ItemPole",1}}; input[] = {{"PartGeneric",2}}; }; - class Crafting1 { + class Crafting1 + { text = $STR_CRAFTING_NAILS; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; @@ -30,7 +33,7 @@ class PartGeneric : CA_Magazine class ItemPole: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_METALPOLE; @@ -90,8 +93,9 @@ class ItemMetalSheet: CA_Magazine descriptionShort = $STR_BLD_desc_ItemMetalSheet;//"Metal Sheeting" }; -class equip_metal_sheet : CA_Magazine { - scope = public; +class equip_metal_sheet : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_metal_sheet; descriptionShort = $STR_ITEM_DESC_equip_metal_sheet; @@ -100,8 +104,9 @@ class equip_metal_sheet : CA_Magazine { type = 256; }; -class equip_metal_sheet_rusted : CA_Magazine { - scope = public; +class equip_metal_sheet_rusted : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_metal_sheet_rusted; descriptionShort = $STR_ITEM_DESC_equip_metal_sheet_rusted; @@ -121,8 +126,9 @@ class ItemRSJ: CA_Magazine descriptionShort = $STR_BLD_desc_ItemRSJ;//"Steel RSJ Support Beam" }; -class equip_1inch_metal_pipe : CA_Magazine { - scope = public; +class equip_1inch_metal_pipe : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_1inch_metal_pipe; descriptionShort = $STR_ITEM_DESC_equip_1inch_metal_pipe; @@ -131,8 +137,9 @@ class equip_1inch_metal_pipe : CA_Magazine { type = 256; }; -class equip_2inch_metal_pipe : CA_Magazine { - scope = public; +class equip_2inch_metal_pipe : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_2inch_metal_pipe; descriptionShort = $STR_ITEM_DESC_equip_2inch_metal_pipe; @@ -141,8 +148,9 @@ class equip_2inch_metal_pipe : CA_Magazine { type = 256; }; -class equip_tent_poles : CA_Magazine { - scope = public; +class equip_tent_poles : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_tent_poles; descriptionShort = $STR_ITEM_DESC_equip_tent_poles; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp index 888fee73e..36e1d9142 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp @@ -1,6 +1,6 @@ class ItemZombieParts: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_ZOMBIEPARTS; @@ -9,23 +9,22 @@ class ItemZombieParts: CA_Magazine descriptionShort = $STR_EPOCH_ZOMBIEPARTS_DESC; }; -class ItemHotwireKit: CA_Magazine { - scope = public; +class ItemHotwireKit: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_HOTWIREKIT; model = "\z\addons\dayz_epoch\models\hotwire.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_hotwire_ca.paa"; descriptionShort = $STR_EPOCH_HOTWIREKIT_DESC; - weight = 2; }; class ItemCards : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\cards.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_cards_ca.paa"; displayName = $STR_ITEM_NAME_CARDS; @@ -34,10 +33,9 @@ class ItemCards : CA_Magazine class ItemKosmosSmokes : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityassets\models\smokes_kosmos.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_kosmos_ca.paa"; displayName = $STR_ITEM_NAME_KOSMOS_SMOKES; @@ -46,18 +44,18 @@ class ItemKosmosSmokes : CA_Magazine class ItemKosmosSmokesOpen : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityassets\models\smokes_open_k.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_smokes_open_k_ca.paa"; displayName = $STR_ITEM_NAME_KOSMOS_SMOKES; descriptionShort = $STR_ITEM_DESC_KOSMOS_SMOKES_OPENED; }; -class equip_nails : CA_Magazine { - scope = public; +class equip_nails : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_nails; descriptionShort = $STR_ITEM_DESC_equip_nails; @@ -77,8 +75,9 @@ class ItemScrews: CA_Magazine descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws" }; -class equip_duct_tape : CA_Magazine { - scope = public; +class equip_duct_tape : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_duct_tape; descriptionShort = $STR_ITEM_DESC_equip_duct_tape; @@ -87,8 +86,9 @@ class equip_duct_tape : CA_Magazine { type = 256; }; -class equip_feathers : CA_Magazine { - scope = public; +class equip_feathers : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_feathers; descriptionShort = $STR_ITEM_DESC_equip_feathers; @@ -97,8 +97,9 @@ class equip_feathers : CA_Magazine { type = 256; }; -class equip_pvc_box : CA_Magazine { - scope = public; +class equip_pvc_box : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_pvc_box; descriptionShort = $STR_ITEM_DESC_equip_pvc_box; @@ -107,8 +108,9 @@ class equip_pvc_box : CA_Magazine { type = 256; }; -class equip_hobo_fishing_kit : CA_Magazine { - scope = public; +class equip_hobo_fishing_kit : CA_Magazine +{ + scope = 2; count = 1; displayName = "Hobo Fishing Kit"; descriptionShort = "Hobo Fishing Kit, catches dem fishes"; @@ -117,8 +119,9 @@ class equip_hobo_fishing_kit : CA_Magazine { type = 256; }; -class equip_hose : CA_Magazine { - scope = public; +class equip_hose : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_hose; descriptionShort = $STR_ITEM_DESC_equip_hose; @@ -127,8 +130,9 @@ class equip_hose : CA_Magazine { type = 256; }; -class equip_hose_clamp : CA_Magazine { - scope = public; +class equip_hose_clamp : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_hose_clamp; descriptionShort = $STR_ITEM_DESC_equip_hose_clamp; @@ -137,8 +141,9 @@ class equip_hose_clamp : CA_Magazine { type = 256; }; -class Item_coni : CA_Magazine { - scope = public; +class Item_coni : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_DESC_equip_con_i; descriptionShort = $STR_ITEM_NAME_equip_con_i; @@ -147,8 +152,9 @@ class Item_coni : CA_Magazine { type = 256; }; -class Item_Connector_I : CA_Magazine { - scope = public; +class Item_Connector_I : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_DESC_equip_con_i; descriptionShort = $STR_ITEM_NAME_equip_con_i; @@ -157,8 +163,9 @@ class Item_Connector_I : CA_Magazine { type = 256; }; -class Item_Connector_L : CA_Magazine { - scope = public; +class Item_Connector_L : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_DESC_equip_con_l; descriptionShort = $STR_ITEM_NAME_equip_con_l; @@ -167,8 +174,9 @@ class Item_Connector_L : CA_Magazine { type = 256; }; -class Item_Connector_T : CA_Magazine { - scope = public; +class Item_Connector_T : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_DESC_equip_con_t; descriptionShort = $STR_ITEM_NAME_equip_con_t; @@ -177,8 +185,9 @@ class Item_Connector_T : CA_Magazine { type = 256; }; -class equip_tin_powder : CA_Magazine { - scope = public; +class equip_tin_powder : CA_Magazine +{ + scope = 2; count = 1; displayName = "Tin of Powder"; descriptionShort = "Tin of Powder has medicinal qualities"; @@ -187,8 +196,9 @@ class equip_tin_powder : CA_Magazine { type = 256; }; -class equip_slugsinacan : CA_Magazine { - scope = public; +class equip_slugsinacan : CA_Magazine +{ + scope = 2; count = 1; displayName = "Slugs in a can"; descriptionShort = "Slugs in a can"; @@ -198,8 +208,9 @@ class equip_slugsinacan : CA_Magazine { }; //No models -class equip_cable_tie : CA_Magazine { - scope = public; +class equip_cable_tie : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_cable_tie; descriptionShort = $STR_ITEM_DESC_equip_cable_tie; @@ -207,8 +218,9 @@ class equip_cable_tie : CA_Magazine { type = 256; }; -class equip_needle : CA_Magazine { - scope = public; +class equip_needle : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_needle; descriptionShort = $STR_ITEM_DESC_equip_needle; @@ -216,8 +228,9 @@ class equip_needle : CA_Magazine { type = 256; }; -class equip_laser : CA_Magazine { - scope = public; +class equip_laser : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_laser; descriptionShort = $STR_ITEM_DESC_equip_laser; @@ -225,8 +238,9 @@ class equip_laser : CA_Magazine { type = 256; }; -class equip_weapon_rails: CA_Magazine { - scope = public; +class equip_weapon_rails: CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_weapon_rails; descriptionShort = $STR_ITEM_DESC_equip_weapon_rails; @@ -234,11 +248,12 @@ class equip_weapon_rails: CA_Magazine { type = 256; }; -class equip_rail_screws : CA_Magazine { - scope = public; +class equip_rail_screws : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_rail_screws; descriptionShort = $STR_ITEM_DESC_equip_rail_screws; picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa"; type = 256; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_empty_barrel.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_empty_barrel.hpp index 8264a0ab7..dc3a0bb5a 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_empty_barrel.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_empty_barrel.hpp @@ -1,5 +1,6 @@ -class equip_empty_barrel : CA_Magazine { - scope = public; +class equip_empty_barrel : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_empty_barrel; descriptionShort = $STR_ITEM_DESC_equip_empty_barrel; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_fuse.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_fuse.hpp index 559a70809..f821c8d60 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_fuse.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_fuse.hpp @@ -1,5 +1,6 @@ -class equip_fuse : CA_Magazine { - scope = public; +class equip_fuse : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_fuse; descriptionShort = $STR_ITEM_DESC_equip_fuse; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_camo.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_camo.hpp index 6d83b997e..c84188c95 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_camo.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_camo.hpp @@ -1,5 +1,6 @@ -class equip_part_camo : CA_Magazine { - scope = public; +class equip_part_camo : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_part_camo; descriptionShort = $STR_ITEM_DESC_equip_part_camo; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_silencer.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_silencer.hpp index d38ab5238..27bdb1384 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_silencer.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_silencer.hpp @@ -1,5 +1,6 @@ -class equip_part_silencer : CA_Magazine { - scope = public; +class equip_part_silencer : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_part_silencer; descriptionShort = $STR_ITEM_DESC_equip_part_silencer; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_sniper_scope.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_sniper_scope.hpp index 54666010c..4a6d18611 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_sniper_scope.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_part_sniper_scope.hpp @@ -1,5 +1,6 @@ -class equip_part_sniper_scope : CA_Magazine { - scope = public; +class equip_part_sniper_scope : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ATTACHMENT_NAME_Sniper_Scope; descriptionShort = $STR_ATTACHMENT_DESC_Sniper_Scope; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_pipecap.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_pipecap.hpp index cec942770..0c6c8c14c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_pipecap.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_pipecap.hpp @@ -1,5 +1,6 @@ -class equip_pipecap : CA_Magazine { - scope = public; +class equip_pipecap : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_pipecap; descriptionShort = $STR_ITEM_DESC_equip_pipecap; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_rubber_tube.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_rubber_tube.hpp index 4e313d865..2f3a4aecb 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_rubber_tube.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Not used/equip_rubber_tube.hpp @@ -1,5 +1,6 @@ -class equip_rubber_tube : CA_Magazine { - scope = public; +class equip_rubber_tube : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_rubber_tube; descriptionShort = $STR_ITEM_DESC_equip_rubber_tube; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Ores.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Ores.hpp index de7840161..038abe2ba 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Ores.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Ores.hpp @@ -1,14 +1,17 @@ -class PartOre: CA_Magazine { - scope = public; +class PartOre: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_ORE_NAME_IRON; model = "\z\addons\dayz_epoch\models\iron_ore.p3d"; picture="\z\addons\dayz_epoch\pictures\equip_iron_ore_CA.paa"; descriptionShort = $STR_ORE_NAME_IRON_DESC; - weight = 1; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_265; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; @@ -18,17 +21,20 @@ class PartOre: CA_Magazine { }; }; }; -class PartOreSilver: CA_Magazine { - scope = public; +class PartOreSilver: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_ORE_NAME_SILVER; model = "\z\addons\dayz_epoch\models\silver_ore.p3d"; picture="\z\addons\dayz_epoch\pictures\equip_silver_ore_CA.paa"; descriptionShort = $STR_ORE_DESC; - weight = 1; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_266; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; @@ -38,17 +44,20 @@ class PartOreSilver: CA_Magazine { }; }; }; -class PartOreGold: CA_Magazine { - scope = public; +class PartOreGold: CA_Magazine +{ + scope = 2; count = 1; type = 256; displayName = $STR_ORE_NAME_GOLD; model = "\z\addons\dayz_epoch\models\gold_ore.p3d"; picture="\z\addons\dayz_epoch\pictures\equip_gold_ore_CA.paa"; descriptionShort = $STR_ORE_DESC; - weight = 1; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_267; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Paints.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Paints.hpp index 443ecad55..1f89eb134 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Paints.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Paints.hpp @@ -1,5 +1,6 @@ -class equip_paint : CA_Magazine { - scope = public; +class equip_paint : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_paint; descriptionShort = $STR_ITEM_DESC_equip_paint; @@ -7,48 +8,54 @@ class equip_paint : CA_Magazine { type = 256; }; -class equip_paint_generic : CA_Magazine { - scope = public; +class equip_paint_generic : CA_Magazine +{ + scope = 2; count = 1; type = 256; picture = "\dayz_epoch_c\icons\equipment\equip_paint_generic.paa"; displayName = $STR_DZE_EQUIP_PAINT_GENERIC_NAME; descriptionShort = $STR_DZE_EQUIP_PAINT_GENERIC_DESC; }; -class equip_paint_black : CA_Magazine { - scope = public; +class equip_paint_black : CA_Magazine +{ + scope = 2; count = 1; type = 256; picture = "\dayz_epoch_c\icons\equipment\equip_paint_black.paa"; displayName = $STR_DZE_EQUIP_PAINT_BLACK_NAME; descriptionShort = $STR_DZE_EQUIP_PAINT_BLACK_DESC; }; -class equip_paint_white : CA_Magazine { - scope = public; +class equip_paint_white : CA_Magazine +{ + scope = 2; count = 1; type = 256; picture = "\dayz_epoch_c\icons\equipment\equip_paint_white.paa"; displayName = $STR_DZE_EQUIP_PAINT_WHITE_NAME; descriptionShort = $STR_DZE_EQUIP_PAINT_WHITE_DESC; }; -class equip_paint_blue : CA_Magazine { - scope = public; +class equip_paint_blue : CA_Magazine +{ + scope = 2; count = 1; type = 256; picture = "\dayz_epoch_c\icons\equipment\equip_paint_blue.paa"; displayName = $STR_DZE_EQUIP_PAINT_BLUE_NAME; descriptionShort = $STR_DZE_EQUIP_PAINT_BLUE_DESC; }; -class equip_paint_green : CA_Magazine { - scope = public; +class equip_paint_green : CA_Magazine +{ + scope = 2; count = 1; type = 256; picture = "\dayz_epoch_c\icons\equipment\equip_paint_green.paa"; displayName = $STR_DZE_EQUIP_PAINT_GREEN_NAME; descriptionShort = $STR_DZE_EQUIP_PAINT_GREEN_DESC; }; -class equip_paint_red : CA_Magazine { - scope = public; +class equip_paint_red : CA_Magazine +{ + scope = 2; count = 1; type = 256; picture = "\dayz_epoch_c\icons\equipment\equip_paint_red.paa"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Planting.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Planting.hpp index 5091d9849..656233864 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Planting.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Planting.hpp @@ -1,5 +1,6 @@ -class ItemFertilizer: CA_Magazine { - scope = public; +class ItemFertilizer: CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_CRAFT_NAME_FERTILIZER; descriptionShort = $STR_CRAFT_DESC_FERTILIZER; @@ -8,15 +9,18 @@ class ItemFertilizer: CA_Magazine { type = 256; }; -class ItemPumpkinSeed: CA_Magazine { - scope = public; +class ItemPumpkinSeed: CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_CRAFT_NAME_PUMPKIN_SEED; descriptionShort = $STR_CRAFT_DESC_PUMPKIN_SEED; model = "\z\addons\dayz_epoch\models\doc_child1.p3d"; // TODO: model + icon picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa"; type = 256; - class ItemActions { + + class ItemActions + { class Crafting { text = $STR_CRAFT_PUMPKIN_PLANT; @@ -29,16 +33,20 @@ class ItemPumpkinSeed: CA_Magazine { }; }; -class ItemPumpkinPlant: CA_Magazine { - scope = public; +class ItemPumpkinPlant: CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_CRAFT_NAME_PUMPKIN_PLANT; descriptionShort = $STR_CRAFT_DESC_PUMPKIN_PLANT; model = "\z\addons\dayz_epoch\models\doc_child1.p3d"; // TODO: model + icon picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa"; type = 256; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_CRAFT_PLANT_PUMPKIN_PLANT; buildText = $STR_CRAFT_NAME_PUMPKIN_PLANT; script = "spawn player_build;"; @@ -48,15 +56,18 @@ class ItemPumpkinPlant: CA_Magazine { }; }; -class ItemHempSeed: CA_Magazine { - scope = public; +class ItemHempSeed: CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_CRAFT_NAME_HEMP_SEED; descriptionShort = $STR_CRAFT_DESC_HEMP_SEED; model = "\z\addons\dayz_epoch\models\doc_child2.p3d"; // TODO: model + icon picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa"; type = 256; - class ItemActions { + + class ItemActions + { class Crafting { text = $STR_CRAFT_HEMP_PLANT; @@ -69,16 +80,20 @@ class ItemHempSeed: CA_Magazine { }; }; -class ItemHempPlant: CA_Magazine { - scope = public; +class ItemHempPlant: CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_CRAFT_NAME_HEMP_PLANT; descriptionShort = $STR_CRAFT_DESC_HEMP_PLANT; model = "\z\addons\dayz_epoch\models\doc_child2.p3d"; // TODO: model + icon picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa"; type = 256; - class ItemActions { - class Build { + + class ItemActions + { + class Build + { text = $STR_CRAFT_PLANT_HEMP_PLANT; buildText = $STR_CRAFT_NAME_HEMP_PLANT; script = "spawn player_build;"; @@ -90,13 +105,14 @@ class ItemHempPlant: CA_Magazine { class ItemKiloHemp : CA_Magazine { - scope = public; + scope = 2; count = 1; displayName = $STR_EPOCH_KILOOFHEMP; descriptionShort = $STR_EPOCH_KILOOFHEMP_DESC; model = "z\addons\dayz_epoch\models\kilohemp.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_kilohemp_CA.paa"; type = 256; + class ItemActions { class Crafting @@ -122,7 +138,7 @@ class ItemKiloHemp : CA_Magazine class ItemKiloTobacco : CA_Magazine { - scope = public; + scope = 2; count = 1; displayName = $STR_EPOCH_KILOTOBACCO; descriptionShort = $STR_EPOCH_KILOTOBACCO_DESC; @@ -131,15 +147,20 @@ class ItemKiloTobacco : CA_Magazine type = 256; }; -class ItemKiloBlackTea : ItemKiloTobacco +class ItemKiloBlackTea : CA_Magazine { + scope = 2; + count = 1; displayName = $STR_EPOCH_KILOBLACKTEA; descriptionShort = $STR_EPOCH_KILOBLACKTEA_DESC; + model = "z\addons\dayz_epoch\models\kilohemp.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_kilohemp_CA.paa"; + type = 256; }; class ItemTobaccoLeafs : CA_Magazine { - scope = public; + scope = 2; count = 1; displayName = $STR_EPOCH_TOBACCO_LEAF; descriptionShort = $STR_EPOCH_TOBACCO_LEAF_DESC; @@ -148,8 +169,9 @@ class ItemTobaccoLeafs : CA_Magazine type = 256; }; -class equip_comfreyleafs : CA_Magazine { - scope = public; +class equip_comfreyleafs : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_comfreyleafs; descriptionShort = $STR_ITEM_DESC_equip_comfreyleafs; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Textiles.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Textiles.hpp index 8563743d2..8818f9591 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Textiles.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Textiles.hpp @@ -1,6 +1,6 @@ class ItemCanvas: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_CANVAS; @@ -42,7 +42,7 @@ class ItemCanvas: CA_Magazine class ItemBurlap: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_BURLAP; @@ -64,8 +64,9 @@ class ItemBurlap: CA_Magazine }; }; -class equip_rag : CA_Magazine { - scope = public; +class equip_rag : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_rag; descriptionShort = $STR_ITEM_DESC_equip_rag; @@ -88,8 +89,9 @@ class equip_rag : CA_Magazine { }; }; -class equip_string : CA_Magazine { - scope = public; +class equip_string : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_string; descriptionShort = $STR_ITEM_DESC_equip_string; @@ -148,8 +150,9 @@ class equip_string : CA_Magazine { }; }; -class equip_rope : CA_Magazine { - scope = public; +class equip_rope : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_rope; descriptionShort = $STR_ITEM_DESC_equip_rope; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/ToolCrafting.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/ToolCrafting.hpp index aba4e82ce..8cc81a837 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/ToolCrafting.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/ToolCrafting.hpp @@ -1,8 +1,8 @@ class equip_lever : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; + type = 256; picture = "\dayz_equip\textures\equip_lever.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_handle.p3d"; descriptionShort = $STR_EQUIP_DESC_LEVER; @@ -11,7 +11,7 @@ class equip_lever : CA_Magazine class ItemSledgeHead : CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_SLEDGEHAMMERHEAD; @@ -36,7 +36,7 @@ class ItemSledgeHead : CA_Magazine class ItemSledgeHandle : CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_SLEDGEHAMMERHANDLE; @@ -61,7 +61,7 @@ class ItemSledgeHandle : CA_Magazine class equip_Crossbow_Kit : CA_Magazine { - scope = public; + scope = 2; count = 1; displayName = $STR_ITEM_NAME_CROSSBOW_KIT; descriptionShort = $STR_ITEM_DESC_CROSSBOW_KIT; @@ -86,7 +86,7 @@ class equip_Crossbow_Kit : CA_Magazine class equip_crossbow_stock : CA_Magazine { - scope = public; + scope = 2; count = 1; displayName = $STR_ITEM_NAME_CROSSBOW_STOCK; descriptionShort = $STR_ITEM_DESC_CROSSBOW_STOCK; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp index 7cc168bdd..8a01d1eec 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp @@ -1,15 +1,17 @@ class PartFueltank : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\fueltank.p3d"; picture = "\dayz_equip\textures\equip_fueltank_ca.paa"; displayName = $STR_EQUIP_NAME_8; descriptionShort = $STR_EQUIP_DESC_8; - class ItemActions { - class Crafting { + + class ItemActions + { + class Crafting + { text = $STR_EPOCH_PLAYER_212; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; @@ -22,10 +24,9 @@ class PartFueltank : CA_Magazine class PartWheel : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\wheel.p3d"; picture = "\dayz_equip\textures\equip_wheel_ca.paa"; displayName = $STR_EQUIP_NAME_9; @@ -34,15 +35,16 @@ class PartWheel : CA_Magazine class PartEngine : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\engine.p3d"; picture = "\dayz_equip\textures\equip_engine_ca.paa"; displayName = $STR_EQUIP_NAME_11; descriptionShort = $STR_EQUIP_DESC_11; - class ItemActions { + + class ItemActions + { class Crafting { text = $STR_EPOCH_PLAYER_212; @@ -57,15 +59,16 @@ class PartEngine : CA_Magazine class PartVRotor : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\vrotor.p3d"; picture = "\dayz_equip\textures\equip_vrotor_ca.paa"; displayName = $STR_EQUIP_NAME_32; descriptionShort = $STR_EQUIP_DESC_32; - class ItemActions { + + class ItemActions + { class Crafting { text = $STR_EPOCH_PLAYER_212; @@ -80,14 +83,13 @@ class PartVRotor : CA_Magazine class PartGlass : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\carglass.p3d"; picture = "\dayz_equip\textures\equip_carglass_ca.paa"; displayName = $STR_EQUIP_NAME_30; descriptionShort = $STR_EQUIP_DESC_30; }; -// PartGeneric can be found under Items\Metal.hpp +// PartGeneric can be found under Items\Metal.hpp \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp index 4899b6a99..2e772a97b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp @@ -1,8 +1,8 @@ class ItemLog : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; + type = 256; displayName = $STR_BLD_name_ItemLog;//"Wooden Log" picture = "\z\addons\dayz_buildings\equip\item_log.paa"; model = "z\addons\dayz_buildings\models\logs.p3d"; @@ -10,7 +10,8 @@ class ItemLog : CA_Magazine class ItemActions { - class Build { + class Build + { text = $STR_ACTIONS_MAKEFIRE; script = "spawn player_build;"; require[] = {"ItemMatchbox"}; @@ -48,9 +49,9 @@ class ItemLog : CA_Magazine class ItemPlank : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; + type = 256; displayName = $STR_BLD_name_ItemPlank;//"Sawn Planks" picture = "\z\addons\dayz_buildings\equip\item_plank.paa"; model = "z\addons\dayz_buildings\models\planks.p3d"; @@ -81,16 +82,18 @@ class ItemPlank : CA_Magazine class PartWoodPile : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; + type = 256; model = "\dayz_equip\models\woodPile.p3d"; picture = "\dayz_equip\textures\equip_woodPile_ca.paa"; displayName = $STR_EQUIP_NAME_40; descriptionShort = $STR_EQUIP_DESC_40; - class ItemActions { - class Build { + class ItemActions + { + class Build + { text = $STR_ACTIONS_MAKEFIRE; script = "spawn player_build;"; require[] = {"ItemMatchbox"}; @@ -139,14 +142,14 @@ class PartWoodPile : CA_Magazine class PartPlankPack: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LUMBERPACK; model = "\z\addons\dayz_epoch\models\plank_pack.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_lumber_pack_CA.paa"; descriptionShort = $STR_EPOCH_LUMBERPACK_DESC; - weight = 6; + class ItemActions { class Crafting @@ -163,14 +166,14 @@ class PartPlankPack: CA_Magazine class PartPlywoodPack: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_PLYWOODPACK; model = "\z\addons\dayz_epoch\models\plywood_pack.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_plywood_pack_CA.paa"; descriptionShort = $STR_EPOCH_PLYWOODPACK_DESC; - weight = 12; + class ItemActions { class Crafting @@ -187,13 +190,14 @@ class PartPlywoodPack: CA_Magazine class PartWoodLumber: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_LUMBER; model = "\z\addons\dayz_epoch\models\planks.p3d"; picture= "\z\addons\dayz_epoch\pictures\equip_wood_planks_CA.paa"; descriptionShort = $STR_EPOCH_LUMBER_DESC; + class ItemActions { class Crafting @@ -278,13 +282,14 @@ class PartWoodLumber: CA_Magazine class PartWoodPlywood: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = $STR_EPOCH_PLYWOOD; model = "\z\addons\dayz_epoch\models\plywood.p3d"; picture= "\z\addons\dayz_epoch\pictures\equip_plywood_CA.paa"; descriptionShort = $STR_EPOCH_PLYWOOD_DESC; + class ItemActions { class Crafting @@ -344,8 +349,9 @@ class PartWoodPlywood: CA_Magazine }; }; -class equip_wood_pallet : CA_Magazine { - scope = public; +class equip_wood_pallet : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_wood_pallet; descriptionShort = $STR_ITEM_DESC_equip_wood_pallet; @@ -354,8 +360,9 @@ class equip_wood_pallet : CA_Magazine { type = 256; }; -class equip_crate : CA_Magazine { - scope = public; +class equip_crate : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_crate; descriptionShort = $STR_ITEM_DESC_equip_crate; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp index 27e49bb16..70a88f5f6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp @@ -1,6 +1,6 @@ class 10Rnd_22lfB_RUGERMK2: CA_Magazine { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_10RND_C22_RUGERMK2_NAME; descriptionShort = $STR_DZ_MAG_10RND_RUGERMK2_C22_DESC; picture = "\RH_de\inv\m_mk2.paa"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/357Magnum.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/357Magnum.hpp index fc702d88c..d4831a004 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/357Magnum.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/357Magnum.hpp @@ -1,6 +1,6 @@ class 6Rnd_357Magnum: CA_Magazine { - scope = public; + scope = 2; type = 16; displayName = $STR_DZ_MAG_6RND_357MAGNUM_NAME; descriptionShort = $STR_DZ_MAG_6RND_357MAGNUM_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/408CheyTac.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/408CheyTac.hpp index 291ecbe62..6a64bb3f5 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/408CheyTac.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/408CheyTac.hpp @@ -1,5 +1,5 @@ class 5Rnd_408_CheyTac : CA_Magazine { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_5RND_408_CHEYTAC_NAME; descriptionShort = $STR_DZ_MAG_5RND_CHEYTAC_DESC; picture ="\z\addons\dayz_epoch_w\m200\data\m_cheytac_CA.paa"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/44Magnum.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/44Magnum.hpp index d63074a7d..eb2e39ae6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/44Magnum.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/44Magnum.hpp @@ -1,6 +1,6 @@ class 6Rnd_44Magnum: CA_Magazine { - scope = public; + scope = 2; type = 16; displayName = $STR_DZ_MAG_6RND_44MAGNUM_NAME; descriptionShort = $STR_DZ_MAG_6RND_44MAGNUM_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/50AE.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/50AE.hpp index 3b79003a2..48427dd55 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/50AE.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/50AE.hpp @@ -1,6 +1,6 @@ class 7Rnd_50AE_Deagle: CA_Magazine { - scope = public; + scope = 2; type = 16; displayName = $STR_DZ_MAG_7RND_50AE_DESERT_EAGLE_NAME; descriptionShort = $STR_DZ_MAG_7RND_50AE_DESERT_EAGLE_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp index f05d8a2fe..fb2084761 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp @@ -45,12 +45,10 @@ class 75Rnd_545x39_RPK : CA_Magazine model = "\z\addons\dayz_epoch_w\magazine\dze_RPK_mag.p3d"; picture = "\CA\weapons\AK\data\equip\M_RPK_74_CA.paa"; displayName = $STR_DZ_MAG_75RND_545X39_RPK_NAME; - descriptionShort = $STR_DZ_MAG_75RND_RPK74_DESC; - + descriptionShort = $STR_DZ_MAG_75RND_RPK74_DESC; count = 75; tracersEvery = 4; - lastRoundsTracer = 4; - + lastRoundsTracer = 4; cartridgeName = "545x39"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp index f2279df81..f59c890ce 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp @@ -1,9 +1,8 @@ class 200Rnd_556x45_M249: CA_Magazine { displayName = $STR_DZ_MAG_200RND_556X45_M249_NAME; - cartridgeName = "556x45"; - type = WeaponSlotItem; // Only takes up one gear slot in Epoch + type = 256; class ItemActions { @@ -24,14 +23,14 @@ class 100Rnd_556x45_M249 : 200Rnd_556x45_M249 }; class 100Rnd_556x45_BetaCMag: CA_Magazine { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_100RND_556x45_BetaCMag_NAME; ammo = "B_556x45_Ball"; count = 100; initSpeed = 920; model = "\z\addons\dayz_epoch_w\magazine\dze_MG36_mag.p3d"; picture = "\ca\weapons\g36\data\equip\M_MG36_CA.paa"; - type = WeaponSlotItem; + type = 256; tracersEvery = 4; lastRoundsTracer = 4; descriptionShort = $STR_DZ_MAG_100RND_BetaCMag_DESC; @@ -42,13 +41,11 @@ class 100Rnd_556x45_BetaCMag: CA_Magazine { }; }; - /* STANAG <-> G36 */ class 20Rnd_556x45_Stanag; class 30Rnd_556x45_Stanag : 20Rnd_556x45_Stanag { - //model = "\dayz_equip\models\mag30.p3d"; displayName = $STR_DZ_MAG_30RND_556x45_STANAG_NAME; descriptionShort = $STR_DZE_MAG_30RND_556x45_STANAG_DESC; @@ -78,7 +75,6 @@ class 30Rnd_556x45_G36 : 30Rnd_556x45_Stanag { displayName = $STR_DZ_MAG_30RND_556x45_G36_NAME; descriptionShort = $STR_DZE_MAG_30RND_556x45_G36_DESC; - cartridgeName = "556x45"; class ItemActions @@ -106,7 +102,6 @@ class 30Rnd_556x45_StanagSD : 30Rnd_556x45_Stanag picture = "\z\addons\dayz_communityweapons\magazines\data\m_30stanagsd_ca.paa"; displayName = $STR_DZ_MAG_30RND_556x45_STANAGSD_NAME; descriptionShort = $STR_DZE_MAG_30RND_556x45_STANAGSD_DESC; - cartridgeName = "556x45_SD"; class ItemActions @@ -133,8 +128,7 @@ class 30Rnd_556x45_G36SD : 30Rnd_556x45_G36 { picture = "\z\addons\dayz_communityweapons\magazines\data\m_g36sd_ca.paa"; displayName = $STR_DZ_MAG_30RND_556x45_G36SD_NAME; - descriptionShort = $STR_DZE_MAG_30RND_556x45_G36SD_DESC; - + descriptionShort = $STR_DZE_MAG_30RND_556x45_G36SD_DESC; cartridgeName = "556x45_SD"; class ItemActions @@ -163,6 +157,7 @@ class 60Rnd_556x45_Stanag_Taped : 30Rnd_556x45_Stanag { count = 60; picture = "\dayz_epoch_c\icons\magazines\m_stanag_taped.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_stannag_twinmag.p3d"; + class ItemActions { COMBINE_MAG @@ -177,6 +172,7 @@ class 60Rnd_556x45_StanagSD_Taped : 30Rnd_556x45_StanagSD { count = 60; picture = "\dayz_epoch_c\icons\magazines\m_stanag_taped_sd.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_stannag_twinmag.p3d"; + class ItemActions { COMBINE_MAG @@ -193,8 +189,7 @@ class 30Rnd_556x45_Aug : 30Rnd_556x45_Stanag { class ItemActions { - COMBINE_MAG - + COMBINE_MAG delete ReloadMag; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/57x28.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/57x28.hpp index 98c022e36..62c79e7c2 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/57x28.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/57x28.hpp @@ -1,7 +1,7 @@ //P90 class 50Rnd_57x28_P90: CA_Magazine { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_50RND_P90_NAME; descriptionShort = $STR_DZ_MAG_50RND_P90_DESC; model = "\RH_smg\mags\mag_p90.p3d"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/6x35.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/6x35.hpp index 7e9f8c307..bca127d4b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/6x35.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/6x35.hpp @@ -1,6 +1,6 @@ class 30Rnd_6x35_KAC: CA_Magazine { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_30RND_KACPDW_NAME; descriptionShort = $STR_DZ_MAG_30RND_KACPDW_DESC; picture = "\RH_pdw\inv\m_30pdw_ca.paa"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x25.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x25.hpp index 375755162..0444c0b8f 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x25.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x25.hpp @@ -1,6 +1,6 @@ class 8Rnd_762x25_TT33 : CA_Magazine { - scope = public; + scope = 2; type = 16; displayName = $STR_DZ_MAG_8RND_762x25_TT33_NAME; descriptionShort = $STR_DZ_MAG_8RND_TT33_762x25_DESC; @@ -8,8 +8,7 @@ class 8Rnd_762x25_TT33 : CA_Magazine model = "\RH_de\mags\mag_tt33.p3d"; ammo = "B_762x25_Ball"; count = 8; - initSpeed = 400; - + initSpeed = 400; cartridgeName = "762x25"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp index ed868293b..aca83eaa4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp @@ -5,8 +5,7 @@ class 30Rnd_762x39_AK47 : CA_Magazine model = "z\addons\dayz_communityweapons\magazines\ak47.p3d"; picture = "\z\addons\dayz_communityweapons\magazines\data\m_ak47_ca.paa"; displayName = $STR_DZ_MAG_30RND_762X39_AK47_NAME; - descriptionShort = $STR_DZ_MAG_30RND_AK47M_DESC; - + descriptionShort = $STR_DZ_MAG_30RND_AK47M_DESC; cartridgeName = "762x39"; class ItemActions @@ -45,8 +44,7 @@ class 75Rnd_762x39_RPK : 30Rnd_762x39_AK47 model = "\z\addons\dayz_epoch_w\magazine\dze_RPK_mag.p3d"; picture = "\z\addons\dayz_communityweapons\magazines\data\m_rpk_ca.paa"; displayName = $STR_DZ_MAG_75RND_762X39_RPK_NAME; - descriptionShort = $STR_DZ_MAG_75RND_762X39_RPK_DESC; - + descriptionShort = $STR_DZ_MAG_75RND_762X39_RPK_DESC; count = 75; tracersEvery = 4; lastRoundsTracer = 4; @@ -61,8 +59,7 @@ class 30Rnd_762x39_SA58 : CA_Magazine { model = "z\addons\dayz_communityweapons\magazines\vz58.p3d"; displayName = $STR_DZ_MAG_30RND_762X39_SA58_NAME; - descriptionShort = $STR_DZ_MAG_30RND_SA58_DESC; - + descriptionShort = $STR_DZ_MAG_30RND_SA58_DESC; cartridgeName = "762x39"; class ItemActions @@ -84,8 +81,7 @@ class 30Rnd_762x39_RK95 : 30Rnd_762x39_AK47 model = "\RH_aks\mags\mag_rk.p3d"; picture = "\dayz_epoch_c\icons\magazines\m_rk95.paa"; displayName = $STR_DZ_MAG_30RND_RK95_NAME; - descriptionShort = $STR_DZ_MAG_30RND_RK95_DESC; - + descriptionShort = $STR_DZ_MAG_30RND_RK95_DESC; cartridgeName = "762x39"; class ItemActions @@ -101,8 +97,7 @@ class 30Rnd_762x39_RK95SD : 30Rnd_762x39_RK95 picture = "\dayz_epoch_c\icons\magazines\m_rk95_sd.paa"; displayName = $STR_DZ_MAG_30RND_RK95SD_NAME; descriptionShort = $STR_DZ_MAG_30RND_RK95SD_DESC; - ammo = "B_762x39_SD"; - + ammo = "B_762x39_SD"; cartridgeName = "762x39_SD"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp index 111aa3d4d..9a11beeb2 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp @@ -2,8 +2,7 @@ class 20Rnd_762x51_FNFAL : CA_Magazine { picture = "\z\addons\dayz_epoch_w\magazine\ui\m_fnfal_mag.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_fnFal_mag.p3d"; - displayName = $STR_DZ_MAG_20RND_762X51_FNFAL_NAME; - + displayName = $STR_DZ_MAG_20RND_762X51_FNFAL_NAME; cartridgeName = "762x51"; class ItemActions @@ -25,8 +24,7 @@ class 20Rnd_762x51_DMR : CA_Magazine model = "\dayz_equip\models\mag20.p3d"; picture = "\dayz_epoch_c\icons\magazines\m_us_dmr_ca.paa"; displayName = $STR_DZ_MAG_20RND_762X51_DMR_NAME; - descriptionShort = $STR_DZ_MAG_20RND_DMR_DESC; - + descriptionShort = $STR_DZ_MAG_20RND_DMR_DESC; cartridgeName = "762x51"; class ItemActions @@ -48,8 +46,7 @@ class 20Rnd_762x51_DMRSD : 20Rnd_762x51_DMR displayName = $STR_DZ_MAG_20RND_762X51_DMRSD_NAME; descriptionShort = $STR_DZ_MAG_20RND_DMRSD_DESC; picture = "\dayz_epoch_c\icons\magazines\m_us_dmr_ca_sd.paa"; - ammo = "Rem_762x51_SD"; - + ammo = "Rem_762x51_SD"; cartridgeName = "762x51_SD"; class ItemActions @@ -63,8 +60,7 @@ class 5Rnd_762x51_M24 : CA_Magazine { model = "\dayz_equip\models\mag5rnd.p3d"; displayName = $STR_DZ_MAG_5RND_762X51_M24_NAME; - descriptionShort = $STR_DZ_MAG_5RND_762x51_M24_DESC; - + descriptionShort = $STR_DZ_MAG_5RND_762x51_M24_DESC; cartridgeName = "762x51"; class ItemActions @@ -84,10 +80,9 @@ class 5Rnd_762x51_M24 : CA_Magazine class 100Rnd_762x51_M240: CA_Magazine { displayName = $STR_DZ_MAG_100RND_762X51_M240_NAME; - descriptionShort = $STR_DZ_MAG_100RND_762x51_M240_DESC; - + descriptionShort = $STR_DZ_MAG_100RND_762x51_M240_DESC; cartridgeName = "762x51"; - type = WeaponSlotItem; // Only takes up one gear slot in Epoch + type = 256; class ItemActions { @@ -100,8 +95,7 @@ class 20Rnd_762x51_B_SCAR : CA_Magazine model = "\z\addons\dayz_epoch_w\magazine\dze_mk17_mag.p3d"; picture = "\dayz_epoch_c\icons\magazines\m_mk17_ca.paa"; displayName = $STR_DZ_MAG_20Rnd_762x51_B_SCAR_NAME; - descriptionShort = $STR_DZ_MAG_20RND_MK17_DESC; - + descriptionShort = $STR_DZ_MAG_20RND_MK17_DESC; cartridgeName = "762x51"; class ItemActions @@ -117,8 +111,7 @@ class 20Rnd_762x51_SB_SCAR : CA_Magazine displayName = $STR_DZ_MAG_20Rnd_762x51_SB_SCAR_NAME; descriptionShort = $STR_DZ_MAG_20RND_MK17SD_DESC; ammo = "Rem_762x51_SD"; - initSpeed = 750; - + initSpeed = 750; cartridgeName = "762x51_SD"; class ItemActions @@ -132,8 +125,7 @@ class 10Rnd_762x51_CZ750 : 5Rnd_762x51_M24 count = 10; picture = "\Ca\Weapons_ACR\Data\UI\picture_CZ750_mag_CA.paa"; displayName = $STR_DZ_MAG_10Rnd_762x51_CZ750_NAME; - descriptionShort = $STR_DZ_MAG_10RND_CZ750_DESC; - + descriptionShort = $STR_DZ_MAG_10RND_CZ750_DESC; cartridgeName = "762x51"; class ItemActions @@ -145,7 +137,7 @@ class 10Rnd_762x51_CZ750 : 5Rnd_762x51_M24 class 20Rnd_762x51_RSASS: CA_Magazine { - scope = public; + scope = 2; initSpeed = 900; picture = "\FHQ_Remington\ammo\ui\i_20rndpmag.paa"; model = "\FHQ_Remington\RSASS\magazine.p3d"; @@ -193,7 +185,7 @@ class 20Rnd_762x51_HK417SD: 20Rnd_762x51_HK417 class 6Rnd_762x51_WA2000: CA_Magazine { - scope = public; + scope = 2; initSpeed = 900; picture = "\z\addons\dayz_epoch_w\wa2000\data\m_wa2000_CA.paa"; model = "\z\addons\dayz_epoch_w\wa2000\h4_wa2000_mag.p3d"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x54r.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x54r.hpp index 7d38bdabd..f066a5af2 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x54r.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x54r.hpp @@ -2,10 +2,9 @@ class 100Rnd_762x54_PK : CA_Magazine { model = "z\addons\dayz_communityweapons\magazines\pk.p3d"; displayName = $STR_DZ_MAG_100RND_762x54_PK_NAME; - descriptionShort = $STR_DZ_MAG_100RND_762x54_PK_DESC; - + descriptionShort = $STR_DZ_MAG_100RND_762x54_PK_DESC; cartridgeName = "762x54"; - type = WeaponSlotItem; // Only takes up one gear slot in Epoch + type = 256; class ItemActions { @@ -15,8 +14,7 @@ class 100Rnd_762x54_PK : CA_Magazine class 50Rnd_762x54_UK59 : 100Rnd_762x54_PK { - count = 50; - + count = 50; model = "z\addons\dayz_communityweapons\magazines\uk59.p3d"; picture = "\z\addons\dayz_communityweapons\magazines\data\m_uk59_ca.paa"; displayName = $STR_DZ_MAG_50RND_762X54_UK59_NAME; @@ -25,8 +23,7 @@ class 50Rnd_762x54_UK59 : 100Rnd_762x54_PK class 10Rnd_762x54_SVD : CA_Magazine { - displayName = $STR_DZ_MAG_10RND_762x54_SVD_NAME; - + displayName = $STR_DZ_MAG_10RND_762x54_SVD_NAME; cartridgeName = "762x54"; class ItemActions @@ -41,8 +38,7 @@ class 5Rnd_762x54_Mosin : 10Rnd_762x54_SVD model = "\dayz_equip\models\mag5rnd.p3d"; picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\ammo.paa"; displayName = $STR_DZ_MAG_5RND_762X54_MOSIN_NAME; - descriptionShort = $STR_DZ_MAG_5RND_762X54_MOSIN_DESC; - + descriptionShort = $STR_DZ_MAG_5RND_762X54_MOSIN_DESC; cartridgeName = "762x54"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x67.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x67.hpp index b6ddbfd8c..a50688fd1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x67.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x67.hpp @@ -1,14 +1,13 @@ class 5Rnd_762x67_XM2010: CA_Magazine { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_5RND_XM2010_NAME; descriptionShort = $STR_DZ_MAG_5RND_XM2010_DESC; count = 5; ammo = "Rem_300Win_Ball"; initSpeed = 850; picture = "\FHQ_Remington\ammo\ui\i_xm2010.paa"; - model = "\FHQ_Remington\XM2010\magazine.p3d"; - + model = "\FHQ_Remington\XM2010\magazine.p3d"; cartridgeName = "762x67"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x17.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x17.hpp index 77728f0c8..d366fbd67 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x17.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x17.hpp @@ -1,6 +1,6 @@ class 7Rnd_9x17_PPK : CA_Magazine { - scope = public; + scope = 2; type = 16; displayName = $STR_DZ_MAG_7RND_9x17_PPK_NAME; descriptionShort = $STR_DZ_MAG_7RND_PPK_9x17_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x39.hpp index bcede17df..091beb7de 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x39.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x39.hpp @@ -32,8 +32,9 @@ class 20Rnd_9x39_SP5_VSS: CA_Magazine }; //Groza-9 -class 20Rnd_9x39_Groza9: CA_Magazine { - scope = public; +class 20Rnd_9x39_Groza9: CA_Magazine +{ + scope = 2; displayName = $STR_DZ_MAG_20RND_Groza9_NAME; descriptionShort = $STR_DZ_MAG_20RND_Groza9_DESC; picture = "\RH_aks\inv\m_oc.paa"; @@ -48,7 +49,8 @@ class 20Rnd_9x39_Groza9: CA_Magazine { }; }; -class 20Rnd_9x39_Groza9SD: 20Rnd_9x39_Groza9 { +class 20Rnd_9x39_Groza9SD: 20Rnd_9x39_Groza9 +{ displayName = $STR_DZ_MAG_20RND_Groza9SD_NAME; descriptionShort = $STR_DZ_MAG_20RND_Groza9SD_DESC; picture = "\dayz_epoch_c\icons\magazines\m_oc_sd.paa"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp index 886e0fdbc..cd9259766 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp @@ -1,7 +1,7 @@ class 1Rnd_Arrow_Wood : CA_Magazine { - scope = public; - + scope = 2; + type = 256; model = "\dayz_weapons\models\bolt_gear"; picture = "\z\addons\dayz_communityassets\pictures\equip_warrow_ca.paa"; displayName = $STR_ITEMWOODENARROW_CODE_NAME; @@ -23,13 +23,11 @@ class 1Rnd_Arrow_Wood : CA_Magazine class 12Rnd_Quiver_Wood : 1Rnd_Arrow_Wood { - type = WeaponSlotItem; - + type = 256; model = "\z\addons\dayz_communityassets\models\quiver"; picture = "\z\addons\dayz_communityassets\pictures\equip_quiver_ca.paa"; descriptionShort = $STR_ITEMQUIVER_CODE_DESC; - displayName = $STR_ITEMQUIVER_CODE_NAME; - + displayName = $STR_ITEMQUIVER_CODE_NAME; count = 12; class ItemActions @@ -46,36 +44,24 @@ class 12Rnd_Quiver_Wood : 1Rnd_Arrow_Wood class 1Rnd_Bolt_Tranquilizer : CA_Magazine { - scope = public; - type = WeaponSlotItem; - count = 1; - + scope = 2; + type = 256; + count = 1; model = "z\addons\community_crossbow\models\ammo.p3d"; picture = "\z\addons\community_crossbow\textures\bolt_tranq.paa"; displayName = $STR_DZ_MAG_BOLT_TRQ_NAME; - descriptionShort = $STR_DZ_MAG_BOLT_TRQ_DESC; - + descriptionShort = $STR_DZ_MAG_BOLT_TRQ_DESC; ammo = "tranquiliser_bolt"; }; class 1Rnd_Bolt_Explosive : CA_Magazine { - scope = public; - type = WeaponSlotItem; - count = 1; - + scope = 2; + type = 256; + count = 1; picture = "\z\addons\community_crossbow\textures\bolt_expl.paa"; model = "z\addons\community_crossbow\models\ammo.p3d"; displayName = $STR_DZ_MAG_BOLT_EXP_NAME; - descriptionShort = $STR_DZ_MAG_BOLT_EXP_DESC; - + descriptionShort = $STR_DZ_MAG_BOLT_EXP_DESC; ammo = "explosive_bolt"; -}; - -/* - //TODO: Remove legacy - class WoodenArrow : 1Rnd_Arrow_Wood {}; - class Quiver : 12Rnd_Quiver_Wood {}; - class Tranquiliser_Bolt : 1Rnd_Bolt_Tranquilizer {}; - class Crossbow_EX_Bolt : 1Rnd_Bolt_Explosive {}; -*/ \ No newline at end of file +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp index ec0d93590..9b14913bd 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp @@ -1,5 +1,6 @@ // M32/M203 grenades -class 1Rnd_HE_M203: CA_Magazine { +class 1Rnd_HE_M203: CA_Magazine +{ scope = 2; type = 16; displayName = "$STR_DN_HE_M203"; @@ -11,7 +12,8 @@ class 1Rnd_HE_M203: CA_Magazine { nameSound = "grenadelauncher"; descriptionShort = "$STR_DSS_1Rnd_HE_M203"; }; -class 6Rnd_HE_M203: 1Rnd_HE_M203 { +class 6Rnd_HE_M203: 1Rnd_HE_M203 +{ count = 6; displayName = "$STR_EP1_DN_6Rnd_HE_M203"; descriptionShort = "$STR_EP1_DSS_6Rnd_HE_M203"; @@ -19,7 +21,8 @@ class 6Rnd_HE_M203: 1Rnd_HE_M203 { picture = "\CA\weapons_E\Data\icons\m_6x40mmHP_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; }; -class FlareWhite_M203: CA_Magazine { +class FlareWhite_M203: CA_Magazine +{ scope = 2; type = 16; displayName = "$STR_DN_FLAREWHITE_M203"; @@ -40,7 +43,8 @@ class 6Rnd_FlareWhite_M203: FlareWhite_M203 picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; }; -class FlareGreen_M203: FlareWhite_M203 { +class FlareGreen_M203: FlareWhite_M203 +{ displayName = "$STR_DN_FLAREGREEN_M203"; ammo = "F_40mm_Green"; picture = "\Ca\weapons\Data\Equip\m_FlareGreen_CA.paa"; @@ -55,7 +59,8 @@ class 6Rnd_FlareGreen_M203: FlareGreen_M203 picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; }; -class FlareRed_M203: FlareWhite_M203 { +class FlareRed_M203: FlareWhite_M203 +{ displayName = "$STR_DN_FLARERED_M203"; ammo = "F_40mm_Red"; picture = "\Ca\weapons\Data\Equip\m_FlareRed_CA.paa"; @@ -70,7 +75,8 @@ class 6Rnd_FlareRed_M203: FlareRed_M203 picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; }; -class FlareYellow_M203: FlareWhite_M203 { +class FlareYellow_M203: FlareWhite_M203 +{ displayName = "$STR_DN_FLAREYELLOW_M203"; ammo = "F_40mm_Yellow"; picture = "\Ca\weapons\Data\Equip\m_FlareYelow_CA.paa"; @@ -85,7 +91,8 @@ class 6Rnd_FlareYellow_M203: FlareYellow_M203 picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; }; -class 1Rnd_Smoke_M203: 1Rnd_HE_M203 { +class 1Rnd_Smoke_M203: 1Rnd_HE_M203 +{ displayName = "$STR_MN_SMOKE_M203"; picture = "\Ca\weapons_E\Data\icons\m_40mmSmoke_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_m203_smoke.p3d"; @@ -101,7 +108,8 @@ class 6Rnd_Smoke_M203: 1Rnd_Smoke_M203 picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; }; -class 1Rnd_SmokeRed_M203: 1Rnd_Smoke_M203 { +class 1Rnd_SmokeRed_M203: 1Rnd_Smoke_M203 +{ ammo = "G_40mm_SmokeRed"; displayName = "$STR_DN_1Rnd_SmokeRed_M203"; descriptionShort = "$STR_DSS_1Rnd_SMOKERED_M203"; @@ -116,7 +124,8 @@ class 6Rnd_SmokeRed_M203: 1Rnd_SmokeRed_M203 picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; }; -class 1Rnd_SmokeGreen_M203: 1Rnd_Smoke_M203 { +class 1Rnd_SmokeGreen_M203: 1Rnd_Smoke_M203 +{ ammo = "G_40mm_SmokeGreen"; displayName = "$STR_DN_1Rnd_SmokeGreen_M203"; descriptionShort = "$STR_DSS_1Rnd_SMOKEGREEN_M203"; @@ -131,7 +140,8 @@ class 6Rnd_SmokeGreen_M203: 1Rnd_SmokeGreen_M203 picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; }; -class 1Rnd_SmokeYellow_M203: 1Rnd_Smoke_M203 { +class 1Rnd_SmokeYellow_M203: 1Rnd_Smoke_M203 +{ ammo = "G_40mm_SmokeYellow"; displayName = "$STR_DN_1Rnd_SmokeYellow_M203"; descriptionShort = "$STR_DSS_1Rnd_SMOKEYELLOW_M203"; @@ -148,7 +158,8 @@ class 6Rnd_SmokeYellow_M203: 1Rnd_SmokeYellow_M203 }; // GP-25 -class 1Rnd_HE_GP25: CA_Magazine { +class 1Rnd_HE_GP25: CA_Magazine +{ scope = 2; type = 16; displayName = "$STR_DN_HE_GP25"; @@ -160,7 +171,8 @@ class 1Rnd_HE_GP25: CA_Magazine { nameSound = "grenadelauncher"; descriptionShort = "$STR_DSS_1Rnd_HE_GP25"; }; -class FlareWhite_GP25: CA_Magazine { +class FlareWhite_GP25: CA_Magazine +{ scope = 2; type = 16; displayName = "$STR_DN_FLAREWHITE_GP25"; @@ -172,44 +184,51 @@ class FlareWhite_GP25: CA_Magazine { count = 1; nameSound = "grenadelauncher"; }; -class FlareGreen_GP25: FlareWhite_GP25 { +class FlareGreen_GP25: FlareWhite_GP25 +{ displayName = "$STR_DN_FLAREGREEN_GP25"; ammo = "F_40mm_Green"; picture = "\Ca\weapons_E\Data\icons\M_GP25_green_CA.paa"; descriptionShort = "$STR_DSS_1Rnd_FLAREGREEN_GP25"; }; -class FlareRed_GP25: FlareWhite_GP25 { +class FlareRed_GP25: FlareWhite_GP25 +{ displayName = "$STR_DN_FLARERED_GP25"; ammo = "F_40mm_Red"; picture = "\Ca\weapons_E\Data\icons\M_GP25_red_CA.paa"; descriptionShort = "$STR_DSS_1Rnd_FLARERED_GP25"; }; -class FlareYellow_GP25: FlareWhite_GP25 { +class FlareYellow_GP25: FlareWhite_GP25 +{ displayName = "$STR_DN_FLAREYELLOW_GP25"; ammo = "F_40mm_Yellow"; picture = "\Ca\weapons_E\Data\icons\M_GP25_yellow_CA.paa"; descriptionShort = "$STR_DSS_1Rnd_FLAREYELLOW_GP25"; }; -class 1Rnd_SMOKE_GP25: 1Rnd_HE_GP25 { +class 1Rnd_SMOKE_GP25: 1Rnd_HE_GP25 +{ displayName = "$STR_MN_SMOKE_GP25"; picture = "\Ca\weapons_E\Data\icons\M_GP25_white_CA.paa"; model = "\z\addons\dayz_epoch_w\magazine\dze_gp_smoke.p3d"; ammo = "G_40mm_Smoke"; descriptionShort = "$STR_DSS_1Rnd_SMOKE_GP25"; }; -class 1Rnd_SmokeRed_GP25: 1Rnd_SMOKE_GP25 { +class 1Rnd_SmokeRed_GP25: 1Rnd_SMOKE_GP25 +{ displayName = "$STR_DN_1Rnd_SmokeRed_GP25"; picture = "\Ca\weapons_E\Data\icons\M_GP25_red_CA.paa"; ammo = "G_40mm_SmokeRed"; descriptionShort = "$STR_DSS_1Rnd_SMOKERED_GP25"; }; -class 1Rnd_SmokeYellow_GP25: 1Rnd_SMOKE_GP25 { +class 1Rnd_SmokeYellow_GP25: 1Rnd_SMOKE_GP25 +{ displayName = "$STR_DN_1Rnd_SmokeYellow_GP25"; picture = "\Ca\weapons_E\Data\icons\M_GP25_yellow_CA.paa"; ammo = "G_40mm_SmokeYellow"; descriptionShort = "$STR_DSS_1Rnd_SMOKEYELLOW_GP25"; }; -class 1Rnd_SmokeGreen_GP25: 1Rnd_SMOKE_GP25 { +class 1Rnd_SmokeGreen_GP25: 1Rnd_SMOKE_GP25 +{ displayName = "$STR_DN_1Rnd_SmokeGreen_GP25"; picture = "\Ca\weapons_E\Data\icons\M_GP25_green_CA.paa"; ammo = "G_40mm_SmokeGreen"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp index 62d199837..09461ada0 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp @@ -1,81 +1,81 @@ // Use single slot for everything, let R3F weight handle load class M136 : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class Javelin : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class AT13 : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class PG7V : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class PG7VL : PG7V { - type = WeaponSlotItem; + type = 256; }; class PG7VR : PG7V { - type = WeaponSlotItem; + type = 256; }; class OG7 : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class PG9_AT : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class OG9_HE : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class Stinger : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class SMAW_HEDP : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class SMAW_HEAA : SMAW_HEDP { - type = WeaponSlotItem; + type = 256; }; class MAAWS_HEDP : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class MAAWS_HEAT : MAAWS_HEDP { - type = WeaponSlotItem; + type = 256; }; class Strela : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class RPG18 : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class Igla : Strela { - type = WeaponSlotItem; + type = 256; }; class 2Rnd_Igla : Igla { - type = WeaponSlotItem; + type = 256; }; class NLAW : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; class Dragon_EP1 : CA_LauncherMagazine { - type = WeaponSlotItem; + type = 256; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Melee.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Melee.hpp index e6ffdcb3e..22486c102 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Melee.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Melee.hpp @@ -1,13 +1,13 @@ class Melee_Swing : CA_Magazine { - type = WeaponNoSlot; + type = 0; count = 100000; initSpeed = 100; }; class Hatchet_Swing : Melee_Swing { - scope = public; + scope = 2; //TODO: test which one is shown and delete the rest displayName = "Hatchet"; @@ -18,8 +18,7 @@ class Hatchet_Swing : Melee_Swing class Crowbar_Swing : Melee_Swing { - scope = public; - + scope = 2; displayName = "Crowbar"; displayNameMagazine = "Crowbar"; shortNameMagazine = "Crowbar"; @@ -28,8 +27,7 @@ class Crowbar_Swing : Melee_Swing class Machete_Swing : Melee_Swing { - scope = public; - + scope = 2; displayName = "Machete"; displayNameMagazine = "Machete"; shortNameMagazine = "Machete"; @@ -38,8 +36,7 @@ class Machete_Swing : Melee_Swing class Fishing_Swing : Melee_Swing { - scope = public; - + scope = 2; displayName = "Fishing"; displayNameMagazine = "Fishing"; shortNameMagazine = "Fishing"; @@ -55,8 +52,7 @@ class Sledge_Swing : Melee_Swing { class Bat_Swing : Melee_Swing { - scope = public; - + scope = 2; displayName = "BaseBallBat"; displayNameMagazine = "BaseBallBat"; shortNameMagazine = "BaseBallBat"; @@ -65,8 +61,7 @@ class Bat_Swing : Melee_Swing class BatBarbed_Swing : Melee_Swing { - scope = public; - + scope = 2; displayName = "BaseBallBatBarbed"; displayNameMagazine = "BaseBallBatBarbed"; shortNameMagazine = "BaseBallBatBarbed"; @@ -75,8 +70,7 @@ class BatBarbed_Swing : Melee_Swing class BatNails_Swing : Melee_Swing { - scope = public; - + scope = 2; displayName = "BaseBallBatNails"; displayNameMagazine = "BaseBallBatNails"; shortNameMagazine = "BaseBallBatNails"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp index 999ba3394..b750fb19b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp @@ -3,8 +3,7 @@ class 5x_22_LR_17_HMR; class 5Rnd_17HMR : 5x_22_LR_17_HMR { displayName = $STR_DZ_MAG_5RND_17HMR_NAME; - descriptionShort = $STR_DZ_MAG_5RND_17HMR_DESC; - + descriptionShort = $STR_DZ_MAG_5RND_17HMR_DESC; model = "\dayz_equip\models\mag5rnd.p3d"; class ItemActions @@ -29,8 +28,7 @@ class 10Rnd_303British : 10x_303 //KSVK class 5Rnd_127x108_KSVK : CA_Magazine { - displayName = $STR_DZ_MAG_5Rnd_127x108_KSVK_NAME; - + displayName = $STR_DZ_MAG_5Rnd_127x108_KSVK_NAME; cartridgeName = "127x108"; class ItemActions @@ -43,8 +41,7 @@ class 5Rnd_127x108_KSVK : CA_Magazine class 10Rnd_B_765x17_Ball: CA_Magazine { model = "\z\addons\dayz_epoch_w\magazine\dze_sa61_mag.p3d"; - displayName = "$STR_EP1_DN_10RND_B_765X17_BALL"; - + displayName = "$STR_EP1_DN_10RND_B_765X17_BALL"; cartridgeName = "765x17"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp index 2ca88c5bd..97ec9663c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp @@ -3,17 +3,14 @@ //Winchester 1866 class 15Rnd_W1866_Slug : CA_Magazine { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\winammo.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_winammo_ca.paa"; displayName = $STR_DZ_MAG_15RND_W1866_NAME; - descriptionShort = $STR_DZ_MAG_15RND_W1866_DESC; - + descriptionShort = $STR_DZ_MAG_15RND_W1866_DESC; ammo = B_1866_Slug; count = 15; initSpeed = 396; - displayNameShort = "Slug"; class ItemActions { @@ -27,8 +24,7 @@ class 8Rnd_12Gauge_Slug : 8Rnd_B_Beneli_74Slug model = "\z\addons\dayz_communityassets\models\greenshotgunslugs.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_greenshotgunslugs_ca.paa"; displayName = $STR_DZ_MAG_8RND_12GAUGE_SLUG_NAME; - descriptionShort = $STR_DZ_MAG_8RND_12GAUGE_SLUG_DESC; - + descriptionShort = $STR_DZ_MAG_8RND_12GAUGE_SLUG_DESC; cartridgeName = "12Gauge_Slug"; class ItemActions @@ -56,8 +52,7 @@ class 2Rnd_12Gauge_Slug : 8Rnd_12Gauge_Slug model = "\z\addons\dayz_communityassets\models\2shells_slugshot.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_2shells_slugshot_CA.paa"; displayName = $STR_DZ_MAG_2RND_12GAUGE_SLUG_NAME; - descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_SLUG_DESC; - + descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_SLUG_DESC; count = 2; class ItemActions @@ -120,8 +115,7 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck model = "\z\addons\dayz_communityassets\models\2shells_slugshot.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_2shells_pellet_ca.paa"; displayName = $STR_DZ_MAG_2RND_12GAUGE_BUCK_NAME; - descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_BUCK_DESC; - + descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_BUCK_DESC; count = 2; class ItemActions @@ -146,12 +140,12 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck }; }; }; + //AA12 Ammo class 20Rnd_B_AA12_74Slug : CA_Magazine { model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; - displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME; - + displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME; cartridgeName = "12Gauge_Slug"; class ItemActions @@ -159,11 +153,11 @@ class 20Rnd_B_AA12_74Slug : CA_Magazine COMBINE_MAG }; }; + class 20Rnd_B_AA12_Pellets : CA_Magazine { model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; - displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME; - + displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME; cartridgeName = "12Gauge_Pellets"; class ItemActions @@ -171,11 +165,11 @@ class 20Rnd_B_AA12_Pellets : CA_Magazine COMBINE_MAG }; }; + class 20Rnd_B_AA12_HE : CA_Magazine { model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; - displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME; - + displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME; cartridgeName = "19mm_HE"; class ItemActions @@ -183,6 +177,7 @@ class 20Rnd_B_AA12_HE : CA_Magazine COMBINE_MAG }; }; + //Saiga12 Ammo class 8Rnd_B_Saiga12_74Slug: CA_Magazine { @@ -216,4 +211,4 @@ class 20Rnd_B_Usas12_Pellets: 8Rnd_B_Saiga12_Pellets { displayName = $STR_DZ_MAG_20RND_USAS12_PELLETS_NAME; descriptionShort = $STR_DZ_MAG_20RND_USAS12_PELLETS_DESC; count = 20; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp index 2b79bba70..928db6494 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp @@ -16,6 +16,7 @@ class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 { displayName = $STR_DZ_MAG_200RND_M240_NAME; count = 200; descriptionShort = $STR_DZ_MAG_200RND_M240_DESC; + class ItemActions { delete CombineMag; @@ -95,7 +96,7 @@ class 200Rnd_762x54_GPMG: 200Rnd_762x54_PKT ammo = "B_762x51_Ball"; }; class 29Rnd_30mm_AGS30 : Vehicle_ammo_base { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_29RND_AGS30_NAME; descriptionShort = $STR_DZ_MAG_29RND_AGS30_DESC; model = "\z\addons\dayz_epoch\models\30mm_mag.p3d"; @@ -120,7 +121,7 @@ class 400Rnd_30mm_AGS17: 29Rnd_30mm_AGS30 }; class 48Rnd_40mm_MK19 : Vehicle_ammo_base { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_48RND_MK19_NAME; descriptionShort = $STR_DZ_MAG_48RND_MK19_DESC; model = "\z\addons\dayz_epoch\models\40mm_mag.p3d"; @@ -140,7 +141,7 @@ class 32Rnd_40mm_GMG: 48Rnd_40mm_MK19 class 4000Rnd_762x51_M134 : Vehicle_ammo_base { count = 4000; - scope = public; + scope = 2; displayName = $STR_DZ_MAG_4000RND_M134_NAME; descriptionShort = $STR_DZ_MAG_4000RND_M134_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_m134_mag_ca.paa"; @@ -166,7 +167,7 @@ class 2000Rnd_762x51_L94A1: 2000Rnd_762x51_M134 }; class 100Rnd_127x99_M2 : Vehicle_ammo_base { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_100RND_M2_NAME; descriptionShort = $STR_DZ_MAG_100RND_M2_DESC; model = "\z\addons\dayz_epoch\models\50cal_mag.p3d"; @@ -181,7 +182,7 @@ class 100Rnd_127x99_M2 : Vehicle_ammo_base { }; class 50Rnd_127x107_DSHKM : Vehicle_ammo_base { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_50RND_DSHKM_NAME; descriptionShort = $STR_DZ_MAG_50RND_DSHKM_DESC; picture = "\z\addons\dayz_epoch\pictures\equip_Dshkm_mag_ca.paa"; @@ -196,7 +197,7 @@ class 50Rnd_127x107_DSHKM : Vehicle_ammo_base { }; class 150Rnd_127x107_DSHKM : 50Rnd_127x107_DSHKM { - scope = public; + scope = 2; displayName = $STR_DZ_MAG_150RND_DSHKM_NAME; descriptionShort = $STR_DZ_MAG_150RND_DSHKM_DESC; count = 150; @@ -267,8 +268,7 @@ class pook_12Rnd_Grenade_Camel: Vehicle_ammo_base maxLeadSpeed = 200; nameSound = "grenade"; picture = "\z\addons\dayz_epoch\pictures\equip_40mm_mag_ca.paa"; - model = "\z\addons\dayz_epoch\models\40mm_mag.p3d"; - + model = "\z\addons\dayz_epoch\models\40mm_mag.p3d"; }; //mozzie diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp index f90f46687..e593b8264 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp @@ -1,9 +1,8 @@ class ItemAntibiotic_base : CA_Magazine { - scope = private; + scope = 0; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\med_antibiotic_gear.p3d"; picture = "\dayz_equip\textures\equip_antibiotics_ca.paa"; displayName = $STR_EQUIP_NAME_17; @@ -11,7 +10,7 @@ class ItemAntibiotic_base : CA_Magazine class ItemAntibiotic : ItemAntibiotic_base { - scope = public; + scope = 2; descriptionShort = $STR_EQUIP_DESC_17; class medical @@ -109,7 +108,7 @@ class ItemAntibiotic1 : ItemAntibiotic class ItemAntibioticEmpty : ItemAntibiotic_base { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_ANTIBIOTICS_EMPTY; descriptionShort = $STR_EQUIP_DESC_54; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp index 88ddc85b2..3887e2a07 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp @@ -1,15 +1,14 @@ class bloodBagBase : CA_Magazine { - scope = private; + scope = 0; count = 1; - type = WeaponSlotItem; - + type = 256; picture = "\z\addons\dayz_communityassets\pictures\equip_bbag_full_ca.paa"; }; class bloodBagANEG : bloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_bloodBagANEG; model = "z\addons\dayz_communityassets\models\bbag_full_m_A.p3d"; descriptionShort = $STR_BLD_desc_bloodBagANEG; @@ -17,7 +16,7 @@ class bloodBagANEG : bloodBagBase class bloodBagAPOS : bloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_bloodBagAPOS; model = "z\addons\dayz_communityassets\models\bbag_full_p_A.p3d"; descriptionShort = $STR_BLD_desc_bloodBagAPOS; @@ -25,7 +24,7 @@ class bloodBagAPOS : bloodBagBase class bloodBagBNEG : bloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_bloodBagBNEG; model = "z\addons\dayz_communityassets\models\bbag_full_m_B.p3d"; descriptionShort = $STR_BLD_desc_bloodBagBNEG; @@ -33,7 +32,7 @@ class bloodBagBNEG : bloodBagBase class bloodBagBPOS : bloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_bloodBagBPOS; model = "z\addons\dayz_communityassets\models\bbag_full_p_B.p3d"; descriptionShort = $STR_BLD_desc_bloodBagBPOS; @@ -41,7 +40,7 @@ class bloodBagBPOS : bloodBagBase class bloodBagABNEG : bloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_bloodBagABNEG; model = "z\addons\dayz_communityassets\models\bbag_full_m_AB.p3d"; descriptionShort = $STR_BLD_desc_bloodBagABNEG; @@ -49,7 +48,7 @@ class bloodBagABNEG : bloodBagBase class bloodBagABPOS : bloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_bloodBagABPOS; model = "z\addons\dayz_communityassets\models\bbag_full_p_AB.p3d"; descriptionShort = $STR_BLD_desc_bloodBagABPOS; @@ -57,7 +56,7 @@ class bloodBagABPOS : bloodBagBase class bloodBagONEG : bloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_bloodBagONEG; model = "z\addons\dayz_communityassets\models\bbag_full_m_O.p3d"; descriptionShort = $STR_BLD_desc_bloodBagONEG; @@ -65,7 +64,7 @@ class bloodBagONEG : bloodBagBase class bloodBagOPOS : bloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_bloodBagOPOS; model = "z\addons\dayz_communityassets\models\bbag_full_p_O.p3d"; descriptionShort = $STR_BLD_desc_bloodBagOPOS; @@ -86,56 +85,56 @@ class wholeBloodBagBase : bloodBagBase class wholeBloodBagANEG : wholeBloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_wholeBloodBagANEG; model = "z\addons\dayz_communityassets\models\bbag_full_m_A.p3d"; descriptionShort = $STR_BLD_desc_wholeBloodBagANEG; }; class wholeBloodBagAPOS : wholeBloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_wholeBloodBagAPOS; model = "z\addons\dayz_communityassets\models\bbag_full_p_A.p3d"; descriptionShort = $STR_BLD_desc_wholeBloodBagAPOS; }; class wholeBloodBagBNEG : wholeBloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_wholeBloodBagBNEG; model = "z\addons\dayz_communityassets\models\bbag_full_m_B.p3d"; descriptionShort = $STR_BLD_desc_wholeBloodBagBNEG; }; class wholeBloodBagBPOS : wholeBloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_wholeBloodBagBPOS; model = "z\addons\dayz_communityassets\models\bbag_full_p_B.p3d"; descriptionShort = $STR_BLD_desc_wholeBloodBagBPOS; }; class wholeBloodBagABNEG : wholeBloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_wholeBloodBagABNEG; model = "z\addons\dayz_communityassets\models\bbag_full_m_AB.p3d"; descriptionShort = $STR_BLD_desc_wholeBloodBagABNEG; }; class wholeBloodBagABPOS : wholeBloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_wholeBloodBagABPOS; model = "z\addons\dayz_communityassets\models\bbag_full_p_AB.p3d"; descriptionShort = $STR_BLD_desc_wholeBloodBagABPOS; }; class wholeBloodBagONEG : wholeBloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_wholeBloodBagONEG; model = "z\addons\dayz_communityassets\models\bbag_full_m_O.p3d"; descriptionShort = $STR_BLD_desc_wholeBloodBagONEG; }; class wholeBloodBagOPOS : wholeBloodBagBase { - scope = public; + scope = 2; displayName = $STR_BLD_name_wholeBloodBagOPOS; model = "z\addons\dayz_communityassets\models\bbag_full_p_O.p3d"; descriptionShort = $STR_BLD_desc_wholeBloodBagOPOS; @@ -144,10 +143,9 @@ class wholeBloodBagOPOS : wholeBloodBagBase //MISC tools needed class bloodTester : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\blood_test.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_blood_test_ca.paa"; displayName = $STR_BLD_name_bloodTester; @@ -165,10 +163,9 @@ class bloodTester : CA_Magazine class transfusionKit : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\blood_transfuse.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bloodbag_transfuse_CA.paa"; displayName = $STR_BLD_name_transfusionKit; @@ -186,10 +183,9 @@ class transfusionKit : CA_Magazine class emptyBloodBag : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\bbag_empty.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bbag_empty_ca.paa"; displayName = $STR_BLD_name_emptyBloodBag; @@ -208,15 +204,18 @@ class emptyBloodBag : CA_Magazine //Classic blood bag class ItemBloodbag: CA_Magazine { - scope = public; + scope = 2; count = 1; type = 256; displayName = "$STR_EQUIP_NAME_16"; model = "\dayz_equip\models\bloodbag.p3d"; picture = "\dayz_equip\textures\equip_bloodbag_ca.paa"; descriptionShort = "$STR_EQUIP_DESC_16"; - class ItemActions { - class use { + + class ItemActions + { + class Use + { text = $STR_BLD_use; script = "spawn player_useMeds;"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp index e5a411a8f..da9870c62 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp @@ -4,10 +4,9 @@ class ItemAntibacterialWipe : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotHandGunItem; - + type = 16; model = "\z\addons\dayz_communityassets\models\antiseptic.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_antiseptic_ca.paa"; displayName = $STR_ITEM_NAME_WIPES; @@ -25,10 +24,9 @@ class ItemAntibacterialWipe : CA_Magazine class ItemBandage : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotHandGunItem; - + type = 16; model = "\dayz_equip\models\fad.p3d"; picture = "\dayz_equip\textures\equip_fad_ca.paa"; displayName = $STR_EQUIP_NAME_7; @@ -56,10 +54,9 @@ class ItemBandage : CA_Magazine class ItemSepsisBandage : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotHandGunItem; - + type = 16; model = "\dayz_equip\models\fad.p3d"; picture = "\dayz_equip\textures\equip_fad_ca.paa"; displayName = $STR_EQUIP_NAME_SEPSISBANDAGE; @@ -77,10 +74,9 @@ class ItemSepsisBandage : CA_Magazine class ItemEpinephrine : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\epi.p3d"; picture = "\dayz_equip\textures\equip_epi_ca.paa"; displayName = $STR_EQUIP_NAME_14; @@ -89,10 +85,9 @@ class ItemEpinephrine : CA_Magazine class ItemMorphine : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\morphine.p3d"; picture = "\dayz_equip\textures\equip_morphine_ca.paa"; displayName = $STR_EQUIP_NAME_15; @@ -110,10 +105,9 @@ class ItemMorphine : CA_Magazine class ItemHeatPack : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\Heat_pack.p3d"; picture = "\dayz_equip\textures\equip_heat_pack_ca.paa"; displayName = $STR_EQUIP_NAME_42; @@ -130,7 +124,7 @@ class ItemHeatPack : CA_Magazine }; class equip_woodensplint : CA_Magazine { - scope = public; + scope = 2; count = 1; displayName = $STR_ITEM_NAME_WOODENSPLINT; descriptionShort = $STR_ITEM_DESC_WOODENSPLINT; @@ -138,16 +132,19 @@ class equip_woodensplint : CA_Magazine { picture = "\z\addons\dayz_communityassets\pictures\equip_woodensplint_ca.paa"; type = 256; - class ItemActions { - class Use { + class ItemActions + { + class Use + { text = $STR_ACTIONS_BRACE_LEG; script = "spawn player_useMeds;"; }; }; }; -class equip_gauze : CA_Magazine { - scope = public; +class equip_gauze : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_gauze; descriptionShort = $STR_ITEM_DESC_equip_gauze; @@ -170,8 +167,9 @@ class equip_gauze : CA_Magazine { }; }; -class equip_gauzepackaged : CA_Magazine { - scope = public; +class equip_gauzepackaged : CA_Magazine +{ + scope = 2; count = 1; displayName = $STR_ITEM_NAME_equip_gauzepackaged; descriptionShort = $STR_ITEM_DESC_equip_gauzepackaged; @@ -194,9 +192,11 @@ class equip_gauzepackaged : CA_Magazine { }; }; -class equip_herb_box : CA_Magazine { - scope = public; +class equip_herb_box : CA_Magazine +{ + scope = 2; count = 1; + type = 256; displayName = $STR_EQUIP_NAME_HERBBOX; descriptionShort = $STR_EQUIP_DESC_HERBBOX; model = "\z\addons\dayz_communityassets\models\herb_box.p3d"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp index 23638d07a..e2b6e7ddb 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp @@ -1,9 +1,8 @@ class ItemPainkiller : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\med_painkiller_gear.p3d"; picture = "\dayz_equip\textures\equip_painkiller_ca.paa"; displayName = $STR_EQUIP_NAME_18; @@ -104,12 +103,11 @@ class ItemPainkiller1 : ItemPainkiller class ItemPainkillerEmpty : CA_Magazine { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_PAINKILLER_EMPTY; descriptionShort = $STR_EQUIP_DESC_PAINKILLER_EMPTY; count = 1; - type = WeaponSlotItem; - + type = 256; model = "\dayz_equip\models\med_painkiller_gear.p3d"; picture = "\dayz_equip\textures\equip_painkiller_ca.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp index 9a242a8bb..94549e640 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp @@ -1,21 +1,18 @@ class TrashJackDaniels : HandGrenade { - scope = public; - + scope = 2; model = "\dayz_equip\models\bottle_jd.p3d"; picture = "\dayz_equip\textures\equip_bottle_jd_ca.paa"; displayName = $STR_EQUIP_NAME_34; - descriptionShort = $STR_EQUIP_DESC_34; - + descriptionShort = $STR_EQUIP_DESC_34; ammo = "JackDaniels"; }; class ItemTrashRazor : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\razor.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_razor_CA.paa"; displayName = $STR_JUNK_NAME_RAZOR; @@ -24,10 +21,9 @@ class ItemTrashRazor : CA_Magazine class ItemTrashToiletpaper : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\toiletpaper.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_toiletpaper_CA.paa"; displayName = $STR_JUNK_NAME_TOILETPAPER; @@ -36,10 +32,9 @@ class ItemTrashToiletpaper : CA_Magazine class FoodChipsSulahoopsEmpty : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\bag_chips_small_sulahoops_opened.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_sulahoops_opened_ca.paa"; displayName = $STR_FOOD_NAME_CHIPS_EMPTY; @@ -48,10 +43,9 @@ class FoodChipsSulahoopsEmpty : CA_Magazine class FoodChipsMysticalesEmpty : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\bag_chips_small_mysticales_opened.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_mysticales_opened_ca.paa"; displayName = $STR_FOOD_NAME_CHIPS_EMPTY; @@ -60,10 +54,9 @@ class FoodChipsMysticalesEmpty : CA_Magazine class FoodChipsChocolateEmpty : CA_Magazine { - scope = public; + scope = 2; count = 1; - type = WeaponSlotItem; - + type = 256; model = "z\addons\dayz_communityassets\models\bag_chips_small_chocolate_opened.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_chocolate_empty_ca.paa"; displayName = $STR_FOOD_NAME_CHIPS_EMPTY; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Trash/TinCan.hpp b/SQF/dayz_code/Configs/CfgMagazines/Trash/TinCan.hpp index 569adf831..4bafe6f86 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Trash/TinCan.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Trash/TinCan.hpp @@ -1,11 +1,3 @@ -/*class FoodCanLongSpratsEmpty : TrashTinCan -{ - model = "z\addons\dayz_communityassets\models\can_long_sprat_clean_empty_co.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_can_long_sprat_clean_empty_ca.paa"; - displayName = $STR_FOOD_NAME_CAN_EMPTY; - descriptionShort = $STR_FOOD_DESC_CAN_EMPTY; -};*/ - class FoodCanBeefEmpty : TrashTinCan { model = "z\addons\dayz_communityassets\models\can_beef_clean_empty.p3d"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp b/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp index 9bd268e48..97f4e3fbe 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp @@ -1,12 +1,10 @@ class ItemSodaEmpty : HandGrenade { - scope = public; - + scope = 2; model = "\dayz_equip\models\soda_coke_e.p3d"; picture = "\dayz_equip\textures\equip_soda_empty_ca.paa"; displayName = $STR_EQUIP_NAME_35; - descriptionShort = $STR_EQUIP_DESC_35; - + descriptionShort = $STR_EQUIP_DESC_35; ammo = "SodaCan"; class ItemActions @@ -16,7 +14,8 @@ class ItemSodaEmpty : HandGrenade text = $STR_ACTIONS_DRINK2; script = ";[_id] spawn player_fillWater;"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_MELT_BARS; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; @@ -29,13 +28,11 @@ class ItemSodaEmpty : HandGrenade class TrashTinCan : HandGrenade { - scope = public; - + scope = 2; model = "\dayz_equip\models\trash_tincan.p3d"; picture = "\dayz_equip\textures\equip_tincan_ca.paa"; displayName = $STR_EQUIP_NAME_33; - descriptionShort = $STR_EQUIP_DESC_33; - + descriptionShort = $STR_EQUIP_DESC_33; ammo = "TinCan"; class ItemActions @@ -45,7 +42,8 @@ class TrashTinCan : HandGrenade text = $STR_ACTIONS_DRINK2; script = ";[_id] spawn player_fillWater;"; }; - class Crafting { + class Crafting + { text = $STR_EPOCH_MELT_BARS; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"fire"}; diff --git a/SQF/dayz_code/Configs/CfgMarkers.hpp b/SQF/dayz_code/Configs/CfgMarkers.hpp index 073cde698..2a6106e13 100644 --- a/SQF/dayz_code/Configs/CfgMarkers.hpp +++ b/SQF/dayz_code/Configs/CfgMarkers.hpp @@ -6,7 +6,7 @@ class CfgMarkers color[] = {1, 0, 0, 1}; size = 32; shadow = true; - scope = private; + scope = 0; }; class Cricle02 { name = "Marker description"; @@ -14,7 +14,7 @@ class CfgMarkers color[] = {1, 0, 0, 1}; size = 32; shadow = true; - scope = private; + scope = 0; }; class Cross01 { name = "Marker description"; @@ -22,7 +22,7 @@ class CfgMarkers color[] = {1, 0, 0, 1}; size = 32; shadow = true; - scope = private; + scope = 0; }; class Cross02 { name = "Marker description"; @@ -30,7 +30,7 @@ class CfgMarkers color[] = {1, 0, 0, 1}; size = 32; shadow = true; - scope = private; + scope = 0; }; class Questionmark { name = "Marker description"; @@ -38,6 +38,6 @@ class Questionmark { color[] = {1, 0, 0, 1}; size = 32; shadow = true; - scope = private; + scope = 0; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgNonAIVehicles.hpp b/SQF/dayz_code/Configs/CfgNonAIVehicles.hpp index a7dc7c139..bf03464bd 100644 --- a/SQF/dayz_code/Configs/CfgNonAIVehicles.hpp +++ b/SQF/dayz_code/Configs/CfgNonAIVehicles.hpp @@ -35,27 +35,27 @@ class CfgNonAIVehicles { class StreetLamp_BaseWeakYellow : StreetLamp { brightness = 0.3; - scope = public; + scope = 2; }; class StreetLamp_BaseMediumOrange : StreetLamp { brightness = 0.3; - scope = public; + scope = 2; }; class StreetLamp_BaseMediumPale : StreetLamp { brightness = 0.3; - scope = public; + scope = 2; }; class StreetLamp_BaseStrongPale : StreetLamp { brightness = 0.3; - scope = public; + scope = 2; }; class Land_Lamp_Small_EP1 : StreetLamp { brightness = 0; - scope = public; + scope = 2; class HitPoints { class HitBulb { armor = 1; @@ -80,7 +80,7 @@ class CfgNonAIVehicles { class Land_Lamp_Street1_EP1 : StreetLamp { brightness = 0; - scope = public; + scope = 2; class HitPoints { class HitBulb { armor = 1; @@ -105,7 +105,7 @@ class CfgNonAIVehicles { class Land_Lamp_Street2_EP1 : StreetLamp { brightness = 0; - scope = public; + scope = 2; class HitPoints { class HitBulb { armor = 1; @@ -130,7 +130,7 @@ class CfgNonAIVehicles { class Land_Lampa_Ind_EP1 : StreetLamp { brightness = 0; - scope = public; + scope = 2; class HitPoints { class HitBulb { armor = 1; @@ -155,7 +155,7 @@ class CfgNonAIVehicles { class Land_PowLines_Conc2L_EP1 : StreetLamp { brightness = 0; - scope = public; + scope = 2; class HitPoints { class HitBulb { armor = 1; @@ -179,7 +179,7 @@ class CfgNonAIVehicles { }; class Land_lampa_sidl : StreetLamp { - scope = public; + scope = 2; model = "\ca\buildings\Misc\lampa_sidl"; class HitPoints { class HitBulb { @@ -204,7 +204,7 @@ class CfgNonAIVehicles { }; class Land_lampa_sidl_2 : StreetLamp { - scope = public; + scope = 2; model = "\ca\buildings\Misc\lampa_sidl_2"; class HitPoints { class HitBulb { @@ -229,7 +229,7 @@ class CfgNonAIVehicles { }; class Land_lampa_sidl_3 : StreetLamp { - scope = public; + scope = 2; model = "\ca\buildings\Misc\lampa_sidl_3"; class HitPoints { class HitBulb { @@ -254,7 +254,7 @@ class CfgNonAIVehicles { }; class Land_lampa_ind : StreetLamp { - scope = public; + scope = 2; model = "\ca\buildings\Misc\lampa_ind"; class HitPoints { class HitBulb { @@ -279,7 +279,7 @@ class CfgNonAIVehicles { }; class Land_lampa_ind_zebr : StreetLamp { - scope = public; + scope = 2; model = "\ca\buildings\Misc\lampa_ind_zebr"; class HitPoints { class HitBulb { diff --git a/SQF/dayz_code/Configs/CfgVehicles/Animal.hpp b/SQF/dayz_code/Configs/CfgVehicles/Animal.hpp index 15f3412c1..8a0d1f481 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Animal.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Animal.hpp @@ -24,7 +24,7 @@ class CAAnimalBase: Animal }; class Pastor: CAAnimalBase { - scope = public; + scope = 2; side = 1; model = "\ca\animals2\Dogs\Pastor\Pastor"; displayName = "Alsatian"; @@ -45,7 +45,7 @@ class Pastor: CAAnimalBase { }; class Fin: CAAnimalBase { - scope = public; + scope = 2; model = "\ca\animals2\Dogs\Fin\Fin"; displayName = "Fin"; moves = "CfgMovesDogDZ"; @@ -56,7 +56,7 @@ class Fin: CAAnimalBase { class Cow: CAAnimalBase { - scope = private; + scope = 0; model = "\ca\animals2\cow\cow"; displayName = "$STR_DN_COW"; moves = "CfgMovesCow"; @@ -89,7 +89,7 @@ class Cow: CAAnimalBase }; class Cow01: Cow { - scope = public; + scope = 2; accuracy = 1000; model = "\ca\animals2\cow\cow"; displayName = "$STR_DN_COW01"; @@ -115,7 +115,7 @@ class Cow01_EP1 : Cow_Base_EP1 {}; class Goat: CAAnimalBase { - scope = public; + scope = 2; model = "\ca\animals2\Goat\Goat"; displayName = "$STR_DN_GOAT"; moves = "CfgMovesGoat"; @@ -143,7 +143,7 @@ class Goat02_EP1 : Goat01_EP1 {}; class Rabbit: CAAnimalBase { - scope = public; + scope = 2; side = 3; model = "\ca\animals2\rabbit\rabbit"; displayName = "$STR_DN_RABBIT"; @@ -177,7 +177,7 @@ class Rabbit: CAAnimalBase class Sheep: CAAnimalBase { - scope = public; + scope = 2; model = "\ca\animals2\Sheep\Sheep"; displayName = "$STR_DN_SHEEP"; moves = "CfgMovesSheep"; @@ -206,7 +206,7 @@ class Sheep02_EP1 : Sheep01_EP1 {}; class WildBoar: CAAnimalBase { - scope = public; + scope = 2; model = "\ca\animals2\WildBoar\WildBoar"; displayName = "$STR_DN_WILDBOAR"; moves = "CfgMovesWildBoar"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp index 7e683a812..9f02a3b3c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp @@ -1,6 +1,6 @@ class ReammoBox_EP1; // External class reference class Bag_Base_EP1 : ReammoBox_EP1 { - scope = private; + scope = 0; class TransportMagazines {}; @@ -156,7 +156,7 @@ class DZ_Backpack_EP1: Bag_Base_EP1 class DZ_LargeGunBag_EP1: Bag_Base_EP1 { - scope = public; + scope = 2; displayName = $STR_EPOCH_PACK_LGB; descriptionShort = $STR_EPOCH_PACK_DESC_LGB; model = "\ca\weapons_e\AmmoBoxes\StaticX.p3d"; @@ -172,7 +172,7 @@ class DZ_LargeGunBag_EP1: Bag_Base_EP1 }; class DZ_GunBag_EP1: Bag_Base_EP1 { - scope = public; + scope = 2; displayName = $STR_EPOCH_PACK_GB; descriptionShort = $STR_EPOCH_PACK_DESC_GB; model = "\ca\weapons_e\AmmoBoxes\StaticY.p3d"; @@ -188,7 +188,7 @@ class DZ_GunBag_EP1: Bag_Base_EP1 }; class DZ_CompactPack_EP1: Bag_Base_EP1 { - scope = public; + scope = 2; displayName = $STR_EPOCH_PACK_COMPACT; descriptionShort = $STR_EPOCH_PACK_DESC_COMPACT; picture = "\ca\weapons_e\data\icons\backpack_RPG_CA.paa"; @@ -204,7 +204,7 @@ class DZ_CompactPack_EP1: Bag_Base_EP1 }; class DZ_TerminalPack_EP1: Bag_Base_EP1 { - scope = public; + scope = 2; displayName = $STR_EPOCH_PACK_TERMINAL; descriptionShort = $STR_EPOCH_PACK_DESC_TERMINAL; picture = "\dayz_epoch_c\icons\backpacks\terminalpack.paa"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATVs.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATVs.hpp index 763984af2..f2b2437fe 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATVs.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATVs.hpp @@ -3,7 +3,7 @@ class ATV_CZ_EP1_DZE: ATV_CZ_EP1 { crew = ""; displayname = $STR_VEH_NAME_ATV_BEIGE; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -15,7 +15,7 @@ class BAF_ATV_W_DZE: BAF_ATV_W { crew = ""; displayname = $STR_VEH_NAME_ATV_GREEN; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -27,7 +27,7 @@ class ATV_CIV_CP_DZE: ATV_CIV_CP { crew = ""; displayname = $STR_VEH_NAME_ATV_WHITE; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -39,7 +39,7 @@ class ATV_CIV_Grey_CP_DZE: ATV_CIV_Grey_CP { crew = ""; displayname = $STR_VEH_NAME_ATV_GREY; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -51,7 +51,7 @@ class ATV_CIV_Red_CP_DZE: ATV_CIV_Red_CP { crew = ""; displayname = $STR_VEH_NAME_ATV_RED; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -62,7 +62,7 @@ class ATV_CIV_Green_CP; class ATV_CIV_Green_CP_DZE: ATV_CIV_Green_CP { crew = ""; displayname = $STR_VEH_NAME_ATV_LIGHTGREEN; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -74,7 +74,7 @@ class ATV_CIV_Blue_CP_DZE: ATV_CIV_Blue_CP { crew = ""; displayname = $STR_VEH_NAME_ATV_BLUE; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -85,7 +85,7 @@ class ATV_CIV_Yellow_CP; class ATV_CIV_Yellow_CP_DZE: ATV_CIV_Yellow_CP { crew = ""; displayname = $STR_VEH_NAME_ATV_YELLOW; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -97,7 +97,7 @@ class ATV_CIV_Purple_CP_DZE: ATV_CIV_Purple_CP { crew = ""; displayname = $STR_VEH_NAME_ATV_PURPLE; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -109,7 +109,7 @@ class ATV_CIV_Black_CP_DZE: ATV_CIV_Black_CP { crew = ""; displayname = $STR_VEH_NAME_ATV_BLACK; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/Bikes.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Bikes.hpp index 9058400ee..93c15b314 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/Bikes.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Bikes.hpp @@ -19,7 +19,7 @@ class Old_bike_base_EP1 : Bicycle class Old_bike_TK_CIV_EP1; class Old_bike_TK_CIV_EP1_DZE: Old_bike_TK_CIV_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BIKE_OLD; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -31,7 +31,7 @@ class Old_bike_TK_CIV_EP1_DZE: Old_bike_TK_CIV_EP1 { class MMT_Civ; class MMT_Civ_DZE: MMT_Civ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BIKE_MOUNTAINBIKE; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/Motorbikes.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Motorbikes.hpp index d36bcdc4b..b1d60d9f4 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/Motorbikes.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Motorbikes.hpp @@ -1,6 +1,6 @@ class Old_moto_TK_Civ_EP1; class Old_moto_TK_Civ_EP1_DZE : Old_moto_TK_Civ_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_MOTORBIKE_WHITE; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -12,7 +12,7 @@ class Old_moto_TK_Civ_EP1_DZE : Old_moto_TK_Civ_EP1 { class TT650_Civ; class TT650_Civ_DZE: TT650_Civ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_MOTORBIKE_TT650_REDWHITE; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -24,7 +24,7 @@ class TT650_Civ_DZE: TT650_Civ { class TT650_TK_CIV_EP1; class TT650_TK_CIV_EP1_DZE: TT650_TK_CIV_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_MOTORBIKE_TT650_RUSTY; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -36,7 +36,7 @@ class TT650_TK_CIV_EP1_DZE: TT650_TK_CIV_EP1 { class TT650_Ins; class TT650_Ins_DZE: TT650_Ins { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_MOTORBIKE_TT650_FIRERED; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -48,7 +48,7 @@ class TT650_Ins_DZE: TT650_Ins { class M1030_US_DES_EP1; class M1030_US_DES_EP1_DZE: M1030_US_DES_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_MOTORBIKE_M1030_GREEN; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Blood_Trail_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Blood_Trail_DZ.hpp index f5c747c95..dd362a2f3 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Blood_Trail_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Blood_Trail_DZ.hpp @@ -1,5 +1,5 @@ class Blood_Trail : House { - scope = private; + scope = 0; displayName = ""; accuracy = 0.1; // accuracy needed to recognize type of this target vehicleClass = "DayZ Epoch Buildings"; @@ -13,7 +13,7 @@ class Blood_Trail : House { placement = "slope"; }; class Blood_Trail_DZ : Blood_Trail { - scope = public; + scope = 2; animated = 0; destrType = "DestructNo"; mapSize = 2; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/Fishing_Boat.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/Fishing_Boat.hpp index 853f330b0..519a7ecb1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/Fishing_Boat.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/Fishing_Boat.hpp @@ -1,6 +1,6 @@ class Fishing_Boat; class Fishing_Boat_DZE: Fishing_Boat { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_FISHING_BOAT; vehicleClass = "DayZ Epoch Vehicles"; armor = 10; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/PBX.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/PBX.hpp index f445fe052..9d150c8b9 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/PBX.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/PBX.hpp @@ -1,6 +1,6 @@ class PBX; class PBX_DZE: PBX { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_PBX; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -16,7 +16,7 @@ class PBX_DZE: PBX { class Zodiac; class Zodiac_DZE: Zodiac { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_CRRC; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp index 160da4f3d..3438eb093 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp @@ -1,7 +1,7 @@ class RHIB; class RHIB_DZ : RHIB { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_RHIB_M2; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -103,7 +103,7 @@ class RHIB_DZE : RHIB_DZ class RHIB2Turret; class RHIB2Turret_DZ : RHIB2Turret { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_RHIB_MK19; enablemanualfire = 0; enableGPS = 0; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/Seafox.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/Seafox.hpp index 8916d8d38..1f2db8a22 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/Seafox.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/Seafox.hpp @@ -1,6 +1,6 @@ class SeaFox; class SeaFox_DZE: SeaFox { - scope = public; + scope = 2; displayname = $STR_DN_SEAFOX; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp index 48aedd78c..a0ff1720a 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp @@ -1,7 +1,7 @@ class Smallboat_1; class Smallboat_1_DZE: Smallboat_1 { - scope = public; + scope = 2; displayName = "$STR_DN_SMALLBOATA"; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Doors.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Doors.hpp index e44a2442e..6aab5c888 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Doors.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Doors.hpp @@ -1,6 +1,6 @@ /* Again your very own basic definition*/ class DZE_Base_Object : All { - scope = private; + scope = 0; side = 3; icon = "\ca\data\data\Unknown_object.paa"; nameSound = "object"; @@ -68,7 +68,7 @@ class DZE_Base_Object : All { /* Your very own base class for buildings*/ class DZE_Housebase : DZE_Base_Object { - scope = protected; + scope = 1; model = ""; icon = ""; displayName = ""; @@ -96,7 +96,7 @@ class Land_DZE_WoodDoor_Base: DZE_Housebase { accuracy = 1000; armor = 2200; /* "Lifepoints", if you like to call it that way.*/ destrType = "DestructBuilding"; /* type of destruction, when armor = 0 */ - scope = public; /* Display it in the editor? 1 = No, 2 = Yes */ + scope = 2; /* Display it in the editor? 1 = No, 2 = Yes */ offset[] = {0,1.5,0}; class DestructionEffects : DestructionEffects { @@ -126,7 +126,7 @@ class Land_DZE_WoodDoorLocked_Base: DZE_Housebase { accuracy = 1000; armor = 2500; /* "Lifepoints", if you like to call it that way.*/ destrType = "DestructBuilding"; /* type of destruction, when armor = 0 */ - scope = public; /* Display it in the editor? 1 = No, 2 = Yes */ + scope = 2; /* Display it in the editor? 1 = No, 2 = Yes */ offset[] = {0,1.5,0}; class DestructionEffects : DestructionEffects { @@ -154,7 +154,7 @@ class CinderWallDoor_DZ_Base: DZE_Housebase { accuracy = 1000; armor = 4000; /* "Lifepoints", if you like to call it that way.*/ destrType = "DestructBuilding"; /* type of destruction, when armor = 0 */ - scope = public; /* Display it in the editor? 1 = No, 2 = Yes */ + scope = 2; /* Display it in the editor? 1 = No, 2 = Yes */ offset[] = {0,1.5,0}; maintainBuilding[] = {{"MortarBucket",1}}; class DestructionEffects : DestructionEffects @@ -181,7 +181,7 @@ class CinderWallDoorLocked_DZ_Base: DZE_Housebase { accuracy = 1000; armor = 4000; /* "Lifepoints", if you like to call it that way.*/ destrType = "DestructBuilding"; /* type of destruction, when armor = 0 */ - scope = public; /* Display it in the editor? 1 = No, 2 = Yes */ + scope = 2; /* Display it in the editor? 1 = No, 2 = Yes */ offset[] = {0,1.5,0}; maintainBuilding[] = {{"MortarBucket",1}}; lockable = 3; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Generator.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Generator.hpp index 294be9c2e..cb9e3be99 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Generator.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Generator.hpp @@ -1,13 +1,13 @@ class Generator_Base: Land_A_tent //Vanilla generator uses SkodaBase but is currently not functional { - scope = private; + scope = 0; model = "\dayz_equip\models\generator_gear.p3d"; picture = "\dayz_equip\textures\equip_generator_ca.paa"; displayName="Generator"; }; class Generator_DZ: Generator_Base { - scope = public; + scope = 2; transportMaxWeapons=0; transportmaxbackpacks = 0; transportMaxMagazines=10; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Misc.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Misc.hpp index 586f5ffe2..b935aaedb 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Misc.hpp @@ -1,7 +1,7 @@ // belt buckle - no idea what this is used for class Helper_Base_EP1; class BeltBuckle_DZE : Helper_Base_EP1 { - scope = public; + scope = 2; model = "\z\addons\dayz_epoch\models\skull.p3d"; displayName = "Belt Buckle"; accuracy = 1000; @@ -12,7 +12,7 @@ class BeltBuckle_DZE : Helper_Base_EP1 { // WorkBench_DZ class WorkBench_DZ: BuiltItems { - scope = public; + scope = 2; destrType = "DestructTree"; cost = 100; offset[] = {0,1.5,0}; @@ -31,7 +31,7 @@ class WorkBench_DZ: BuiltItems class FuelPump_DZ: BuiltItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,2,0}; @@ -82,7 +82,7 @@ class Plastic_Pole_EP1_DZ: Sign_1L_Noentry_EP1 coefInside = 4; coefInsideHeur = 4; - scope = public; + scope = 2; offset[] = {0,2.5,0.3}; displayName = $STR_EPOCH_PLAYER_246; vehicleClass = "DayZ Epoch Buildables"; @@ -95,7 +95,7 @@ class Land_covering_hut_EP1; class CanvasHut_DZ: Land_covering_hut_EP1 { armor = 200; - scope = public; + scope = 2; offset[] = {0,2.5,1}; displayName = $STR_EPOCH_CANVASSUNSHADE; vehicleClass = "DayZ Epoch Buildables"; @@ -104,7 +104,7 @@ class CanvasHut_DZ: Land_covering_hut_EP1 class Park_bench1; class ParkBench_DZ: Park_bench1 { - scope = public; + scope = 2; offset[] = {0,1.5,0.5}; displayName = $STR_EPOCH_WOODBENCH; vehicleClass = "DayZ Epoch Buildables"; @@ -115,7 +115,7 @@ class DesertCamoNet_DZ: Land_CamoNet_EAST_EP1 { armor = 300; destrType = "DestructNo"; - scope = public; + scope = 2; offset[] = {0,9,0}; displayName = $STR_EPOCH_DESERTCAMONET; vehicleClass = "DayZ Epoch Buildables"; @@ -126,7 +126,7 @@ class ForestCamoNet_DZ: Land_CamoNet_EAST { armor = 300; destrType = "DestructNo"; - scope = public; + scope = 2; offset[] = {0,9,0}; displayName = $STR_EPOCH_FORESTCAMONET; vehicleClass = "DayZ Epoch Buildables"; @@ -137,7 +137,7 @@ class DesertLargeCamoNet_DZ: Land_CamoNetB_EAST_EP1 { armor = 300; destrType = "DestructNo"; - scope = public; + scope = 2; offset[] = {0,9,0}; displayName = $STR_EPOCH_LARGEDESERTCAMONET; vehicleClass = "DayZ Epoch Buildables"; @@ -148,7 +148,7 @@ class DeerStand_DZ: Land_Misc_deerstand { armor = 300; // destrType = "DestructNo"; - scope = public; + scope = 2; offset[] = {0,5,0}; displayName = $STR_EPOCH_DEERSTAND; vehicleClass = "DayZ Epoch Buildables"; @@ -159,7 +159,7 @@ class ForestLargeCamoNet_DZ: Land_CamoNetB_EAST { armor = 300; destrType = "DestructNo"; - scope = public; + scope = 2; offset[] = {0,9,0}; displayName = $STR_EPOCH_LARGEFORESTCAMONET; vehicleClass = "DayZ Epoch Buildables"; @@ -170,7 +170,7 @@ class Land_Wall_Gate_Ind1_L; class MetalGate_DZ: Land_Wall_Gate_Ind1_L { armor = 400; - scope = public; + scope = 2; offset[] = {0,6,1}; displayName = $STR_EPOCH_RUSTYGATE; vehicleClass = "DayZ Epoch Buildables"; @@ -181,7 +181,7 @@ class Fence_corrugated_plate; class Fence_corrugated_DZ: Fence_corrugated_plate { armor = 600; - scope = public; + scope = 2; offset[] = {0,3,1}; removeoutput[] = {{"ItemCorrugated",1}}; displayName = $STR_EPOCH_CORRUGATEDFENCE; @@ -194,7 +194,7 @@ class StickFence_DZ: Wall_FenW2_6_EP1 { destrType = "DestructTree"; armor = 200; - scope = public; + scope = 2; offset[] = {0,4.5,0}; displayName = $STR_EPOCH_STICKFENCE; vehicleClass = "DayZ Epoch Buildables"; @@ -204,7 +204,7 @@ class ASC_EU_LHVOld; class LightPole_DZ: ASC_EU_LHVOld { armor = 200; - scope = public; + scope = 2; offset[] = {0,2.5,0}; displayName = $STR_EPOCH_LIGHTPOLE; vehicleClass = "DayZ Epoch Buildables"; @@ -216,7 +216,7 @@ class Scaffolding_DZ: Land_Misc_Scaffolding { armor = 100; destrType = "DestructBuilding"; - scope = public; + scope = 2; displayName = $STR_EPOCH_SCAFFOLDING; vehicleClass = "DayZ Epoch Buildables"; constructioncount = 6; @@ -234,7 +234,7 @@ class Scaffolding_DZ: Land_Misc_Scaffolding class Hedgehog_DZ: BuiltItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0.55}; @@ -252,7 +252,7 @@ class Hedgehog_DZ: BuiltItems }; class MetalPanel_DZ: BuiltItems { - scope = public; + scope = 2; destrType = "DestructTree"; cost = 100; offset[] = {0,2.5,0.5}; @@ -267,7 +267,7 @@ class MetalPanel_DZ: BuiltItems }; class Fort_RazorWire : BuiltItems { - scope = public; + scope = 2; animated = 0; vehicleClass = "DayZ Epoch Buildables"; model = "\ca\misc\Fort_Razorwire"; @@ -284,7 +284,7 @@ class Fort_RazorWire : BuiltItems { class Sandbag1_DZ: BuiltItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "\ca\misc2\BagFenceLong.p3d"; @@ -303,7 +303,7 @@ class Sandbag1_DZ: BuiltItems //review some of these settings class BagFenceRound_DZ: BuiltItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "\ca\misc2\BagFenceRound.p3d"; @@ -319,7 +319,7 @@ class BagFenceRound_DZ: BuiltItems }; class Land_HBarrier1_DZ : BuiltItems { - scope = public; + scope = 2; animated = 0; vehicleClass = "DayZ Epoch Buildables"; typicalCargo[] = {}; @@ -350,7 +350,7 @@ class Land_HBarrier3_DZ : BuiltItems { mapSize = 3.5; displayName = $STR_EQUIP_NAME_21_3XHBARRIER; GhostPreview = "Land_HBarrier3ePreview"; - scope = public; + scope = 2; animated = 0; vehicleClass = "DayZ Epoch Buildables"; typicalCargo[] = {}; @@ -377,7 +377,7 @@ class Land_HBarrier5_DZ:BuiltItems { mapSize = 7; displayName = $STR_EQUIP_NAME_21_5XHBARRIER; GhostPreview = "Land_HBarrier5Preview"; - scope = public; + scope = 2; animated = 0; vehicleClass = "DayZ Epoch Buildables"; typicalCargo[] = {}; @@ -399,7 +399,7 @@ class Land_HBarrier5_DZ:BuiltItems { }; class SandNest_DZ : BuiltItems { - scope = public; + scope = 2; model = "\ca\Misc_E\fortified_nest_small_ep1"; displayName = $STR_EQUIP_NAME_21_NEST; expansion = 1; @@ -427,7 +427,7 @@ class M240Nest_DZ: USMC_WarfareBMGNest_M240 { destrType = "DestructBuilding"; armor = 450; - scope = public; + scope = 2; offset[] = {0,3.5,0}; displayName = $STR_EPOCH_M240NEST; vehicleClass = "DayZ Epoch Buildables"; @@ -440,7 +440,7 @@ class M240Nest_DZ: USMC_WarfareBMGNest_M240 class WoodGate_DZ: BuiltItems { - scope = public; + scope = 2; destrType = "DestructTree"; //cost = 100; offset[] = {0,1.5,0.5}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuilding.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuilding.hpp index 419c92b91..2963eb91e 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuilding.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularBuilding.hpp @@ -28,7 +28,7 @@ class ModularItems: NonStrategic{ }; }; class MetalFloor_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,4,0}; @@ -51,7 +51,7 @@ class MetalFloor_DZ: ModularItems { }; }; class WoodRamp_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,4,0}; @@ -64,7 +64,7 @@ class WoodRamp_DZ: ModularItems { GhostPreview = "WoodRamp_Preview_DZ"; }; class CinderWallHalf_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,2,0}; @@ -90,7 +90,7 @@ class CinderWallHalf_DZ: ModularItems { }; }; class CinderWall_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,2,0}; @@ -116,7 +116,7 @@ class CinderWall_DZ: ModularItems { }; class CinderWallDoorway_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,2,0}; @@ -142,7 +142,7 @@ class CinderWallDoorway_DZ: ModularItems { }; }; class CinderWallSmallDoorway_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,2,0}; @@ -169,7 +169,7 @@ class CinderWallSmallDoorway_DZ: ModularItems { }; class WoodFloor_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,4,0}; @@ -194,7 +194,7 @@ class WoodFloor_DZ: ModularItems { }; }; class WoodFloorHalf_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,4,0}; @@ -220,7 +220,7 @@ class WoodFloorHalf_DZ: ModularItems { }; }; class WoodFloorQuarter_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,4,0}; @@ -247,7 +247,7 @@ class WoodFloorQuarter_DZ: ModularItems { }; class WoodLargeWall_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -273,7 +273,7 @@ class WoodLargeWall_DZ: ModularItems { }; class WoodLargeWallDoor_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -298,7 +298,7 @@ class WoodLargeWallDoor_DZ: ModularItems { }; }; class WoodLargeWallWin_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -323,7 +323,7 @@ class WoodLargeWallWin_DZ: ModularItems { }; class WoodSmallWall_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -348,7 +348,7 @@ class WoodSmallWall_DZ: ModularItems { }; }; class WoodSmallWallThird_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -373,7 +373,7 @@ class WoodSmallWallThird_DZ: ModularItems { }; }; class WoodSmallWallWin_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -397,7 +397,7 @@ class WoodSmallWallWin_DZ: ModularItems { }; }; class WoodSmallWallDoor_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -423,7 +423,7 @@ class WoodSmallWallDoor_DZ: ModularItems { }; }; class WoodStairs_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -438,7 +438,7 @@ class WoodStairs_DZ: ModularItems { GhostPreview = "WoodStairs_Preview_DZ"; }; class WoodLadder_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -454,7 +454,7 @@ class WoodLadder_DZ: ModularItems { }; class WoodStairsRails_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -469,7 +469,7 @@ class WoodStairsRails_DZ: ModularItems { }; class WoodStairsSans_DZ: ModularItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; offset[] = {0,1.5,0}; @@ -487,7 +487,7 @@ class WoodStairsSans_DZ: ModularItems { // Ghost previews class CinderWallSmallDoorway_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -499,7 +499,7 @@ class CinderWallSmallDoorway_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class CinderWallDoorway_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -511,7 +511,7 @@ class CinderWallDoorway_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class MetalFloor_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -523,7 +523,7 @@ class MetalFloor_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodRamp_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -536,7 +536,7 @@ class WoodRamp_Preview_DZ: NonStrategic { }; class CinderWallHalf_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -548,7 +548,7 @@ class CinderWallHalf_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class CinderWall_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -561,7 +561,7 @@ class CinderWall_Preview_DZ: NonStrategic { }; class WoodFloorQuarter_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -573,7 +573,7 @@ class WoodFloorQuarter_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodFloorHalf_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -585,7 +585,7 @@ class WoodFloorHalf_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodSmallWall_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -597,7 +597,7 @@ class WoodSmallWall_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodSmallWallThird_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -609,7 +609,7 @@ class WoodSmallWallThird_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodSmallWallWin_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -621,7 +621,7 @@ class WoodSmallWallWin_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodFloor_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -633,7 +633,7 @@ class WoodFloor_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodSmallWallDoor_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -645,7 +645,7 @@ class WoodSmallWallDoor_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodLargeWall_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -657,7 +657,7 @@ class WoodLargeWall_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodLargeWallDoor_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -669,7 +669,7 @@ class WoodLargeWallDoor_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodLargeWallWin_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -682,7 +682,7 @@ class WoodLargeWallWin_Preview_DZ: NonStrategic { }; class WoodStairs_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -694,7 +694,7 @@ class WoodStairs_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodStairsSans_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -707,7 +707,7 @@ class WoodStairsSans_Preview_DZ: NonStrategic { }; class WoodLadder_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -719,7 +719,7 @@ class WoodLadder_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class WoodDoor_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -731,7 +731,7 @@ class WoodDoor_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class LargeWoodDoor_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; @@ -743,7 +743,7 @@ class LargeWoodDoor_Preview_DZ: NonStrategic { vehicleClass = "DayZ Epoch Buildables"; }; class GarageWoodDoor_Preview_DZ: NonStrategic { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularWrecks.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularWrecks.hpp index 09144fc5f..960970a64 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularWrecks.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/ModularWrecks.hpp @@ -1,12 +1,12 @@ class Land_wood_wreck_frame : ruins { - scope = protected; + scope = 2; model = "\z\addons\dayz_epoch\models\wood_wreck_frame.p3d"; displayName = $STR_WOOD_WALL_WRECK; removeoutput[] = {{"PartWoodPlywood",{0,3}},{"PartWoodLumber",{0,3}}}; vehicleClass = "DayZ Epoch Buildables"; }; class Land_wood_wreck_third : ruins { - scope = protected; + scope = 2; model = "\z\addons\dayz_epoch\models\wood_wreck_third.p3d"; displayName = $STR_WOOD_WALL_WRECK; removeoutput[] = {{"PartWoodPlywood",{0,1}},{"PartWoodLumber",{0,1}}}; @@ -14,7 +14,7 @@ class Land_wood_wreck_third : ruins { }; class Land_wood_wreck_half : ruins { - scope = protected; + scope = 2; model = "\z\addons\dayz_epoch\models\wood_wreck_half.p3d"; displayName = $STR_WOOD_FLOOR_WRECK; removeoutput[] = {{"PartWoodPlywood",{0,1}},{"PartWoodLumber",{0,1}}}; @@ -22,7 +22,7 @@ class Land_wood_wreck_half : ruins { }; class Land_wood_wreck_floor : ruins { - scope = protected; + scope = 2; model = "\z\addons\dayz_epoch\models\wood_wreck_floor.p3d"; displayName = $STR_WOOD_FLOOR_WRECK; removeoutput[] = {{"PartWoodPlywood",{0,3}},{"PartWoodLumber",{0,3}}}; @@ -30,7 +30,7 @@ class Land_wood_wreck_floor : ruins { }; class Land_wood_wreck_quarter : ruins { - scope = protected; + scope = 2; model = "\z\addons\dayz_epoch\models\wood_wreck_quarter.p3d"; displayName = $STR_WOOD_FLOOR_WRECK; removeoutput[] = {{"PartWoodPlywood",{0,1}},{"PartWoodLumber",{0,1}}}; @@ -38,14 +38,14 @@ class Land_wood_wreck_quarter : ruins { }; class Land_wreck_cinder: ruins { - scope = protected; + scope = 2; model = "\z\addons\dayz_epoch\models\wreck_cinder.p3d"; displayName = $STR_CINDER_WALL_WRECK; removeoutput[] = {{"CinderBlocks",{0,1}}}; vehicleClass = "DayZ Epoch Buildables"; }; class Land_wreck_metal_floor: ruins { - scope = protected; + scope = 2; model = "\z\addons\dayz_epoch\models\wreck_metal_floor.p3d"; displayName = $STR_METAL_FLOOR_WRECK; removeoutput[] = {{"ItemPole",{0,2}},{"ItemTankTrap",{0,2}}}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Stashes.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Stashes.hpp index cf7af3fb0..f6f3d3209 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Stashes.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Stashes.hpp @@ -3,7 +3,7 @@ class StashSmall_base : DZ_storage_base { icon = "\Ca\misc3\data\Icons\icon_Atent_ca.paa"; mapsize = 3; model = "\z\addons\dayz_communityassets\models\stash_small.p3d"; - scope = public; + scope = 2; vehicleClass = "DayZ Epoch Buildables"; transportMaxMagazines = 12; transportMaxWeapons = 0; @@ -57,7 +57,7 @@ class StashMedium_base : DZ_storage_base { icon = "\Ca\misc3\data\Icons\icon_Atent_ca.paa"; mapsize = 3; model = "\z\addons\dayz_communityassets\models\dirt_stash_reinforced.p3d"; - scope = public; + scope = 2; vehicleClass = "DayZ Epoch Buildables"; transportMaxMagazines = 25; transportMaxWeapons = 1; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp index b5e38572d..6fa651a32 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp @@ -2,7 +2,7 @@ class Gunrack1; class GunRack_DZ: Gunrack1 { armor = 200; - scope = public; + scope = 2; displayName = $STR_EPOCH_GUNRACK; vehicleClass = "DayZ Epoch Buildables"; transportMaxWeapons = 20; @@ -17,7 +17,7 @@ class GunRack_DZ: Gunrack1 class GunRack2_DZ: Gunrack1 { armor = 400; - scope = public; + scope = 2; displayName = $STR_EPOCH_GUNRACK2; vehicleClass = "DayZ Epoch Buildables"; transportMaxWeapons = 40; @@ -32,7 +32,7 @@ class GunRack2_DZ: Gunrack1 class Fort_Crate_wood; class WoodCrate_DZ: Fort_Crate_wood { - scope = public; + scope = 2; destrType = "DestructBuilding"; offset[] = {0,2.5,0.5}; armor = 200; @@ -48,7 +48,7 @@ class WoodCrate_DZ: Fort_Crate_wood class WoodCrate2_DZ: Fort_Crate_wood { - scope = public; + scope = 2; destrType = "DestructBuilding"; offset[] = {0,2.5,0.5}; armor = 400; @@ -66,7 +66,7 @@ class Land_KBud; class OutHouse_DZ: Land_KBud { armor = 200; - scope = public; + scope = 2; offset[] = {0,2.5,1}; displayName = $STR_EPOCH_OUTHOUSE; vehicleClass = "DayZ Epoch Buildables"; @@ -80,7 +80,7 @@ class Land_Shed_M01; class StorageShed_DZ: Land_Shed_M01 { armor = 1600; - scope = public; + scope = 2; offset[] = {0,4,1}; displayName = $STR_EPOCH_STORAGESHED; vehicleClass = "DayZ Epoch Buildables"; @@ -93,7 +93,7 @@ class StorageShed_DZ: Land_Shed_M01 class StorageShed2_DZ: Land_Shed_M01 { armor = 3200; - scope = public; + scope = 2; offset[] = {0,4,1}; displayName = $STR_EPOCH_STORAGESHED2; vehicleClass = "DayZ Epoch Buildables"; @@ -106,7 +106,7 @@ class StorageShed2_DZ: Land_Shed_M01 class Land_kulna; class WoodShack_DZ: Land_kulna { - scope = public; + scope = 2; destrType = "DestructBuilding"; offset[] = {0,4,1.3}; armor = 800; @@ -121,7 +121,7 @@ class WoodShack_DZ: Land_kulna }; class WoodShack2_DZ: Land_kulna { - scope = public; + scope = 2; destrType = "DestructBuilding"; offset[] = {0,4,1.3}; armor = 1600; @@ -137,7 +137,7 @@ class WoodShack2_DZ: Land_kulna class Land_Shed_wooden; class Wooden_shed_DZ: Land_Shed_wooden { - scope = public; + scope = 2; destrType = "DestructBuilding"; offset[] = {0,5,1}; armor = 1000; @@ -153,7 +153,7 @@ class Wooden_shed_DZ: Land_Shed_wooden class Wooden_shed2_DZ: Land_Shed_wooden { - scope = public; + scope = 2; destrType = "DestructBuilding"; offset[] = {0,5,1}; armor = 2000; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Tents.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Tents.hpp index 4208ccdef..f1747c156 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Tents.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Tents.hpp @@ -1,5 +1,5 @@ class TentStorage_base : DZ_storage_base { - scope = public; + scope = 2; model = "\z\addons\dayz_communityassets\models\tent_a.p3d"; destrType = DestructTent; displayName = $STR_VEH_NAME_TENT; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Traps.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Traps.hpp index 0afd564e2..6ebd54e48 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Traps.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Traps.hpp @@ -3,7 +3,7 @@ class TrapItems : NonStrategic { }; class BearTrap_DZ : TrapItems { - scope = public; + scope = 2; destrType = "DestructNo"; displayName = $STR_EQUIP_NAME_BEARTRAP; descriptionShort = $STR_EQUIP_DESC_BEARTRAP; @@ -117,7 +117,7 @@ class Bomb }; class TrapBearTrapFlare : TrapItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "z\addons\dayz_communityassets\models\trap_beartrap_flare.p3d"; @@ -169,7 +169,7 @@ class TrapBearTrapFlare : TrapItems { }; class TrapBearTrapSmoke : TrapItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "z\addons\dayz_communityassets\models\trap_beartrap_smoke.p3d"; @@ -221,7 +221,7 @@ class TrapBearTrapSmoke : TrapItems { }; class Trap_Cans : TrapItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "z\addons\dayz_communityassets\models\tripwire_cans.p3d"; @@ -273,7 +273,7 @@ class Trap_Cans : TrapItems { }; class TrapTripwireFlare : TrapItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "z\addons\dayz_communityassets\models\trap_tripwire_flare.p3d"; @@ -325,7 +325,7 @@ class TrapTripwireFlare : TrapItems { }; class TrapTripwireGrenade : TrapItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "z\addons\dayz_communityassets\models\trap_tripwire_grenade.p3d"; @@ -377,7 +377,7 @@ class TrapTripwireGrenade : TrapItems { }; class TrapTripwireSmoke : TrapItems { - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "z\addons\dayz_communityassets\models\trap_tripwire_smoke.p3d"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Fuelstations.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Fuelstations.hpp index d176c41db..2a72a1a43 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Fuelstations.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Fuelstations.hpp @@ -13,7 +13,7 @@ class Land_Ind_FuelStation_Feed_EP1: Strategic }; class FuelStation : Strategic { icon = "\Ca\buildings\Icons\i_fuel_CA.paa"; - scope = private; + scope = 0; animated = 0; armor = 2000; displayName = "Fuel station"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_Crane_02b.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_Crane_02b.hpp index cc4283537..1a31530a2 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_Crane_02b.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_Crane_02b.hpp @@ -1,6 +1,6 @@ class Land_A_Crane_02b: House { - scope = protected; + scope = 1; armor = 110; featureSize = 30; model = "\ca\buildings2\A_Crane_02\A_Crane_02b"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_TVTower_Mid.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_TVTower_Mid.hpp index 2dcb2e234..f318c5429 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_TVTower_Mid.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_TVTower_Mid.hpp @@ -1,6 +1,6 @@ class Land_A_TVTower_Mid: House { - scope = protected; + scope = 1; destrType = "DestructNo"; model = "\ca\Structures\A_TVTower\A_TVTower_Mid"; featureSize = 150; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_TVTower_Top.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_TVTower_Top.hpp index bda99e313..d29e4d98d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_TVTower_Top.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_A_TVTower_Top.hpp @@ -1,6 +1,6 @@ class Land_A_TVTower_Top: House { - scope = protected; + scope = 1; destrType = "DestructNo"; model = "\ca\Structures\A_TVTower\A_TVTower_Top"; featureSize = 150; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Farm_WTower.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Farm_WTower.hpp index 4a92dcfe8..e07ad6a1b 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Farm_WTower.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Farm_WTower.hpp @@ -1,6 +1,6 @@ class Land_Farm_WTower: House { - scope = protected; + scope = 1; armor = 100; model = "\CA\buildings2\Farm_WTower\Farm_WTower"; class MarkerLights diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_HouseB_Tenement.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_HouseB_Tenement.hpp index 62f8c8446..5a2669cf7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_HouseB_Tenement.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_HouseB_Tenement.hpp @@ -2,7 +2,7 @@ class Land_HouseB_Tenement: House { armor = 180; model = "\Ca\Structures\House\HouseBT\HouseB_Tenement"; - scope = protected; + scope = 1; featureSize = 50; class HitPoints { diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Ind_MalyKomin.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Ind_MalyKomin.hpp index 9b41ed38d..23baa04d0 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Ind_MalyKomin.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Ind_MalyKomin.hpp @@ -1,6 +1,6 @@ class Land_Ind_MalyKomin: House { - scope = protected; + scope = 1; armor = 100; featureSize = 40; model = "\Ca\buildings2\Ind_CementWorks\Ind_MalyKomin\Ind_MalyKomin"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Mil_ControlTower.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Mil_ControlTower.hpp index 478d3c1e9..baaf95032 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Mil_ControlTower.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Mil_ControlTower.hpp @@ -1,6 +1,6 @@ class Land_Mil_ControlTower: House { - scope = protected; + scope = 1; armor = 400; class DestructionEffects: DestructionEffects { diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_NAV_Lighthouse.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_NAV_Lighthouse.hpp index 20304b560..8916921e8 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_NAV_Lighthouse.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_NAV_Lighthouse.hpp @@ -1,6 +1,6 @@ class Land_NAV_Lighthouse: House { - scope = protected; + scope = 1; armor = 500; featureSize = 15; model = "\Ca\Structures\NAV\NAV_Lighthouse"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_NavigLight.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_NavigLight.hpp index baf04f83c..a6f99d6ff 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_NavigLight.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_NavigLight.hpp @@ -1,6 +1,6 @@ class Land_NavigLight: House { - scope = protected; + scope = 1; displayName = ""; model = "\ca\buildings\Misc\NavigLight"; armor = 50; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Rail_Semafor.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Rail_Semafor.hpp index bfe64eaba..194d3e5e2 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Rail_Semafor.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Rail_Semafor.hpp @@ -1,6 +1,6 @@ class Land_Rail_Semafor: House { - scope = protected; + scope = 1; model = "\CA\Structures\Rail\Rail_Misc\rail_Semafor"; destrType = "DestructTree"; class MarkerLights diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Rail_Zavora.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Rail_Zavora.hpp index fb587d9d9..59dbfaebd 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Rail_Zavora.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Rail_Zavora.hpp @@ -1,6 +1,6 @@ class Land_Rail_Zavora: House { - scope = protected; + scope = 1; model = "\CA\Structures\Rail\Rail_Misc\rail_Zavora"; destrType = "DestructTree"; class MarkerLights diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Stoplight.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Stoplight.hpp index 99fe89181..ecea7004d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Stoplight.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Stoplight.hpp @@ -1,6 +1,6 @@ class Land_Stoplight01: House { - scope = protected; + scope = 1; model = "\ca\buildings\Misc\stoplight01"; armor = 50; class MarkerLights diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_VASICore.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_VASICore.hpp index 89c96d3ae..6faa77e6d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_VASICore.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_VASICore.hpp @@ -1,6 +1,6 @@ class Land_VASICore: NonStrategic { - scope = protected; + scope = 1; animated = 0; reversed = 0; vehicleClass = "Objects"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Vysilac_FM.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Vysilac_FM.hpp index 943e52fea..9abb12330 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Vysilac_FM.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Vysilac_FM.hpp @@ -1,6 +1,6 @@ class Land_Vysilac_FM: House { - scope = protected; + scope = 1; armor = 150; destrType = "DestructBuilding"; ladders[] = {{"start","end"}}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_majak.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_majak.hpp index 83f890789..487e93a59 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_majak.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_majak.hpp @@ -1,6 +1,6 @@ class Land_majak: House { - scope = protected; + scope = 1; model = "\ca\buildings\majak"; displayName = "Lighthouse"; animated = 1; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_runway_edgelight.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_runway_edgelight.hpp index 26e0bc29c..52a7c85ab 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_runway_edgelight.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_runway_edgelight.hpp @@ -1,6 +1,6 @@ class Land_runway_edgelight: House { - scope = protected; + scope = 1; displayName = ""; model = "\ca\buildings\Misc\runway_edgelight"; armor = 20; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_telek1.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_telek1.hpp index 453ac7776..ace1205ad 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_telek1.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_telek1.hpp @@ -1,6 +1,6 @@ class Land_telek1: House { - scope = protected; + scope = 1; armor = 600; destrType = "DestructBuilding"; model = "\ca\buildings\telek1"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/land_ibr_hangar.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/land_ibr_hangar.hpp index bb41f3fc9..c3e5fe5a7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/land_ibr_hangar.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/land_ibr_hangar.hpp @@ -1,7 +1,7 @@ // Lingor hangars class land_ibr_hangar : House { model = "\ibr\ibr_hangars\ibr_hangar"; - scope = public; + scope = 2; vehicleClass = "ibr_hangars"; transportFuel = 0; transportRepair = 0; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp index 1d064d393..54f0dd719 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp @@ -1,6 +1,6 @@ class ArmoredSUV_DZE_Base_PMC: Car { - scope = private; + scope = 0; brakeDistance = 19; vehicleClass = "DayZ Epoch Vehicles"; htMin = 60; @@ -284,7 +284,7 @@ class ArmoredSUV_DZE_Base_PMC: Car class ArmoredSUV_PMC_DZ: ArmoredSUV_DZE_Base_PMC { - scope = public; + scope = 2; side = 2; faction = "PMC_BAF"; displayName = $STR_VEH_NAME_SUV_ARMORED; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/BMP2.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/BMP2.hpp index 2c27cf69e..bc83b0da7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/BMP2.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/BMP2.hpp @@ -1,6 +1,6 @@ class BMP2_HQ_CDF; class BMP2_HQ_CDF_DZ: BMP2_HQ_CDF { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BMP2_CDF; vehicleClass = "DayZ Epoch Vehicles"; @@ -24,7 +24,7 @@ class BMP2_HQ_CDF_DZ: BMP2_HQ_CDF { }; class BMP2_HQ_CDF_DZE: BMP2_HQ_CDF_DZ { - scope = public; + scope = 2; class Turrets: Turrets { class MainTurret: MainTurret @@ -36,7 +36,7 @@ class BMP2_HQ_CDF_DZE: BMP2_HQ_CDF_DZ { class BMP2_HQ_INS; class BMP2_HQ_INS_DZ: BMP2_HQ_INS { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BMP2_INS; vehicleClass = "DayZ Epoch Vehicles"; @@ -60,7 +60,7 @@ class BMP2_HQ_INS_DZ: BMP2_HQ_INS { }; class BMP2_HQ_INS_DZE: BMP2_HQ_INS_DZ { - scope = public; + scope = 2; class Turrets: Turrets { class MainTurret: MainTurret @@ -72,7 +72,7 @@ class BMP2_HQ_INS_DZE: BMP2_HQ_INS_DZ { class BMP2_HQ_TK_EP1; class BMP2_HQ_TK_EP1_DZ: BMP2_HQ_TK_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BMP2_TK; vehicleClass = "DayZ Epoch Vehicles"; @@ -96,7 +96,7 @@ class BMP2_HQ_TK_EP1_DZ: BMP2_HQ_TK_EP1 { }; class BMP2_HQ_TK_EP1_DZE: BMP2_HQ_TK_EP1_DZ { - scope = public; + scope = 2; class Turrets: Turrets { class MainTurret: MainTurret @@ -107,7 +107,7 @@ class BMP2_HQ_TK_EP1_DZE: BMP2_HQ_TK_EP1_DZ { }; class BMP2_Ambul_INS; class BMP2_Ambul_INS_DZE: BMP2_Ambul_INS { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BMP2_AMBULANCE_INS; vehicleClass = "DayZ Epoch Vehicles"; @@ -130,7 +130,7 @@ class BMP2_Ambul_INS_DZE: BMP2_Ambul_INS { class BMP2_Ambul_CDF; class BMP2_Ambul_CDF_DZE: BMP2_Ambul_CDF { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BMP2_AMBULANCE_CDF; vehicleClass = "DayZ Epoch Vehicles"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/BRDM2_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/BRDM2_DZ.hpp index 4549f2e37..9439f577d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/BRDM2_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/BRDM2_DZ.hpp @@ -5,7 +5,7 @@ class BRDM2_HQ_TK_GUE_EP1: BRDM2_HQ_Base { }; class BRDM2_HQ_TK_GUE_EP1_DZ: BRDM2_HQ_TK_GUE_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_BRDM2_HQ; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/BTR40.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/BTR40.hpp index 0c772770e..31e86201e 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/BTR40.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/BTR40.hpp @@ -1,6 +1,6 @@ class BTR40_MG_base_EP1; class BTR40_MG_TK_GUE_EP1_DZ : BTR40_MG_base_EP1 { - scope = public; + scope = 2; vehicleClass = "DayZ Epoch Vehicles"; displayname = $STR_VEH_NAME_BTR40_DSHKM_GREEN; crew = ""; @@ -24,7 +24,7 @@ class BTR40_MG_TK_GUE_EP1_DZE : BTR40_MG_TK_GUE_EP1_DZ { }; class BTR40_MG_TK_INS_EP1_DZ : BTR40_MG_TK_GUE_EP1_DZ { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_BTR40_DSHKM_WOOD; hiddenSelectionsTextures[] = {"ca\wheeled_e\btr40\data\btr40extcamo_co.paa"}; }; @@ -42,7 +42,7 @@ class BTR40_MG_TK_INS_EP1_DZE : BTR40_MG_TK_INS_EP1_DZ { class BTR40_base_EP1; class BTR40_TK_GUE_EP1_DZE: BTR40_base_EP1 { - scope = public; + scope = 2; vehicleClass = "DayZ Epoch Vehicles"; displayname = $STR_VEH_NAME_BTR40_GREEN; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/BTR60.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/BTR60.hpp index 636eafbc3..b58f91bd1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/BTR60.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/BTR60.hpp @@ -4,7 +4,7 @@ class BTR60_TK_EP1: BRDM2_Base { }; class BTR60_TK_EP1_DZ: BTR60_TK_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BTR60_WOOD; vehicleClass = "DayZ Epoch Vehicles"; @@ -130,7 +130,7 @@ class BTR60_TK_EP1_DZ: BTR60_TK_EP1 { }; class BTR60_TK_EP1_DZE: BTR60_TK_EP1_DZ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BTR60_WOOD; class Turrets: Turrets @@ -239,13 +239,13 @@ class BTR60_TK_EP1_DZE: BTR60_TK_EP1_DZ { }; class BTR60_Gue_DZ: BTR60_TK_EP1_DZ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BTR60_GREEN; hiddenSelectionsTextures[] = {"\CorePatch\CorePatch_Vehicles\textures\btr60_body_gue_co.paa","\CorePatch\CorePatch_Vehicles\textures\btr60_details_gue_co.paa"}; }; class BTR60_Gue_DZE: BTR60_TK_EP1_DZE { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BTR60_GREEN; hiddenSelectionsTextures[] = {"\CorePatch\CorePatch_Vehicles\textures\btr60_body_gue_co.paa","\CorePatch\CorePatch_Vehicles\textures\btr60_details_gue_co.paa"}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/BTR90.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/BTR90.hpp index d001cb3cf..0adbdc6d1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/BTR90.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/BTR90.hpp @@ -1,6 +1,6 @@ class BTR90; class BTR90_DZ: BTR90 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BTR90; vehicleClass = "DayZ Epoch Vehicles"; @@ -24,7 +24,7 @@ class BTR90_DZ: BTR90 { }; class BTR90_HQ; class BTR90_HQ_DZ: BTR90_HQ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_BTR90_HQ; vehicleClass = "DayZ Epoch Vehicles"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp index 265aaf758..54d83fa62 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp @@ -1,6 +1,6 @@ class car_hatchback; class car_hatchback_DZE: car_hatchback { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_HATCHBACK_YELLOW; vehicleClass = "DayZ Epoch Vehicles"; maxspeed = 125; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp index f94623c27..c8de9d5ed 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp @@ -1,6 +1,6 @@ class car_sedan; class car_sedan_DZE : car_sedan { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_SEDAN_WHITE; vehicleClass = "DayZ Epoch Vehicles"; maxspeed = 125; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Dingo.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Dingo.hpp index b42952a20..fe3ad9129 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Dingo.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Dingo.hpp @@ -1,6 +1,6 @@ class Dingo_DZE_Base_ACR: Car { - scope = private; + scope = 0; displayName = "$STR_ACR_DN_DINGO_MG"; transportMaxWeapons = 20; transportMaxMagazines = 100; @@ -331,7 +331,7 @@ class Dingo_DZE_Base_ACR: Car class Dingo_WDL_ACR_DZ: Dingo_DZE_Base_ACR { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_DINGO_M240_WOODLAND; class AnimationSources: AnimationSources { @@ -378,7 +378,7 @@ class Dingo_DST_ACR_DZE: Dingo_WDL_ACR_DZE class Dingo_GL_Wdl_ACR_DZ: Dingo_DZE_Base_ACR { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_DINGO_MK19_WOODLAND; model = "\CA\Wheeled_ACR\Dingo\AMT_Dingo2a2"; Picture = "\Ca\Wheeled_ACR\Data\UI\Picture_Dingo2_CA.paa"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Gaz_Vodnik.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Gaz_Vodnik.hpp index f24bef781..29d02d0ca 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Gaz_Vodnik.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Gaz_Vodnik.hpp @@ -1,6 +1,6 @@ class GAZ_Vodnik_HMG; class GAZ_Vodnik_HMG_DZ : GAZ_Vodnik_HMG { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_VODNIK_BPPU; vehicleClass = "DayZ Epoch Vehicles"; typicalCargo[] = {}; @@ -86,7 +86,7 @@ class GAZ_Vodnik_HMG_DZE : GAZ_Vodnik_HMG_DZ { class GAZ_Vodnik; class GAZ_Vodnik_DZ : GAZ_Vodnik { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_VODNIK_PKT; vehicleClass = "DayZ Epoch Vehicles"; typicalCargo[] = {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp index e0dfe2b6a..796e7999c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp @@ -1,6 +1,6 @@ class HMMWV_DZE_Base: Car { - scope = private; + scope = 0; vehicleClass = "DayZ Epoch Vehicles"; accuracy = 0.3; side = 1; @@ -317,7 +317,7 @@ class HMMWV_DZ: HMMWV_DZE_Base { mapsize = 5; model = "ca\wheeled_E\HMMWV\HMMWV"; picture = "\Ca\wheeled\data\ico\HMMWV_CA.paa"; - scope = public; + scope = 2; side = 2; crew = ""; typicalCargo[] = {}; @@ -422,7 +422,7 @@ class HMMWV_M998A2_SOV_DES_EP1_DZ: HMMWV_DZE_Base { expansion = 1; side = 1; - scope = public; + scope = 2; transportSoldier = 4; transportMaxWeapons = 15; transportMaxMagazines = 70; @@ -684,7 +684,7 @@ class HMMWV_M998A2_SOV_DES_EP1_DZ: HMMWV_DZE_Base class HMMWV_M998A2_SOV_DES_EP1_DZE: HMMWV_M998A2_SOV_DES_EP1_DZ { - scope = public; + scope = 2; class Turrets: Turrets { class MainTurret: MainTurret @@ -735,7 +735,7 @@ class HMMWV_M1151_M2_CZ_DES_EP1_DZ: HMMWV_DZE_Base { expansion = 1; side = 1; - scope = public; + scope = 2; model = "\ca\wheeled_e\HMMWV\m1151_m2_gpk"; displayname = $STR_VEH_NAME_HMMWV_GPK; transportMaxWeapons = 15; @@ -815,7 +815,7 @@ class HMMWV_M1151_M2_CZ_DES_EP1_DZ: HMMWV_DZE_Base }; class HMMWV_M1151_M2_CZ_DES_EP1_DZE: HMMWV_M1151_M2_CZ_DES_EP1_DZ { - scope = public; + scope = 2; class Turrets: Turrets { class MainTurret: MainTurret @@ -926,7 +926,7 @@ class HMMWV_Armored_DZ: HMMWV_DZE_Base { accuracy = 0.32; picture = "\Ca\wheeled\data\ico\HMMWVmk19_CA.paa"; Icon = "\Ca\wheeled\data\map_ico\icomap_hmwvmk19_CA.paa"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines {}; @@ -1019,7 +1019,7 @@ class HMMWV_Armored_DZE: HMMWV_Armored_DZ { class HMMWV_M2_DZ: HMMWV_DZE_Base { displayname = $STR_VEH_NAME_HMMWV_M2; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines {}; @@ -1063,7 +1063,7 @@ class HMMWV_M2_DZE: HMMWV_M2_DZ { }; class HMMWV_M1035_DES_EP1_DZE : HMMWV_DZE_Base { - scope = public; + scope = 2; model = "\ca\wheeled_e\HMMWV\M1035_transport"; displayname = $STR_VEH_NAME_HMMWV_DES; transportSoldier = 3; @@ -1094,7 +1094,7 @@ class HMMWV_M1035_DES_EP1_DZE : HMMWV_DZE_Base { }; class HMMWV_Ambulance_DZE : HMMWV_DZE_Base { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_HMMWV_AMBULANCE; model = "\ca\wheeled2\HMMWV\M997A2_Ambulance\M997A2_Ambulance"; vehicleClass = "Support"; @@ -1136,7 +1136,7 @@ class HMMWV_DES_EP1_DZE : HMMWV_DZ { class HMMWV_Ambulance_CZ_DES_EP1_DZE : HMMWV_Ambulance_DZE { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_HMMWV_AMBULANCE_DES; crew = ""; typicalCargo[] = {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Jackal.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Jackal.hpp index f6b0541bb..fbc5785f7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Jackal.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Jackal.hpp @@ -1,7 +1,7 @@ class BAF_Jackal2_L2A1_D; class BAF_Jackal2_L2A1_D_DZ : BAF_Jackal2_L2A1_D { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_JACKAL_L2A1_DESERT; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp index 5fff02444..4d2cb939d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp @@ -1,6 +1,6 @@ class KamazOpen; class KamazOpen_DZE : KamazOpen { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_KAMAZ; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -16,7 +16,7 @@ class KamazOpen_DZE : KamazOpen { class Kamaz; class Kamaz_DZE: Kamaz { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_KAMAZ_COVERT; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -91,7 +91,7 @@ class KamazOpen_DZE4: KamazOpen_DZE3 { }; class KamazRefuel; class KamazRefuel_DZ: KamazRefuel { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_KAMAZ_REFUEL; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -139,7 +139,7 @@ class KamazRefuel_DZE4: KamazRefuel_DZE3 { class KamazRepair; class KamazRepair_DZE : KamazRepair { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_KAMAZ_AMMO; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -155,7 +155,7 @@ class KamazRepair_DZE : KamazRepair { class KamazReammo; class KamazReammo_DZE : KamazReammo { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_KAMAZ_WEAPONS; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/LAV25.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/LAV25.hpp index fac5bfb8a..5f6c593c8 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/LAV25.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/LAV25.hpp @@ -1,6 +1,6 @@ class LAV25; class LAV25_DZ: LAV25 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_LAV25; commanderCanSee = 2+16+32; @@ -23,7 +23,7 @@ class LAV25_DZ: LAV25 { }; class LAV25_HQ; class LAV25_HQ_DZ: LAV25_HQ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_LAV25_HQ; commanderCanSee = 2+16+32; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp index 79d26784c..7fc4a1590 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp @@ -1,6 +1,6 @@ class Lada1; class Lada1_DZE: Lada1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_LADA_WHITE; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -29,7 +29,7 @@ class Lada1_DZE: Lada1 { }; class Lada2; class Lada2_DZE: Lada2 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_LADA_RED; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -58,7 +58,7 @@ class Lada2_DZE: Lada2 { }; class LadaLM; class LadaLM_DZE: LadaLM { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_LADA_POLICE; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -88,7 +88,7 @@ class LadaLM_DZE: LadaLM { class Lada1_TK_CIV_EP1; class Lada1_TK_CIV_EP1_DZE: Lada1_TK_CIV_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_LADA_GREEN; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -117,7 +117,7 @@ class Lada1_TK_CIV_EP1_DZE: Lada1_TK_CIV_EP1 { }; class Lada2_TK_CIV_EP1; class Lada2_TK_CIV_EP1_DZE: Lada2_TK_CIV_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_LADA_HIPPY; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/LandRover.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/LandRover.hpp index c9200552d..d97a69e5a 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/LandRover.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/LandRover.hpp @@ -1,6 +1,6 @@ class LandRover_CZ_EP1; class LandRover_CZ_EP1_DZE: LandRover_CZ_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_MILITARY_OFFROAD_DESERT; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -487,7 +487,7 @@ class BAF_Offroad_W_DZE4: BAF_Offroad_W_DZE3 { class LandRover_Special_CZ_EP1; class LandRover_Special_CZ_EP1_DZ: LandRover_Special_CZ_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_MILITARY_OFFROAD_SPECIAL; vehicleClass = "DayZ Epoch Vehicles"; class Turrets; @@ -644,7 +644,7 @@ class LandRover_Special_CZ_EP1_DZE4: LandRover_Special_CZ_EP1_DZE3 { class LandRover_MG_TK_EP1; class LandRover_MG_TK_EP1_DZ: LandRover_MG_TK_EP1 { - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp index ea0b5205a..bb00b864d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp @@ -1,6 +1,6 @@ class M113Ambul_UN_EP1; class M113Ambul_UN_EP1_DZ : M113Ambul_UN_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_M113_AMBULANCE_UN; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -19,14 +19,14 @@ class M113Ambul_UN_EP1_DZ : M113Ambul_UN_EP1 { }; class M113Ambul_TK_EP1_DZ : M113Ambul_UN_EP1_DZ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_M113_AMBULANCE_TK; hiddenSelectionsTextures[] = {"\ca\Tracked_E\M113\Data\m113a3_01_TK_co.paa"}; }; class M113_UN_EP1; class M113_UN_EP1_DZ : M113_UN_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_M113_UN; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -46,7 +46,7 @@ class M113_UN_EP1_DZ : M113_UN_EP1 { }; class M113_TK_EP1_DZ : M113_UN_EP1_DZ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_M113_TK; hiddenSelectionsTextures[] = {"\ca\Tracked_E\M113\Data\m113a3_01_TK_co.paa"}; }; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp index 4cfed040d..7bcb6d4da 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp @@ -1,6 +1,6 @@ class MTVR; class MTVR_DZE: MTVR { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_MTVR_WOODLAND; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -12,7 +12,7 @@ class MTVR_DZE: MTVR { class MTVR_DES_EP1; class MTVR_DES_EP1_DZE : MTVR_DES_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_MTVR_DESERT; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -24,7 +24,7 @@ class MTVR_DES_EP1_DZE : MTVR_DES_EP1 { class MtvrRefuel_DES_EP1; class MtvrRefuel_DES_EP1_DZ: MtvrRefuel_DES_EP1 { - scope = public; + scope = 2; crew = ""; displayName = $STR_VEH_NAME_MTVR_DESERT_REFUEL; vehicleClass = "DayZ Epoch Vehicles"; @@ -41,7 +41,7 @@ class MtvrRefuel_DES_EP1_DZ: MtvrRefuel_DES_EP1 { class MtvrRefuel; class MtvrRefuel_DZ: MtvrRefuel { - scope = public; + scope = 2; crew = ""; displayName = $STR_VEH_NAME_MTVR_WOODLAND_REFUEL; vehicleClass = "DayZ Epoch Vehicles"; @@ -58,7 +58,7 @@ class MtvrRefuel_DZ: MtvrRefuel { class MtvrRepair; class MtvrRepair_DZE: MtvrRepair { - scope = public; + scope = 2; crew = ""; displayName = $STR_VEH_NAME_MTVR_AMMO; vehicleClass = "DayZ Epoch Vehicles"; @@ -74,7 +74,7 @@ class MtvrRepair_DZE: MtvrRepair { class MtvrReammo; class MtvrReammo_DZE: MtvrReammo { - scope = public; + scope = 2; crew = ""; displayName = $STR_VEH_NAME_MTVR_WEAPONS; vehicleClass = "DayZ Epoch Vehicles"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Octavia.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Octavia.hpp index 583b799b6..3bd4bdc7c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Octavia.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Octavia.hpp @@ -1,5 +1,5 @@ class Octavia_ACR_DZE: Car { - scope = public; + scope = 2; model = "\Corepatch\CorePatch_Vehicles\models\Octavia_ACR"; displayName = $STR_VEH_NAME_OCTAVIA_WHITE; icon = "\Ca\Wheeled_ACR\Data\UI\Icon_Octavia_CA.paa"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Offroad_DSHKM_INS.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Offroad_DSHKM_INS.hpp index f64ca94e2..1b8bec9aa 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Offroad_DSHKM_INS.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Offroad_DSHKM_INS.hpp @@ -1,6 +1,6 @@ class Offroad_DSHKM_Gue; class Offroad_DSHKM_Gue_DZ: Offroad_DSHKM_Gue { - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Pickup_PK_INS.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Pickup_PK_INS.hpp index 4e716da18..b0e7c8afc 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Pickup_PK_INS.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Pickup_PK_INS.hpp @@ -1,6 +1,6 @@ class Pickup_PK_GUE; class Pickup_PK_GUE_DZ: Pickup_PK_GUE { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_PICKUP_GUE_PKT; vehicleClass = "DayZ Epoch Vehicles"; @@ -17,7 +17,7 @@ class Pickup_PK_GUE_DZ: Pickup_PK_GUE { }; class Pickup_PK_TK_GUE_EP1; class Pickup_PK_TK_GUE_EP1_DZ: Pickup_PK_TK_GUE_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_PICKUP_TK_PKT; vehicleClass = "DayZ Epoch Vehicles"; @@ -34,7 +34,7 @@ class Pickup_PK_TK_GUE_EP1_DZ: Pickup_PK_TK_GUE_EP1 { }; class Pickup_PK_INS; class Pickup_PK_INS_DZ: Pickup_PK_INS { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_PICKUP_INS_PKT; vehicleClass = "DayZ Epoch Vehicles"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/SUV_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/SUV_DZ.hpp index 7a17a27cd..8e2172830 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/SUV_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/SUV_DZ.hpp @@ -1,6 +1,6 @@ class SUV_DZ: SUV_Base_EP1 { crew = ""; - scope = public; + scope = 2; vehicleClass = "DayZ Epoch Vehicles"; typicalCargo[] = {}; class TransportMagazines {}; @@ -82,7 +82,7 @@ class SUV_DZ: SUV_Base_EP1 { class SUV_TK_CIV_EP1_DZE: SUV_Base_EP1 { displayName = $STR_VEH_NAME_SUV_BLACK; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Skoda.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Skoda.hpp index d1f752579..81835f548 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Skoda.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Skoda.hpp @@ -1,6 +1,6 @@ class Skoda; class Skoda_DZE: Skoda { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_SKODA_WHITE; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -31,7 +31,7 @@ class Skoda_DZE: Skoda { class SkodaBlue; class SkodaBlue_DZE: SkodaBlue { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_SKODA_BLUE; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -61,7 +61,7 @@ class SkodaBlue_DZE: SkodaBlue { }; class SkodaRed; class SkodaRed_DZE: SkodaRed { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_SKODA_RED; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -92,7 +92,7 @@ class SkodaRed_DZE: SkodaRed { class SkodaGreen; class SkodaGreen_DZE: SkodaGreen { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_SKODA_GREEN; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Tatra_T810.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Tatra_T810.hpp index 17b1f0151..3d120e3f4 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Tatra_T810.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Tatra_T810.hpp @@ -1,6 +1,6 @@ class T810_DZE_Base_ACR: Truck { - scope = private; + scope = 0; mapSize = 8; picture = "\Ca\Wheeled_ACR\Data\UI\Picture_T810_CA.paa"; Icon = "\Ca\Wheeled_ACR\Data\UI\Icon_T810_CA.paa"; @@ -341,7 +341,7 @@ class T810_DZE_Base_ACR: Truck class T810A_PKT_ACR_DZ: T810_DZE_Base_ACR { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_TATRA_PKT_WOODLAND; model = "\CorePatch\CorePatch_Vehicles\models\T810_vp2_ACR"; picture = "\Ca\Wheeled_ACR\Data\UI\Picture_T810_MG_CA.paa"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ.hpp index 2b974a1af..56b75bab7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ.hpp @@ -1,6 +1,6 @@ class UAZ_CDF; class UAZ_CDF_DZE: UAZ_CDF { - scope = public; + scope = 2; maxspeed = 190; displayName = $STR_VEH_NAME_UAZ_CDF; vehicleClass = "DayZ Epoch Vehicles"; @@ -27,7 +27,7 @@ class UAZ_CDF_DZE: UAZ_CDF { }; class UAZ_INS; class UAZ_INS_DZE: UAZ_INS { - scope = public; + scope = 2; maxspeed = 190; displayName = $STR_VEH_NAME_UAZ_INS; vehicleClass = "DayZ Epoch Vehicles"; @@ -54,7 +54,7 @@ class UAZ_INS_DZE: UAZ_INS { }; class UAZ_RU; class UAZ_RU_DZE: UAZ_RU { - scope = public; + scope = 2; maxspeed = 190; displayName = $STR_VEH_NAME_UAZ_RU; vehicleClass = "DayZ Epoch Vehicles"; @@ -82,7 +82,7 @@ class UAZ_RU_DZE: UAZ_RU { class UAZ_Unarmed_TK_EP1; class UAZ_Unarmed_TK_EP1_DZE: UAZ_Unarmed_TK_EP1 { maxspeed = 190; - scope = public; + scope = 2; displayName = $STR_VEH_NAME_UAZ_TK; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -109,7 +109,7 @@ class UAZ_Unarmed_TK_EP1_DZE: UAZ_Unarmed_TK_EP1 { class UAZ_Unarmed_UN_EP1; class UAZ_Unarmed_UN_EP1_DZE: UAZ_Unarmed_UN_EP1 { maxspeed = 190; - scope = public; + scope = 2; displayName = $STR_VEH_NAME_UAZ_UN; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -136,7 +136,7 @@ class UAZ_Unarmed_UN_EP1_DZE: UAZ_Unarmed_UN_EP1 { class UAZ_Unarmed_TK_CIV_EP1; class UAZ_Unarmed_TK_CIV_EP1_DZE: UAZ_Unarmed_TK_CIV_EP1 { maxspeed = 190; - scope = public; + scope = 2; displayName = $STR_VEH_NAME_UAZ_CIVIL; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ_MG.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ_MG.hpp index 7e2c5e591..3979e1998 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ_MG.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ_MG.hpp @@ -1,7 +1,7 @@ class UAZ_MG_TK_EP1; class UAZ_MG_TK_EP1_DZ: UAZ_MG_TK_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_UAZ_DSHKM; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp index 41e9f5ea0..a1cf60003 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp @@ -1,6 +1,6 @@ class Ural_INS; class Ural_INS_DZE: Ural_INS { - scope = public; + scope = 2; crew = ""; displayName= $STR_VEH_NAME_URAL_INS; typicalCargo[] = {}; @@ -12,7 +12,7 @@ class Ural_INS_DZE: Ural_INS { class Ural_CDF; class Ural_CDF_DZE: Ural_CDF { - scope = public; + scope = 2; crew = ""; displayName= $STR_VEH_NAME_URAL_CDF; typicalCargo[] = {}; @@ -24,7 +24,7 @@ class Ural_CDF_DZE: Ural_CDF { class UralOpen_CDF; class UralOpen_CDF_DZE: UralOpen_CDF { - scope = public; + scope = 2; crew = ""; displayName= $STR_VEH_NAME_URAL_CDF_OPEN; typicalCargo[] = {}; @@ -36,7 +36,7 @@ class UralOpen_CDF_DZE: UralOpen_CDF { class Ural_TK_CIV_EP1; class Ural_TK_CIV_EP1_DZE: Ural_TK_CIV_EP1 { - scope = public; + scope = 2; crew = ""; displayName= $STR_VEH_NAME_URAL_TK; typicalCargo[] = {}; @@ -48,7 +48,7 @@ class Ural_TK_CIV_EP1_DZE: Ural_TK_CIV_EP1 { class Ural_UN_EP1; class Ural_UN_EP1_DZE: Ural_UN_EP1 { - scope = public; + scope = 2; crew = ""; displayName= $STR_VEH_NAME_URAL_UN; typicalCargo[] = {}; @@ -60,7 +60,7 @@ class Ural_UN_EP1_DZE: Ural_UN_EP1 { class UralCivil; class UralCivil_DZE : UralCivil { - scope = public; + scope = 2; displayName= $STR_VEH_NAME_URAL_CIVIL; crew = ""; typicalCargo[] = {}; @@ -73,7 +73,7 @@ class UralCivil_DZE : UralCivil { class UralCivil2; class UralCivil2_DZE : UralCivil2 { displayName = $STR_VEH_NAME_URAL_CIVIL_OPEN; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -85,7 +85,7 @@ class UralCivil2_DZE : UralCivil2 { class UralSupply_TK_EP1; class UralSupply_TK_EP1_DZE : UralSupply_TK_EP1 { displayName = $STR_VEH_NAME_URAL_CIVIL_OPEN; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -96,7 +96,7 @@ class UralSupply_TK_EP1_DZE : UralSupply_TK_EP1 { class UralRefuel_TK_EP1; class UralRefuel_TK_EP1_DZ: UralRefuel_TK_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_URAL_FUEL; crew = ""; typicalCargo[] = {}; @@ -113,7 +113,7 @@ class UralRefuel_TK_EP1_DZ: UralRefuel_TK_EP1 { class UralReammo_CDF; class UralReammo_CDF_DZE: UralReammo_CDF { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_URAL_WEAPONS; crew = ""; typicalCargo[] = {}; @@ -129,7 +129,7 @@ class UralReammo_CDF_DZE: UralReammo_CDF { class UralRepair_CDF; class UralRepair_CDF_DZE: UralRepair_CDF { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_URAL_AMMO; crew = ""; typicalCargo[] = {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp index 7e687ac9e..f13e0c403 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp @@ -18,7 +18,7 @@ class V3S_Civ_DZE : V3S_Civ { displayname = $STR_VEH_NAME_V3S_CAMO_OPEN; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; - scope = public; + scope = 2; typicalCargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; @@ -49,7 +49,7 @@ class V3S_Open_TK_EP1_DZE: V3S_Open_TK_EP1 { class V3S_TK_EP1; class V3S_TK_EP1_DZE: V3S_TK_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_V3S; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -61,7 +61,7 @@ class V3S_TK_EP1_DZE: V3S_TK_EP1 { class V3S_Reammo_TK_GUE_EP1; class V3S_RA_TK_GUE_EP1_DZE: V3S_Reammo_TK_GUE_EP1 { - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; displayname = $STR_VEH_NAME_V3S_REAMMO; @@ -76,7 +76,7 @@ class V3S_Refuel_TK_GUE_EP1; class V3S_Refuel_TK_GUE_EP1_DZ: V3S_Refuel_TK_GUE_EP1 { displayname = $STR_VEH_NAME_V3S_FUEL; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; transportMaxWeapons = 50; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/VWGolf.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/VWGolf.hpp index 1745b2a49..0ea956f14 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/VWGolf.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/VWGolf.hpp @@ -1,6 +1,6 @@ class VWGolf; class VWGolf_DZE: VWGolf { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_VWGOLF_RED; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Volha.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Volha.hpp index 36164ba92..432592e1c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Volha.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Volha.hpp @@ -1,6 +1,6 @@ class Volha_1_TK_CIV_EP1; class Volha_1_TK_CIV_EP1_DZE: Volha_1_TK_CIV_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_GAZ_BLUE; vehicleClass = "DayZ Epoch Vehicles"; fuelCapacity = 100; @@ -24,7 +24,7 @@ class Volha_1_TK_CIV_EP1_DZE: Volha_1_TK_CIV_EP1 { class Volha_2_TK_CIV_EP1; class Volha_2_TK_CIV_EP1_DZE: Volha_2_TK_CIV_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_GAZ_GREY; vehicleClass = "DayZ Epoch Vehicles"; fuelCapacity = 100; @@ -48,7 +48,7 @@ class Volha_2_TK_CIV_EP1_DZE: Volha_2_TK_CIV_EP1 { class VolhaLimo_TK_CIV_EP1; class VolhaLimo_TK_CIV_EP1_DZE: VolhaLimo_TK_CIV_EP1 { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_GAZ_BLACK; vehicleClass = "DayZ Epoch Vehicles"; fuelCapacity = 100; diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp index b5618f22a..80ccbec38 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp @@ -458,7 +458,7 @@ class CfgVehicles //Buildables class DZ_storage_base : Land_A_tent { - scope = private; + scope = 0; armor = 5; displayname = $STR_VEH_NAME_STASH; icon = ""; @@ -492,7 +492,7 @@ class CfgVehicles #include "WeaponHolder.hpp" class Plant_Base: WeaponHolder { - scope = public; + scope = 2; icon = ""; mapSize = 0; transportMaxWeapons = 0; @@ -514,8 +514,8 @@ class CfgVehicles class Land_CncBlock_AntiHack: NonStrategic { - scope = public; - vehicleClass = "Misc"; + scope = 2; + vehicleClass = "DayZ Epoch Buildings"; model = "z\addons\dayz_communityassets\models\CncBlock_D.p3d"; Icon = "\Ca\misc3\Data\Icons\icon_cnc_con_barrier_CA.paa"; mapSize = 4; diff --git a/SQF/dayz_code/Configs/CfgVehicles/CrashSite.hpp b/SQF/dayz_code/Configs/CfgVehicles/CrashSite.hpp index 5b2653e75..544ba9ca4 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/CrashSite.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/CrashSite.hpp @@ -23,7 +23,7 @@ class CrashSite : House class CrashSite_RU : CrashSite { - scope = public; + scope = 2; displayname = $STR_EPOCH_CRASHSITE1; model = "\z\addons\dayz_communityassets\crashsite\mi8\mi8_ru.p3d"; lootParams[] = {{0.6, -4.5, 0}, 7, 2.5, 5, 7}; @@ -37,7 +37,7 @@ class CrashSite_UN : CrashSite_RU class CrashSite_US : CrashSite { - scope = public; + scope = 2; displayname = $STR_EPOCH_CRASHSITE3; model = "\ca\air2\uh1y\uh1y_crashed.p3d"; hiddenSelections[] = {"zasleh"}; @@ -47,7 +47,7 @@ class CrashSite_US : CrashSite class CrashSite_EU : CrashSite { - scope = public; + scope = 2; displayname = $STR_EPOCH_CRASHSITE4; model = "\z\addons\dayz_communityassets\crashsite\hc3\hc3.p3d"; lootParams[] = {{-0.4, -0.5, 0}, 4, 2.5, 7.5, 7}; @@ -56,7 +56,7 @@ class CrashSite_EU : CrashSite //Old crash site wrecks from the glt_bh_wreck addon class UH60_NAVY_Wreck_DZ: SpawnableWreck { - scope = public; + scope = 2; class Armory { disabled = 1; }; diff --git a/SQF/dayz_code/Configs/CfgVehicles/DebugBox.hpp b/SQF/dayz_code/Configs/CfgVehicles/DebugBox.hpp index 4890c05a9..d651c810e 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DebugBox.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DebugBox.hpp @@ -1,7 +1,7 @@ class DebugBox_DZ: NonStrategic { placement = "vertical"; - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "\z\addons\dayz_epoch\models\debug_box.p3d"; @@ -14,7 +14,7 @@ class DebugBox_DZ: NonStrategic class DebugBoxPlayer_DZ: NonStrategic { placement = "vertical"; - scope = public; + scope = 2; destrType = "DestructNo"; cost = 100; model = "\z\addons\dayz_epoch\models\player_box.p3d"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH1Z.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH1Z.hpp index d8e1b48b2..dc211b835 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH1Z.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH1Z.hpp @@ -1,6 +1,6 @@ class AH1Z; class AH1Z_DZ: AH1Z { - scope = public; + scope = 2; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; typicalCargo[] = {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp index 7503cbf06..27047277f 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp @@ -1,7 +1,7 @@ class AH6J_EP1; class AH6J_EP1_DZ: AH6J_EP1 { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_AH6J; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; @@ -30,7 +30,7 @@ class AH6J_EP1_DZ: AH6J_EP1 class AH6J_EP1_DZE: AH6J_EP1_DZ { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_AH6J; magazines[] = {"60Rnd_CMFlareMagazine","60Rnd_CMFlareMagazine"}; }; @@ -40,7 +40,7 @@ class AH6X_DZ: AH6X_EP1 { displayname = $STR_VEH_NAME_AH6X; vehicleClass = "DayZ Epoch Vehicles"; model = "dayz_vehicles\helicopters\greybird\greybird.p3d"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/BAF_Merlin.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/BAF_Merlin.hpp index 5c4dc381f..ab61a3f2e 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/BAF_Merlin.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/BAF_Merlin.hpp @@ -1,6 +1,6 @@ class BAF_Merlin_HC3_D; class BAF_Merlin_DZE : BAF_Merlin_HC3_D { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_AW101; vehicleClass = "DayZ Epoch Vehicles"; magazines[] = {"120Rnd_CMFlareMagazine"}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH47.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH47.hpp index bc78b6f61..d31c8c160 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH47.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH47.hpp @@ -1,7 +1,7 @@ class CH_47F_EP1; class CH_47F_EP1_DZ : CH_47F_EP1 { vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; displayName = $STR_VEH_NAME_CH47_GREEN; crew = ""; typicalCargo[] = {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp index 871ecf1ef..ae6c67128 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp @@ -1,6 +1,6 @@ class USEC_ch53_E; class CH53_DZE : USEC_ch53_E { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_CH53; vehicleClass = "DayZ Epoch Vehicles"; destrType = "DestructWreck"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/KA60.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/KA60.hpp index 0f12add23..bf606734b 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/KA60.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/KA60.hpp @@ -7,7 +7,7 @@ class Ka60_GL_PMC: Ka60_GL_BASE_PMC { class Ka60_GL_PMC_DZ: Ka60_GL_PMC { displayName = $STR_VEH_NAME_KA60; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; radartype = 0; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MH6J_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MH6J_DZ.hpp index 4ecfcbe1a..2e9cff5cf 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MH6J_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MH6J_DZ.hpp @@ -1,7 +1,7 @@ class MH6J_EP1; class MH6J_DZ: MH6J_EP1 { - scope = public; + scope = 2; crew = ""; enablemanualfire = 0; typicalCargo[] = {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MI17.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MI17.hpp index 46e15fbfc..ec719f8b1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MI17.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MI17.hpp @@ -14,7 +14,7 @@ class Mi17_base: Helicopter { class Mi17_DZ: Mi17_base { displayname = $STR_VEH_NAME_MI17; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; hiddenSelections[] = {}; @@ -52,7 +52,7 @@ class Mi17_DZE: Mi17_DZ { class Mi17_TK_EP1_DZ: Mi17_base { displayname = $STR_VEH_NAME_MI17_TK; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -90,7 +90,7 @@ class Mi17_TK_EP1_DZE: Mi17_TK_EP1_DZ { class Mi17_UN_CDF_EP1_DZ: Mi17_base { displayname = $STR_VEH_NAME_MI17_UN; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -128,7 +128,7 @@ class Mi17_UN_CDF_EP1_DZE: Mi17_UN_CDF_EP1_DZ { class Mi17_CDF_DZ: Mi17_base { displayname = $STR_VEH_NAME_MI17_CDF; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -166,7 +166,7 @@ class Mi17_CDF_DZE: Mi17_CDF_DZ { class Mi171Sh_CZ_EP1_DZ: Mi17_base { displayname = $STR_VEH_NAME_MI17_SH; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -433,7 +433,7 @@ class Mi17_Civilian; class Mi17_Civilian_DZ: Mi17_Civilian { displayname = $STR_VEH_NAME_MI17_CIVIL; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -454,7 +454,7 @@ class Mi17_medevac_CDF; class Mi17_medevac_CDF_DZ: Mi17_medevac_CDF { displayname = $STR_VEH_NAME_MI17_MEDEVAC_CDF; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -474,7 +474,7 @@ class Mi17_medevac_Ins; class Mi17_medevac_Ins_DZ: Mi17_medevac_Ins { displayname = $STR_VEH_NAME_MI17_MEDEVAC_INS; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -494,7 +494,7 @@ class Mi17_medevac_RU; class Mi17_medevac_RU_DZ: Mi17_medevac_RU { displayname = $STR_VEH_NAME_MI17_MEDEVAC_RU; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp index 8f1916b73..b659befa7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp @@ -18,7 +18,7 @@ class UH1H_DZ: UH1H_base { displayname = $STR_VEH_NAME_UH1H_GREEN; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; model = "dayz_vehicles\helicopters\huey\huey.p3d"; typicalCargo[] = {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp index 7b3718216..ced732044 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp @@ -13,7 +13,7 @@ class UH1_Base: Helicopter { }; }; class UH1Y_DZ: UH1_Base { - scope = public; + scope = 2; displayname = $STR_VEH_NAME_UH1Y; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60.hpp index dd2ce0387..bb85dc38f 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60.hpp @@ -2,7 +2,7 @@ class MH60S; class MH60S_DZ : MH60S { displayName = $STR_VEH_NAME_MH60; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -96,7 +96,7 @@ class UH60M_EP1; class UH60M_EP1_DZ: UH60M_EP1 { displayName = $STR_VEH_NAME_UH60; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; class TransportMagazines{}; @@ -187,7 +187,7 @@ class UH60M_MEV_EP1; class UH60M_MEV_EP1_DZ : UH60M_MEV_EP1 { displayname = $STR_VEH_NAME_HH60; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; crew = ""; typicalCargo[] = {}; commanderCanSee = 2+16+32; diff --git a/SQF/dayz_code/Configs/CfgVehicles/InfectedCamps.hpp b/SQF/dayz_code/Configs/CfgVehicles/InfectedCamps.hpp index 1ca9af57a..aeca23cd1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/InfectedCamps.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/InfectedCamps.hpp @@ -1,5 +1,5 @@ class IC_Fireplace1: House { - scope = public; + scope = 2; displayname = $str_misc_campfire; model = "\Ca\misc3\Campfire"; vehicleClass = "DayZ Epoch Buildings"; @@ -12,7 +12,7 @@ class IC_Tent: House { icon = "\Ca\misc3\data\Icons\icon_Atent_ca.paa"; mapsize = 3; model = "\CA\Misc3\A_tent"; - scope = public; + scope = 2; vehicleClass = "DayZ Epoch Buildings"; pack = "WeaponHolder_ItemTent"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Land_Fire.hpp b/SQF/dayz_code/Configs/CfgVehicles/Land_Fire.hpp index a19c69f81..1fd542e52 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Land_Fire.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Land_Fire.hpp @@ -4,7 +4,7 @@ class flamable_DZ: House displayName = ""; icon = "\ca\misc3\data\Icons\icon_fireplace_ca.paa"; mapSize = 0; - scope = public; + scope = 2; armor=1000; simulation="fire"; vehicleClass="Misc"; @@ -40,7 +40,7 @@ class Land_Fire: House displayName = "$STR_MISC_FIRE"; icon = "\ca\misc3\data\Icons\icon_fireplace_ca.paa"; mapsize = 1.03; - scope = public; + scope = 2; accuracy=1; armor = 150; simulation="fire"; @@ -148,7 +148,7 @@ class Land_Camp_Fire_DZ : Land_Fire { class Misc_TyreHeap: Land_Fire { - scope = public; + scope = 2; vehicleClass="Misc"; model = "\ca\misc\Misc_TyreHeap"; icon="\Ca\Misc3\Data\Icons\icomap_tyreHeap_CA.paa"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/LootContainer/AmmoCrates.hpp b/SQF/dayz_code/Configs/CfgVehicles/LootContainer/AmmoCrates.hpp index e9bf64c68..6995e1399 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LootContainer/AmmoCrates.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LootContainer/AmmoCrates.hpp @@ -1,6 +1,6 @@ class DZ_AmmoBoxRU : ReammoBox { - scope = public; + scope = 2; model = "ca\weapons\ammoboxes\proxy_ruweaponboxlow.p3d"; displayName = $STR_DAYZ_OBJ_3; @@ -9,7 +9,7 @@ class DZ_AmmoBoxRU : ReammoBox class DZ_ExplosiveBoxRU : ReammoBox { - scope = public; + scope = 2; model = "ca\weapons\ammoboxes\proxy_ruexplosives.p3d"; displayName = $STR_DAYZ_OBJ_3; @@ -18,7 +18,7 @@ class DZ_ExplosiveBoxRU : ReammoBox class DZ_AmmoBoxUS : ReammoBox { - scope = public; + scope = 2; model = "ca\weapons\ammoboxes\proxy_usbasicammoboxsmall.p3d"; displayName = $STR_DAYZ_OBJ_3; @@ -27,7 +27,7 @@ class DZ_AmmoBoxUS : ReammoBox class DZ_ExplosivesBoxUS : ReammoBox { - scope = public; + scope = 2; model = "ca\weapons\ammoboxes\proxy_usbasicexplosives.p3d"; displayName = $STR_DAYZ_OBJ_3; @@ -36,7 +36,7 @@ class DZ_ExplosivesBoxUS : ReammoBox class DZ_CardboardBox : ReammoBox { - scope = public; + scope = 2; model = "dayz_equip\models\cardboard_box.p3d"; displayName = $STR_DAYZ_OBJ_4; @@ -45,7 +45,7 @@ class DZ_CardboardBox : ReammoBox class DZ_MedBox : ReammoBox { - scope = public; + scope = 2; model = "z\addons\dayz_communityassets\models\medical_freezbox.p3d"; displayName = $STR_DAYZ_OBJ_2; @@ -54,7 +54,7 @@ class DZ_MedBox : ReammoBox class DZ_AmmoBoxSmallUS : ReammoBox { - scope = public; + scope = 2; model = "\ca\weapons\AmmoBoxes\USBasicAmmo.p3d"; displayName = $STR_DAYZ_OBJ_3; diff --git a/SQF/dayz_code/Configs/CfgVehicles/LootContainer/CardboardBox.hpp b/SQF/dayz_code/Configs/CfgVehicles/LootContainer/CardboardBox.hpp index 1e72ab47a..6a416c546 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LootContainer/CardboardBox.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LootContainer/CardboardBox.hpp @@ -3,7 +3,7 @@ class CardboardBox : ReammoBox { }; class FoodBox0 : CardboardBox { - scope = public; + scope = 2; displayName = $STR_DAYZ_OBJ_1; model = "\dayz_equip\models\cardboard_box.p3d"; vehicleClass = "DayZ Epoch Crates"; @@ -36,7 +36,7 @@ class FoodBox1 : FoodBox0 {}; class FoodBox2 : FoodBox0 {}; class MedBox0 : CardboardBox { - scope = public; + scope = 2; displayName = $STR_DAYZ_OBJ_2; model = "z\addons\dayz_communityassets\models\medical_freezbox.p3d"; vehicleClass = "DayZ Epoch Crates"; @@ -65,7 +65,7 @@ class MedBox0 : CardboardBox { }; class MedBox1 : CardboardBox { - scope = public; + scope = 2; displayName = $STR_DAYZ_OBJ_2; model = "z\addons\dayz_communityassets\models\medical_freezbox.p3d"; vehicleClass = "DayZ Epoch Crates"; @@ -104,7 +104,7 @@ class MedBox1 : CardboardBox { }; class MedBox2 : CardboardBox { - scope = public; + scope = 2; displayName = $STR_DAYZ_OBJ_2; model = "z\addons\dayz_communityassets\models\medical_freezbox.p3d"; vehicleClass = "DayZ Epoch Crates"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Plane/AN2_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Plane/AN2_DZ.hpp index 21005716f..27f9ee07d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Plane/AN2_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Plane/AN2_DZ.hpp @@ -3,7 +3,7 @@ class AN2_DZ: An2_Base_EP1 { displayname = $STR_VEH_NAME_AN2_GREEN; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; side = 2; crew = ""; typicalCargo[] = {}; @@ -63,7 +63,7 @@ class An2_2_TK_CIV_EP1_DZ : An2_2_TK_CIV_EP1 { displayname = $STR_VEH_NAME_AN2_WHITEGREEN; vehicleClass = "DayZ Epoch Vehicles"; - scope = public; + scope = 2; side = 2; crew = ""; typicalCargo[] = {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp b/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp index 8c1ce6247..f35d52362 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp @@ -1,7 +1,7 @@ class MV22; class MV22_DZ : MV22 { accuracy = 1000; - scope = public; + scope = 2; displayName = $STR_VEH_NAME_MV22; vehicleClass = "DayZ Epoch Vehicles"; crew = ""; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp b/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp index fed7d27bd..803cf9886 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp @@ -12,7 +12,7 @@ class CAManBase: Man //includes all skins except animals class Civilian: CAManBase { rarityUrban = -1; - scope = private; + scope = 0; faction = "CIV"; genericNames = "CzechMen"; portrait = "\Ca\characters\data\portraits\comBarHead_civ_man_ca.paa"; @@ -68,7 +68,7 @@ class Civilian: CAManBase }; class Survivor_DZ : Civilian { - scope = private; + scope = 0; side = TWest; weapons[] = {"Throw", "Put"}; magazines[] = {}; @@ -124,13 +124,13 @@ class SoldierHeavy_Base_DZ : Survivor_DZ { }; class Survivor1_DZ : Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_CHAR_1; model = "\dayz\objects\proxy_man"; }; class Survivor2_DZ : Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_CHAR_1; model = "\dayz\characters\man_survivor"; }; @@ -144,7 +144,7 @@ class Survivor3_DZ : Survivor2_DZ { //Bandit1_DZ moved to DZE section below class Rocket_DZ: SoldierLight_Base_DZ { //BAF_Soldier_Officer_W - scope = public; + scope = 2; displayName = "Rocket"; model = "\ca\characters_d_BAF\BAF_Soldier_Officer_BAF"; portrait = "\ca\characters_d_baf\Data\portraits\baf_officer_CA"; @@ -159,7 +159,7 @@ class Rocket_DZ: SoldierLight_Base_DZ { //BAF_Soldier_Officer_W }; class Soldier1_DZ: SoldierHeavy_Base_DZ { //BAF_Soldier_W - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_SOLDIER; model = "\ca\characters_d_BAF\BAF_Soldier_1_BAF"; portrait = "ca\characters_d_baf\Data\portraits\baf_soldier_CA"; @@ -173,7 +173,7 @@ class Soldier1_DZ: SoldierHeavy_Base_DZ { //BAF_Soldier_W }; class Sniper1_DZ: Survivor_DZ { //BAF_Soldier_SniperH_W - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_GHILLIE_WDL_NAME; model = "\ca\characters_e\Ghillie\Ghillie_Overall"; portrait = "\Ca\characters\data\portraits\comBarHead_common_sniper_ca"; @@ -188,7 +188,7 @@ class Sniper1_DZ: Survivor_DZ { //BAF_Soldier_SniperH_W }; class Camo1_DZ: SoldierLight_Base_DZ { //BAF_Soldier_L_W - scope = public; + scope = 2; displayName = $STR_CHAR_1; model = "\ca\characters_d_BAF\BAF_Soldier_light_BAF"; portrait = "ca\characters_d_baf\Data\portraits\baf_soldier_CA"; @@ -203,7 +203,7 @@ class Camo1_DZ: SoldierLight_Base_DZ { //BAF_Soldier_L_W }; class INS_Lopotev_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BOSS; model = "\ca\characters2\OpforIns\Ins_Lopotev"; portrait = "\Ca\characters\data\portraits\comBarHead_civ_man_ca"; @@ -215,7 +215,7 @@ class INS_Lopotev_DZ: Survivor_DZ { }; class RU_Soldier_Crew_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CREWMAN; model = "\ca\characters2\Rus\Soldier_Crew"; portrait = "\Ca\characters\data\portraits\comBarHead_common_crew_ca"; @@ -227,7 +227,7 @@ class RU_Soldier_Crew_DZ: SoldierLight_Base_DZ { }; class TK_Commander_EP1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_GENERAL; model = "\CA\characters_E\TK\Tk_Commander"; portrait = "\Ca\characters\data\portraits\comBarHead_ru_soldier_ca"; @@ -235,7 +235,7 @@ class TK_Commander_EP1_DZ: Survivor_DZ { }; class TK_Soldier_Sniper_EP1_DZ: Sniper1_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_GHILLIE_DES_NAME; model = "\ca\characters_E\Ghillie\Ghillie_Top"; portrait = "\Ca\characters\data\portraits\comBarHead_common_sniper_ca"; @@ -249,7 +249,7 @@ class TK_Soldier_Sniper_EP1_DZ: Sniper1_DZ { }; class TK_Special_Forces_MG_EP1_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_SMUGGLER; model = "\CA\characters_E\TK\Tk_StormTrooper"; portrait = "\Ca\characters\data\portraits\comBarHead_ru_soldier_ca"; @@ -257,7 +257,7 @@ class TK_Special_Forces_MG_EP1_DZ: SoldierLight_Base_DZ { }; class INS_Soldier_AR_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = "Cooper"; model = "\ca\characters2\OpforIns\Ins_Soldier_1.p3d"; portrait = "\Ca\characters\data\portraits\comBarHead_opFor_ca"; @@ -293,7 +293,7 @@ class INS_Worker2_DZ: INS_Soldier_AR_DZ { }; class Bandit1_DZ : SoldierLight_Base_DZ { //Normal black PMC vest bandit - scope = public; + scope = 2; displayName = $STR_CHAR_2; model = "\dayz\characters\man_bandit"; portrait = "\Ca\characters_E\data\portraits\ger_soldier_CA"; @@ -311,7 +311,7 @@ class Bandit1_DZ : SoldierLight_Base_DZ { //Normal black PMC vest bandit }; class Bandit2_DZ: Bandit1_DZ { //German bright color camo bandit - scope = public; + scope = 2; displayName = $STR_CHAR_2; weapons[] = {"Throw","Put"}; model = "\ca\characters_E\GER\GER_rifleman"; @@ -322,7 +322,7 @@ class Bandit2_DZ: Bandit1_DZ { //German bright color camo bandit }; class GUE_Soldier_MG_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_CHAR_2; model = "\ca\characters2\IndepIns\Soldier_MG.p3d"; portrait = "\Ca\characters\data\portraits\comBarHead_opFor_ca"; @@ -360,7 +360,7 @@ class GUE_Soldier_2_DZ: GUE_Soldier_MG_DZ { }; class RU_Policeman_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_POLICE_OFFICER; model = "\ca\characters2\civil\Policeman\Policeman"; class Wounds @@ -382,13 +382,13 @@ class RU_Policeman2_DZ: RU_Policeman_DZ { }; class Pilot_EP1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_PILOT; model = "\Ca\characters_E\Civil\Pilot\pilot"; }; class Haris_Press_EP1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_JOURNALIST; model = "\ca\characters_E\Civil\Harris\Harris"; hiddenSelections[] = {}; @@ -406,13 +406,13 @@ class GUE_Commander_DZ: GUE_Soldier_MG_DZ { }; class Functionary1_EP1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BUSINESSMAN; model = "\Ca\characters_E\Civil\Functionary\Functionary"; }; class Priest_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_PRIEST; model = "\ca\characters2\civil\Priest\Priest"; class Wounds @@ -423,7 +423,7 @@ class Priest_DZ: Survivor_DZ { }; class Rocker1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_Rocker; model = "\ca\characters2\civil\Rocker\Rocker"; class Wounds @@ -448,7 +448,7 @@ class Rocker4_DZ: Rocker1_DZ { }; class TK_INS_Warlord_EP1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TAKISTANIWARLORD; model = "\CA\characters_E\LOC\LOC_soldier02"; portrait = "\Ca\characters_E\data\portraits\loc_soldier_CA"; @@ -481,7 +481,7 @@ class TK_INS_Soldier_EP1_DZ: TK_INS_Warlord_EP1_DZ { }; class CZ_Special_Forces_GL_DES_EP1_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_SPECIALFORCES; model = "\CA\characters_E\ACR\acr_soldier_spec1"; portrait = "\Ca\characters\data\portraits\comBarHead_bluFor_cdf_ca"; @@ -494,7 +494,7 @@ class CZ_Special_Forces_GL_DES_EP1_DZ: SoldierLight_Base_DZ { }; class Drake_Light_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_DESERTCAMO; model = "\ca\characters_E\US\US_machine_gunner_Light"; portrait = "\Ca\characters\data\portraits\comBarHead_usmc_soldier_ca"; @@ -506,7 +506,7 @@ class Drake_Light_DZ: SoldierLight_Base_DZ { }; class Soldier_Bodyguard_AA12_PMC_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BODYGUARD; model = "\Ca\Characters_PMC\Dixon\Dixon.p3d"; portrait = "\Ca\characters\data\portraits\comBarHead_civ_man_ca.paa"; @@ -550,7 +550,7 @@ class Soldier_TL_PMC_DZ: Soldier_Bodyguard_AA12_PMC_DZ { }; class FR_OHara_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_JUNGLECAMO; model = "\ca\characters2\USMC\Ohara"; portrait = "\Ca\characters\data\portraits\comBarHead_ohara_ca"; @@ -575,7 +575,7 @@ class CZ_Soldier_Sniper_EP1_DZ: Sniper1_DZ { }; class Graves_Light_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_URBANCAMO; model = "\ca\characters_E\Delta\Delta2_Light.p3d"; portrait = "\ca\characters_E\data\portraits\Graves_CA.paa"; @@ -584,7 +584,7 @@ class Graves_Light_DZ: SoldierLight_Base_DZ { }; class USMC_Soldier_Officer_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_USMCOFFICER; model = "\ca\characters2\USMC\USMC_soldier_Officer"; portrait = "\Ca\characters\data\portraits\comBarHead_usmc_soldier_ca"; @@ -624,7 +624,7 @@ class USMC_Soldier_Pilot_DZ: USMC_Soldier_MG_DZ { }; class FR_TL_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CAMOTEAMLEADER; model = "\ca\characters2\USMC\FR_CO"; portrait = "\Ca\characters\data\portraits\comBarHead_fr_soldier_ca"; @@ -679,7 +679,7 @@ class FR_Assault_R_DZ: FR_TL_DZ { }; class RU_Soldier_DZ: SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_RUSOLDIER; portrait = "\Ca\characters\data\portraits\comBarHead_ru_soldier_ca"; model = "\ca\characters2\Rus\Soldier"; @@ -710,7 +710,7 @@ class RU_Soldier_Officer_DZ: RU_Soldier_DZ { }; class RUS_Soldier1_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_RUCAMO; model = "\ca\characters2\Rus\Specnaz_Back"; portrait = "\Ca\characters\data\portraits\comBarHead_ru_spec_ca"; @@ -728,7 +728,7 @@ class RUS_Commander_DZ: RUS_Soldier1_DZ { }; class MVD_Soldier_DZ: SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_MVDSOLDIER; model = "\ca\characters2\Rus\Vityaz"; portrait = "\Ca\characters\data\portraits\comBarHead_ru_mvd_ca"; @@ -759,14 +759,14 @@ class Ins_Soldier_Crew_DZ: INS_Soldier_AR_DZ { }; class CDF_Soldier_DZ: SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CDFSOLDIER; portrait = "\Ca\characters\data\portraits\comBarHead_bluFor_cdf_ca"; model = "\ca\characters2\Blufor\Soldier"; }; class Doctor_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_DOCTOR; model = "\ca\characters2\civil\Doctor\Doctor"; hiddenSelections[] = {"Camo"}; @@ -794,7 +794,7 @@ class Gardener_DZ: Doctor_DZ { }; class Worker1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_WORKER; model = "\ca\characters2\civil\Worker\Worker"; hiddenSelections[] = {"Camo"}; @@ -815,7 +815,7 @@ class Worker4_DZ: Worker1_DZ { }; class TK_CIV_Takistani01_EP1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKCITIZEN; hiddenSelections[] = {"Camo"}; model = "\CA\characters_E\civil\Tak_civil01\Tak_civil01"; @@ -874,7 +874,7 @@ class TK_CIV_Takistani06_EP1_DZ: TK_CIV_Takistani01_EP1_DZ { }; class TK_INS_Soldier_AR_EP1_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKSOLDIER; model = "\CA\characters_E\LOC\LOC_soldier05"; portrait = "\Ca\characters_E\data\portraits\loc_soldier_CA"; @@ -892,7 +892,7 @@ class TK_INS_Soldier_AR_EP1_DZ: SoldierLight_Base_DZ { }; class TK_GUE_Soldier_EP1_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_TKGUESOLDIER; model = "\CA\characters_E\LOC\LOC_soldier01"; portrait = "\Ca\characters_E\data\portraits\loc_soldier_CA"; @@ -910,7 +910,7 @@ class TK_GUE_Soldier_EP1_DZ: SoldierLight_Base_DZ { }; class CZ_Soldier_SL_DES_EP1_DZ: SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_CZSOLDIER; portrait = "\Ca\characters\data\portraits\comBarHead_bluFor_cdf_ca"; hiddenSelections[] = {"Camo"}; @@ -918,7 +918,7 @@ class CZ_Soldier_SL_DES_EP1_DZ: SoldierHeavy_Base_DZ { }; class US_Soldier_EP1_DZ: SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_USSOLDIER; model = "\ca\characters_e\US\US_rifleman"; portrait = "\Ca\characters\data\portraits\comBarHead_usmc_soldier_ca"; @@ -930,20 +930,20 @@ class US_Soldier_EP1_DZ: SoldierHeavy_Base_DZ { }; class UN_CDF_Soldier_Guard_EP1_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_UNCOMMANDER; model = "\ca\characters_e\UN\UN_CDF_Officer"; portrait = "\Ca\characters\data\portraits\comBarHead_common_officer_ca"; }; class UN_CDF_Soldier_EP1_DZ: SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_UNSOLDIER; model = "\ca\characters_E\UN\UN_CDF_Soldier"; }; class GER_Soldier_TL_EP1_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_GERRECON; model = "\ca\characters_E\GER\GER_rifleman_light"; portrait = "\Ca\characters\data\portraits\comBarHead_opFor_ca"; @@ -951,7 +951,7 @@ class GER_Soldier_TL_EP1_DZ: SoldierLight_Base_DZ { }; class BAF_Soldier_Officer_MTP_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_BAFOFFICER; portrait = "\ca\characters_d_baf\Data\portraits\baf_officer_CA"; model = "\ca\characters_d_BAF\BAF_Soldier_Officer_BAF"; @@ -992,7 +992,7 @@ class FR_Sapper_DZ: FR_TL_DZ { }; class CamoWinter_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_THERMOSUITMAN; model = "\nst\ns_dayz\characters\cw\camowinter_dzn.p3d"; faceType = "HeadMask1Black"; @@ -1015,13 +1015,13 @@ class Sniper1W_DZ: Sniper1_DZ { }; class Nac_Soldier_DZ: SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_EPOCH_SKINS_NACSOLDIER; model = "\nst\ns_fraction\nac\nac_soldier_1"; }; class gsc_military_helmet_wdl_DZ : SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_STALKER_WDL_MIL_MASK_NAME; model = "\gsc_stalker\gsc_military_helmet_wdl.p3d"; class Wounds { @@ -1068,7 +1068,7 @@ class gsc_military_head_grey_DZ : gsc_military_helmet_wdl_DZ { }; class gsc_scientist1_DZ : Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_STALKER_SCIENTIST1_MASK_NAME; model = "\gsc_stalker\gsc_eco_suit.p3d"; class Wounds { @@ -1093,13 +1093,13 @@ class gsc_scientist2_head_DZ : gsc_scientist1_DZ { }; class gsc_cloth_loner_head_DZ : Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_STALKER_ROOKIE_NAME; model = "\gsc_stalker\gsc_cloth_loner_head.p3d"; }; class gsc_eco_stalker_mask_neutral_DZ : SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_STALKER_LONER_MASK_NAME; side = 1; model = "\gsc_stalker\gsc_eco_stalker_mask.p3d"; @@ -1285,7 +1285,7 @@ class GhillieFull_Wood16_DZ: GhillieFull_Wood01_DZ { //KSK Mod Skins class GER_Soldier_EP1_des_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_KSK_DES_RIFLEMAN_NAME; model = "\ksk_mod\GER_rifleman_des.p3d"; }; @@ -1304,7 +1304,7 @@ class GER_Soldier_TL_EP1_wdl_DZ: GER_Soldier_EP1_des_DZ { //Ice Apo Mod Skins class Apo_Rifleman_01_DZ: SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_ICE_APO_RIFLEMAN_NAME; model = "\ice_apo_resistance\soldier_hood_medium_beard.p3d"; picture = "\Ca\characters\data\Ico\i_null_CA.paa"; @@ -1347,7 +1347,7 @@ class Apo_Rifleman_06_DZ : Apo_Rifleman_01_DZ { }; class SG_GRU_TL_DZ : SoldierLight_Base_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_SKIN_SG_GRU_DT_TL_NAME; model = "\SG_GRU\Soldier_Gorka_1.p3d"; class Wounds { @@ -1404,7 +1404,7 @@ class SG_GRU_MG_D_DZ : SG_GRU_TL_DZ { displayName = $STR_DZE_SKIN_SG_GRU_WDL_MGSOLDIER_NAME; }; class CZ_Soldier805_DES_ACR_DZ : SoldierHeavy_Base_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_ACR_DES_SOLDIER_NAME; model = "\Ca\Characters_ACR\acr_dst_805"; portrait = "\Ca\characters\data\portraits\comBarHead_usmc_soldier_ca"; @@ -1549,7 +1549,7 @@ class CZ_Soldier_Light_Wdl_ACR_DZ : CZ_Soldier805_DES_ACR_DZ { }; class Firefighter1_DZ : Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_FIREFIGHTER_NAME; model = "\kpfs_thw\characters\worker\thw_worker"; hiddenSelections[] = {"camo01","hps","glasses"}; @@ -1583,7 +1583,7 @@ class Firefighter5_DZ : Firefighter4_DZ { hiddenSelectionsTextures[] = {"\kpfs_feuerwehr\man\fw_leader_co.paa","\kpfs_feuerwehr\man\fw_helmet_sl_co.paa"}; }; class Firefighter_Officer1_DZ : Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_FIREFIGHTER_OFFICER_NAME; model = "\kpfs_thw\characters\officer\thw_officer"; class Wounds @@ -1604,7 +1604,7 @@ class Firefighter_Officer2_DZ : Firefighter_Officer1_DZ { }; class Postman1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_POSTMAN_NAME; model = "kpfs_civ\dbp_officer"; class Wounds @@ -1642,7 +1642,7 @@ class Postman4_DZ: Postman1_DZ { }; class Hunter_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_HUNTER_NAME; model = "kpfs_civ\hunter"; hiddenSelections[] = {}; @@ -1655,7 +1655,7 @@ class Hunter_DZ: Survivor_DZ { }; class Civilian1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_CHAR_1; hiddenSelections[] = {"Camo01","Camo02","boonie"}; hiddenSelectionsTextures[] = {"sra_civilian\civilian\civil_tshirt_01_dress_co.paa","sra_civilian\civilian\klouboucek_cepice1_co.paa"}; @@ -1723,7 +1723,7 @@ class Civilian14_DZ: Civilian2_DZ { hiddenSelectionsTextures[] = {"sra_civilian\civilian\civil_tshirt_01_star_co.paa","sra_civilian\civilian\klouboucek_cepice3_co.paa"}; }; class Prisoner1_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_PRISONER_NAME; hiddenSelections[] = {"Camo01"}; hiddenSelectionsTextures[] = {"sra_civilian\prisoner\vezen_labordress_torn1_co.paa"}; @@ -1742,7 +1742,7 @@ class Prisoner3_DZ: Prisoner1_DZ { hiddenSelectionsTextures[] = {"sra_civilian\prisoner\vezen_tshirtdress_torn_co.paa"}; }; class Reporter_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_REPORTER_NAME; model = "\sra_civilian\civil_pressmanik"; class Wounds @@ -1753,7 +1753,7 @@ class Reporter_DZ: Survivor_DZ { }; class MafiaBoss_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_MAFIABOSS_NAME; model = "\sra_civilian\civil_tvreport"; class Wounds @@ -1764,7 +1764,7 @@ class MafiaBoss_DZ: Survivor_DZ { }; class Dealer_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_DRUGDEALER_NAME; model = "\sra_civilian\arms_dealer"; class Wounds @@ -1775,7 +1775,7 @@ class Dealer_DZ: Survivor_DZ { }; class BusinessMan_DZ: Survivor_DZ { - scope = public; + scope = 2; displayName = $STR_DZE_EQUIP_BUSINESSMAN_NAME; model = "\sra_civilian\chancellor"; class Wounds diff --git a/SQF/dayz_code/Configs/CfgVehicles/SupplyCrate.hpp b/SQF/dayz_code/Configs/CfgVehicles/SupplyCrate.hpp index d2c377be0..3e388622e 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/SupplyCrate.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/SupplyCrate.hpp @@ -1,6 +1,6 @@ class Supply_Crate_DZE: MiningItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; @@ -17,18 +17,18 @@ class Supply_Crate_DZE: MiningItems { class Ruin1 { - simulation = "ruin"; - type = "\z\addons\dayz_epoch\models\ammo_supply_wreck.p3d"; - position = ""; - intensity = 1; - interval = 1; - lifeTime = 1; + simulation = "ruin"; + type = "\z\addons\dayz_epoch\models\ammo_supply_wreck.p3d"; + position = ""; + intensity = 1; + interval = 1; + lifeTime = 1; }; }; }; class Land_ammo_supply_wreck: ruins { - scope = public; + scope = 2; model = "\z\addons\dayz_epoch\models\ammo_supply_wreck.p3d"; displayName = $STR_EPOCH_BULK_NAME; vehicleClass = "DayZ Epoch Buildings"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Veins.hpp b/SQF/dayz_code/Configs/CfgVehicles/Veins.hpp index b635cc4ab..8dbde4612 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Veins.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Veins.hpp @@ -30,7 +30,7 @@ class MiningItems: NonStrategic{ }; class Gold_Vein_DZE: MiningItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; model="\z\addons\dayz_epoch\models\gold_vein.p3d"; @@ -51,7 +51,7 @@ class Gold_Vein_DZE: MiningItems { }; }; class Silver_Vein_DZE: MiningItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; model="\z\addons\dayz_epoch\models\silver_vein.p3d"; @@ -72,7 +72,7 @@ class Silver_Vein_DZE: MiningItems { }; }; class Iron_Vein_DZE: MiningItems { - scope = public; + scope = 2; destrType = "DestructBuilding"; cost = 100; model="\z\addons\dayz_epoch\models\iron_vein.p3d"; @@ -94,19 +94,19 @@ class Iron_Vein_DZE: MiningItems { }; class Land_iron_vein_wreck: ruins { - scope = public; + scope = 2; model = "\z\addons\dayz_epoch\models\iron_vein_wreck.p3d"; displayName = $STR_ORE_VEIN_WRECK_IRON; vehicleClass = "DayZ Epoch Buildings"; }; class Land_silver_vein_wreck: ruins { - scope = public; + scope = 2; model = "\z\addons\dayz_epoch\models\silver_vein_wreck.p3d"; displayName = $STR_ORE_VEIN_WRECK_SILVER; vehicleClass = "DayZ Epoch Buildings"; }; class Land_gold_vein_wreck: ruins { - scope = public; + scope = 2; model = "\z\addons\dayz_epoch\models\gold_vein_wreck.p3d"; displayName = $STR_ORE_VEIN_WRECK_GOLD; vehicleClass = "DayZ Epoch Buildings"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp index a5896441c..47d6e72bb 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp @@ -3,7 +3,7 @@ class WeaponHolderBase: ReammoBox { }; class WoodenArrowF : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_ITEMWOODENARROW_CODE_NAME; model = "\dayz_weapons\models\bolt"; destrType = "DestructNo"; @@ -15,7 +15,7 @@ class WoodenArrowF : WeaponHolderBase { }; class WeaponHolder_ItemCrowbar: WeaponHolderBase { - scope=2; + scope = 2; displayName=$STR_EQUIP_NAME_CROWBAR; model="\dayz_equip\models\crowbar.p3d"; destrType = "DestructNo"; @@ -27,7 +27,7 @@ class WeaponHolder_ItemCrowbar: WeaponHolderBase }; class WeaponHolder_ItemPickaxe: WeaponHolderBase { - scope=2; + scope = 2; displayName = $STR_EQUIP_NAME_PICKAXE; model = "z\addons\dayz_communityweapons\models\pickaxe\pickaxe.p3d"; destrType = "DestructNo"; @@ -47,7 +47,7 @@ class WeaponHolder_ItemPickaxeBroken: WeaponHolder_ItemPickaxe }; }; class WeaponHolder_ItemSledge : WeaponHolderBase { // Epoch class. Needed for player_dropWeapon - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_SledgeHammer; model="\z\addons\dayz_epoch\models\sledge_mag.p3d"; destrType = "DestructNo"; @@ -58,7 +58,7 @@ class WeaponHolder_ItemSledge : WeaponHolderBase { // Epoch class. Needed for pl }; class WeaponHolder_MeleeMachete: WeaponHolderBase { - scope=2; + scope = 2; displayName=$STR_EQUIP_NAME_MACHETE; model="\z\addons\dayz_communityassets\models\machete.p3d"; destrType = "DestructNo"; @@ -69,7 +69,7 @@ class WeaponHolder_MeleeMachete: WeaponHolderBase }; }; class WeaponHolder_ItemJerrycanEmpty : WeaponHolderBase { - scope = public; + scope = 2; displayName = "$STR_EQUIP_NAME_39"; model = "\dayz_equip\proxy\jerrycan_side.p3d"; destrType = "DestructNo"; @@ -79,7 +79,7 @@ class WeaponHolder_ItemJerrycanEmpty : WeaponHolderBase { }; }; class WeaponHolder_ItemFuelcanEmpty : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_ITEM_NAME_FUELCAN_EMPTY; model = "z\addons\dayz_communityassets\models\fuelcan.p3d"; destrType = "DestructNo"; @@ -89,7 +89,7 @@ class WeaponHolder_ItemFuelcanEmpty : WeaponHolderBase { }; }; class WeaponHolder_ItemFuelcan : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_ITEM_NAME_FUELCAN; model = "z\addons\dayz_communityassets\models\fuelcan.p3d"; destrType = "DestructNo"; @@ -99,7 +99,7 @@ class WeaponHolder_ItemFuelcan : WeaponHolderBase { }; }; class WeaponHolder_ItemCamoNet : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_ITEM_NAME_CAMONET; model = "z\addons\dayz_communityassets\models\packed_net_green.p3d"; destrType = "DestructNo"; @@ -110,7 +110,7 @@ class WeaponHolder_ItemCamoNet : WeaponHolderBase { }; class WeaponHolder_ItemDomeTent : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_DOME_TENT; model = "\dayz_equip\proxy\tentbag.p3d"; destrType = "DestructNo"; @@ -121,7 +121,7 @@ class WeaponHolder_ItemDomeTent : WeaponHolderBase { }; class WeaponHolder_ItemDesertTent : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_VEH_NAME_DESERT_TENT; model = "\dayz_equip\proxy\tentbag.p3d"; destrType = "DestructNo"; @@ -132,7 +132,7 @@ class WeaponHolder_ItemDesertTent : WeaponHolderBase { }; class WeaponHolder_ItemCrate : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_ITEM_NAME_equip_crate; model = "\z\addons\dayz_communityassets\models\crate.p3d"; destrType = "DestructNo"; @@ -143,7 +143,7 @@ class WeaponHolder_ItemCrate : WeaponHolderBase { }; class WeaponHolder_Colt1911 : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_WPN_HOLDR_1; model = "\dayz_equip\proxy\Colt1911.p3d"; destrType = "DestructNo"; @@ -154,7 +154,7 @@ class WeaponHolder_Colt1911 : WeaponHolderBase { }; class WeaponHolder_ItemHatchet : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_HATCHET; model = "\dayz_equip\models\hatchet.p3d"; destrType = "DestructNo"; @@ -165,7 +165,7 @@ class WeaponHolder_ItemHatchet : WeaponHolderBase { }; class WeaponHolder_MeleeCrowbar : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_CROWBAR; model = "\dayz_equip\models\crowbar.p3d"; destrType = "DestructNo"; @@ -176,7 +176,7 @@ class WeaponHolder_MeleeCrowbar : WeaponHolderBase { }; class WeaponHolder_huntingrifle : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_WPN_HOLDR_2; model = "\dayz_equip\proxy\huntingrifle.p3d"; destrType = "DestructNo"; @@ -187,7 +187,7 @@ class WeaponHolder_huntingrifle : WeaponHolderBase { }; class WeaponHolder_M4A1 : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_WPN_HOLDR_3; model = "\dayz_equip\proxy\M4A1.p3d"; destrType = "DestructNo"; @@ -198,7 +198,7 @@ class WeaponHolder_M4A1 : WeaponHolderBase { }; class WeaponHolder_ItemTent : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_20; model = "\dayz_equip\proxy\tentbag.p3d"; destrType = "DestructNo"; @@ -209,7 +209,7 @@ class WeaponHolder_ItemTent : WeaponHolderBase { }; class WeaponHolder_ItemFlashlight : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_5; model = "\dayz_equip\proxy\flashlight.p3d"; destrType = "DestructNo"; @@ -220,7 +220,7 @@ class WeaponHolder_ItemFlashlight : WeaponHolderBase { }; class WeaponHolder_ItemFlashlightRed : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_6; model = "\dayz_equip\proxy\flashlight_mil.p3d"; destrType = "DestructNo"; @@ -231,7 +231,7 @@ class WeaponHolder_ItemFlashlightRed : WeaponHolderBase { }; class WeaponHolder_ItemWaterbottle : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_12; model = "\dayz_equip\proxy\waterbottle.p3d"; destrType = "DestructNo"; @@ -242,7 +242,7 @@ class WeaponHolder_ItemWaterbottle : WeaponHolderBase { }; class WeaponHolder_ItemGenerator : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_31; model = "\dayz_equip\models\generator.p3d"; destrType = "DestructNo"; @@ -253,7 +253,7 @@ class WeaponHolder_ItemGenerator : WeaponHolderBase { }; class WeaponHolder_ItemToolbox : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_2; model = "\dayz_equip\proxy\toolbox.p3d"; destrType = "DestructNo"; @@ -264,7 +264,7 @@ class WeaponHolder_ItemToolbox : WeaponHolderBase { }; class WeaponHolder_PartFueltank : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_8; model = "\dayz_equip\proxy\fueltank.p3d"; destrType = "DestructNo"; @@ -275,7 +275,7 @@ class WeaponHolder_PartFueltank : WeaponHolderBase { }; class WeaponHolder_PartWheel : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_9; model = "\dayz_equip\proxy\wheel.p3d"; destrType = "DestructNo"; @@ -286,7 +286,7 @@ class WeaponHolder_PartWheel : WeaponHolderBase { }; class WeaponHolder_PartGeneric : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_10; model = "\dayz_equip\proxy\genericparts.p3d"; destrType = "DestructNo"; @@ -297,7 +297,7 @@ class WeaponHolder_PartGeneric : WeaponHolderBase { }; class WeaponHolder_PartVRotor : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_32; model = "\dayz_equip\proxy\vrotor.p3d"; destrType = "DestructNo"; @@ -308,7 +308,7 @@ class WeaponHolder_PartVRotor : WeaponHolderBase { }; class WeaponHolder_PartEngine : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_11; model = "\dayz_equip\proxy\engine.p3d"; destrType = "DestructNo"; @@ -319,7 +319,7 @@ class WeaponHolder_PartEngine : WeaponHolderBase { }; class WeaponHolder_PartGlass : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_30; model = "\dayz_equip\proxy\carglass.p3d"; destrType = "DestructNo"; @@ -330,7 +330,7 @@ class WeaponHolder_PartGlass : WeaponHolderBase { }; class WeaponHolder_ItemJerrycan : WeaponHolderBase { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_19; model = "\dayz_equip\proxy\jerrycan.p3d"; destrType = "DestructNo"; @@ -345,13 +345,13 @@ class WeaponHolder_ItemJerrycanSide : WeaponHolder_ItemJerrycan { }; class WeaponHolder_ItemVault: WeaponHolder { - scope = protected; + scope = 1; displayName = $STR_EPOCH_SAFE; seedItem = "ItemVault"; }; class WeaponHolder_ItemLockbox: WeaponHolder { - scope = protected; + scope = 1; displayName = $STR_EPOCH_LOCKBOX; seedItem = "ItemLockbox"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/DeadBodys.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/DeadBodys.hpp index 33a0cdf51..d5357b7ef 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/DeadBodys.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Zeds/DeadBodys.hpp @@ -1,5 +1,5 @@ class BodySurvivor1 : Wreck_Base { - scope = public; + scope = 2; mapSize = 2; displayName = "Dead Body Survivor 1"; model = "\ca\characters_E\GER\GER_rifleman"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp index 9a18744bf..291f3cff0 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp @@ -1,5 +1,5 @@ class Swarm_Base : Citizen1 { - scope = public; + scope = 2; class HitDamage {}; glassesEnabled = 0; vehicleClass = "Zombie"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/ViralZeds.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/ViralZeds.hpp index 82d1e8027..8b5608216 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/ViralZeds.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Zeds/ViralZeds.hpp @@ -1,5 +1,5 @@ class zZombie_new_Base : zZombie_Base { - scope = public; + scope = 2; glassesEnabled = 0; identityTypes[] = {"Zombie3"}; class TalkTopics {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp index eefec7a64..c1529ff6e 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp @@ -1,6 +1,6 @@ class WildZombie_Base : Zed_Base { - scope = public; + scope = 2; glassesEnabled = 0; vehicleClass = "Zombie"; displayName = $STR_ZNAME_INFECTED; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp index 52fe67160..ff78f6d42 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp @@ -24,14 +24,14 @@ class Citizen1: Citizen { }; }; class Zed_Base : Citizen1 { - scope = public; + scope = 2; class HitDamage {}; armor = 3; agentTasks[] = {}; canCarryBackPack = 1; }; class zZombie_Base : Zed_Base { - scope = public; + scope = 2; glassesEnabled = 0; vehicleClass = "Zombie"; displayName = $STR_ZNAME_INFECTED; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Item/ItemKeys.hpp b/SQF/dayz_code/Configs/CfgWeapons/Item/ItemKeys.hpp index decf8b539..6e11fb84f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Item/ItemKeys.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Item/ItemKeys.hpp @@ -6,6 +6,7 @@ class ItemKey: ItemCore { keyid = 0; scope = 2; weight = 0.01; + class ItemActions { class Toolbelt diff --git a/SQF/dayz_code/Configs/CfgWeapons/Loot.hpp b/SQF/dayz_code/Configs/CfgWeapons/Loot.hpp index 98b4ec839..5e677491b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Loot.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Loot.hpp @@ -1,8 +1,8 @@ class Loot : Default { - scope = public; + scope = 2; value = 0; - type = WeaponNoSlot; + type = 0; displayName = "Use"; canDrop = false; muzzles[] = {this}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/BaseballBat.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/BaseballBat.hpp index d953b5f32..59437cf86 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/BaseballBat.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/BaseballBat.hpp @@ -1,14 +1,11 @@ class MeleeBaseBallBat : MeleeWeapon { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\baseball_bat_weaponized.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_baseball_bat_ca.paa"; displayName = $STR_EQUIP_NAME_BASEBALLBAT; - descriptionShort = $STR_EQUIP_DESC_BASEBALLBAT; - - magazines[] = {"Bat_Swing"}; - + descriptionShort = $STR_EQUIP_DESC_BASEBALLBAT; + magazines[] = {"Bat_Swing"}; droppeditem = "MeleeBaseBallBat"; class Library @@ -45,7 +42,7 @@ class MeleeBaseBallBat : MeleeWeapon class MeleeBaseBallBatBarbed : MeleeWeapon { - scope = public; + scope = 2; model="\z\addons\dayz_communityassets\models\baseball_bat_barbed_weaponized.p3d"; picture="\z\addons\dayz_communityassets\pictures\equip_baseball_bat_barbed_ca.paa"; @@ -64,7 +61,7 @@ class MeleeBaseBallBatBarbed : MeleeWeapon class MeleeBaseBallBatNails : MeleeWeapon { - scope = public; + scope = 2; model="\z\addons\dayz_communityassets\models\baseball_bat_nails_weaponized.p3d"; picture="\z\addons\dayz_communityassets\pictures\equip_baseball_bat_nails_ca.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/Crowbar.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/Crowbar.hpp index b29dcda0a..8d2a408f3 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Crowbar.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Crowbar.hpp @@ -1,14 +1,11 @@ class MeleeCrowbar : MeleeWeapon { - scope = public; - + scope = 2; model = "\dayz_weapons\models\crowbar_weaponized"; picture = "\dayz_weapons\textures\equip_crowbar_CA.paa"; displayName = $STR_EQUIP_NAME_CROWBAR; - descriptionShort = $STR_EQUIP_DESC_CROWBAR; - - magazines[] = {"Crowbar_Swing"}; - + descriptionShort = $STR_EQUIP_DESC_CROWBAR; + magazines[] = {"Crowbar_Swing"}; droppeditem = "ItemCrowbar"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/FishingPole.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/FishingPole.hpp index 442ce2afb..56db56e9d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/FishingPole.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/FishingPole.hpp @@ -1,12 +1,10 @@ class MeleeFishingPole : MeleeWeapon { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\fishing_rod_weaponized.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_fishingpole_CA.paa"; displayName = $STR_ITEM_NAME_FISHINGPOLE; - descriptionShort = $STR_ITEM_DESC_FISHINGPOLE; - + descriptionShort = $STR_ITEM_DESC_FISHINGPOLE; magazines[] = {"Fishing_Swing"}; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp index 59afb8882..164fd3179 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp @@ -1,14 +1,11 @@ class MeleeHatchet : MeleeWeapon { - scope = public; - + scope = 2; model = "\dayz_weapons\models\Hatchet_weaponized"; picture = "\dayz_equip\textures\equip_hatchet_CA.paa"; displayName = $STR_EQUIP_NAME_HATCHET; - descriptionShort = $STR_EQUIP_DESC_HATCHET; - - magazines[] = {"Hatchet_Swing"}; - + descriptionShort = $STR_EQUIP_DESC_HATCHET; + magazines[] = {"Hatchet_Swing"}; droppeditem = "ItemHatchet"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/Machete.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/Machete.hpp index a16077848..ce5a3c18f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Machete.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Machete.hpp @@ -1,14 +1,11 @@ class MeleeMachete: MeleeWeapon { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\machete_weaponized.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_machete_CA.paa"; displayName = $STR_EQUIP_NAME_MACHETE; - descriptionShort = $STR_EQUIP_DESC_MACHETE; - - magazines[] = {"Machete_Swing"}; - + descriptionShort = $STR_EQUIP_DESC_MACHETE; + magazines[] = {"Machete_Swing"}; droppeditem = "MeleeMachete"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp index ad648b70a..054ae0d90 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp @@ -1,14 +1,11 @@ class MeleeSledge: MeleeWeapon { - scope = public; - + scope = 2; model = "\z\addons\dayz_epoch\models\sledge_weaponized"; picture = "\z\addons\dayz_epoch\pictures\equip_sledge_CA.paa"; // todo icon displayName = $STR_EQUIP_NAME_SledgeHammer; - descriptionShort = $STR_EQUIP_SLEDGE_DESC; - - magazines[] = {"Sledge_Swing"}; - + descriptionShort = $STR_EQUIP_SLEDGE_DESC; + magazines[] = {"Sledge_Swing"}; droppeditem = "ItemSledge"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/APS.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/APS.hpp index c23a5c7de..8a20d6b2a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/APS.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/APS.hpp @@ -1,6 +1,6 @@ class APS_DZ: Makarov { - scope = public; + scope = 2; model = "\RH_aks\RH_aps.p3d"; modelOptics = "-"; picture = "\RH_aks\inv\aps.paa"; @@ -82,7 +82,7 @@ class APS_DZ: Makarov class APS_SD_DZ: MakarovSD { - scope = public; + scope = 2; model = "\RH_aks\RH_apssd.p3d"; modelOptics = "-"; picture = "\RH_aks\inv\apssd.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Browning.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Browning.hpp index 7e5f0ff5a..638ca7ad1 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Browning.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Browning.hpp @@ -1,6 +1,6 @@ class BrowningHP_DZ: M9 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_BROWNING_HP_NAME; descriptionShort = $STR_DZ_WPN_BROWNING_HP_DESC; model = "\RH_de\RH_browninghp.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/DesertEagle.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/DesertEagle.hpp index c2ba8c028..72fa1cb0f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/DesertEagle.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/DesertEagle.hpp @@ -1,6 +1,6 @@ class DesertEagle_DZ: Colt_Python_DZ { - scope = public; + scope = 2; model = "\z\addons\dayz_epoch_w\deagle\h4_deagle"; modelOptics = "-"; picture = "\z\addons\dayz_epoch_w\deagle\data\w_deagle_CA.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp index de7cd41b7..cc3010114 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/MK22.hpp @@ -1,6 +1,6 @@ class MK22_DZ: M9 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_MK22_NAME; descriptionShort = $STR_DZ_WPN_MK22_DESC; model = "\RH_de\RH_mk22.p3d"; @@ -30,7 +30,7 @@ class MK22_2_DZ: MK22_DZ class MK22_SD_DZ: M9SD { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_MK22SD_NAME; descriptionShort = $STR_DZ_WPN_MK22SD_DESC; model = "\RH_de\RH_mk22sd.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/P226.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/P226.hpp index 4f3706dd3..65765c6a8 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/P226.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/P226.hpp @@ -1,6 +1,6 @@ class P226_DZ: M9 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_P226_NAME; descriptionShort = $STR_DZ_WPN_P226_DESC; model = "\RH_de\RH_p226.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/P38.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/P38.hpp index 2580636f8..0bf45fb1f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/P38.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/P38.hpp @@ -1,6 +1,6 @@ class P38_DZ: M9 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_P38_NAME; descriptionShort = $STR_DZ_WPN_P38_DESC; model = "\RH_de\RH_p38.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/PPK.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/PPK.hpp index b0433da0a..81fa2c330 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/PPK.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/PPK.hpp @@ -1,6 +1,6 @@ class PPK_DZ: M9 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_PPK_NAME; descriptionShort = $STR_DZ_WPN_PPK_DESC; model = "\RH_de\RH_ppk.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp index a38e40565..f85d1ca44 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp @@ -5,7 +5,7 @@ class Revolver_DZ : revolver_EP1 class Colt_Anaconda_DZ: Pistol { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_COLT_ANACONDA_NAME; descriptionShort = $STR_DZ_WPN_COLT_ANACONDA_DESC; model = "\RH_de\RH_anac.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/RugerMK2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/RugerMK2.hpp index d1c1f4993..6f34c5afb 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/RugerMK2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/RugerMK2.hpp @@ -1,6 +1,6 @@ class Ruger_MK2_DZ: Makarov { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_RUGERMK2_NAME; descriptionShort = $STR_DZ_WPN_RUGERMK2_DESC; model = "\RH_de\RH_mk2.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/TT33.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/TT33.hpp index af336d0db..f6e68493b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/TT33.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/TT33.hpp @@ -1,6 +1,6 @@ class Tokarew_TT33_DZ: Makarov { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_TT33_NAME; descriptionShort = $STR_DZ_WPN_TT33_DESC; model = "\RH_de\RH_tt33.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/USP.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/USP.hpp index 360910a71..de788af13 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/USP.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/USP.hpp @@ -1,6 +1,6 @@ class USP_DZ : Colt1911 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_USP_NAME; descriptionShort = $STR_DZ_WPN_USP_DESC; model = "\RH_de\RH_usp.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp index cd1e92dd9..490fc489e 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp @@ -120,7 +120,7 @@ class OpticsModes\ class ACR_DZ_BASE: M4A1 { - scope = private; + scope = 0; ACR_FLASHLIGHT; magazines[] = {"ACR_30Rnd_680x43"}; class Library @@ -179,7 +179,7 @@ class ACR_DZ_BASE: M4A1 { }; class ACR_SD_DZ_BASE: M4A1_AIM_SD_camo { - scope = private; + scope = 0; ACR_FLASHLIGHT; magazines[] = {"ACR_30Rnd_680x43_SD"}; fireLightDuration = 0; @@ -241,7 +241,7 @@ class ACR_SD_DZ_BASE: M4A1_AIM_SD_camo { //ACR Woodland class ACR_WDL_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_ACR_NAME; weaponInfoType = "RscWeaponZeroing"; discreteDistance[] = {100,200,300,400,500,600}; @@ -260,7 +260,7 @@ class ACR_WDL_DZ : ACR_DZ_BASE class ACR_WDL_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_ACR_SD_NAME; weaponInfoType = "RscWeaponZeroing"; discreteDistance[] = {100,200,300,400,500,600}; @@ -675,7 +675,7 @@ class ACR_WDL_ACOG_GL_SD_DZ : ACR_WDL_GL_SD_DZ //ACR Woodland TWS class ACR_WDL_TWS_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_wdl_tws.paa"; model = "\fhq_remington\acr\acr_wdl_tws.p3d"; displayName = $STR_DZ_WPN_ACR_TWS_NAME; @@ -730,7 +730,7 @@ class ACR_WDL_TWS_GL_DZ : ACR_WDL_GL_DZ class ACR_WDL_TWS_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_wdl_tws_sd.paa"; model = "\fhq_remington\acr\acr_wdl_tws_sd.p3d"; displayName = $STR_DZ_WPN_ACR_TWS_SD_NAME; @@ -794,7 +794,7 @@ class ACR_WDL_TWS_GL_SD_DZ : ACR_WDL_GL_SD_DZ //ACR Woodland NV class ACR_WDL_NV_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_DESC; @@ -810,7 +810,7 @@ class ACR_WDL_NV_DZ : ACR_DZ_BASE class ACR_WDL_NV_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_SD_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC; @@ -833,7 +833,7 @@ class ACR_WDL_NV_SD_DZ : ACR_SD_DZ_BASE class ACR_WDL_NV_GL_DZ : ACR_WDL_GL_DZ { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_GL_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_DESC; @@ -856,7 +856,7 @@ class ACR_WDL_NV_GL_DZ : ACR_WDL_GL_DZ class ACR_WDL_NV_GL_SD_DZ : ACR_WDL_GL_SD_DZ { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_GL_SD_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC; @@ -886,7 +886,7 @@ class ACR_WDL_NV_GL_SD_DZ : ACR_WDL_GL_SD_DZ //ACR Black class ACR_BL_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_blk_iron.paa"; model = "\fhq_remington\acr\acr_blk_iron.p3d"; displayName = $STR_DZ_WPN_ACR_NAME; @@ -907,7 +907,7 @@ class ACR_BL_DZ : ACR_DZ_BASE class ACR_BL_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_blk_iron_sd.paa"; model = "\fhq_remington\acr\acr_blk_iron_sd.p3d"; displayName = $STR_DZ_WPN_ACR_SD_NAME; @@ -1338,7 +1338,7 @@ class ACR_BL_ACOG_GL_SD_DZ : ACR_BL_GL_SD_DZ //ACR Black TWS class ACR_BL_TWS_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_blk_tws.paa"; model = "\fhq_remington\acr\acr_blk_tws.p3d"; displayName = $STR_DZ_WPN_ACR_TWS_NAME; @@ -1393,7 +1393,7 @@ class ACR_BL_TWS_GL_DZ : ACR_BL_GL_DZ class ACR_BL_TWS_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_blk_tws_sd.paa"; model = "\fhq_remington\acr\acr_blk_tws_sd.p3d"; displayName = $STR_DZ_WPN_ACR_TWS_SD_NAME; @@ -1457,7 +1457,7 @@ class ACR_BL_TWS_GL_SD_DZ : ACR_BL_GL_SD_DZ //ACR Black NV class ACR_BL_NV_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_DESC; @@ -1473,7 +1473,7 @@ class ACR_BL_NV_DZ : ACR_DZ_BASE class ACR_BL_NV_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_SD_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC; @@ -1496,7 +1496,7 @@ class ACR_BL_NV_SD_DZ : ACR_SD_DZ_BASE class ACR_BL_NV_GL_DZ : ACR_BL_GL_DZ { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_GL_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_DESC; @@ -1519,7 +1519,7 @@ class ACR_BL_NV_GL_DZ : ACR_BL_GL_DZ class ACR_BL_NV_GL_SD_DZ : ACR_BL_GL_SD_DZ { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_GL_SD_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC; @@ -1547,7 +1547,7 @@ class ACR_BL_NV_GL_SD_DZ : ACR_BL_GL_SD_DZ //ACR Desert class ACR_DES_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_tan_iron.paa"; model = "\fhq_remington\acr\acr_tan_iron.p3d"; displayName = $STR_DZ_WPN_ACR_NAME; @@ -1568,7 +1568,7 @@ class ACR_DES_DZ : ACR_DZ_BASE class ACR_DES_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_tan_iron_sd.paa"; model = "\fhq_remington\acr\acr_tan_iron_sd.p3d"; displayName = $STR_DZ_WPN_ACR_SD_NAME; @@ -1999,7 +1999,7 @@ class ACR_DES_ACOG_GL_SD_DZ : ACR_DES_GL_SD_DZ //ACR Desert TWS class ACR_DES_TWS_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_tan_tws.paa"; model = "\fhq_remington\acr\acr_tan_tws.p3d"; displayName = $STR_DZ_WPN_ACR_TWS_NAME; @@ -2054,7 +2054,7 @@ class ACR_DES_TWS_GL_DZ : ACR_DES_GL_DZ class ACR_DES_TWS_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_tan_tws_sd.paa"; model = "\fhq_remington\acr\acr_tan_tws_sd.p3d"; displayName = $STR_DZ_WPN_ACR_TWS_SD_NAME; @@ -2118,7 +2118,7 @@ class ACR_DES_TWS_GL_SD_DZ : ACR_DES_GL_SD_DZ //ACR Desert NV class ACR_DES_NV_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_DESC; @@ -2134,7 +2134,7 @@ class ACR_DES_NV_DZ : ACR_DZ_BASE class ACR_DES_NV_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_SD_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC; @@ -2157,7 +2157,7 @@ class ACR_DES_NV_SD_DZ : ACR_SD_DZ_BASE class ACR_DES_NV_GL_DZ : ACR_DES_GL_DZ { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_GL_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_DESC; @@ -2180,7 +2180,7 @@ class ACR_DES_NV_GL_DZ : ACR_DES_GL_DZ class ACR_DES_NV_GL_SD_DZ : ACR_DES_GL_SD_DZ { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_GL_SD_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC; @@ -2209,7 +2209,7 @@ class ACR_DES_NV_GL_SD_DZ : ACR_DES_GL_SD_DZ //ACR Snow class ACR_SNOW_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_snw_iron.paa"; model = "\fhq_remington\acr\acr_snw_iron.p3d"; displayName = $STR_DZ_WPN_ACR_NAME; @@ -2230,7 +2230,7 @@ class ACR_SNOW_DZ : ACR_DZ_BASE class ACR_SNOW_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_snw_iron_sd.paa"; model = "\fhq_remington\acr\acr_snw_iron_sd.p3d"; displayName = $STR_DZ_WPN_ACR_SD_NAME; @@ -2661,7 +2661,7 @@ class ACR_SNOW_ACOG_GL_SD_DZ : ACR_SNOW_GL_SD_DZ //ACR Snow TWS class ACR_SNOW_TWS_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_snw_tws.paa"; model = "\fhq_remington\acr\acr_snw_tws.p3d"; displayName = $STR_DZ_WPN_ACR_TWS_NAME; @@ -2716,7 +2716,7 @@ class ACR_SNOW_TWS_GL_DZ : ACR_SNOW_GL_DZ class ACR_SNOW_TWS_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; picture = "\fhq_remington\acr\ui\i_acr_snw_tws_sd.paa"; model = "\fhq_remington\acr\acr_snw_tws_sd.p3d"; displayName = $STR_DZ_WPN_ACR_TWS_SD_NAME; @@ -2780,7 +2780,7 @@ class ACR_SNOW_TWS_GL_SD_DZ : ACR_SNOW_GL_SD_DZ //ACR Snow NV class ACR_SNOW_NV_DZ : ACR_DZ_BASE { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_DESC; @@ -2796,7 +2796,7 @@ class ACR_SNOW_NV_DZ : ACR_DZ_BASE class ACR_SNOW_NV_SD_DZ : ACR_SD_DZ_BASE { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_SD_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC; @@ -2819,7 +2819,7 @@ class ACR_SNOW_NV_SD_DZ : ACR_SD_DZ_BASE class ACR_SNOW_NV_GL_DZ : ACR_SNOW_GL_DZ { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_GL_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_DESC; @@ -2842,7 +2842,7 @@ class ACR_SNOW_NV_GL_DZ : ACR_SNOW_GL_DZ class ACR_SNOW_NV_GL_SD_DZ : ACR_SNOW_GL_SD_DZ { - scope = public; + scope = 2; ACR_NV; displayName = $STR_DZ_WPN_ACR_NV_GL_SD_NAME; descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp index 143d260ed..3ce48e1e6 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp @@ -1,6 +1,6 @@ class AN94_DZ: AK_74 { - scope = public; + scope = 2; opticsZoomInit = 0.375; model = "\RH_aks\RH_an94.p3d"; picture = "\RH_aks\inv\an94.paa"; @@ -111,7 +111,7 @@ class AN94_DZ: AK_74 }; class AN94_GL_DZ: AN94_DZ { - scope = public; + scope = 2; model = "\RH_aks\RH_an94gl.p3d"; modelOptics = "-"; optics = 1; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AS50.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AS50.hpp index e8b195741..a487b1582 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AS50.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AS50.hpp @@ -1,7 +1,7 @@ class BAF_AS50_scoped; class BAF_AS50_scoped_DZ : BAF_AS50_scoped { displayname = "AS50"; - type = WeaponSlotPrimary; + type = 1; canlock = 0; //cursor = "RifleCursor"; //cursoraim = "Foresight"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Anzio_20.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Anzio_20.hpp index c99b18b60..a04419039 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Anzio_20.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Anzio_20.hpp @@ -2,5 +2,5 @@ class Anzio_20; class Anzio_20_DZ : Anzio_20 { displayName = $STR_DZ_WPN_ANZIO_NAME; descriptionShort = $STR_DZ_WPN_ANZIO_DESC; - type = WeaponSlotPrimary; + type = 1; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/BarrettMRAD.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/BarrettMRAD.hpp index e4b28c075..c00bd9c89 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/BarrettMRAD.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/BarrettMRAD.hpp @@ -1,7 +1,7 @@ class Barrett_MRAD_Iron_DZ: m107 { - scope = public; - type = WeaponSlotPrimary; + scope = 2; + type = 1; canlock = 0; autoFire = 0; displayname = $STR_DZ_WPN_BARETT_MRAD_IRON_NAME; @@ -55,8 +55,8 @@ class Barrett_MRAD_CCO_DZ: Barrett_MRAD_Iron_DZ class Barrett_MRAD_Sniper_DZ: m107 { - scope = public; - type = WeaponSlotPrimary; + scope = 2; + type = 1; canlock = 0; autoFire = 0; magazines[] = {10Rnd_86x70_MRAD}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CTAR21.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CTAR21.hpp index 34a54fbd0..e31909ee3 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CTAR21.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CTAR21.hpp @@ -1,6 +1,6 @@ class CTAR21_DZ: M4A1 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_CTAR21_NAME; model = "\RH_hk416\RH_ctar21.p3d"; picture = "\RH_hk416\inv\ctar21.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Crossbow.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Crossbow.hpp index 9e6c35cf4..a8539546d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Crossbow.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Crossbow.hpp @@ -56,7 +56,7 @@ class Crossbow_Base : Rifle class Crossbow_DZ : Crossbow_Base { - scope = public; + scope = 2; model = "z\addons\community_crossbow\models\crossbow.p3d"; picture = "\z\addons\community_crossbow\icons\crossbow_icon.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp index f81472fab..6192ec2d8 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp @@ -1,6 +1,6 @@ class G3_DZ: FNFAL_DZ { - scope = public; + scope = 2; model = "\z\addons\dayz_epoch_w\g3\h4g3.p3d"; picture = "\z\addons\dayz_epoch_w\g3\data\w_g3_ca.paa"; displayName = $STR_DZ_WPN_G3_NAME; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Groza.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Groza.hpp index debaec0ad..9635e6257 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Groza.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Groza.hpp @@ -1,7 +1,7 @@ //Groza-9 class Groza9_DZ: AKM_DZ { - scope = public; + scope = 2; model = "\RH_aks\RH_oc14.p3d"; picture = "\RH_aks\inv\oc14.paa"; displayName = $STR_DZ_WPN_Groza9_NAME; @@ -150,7 +150,7 @@ class Groza9_Sniper_SD_DZ: Groza9_SD_DZ //Groza-1 class Groza1_DZ: AKM_DZ { - scope = public; + scope = 2; model = "\RH_aks\RH_gr1.p3d"; picture = "\RH_aks\inv\gr1.paa"; displayName = $STR_DZ_WPN_Groza1_NAME; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK53.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK53.hpp index 53595b7e7..fe09e87c7 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK53.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK53.hpp @@ -1,6 +1,6 @@ class HK53A3_DZ: M4A1 { - scope = public; + scope = 2; model = "\RH_smg\RH_HK53.p3d"; displayName = $STR_DZ_WPN_HK53A3_NAME; UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp index 272c69393..9e42914a4 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp @@ -1,6 +1,6 @@ class KAC_PDW_DZ: Rifle { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_KACPDW_NAME; descriptionShort = $STR_DZ_WPN_KACPDW_DESC; model = "\RH_pdw\RH_pdw.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/KSVK.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/KSVK.hpp index 93ccab818..658fc83ce 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/KSVK.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/KSVK.hpp @@ -1,4 +1,4 @@ class ksvk; class KSVK_DZE:ksvk { - type = WeaponSlotPrimary; + type = 1; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp index 6b95a76b1..28624e680 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp @@ -4,7 +4,7 @@ class L110A1_CCO_DZ : BAF_L110A1_Aim picture = "\z\addons\dayz_communityweapons\l110a1\data\w_l110a1_cco_ca.paa"; displayName = $STR_DZ_WPN_L110A1_CCO_NAME; irDistance = 0; - type = WeaponSlotPrimary; + type = 1; magazines[] = { 200Rnd_556x45_L110A1, @@ -64,7 +64,7 @@ class L110A1_DZ : L110A1_CCO_DZ }; class BAF_L110A1_Aim_DZE: BAF_L110A1_Aim { //Slightly different scope from L110A1_CCO_DZ, otherwise identical - type = WeaponSlotPrimary; + type = 1; magazines[] = { 200Rnd_556x45_L110A1, diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M107.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M107.hpp index f9034a5a6..6463300de 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M107.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M107.hpp @@ -2,8 +2,8 @@ class m107; class m107_DZ: m107 { displayname = $STR_DZ_WPN_M107_NAME; descriptionShort = $STR_DZ_WPN_M107_DESC; - scope = public; - type = WeaponSlotPrimary; + scope = 2; + type = 1; canlock = 0; magazines[] = {"10Rnd_127x99_m107"}; begin1[] = {"ca\sounds\weapons\rifles\m107",2.51189,1,2000}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp index c380dd416..71bb6f8cf 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp @@ -45,7 +45,7 @@ class M16A2_Rusty_DZ : M16A2 { scale[] = {1, 1, 0.5}; brightness = 0.1; }; - scope = public; + scope = 2; picture = "\ice_apo_weapons\Data\m16_ca.paa"; model = "\ice_apo_weapons\M16_proxy"; displayName = $STR_DZE_WPN_M16RUSTY_NAME; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M1ASC.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M1ASC.hpp index 21ad2f87b..bca10dd26 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M1ASC.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M1ASC.hpp @@ -38,7 +38,7 @@ class OpticsModes\ class M1A_SC16_BL_DZ: M14_EP1 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_M1ASC16_NAME; descriptionShort = $STR_DZ_WPN_M1ASC16_DESC; reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20}; @@ -187,7 +187,7 @@ class M1A_SC16_BL_Sniper_DZ: M1A_SC16_BL_DZ class M1A_SC16_TAN_DZ: M14_EP1 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_M1ASC16_NAME; descriptionShort = $STR_DZ_WPN_M1ASC16_DESC; reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20}; @@ -338,7 +338,7 @@ class M1A_SC16_TAN_Sniper_DZ: M1A_SC16_TAN_DZ class M1A_SC2_BL_DZ: M14_EP1 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_M1ASC2_NAME; descriptionShort = $STR_DZ_WPN_M1ASC2_DESC; reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M200CheyTac.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M200CheyTac.hpp index edc2c6127..7021761eb 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M200CheyTac.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M200CheyTac.hpp @@ -1,7 +1,7 @@ class M200_CheyTac_DZ: m107 { - scope = public; - type = WeaponSlotPrimary; + scope = 2; + type = 1; canlock = 0; displayname = $STR_DZ_WPN_M200_CHEYTAC_NAME; descriptionShort = $STR_DZ_WPN_M200_CHEYTAC_DESC; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M21.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M21.hpp index 5b0fd1183..4769c558a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M21.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M21.hpp @@ -1,6 +1,6 @@ class M21_DZ: M14_EP1 { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_M21_NAME; descriptionShort = $STR_DZ_WPN_M21_DESC; model = "\RH_m14\RH_m21.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp index a3eb97d6a..8906312a4 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp @@ -3,7 +3,7 @@ class M240_DZ : M240 picture = "\z\addons\dayz_communityweapons\m240\data\w_m240_ca.paa"; displayName = $STR_DZ_WPN_M240_NAME; - type = WeaponSlotPrimary; + type = 1; magazines[] = {100Rnd_762x51_M240}; @@ -51,5 +51,5 @@ class M240_Holo_DZ : M240_CCO_DZ }; class m240_scoped_EP1_DZE:m240_scoped_EP1 { //has m145 scope - type = WeaponSlotPrimary; + type = 1; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp index 7a5ae1631..33686d070 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp @@ -4,7 +4,7 @@ class M249_CCO_DZ : M249 picture = "\z\addons\dayz_communityweapons\m249\data\w_m249_cco_ca.paa"; displayName = $STR_DZ_WPN_M249_CCO_NAME; - type = WeaponSlotPrimary; + type = 1; magazines[] = { @@ -67,7 +67,7 @@ class M249_Holo_DZ : M249_CCO_DZ class M249_EP1; class M249_EP1_DZ: M249_EP1 { //Iron sight with shorter stock (slightly different look from M249_DZ) can also fire MG36 mags - type = WeaponSlotPrimary; + type = 1; magazines[] = { @@ -84,7 +84,7 @@ class M249_EP1_DZ: M249_EP1 { //Iron sight with shorter stock (slightly differen class M249_m145_EP1; class M249_m145_EP1_DZE: M249_m145_EP1 { - type = WeaponSlotPrimary; + type = 1; magazines[] = { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M31.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M31.hpp index acff7a019..7b300b5f9 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M31.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M31.hpp @@ -1,6 +1,6 @@ class M31_DZ: MP5A5 { - scope = public; + scope = 2; model = "z\addons\dayz_epoch_w\suomi\suomikp31.p3d"; displayName = $STR_DZ_WPN_M31_NAME; descriptionShort = $STR_DZ_WPN_M31_DESC; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp index 9ea855f7f..fd2078174 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp @@ -1564,7 +1564,7 @@ class M4A1_GL_ACOG_SD_MFL_DZ : M4A1_GL_SD_MFL_DZ class M4A1_Rusty_DZ : M4A1 { M4A1_FLASHLIGHT; - scope = public; + scope = 2; model = "\ice_apo_weapons\M4_ironsight"; picture = "\ice_apo_weapons\Data\m4a1_ca.paa"; displayName = $STR_DZE_WPN_M4RUSTY_NAME; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M60A4.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M60A4.hpp index 955ce4731..cbe42b0d2 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M60A4.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M60A4.hpp @@ -1,4 +1,4 @@ class M60A4_EP1; class M60A4_EP1_DZE : M60A4_EP1 { - type = WeaponSlotPrimary; + type = 1; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MAT49.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MAT49.hpp index c0dbcd245..009909901 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MAT49.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MAT49.hpp @@ -1,6 +1,6 @@ class MAT49_DZ: MP5A5 { - scope = public; + scope = 2; model = "\z\addons\dayz_epoch_w\mat49\h4_mat49"; displayName = $STR_DZ_WPN_MAT49_NAME; descriptionShort = $STR_DZ_WPN_MAT49_DESC; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp index 0c7d4a22c..691613ec8 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp @@ -1,6 +1,6 @@ class MR43_Base : Rifle { - scope = public; + scope = 2; descriptionShort = $STR_DZ_WPN_MR43_DESC; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MSR.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MSR.hpp index 54066dd26..cea4cedd0 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MSR.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MSR.hpp @@ -1,6 +1,6 @@ class MSR_BASE: Rifle { - scope = private; + scope = 0; irLaserPos = "laser pos"; irLaserEnd = "laser dir"; irDistance = 100; @@ -53,7 +53,7 @@ class MSR_BASE: Rifle }; class MSR_SD_BASE: Rifle { - scope = private; + scope = 0; irLaserPos = "laser pos"; irLaserEnd = "laser dir"; irDistance = 100; @@ -109,7 +109,7 @@ class MSR_SD_BASE: Rifle class MSR_DZ: MSR_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_MSR_NAME; descriptionShort = $STR_DZ_WPN_MSR_DESC; model = "\fhq_remington\MSR\MSR.p3d"; @@ -118,7 +118,7 @@ class MSR_DZ: MSR_BASE class MSR_SD_DZ: MSR_SD_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_MSRSD_NAME; descriptionShort = $STR_DZ_WPN_MSR_SD_DESC; model = "\fhq_remington\MSR\MSR_sd.p3d"; @@ -127,7 +127,7 @@ class MSR_SD_DZ: MSR_SD_BASE class MSR_NV_DZ: MSR_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_MSR_NV_NAME; descriptionShort = $STR_DZ_WPN_MSR_NV_DESC; model = "\fhq_remington\MSR\MSR_nv.p3d"; @@ -137,7 +137,7 @@ class MSR_NV_DZ: MSR_BASE class MSR_NV_SD_DZ: MSR_SD_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_MSRSD_NV_NAME; descriptionShort = $STR_DZ_WPN_MSR_SD_NV_DESC; model = "\fhq_remington\MSR\MSR_nv_sd.p3d"; @@ -147,7 +147,7 @@ class MSR_NV_SD_DZ: MSR_SD_BASE class MSR_TWS_DZ: MSR_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_MSR_TWS_NAME; descriptionShort = $STR_DZ_WPN_MSR_TWS_DESC; model = "\fhq_remington\MSR\MSR_tws.p3d"; @@ -184,7 +184,7 @@ class MSR_TWS_DZ: MSR_BASE class MSR_TWS_SD_DZ: MSR_SD_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_MSRSD_TWS_NAME; descriptionShort = $STR_DZ_WPN_MSR_SD_TWS_DESC; model = "\fhq_remington\MSR\MSR_tws_sd.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Mk48.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Mk48.hpp index 0a46117ee..a52b15977 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Mk48.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Mk48.hpp @@ -4,7 +4,7 @@ class Mk48_CCO_DZ : Mk_48 picture = "\z\addons\dayz_communityweapons\mk48\data\w_mk48_cco_camo_ca.paa"; displayName = $STR_DZ_WPN_MK48_CCO_NAME; - type = WeaponSlotPrimary; + type = 1; magazines[] = {100Rnd_762x51_M240}; @@ -61,7 +61,7 @@ class Mk48_Holo_DZ : Mk48_CCO_DZ class Mk_48_DES_EP1; class Mk48_DES_CCO_DZ: Mk_48_DES_EP1 { displayName = $STR_DZ_WPN_MK48_CCO_NAME; - type = WeaponSlotPrimary; + type = 1; weaponInfoType = "RscWeaponZeroing"; discreteDistance[] = {300,400,500,600,700,800,900,1000}; discreteDistanceInitIndex = 0; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Mosin.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Mosin.hpp index 8bad16c98..60a18abe5 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Mosin.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Mosin.hpp @@ -53,7 +53,7 @@ class Mosin_Base : Rifle class Mosin_DZ : Mosin_Base { - scope = public; + scope = 2; model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_animated"; picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\1891.paa"; @@ -220,7 +220,7 @@ class Mosin_Belt_MFL_DZ : Mosin_MFL_DZ class Mosin_PU_DZ : Mosin_Base { - scope = public; + scope = 2; model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_scoped_animated"; picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\1891S.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp index b4a0a0bd2..324501791 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp @@ -1,6 +1,6 @@ class PKM_DZ : PK //Iron sight PKM { - type = WeaponSlotPrimary; + type = 1; model = "z\addons\dayz_communityweapons\pkm\pkm.p3d"; displayName = $STR_DZ_WPN_PKM_NAME; @@ -19,6 +19,7 @@ class PKM_DZ : PK //Iron sight PKM }; }; -class Pecheneg_DZ: Pecheneg { //PKP with long range scope - type = WeaponSlotPrimary; +class Pecheneg_DZ: Pecheneg //PKP with long range scope +{ + type = 1; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp index 3824239b8..2db879de5 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp @@ -38,7 +38,7 @@ class OpticsModes\ class RK95_DZ: AKM_DZ { - scope = public; + scope = 2; opticsZoomInit = 0.375; model = "\RH_aks\RH_rk95.p3d"; picture = "\RH_aks\inv\rk95.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RSASS.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RSASS.hpp index 83692a83b..02706c26e 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RSASS.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RSASS.hpp @@ -1,6 +1,6 @@ class RSASS_BASE: DMR { - scope = private; + scope = 0; htMin = 1; htMax = 420; afMax = 0; @@ -114,7 +114,7 @@ class RSASS_SD_BASE: RSASS_BASE class RSASS_DZ: RSASS_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_RSASS_NAME; descriptionShort = $STR_DZ_WPN_RSASS_DESC; model = "\fhq_remington\rsass\rsass.p3d"; @@ -128,7 +128,7 @@ class RSASS_DZ: RSASS_BASE class RSASS_TWS_DZ: RSASS_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_RSASS_TWS_NAME; descriptionShort = $STR_DZ_WPN_RSASS_TWS_DESC; model = "\fhq_remington\rsass\rsass_tws.p3d"; @@ -184,7 +184,7 @@ class RSASS_TWS_DZ: RSASS_BASE }; class RSASS_SD_DZ: RSASS_SD_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_RSASSSD_NAME; descriptionShort = $STR_DZ_WPN_RSASS_SD_DESC; model = "\fhq_remington\rsass\rsass_sd.p3d"; @@ -198,7 +198,7 @@ class RSASS_SD_DZ: RSASS_SD_BASE class RSASS_TWS_SD_DZ: RSASS_SD_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_RSASSSD_TWS_NAME; descriptionShort = $STR_DZ_WPN_RSASS_SD_TWS_DESC; model = "\fhq_remington\rsass\rsass_tws_sd.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp index 08d5472fb..79d0afa83 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp @@ -22,7 +22,7 @@ class Remington870_Base : Rifle { - scope = public; + scope = 2; descriptionShort = $STR_DZ_WPN_R870_DESC; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Sten.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Sten.hpp index df6c60213..65547859a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Sten.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Sten.hpp @@ -1,6 +1,6 @@ class Sten_MK_DZ: MP5A5 { - scope = public; + scope = 2; model = "z\addons\dayz_epoch_w\sten\h4_sten.p3d"; displayName = $STR_DZ_WPN_STEN_MK_NAME; picture = "\z\addons\dayz_epoch_w\sten\data\W_sten_CA.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SteyrAug.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SteyrAug.hpp index 7d0a13724..830846cc3 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SteyrAug.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SteyrAug.hpp @@ -21,7 +21,7 @@ class OpticsModes\ class SteyrAug_A3_base: Rifle { - scope = private; + scope = 0; displayName = ""; descriptionShort = $STR_DZ_WPN_AUGA3_DESC; model = "\MIDF_Weapons\Aug_a3\Aug_a3.p3d"; @@ -72,7 +72,7 @@ class SteyrAug_A3_base: Rifle }; class SteyrAug_A3_Green_DZ: SteyrAug_A3_base { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_AUGA3_NAME; modelOptics = "\MIDF_Weapons\optic\leupold_cqt.p3d"; picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_green.paa"; @@ -143,7 +143,7 @@ class SteyrAug_A3_ACOG_Blue_DZ: SteyrAug_A3_ACOG_Green_DZ { }; class SteyrAug_A3_Holo_Green_DZ: SteyrAug_A3_base { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_AUGA3_HOLO_NAME; model = "\MIDF_Weapons\Aug_a3\Aug_a3_eotech.p3d"; picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_eotech_green.paa"; @@ -173,7 +173,7 @@ class SteyrAug_A3_Holo_Blue_DZ: SteyrAug_A3_Holo_Green_DZ { }; class SteyrAug_A3_GL_Green_DZ: SteyrAug_A3_Green_DZ { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_AUGA3_GL_NAME; picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_gl_green.paa"; model = "\MIDF_Weapons\Aug_a3\aug_a3_gl.p3d"; @@ -264,7 +264,7 @@ class SteyrAug_A3_ACOG_GL_Blue_DZ: SteyrAug_A3_ACOG_GL_Green_DZ { }; class SteyrAug_A3_Holo_GL_Green_DZ: SteyrAug_A3_base { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_AUGA3_HOLO_GL_NAME; picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_eotech_gl_green.paa"; model = "\MIDF_Weapons\Aug_a3\aug_a3_eotech_gl.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Usas12.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Usas12.hpp index a01bef7bf..a13051fd6 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Usas12.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Usas12.hpp @@ -1,6 +1,6 @@ class USAS12_DZ: Saiga12K { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_USAS12_NAME; descriptionShort = $STR_DZ_WPN_USAS12_DESC; model = "\z\addons\dayz_epoch_w\usas12\h4_usas12.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/WA2000.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/WA2000.hpp index 4944b3f06..9997e078f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/WA2000.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/WA2000.hpp @@ -1,7 +1,7 @@ class WA2000_DZ: m107 { - scope = public; - type = WeaponSlotPrimary; + scope = 2; + type = 1; canlock = 0; displayname = $STR_DZ_WPN_WA2000_NAME; descriptionShort = $STR_DZ_WPN_WA2000_DESC; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Winchester1866.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Winchester1866.hpp index f0724a77e..78547388e 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Winchester1866.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Winchester1866.hpp @@ -1,6 +1,6 @@ class Winchester1866_Base : Rifle { - scope = public; + scope = 2; descriptionShort = $STR_DZ_WPN_W1866_DESC; magazines[] = {15Rnd_W1866_Slug}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp index 1f71ca390..a897d4d85 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp @@ -1,6 +1,6 @@ class XM2010_BASE: Rifle { - scope = private; + scope = 0; irLaserPos = "laser pos"; irLaserEnd = "laser dir"; irDistance = 100; @@ -53,7 +53,7 @@ class XM2010_BASE: Rifle class XM2010_SD_BASE: Rifle { - scope = private; + scope = 0; irLaserPos = "laser pos"; irLaserEnd = "laser dir"; irDistance = 100; @@ -108,7 +108,7 @@ class XM2010_SD_BASE: Rifle class XM2010_DZ: XM2010_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_XM2010_NAME; descriptionShort = $STR_DZ_WPN_XM2010_DESC; model = "\fhq_remington\XM2010\XM2010.p3d"; @@ -116,7 +116,7 @@ class XM2010_DZ: XM2010_BASE }; class XM2010_SD_DZ: XM2010_SD_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_XM2010SD_NAME; descriptionShort = $STR_DZ_WPN_XM2010_SD_DESC; model = "\fhq_remington\XM2010\XM2010_sd.p3d"; @@ -124,7 +124,7 @@ class XM2010_SD_DZ: XM2010_SD_BASE }; class XM2010_NV_DZ: XM2010_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_XM2010_NV_NAME; descriptionShort = $STR_DZ_WPN_XM2010_NV_DESC; model = "\fhq_remington\XM2010\XM2010_nv.p3d"; @@ -133,7 +133,7 @@ class XM2010_NV_DZ: XM2010_BASE }; class XM2010_NV_SD_DZ: XM2010_SD_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_XM2010SD_NV_NAME; descriptionShort = $STR_DZ_WPN_XM2010_SD_NV_DESC; model = "\fhq_remington\XM2010\XM2010_nv_sd.p3d"; @@ -142,7 +142,7 @@ class XM2010_NV_SD_DZ: XM2010_SD_BASE }; class XM2010_TWS_DZ: XM2010_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_XM2010_TWS_NAME; descriptionShort = $STR_DZ_WPN_XM2010_TWS_DESC; model = "\fhq_remington\XM2010\XM2010_tws.p3d"; @@ -178,7 +178,7 @@ class XM2010_TWS_DZ: XM2010_BASE }; class XM2010_TWS_SD_DZ: XM2010_SD_BASE { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_XM2010SD_TWS_NAME; descriptionShort = $STR_DZ_WPN_XM2010_SD_TWS_DESC; model = "\fhq_remington\XM2010\XM2010_tws_sd.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM8.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM8.hpp index 6ff28d099..0556f431c 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM8.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM8.hpp @@ -1,6 +1,6 @@ class m8_carbine; class XM8_DZ: m8_carbine { - scope = public; + scope = 2; displayName = $STR_DZ_WPN_XM8_CARBINE_NAME; descriptionShort = $STR_DSS_XM8; model = "\RH_mgswp\RH_xm8.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp index 888097564..34ddc1e71 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp @@ -1,11 +1,14 @@ -class ItemAPSI_DZE : ItemCore { - scope = public; +class ItemAPSI_DZE : ItemCore +{ + scope = 2; displayName = $STR_EQUIP_APSI; picture = "\dayz_epoch_c\icons\tools\ItemAPSI.paa"; descriptionShort = $STR_EQUIP_APSI_DESC; }; -class ItemAPSIBroken_DZE : ItemAPSI_DZE { +class ItemAPSIBroken_DZE : ItemCore +{ + scope = 2; displayName = $STR_EQUIP_APSI_BROKEN; descriptionShort = $STR_EQUIP_APSI_BROKEN_DESC; picture = "\dayz_epoch_c\icons\tools\ItemAPSI.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Chainsaw.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Chainsaw.hpp index fad8bd023..003512194 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Chainsaw.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Chainsaw.hpp @@ -1,115 +1,87 @@ - class ChainSaw: Rifle +class ChainSaw: Rifle +{ + scope = 2; + emptySound[] = {"",10,1}; + soundBullet[] = {"emptySound",1}; + model = "\z\addons\dayz_epoch\models\chainsaw.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_chainsaw_CA.paa"; + displayName = $STR_EPOCH_CHAINSAW; + cursor = ""; + cursoraim = "\ca\Weapons\Data\clear_empty"; + + modes[] = {"manual"}; + handAnim[]= { - scope = public; - //melee= "true"; - - /* - bullet1[] = {"ca\sounds\weapons\shells\big_shell_wood_01",0.0707946,1,15}; - bullet2[] = {"ca\sounds\weapons\shells\big_shell_wood_02",0.0707946,1,15}; - bullet3[] = {"ca\sounds\weapons\shells\big_shell_wood_03",0.0707946,1,15}; - bullet4[] = {"ca\sounds\weapons\shells\big_shell_wood_04",0.0707946,1,15}; - bullet5[] = {"ca\sounds\weapons\shells\big_shell_wood_05",0.0707946,1,15}; - bullet6[] = {"ca\sounds\weapons\shells\big_shell_wood_06",0.0707946,1,15}; - bullet7[] = {"ca\sounds\weapons\shells\big_shell_wood_07",0.0707946,1,15}; - bullet8[] = {"ca\sounds\weapons\shells\big_shell_dirt_04",0.0707946,1,15}; - bullet9[] = {"ca\sounds\weapons\shells\big_shell_soft_01",0.0707946,1,15}; - bullet10[] = {"ca\sounds\weapons\shells\big_shell_soft_02",0.0707946,1,15}; - bullet11[] = {"ca\sounds\weapons\shells\big_shell_soft_03",0.0707946,1,15}; - bullet12[] = {"ca\sounds\weapons\shells\big_shell_soft_04",0.0707946,1,15}; - */ - - //soundBullet[] = {"bullet1",0.083,"bullet2",0.083,"bullet3",0.083,"bullet4",0.083,"bullet5",0.083,"bullet6",0.083,"bullet7",0.083,"bullet8",0.083,"bullet9",0.083,"bullet10",0.083,"bullet11",0.083,"bullet12",0.083}; - - emptySound[] = {"",10,1}; - soundBullet[] = {"emptySound",1}; - - - model = "\z\addons\dayz_epoch\models\chainsaw.p3d"; - - picture = "\z\addons\dayz_epoch\pictures\equip_chainsaw_CA.paa"; - - displayName = $STR_EPOCH_CHAINSAW; - - cursor = ""; - cursoraim = "\ca\Weapons\Data\clear_empty"; - - modes[] = {"manual"}; - handAnim[]= - { - "OFP2_ManSkeleton", - "\z\addons\dayz_code\anim\saw_idle.rtm" - }; - class manual: Mode_FullAuto - { - recoil = "recoil_auto_machinegun_10outof10"; - recoilProne = "recoil_auto_machinegun_prone_10outof10"; - - dispersion = 0.2; - - begin1[] = {"\dayz_sfx\chainsaw\running2.ogg",1.77828,1,1000}; - soundBegin[] = {"begin1",1}; - - //end1[] = {"\dayz_sfx\chainsaw\running2.ogg",1.77828,1,1000}; - //soundEnd[] = {"end1",1}; - - distanceZoomMin = 50; - distanceZoomMax = 50; - canDrop = 0; - UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa"; - optics = 1; - modelOptics = "-"; - - burst = 1; - multiplier = 1; - - soundContinuous = 0; - soundBurst = 0; - - useAction = 0; - useActionTitle = ""; - - // from hatchet - minRange = 0.5; - minRangeProbab = 0.8; - midRange = 1; - midRangeProbab = 1.5; - maxRange = 2; - maxRangeProbab = 2.5; - - showToPlayer = 1; - //reloadTime = 0.0708762; - reloadTime = 0.12; - displayName = $STR_EPOCH_CHAINSAW_GAS; - }; - aiDispersionCoefY = 21; - aiDispersionCoefX = 21; - dexterity = 0.51; - reloadMagazineSound[] = {"\dayz_sfx\chainsaw\start-attempt.ogg",0.1,1,20}; - drySound[] = {"\dayz_sfx\chainsaw\start-attempt.ogg",0.01,1,10}; - magazines[] = {"CSGAS"}; - class Library - { - libTextDesc = $STR_EPOCH_DESC_CHAINSAW; - }; - descriptionShort = $STR_EPOCH_DESC_CHAINSAW; + "OFP2_ManSkeleton", + "\z\addons\dayz_code\anim\saw_idle.rtm" }; - class ChainSawB : ChainSaw { - model = "\z\addons\dayz_epoch\models\chainsaw_B.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_chainsawB_CA.paa"; - descriptionShort = $STR_EPOCH_DESC_CHAINSAW_BLUE; + class manual: Mode_FullAuto + { + recoil = "recoil_auto_machinegun_10outof10"; + recoilProne = "recoil_auto_machinegun_prone_10outof10"; + dispersion = 0.2; + + begin1[] = {"\dayz_sfx\chainsaw\running2.ogg",1.77828,1,1000}; + soundBegin[] = {"begin1",1}; + + distanceZoomMin = 50; + distanceZoomMax = 50; + canDrop = 0; + UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa"; + optics = 1; + modelOptics = "-"; + + burst = 1; + multiplier = 1; + + soundContinuous = 0; + soundBurst = 0; + + useAction = 0; + useActionTitle = ""; + + // from hatchet + minRange = 0.5; + minRangeProbab = 0.8; + midRange = 1; + midRangeProbab = 1.5; + maxRange = 2; + maxRangeProbab = 2.5; + + showToPlayer = 1; + //reloadTime = 0.0708762; + reloadTime = 0.12; + displayName = $STR_EPOCH_CHAINSAW_GAS; }; - class ChainSawG : ChainSaw { - model = "\z\addons\dayz_epoch\models\chainsaw_G.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_chainsawG_CA.paa"; - descriptionShort = $STR_EPOCH_DESC_CHAINSAW_GREEN; - }; - class ChainSawP : ChainSaw { - model = "\z\addons\dayz_epoch\models\chainsaw_P.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_chainsawP_CA.paa"; - descriptionShort = $STR_EPOCH_DESC_CHAINSAW_PINK; - }; - class ChainSawR : ChainSaw { - model = "\z\addons\dayz_epoch\models\chainsaw_R.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_chainsawR_CA.paa"; - descriptionShort = $STR_EPOCH_DESC_CHAINSAW_RED; + aiDispersionCoefY = 21; + aiDispersionCoefX = 21; + dexterity = 0.51; + reloadMagazineSound[] = {"\dayz_sfx\chainsaw\start-attempt.ogg",0.1,1,20}; + drySound[] = {"\dayz_sfx\chainsaw\start-attempt.ogg",0.01,1,10}; + magazines[] = {"CSGAS"}; + class Library + { + libTextDesc = $STR_EPOCH_DESC_CHAINSAW; }; + descriptionShort = $STR_EPOCH_DESC_CHAINSAW; +}; +class ChainSawB : ChainSaw { + model = "\z\addons\dayz_epoch\models\chainsaw_B.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_chainsawB_CA.paa"; + descriptionShort = $STR_EPOCH_DESC_CHAINSAW_BLUE; +}; +class ChainSawG : ChainSaw { + model = "\z\addons\dayz_epoch\models\chainsaw_G.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_chainsawG_CA.paa"; + descriptionShort = $STR_EPOCH_DESC_CHAINSAW_GREEN; +}; +class ChainSawP : ChainSaw { + model = "\z\addons\dayz_epoch\models\chainsaw_P.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_chainsawP_CA.paa"; + descriptionShort = $STR_EPOCH_DESC_CHAINSAW_PINK; +}; +class ChainSawR : ChainSaw { + model = "\z\addons\dayz_epoch\models\chainsaw_R.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_chainsawR_CA.paa"; + descriptionShort = $STR_EPOCH_DESC_CHAINSAW_RED; +}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Crowbar.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Crowbar.hpp index 4134f17d5..a37dea23d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Crowbar.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Crowbar.hpp @@ -1,7 +1,6 @@ class ItemCrowbar : ItemCore { - scope = public; - + scope = 2; model = "\dayz_equip\models\crowbar.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_crowbar_CA.paa"; displayName = $STR_EQUIP_NAME_CROWBAR; @@ -41,8 +40,7 @@ class ItemCrowbar : ItemCore class ItemCrowbarBent : ItemCore { - scope = public; - + scope = 2; model = "\dayz_equip\models\crowbar.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_crowbar_CA.paa"; displayName = $STR_EQUIP_NAME_CROWBARBENT; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp index f3735f87a..36b8c18bf 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp @@ -1,19 +1,15 @@ class ItemEtool : ItemCore { - scope = public; + scope = 2; model = "\dayz_equip\models\etool.p3d"; picture = "\dayz_equip\textures\equip_etool_ca.paa"; displayName = $STR_EQUIP_NAME_1; - descriptionShort = $STR_EQUIP_DESC_1; - - stashsmall = "StashSmall"; - stashmedium = "StashMedium"; - consume = "ItemSandbag"; + descriptionShort = $STR_EQUIP_DESC_1; }; class ItemEtoolBroken : ItemCore { - scope = public; + scope = 2; model = "\dayz_equip\models\etool.p3d"; picture = "\dayz_equip\textures\equip_etool_ca.paa"; displayName = $STR_EQUIP_NAME_1_BROKEN; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp index 24bb138c9..a59ffb533 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp @@ -1,7 +1,6 @@ class ItemFishingPole : ItemCore { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\fishing_rod_loot_item.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_fishingpole_CA.paa"; displayName = $STR_ITEM_NAME_FISHINGPOLE; @@ -39,9 +38,11 @@ class ItemFishingPole : ItemCore }; }; -class ItemFishingPoleBroken : ItemFishingPole +class ItemFishingPoleBroken : ItemCore { + scope = 2; + model = "\z\addons\dayz_communityassets\models\fishing_rod_loot_item.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_fishingpole_CA.paa"; displayName = $STR_ITEM_NAME_FISHINGPOLEBROKEN; descriptionShort = $STR_ITEM_DESC_FISHINGPOLE_BROKEN; - class ItemActions {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp index 9afcbfc4d..66aafc7b2 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp @@ -1,7 +1,6 @@ class ItemFlashlight : ItemCore { - scope = public; - + scope = 2; model = "\dayz_equip\models\flashlight.p3d"; picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; displayName = $STR_EQUIP_NAME_5; @@ -19,17 +18,18 @@ class ItemFlashlight : ItemCore }; }; -class ItemFlashlightBroken : ItemFlashlight +class ItemFlashlightBroken : ItemCore { + scope = 2; + model = "\dayz_equip\models\flashlight.p3d"; + picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; displayName = $STR_EQUIP_NAME_5_BROKEN; descriptionShort = $STR_EQUIP_DESC_5_BROKEN; - class ItemActions {}; }; class MeleeFlashlight : Pistol { - scope = public; - + scope = 2; model = "\dayz_equip\models\flashlight.p3d"; picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; displayName = $STR_EQUIP_NAME_5; @@ -80,11 +80,13 @@ class ItemFlashlightRed : ItemFlashlight }; }; -class ItemFlashlightRedBroken : ItemFlashlightRed +class ItemFlashlightRedBroken : ItemCore { + scope = 2; + model = "\dayz_equip\models\flashlight_mil.p3d"; + picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa"; displayName = $STR_EQUIP_NAME_6_BROKEN; descriptionShort = $STR_EQUIP_DESC_6_BROKEN; - class ItemActions {}; }; class MeleeFlashlightRed : MeleeFlashlight diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/GPS.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/GPS.hpp index fa8135c36..d9918e4c7 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/GPS.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/GPS.hpp @@ -3,8 +3,9 @@ class ItemGPS : ItemCore model = "z\addons\dayz_communityassets\models\gps.p3d"; }; -class ItemGPSBroken_DZE : ItemCore { - scope = public; +class ItemGPSBroken_DZE : ItemCore +{ + scope = 2; displayName = $STR_EQUIP_BROKEN_GPS; model = "z\addons\dayz_communityassets\models\gps.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemGPSBroken.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp index 2132ef9e5..f9d638789 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp @@ -1,7 +1,6 @@ class ItemHatchet : ItemCore { - scope = public; - + scope = 2; model = "\dayz_equip\models\hatchet.p3d"; picture = "\dayz_equip\textures\equip_hatchet_CA.paa"; displayName = $STR_EQUIP_NAME_HATCHET; @@ -29,12 +28,10 @@ class ItemHatchet : ItemCore class ItemHatchetBroken : ItemCore { - scope = public; - + scope = 2; picture = "\dayz_equip\textures\equip_hatchet_CA.paa"; displayName = $STR_name_ItemHatchetBroken; - descriptionShort = $STR_desc_ItemHatchetBroken; - + descriptionShort = $STR_desc_ItemHatchetBroken; fixedTool = "ItemHatchet"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp index f953562a9..47137b8f1 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp @@ -1,12 +1,17 @@ -class ItemKeyKit: ItemCore { - scope = public; +class ItemKeyKit: ItemCore +{ + scope = 2; displayname = $STR_EQUIP_KEYKIT; - model="\z\addons\dayz_epoch\models\keykit.p3d"; - descriptionShort=$STR_EQUIP_KEYKIT_DESC; - picture="\z\addons\dayz_epoch\pictures\equip_keykit_ca.paa"; + model = "\z\addons\dayz_epoch\models\keykit.p3d"; + descriptionShort = $STR_EQUIP_KEYKIT_DESC; + picture = "\z\addons\dayz_epoch\pictures\equip_keykit_ca.paa"; }; -class ItemKeyKitBroken: ItemKeyKit { +class ItemKeyKitBroken: ItemCore +{ + scope = 2; displayname = $STR_EQUIP_KEYKIT_BROKEN; descriptionShort = $STR_EQUIP_KEYKIT_BROKEN_DESC; + model = "\z\addons\dayz_epoch\models\keykit.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_keykit_ca.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp index 2331d885b..cfa83b38a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp @@ -1,10 +1,10 @@ class ItemKnife_Base : ItemCore { - scope = private; - + scope = 0; model = "\dayz_equip\models\knife_gear.p3d"; picture = "\dayz_equip\textures\equip_knife_ca.paa"; displayName = $STR_EQUIP_NAME_4; + class ItemActions { class Use @@ -17,7 +17,7 @@ class ItemKnife_Base : ItemCore class ItemKnife : ItemKnife_Base { - scope = public; + scope = 2; model = "\dayz_equip\models\knife_gear.p3d"; // Some mods override this. We leave this here just to be sure. picture = "\dayz_equip\textures\equip_knife_ca.paa"; descriptionShort = $STR_EQUIP_DESC_4; @@ -26,42 +26,42 @@ class ItemKnife : ItemKnife_Base class ItemKnife5 : ItemKnife_Base { - scope = public; + scope = 2; descriptionShort = $STR_EQUIP_DESC_4_A; sharpnessRemaining = "ItemKnife4"; }; class ItemKnife4 : ItemKnife_Base { - scope = public; + scope = 2; descriptionShort = $STR_EQUIP_DESC_4_B; sharpnessRemaining = "ItemKnife3"; }; class ItemKnife3 : ItemKnife_Base { - scope = public; + scope = 2; descriptionShort = $STR_EQUIP_DESC_4_C; sharpnessRemaining = "ItemKnife2"; }; class ItemKnife2 : ItemKnife_Base { - scope = public; + scope = 2; descriptionShort = $STR_EQUIP_DESC_4_D; sharpnessRemaining = "ItemKnife1"; }; class ItemKnife1 : ItemKnife_Base { - scope = public; + scope = 2; descriptionShort = $STR_EQUIP_DESC_4_E; sharpnessRemaining = "ItemKnifeBlunt"; }; class ItemKnifeBlunt : ItemKnife_Base { - scope = public; + scope = 2; descriptionShort = $STR_EQUIP_CODE_DESC_4; sharpnessRemaining = "ItemKnifeBlunt"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp index e11f48843..470365f4c 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp @@ -1,7 +1,6 @@ class ItemMachete : ItemCore { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\machete.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_machete_CA.paa"; displayName = $STR_EQUIP_NAME_MACHETE; @@ -27,9 +26,11 @@ class ItemMachete : ItemCore }; }; -class ItemMacheteBroken : ItemMachete +class ItemMacheteBroken : ItemCore { + scope = 2; + model = "\z\addons\dayz_communityassets\models\machete.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_machete_CA.paa"; displayName = $STR_EQUIP_NAME_MACHETE_BROKEN; descriptionShort = $STR_EQUIP_DESC_MACHETE_BROKEN; - class ItemActions {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Map.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Map.hpp index af339085d..adff2128c 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Map.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Map.hpp @@ -5,12 +5,10 @@ class ItemMap : ItemCore class ItemMap_Debug: ItemCore { - scope = public; - + scope = 2; displayname = "Debug Map"; descriptionshort = "Debug Map - Admin use only"; - picture = "\z\addons\dayz_communityassets\pictures\gear_picture_map_debug.paa"; - + picture = "\z\addons\dayz_communityassets\pictures\gear_picture_map_debug.paa"; simulation = "ItemMap"; class Library diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp index 311d41d36..8802bc121 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp @@ -1,35 +1,47 @@ -class ItemPilotmask_DZE : ItemCore { - scope = public; +class ItemPilotmask_DZE : ItemCore +{ + scope = 2; picture = "\dayz_epoch_c\icons\tools\ItemPilotmask.paa"; displayName = $STR_EQUIP_PILOT_MASK; descriptionShort = $STR_EQUIP_PILOT_MASK_DESC; }; -class ItemPilotmaskBroken_DZE : ItemPilotmask_DZE { +class ItemPilotmaskBroken_DZE : ItemCore +{ + scope = 2; + picture = "\dayz_epoch_c\icons\tools\ItemPilotmask.paa"; displayName = $STR_EQUIP_PILOT_MASK_BROKEN; descriptionShort = $STR_EQUIP_PILOT_MASK_BROKEN_DESC; }; -class ItemGasmask1_DZE : ItemCore { - scope = public; +class ItemGasmask1_DZE : ItemCore +{ + scope = 2; picture = "\dayz_epoch_c\icons\tools\ItemGasmask1.paa"; displayName = $STR_EQUIP_GAS_MASK1; descriptionShort = $STR_EQUIP_GAS_MASK1_DESC; }; -class ItemGasmask1Broken_DZE : ItemGasmask1_DZE { +class ItemGasmask1Broken_DZE : ItemCore +{ + scope = 2; + picture = "\dayz_epoch_c\icons\tools\ItemGasmask1.paa"; displayName = $STR_EQUIP_GAS_MASK1_BROKEN; descriptionShort = $STR_EQUIP_GAS_MASK1_BROKEN_DESC; }; -class ItemGasmask2_DZE : ItemCore { - scope = public; +class ItemGasmask2_DZE : ItemCore +{ + scope = 2; picture = "\dayz_epoch_c\icons\tools\ItemGasmask2.paa"; displayName = $STR_EQUIP_GAS_MASK2; descriptionShort = $STR_EQUIP_GAS_MASK2_DESC; }; -class ItemGasmask2Broken_DZE : ItemGasmask2_DZE { +class ItemGasmask2Broken_DZE : ItemCore +{ + scope = 2; + picture = "\dayz_epoch_c\icons\tools\ItemGasmask2.paa"; displayName = $STR_EQUIP_GAS_MASK2_BROKEN; descriptionShort = $STR_EQUIP_GAS_MASK2_BROKEN_DESC; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp index 73887b246..a2464b1af 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp @@ -1,6 +1,6 @@ class ItemMatchbox_base : ItemCore { - scope = private; + scope = 0; model = "\dayz_equip\models\matchbox_gear.p3d"; picture = "\dayz_equip\textures\equip_matchbox_ca.paa"; displayName = $STR_EQUIP_NAME_3; @@ -9,7 +9,7 @@ class ItemMatchbox_base : ItemCore class ItemMatchboxEmpty : ItemMatchbox_base { - scope = public; + scope = 2; displayName = $STR_EQUIP_NAME_3_EMPTY; descriptionShort = $STR_EQUIP_DESC_3_EMPTY; }; @@ -17,7 +17,7 @@ class ItemMatchboxEmpty : ItemMatchbox_base //Loot Spawn Table. class ItemMatchbox : ItemMatchbox_base { - scope = public; + scope = 2; model = "\dayz_equip\models\matchbox_gear.p3d"; // Some mods override this. We leave this here just to be sure. picture = "\dayz_equip\textures\equip_matchbox_ca.paa"; matches = -1; @@ -25,7 +25,8 @@ class ItemMatchbox : ItemMatchbox_base class ItemActions { - class Combine { + class Combine + { text = $STR_ANTIBIOTICS_COMBINE; script = "spawn player_combineMatches;"; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp index 6a9e7e076..ed169329d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp @@ -6,8 +6,9 @@ class NVGoggles_DZE: NVGoggles descriptionShort = "Full Screen Night Vision Goggles"; }; -class ItemNVGBroken_DZE : ItemCore { - scope = public; +class ItemNVGBroken_DZE : ItemCore +{ + scope = 2; displayName = $STR_EQUIP_BROKEN_NV; model = "\dayz_epoch_c\items\nvg\nvg_dzn.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemNVGBroken.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Pickaxe.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Pickaxe.hpp index 71281c591..5d0a28340 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Pickaxe.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Pickaxe.hpp @@ -1,7 +1,6 @@ class ItemPickaxe : ItemCore { - scope = public; - + scope = 2; model = "z\addons\dayz_communityweapons\models\pickaxe\pickaxe.p3d"; picture = "\z\addons\dayz_communityweapons\models\pickaxe\pickaxe.paa"; displayName = $STR_EQUIP_NAME_PICKAXE; @@ -19,13 +18,11 @@ class ItemPickaxe : ItemCore class ItemPickaxeBroken : ItemCore { - scope = public; - + scope = 2; model = "z\addons\dayz_communityweapons\models\pickaxe\pickaxe.p3d"; picture = "\z\addons\dayz_communityweapons\models\pickaxe\pickaxe.paa"; displayName = $STR_name_ItemPickaxeBroken; - descriptionShort = $STR_desc_ItemPickaxeBroken; - + descriptionShort = $STR_desc_ItemPickaxeBroken; fixedTool = "ItemPickaxe"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Radio.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Radio.hpp index 0fce7ca5a..56184582f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Radio.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Radio.hpp @@ -11,8 +11,9 @@ class ItemRadio : ItemCore }; }; -class ItemRadioBroken_DZE : ItemCore { - scope = public; +class ItemRadioBroken_DZE : ItemCore +{ + scope = 2; displayName = $STR_EQUIP_BROKEN_RADIO; model = "\nst\ns_dayz\items\radio\radio_dzn.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemRadioBroken.paa"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp index a7c410695..caf113d87 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp @@ -1,22 +1,15 @@ class ItemShovel : ItemCore { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\shovel.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_shovel_ca.paa"; displayName = $STR_EQUIP_NAME_1b; - descriptionShort = $STR_EQUIP_DESC_1b; - - stashsmall = "StashSmall"; - stashmedium = "StashMedium"; - consume = "ItemSandbag"; - + descriptionShort = $STR_EQUIP_DESC_1b; }; class ItemShovelBroken : ItemCore { - scope = public; - + scope = 2; model = "\z\addons\dayz_communityassets\models\shovel.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_shovel_ca.paa"; displayName = $STR_EQUIP_NAME_1b_BROKEN; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp index 134088902..79fad3f65 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp @@ -1,11 +1,10 @@ class ItemSledge: ItemCore // Epoch class { - scope = public; - - model="\z\addons\dayz_epoch\models\sledge_mag.p3d"; - picture="\z\addons\dayz_epoch\pictures\equip_sledge_CA.paa"; - displayName=$STR_EQUIP_NAME_SledgeHammer; - descriptionShort=$STR_EQUIP_SLEDGE_DESC; + scope = 2; + model = "\z\addons\dayz_epoch\models\sledge_mag.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_sledge_CA.paa"; + displayName = $STR_EQUIP_NAME_SledgeHammer; + descriptionShort = $STR_EQUIP_SLEDGE_DESC; class ItemActions { @@ -24,30 +23,23 @@ class ItemSledge: ItemCore // Epoch class use[] = {"ItemSledge"}; output[] = {"MeleeSledge"}; }; - - /* Lets take this out for now and see how it goes. - class MineOre - { - text="Mine Ore"; - script="spawn player_mineOre;"; - }; - */ }; }; -class ItemSledgeBroken: ItemSledge // Epoch class +class ItemSledgeBroken: ItemCore { + scope = 2; + model = "\z\addons\dayz_epoch\models\sledge_mag.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_sledge_CA.paa"; displayName = $STR_name_ItemSledgeHammerBroken; descriptionShort = $STR_desc_ItemSledgeHammerBroken; - class ItemActions {}; }; //Vanilla sledge is using a different model. //All scripts have been changed to use Epoch ItemSledge, but leave this defined in case admins want to use it for something. class ItemSledgeHammer : ItemCore { - scope = public; - + scope = 2; model = "z\addons\dayz_communityweapons\models\sledge_hammer\sledgehammer.p3d"; picture = "\z\addons\dayz_communityweapons\models\sledge_hammer\sledgehammer.paa"; displayName = $STR_EQUIP_NAME_SledgeHammer; @@ -56,13 +48,11 @@ class ItemSledgeHammer : ItemCore class ItemSledgeHammerBroken : ItemCore { - scope = public; - + scope = 2; model = "z\addons\dayz_communityweapons\models\sledge_hammer\sledgehammer.p3d"; picture = "\z\addons\dayz_communityweapons\models\sledge_hammer\sledgehammer.paa"; displayName = $STR_name_ItemSledgeHammerBroken; - descriptionShort = $STR_desc_ItemSledgeHammerBroken; - + descriptionShort = $STR_desc_ItemSledgeHammerBroken; fixedTool = "ItemSledgeHammer"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp index ee80c40ae..8b10cb851 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp @@ -1,12 +1,17 @@ -class ItemSolder_DZE : ItemCore { - scope = public; +class ItemSolder_DZE : ItemCore +{ + scope = 2; displayName = $STR_EQUIP_SOLDER; model = "\nst\ns_dayz\items\solder\solder_dzn.p3d"; picture = "\nst\ns_dayz\items\solder\data\icon_solder_dzn_ca.paa"; descriptionShort = $STR_EQUIP_SOLDER_DESC; }; -class ItemSolderBroken_DZE : ItemSolder_DZE { +class ItemSolderBroken_DZE : ItemCore +{ + scope = 2; displayName = $STR_EQUIP_SOLDER_BROKEN; descriptionShort = $STR_EQUIP_SOLDER_BROKEN_DESC; + model = "\nst\ns_dayz\items\solder\solder_dzn.p3d"; + picture = "\nst\ns_dayz\items\solder\data\icon_solder_dzn_ca.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp index 43ae0bf5e..d5487b330 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp @@ -1,10 +1,11 @@ class ItemToolbox : ItemCore { - scope = public; + scope = 2; model = "\dayz_equip\models\toolbox.p3d"; picture = "\dayz_equip\textures\equip_toolbox_ca.paa"; displayName = $STR_EQUIP_NAME_2; descriptionShort = $STR_EQUIP_DESC_2; + class ItemActions { class RemoveNet @@ -15,9 +16,11 @@ class ItemToolbox : ItemCore }; }; -class ItemToolboxBroken : ItemToolbox +class ItemToolboxBroken : ItemCore { + scope = 2; + model = "\dayz_equip\models\toolbox.p3d"; + picture = "\dayz_equip\textures\equip_toolbox_ca.paa"; displayName = $STR_EQUIP_NAME_2_BROKEN; descriptionShort = $STR_EQUIP_DESC_2_BROKEN; - class ItemActions {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp index 5a18cf1a7..38bf15926 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp @@ -1,3 +1,5 @@ +//Workaround for non reloadable magazine 8Rnd_AT5_BMP2 + class AT5Launcher; class AT5LauncherSingle: AT5Launcher {