From e3fee60a8f5a721640316de214478d0c626d319e Mon Sep 17 00:00:00 2001 From: icomrade Date: Thu, 21 Jul 2016 00:35:51 -0400 Subject: [PATCH] Change water bottle image back to canteen image --- .../Configs/CfgMagazines/Consumables/WaterBottle.hpp | 4 ++-- .../Configs/CfgMagazines/Items/WaterBottle.hpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp index 707788c6c..6a83194fc 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp @@ -2,8 +2,8 @@ class ItemWaterBottle : FoodDrink { scope = public; - model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; - picture = "\z\addons\dayz_communityassets\textures\waterbottle.paa"; + model = "\dayz_equip\models\waterbottle_gear.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa"; displayName = $STR_EQUIP_NAME_12; descriptionShort = $STR_EQUIP_DESC_12; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/WaterBottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/WaterBottle.hpp index e5e997313..3ec9d7782 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/WaterBottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/WaterBottle.hpp @@ -4,8 +4,8 @@ class ItemWaterBottleUnfilled : CA_Magazine count = 1; type = WeaponSlotItem; - model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; - picture = "\z\addons\dayz_communityassets\textures\waterbottle.paa"; + 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; @@ -23,14 +23,14 @@ class ItemWaterBottleUnfilled : CA_Magazine }; }; -class ItemWaterBottleDmg : 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; count = 1; type = WeaponSlotItem; - model = "z\addons\dayz_communityassets\models\waterbottle_damaged.p3d"; - picture = "\z\addons\dayz_communityassets\textures\waterbottle_damaged.paa"; + model = "\dayz_equip\models\waterbottle_gear.p3d"; + picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa"; displayName = $STR_ITEMWATERBOTTLEDMG_CODE_NAME; descriptionShort = $STR_ITEMWATERBOTTLEDMG_CODE_DESC;