minetest-mods/turtle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix turtle digging, and yaw

Browse Source
This commit is contained in:
Novatux 2015-02-18 14:22:54 +01:00
parent 645c57138b
commit 7aef9df55d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api.lua
View File

@ -12,7 +12,10 @@ local function pointable(stack, node)
return nodedef and def and (nodedef.pointable or (nodedef.liquidtype ~= "none" and def.liquid_pointable))
end
function turtles.create_turtle_player(turtle_id, dir, only_player)
local NONE = 0
local FRONT = 1
local ANY = 2
function turtles.create_turtle_player(turtle_id, dir, pointed_type)
local info = turtles.get_turtle_info(turtle_id)
local inv = turtles.get_turtle_inventory(turtle_id)
local pitch
@ -68,17 +71,17 @@ function turtles.create_turtle_player(turtle_id, dir, only_player)
set_detach = delay(),
set_bone_position = delay(),
}
if only_player then return player end
if pointed_type == NONE then return player end
local above, under = nil, nil
local wieldstack = player:get_wielded_item()
local pos = vector.add(info.spos, dir)
if pointable(wieldstack, minetest.get_node(pos)) then
above = vector.new(info.spos)
under = pos
elseif pointable(wieldstack, minetest.get_node(vector.add(pos, dir))) then
elseif pointed_type == ANY and pointable(wieldstack, minetest.get_node(vector.add(pos, dir))) then
above = pos
under = vector.add(pos, dir)
else
elseif pointed_type == ANY then
for i = 0, 5 do
local dir2 = directions.side_to_dir(i)
if vector.dot(dir2, dir) == 0 and pointable(wieldstack, minetest.get_node(vector.add(pos, dir2))) then
@ -187,7 +190,7 @@ end
local function turtle_dig(turtle, cptr, dir)
tl.close_form(turtle)
local player, pointed_thing = turtles.create_turtle_player(turtle, dir)
local player, pointed_thing = turtles.create_turtle_player(turtle, dir, FRONT)
if pointed_thing == nil then return end
local info = turtles.get_turtle_info(turtle)
local wieldstack = player:get_wielded_item()
@ -224,7 +227,7 @@ end
local function turtle_place(turtle, cptr, dir)
tl.close_form(turtle)
local player, pointed_thing = turtles.create_turtle_player(turtle, dir)
local player, pointed_thing = turtles.create_turtle_player(turtle, dir, ANYDIR)
if pointed_thing == nil then return end
local formspec = minetest.get_meta(pointed_thing.under):get_string("formspec")
if formspec ~= "" then
@ -329,7 +332,7 @@ local function get_turtle_formspec_player(turtle)
else
dir = minetest.facedir_to_dir(info.dir)
end
return turtles.create_turtle_player(turtle, dir, true)
return turtles.create_turtle_player(turtle, dir, NONE)
end
local function send_fields(turtle)

4
t2.lua
View File

@ -104,7 +104,7 @@ local function update_craftpreview(turtle)
local inv = turtles.get_turtle_inventory(turtle)
local info = turtles.get_turtle_info(turtle)
local dir = minetest.facedir_to_dir(info.dir)
local player = turtles.create_turtle_player(turtle, dir, true)
local player = turtles.create_turtle_player(turtle, dir, 0)
inv:set_stack("craftpreview", 1,
minetest.craft_predict(
minetest.get_craft_result({method = "normal", items = inv:get_list("craft"), width = inv:get_width("craft")}).item,
@ -239,7 +239,7 @@ minetest.register_entity("turtle:turtle", {
elseif info.ndir ~= nil then
local yaw = self.object:getyaw()
local rotate_speed = info.rotate
local nyaw = info.ndir * math.pi/2
local nyaw = -info.ndir * math.pi/2
if done_rotation(yaw, nyaw, rotate_speed) then
self.object:setyaw(nyaw)
info.dir = info.ndir