diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp index d5d17e1e9..274b683dd 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp @@ -89,7 +89,7 @@ class FoodRaw : FoodEdible bloodRegen = 200; Nutrition[] = {282,0,0,0}; - infectionChance = 0.1; + infectionChance = 0.7; }; //Cooked food base class @@ -102,6 +102,7 @@ class FoodCooked : FoodEdible #include "PackagedFood.hpp" #include "Meat.hpp" #include "Fish.hpp" +#include "Plants.hpp" #include "Soda.hpp" #include "WaterBottle.hpp" diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp index 291a38c8a..1dafd752c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp @@ -440,57 +440,4 @@ class FoodBioMeat: FoodEdible descriptionShort = $STR_FOOD_NAME_BIOMEAT_DESC; bloodRegen = 1600; infectionChance = 0.4; -}; - -class equip_garlic_bulb : FoodEdible -{ - scope = 2; - count = 1; - displayName = $STR_ITEM_NAME_equip_garlic_bulb; - descriptionShort = $STR_ITEM_DESC_equip_garlic_bulb; - model = "\z\addons\dayz_communityassets\models\herb_garlic_bulb.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_garlic_bulb_ca.paa"; - bloodRegen = 80; -}; - -// new DZE harvested food -class FoodPumpkin : FoodEdible -{ - scope = 2; - count = 1; - bloodRegen = 100; - displayName = $STR_FOOD_NAME_PUMPKIN; - descriptionShort = $STR_FOOD_NAME_PUMPKIN; - 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 - { - text = $STR_EAT_FOOD; - script = "spawn player_consume"; - }; - class Crafting - { - text = $STR_FOOD_NAME_PUMPKIN_CRAFT; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; - neednearby[] = {""}; - requiretools[] = {"ItemKnife"}; - output[] = {{"ItemPumpkinSeed",5}}; - input[] = {{"FoodPumpkin",1}}; - }; - }; -}; -class FoodSunFlowerSeed : FoodEdible -{ - scope = 2; - count = 1; - bloodRegen = 100; - displayName = $STR_FOOD_NAME_SUNFLOWER; - descriptionShort = $STR_FOOD_NAME_SUNFLOWER; - 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/Plants.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Plants.hpp new file mode 100644 index 000000000..5ac657e4a --- /dev/null +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Plants.hpp @@ -0,0 +1,92 @@ +class equip_garlic_bulb : FoodEdible +{ + scope = 2; + count = 1; + displayName = $STR_ITEM_NAME_equip_garlic_bulb; + descriptionShort = $STR_ITEM_DESC_equip_garlic_bulb; + model = "\z\addons\dayz_communityassets\models\herb_garlic_bulb.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_garlic_bulb_ca.paa"; + bloodRegen = 80; +}; + +class FoodPumpkin : FoodEdible +{ + scope = 2; + count = 1; + bloodRegen = 100; + displayName = $STR_FOOD_NAME_PUMPKIN; + descriptionShort = $STR_FOOD_NAME_PUMPKIN; + 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 + { + text = $STR_EAT_FOOD; + script = "spawn player_consume"; + }; + class Crafting + { + text = $STR_FOOD_NAME_PUMPKIN_CRAFT; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {""}; + requiretools[] = {"ItemKnife"}; + output[] = {{"ItemPumpkinSeed",5}}; + input[] = {{"FoodPumpkin",1}}; + }; + }; +}; + +class FoodSunFlowerSeed : FoodEdible +{ + scope = 2; + count = 1; + bloodRegen = 100; + displayName = $STR_FOOD_NAME_SUNFLOWER; + descriptionShort = $STR_FOOD_NAME_SUNFLOWER; + weight = 0.1; + model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon + picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa"; +}; + +class FoodPotatoRaw : FoodRaw +{ + scope = 2; + count = 1; + displayName = $STR_FOOD_NAME_POTATO; + descriptionShort = $STR_FOOD_NAME_POTATO; + weight = 0.1; + model = "\z\addons\dayz_epoch_w\items\veges\dze_potato.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa"; + bloodRegen = 0; + Nutrition[] = {0,0,0,0}; + cookOutput = "FoodPotatoBaked"; +}; + +class FoodPotatoBaked : FoodCooked +{ + scope = 2; + count = 1; + displayName = $STR_FOOD_NAME_POTATO_BAKED; + descriptionShort = $STR_FOOD_NAME_POTATO_BAKED; + weight = 0.1; + model = "\z\addons\dayz_epoch_w\items\veges\dze_potato.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa"; + bloodRegen = 200; + Nutrition[] = {250,0,0,0}; +}; + +class FoodCarrot : FoodCooked +{ + scope = 2; + count = 1; + displayName = $STR_FOOD_NAME_CARROT; + descriptionShort = $STR_FOOD_NAME_CARROT; + weight = 0.1; + model = "\z\addons\dayz_epoch_w\items\veges\dze_carrot.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa"; + bloodRegen = 150; + Nutrition[] = {120,0,0,0}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index b3a323dee..42eab1522 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -25280,6 +25280,18 @@ Säckchen Sonnenblumensamen Мешочек семечек + + Potato + Kartoffel + + + Baked Potato + Gebackene Kartoffel + + + Carrot + Karotte + Topaz Topas