diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/BarrelsCans.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/BarrelsCans.hpp index 33d3f0119..4652cd30c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/BarrelsCans.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/BarrelsCans.hpp @@ -36,7 +36,7 @@ class ItemFuelcanEmpty : ItemJerrycanEmpty { type = 256; model = "z\addons\dayz_communityassets\models\fuelcan.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_fuelcan_empty_CA.paa"; + picture = "\dayz_epoch_c\icons\equipment\ItemFuelcanEmpty.paa"; displayName = $STR_ITEM_NAME_FUELCAN_EMPTY; descriptionShort = $STR_ITEM_DESC_FUELCAN_EMPTY; fuelQuantity = 0; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp index 928db6494..7862737e9 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp @@ -1,5 +1,5 @@ class Vehicle_ammo_base: CA_Magazine { - scope = private; + scope = 0; reloadAction = ""; maxLeadSpeed = 100; type = 256; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp index e593b8264..025859455 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp @@ -111,4 +111,5 @@ class ItemAntibioticEmpty : ItemAntibiotic_base scope = 2; displayName = $STR_EQUIP_NAME_ANTIBIOTICS_EMPTY; descriptionShort = $STR_EQUIP_DESC_54; + picture = "\dayz_epoch_c\icons\equipment\ItemAntibioticsEmpty.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp index e2b6e7ddb..f6fad62f4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp @@ -109,5 +109,5 @@ class ItemPainkillerEmpty : CA_Magazine count = 1; type = 256; model = "\dayz_equip\models\med_painkiller_gear.p3d"; - picture = "\dayz_equip\textures\equip_painkiller_ca.paa"; + picture = "\dayz_epoch_c\icons\equipment\ItemPainkillerEmpty.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp index 34ddc1e71..ddf596358 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp @@ -11,5 +11,5 @@ 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"; + picture = "\dayz_epoch_c\icons\tools\ItemAPSIBroken.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Crowbar.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Crowbar.hpp index a37dea23d..71a4ec814 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Crowbar.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Crowbar.hpp @@ -42,7 +42,7 @@ class ItemCrowbarBent : ItemCore { scope = 2; model = "\dayz_equip\models\crowbar.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_crowbar_CA.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemCrowbarBroken.paa"; displayName = $STR_EQUIP_NAME_CROWBARBENT; descriptionShort = $STR_EQUIP_DESC_CROWBARBENT; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp index 36b8c18bf..45042b3c6 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp @@ -11,7 +11,7 @@ class ItemEtoolBroken : ItemCore { scope = 2; model = "\dayz_equip\models\etool.p3d"; - picture = "\dayz_equip\textures\equip_etool_ca.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemEtoolBroken.paa"; displayName = $STR_EQUIP_NAME_1_BROKEN; descriptionShort = $STR_EQUIP_DESC_1_BROKEN; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp index a59ffb533..c9d186251 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp @@ -42,7 +42,7 @@ 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"; + picture = "\dayz_epoch_c\icons\tools\ItemFishingpoleBroken.paa"; displayName = $STR_ITEM_NAME_FISHINGPOLEBROKEN; descriptionShort = $STR_ITEM_DESC_FISHINGPOLE_BROKEN; }; \ 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 66aafc7b2..77ac9379a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp @@ -22,7 +22,7 @@ class ItemFlashlightBroken : ItemCore { scope = 2; model = "\dayz_equip\models\flashlight.p3d"; - picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemFlashlightBroken.paa"; displayName = $STR_EQUIP_NAME_5_BROKEN; descriptionShort = $STR_EQUIP_DESC_5_BROKEN; }; @@ -84,7 +84,7 @@ class ItemFlashlightRedBroken : ItemCore { scope = 2; model = "\dayz_equip\models\flashlight_mil.p3d"; - picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemMilitaryFlashlightBroken.paa"; displayName = $STR_EQUIP_NAME_6_BROKEN; descriptionShort = $STR_EQUIP_DESC_6_BROKEN; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp index f9d638789..babcddeff 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp @@ -29,7 +29,8 @@ class ItemHatchet : ItemCore class ItemHatchetBroken : ItemCore { scope = 2; - picture = "\dayz_equip\textures\equip_hatchet_CA.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemHatchetBroken.paa"; + model = "\dayz_equip\models\hatchet.p3d"; displayName = $STR_name_ItemHatchetBroken; descriptionShort = $STR_desc_ItemHatchetBroken; fixedTool = "ItemHatchet"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp index 47137b8f1..a46dd82fe 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp @@ -11,7 +11,7 @@ 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"; + descriptionShort = $STR_EQUIP_KEYKIT_BROKEN_DESC; + picture = "\dayz_epoch_c\icons\tools\ItemKeymakersKitBroken.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp index 470365f4c..7019bbef1 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp @@ -30,7 +30,7 @@ class ItemMacheteBroken : ItemCore { scope = 2; model = "\z\addons\dayz_communityassets\models\machete.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_machete_CA.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemMacheteBroken.paa"; displayName = $STR_EQUIP_NAME_MACHETE_BROKEN; descriptionShort = $STR_EQUIP_DESC_MACHETE_BROKEN; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp index 8802bc121..dd5adeb08 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp @@ -9,7 +9,7 @@ class ItemPilotmask_DZE : ItemCore class ItemPilotmaskBroken_DZE : ItemCore { scope = 2; - picture = "\dayz_epoch_c\icons\tools\ItemPilotmask.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemPilotmaskBroken.paa"; displayName = $STR_EQUIP_PILOT_MASK_BROKEN; descriptionShort = $STR_EQUIP_PILOT_MASK_BROKEN_DESC; }; @@ -25,7 +25,7 @@ class ItemGasmask1_DZE : ItemCore class ItemGasmask1Broken_DZE : ItemCore { scope = 2; - picture = "\dayz_epoch_c\icons\tools\ItemGasmask1.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemGasmask1Broken.paa"; displayName = $STR_EQUIP_GAS_MASK1_BROKEN; descriptionShort = $STR_EQUIP_GAS_MASK1_BROKEN_DESC; }; @@ -41,7 +41,7 @@ class ItemGasmask2_DZE : ItemCore class ItemGasmask2Broken_DZE : ItemCore { scope = 2; - picture = "\dayz_epoch_c\icons\tools\ItemGasmask2.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemGasmask2Broken.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 a2464b1af..fd11a14bf 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp @@ -10,6 +10,7 @@ class ItemMatchbox_base : ItemCore class ItemMatchboxEmpty : ItemMatchbox_base { scope = 2; + picture = "\dayz_epoch_c\icons\tools\ItemMatchesEmpty.paa"; displayName = $STR_EQUIP_NAME_3_EMPTY; descriptionShort = $STR_EQUIP_DESC_3_EMPTY; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp index ed169329d..37da48244 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp @@ -1,9 +1,14 @@ -class NVGoggles; +class NVGoggles: Binocular +{ + model = "\dayz_epoch_c\items\nvg\nvg_dzn.p3d"; +}; + class NVGoggles_DZE: NVGoggles { displayName = "NVG (Full Screen)"; modelOptics = ""; descriptionShort = "Full Screen Night Vision Goggles"; + model = "\dayz_epoch_c\items\nvg\nvg_dzn.p3d"; }; class ItemNVGBroken_DZE : ItemCore @@ -11,6 +16,6 @@ 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"; + picture = "\dayz_epoch_c\icons\tools\ItemNightVisionBroken.paa"; descriptionShort = $STR_EQUIP_BROKEN_NV_DESC; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Pickaxe.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Pickaxe.hpp index 5d0a28340..287694996 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Pickaxe.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Pickaxe.hpp @@ -20,7 +20,7 @@ class ItemPickaxeBroken : ItemCore { scope = 2; model = "z\addons\dayz_communityweapons\models\pickaxe\pickaxe.p3d"; - picture = "\z\addons\dayz_communityweapons\models\pickaxe\pickaxe.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemPickaxeBroken.paa"; displayName = $STR_name_ItemPickaxeBroken; descriptionShort = $STR_desc_ItemPickaxeBroken; fixedTool = "ItemPickaxe"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp index caf113d87..eee967590 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp @@ -2,7 +2,7 @@ class ItemShovel : ItemCore { scope = 2; model = "\z\addons\dayz_communityassets\models\shovel.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_shovel_ca.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemShovel.paa"; displayName = $STR_EQUIP_NAME_1b; descriptionShort = $STR_EQUIP_DESC_1b; }; @@ -11,7 +11,7 @@ class ItemShovelBroken : ItemCore { scope = 2; model = "\z\addons\dayz_communityassets\models\shovel.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_shovel_ca.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemShovelBroken.paa"; displayName = $STR_EQUIP_NAME_1b_BROKEN; descriptionShort = $STR_EQUIP_DESC_1b_BROKEN; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp index 79fad3f65..acb095532 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp @@ -30,7 +30,7 @@ class ItemSledgeBroken: ItemCore { scope = 2; model = "\z\addons\dayz_epoch\models\sledge_mag.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_sledge_CA.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemSledge1Broken.paa"; displayName = $STR_name_ItemSledgeHammerBroken; descriptionShort = $STR_desc_ItemSledgeHammerBroken; }; @@ -50,7 +50,7 @@ class ItemSledgeHammerBroken : ItemCore { scope = 2; model = "z\addons\dayz_communityweapons\models\sledge_hammer\sledgehammer.p3d"; - picture = "\z\addons\dayz_communityweapons\models\sledge_hammer\sledgehammer.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemSledge2Broken.paa"; displayName = $STR_name_ItemSledgeHammerBroken; descriptionShort = $STR_desc_ItemSledgeHammerBroken; fixedTool = "ItemSledgeHammer"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp index 8b10cb851..814c6517b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp @@ -13,5 +13,5 @@ class ItemSolderBroken_DZE : ItemCore 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"; + picture = "\dayz_epoch_c\icons\tools\ItemSolderBroken.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 d5487b330..f86bf02e6 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp @@ -20,7 +20,7 @@ class ItemToolboxBroken : ItemCore { scope = 2; model = "\dayz_equip\models\toolbox.p3d"; - picture = "\dayz_equip\textures\equip_toolbox_ca.paa"; + picture = "\dayz_epoch_c\icons\tools\ItemToolboxBroken.paa"; displayName = $STR_EQUIP_NAME_2_BROKEN; descriptionShort = $STR_EQUIP_DESC_2_BROKEN; }; \ No newline at end of file