Mirrorlandia_minetest/digtron
1
0
Fork 0
mirror of https://github.com/minetest-mods/digtron.git synced 2025-01-05 10:17:28 +01:00
Code Issues Projects Releases Wiki Activity

Eliminate another minor code redundancy

Browse Source
This commit is contained in:
FaceDeer 2017-01-08 22:19:49 -07:00
parent 7af220009b
commit 38e1cbc41e
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
util_execute_cycle.lua
View File

@ -65,6 +65,17 @@ local function neighbour_test(layout, status_text)
return status_text, 0 return status_text, 0
end end
-- Checks if a player is within a layout's extents.
local function move_player_test(layout, player)
local player_pos = player:getpos()
if player_pos.x >= layout.extents.min_x - 1 and player_pos.x <= layout.extents.max_x + 1 and
player_pos.y >= layout.extents.min_y - 1 and player_pos.y <= layout.extents.max_y + 1 and
player_pos.z >= layout.extents.min_z - 1 and player_pos.z <= layout.extents.max_z + 1 then
return true
end
return false
end
-- returns newpos, status string, and a return code indicating why the method returned (so the auto-controller can keep trying if it's due to unloaded nodes) -- returns newpos, status string, and a return code indicating why the method returned (so the auto-controller can keep trying if it's due to unloaded nodes)
-- 0 - success -- 0 - success
-- 1 - failed due to unloaded nodes -- 1 - failed due to unloaded nodes
@ -217,13 +228,7 @@ digtron.execute_dig_cycle = function(pos, clicker)
end end
-- if the player is standing within the array or next to it, move him too. -- if the player is standing within the array or next to it, move him too.
local player_pos = clicker:getpos() local move_player = move_player_test(layout, clicker)
local move_player = false
if player_pos.x >= layout.extents.min_x - 1 and player_pos.x <= layout.extents.max_x + 1 and
player_pos.y >= layout.extents.min_y - 1 and player_pos.y <= layout.extents.max_y + 1 and
player_pos.z >= layout.extents.min_z - 1 and player_pos.z <= layout.extents.max_z + 1 then
move_player = true
end
-- damage the weak flesh -- damage the weak flesh
if digtron.diggers_damage_creatures then if digtron.diggers_damage_creatures then
@ -347,13 +352,7 @@ digtron.execute_move_cycle = function(pos, clicker)
minetest.sound_play("truck", {gain=1.0, pos=pos}) minetest.sound_play("truck", {gain=1.0, pos=pos})
-- if the player is standing within the array or next to it, move him too. -- if the player is standing within the array or next to it, move him too.
local player_pos = clicker:getpos() local move_player = move_player_test(layout, clicker)
local move_player = false
if player_pos.x >= layout.extents.min_x - 1 and player_pos.x <= layout.extents.max_x + 1 and
player_pos.y >= layout.extents.min_y - 1 and player_pos.y <= layout.extents.max_y + 1 and
player_pos.z >= layout.extents.min_z - 1 and player_pos.z <= layout.extents.max_z + 1 then
move_player = true
end
--move the array --move the array
digtron.move_digtron(facing, layout.all, layout.extents, nodes_dug) digtron.move_digtron(facing, layout.all, layout.extents, nodes_dug)