diff --git a/Documents/Epoch 1.0.7.1 Classnames/CfgMagazines all.txt b/Documents/Epoch 1.0.7.1 Classnames/CfgMagazines all.txt index 104eaa623..571551149 100644 --- a/Documents/Epoch 1.0.7.1 Classnames/CfgMagazines all.txt +++ b/Documents/Epoch 1.0.7.1 Classnames/CfgMagazines all.txt @@ -545,6 +545,15 @@ ItemSodaRbull ItemSodaOrangeSherbet ItemSodaFrozen1 ItemSodaFrozen2 +FoodSteakWithPotatos +FoodSushi +FoodPumpkinSoup +FoodCarrotSoup +FoodPotatoSoup +FoodGarlicSoup +FoodVegetablePlate +ItemHoneyTea +ItemHoney ItemWaterBottle ItemWaterBottleInfected ItemWaterBottleSafe @@ -1423,6 +1432,8 @@ equip_rail_screws ItemBackpackUpgrade_1 ItemBackpackUpgrade_2 ItemBackpackUpgrade_3 +ItemDung +ItemSunFlowerOil TrapBear ItemTrapBearTrapFlare ItemTrapBearTrapSmoke diff --git a/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp b/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp index d45445333..4f8a47b3d 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp @@ -77,7 +77,7 @@ class Land_a_stationhouse: Military lootPosSmall[] = { {9.06836,3.57568,-7.921},{18.2129,-7.46094,-9.361},{18.1426,-6.00977,-9.461},{13.9092,3.57227,-9.001},{14.6641,3.53564,-8.621},{8.3291,3.6084,-8.241},{-0.427734,3.32861,-8.241},{-0.414063,1.05225,-8.621},{-0.453125,2.5249,-9.001},{-0.462891,1.72119,-8.241},{-5.54199,-7.50195,-8.621},{-3.46094,-8.99805,-8.621},{-2.65137,-8.99268,-8.241},{-5.09766,-9.01709,-9.001},{-1.80859,-9.03223,1.19621},{-1.73438,-8.3042,0.07621}, {-4.80762,9.25098,-3.92133},{-7.29004,9.16821,-3.96136},{-10.9609,6.15259,-3.52136},{-17.3389,5.68262,-4.08136},{-17.6768,-0.918701,-4.08136},{-9.26855,0.344482,-3.93134},{-2.83594,1.28564,-3.79987}, - {-18.0215,-1.25732,-6.35403},{-17.9746,3.85962,-6.35406},{-18.0635,7.23438,-6.35413},{-8.25586,5.18262,-6.4473},{-4.4873,5.12744,-6.44843},{-6.66602,0.610107,-6.17838}{-14.5615,-5.67358,-8.80038},{-18.1738,-5.58862,-8.79895},{-17.3984,2.9021,-8.79712},{-3.54785,7.06323,-8.73163},{-10.9971,6.32983,-8.72},{-2.84863,-2.62744,-8.73438},{-9.76172,-2.33618,-8.72217}}; + {-18.0215,-1.25732,-6.35403},{-17.9746,3.85962,-6.35406},{-18.0635,7.23438,-6.35413},{-8.25586,5.18262,-6.4473},{-4.4873,5.12744,-6.44843},{-6.66602,0.610107,-6.17838},{-14.5615,-5.67358,-8.80038},{-18.1738,-5.58862,-8.79895},{-17.3984,2.9021,-8.79712},{-3.54785,7.06323,-8.73163},{-10.9971,6.32983,-8.72},{-2.84863,-2.62744,-8.73438},{-9.76172,-2.33618,-8.72217}}; }; class Land_Mil_ControlTower: Military diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp index 274b683dd..364b94230 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp @@ -106,4 +106,6 @@ class FoodCooked : FoodEdible #include "Soda.hpp" #include "WaterBottle.hpp" -#include "PlasticWaterbottle.hpp" \ No newline at end of file +#include "PlasticWaterbottle.hpp" + +#include "Misc.hpp" \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Misc.hpp new file mode 100644 index 000000000..c5fd3ae4f --- /dev/null +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Misc.hpp @@ -0,0 +1,98 @@ +class FoodSteakWithPotatos : FoodCooked +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\plastic_box.p3d"; + picture = "\dayz_epoch_c\icons\equipment\steak_with_fries.paa"; + displayName = $STR_EQUIP_FOOD_NAME_STEAKWITHFRIES; + descriptionShort = $STR_EQUIP_FOOD_DESC_STEAKWITHFRIES; + bloodRegen = 3200; + Nutrition[] = {332,500,0,10}; +}; + +class FoodSushi : FoodCooked +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\plastic_box.p3d"; + picture = "\dayz_epoch_c\icons\equipment\suhsi.paa"; + displayName = $STR_EQUIP_FOOD_NAME_SUSHI; + descriptionShort = $STR_EQUIP_FOOD_DESC_SUSHI; + bloodRegen = 3500; + Nutrition[] = {332,600,20,5}; +}; + +class FoodPumpkinSoup : FoodCooked +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\plastic_box.p3d"; + picture = "\dayz_epoch_c\icons\equipment\pumpkin_soup.paa"; + displayName = $STR_EQUIP_FOOD_NAME_PUMPKINSOUP; + descriptionShort = $STR_EQUIP_FOOD_DESC_PUMPKINSOUP; + bloodRegen = 1500; + Nutrition[] = {332,150,300,20}; +}; + +class FoodCarrotSoup : FoodCooked +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\plastic_box.p3d"; + picture = "\dayz_epoch_c\icons\equipment\carrot_soup.paa"; + displayName = $STR_EQUIP_FOOD_NAME_CARROTSOUP; + descriptionShort = $STR_EQUIP_FOOD_DESC_CARROTSOUP; + bloodRegen = 1500; + Nutrition[] = {332,150,300,20}; +}; + +class FoodPotatoSoup : FoodCooked +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\plastic_box.p3d"; + picture = "\dayz_epoch_c\icons\equipment\potato_soup.paa"; + displayName = $STR_EQUIP_FOOD_NAME_POTATOSOUP; + descriptionShort = $STR_EQUIP_FOOD_DESC_POTATOSOUP; + bloodRegen = 1500; + Nutrition[] = {332,150,300,20}; +}; + +class FoodGarlicSoup : FoodCooked +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\plastic_box.p3d"; + picture = "\dayz_epoch_c\icons\equipment\garlic_soup.paa"; + displayName = $STR_EQUIP_FOOD_NAME_GARLICSOUP; + descriptionShort = $STR_EQUIP_FOOD_DESC_GARLICSOUP; + bloodRegen = 1500; + Nutrition[] = {332,150,300,20}; +}; + +class FoodVegetablePlate : FoodCooked +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\plastic_box.p3d"; + picture = "\dayz_epoch_c\icons\equipment\vegetable_plate.paa"; + displayName = $STR_EQUIP_FOOD_NAME_VEGYPLATE; + descriptionShort = $STR_EQUIP_FOOD_DESC_VEGYPLATE; + bloodRegen = 2300; + Nutrition[] = {500,400,20,5}; +}; + +class ItemHoneyTea : FoodDrink +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\waterbottle.p3d"; + picture = "\dayz_epoch_c\icons\equipment\honeytea.paa"; + displayName = $STR_ITEM_HONEYTEA_NAME; + descriptionShort = $STR_ITEM_HONEYTEA_DESC; + Nutrition[] = {200,0,320,20}; + infectionChance = -1; +}; + +class ItemHoney : FoodPackaged +{ + scope = 2; + model = "\z\addons\dayz_communityassets\models\plastic_box.p3d"; + picture = "\dayz_epoch_c\icons\equipment\honey.paa"; + displayName = $STR_EQUIP_FOOD_NAME_HONEYCOMB; + descriptionShort = $STR_EQUIP_FOOD_DESC_HONEYCOMB; + Nutrition[] = {50,50,50,0}; + bloodRegen = 175; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp index f71c3d193..a4b8753d0 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp @@ -249,28 +249,6 @@ class FoodCanDog2 : FoodPackaged consumeOutput = "FoodCanRusUnlabeledEmpty"; }; -class FoodCanFrozen1 : CA_Magazine -{ - scope = 2; - count = 1; - type = 256; - model = "z\addons\dayz_communityassets\models\can_unlabeled_clean_full.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_can_unlabeled_clean_full_ca.paa"; - displayName = $STR_FOOD_NAME_CAN_FROZEN; - descriptionShort = $STR_FOOD_DESC_CAN_FROZEN; -}; - -class FoodCanFrozen2 : CA_Magazine -{ - scope = 2; - count = 1; - type = 256; - model = "z\addons\dayz_communityassets\models\can_small_unlabeled_full.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_unlabeled_clean_full_ca.paa"; - displayName = $STR_FOOD_NAME_CAN_FROZEN; - descriptionShort = $STR_FOOD_DESC_CAN_FROZEN; -}; - class FoodCanRusStew : FoodPackaged { scope = 2; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp index 0fcfbc6a4..d8ddc6b75 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp @@ -221,26 +221,4 @@ class ItemSodaOrangeSherbet : ItemSodaCoke descriptionShort = $STR_FOOD_DESC_OSHERBET; model = "z\addons\dayz_epoch\models\soda_sherbet.p3d"; picture = "\z\addons\dayz_epoch\pictures\soda_orangesherbet_ca.paa"; -}; - -class ItemSodaFrozen1 : CA_Magazine -{ - scope = 2; - count = 1; - type = 256; - model = "z\addons\dayz_communityassets\models\can_unlabeled_clean_full.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_can_unlabeled_clean_full_ca.paa"; - displayName = $STR_EQUIP_NAME_SODA_CAN_FROZEN; - descriptionShort = $STR_EQUIP_DESC_SODA_CAN_FROZEN; -}; - -class ItemSodaFrozen2 : CA_Magazine -{ - scope = 2; - count = 1; - type = 256; - model = "z\addons\dayz_communityassets\models\can_small_unlabeled_full.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_unlabeled_clean_full_ca.paa"; - displayName = $STR_EQUIP_NAME_SODA_CAN_FROZEN; - descriptionShort = $STR_EQUIP_DESC_SODA_CAN_FROZEN; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp index 7d2cc654d..f6cf63cc6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp @@ -531,4 +531,70 @@ class ItemBackpackUpgrade_3 : CA_Magazine model = "\ca\weapons\mag_univ.p3d"; picture = "\dayz_epoch_c\icons\equipment\ItemBackpackUpgrade.paa"; type = 256; -}; \ No newline at end of file +}; + +class FoodCanFrozen1 : CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + model = "z\addons\dayz_communityassets\models\can_unlabeled_clean_full.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_can_unlabeled_clean_full_ca.paa"; + displayName = $STR_FOOD_NAME_CAN_FROZEN; + descriptionShort = $STR_FOOD_DESC_CAN_FROZEN; +}; + +class FoodCanFrozen2 : CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + model = "z\addons\dayz_communityassets\models\can_small_unlabeled_full.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_unlabeled_clean_full_ca.paa"; + displayName = $STR_FOOD_NAME_CAN_FROZEN; + descriptionShort = $STR_FOOD_DESC_CAN_FROZEN; +}; + +class ItemSodaFrozen1 : CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + model = "z\addons\dayz_communityassets\models\can_unlabeled_clean_full.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_can_unlabeled_clean_full_ca.paa"; + displayName = $STR_EQUIP_NAME_SODA_CAN_FROZEN; + descriptionShort = $STR_EQUIP_DESC_SODA_CAN_FROZEN; +}; + +class ItemSodaFrozen2 : CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + model = "z\addons\dayz_communityassets\models\can_small_unlabeled_full.p3d"; + picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_unlabeled_clean_full_ca.paa"; + displayName = $STR_EQUIP_NAME_SODA_CAN_FROZEN; + descriptionShort = $STR_EQUIP_DESC_SODA_CAN_FROZEN; +}; + +class ItemDung : CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + model = "\z\addons\dayz_epoch\models\zombie_parts_bag_v2.p3d"; + picture = "\dayz_epoch_c\icons\equipment\dung.paa"; + displayName = $STR_ITEM_NAME_DUNG; + descriptionShort = $STR_ITEM_DESC_DUNG; +}; + +class ItemSunFlowerOil : CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + model = "\z\addons\dayz_communityassets\models\waterbottle.p3d"; + picture = "\dayz_epoch_c\icons\equipment\sunfloweroil.paa"; + displayName = $STR_ITEM_NAME_SUNFLOWEROIL; + descriptionShort = $STR_ITEM_DESC_SUNFLOWEROIL; +}; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/Misc.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/Misc.hpp new file mode 100644 index 000000000..67655909c --- /dev/null +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/Misc.hpp @@ -0,0 +1,36 @@ +class FoodSteakWithPotatos +{ + weight = 0.6; +}; +class FoodSushi +{ + weight = 0.8; +}; +class FoodPumpkinSoup +{ + weight = 0.4; +}; +class FoodCarrotSoup +{ + weight = 0.4; +}; +class FoodPotatoSoup +{ + weight = 0.4; +}; +class FoodGarlicSoup +{ + weight = 0.4; +}; +class FoodVegetablePlate +{ + weight = 0.4; +}; +class ItemHoneyTea +{ + weight = 1; +}; +class ItemHoney +{ + weight = 0.2; +}; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/PackagedFood.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/PackagedFood.hpp index aa8a7ebb5..4c37b98f0 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/PackagedFood.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/PackagedFood.hpp @@ -169,12 +169,4 @@ class FoodCanDog1 class FoodCanDog2 { weight = 0.2; -}; -class FoodCanFrozen1 -{ - weight = 0.25; -}; -class FoodCanFrozen2 -{ - weight = 0.25; }; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/Soda.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/Soda.hpp index 1f395aeb6..e212a8cb1 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/Soda.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Consumables/Soda.hpp @@ -81,12 +81,4 @@ class ItemSodaRbull class ItemSodaOrangeSherbet { weight = 0.2; -}; -class ItemSodaFrozen1 -{ - weight = 0.25; -}; -class ItemSodaFrozen2 -{ - weight = 0.25; }; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Misc.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Misc.hpp index 0fad7969c..c0347dc17 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Misc.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Misc.hpp @@ -244,4 +244,28 @@ class ItemBackpackUpgrade_2 class ItemBackpackUpgrade_3 { weight = 6; +}; +class FoodCanFrozen1 +{ + weight = 0.25; +}; +class FoodCanFrozen2 +{ + weight = 0.25; +}; +class ItemSodaFrozen1 +{ + weight = 0.25; +}; +class ItemSodaFrozen2 +{ + weight = 0.25; +}; +class ItemDung +{ + weight = 2.5; +}; +class ItemSunFlowerOil +{ + weight = 0.6; }; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Planting.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Planting.hpp index 8464855c2..b83f06296 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Planting.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Planting.hpp @@ -47,6 +47,10 @@ class equip_comfreyleafs { weight = 0.1; }; +class ItemComfreySeed +{ + weight = 0.2; +}; class FoodPumpkin { weight = 3; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp index fe7fb4961..4df2d71de 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp @@ -43,6 +43,7 @@ class CfgWeight #include "Magazines\Consumables\PlasticWaterbottle.hpp" #include "Magazines\Consumables\Soda.hpp" #include "Magazines\Consumables\WaterBottle.hpp" + #include "Magazines\Consumables\Misc.hpp" #include "Magazines\Items\Currency\AluminumBar.hpp" #include "Magazines\Items\Currency\Briefcase.hpp" diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 1daeb989a..04e02e7f6 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -5837,6 +5837,93 @@ Une boîte intacte de maïs. Čistá a ještě neotevřená plechovka kukuřice. + + Steak with fries + Steak mit Pommes + + + A very hearty meal with a steak and some fries. + Ein sehr deftiges Mahl mit einem Steak und einigen Pommes. + + + Sushi + + + Suhsi with three kinds of fish. + Suhsi mit dreierlei Arten von Fisch. + + + Pumpkin soup + Kürbissuppe + + + A homemade pumpkin soup. + Eine Kürbissuppe nach Hausmannsart. + + + Carrot soup + Karottensuppe + + + A homemade carrot soup. + Eine Karottensuppe nach Hausmannsart. + + + Potato soup + Kartoffelsuppe + + + A homemade potato soup. + Eine Kartoffelsuppe nach Hausmannsart. + + + Garlic soup + Knoblauchsuppe + + + A homemade garlic soup. + Eine Knoblauchsuppe nach Hausmannsart. + + + Vegetable platter + Gemüseplatte + + + A platter of vegetable with lots of vitamins. + Eine Gemüseplatte mit vielen Vitaminen. + + + Honey tea + Honigtee + + + A heathly honey tea which will warm yourself. + Ein gesunder Honigtee, welcher Wärme spendet. + + + Honeycomb + Honigwabe + + + A freshly harvested honeycomb from a wild bee hive. + Eine frisch geerntete Honigwabe aus einem Wildbienenstock. + + + Dung + Mist + + + A by-product of your kept animals. + Ein Nebenprodukt von gehaltenen Tieren. + + + Sunfloweroil + Sonnenblumenöl + + + An oil made od sunflower seeds. + Ein Öl, welches aus Sonnenblumensamen hergestellt wird. + Toilet paper Toilettenpapier