diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp index 97ffb2a26..ca1fa12e8 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp @@ -24,7 +24,7 @@ Castle[] = {Loot_MAGAZINE, 4, PartWoodPile}, {Loot_MAGAZINE, 2, ItemComboLock}, {Loot_MAGAZINE, 1, ItemTent}, - {Loot_MAGAZINE, 1, ItemCamoNet}, + {Loot_MAGAZINE, 1, forest_net_kit}, //Groups {Loot_GROUP, 5, AmmoCivilian}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp index a9cde4d92..87b81cedf 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp @@ -28,7 +28,7 @@ Supermarket[] = {Loot_MAGAZINE, 1, ItemMixOil}, {Loot_MAGAZINE, 1, PartPlywoodPack}, //{Loot_MAGAZINE, 0.5, ItemDomeTent}, //IN TENTS GROUP - {Loot_MAGAZINE, 1, ItemCamoNet}, + {Loot_MAGAZINE, 1, forest_net_kit}, {Loot_MAGAZINE, 0.1, ItemComboLock}, {Loot_MAGAZINE, 3, ItemBandage}, {Loot_MAGAZINE, 2, ItemPainkiller}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp index b8350e1d6..9cfa58be1 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp @@ -41,7 +41,7 @@ CrashSiteRU[] = //Other {Loot_MAGAZINE, 1, PartVRotor}, - {Loot_MAGAZINE, 2, ItemCamonet}, + {Loot_MAGAZINE, 2, forest_large_net_kit}, {Loot_GROUP, 7, AttachmentsEast}, {Loot_GROUP, 3, AttachmentsWest}, @@ -100,7 +100,7 @@ CrashSiteUS[] = //Other {Loot_MAGAZINE, 1, PartVRotor}, - {Loot_MAGAZINE, 2, ItemCamonet}, + {Loot_MAGAZINE, 2, forest_large_net_kit}, {Loot_GROUP, 10, AttachmentsWest}, //Piles @@ -158,7 +158,7 @@ CrashSiteEU[] = //Other {Loot_MAGAZINE, 1, PartVRotor}, - {Loot_MAGAZINE, 2, ItemCamonet}, + {Loot_MAGAZINE, 2, desert_net_kit}, {Loot_GROUP, 10, AttachmentsWest}, //Piles @@ -217,7 +217,7 @@ CrashSiteUN[] = //Other {Loot_MAGAZINE, 1, PartVRotor}, - {Loot_MAGAZINE, 2, ItemCamonet}, + {Loot_MAGAZINE, 2, desert_large_net_kit}, {Loot_GROUP, 3, AttachmentsEast}, {Loot_GROUP, 3, AttachmentsWest}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index 8c7aac4e1..51ad65420 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -454,8 +454,8 @@ class desert_large_net_kit: CA_Magazine type = 256; displayName = $STR_EPOCH_LARGEDESERTCAMONET; descriptionShort = $STR_EPOCH_LARGECAMONET_DESC; - model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + 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 { @@ -475,8 +475,8 @@ class forest_large_net_kit: CA_Magazine type = 256; displayName = $STR_EPOCH_LARGEFORESTCAMONET; descriptionShort = $STR_EPOCH_LARGECAMONET_DESC; - model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + 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 { @@ -496,8 +496,8 @@ class desert_net_kit: CA_Magazine type = 256; displayName = $STR_EPOCH_DESERTCAMONET; descriptionShort = $STR_EPOCH_CAMONET_DESC; - model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + 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 { @@ -526,8 +526,8 @@ class forest_net_kit: CA_Magazine type = 256; displayName = $STR_EPOCH_FORESTCAMONET; descriptionShort = $STR_EPOCH_CAMONET_DESC; - model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + 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 { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp index 5f9d5e95f..abae1b05c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp @@ -1,4 +1,4 @@ -class ItemCamoNet : CA_Magazine +/*class ItemCamoNet : CA_Magazine //Duplicate of Epoch forest_net_kit { scope = public; count = 1; @@ -20,7 +20,7 @@ class ItemCamoNet : CA_Magazine create = "CamoNet_DZ"; }; }; -}; +};*/ /*class ItemCamoNetGrey : ItemCamoNet { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp index 2c56d3f3a..334a24854 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp @@ -8,7 +8,7 @@ //Simple buildables #include "Tent.hpp" -#include "CamoNet.hpp" +//#include "CamoNet.hpp" //Duplicate of Epoch camo nets in DZE\Misc.hpp #include "TankTrap.hpp" #include "WireFence.hpp" #include "BearTrap.hpp" diff --git a/SQF/dayz_code/Configs/CfgVehicles/CamoNetting.hpp b/SQF/dayz_code/Configs/CfgVehicles/CamoNetting.hpp index 26fb61afc..910e1c550 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/CamoNetting.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/CamoNetting.hpp @@ -1,4 +1,4 @@ -class CamoNet_DZ: BuiltItems { +/*class CamoNet_DZ: BuiltItems { //Duplicate of Epoch camo net in DZE\Prop_Defs.hpp armor = 3; destrtype = "DestructTent"; displayName = $STR_ITEM_NAME_CAMONET; @@ -8,4 +8,4 @@ class CamoNet_DZ: BuiltItems { model = "\Ca\misc3\CamoNet_EAST"; scope = public; vehicleclass = "Military"; -}; \ No newline at end of file +};*/ \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp index e39ccb7b9..7e1859336 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp @@ -549,7 +549,7 @@ class CfgVehicles { #include "Buildings\Land_Vysilac_FM.hpp" //camo - #include "CamoNetting.hpp" + //#include "CamoNetting.hpp" //Duplicate of Epoch camo net in DZE\Prop_Defs.hpp //WeaponHolder diff --git a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp index 148bf2c87..db8c6c29c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp @@ -103,7 +103,7 @@ class WeaponHolder_ItemCamoNet : WeaponHolderBase { model = "z\addons\dayz_communityassets\models\packed_net_green.p3d"; // was models\tentbag_gear.prd ... class eventHandlers { - init = "[(_this select 0),'cfgMagazines','ItemCamoNet'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; + init = "[(_this select 0),'cfgMagazines','forest_net_kit'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; }; };