diff options
| author | FaceDeer <derksenmobile@gmail.com> | 2017-01-11 08:38:02 -0700 |
|---|---|---|
| committer | FaceDeer <derksenmobile@gmail.com> | 2017-01-11 08:38:02 -0700 |
| commit | 9f139288845b7aa27bc4a251d6d5ddde713d27b7 (patch) | |
| tree | 9b8a7bfec1d55795a81aff339ed7653859bd3b65 | |
| parent | 8350469d16878bd019cfa515f99ad1f6c6536083 (diff) | |
| parent | f665f430fc94165a8c2d01f7d09fc327eee66c58 (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/master' into layout-refactor
| -rw-r--r-- | node_controllers.lua | 24 | ||||
| -rw-r--r-- | textures/digtron_auto_control_tint.png | bin | 0 -> 185 bytes | |||
| -rw-r--r-- | textures/digtron_pusher_tint.png | bin | 0 -> 185 bytes | |||
| -rw-r--r-- | util_execute_cycle.lua | 8 |
4 files changed, 15 insertions, 17 deletions
diff --git a/node_controllers.lua b/node_controllers.lua index 3e7b563..9efa804 100644 --- a/node_controllers.lua +++ b/node_controllers.lua @@ -128,12 +128,12 @@ minetest.register_node("digtron:auto_controller", { is_ground_content = false, -- Aims in the +Z direction by default tiles = { - "digtron_plate.png^[transformR90^[colorize:#88000030", - "digtron_plate.png^[transformR270^[colorize:#88000030", - "digtron_plate.png^[colorize:#88000030", - "digtron_plate.png^[transformR180^[colorize:#88000030", - "digtron_plate.png^[colorize:#88000030", - "digtron_plate.png^digtron_control.png^[colorize:#88000030", + "digtron_plate.png^[transformR90^digtron_auto_control_tint.png", + "digtron_plate.png^[transformR270^digtron_auto_control_tint.png", + "digtron_plate.png^digtron_auto_control_tint.png", + "digtron_plate.png^[transformR180^digtron_auto_control_tint.png", + "digtron_plate.png^digtron_auto_control_tint.png", + "digtron_plate.png^digtron_control.png^digtron_auto_control_tint.png", }, drawtype = "nodebox", @@ -201,12 +201,12 @@ minetest.register_node("digtron:pusher", { is_ground_content = false, -- Aims in the +Z direction by default tiles = { - "digtron_plate.png^[transformR90^[colorize:#00880030", - "digtron_plate.png^[transformR270^[colorize:#00880030", - "digtron_plate.png^[colorize:#00880030", - "digtron_plate.png^[transformR180^[colorize:#00880030", - "digtron_plate.png^[colorize:#00880030", - "digtron_plate.png^digtron_control.png^[colorize:#00880030", + "digtron_plate.png^[transformR90^digtron_pusher_tint.png", + "digtron_plate.png^[transformR270^digtron_pusher_tint.png", + "digtron_plate.png^digtron_pusher_tint.png", + "digtron_plate.png^[transformR180^digtron_pusher_tint.png", + "digtron_plate.png^digtron_pusher_tint.png", + "digtron_plate.png^digtron_control.png^digtron_pusher_tint.png", }, drawtype = "nodebox", diff --git a/textures/digtron_auto_control_tint.png b/textures/digtron_auto_control_tint.png Binary files differnew file mode 100644 index 0000000..0581f23 --- /dev/null +++ b/textures/digtron_auto_control_tint.png diff --git a/textures/digtron_pusher_tint.png b/textures/digtron_pusher_tint.png Binary files differnew file mode 100644 index 0000000..a4c12c8 --- /dev/null +++ b/textures/digtron_pusher_tint.png diff --git a/util_execute_cycle.lua b/util_execute_cycle.lua index e5ba7d2..42bf410 100644 --- a/util_execute_cycle.lua +++ b/util_execute_cycle.lua @@ -247,8 +247,7 @@ digtron.execute_dig_cycle = function(pos, clicker) pos = digtron.find_new_pos(pos, facing) meta = minetest.get_meta(pos) if move_player then - local player_pos = clicker:getpos() - clicker:moveto(digtron.find_new_pos(player_pos, facing), true) + clicker:moveto(digtron.find_new_pos(clicker:getpos(), facing), true) end @@ -352,8 +351,7 @@ digtron.execute_move_cycle = function(pos, clicker) layout:write_layout_image() pos = digtron.find_new_pos(pos, facing) if move_player then - local player_pos = clicker:getpos() - clicker:moveto(digtron.find_new_pos(player_pos, facing), true) - end + clicker:moveto(digtron.find_new_pos(clicker:getpos(), facing), true) + end return pos, "", 0 end
\ No newline at end of file |
