diff --git a/crops.txt b/crops.txt index ef6c4d8..9fa817a 100644 --- a/crops.txt +++ b/crops.txt @@ -4,12 +4,12 @@ barley,,,10,7,2,,,,1,1,,2,1,,,,1,,1,3,,1,3,,2,25,,30,,,,,,,,,,,farming:straw,,,f beetroot,1,,10,5,2,2,,1,,1,,,,,,,,,,,,,3,,,35,,30,,,,9,,,,,,,,,,, blackberry,1,,10,4,2,1,,,,,1,1,,,,,,,,,,,3,1,5,,90,20,,,,9,,,,,,,,,,, blueberry,1,,10,4,2,1,,,,,1,1,,,,,,,,,,,3,,,45,90,40,90,,,9,,,,,,,,,,, -carrot,1,,10,8,2,2,,1,,1,,,,,,,,,,2,,,3,,,45,,30,90,,,8,,,,,,,,,,,farming:carrot_baked +carrot,1,,10,8,2,2,,1,,1,,,,,,,,,,2,,,3,,,45,,30,90,,,8,,,,,,,,,,,farming:carrot_gold chili,1,,20,8,2,1,,,,,1,,,,,,,,,,,,3,,,45,90,,,,1000,,,,,,,,,,,, coffee,1,,20,5,2,1,,,,,1,,,,,,,,1,4,,,3,,,50,120,50,150,,1000,12,,,,,,,,,,, corn,1,,10,8,2,2,,,,1,,2,1,,,,,,,4,1,,3,,2,35,90,30,,,,,,,,,,,,,,,farming:corn_cob cotton,1,,10,8,2,,,,1,1,,,1,,,,1,,,,,,3,,2,45,90,20,,,,12,,,,,,,,,,, -culturewheat,1,,100,4,3,,1,,1,1,,2,2,,,,1,,1,3,,1,3,,2,25,,40,,,,10,,,,,100,5,farming:straw,,,farming:flour, +culturewheat,1,,100,4,3,,1,,1,1,,2,2,,,,1,,1,3,,1,3,,2,25,,40,,,,10,,,,,,100,farming:straw,,,farming:flour, flax,,,10,7,2,,,,1,1,,,1,,,,1,,,,,,3,,,25,,30,,,,,,,,,,,farming:flaw,,,, garlic,,,10,5,2,1,,1,,1,,,,,,,,,,3,,,3,,,,,,,,,,,,,,,,,,,, grapes,,,10,8,3,2,1,,,1,1,,1,,,,,1,,,,,3,,3,,,,,,,,,,,,,,,,farming:seed_wildgrapes,, @@ -22,10 +22,10 @@ rhubarb,1,,10,3,2,2,,1,,1,,,,,,,,,,,,,3,,,,,,,,,9,,,,,,,,,,, spelt,,,10,7,2,,,,1,1,,2,1,,,,1,,,3,,1,3,,2,,,,,,,,,,,,,,farming:straw,,,farming:flour, strawberry,1,,10,4,2,1,,,,,1,1,,,,,,,,,,,3,,,,,,,,,9,,,,,,,,,,, sugarbeet,1,,10,5,2,2,,1,,1,,,,,,,,,,,,,3,,,35,,30,,,,9,,,,,,,,,,, -tea,1,,20,5,2,1,,,,,1,,,,1,,,,,4,,,3,,,30,70,30,70,,,,,,,,,,,,,, +tea,1,,20,5,2,1,,,,,1,,,,1,,,,,4,,,3,,,30,70,30,70,,,,,,,,,,,,farming:tea_leaves,, tobaco,1,,10,8,2,,,,1,1,1,,,2,,,,,,4,,,3,,,,,,,,,,,,,,,,,,,, tomato,,,10,8,2,1,,,1,1,1,1,1,,,,,1,,,,,3,,,,,,,,,,,,,,,,,,,, nettle,1,,10,5,2,1,,,1,,,3,,1,,,1,,,2,,,3,1,3,5,150,0,100,,2000,8,,,,0.1,7,,farming:nettle_fibre,,,, -wheat,1,farming:culturewheat,10,8,2,,,,1,1,,2,1,,,,1,,1,3,,1,3,,2,,,,,,,,,,,,,5,farming:straw,10,,farming:flour, +wheat,1,farming:culturewheat,10,8,2,,,,1,1,,2,1,,,,1,,1,3,,1,3,,2,,,,,,,,,,,,,100,farming:straw,10,,farming:flour, wildhop,,hop,10,6,2,,,,,,,1,,,,1,,,,4,,,3,,,,,,,,,,,,,,,,,5,,, wildgrapes,,,10,4,2,1,,,,,,,,,,1,,,,,,,3,,,,,,,,,,,,,,,,,5,,, diff --git a/init.lua b/init.lua index cbe77e1..d3a3441 100644 --- a/init.lua +++ b/init.lua @@ -80,6 +80,7 @@ minetest.register_abm({ intervall = 5, change=5, action = function(pos) + local starttime=os.time() local node=minetest.get_node(pos) if node.name == "air" or node.name == "ignore" then return @@ -96,6 +97,7 @@ minetest.register_abm({ if math.random(1,ill_rate)==1 then farming.plant_infect(pos) end +-- print("infect time: "..os.time()-starttime) end }) @@ -106,6 +108,7 @@ minetest.register_abm({ interval = 15+math.random(-1,1), -- little noise chance = 200, action = function(pos) + local starttime=os.clock() local ptabove={x=pos.x,y=pos.y+1,z=pos.z} local above = minetest.get_node(ptabove) if above.name ~= "air" then @@ -148,7 +151,9 @@ minetest.register_abm({ local rand_plant = math.random(1,#sc) minetest.add_node(ptabove, {name=sc[rand_plant],param2=1}) minetest.get_node_timer(ptabove):start(math.random(10, 15)) + local starttime=os.clock() farming.set_node_metadata(ptabove) + print("place time: "..(1000*(os.clock()-starttime))) end -- end end, diff --git a/textures/farming_barley.png b/textures/farming_barley.png index 87e2f22..43404d7 100644 Binary files a/textures/farming_barley.png and b/textures/farming_barley.png differ diff --git a/textures/farming_barley_wilt.png b/textures/farming_barley_wilt.png new file mode 100644 index 0000000..9a2a599 Binary files /dev/null and b/textures/farming_barley_wilt.png differ diff --git a/textures/farming_beetroot.png b/textures/farming_beetroot.png new file mode 100644 index 0000000..9f1c667 Binary files /dev/null and b/textures/farming_beetroot.png differ diff --git a/textures/farming_culturewheat.png b/textures/farming_culturewheat.png index 95caa70..e959b7b 100644 Binary files a/textures/farming_culturewheat.png and b/textures/farming_culturewheat.png differ diff --git a/textures/farming_spelt.png b/textures/farming_spelt.png index 314128a..126149d 100644 Binary files a/textures/farming_spelt.png and b/textures/farming_spelt.png differ diff --git a/textures/farming_wheat.png b/textures/farming_wheat.png index 95caa70..ff6c860 100644 Binary files a/textures/farming_wheat.png and b/textures/farming_wheat.png differ diff --git a/textures/src/CDC_beets.jpg b/textures/src/CDC_beets.jpg new file mode 100644 index 0000000..25ed66f Binary files /dev/null and b/textures/src/CDC_beets.jpg differ diff --git a/textures/src/WheatSheaf.svg b/textures/src/WheatSheaf.svg new file mode 100644 index 0000000..ffd43b3 --- /dev/null +++ b/textures/src/WheatSheaf.svg @@ -0,0 +1,1713 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/textures/src/WheatSheaf.svg.png b/textures/src/WheatSheaf.svg.png new file mode 100644 index 0000000..fd244ed Binary files /dev/null and b/textures/src/WheatSheaf.svg.png differ diff --git a/textures/src/WheatSheaf_min.svg.png b/textures/src/WheatSheaf_min.svg.png new file mode 100644 index 0000000..feb071b Binary files /dev/null and b/textures/src/WheatSheaf_min.svg.png differ