Compare commits

...

6 Commits

2 changed files with 27 additions and 12 deletions

View File

@ -3,7 +3,7 @@
-- by sys4 -- by sys4
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
local redo = farming.mod and farming.mod == "redo" local redo = farming.mod and farming.mod == "redo" and farming.carrot and farming.corn
local plus = minetest.get_modpath("farming_plus") local plus = minetest.get_modpath("farming_plus")
local diet_mod = minetest.get_modpath("diet") local diet_mod = minetest.get_modpath("diet")

View File

@ -17,6 +17,17 @@ local state = {
} }
local target_plants = { local target_plants = {
"default:grass_1",
"default:grass_2",
"default:grass_3",
"default:grass_4",
"default:grass_5",
"default:dry_grass_1",
"default:dry_grass_2",
"default:dry_grass_3",
"default:dry_grass_4",
"default:dry_grass_5",
"default:junglegrass",
"farming:wheat_8", "farming:wheat_8",
"farming:cotton_8", "farming:cotton_8",
"moreflowers:wild_carrot", "moreflowers:wild_carrot",
@ -31,6 +42,9 @@ if redo then
local redo_plants = { local redo_plants = {
--{"farming:barley_7", "farming:seed_barley", "farming:barley"}, --{"farming:barley_7", "farming:seed_barley", "farming:barley"},
{"farming:barley_7", nil}, {"farming:barley_7", nil},
{"farming:oat_8", nil},
{"farming:rice_8", nil},
{"farming:rye_8", nil},
{"farming:blueberry_4", "farming:blueberries", "farming:blueberry"}, {"farming:blueberry_4", "farming:blueberries", "farming:blueberry"},
{"farming:carrot_8", nil}, {"farming:carrot_8", nil},
{"farming:coffee_5", "farming:coffee_beans", "farming:coffee"}, {"farming:coffee_5", "farming:coffee_beans", "farming:coffee"},
@ -50,6 +64,7 @@ if redo then
{"farming:pea_5", "farming:pea_pod", "farming:pea"}, {"farming:pea_5", "farming:pea_pod", "farming:pea"},
{"farming:pepper_5", "farming:peppercorn", "farming:pepper"}, {"farming:pepper_5", "farming:peppercorn", "farming:pepper"},
{"farming:pineapple_8", "farming:pineapple_top", "farming:pineapple"}, {"farming:pineapple_8", "farming:pineapple_top", "farming:pineapple"},
{"farming:mint_4", nil},
} }
for _, item in pairs(redo_plants) do for _, item in pairs(redo_plants) do
table.insert(target_plants, item[1]) table.insert(target_plants, item[1])
@ -321,28 +336,28 @@ plant = function(self, dtime)
under = vector.add(self.destination, {x = 0, y = -1, z = 0}), under = vector.add(self.destination, {x = 0, y = -1, z = 0}),
above = self.destination, above = self.destination,
} }
if redo or plus then if redo or plus then
local t = string.split(itemname, "seed_") local t = string.split(itemname, "seed_")
if t[2] then if t[2] then
local newstackname = t[1]..t[2].."_1" itemname = t[1]..t[2].."_1"
stack = farming.place_seed(stack, minetest.get_player_by_name(self.owner_name), pointed_thing, newstackname)
elseif minetest.get_item_group(itemname, "redo") == 1 then elseif minetest.get_item_group(itemname, "redo") == 1 then
if seed_plants[itemname] then if seed_plants[itemname] then
itemname = seed_plants[itemname] itemname = seed_plants[itemname]
end end
stack = farming.place_seed(stack, minetest.get_player_by_name(self.owner_name), pointed_thing, itemname.."_1") itemname = itemname.."_1"
elseif minetest.get_item_group(itemname, "plus") == 1 then elseif minetest.get_item_group(itemname, "plus") == 1 then
stack = farming.place_seed(stack, minetest.get_player_by_name(self.owner_name), pointed_thing, itemname = string.split(itemname, "_seed")[1].."_1"
string.split(itemname, "_seed")[1].."_1")
else
stack = farming.place_seed(stack, minetest.get_player_by_name(self.owner_name), pointed_thing, itemname)
end end
end
if not stack or not itemname or not minetest.registered_nodes[itemname] then
to_walk_randomly(self)
return
else else
farming.place_seed(stack, minetest.get_player_by_name(self.owner_name), pointed_thing, itemname) stack = farming.place_seed(stack, minetest.get_player_by_name(self.owner_name), pointed_thing, itemname)
end end
stack:take_item(1) if plus then stack:take_item(1) end
self:set_wield_item_stack(stack) self:set_wield_item_stack(stack)
end end
to_walk_randomly(self) to_walk_randomly(self)