diff --git a/crops.txt b/crops.txt index 12fc98b..a9ed71c 100644 --- a/crops.txt +++ b/crops.txt @@ -1,31 +1,31 @@ -name,enabled,hijack,next_plant,rarety,rarety_grass_drop,rarety_junglegrass_drop,steps,harvest_max,eat_hp,to_culture,to_dig,has_harvest,on_soil,is_bush,punchable,wiltable,infectable,infection_defence,seed_extractable,no_seed,use_flail,use_trellis,for_coffee,seed_roastable,seed_grindable,for_flour,snappy,damage_per_second,liquid_viscosity,temperature_min,temperature_max,humidity_min,humidity_max,elevation_min,elevation_max,light_min,light_max,infect_rate_base,infect_rate_monoculture,spread_rate,grow_time_mean,wilt_time,straw,culture_rate,seed_drop,grind,roast -default,1,,,10,,,8,3,1,,,,,,,,,,,,,,,,,,3,,,15,80,10,80,-20,200,11,14,1000,90,1,120,6400,,,,, -barley,1,,,10,15,,7,,,,,1,1,,,2,1,,,,1,,1,3,,1,3,,2,25,,30,,,,,,,,,,,farming:straw,,,farming:flour,farming:grain_roasted -beetroot,1,,,10,,,5,,2,,1,,1,,,,,,,,,,,,,,3,,,35,,30,,,,9,,,,,,,,,,, -blackberry,1,,,10,,,4,,,,,,,1,1,1,,,,,,,,,,,3,1,4,,90,20,,,,9,,,,,,,,,,, -blueberry,1,,,10,,,4,,,,,,,1,1,1,,,,,,,,,,,3,,,45,90,40,90,,,9,,,,,,,,,,, -carrot,1,,,10,20,,8,,2,,1,,1,,,,,,,,,,,2,,,3,,,,,30,90,,,8,,,,,,,,,,,farming:carrot_gold -chili,1,,,20,,,8,,,,,,,,1,,,,,,,,,,,,3,,,55,90,,,20,1000,,,,,,,,,,,, -coffee,1,,,20,,,5,,,,,,,,1,,,,,,,,1,4,,,3,,,55,120,50,150,20,1000,12,,,,,,,,,,, -corn,1,,,10,,35,8,4,2,,,,1,,,2,1,,,,,,,4,1,,3,,2,35,90,30,,,,,,,,,,,,,,,farming:corn_cob -cotton,1,,,10,10,10,8,,,,,1,1,,,,1,,,,1,,,,,,3,,2,45,90,20,,,,12,,,,,,,,,,, -culturewheat,1,,,100,,,4,4,,1,,1,1,,,2,2,,,,1,,1,3,,1,3,,2,25,,40,,,,10,,700,75,,,100,farming:straw,,,farming:flour,farming:grain_roasted -flax,,,,10,,,7,,,,,1,1,,,,1,,,,1,,,,,,3,,2,25,,30,,,,,,,,,,,farming:flaw,,,, -garlic,,,,10,,,5,,,,1,,1,,,,,,,,,,,3,,,3,,,,,,,,,,,,,,,,,,,, -grapes,,,,10,,,8,,2,1,,,1,,1,,1,,,,,1,,,,,3,,3,,,,,,,,,,,,,,,,farming:wildgrapes_seed,, -hemp,1,,,10,,,8,,,,,1,,,,,,,,,1,,,,,,3,,2,,120,,,,,8,,,,1E-05,55,,farming:hemp_fibre,,,, -hop,1,,,10,,,7,,,1,,,1,,1,2,2,,,,,1,,4,,,3,,2,55,,,,,50,,,,,,,,,,farming:wildhop_seed,, -mustard,1,,,10,,,5,,,,,,,,,,1,,,,,,,,2,,3,,,,,,,,,,,,,,,,,,,, -potato,1,,,10,50,,4,4,2,,,,1,,,2,1,,,,,,,4,1,,3,,2,,,,60,,,,,550,75,,,,,,,,farming:potato_baked -raspberry,1,,,10,,,4,,,,,,,1,1,1,,,,,,,,,,,3,1,4,,,,,,,9,,,,,,,,,,, -rhubarb,1,,,10,,,3,,2,,1,,1,,,,,,,,,,,,,,3,,,,,,,,,9,,,,,,,,,,, -spelt,1,,,10,15,,7,,,,,1,1,,,2,1,,,,1,,,3,,1,3,,2,,,,,,,,,,,,,,farming:straw,,,farming:flour,farming:grain_roasted -strawberry,1,ethereal:strawberry,,10,,,8,,,,,,,1,1,1,,,,,,,,,,,3,,,,,,,,,9,,,,,,,,,,, -sugarbeet,1,,,10,,,5,,2,,1,,1,,,,,,,,,,,,,,3,,,35,,30,,,,9,,,,,,,,,,, -tea,1,,,20,,,8,,,,,,1,,1,,,,1,,,,,4,,,3,,2,30,70,30,70,20,1000,,,,,,,,,,farming:tea_leaves,,farming:tea_black -tobaco,1,,,10,,50,8,,,,,,1,,1,,,2,1,,,,,4,,,3,,,,,,,,1000,,,,,,,,,,farming:tobaco_leaves,, -tomato,,,,10,,,8,,,,,1,1,,1,1,1,,,,,1,,,,,3,,,,,,,,,,,,,,,,,,,, -nettle,1,,,10,,,5,,,,,1,,,1,3,,1,,,1,,,2,,,3,1,3,5,150,0,100,,2000,8,,,,0.1,50,,farming:nettle_fibre,,,, -wheat,1,,farming:culturewheat,10,10,,8,,,,,1,1,,,2,1,,,,1,,1,3,,1,3,,2,,,30,70,,,,,,,,70,100,farming:straw,10,,farming:flour,farming:grain_roasted -wildoat,1,,,10,,,7,,,,,1,1,,,2,1,,,,1,,1,3,,1,3,,2,,,30,70,,,,,,,,70,100,farming:straw,,,farming:flour,farming:grain_roasted -wildgrapes,,,,10,,,4,,,,,,,,,,,,,1,,,,,,,3,,,,,,,,,,,,,,,,,5,,, +name,enabled,hijack,next_plant,rarety,rarety_grass_drop,rarety_junglegrass_drop,steps,harvest_max,eat_hp,drink,to_culture,to_dig,has_harvest,on_soil,is_bush,punchable,wiltable,infectable,infection_defence,seed_extractable,no_seed,use_flail,use_trellis,for_coffee,seed_roastable,seed_grindable,for_flour,snappy,damage_per_second,liquid_viscosity,temperature_min,temperature_max,humidity_min,humidity_max,elevation_min,elevation_max,light_min,light_max,infect_rate_base,infect_rate_monoculture,spread_rate,grow_time_mean,wilt_time,straw,culture_rate,seed_drop,grind,roast +default,1,,,10,,,8,3,1,,,,,,,,,,,,,,,,,,,3,,,15,80,10,80,-20,200,11,14,1000,90,1,120,6400,,,,, +barley,1,,,10,15,,7,,,,,,1,1,,,2,1,,,,1,,1,3,,1,3,,2,25,,30,,,,,,,,,,,farming:straw,,,farming:flour,farming:grain_roasted +beetroot,1,,,10,,,5,,2,,,1,,1,,,,,,,,,,,,,,3,,,35,,30,,,,9,,,,,,,,,,, +blackberry,1,,,10,,,4,,,5,,,,,1,1,1,,,,,,,,,,,3,1,4,,90,20,,,,9,,,,,,,,,,, +blueberry,1,,,10,,,4,,,5,,,,,1,1,1,,,,,,,,,,,3,,,45,90,40,90,,,9,,,,,,,,,,, +carrot,1,,,10,20,,8,,2,2,,1,,1,,,,,,,,,,,2,,,3,,,,,30,90,,,8,,,,,,,,,,,farming:carrot_gold +chili,1,,,20,,,8,,,,,,,,,1,,,,,,,,,,,,3,,,55,90,,,20,1000,,,,,,,,,,,, +coffee,1,,,20,,,5,,,,,,,,,1,,,,,,,,1,4,,,3,,,55,120,50,150,20,1000,12,,,,,,,,,,, +corn,1,,,10,,35,8,4,2,,,,,1,,,2,1,,,,,,,4,1,,3,,2,35,90,30,,,,,,,,,,,,,,,farming:corn_cob +cotton,1,,,10,10,10,8,,,,,,1,1,,,,1,,,,1,,,,,,3,,2,45,90,20,,,,12,,,,,,,,,,, +culturewheat,1,,,100,,,4,4,,,1,,1,1,,,2,2,,,,1,,1,3,,1,3,,2,25,,40,,,,10,,700,75,,,100,farming:straw,,,farming:flour,farming:grain_roasted +flax,,,,10,,,7,,,,,,1,1,,,,1,,,,1,,,,,,3,,2,25,,30,,,,,,,,,,,farming:flaw,,,, +garlic,,,,10,,,5,,,,,1,,1,,,,,,,,,,,3,,,3,,,,,,,,,,,,,,,,,,,, +grapes,,,,10,,,8,,2,5,1,,,1,,1,,1,,,,,1,,,,,3,,3,,,,,,,,,,,,,,,,farming:wildgrapes_seed,, +hemp,1,,,10,,,8,,,,,,1,,,,,,,,,1,,,,,,3,,2,,120,,,,,8,,,,1E-05,55,,farming:hemp_fibre,,,, +hop,1,,,10,,,7,,,,1,,,1,,1,2,2,,,,,1,,4,,,3,,2,55,,,,,50,,,,,,,,,,farming:wildhop_seed,, +mustard,1,,,10,,,5,,,,,,,,,,,1,,,,,,,,2,,3,,,,,,,,,,,,,,,,,,,, +potato,1,,,10,50,,4,4,2,2,,,,1,,,2,1,,,,,,,4,1,,3,,2,,,,60,,,,,550,75,,,,,,,,farming:potato_baked +raspberry,1,,,10,,,4,,,5,,,,,1,1,1,,,,,,,,,,,3,1,4,,,,,,,9,,,,,,,,,,, +rhubarb,1,,,10,,,3,,2,4,,1,,1,,,,,,,,,,,,,,3,,,,,,,,,9,,,,,,,,,,, +spelt,1,,,10,15,,7,,,,,,1,1,,,2,1,,,,1,,,3,,1,3,,2,,,,,,,,,,,,,,farming:straw,,,farming:flour,farming:grain_roasted +strawberry,1,ethereal:strawberry,,10,,,8,,,5,,,,,1,1,1,,,,,,,,,,,3,,,,,,,,,9,,,,,,,,,,, +sugarbeet,1,,,10,,,5,,2,,,1,,1,,,,,,,,,,,,,,3,,,35,,30,,,,9,,,,,,,,,,, +tea,1,,,20,,,8,,,,,,,1,,1,,,,1,,,,,4,,,3,,2,30,70,30,70,20,1000,,,,,,,,,,farming:tea_leaves,,farming:tea_black +tobaco,1,,,10,,50,8,,,,,,,1,,1,,,2,1,,,,,4,,,3,,,,,,,,1000,,,,,,,,,,farming:tobaco_leaves,, +tomato,,,,10,,,8,,,8,,,1,1,,1,1,1,,,,,1,,,,,3,,,,,,,,,,,,,,,,,,,, +nettle,1,,,10,,,5,,,,,,1,,,1,3,,1,,,1,,,2,,,3,1,3,5,150,0,100,,2000,8,,,,0.1,50,,farming:nettle_fibre,,,, +wheat,1,,farming:culturewheat,10,10,,8,,,,,,1,1,,,2,1,,,,1,,1,3,,1,3,,2,,,30,70,,,,,,,,70,100,farming:straw,10,,farming:flour,farming:grain_roasted +wildoat,1,,,10,,,7,,,,,,1,1,,,2,1,,,,1,,1,3,,1,3,,2,,,30,70,,,,,,,,70,100,farming:straw,,,farming:flour,farming:grain_roasted +wildgrapes,,,,10,,,4,,,5,,,,,,,,,,,1,,,,,,,3,,,,,,,,,,,,,,,,,5,,, diff --git a/nodes_register.lua b/nodes_register.lua index 78938dc..c0c8dea 100644 --- a/nodes_register.lua +++ b/nodes_register.lua @@ -298,9 +298,18 @@ farming.register_seed=function(sdef) --time optimised end end - if sdef.eat_hp then - seed_def.on_use=minetest.item_eat(sdef.eat_hp) - seed_def.groups["eatable"]=sdef.eat_hp + if sdef.eat_hp or sdef.drink then + local eat_hp=0 + if sdef.eat_hp then + eat_hp=sdef.eat_hp + end + seed_def.on_use=minetest.item_eat(eat_hp) + if sdef.eat_hp then + seed_def.groups["eatable"]=sdef.eat_hp + end + if sdef.drink then + seed_def.groups["drinkable"]=sdef.drink + end end minetest.register_node(":" .. sdef.seed_name, seed_def)