diff --git a/SQF/dayz_code/Configs/CfgArma.hpp b/SQF/dayz_code/Configs/CfgArma.hpp index 529d07ee0..71ad41a66 100644 --- a/SQF/dayz_code/Configs/CfgArma.hpp +++ b/SQF/dayz_code/Configs/CfgArma.hpp @@ -568,6 +568,9 @@ class CfgSurvival { }; class Plant_Garlic_DZE { qty = 7; + }; + class Plant_Comfrey_DZE { + qty = 3; }; }; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Planting.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Planting.hpp index e6f0dacc6..c215d629e 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Planting.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Planting.hpp @@ -130,6 +130,17 @@ class ItemTobaccoLeafs : CA_Magazine type = 256; }; +class ItemComfreySeed: CA_Magazine +{ + scope = 2; + count = 1; + displayName = $STR_CRAFT_NAME_COMFREY_SEED; + descriptionShort = $STR_CRAFT_DESC_COMFREY_SEED; + model = "\z\addons\dayz_epoch_w\items\veges\seedbag_01.p3d"; + picture = "\dayz_epoch_c\icons\plants\confreyseeds.paa"; + type = 256; +}; + class equip_comfreyleafs : CA_Magazine { scope = 2; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp b/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp index 1f7ce3ecc..5d1bb12b7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp @@ -122,6 +122,11 @@ class Plant_Patch_Garlic_DZE : Plant_Patch_Base_DZE { displayname = $STR_EPOCH_PLANT_PATCH_GARLIC; }; +class Plant_Patch_Comfrey_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; @@ -168,4 +173,10 @@ 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"; +}; + +class Plant_Comfrey_DZE : Plant_Patch_Base_DZE { + scope = 2; + displayName = $STR_EPOCH_PLANT_COMFREY; + model = "z\addons\dayz_communityassets\models\comfrey_up.p3d"; }; \ No newline at end of file diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 4742ae899..3a463767c 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -13,13 +13,13 @@ DZE_isNewStorage = ["Generator_DZ","GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","Wo DZE_Tents = ["TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","DesertTentStorage","DesertTentStorage0","DesertTentStorage1","DesertTentStorage2","DesertTentStorage3","DesertTentStorage4","TentStorageWinter","TentStorageWinter0","TentStorageWinter1","TentStorageWinter2","TentStorageWinter3","TentStorageWinter4","WinterDomeTentStorage","WinterDomeTentStorage0","WinterDomeTentStorage1","WinterDomeTentStorage2","WinterDomeTentStorage3","WinterDomeTentStorage4"]; DZE_Stashes = ["StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4"]; DZE_CamoNets = ["DesertCamoNet_DZ","WinterCamoNet_DZ","ForestCamoNet_DZ","WinterLargeCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ"]; -DZE_Plants = ["Plant_Pumpkin_DZE","Plant_Sunflower_DZE","Plant_Potato_DZE","Plant_Carrot_DZE","Plant_Hemp_DZE","Plant_Tea_DZE","Plant_Tobacco_DZE","Plant_Garlic_DZE"]; -DayZ_SafeObjects = ["Land_Fire_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","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","WorkBench_DZ","FuelPump_DZ","FireBarrel_DZ","Plastic_Pole_EP1_DZ","CanvasHut_DZ","ParkBench_DZ","DeerStand_DZ","MetalGate_DZ","Fence_corrugated_DZ","StickFence_DZ","LightPole_DZ","Scaffolding_DZ","Hedgehog_DZ","MetalPanel_DZ","Fort_RazorWire","FortifiedWire_DZ","BarbedGate_DZ","WoodGate_DZ","ConcreteBarrier_DZ","ConcreteBarrierStriped_DZ","ConcreteWall_DZ","ConcretePipe_DZ","DragonTeeth_DZ","DragonTeethBig_DZ","SimpleFootbridge_DZ","WoodenFootbridge_DZ","Windbreak_DZ","MetalContainer1A_DZ","MetalContainer1B_DZ","MetalContainer1G_DZ","MetalContainer2D_DZ","Notebook_DZ","Water_Pump_DZ","Greenhouse_DZ","Bed_DZ","Table_DZ","Office_Chair_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","Satellite_Dish_DZE","Fueltank_DZE","Watertank_DZE","Watertower_DZE","CinderWallHalf_DZ","CinderWallHalf_Gap_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallSmallDoorway_DZ","CinderGateFrame_DZ","CinderGarageOpenTopFrame_DZ","WoodRamp_DZ","WoodFloor_DZ","WoodFloorStairs_DZ","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodFloor4x_DZ","WoodTriangleFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallThird_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","WoodTriangleWall_DZ","WoodGateFrame_DZ","WoodStairs_DZ","WoodStairsRails_DZ","WoodStairsSans_DZ","WoodLadder_DZ","WoodHandrail_DZ","WoodPillar_DZ","MetalFloor_DZ","MetalFloor_Half_DZ","MetalFloor_Quarter_DZ","MetalFloor4x_DZ","DoorFrame_DZ","MetalPillar_DZ","GlassFloor_DZ","GlassFloor_Half_DZ","GlassFloor_Quarter_DZ","ElevatorStart_DZ","ElevatorStop_Glass_DZ","Sandbag1_DZ","BagFenceRound_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Land_HBarrier5Curved_DZ","Land_WarfareBarrier5x_DZ","Land_WarfareBarrier10x_DZ","Land_WarfareBarrier10xTall_DZ","SandNest_DZ","SandNestLarge_DZ","HeavyBagFence_DZ","HeavyBagFenceCorner_DZ","HeavyBagFenceRound_DZ","BearTrap_DZ","TrapBearTrapFlare","TrapBearTrapSmoke","Trap_Cans","TrapTripwireFlare","TrapTripwireGrenade","TrapTripwireSmoke","Compost_Barrel_Empty_DZE","Compost_Barrel_Full_DZE","Plant_Patch_Pumpkin_DZE","Plant_Patch_Sunflower_DZE","Plant_Patch_Carrot_DZE","Plant_Patch_Potato_DZE","Plant_Patch_Hemp_DZE","Plant_Patch_Tobacco_DZE","Plant_Patch_Tea_DZE","Plant_Patch_Garlic_DZE"]; +DZE_Plants = ["Plant_Pumpkin_DZE","Plant_Sunflower_DZE","Plant_Potato_DZE","Plant_Carrot_DZE","Plant_Hemp_DZE","Plant_Tea_DZE","Plant_Tobacco_DZE","Plant_Garlic_DZE","Plant_Comfrey_DZE"]; +DayZ_SafeObjects = ["Land_Fire_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","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","WorkBench_DZ","FuelPump_DZ","FireBarrel_DZ","Plastic_Pole_EP1_DZ","CanvasHut_DZ","ParkBench_DZ","DeerStand_DZ","MetalGate_DZ","Fence_corrugated_DZ","StickFence_DZ","LightPole_DZ","Scaffolding_DZ","Hedgehog_DZ","MetalPanel_DZ","Fort_RazorWire","FortifiedWire_DZ","BarbedGate_DZ","WoodGate_DZ","ConcreteBarrier_DZ","ConcreteBarrierStriped_DZ","ConcreteWall_DZ","ConcretePipe_DZ","DragonTeeth_DZ","DragonTeethBig_DZ","SimpleFootbridge_DZ","WoodenFootbridge_DZ","Windbreak_DZ","MetalContainer1A_DZ","MetalContainer1B_DZ","MetalContainer1G_DZ","MetalContainer2D_DZ","Notebook_DZ","Water_Pump_DZ","Greenhouse_DZ","Bed_DZ","Table_DZ","Office_Chair_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","Satellite_Dish_DZE","Fueltank_DZE","Watertank_DZE","Watertower_DZE","CinderWallHalf_DZ","CinderWallHalf_Gap_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallSmallDoorway_DZ","CinderGateFrame_DZ","CinderGarageOpenTopFrame_DZ","WoodRamp_DZ","WoodFloor_DZ","WoodFloorStairs_DZ","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodFloor4x_DZ","WoodTriangleFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallThird_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","WoodTriangleWall_DZ","WoodGateFrame_DZ","WoodStairs_DZ","WoodStairsRails_DZ","WoodStairsSans_DZ","WoodLadder_DZ","WoodHandrail_DZ","WoodPillar_DZ","MetalFloor_DZ","MetalFloor_Half_DZ","MetalFloor_Quarter_DZ","MetalFloor4x_DZ","DoorFrame_DZ","MetalPillar_DZ","GlassFloor_DZ","GlassFloor_Half_DZ","GlassFloor_Quarter_DZ","ElevatorStart_DZ","ElevatorStop_Glass_DZ","Sandbag1_DZ","BagFenceRound_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Land_HBarrier5Curved_DZ","Land_WarfareBarrier5x_DZ","Land_WarfareBarrier10x_DZ","Land_WarfareBarrier10xTall_DZ","SandNest_DZ","SandNestLarge_DZ","HeavyBagFence_DZ","HeavyBagFenceCorner_DZ","HeavyBagFenceRound_DZ","BearTrap_DZ","TrapBearTrapFlare","TrapBearTrapSmoke","Trap_Cans","TrapTripwireFlare","TrapTripwireGrenade","TrapTripwireSmoke","Compost_Barrel_Empty_DZE","Compost_Barrel_Full_DZE","Plant_Patch_Pumpkin_DZE","Plant_Patch_Sunflower_DZE","Plant_Patch_Carrot_DZE","Plant_Patch_Potato_DZE","Plant_Patch_Hemp_DZE","Plant_Patch_Tobacco_DZE","Plant_Patch_Tea_DZE","Plant_Patch_Garlic_DZE","Plant_Patch_Comfrey_DZE"]; DayZ_SafeObjects = DayZ_SafeObjects + DZE_DoorsLocked + DZE_LockedStorage + DZE_StaticWeapons + DZE_isNewStorage + DZE_Tents + DZE_Stashes + DZE_CamoNets + DZE_Plants + DZE_modularDoors; DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank"]; DayZ_GearedObjects = DayZ_GearedObjects + DZE_UnLockedStorage + DZE_isNewStorage; 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","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_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","comfrey_up.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 = []; @@ -292,7 +292,7 @@ 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","Fueltank_DZE"]; - dayz_plantOutput = ["FoodPumpkin","FoodSunFlowerSeed","ItemKiloHemp","FoodPumpkin","FoodSunFlowerSeed","FoodPotatoRaw","FoodCarrot","ItemKiloHemp","ItemKiloBlackTea","ItemTobaccoLeafs","equip_garlic_bulb"]; + dayz_plantOutput = ["FoodPumpkin","FoodSunFlowerSeed","ItemKiloHemp","FoodPumpkin","FoodSunFlowerSeed","FoodPotatoRaw","FoodCarrot","ItemKiloHemp","ItemKiloBlackTea","ItemTobaccoLeafs","equip_garlic_bulb","equip_comfreyleafs"]; dayz_plantTypes = ["","MAP_pumpkin","MAP_p_Helianthus","fiberplant"] + DZE_Plants; DZE_LockableStorage = DZE_LockedStorage + DZE_UnLockedStorage; DZE_UpgradableStorage = ["StorageShed_DZ","WoodShack_DZ","Wooden_shed_DZ","GunRack_DZ","WoodCrate_DZ","VaultStorageLocked","LockboxStorageLocked","LockboxStorageWinterLocked"]; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index a6fde5bd4..7bdf2dee0 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -27089,6 +27089,14 @@ Ein paar schwarzer Teesamen. Семена чая, пригодные для посева. + + Bag of Comfrey Seeds + Säckchen Beinwellsamen + + + A few comfrey seeds. + Ein paar Beinwellsamen. + Hemp Plant Hanfpflanze @@ -35197,6 +35205,10 @@ Garlic patch Knoblauchbeet + + Comfrey patch + Beinwellbeet + Pumpkin Plant Kürbispflanze @@ -35228,6 +35240,10 @@ Garlic Plant Knoblauchpflanze + + + Comfrey Plant + Beinwellpflanze Notebook