diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp index b95077d01..e3bb04cec 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp @@ -746,4 +746,69 @@ class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle script = "spawn player_fillWater;"; }; }; +}; +class ItemPlasticWaterBottleCoffee : FoodDrink +{ + scope = 2; + model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; + picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa"; + displayName = $STR_EQUIP_NAME_WBPET_COFFEE; + descriptionShort = $STR_EQUIP_DESC_WBPET_COFFEE; + + Nutrition[] = {50,0,950,0}; + + infectionChance = 0; + + consumeOutput = "ItemPlasticWaterbottleUnfilled"; + + containerEmpty = "ItemPlasticWaterbottleUnfilled"; + + class ItemActions : ItemActions + { + class Consume : Consume {}; + + class Empty + { + text = $STR_EQUIP_NAME_13_EMPTY; + script = "spawn player_emptyContainer"; + }; + }; +}; +class ItemPlasticWaterBottleBlackTea : FoodDrink +{ + scope = 2; + model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; + picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa"; + displayName = $STR_EQUIP_NAME_WBPET_BLACKTEA; + descriptionShort = $STR_EQUIP_DESC_WBPET_BLACKTEA; + + Nutrition[] = {90,0,900,0}; + + infectionChance = 0; + + consumeOutput = "ItemPlasticWaterbottleUnfilled"; + + containerEmpty = "ItemPlasticWaterbottleUnfilled"; + + class ItemActions : ItemActions + { + class Consume : Consume {}; + + class Empty + { + text = $STR_EQUIP_NAME_13_EMPTY; + script = "spawn player_emptyContainer"; + }; + }; +}; +class ItemPlasticWaterBottleFrozen : CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + model = "z\addons\dayz_communityassets\models\waterbottle.p3d"; + picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa"; + displayName = $STR_EQUIP_NAME_WBPET_FROZEN; + descriptionShort = $STR_EQUIP_DESC_WBPET_FROZEN; + }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp index 62e5a0997..bbe4836e6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp @@ -724,3 +724,68 @@ class ItemWaterbottle9ozBoiled : ItemWaterbottle }; }; }; +class ItemWaterBottleCoffee : FoodDrink +{ + scope = 2; + model = "\dayz_equip\models\waterbottle_gear.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa"; + displayName = $STR_EQUIP_NAME_WATER_BOTTLE_COFFEE; + descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE_COFFEE; + + Nutrition[] = {50,0,950,0}; + + infectionChance = 0; + + consumeOutput = "ItemWaterBottleUnfilled"; + + containerEmpty = "ItemWaterBottleUnfilled"; + + class ItemActions : ItemActions + { + class Consume : Consume {}; + + class Empty + { + text = $STR_EQUIP_NAME_13_EMPTY; + script = "spawn player_emptyContainer"; + }; + }; +}; +class ItemWaterBottleBlackTea : FoodDrink +{ + scope = 2; + model = "\dayz_equip\models\waterbottle_gear.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa"; + displayName = $STR_EQUIP_NAME_WATER_BOTTLE_BLACKTEA; + descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE_BLACKTEA; + + Nutrition[] = {90,0,900,0}; + + infectionChance = 0; + + consumeOutput = "ItemWaterBottleUnfilled"; + + containerEmpty = "ItemWaterBottleUnfilled"; + + class ItemActions : ItemActions + { + class Consume : Consume {}; + + class Empty + { + text = $STR_EQUIP_NAME_13_EMPTY; + script = "spawn player_emptyContainer"; + }; + }; +}; +class ItemWaterBottleFrozen : CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + model = "\dayz_equip\models\waterbottle_gear.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa"; + displayName = $STR_EQUIP_NAME_WATER_BOTTLE_FROZEN; + descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE_FROZEN; + +}; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 612593592..2f8db7c87 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -3550,6 +3550,30 @@ Une Bouteille vide. Il serait bien de la remplir à nouveau. Prázdná láhev na vodu. Může být znovu naplněna. + + Water Bottle (Coffee) + Wasserflasche (Kaffee) + + + A bottle that has been filled with brewed coffee. + Eine Flasche gefüllt mit gekochtem Kaffee. + + + Water Bottle (Black Tea) + Wasserflasche (Schwarzer Tee) + + + A bottle that has been filled with brewed black tea. + Eine Flasche gefüllt mit gekochtem schwarzem Tee. + + + Water Bottle (Frozen) + Wasserflasche (Gefroren) + + + A bottle that has been filled with water. The content seems to be frozen. + Eine Flasche gefüllt mit Wasser. Der Inhalt scheint gefroren zu sein. + Epi-Pen Epinephrin-Autoinjektor @@ -32423,6 +32447,30 @@ Бутылка с 900мл кипячёной воды Wasserflasche PET mit 900ml abgekochtem Wasser. + + Water Bottle PET (Coffee) + Wasserflasche PET (Kaffee) + + + A PET bottle that has been filled with brewed coffee. + Eine Plastik-Flasche gefüllt mit gekochtem Kaffee. + + + Water Bottle PET (Black Tea) + Wasserflasche PET (Schwarzer Tee) + + + A PET bottle that has been filled with brewed black tea. + Eine Plastik-Flasche gefüllt mit gekochtem schwarzem Tee. + + + Water Bottle PET (Frozen) + Wasserflasche PET (Gefroren) + + + A PET bottle that has been filled with water. The content seems to be frozen. + Eine Plastik-Flasche gefüllt mit Wasser. Der Inhalt scheint gefroren zu sein. + Paint bucket (generic) Farbeimer (Generisch)