diff --git a/SQF/dayz_code/Configs/CfgArma.hpp b/SQF/dayz_code/Configs/CfgArma.hpp index 11cf0bdc9..529d07ee0 100644 --- a/SQF/dayz_code/Configs/CfgArma.hpp +++ b/SQF/dayz_code/Configs/CfgArma.hpp @@ -543,6 +543,31 @@ class CfgSurvival { yield = 2; rawfoodtype = "FoodrabbitRaw"; }; - + }; + class Plants { + class Plant_Pumpkin_DZE { + qty = 4; + }; + class Plant_Sunflower_DZE { + qty = 3; + }; + class Plant_Potato_DZE { + qty = 7; + }; + class Plant_Carrot_DZE { + qty = 7; + }; + class Plant_Hemp_DZE { + qty = 2; + }; + class Plant_Tea_DZE { + qty = 3; + }; + class Plant_Tobacco_DZE { + qty = 2; + }; + class Plant_Garlic_DZE { + qty = 7; + }; }; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp index 07c338d6d..e8f22d8a1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp @@ -1471,4 +1471,44 @@ class metal_container_2d_kit: CA_Magazine // 2x red create = "MetalContainer2D_DZ"; }; }; +}; + +class compost_barrel_empty_kit: CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + displayName = $STR_EPOCH_COMPOST_BARREL_EMTPY; + descriptionShort = $STR_EPOCH_COMPOST_BARREL_EMTPY_DESC; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + + class ItemActions { + class Build { + text = $STR_EPOCH_BUILD_COMPOST_BARREL; + script = "spawn player_build;"; + require[] = {}; + create = "Compost_Barrel_Empty_DZE"; + }; + }; +}; + +class compost_barrel_full_kit: CA_Magazine +{ + scope = 2; + count = 1; + type = 256; + displayName = $STR_EPOCH_COMPOST_BARREL_FULL; + descriptionShort = $STR_EPOCH_COMPOST_BARREL_FULL_DESC; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + + class ItemActions { + class Build { + text = $STR_EPOCH_BUILD_COMPOST_BARREL; + script = "spawn player_build;"; + require[] = {"ItemShovel"}; + create = "Compost_Barrel_Full_DZE"; + }; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp b/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp index bd85705b8..6edd42521 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp @@ -51,6 +51,26 @@ class Dayz_Plant1: Plant_Base { }; }; +class Compost_Barrel_Base_DZE : NonStrategic { + scope = 0; + icon = "\ca\data\data\Unknown_object.paa"; + model = "\CA\Structures\Misc\Armory\Barels\barrel_empty.p3d"; + armor = 100; + mapsize = 2; + vehicleClass = "DayZ Epoch Plants"; +}; + +class Compost_Barrel_Empty_DZE : Compost_Barrel_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_COMPOST_BARREL_EMTPY; +}; + +class Compost_Barrel_Full_DZE : Compost_Barrel_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_COMPOST_BARREL_FULL; + model = "\CA\Structures\Misc\Armory\Barels\barrel_sand.p3d"; +}; + class Plant_Patch_Base_DZE : NonStrategic { scope = 0; model = "\z\addons\dayz_communityassets\models\stash_small.p3d"; @@ -93,4 +113,57 @@ class Plant_Patch_Tobacco_DZE : Plant_Patch_Base_DZE { class Plant_Patch_Tea_DZE : Plant_Patch_Base_DZE { scope = 2; displayname = $STR_EPOCH_PLANT_PATCH_TEA; +}; + +class Plant_Patch_Garlic_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayname = $STR_EPOCH_PLANT_PATCH_GARLIC; +}; + +class Plant_Pumpkin_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_PUMPKIN; + model = "\ca\plants2\plant\pumpkin.p3d"; +}; + +class Plant_Sunflower_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_SUNFLOWER; + model = "\ca\plants2\plant\p_helianthus.p3d"; +}; + +class Plant_Potato_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_POTATO; + model = "\ca\plants2\plant\p_urtica.p3d"; +}; + +class Plant_Carrot_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_CARROT; + model = "\ca\plants2\plant\p_carduus.p3d"; +}; + +class Plant_Hemp_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_HEMP; + model = "\ca\plants_e\plant\p_fiberplant_ep1.p3d"; +}; + +class Plant_Tea_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_TEA; + model = "\ca\plants2\clutter\c_wideLeafPlant.p3d"; +}; + +class Plant_Tobacco_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_TOBACCO; + model = "\ca\plants2\bush\b_betulaHumilis.p3d"; +}; + +class Plant_Garlic_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_GARLIC; + model = "z\addons\dayz_communityassets\models\comfrey_up_small.p3d"; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_harvestPlant.sqf b/SQF/dayz_code/actions/player_harvestPlant.sqf index c8f0ce003..2da7fe5c8 100644 --- a/SQF/dayz_code/actions/player_harvestPlant.sqf +++ b/SQF/dayz_code/actions/player_harvestPlant.sqf @@ -4,66 +4,57 @@ Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. */ -closeDialog 0; - if (dayz_actionInProgress) exitWith {localize "str_epoch_player_72" call dayz_rollingMessages;}; dayz_actionInProgress = true; +closeDialog 0; -private ["_isOk","_i","_objName","_finished","_proceed","_itemOut","_countOut","_plant","_findNearestPlant","_index","_invResult","_text","_playerNear"]; +local _plant = objNull; +local _itemOut = ""; +local _type = ""; -_countOut = 0; - -_findNearestPlant = []; -{ - if (typeOf _x in dayz_plantTypes && {alive _x}) then { - _objName = _x call fn_getModelName; - if (_objName in dayz_plant) then { - _findNearestPlant set [count _findNearestPlant,_x]; +{ + local _obj = _x; + _type = typeOf _obj; + if (alive _obj && {_type in dayz_plantTypes}) exitwith { + local _objName = _obj call fn_getModelName; + + if (_objName in ["pumpkin.p3d","p_helianthus.p3d","p_fiberplant_ep1.p3d"] || _type != "" && {_objName in dayz_plant}) exitWith { _index = dayz_plant find _objName; _itemOut = dayz_plantOutput select _index; - _countOut = 1; + _plant = _obj; }; }; } count nearestObjects [([player] call FNC_getPos), [], 10]; -if (count _findNearestPlant >= 1) then { - _plant = _findNearestPlant select 0; +if !(isNull _plant) then { + [player,(getPosATL player),20,"chopwood"] spawn fnc_alertZombies; + local _finished = ["Medic",1] call fn_loopAction; - _isOk = true; - _proceed = false; - while {_isOk} do { - [player,(getPosATL player),20,"chopwood"] spawn fnc_alertZombies; - - _finished = ["Medic",1] call fn_loopAction; - - if(!_finished) exitWith { - _isOk = false; - _proceed = false; - }; - - if(_finished) exitWith { - _isOk = false; - _proceed = true; - }; - }; - - if (_proceed) then { - _playerNear = {isPlayer _x} count (([_plant] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1; + if (_finished) then { + local _playerNear = {isPlayer _x} count (([_plant] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1; if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;}; false call dz_fn_meleeMagazines; //Remove melee magazines (BIS_fnc_invAdd fix) ["Working",0,[3,2,4,0]] call dayz_NutritionSystem; - _invResult = false; - _i = 0; + local _invResult = false; + local _groundDrop = false; + local _i = 0; + local _j = 0; + local _countOut = getNumber(configFile >> "CfgSurvival" >> "Plants" >> _type >> "qty"); + _countOut = 1 + floor(random _countOut); + for "_x" from 1 to _countOut do { _invResult = [player,_itemOut] call BIS_fnc_invAdd; - if(_invResult) then { - _i = _i + 1; + if !(_invResult) then { + [_itemOut,1,1] call fn_dropItem; + _groundDrop = true; + _j = _j + 1; }; + _i = _i + 1; }; true call dz_fn_meleeMagazines; - _text = getText (configFile >> "CfgMagazines" >> _itemOut >> "displayName"); + local _text = getText (configFile >> "CfgMagazines" >> _itemOut >> "displayName"); if (_i != 0) then { if ("" == typeOf _plant) then { @@ -72,7 +63,11 @@ if (count _findNearestPlant >= 1) then { } else { deleteVehicle _plant; }; - format[localize "str_epoch_player_154",_i,_text] call dayz_rollingMessages; + if (_groundDrop) then { + format[localize "str_success_gathered",_text,(_i-_j),_j,_text] call dayz_rollingMessages; + } else { + format[localize "str_epoch_player_154",_i,_text] call dayz_rollingMessages; + }; } else { format[localize "str_epoch_player_143",_i,_text] call dayz_rollingMessages; }; @@ -83,4 +78,4 @@ if (count _findNearestPlant >= 1) then { localize "str_epoch_player_74" call dayz_rollingMessages; }; -dayz_actionInProgress = false; +dayz_actionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 9515fbd2d..bfdf3cb66 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -4,7 +4,7 @@ Dayz_plants = ["Dayz_Plant1","Dayz_Plant2","Dayz_Plant3"]; DayZ_SafeObjects = ["Base_Fire_DZ","Land_Fire_DZ","TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","BearTrap_DZ","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare","TentStorageDomed","VaultStorageLocked","VaultStorage2Locked","BagFenceRound_DZ","TrapBear","Fort_RazorWire","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","Plastic_Pole_EP1_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","WinterCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","WinterLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","LockboxStorage2Locked","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodStairsRails_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","GunRack2_DZ","FireBarrel_DZ","WoodCrate_DZ","WoodCrate2_DZ","Scaffolding_DZ","DesertTentStorage","DesertTentStorage0","DesertTentStorage1","DesertTentStorage2","DesertTentStorage3","DesertTentStorage4","WoodenFence_1_foundation_DZ","WoodenFence_1_frame_DZ","WoodenFence_quaterpanel_DZ","WoodenFence_halfpanel_DZ","WoodenFence_thirdpanel_DZ","WoodenFence_1_DZ","WoodenFence_2_DZ","WoodenFence_3_DZ","WoodenFence_4_DZ","WoodenFence_5_DZ","WoodenFence_6_DZ","WoodenFence_7_DZ","MetalFence_1_foundation_DZ","MetalFence_1_frame_DZ","MetalFence_halfpanel_DZ","MetalFence_thirdpanel_DZ","MetalFence_1_DZ","MetalFence_2_DZ","MetalFence_3_DZ","MetalFence_4_DZ","MetalFence_5_DZ","MetalFence_6_DZ","MetalFence_7_DZ","WoodenGate_foundation_DZ","WoodenGate_1_DZ","WoodenGate_2_DZ","WoodenGate_3_DZ","WoodenGate_4_DZ","WoodGateFrame_DZ","Land_DZE_WoodGate","Land_DZE_WoodGateLocked","CinderGateFrame_DZ","CinderGate_DZ","CinderGateLocked_DZ","Metal_Drawbridge_DZ","Metal_DrawbridgeLocked_DZ","WoodTriangleWall_DZ","WoodHandrail_DZ","WoodFloorStairs_DZ","WoodPillar_DZ","Land_DZE_WoodOpenTopGarageDoor","Land_DZE_WoodOpenTopGarageLocked","CinderGarageOpenTopFrame_DZ","CinderGarageOpenTop_DZ","CinderGarageOpenTopLocked_DZ","DoorFrame_DZ","Door_DZ","DoorLocked_DZ","CinderWallWindow_DZ","CinderWallWindowLocked_DZ","CinderDoorHatch_DZ","CinderDoorHatchLocked_DZ","MetalPillar_DZ","MetalFloor_Half_DZ","MetalFloor_Quarter_DZ","GlassFloor_DZ","Concrete_Bunker_DZ","Concrete_Bunker_Locked_DZ","TallSafeLocked","Advanced_WorkBench_DZ","CookTripod_DZ","Stoneoven_DZ","Commode_DZ","Wardrobe_DZ","Fridge_DZ","Washing_Machine_DZ","Server_Rack_DZ","ATM_DZ","Armchair_DZ","Sofa_DZ","Arcade_DZ","Vendmachine1_DZ","Vendmachine2_DZ","Notebook_DZ","Water_Pump_DZ","Greenhouse_DZ","Bed_DZ","Table_DZ","Office_Chair_DZ","MetalFloor4x_DZ","GlassFloor_Half_DZ","GlassFloor_Quarter_DZ","WoodFloor4x_DZ","WoodTriangleFloor_DZ","CinderWallHalf_Gap_DZ","TentStorageWinter","TentStorageWinter0","TentStorageWinter1","TentStorageWinter2","TentStorageWinter3","TentStorageWinter4","WinterDomeTentStorage","WinterDomeTentStorage0","WinterDomeTentStorage1","WinterDomeTentStorage2","WinterDomeTentStorage3","WinterDomeTentStorage4","VaultStorageBroken","VaultStorageBroken2","TallSafeBroken","LockboxStorageBroken","LockboxStorage2Broken","LockboxStorageWinterBroken","LockboxStorageWinter2Broken","StorageCrate_DZ","CamoStorageCrate_DZ","Garage_Green_DZ","Garage_White_DZ","Garage_Brown_DZ","Garage_Grey_DZ","Helipad_Civil_DZ","Helipad_Rescue_DZ","Helipad_Army_DZ","Helipad_Cross_DZ","Helipad_ParkBorder_DZ","CCTV_DZ","BarbedGate_DZ","MetalContainer2D_DZ","MetalContainer1G_DZ","MetalContainer1B_DZ","MetalContainer1A_DZ","Windbreak_DZ","DragonTeethBig_DZ","DragonTeeth_DZ","ConcretePipe_DZ","ConcreteWall_DZ","ConcreteBarrierStriped_DZ","ConcreteBarrier_DZ","WoodenFootbridge_DZ","SimpleFootbridge_DZ","FortifiedWire_DZ","SandNestLarge_DZ","Land_WarfareBarrier10xTall_DZ","Land_WarfareBarrier10x_DZ","Land_WarfareBarrier5x_DZ","Land_HBarrier5Curved_DZ","HeavyBagFence_DZ","HeavyBagFenceCorner_DZ","HeavyBagFenceRound_DZ"]; DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank","VaultStorage","VaultStorage2","TallSafe","LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2","TentStorage","OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","WoodCrate2_DZ","Scaffolding_DZ","Generator_DZ","Advanced_WorkBench_DZ","CookTripod_DZ","Stoneoven_DZ","Commode_DZ","Wardrobe_DZ","Fridge_DZ","Washing_Machine_DZ","Server_Rack_DZ","ATM_DZ","Armchair_DZ","Sofa_DZ","Arcade_DZ","Vendmachine1_DZ","Vendmachine2_DZ","VaultStorageBroken","VaultStorageBroken2","TallSafeBroken","LockboxStorageBroken","LockboxStorage2Broken","LockboxStorageWinterBroken","LockboxStorageWinter2Broken","StorageCrate_DZ","CamoStorageCrate_DZ"]; dayz_typedBags = ["bloodTester","bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; -dayz_plant = ["pumpkin.p3d","p_helianthus.p3d","p_fiberplant_ep1.p3d"]; +dayz_plant = ["pumpkin.p3d","p_helianthus.p3d","p_fiberplant_ep1.p3d","pumpkin.p3d","p_helianthus.p3d","p_urtica.p3d","p_carduus.p3d","p_fiberplant_ep1.p3d","c_wideleafplant.p3d","b_betulahumilis.p3d","comfrey_up_small.p3d"]; dayz_trees = ["ind_timbers.p3d","t_picea2s_snow.p3d","b_corylus.p3d","t_quercus3s.p3d","t_larix3s.p3d","t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d","str habr.p3d","brg_bird_1.p3d","brg_bird_2.p3d","brg_bird_3.p3d","brg_umbrella_acacia02b.p3d","brg_africandoumpalm_1.p3d","brg_umbrella_acacia04b.p3d","brg_datepalm_4.p3d","brg_datepalm_1.p3d","brg_umbrella_acacia03b.p3d","brg_bottle_4.p3d","brg_aloe1.p3d","brg_umbrella_acacia03.p3d","brg_umbrella_acacia01.p3d","brg_umbrella_acacia04.p3d","brg_aloe2.p3d","brg_umbrella_acacia02.p3d","brg_aloe3.p3d","brg_bottle_1.p3d","brg_datepalm_3.p3d","brg_datepalm_2.p3d","brg_baobab_1.p3d","brg_bottle_2.p3d","brg_bottle_3.p3d","t_fraxinus2s.p3d","t_carpinus2s.p3d"]; dayZ_explosiveParts = ["palivo","motor"]; dayz_traps_active = []; @@ -283,8 +283,8 @@ if (!isDedicated) then { DayZ_fuelCans = ["ItemJerrycan","ItemFuelcan","ItemFuelBarrel"]; DayZ_fuelCansEmpty = ["ItemJerrycanEmpty","ItemFuelcanEmpty","ItemFuelBarrelEmpty"]; DayZ_fuelSources = ["Land_Ind_TankSmall","Land_fuel_tank_big","Land_fuel_tank_stairs","Land_fuel_tank_stairs_ep1","Land_wagon_tanker","Land_fuelstation","Land_fuelstation_army","Land_smd_fuelstation_army","land_fuelstation_w","Land_benzina_schnell"]; - dayz_plantOutput = ["FoodPumpkin","FoodSunFlowerSeed","ItemKiloHemp"]; - dayz_plantTypes = ["","MAP_pumpkin","MAP_p_Helianthus","fiberplant"]; + dayz_plantOutput = ["FoodPumpkin","FoodSunFlowerSeed","ItemKiloHemp","FoodPumpkin","FoodSunFlowerSeed","FoodPotatoRaw","FoodCarrot","ItemKiloHemp","ItemKiloBlackTea","ItemTobaccoLeafs","equip_garlic_bulb"]; + dayz_plantTypes = ["","MAP_pumpkin","MAP_p_Helianthus","fiberplant","Plant_Pumpkin_DZE","Plant_Sunflower_DZE","Plant_Potato_DZE","Plant_Carrot_DZE","Plant_Hemp_DZE","Plant_Tea_DZE","Plant_Tobacco_DZE","Plant_Garlic_DZE"]; DZE_LockableStorage = ["VaultStorage","VaultStorage2","VaultStorageLocked","VaultStorage2Locked","LockboxStorageLocked","LockboxStorage2Locked","LockboxStorage","LockboxStorage2","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","LockboxStorageWinter","LockboxStorageWinter2","TallSafe","TallSafeLocked"]; DZE_UpgradableStorage = ["StorageShed_DZ","WoodShack_DZ","Wooden_shed_DZ","GunRack_DZ","WoodCrate_DZ","VaultStorageLocked","LockboxStorageLocked","LockboxStorageWinterLocked"]; DZE_LockboxesUnlocked = ["LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2"]; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 45c26416f..134966564 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -6389,11 +6389,11 @@ - You have collected %2 %1. %3 Dropped. - Du hast %2x %1 aufgesammelt. Die restlichen %3 liegen noch auf dem Boden. - Вы собрали %1 (%2). %3 осталось. - Vous avez récolté %2 %1. %3 Dropped. - Nasbírali jste %2x %1. Zbývá ještě %3. + You have collected %2x %1. %3 %4 dropped on the ground. + Du hast %2x %1 aufgesammelt. Die restlichen %3 %4 liegen noch auf dem Boden. + Вы собрали %1 (%2). %3 %4 осталось. + Vous avez récolté %2x %1. %3 %4 Dropped. + Nasbírali jste %2x %1. Zbývá ještě %3 %4. Unable to gather due to space, 3 main slots are needed. @@ -23642,12 +23642,12 @@ Downgradnuli jste %1. - %1 of %2 could not be added to your inventory. (not enough room?) - %1 von %2 konnte dem Inventar nicht hinzugefügt werden. (Inventar voll?) + %1x %2 could not be added to your inventory. (not enough room?) + %1x %2 konnte dem Inventar nicht hinzugefügt werden. (Inventar voll?) %2 (в количестве: %1) не может быть добавлен в ваш инвентарь. (Недостаточно места?) - %1 van %2 kon niet worden toegevoegd aan je inventaris (vol?) - %1 sur %2 ne peuvent être ajoutés à votre inventaire. (pas assez de place ?) - %1 z %2 nemohl být přidán do inventáře. (nedostatek místa?) + %1x %2 kon niet worden toegevoegd aan je inventaris (vol?) + %1x %2 ne peuvent être ajoutés à votre inventaire. (pas assez de place ?) + %1x %2 nemohl být přidán do inventáře. (nedostatek místa?) Missing Parts after first check Item: %1 / %2 @@ -23679,11 +23679,11 @@ %3 hotovo, chybí ještě %1 %2 - %1 of %2 has been successfully added to your inventory. - %1 %2 wurde erfolgreich deinem Inventar hinzugefügt. + %1x %2 has been successfully added to your inventory. + %1x %2 wurde erfolgreich deinem Inventar hinzugefügt. %2 (в количестве: %1) успешно добавлен в ваш инвентарь. - %1 %2 is aan je inventaris toegevoegd. - %1 %2 bylo úspěšně přidáno do Vašeho inventáře. + %1x %2 is aan je inventaris toegevoegd. + %1x %2 bylo úspěšně přidáno do Vašeho inventáře. Mining Ore, walk away at any time to cancel. (%1/%2) @@ -35138,6 +35138,26 @@ Müllhaufen Мусорная куча + + Compost Barrel (Empty) + Kompostfass (Leer) + + + Compost Barrel (Empty) + Kompostfass (Leer) + + + Compost Barrel (Full) + Kompostfass (Voll) + + + Compost Barrel (Full) + Kompostfass (Voll) + + + Build Compost Barrel + Kompostfass bauen + Pumpkin patch Kürbisbeet @@ -35173,6 +35193,42 @@ Teepflanzenbeet Чайный участок + + Garlic patch + Knoblauchbeet + + + Pumpkin Plant + Kürbispflanze + + + Sunflower + Sonnenblume + + + Potato Plant + Kartoffelpflanze + + + Carrot Plant + Karottenpflanze + + + Hemp Plant + Cannabispflanze + + + Tea Plant + Teepflanze + + + Tobacco Plant + Tabakpflanze + + + Garlic Plant + Knoblauchpflanze + Notebook Ноутбук