mirror of
https://github.com/minetest-mods/digtron.git
synced 2024-08-19 20:34:04 +02:00
Merge remote-tracking branch 'refs/remotes/origin/master' into layout-refactor
This commit is contained in:
commit
9f13928884
@ -128,12 +128,12 @@ minetest.register_node("digtron:auto_controller", {
|
|||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
-- Aims in the +Z direction by default
|
-- Aims in the +Z direction by default
|
||||||
tiles = {
|
tiles = {
|
||||||
"digtron_plate.png^[transformR90^[colorize:#88000030",
|
"digtron_plate.png^[transformR90^digtron_auto_control_tint.png",
|
||||||
"digtron_plate.png^[transformR270^[colorize:#88000030",
|
"digtron_plate.png^[transformR270^digtron_auto_control_tint.png",
|
||||||
"digtron_plate.png^[colorize:#88000030",
|
"digtron_plate.png^digtron_auto_control_tint.png",
|
||||||
"digtron_plate.png^[transformR180^[colorize:#88000030",
|
"digtron_plate.png^[transformR180^digtron_auto_control_tint.png",
|
||||||
"digtron_plate.png^[colorize:#88000030",
|
"digtron_plate.png^digtron_auto_control_tint.png",
|
||||||
"digtron_plate.png^digtron_control.png^[colorize:#88000030",
|
"digtron_plate.png^digtron_control.png^digtron_auto_control_tint.png",
|
||||||
},
|
},
|
||||||
|
|
||||||
drawtype = "nodebox",
|
drawtype = "nodebox",
|
||||||
@ -201,12 +201,12 @@ minetest.register_node("digtron:pusher", {
|
|||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
-- Aims in the +Z direction by default
|
-- Aims in the +Z direction by default
|
||||||
tiles = {
|
tiles = {
|
||||||
"digtron_plate.png^[transformR90^[colorize:#00880030",
|
"digtron_plate.png^[transformR90^digtron_pusher_tint.png",
|
||||||
"digtron_plate.png^[transformR270^[colorize:#00880030",
|
"digtron_plate.png^[transformR270^digtron_pusher_tint.png",
|
||||||
"digtron_plate.png^[colorize:#00880030",
|
"digtron_plate.png^digtron_pusher_tint.png",
|
||||||
"digtron_plate.png^[transformR180^[colorize:#00880030",
|
"digtron_plate.png^[transformR180^digtron_pusher_tint.png",
|
||||||
"digtron_plate.png^[colorize:#00880030",
|
"digtron_plate.png^digtron_pusher_tint.png",
|
||||||
"digtron_plate.png^digtron_control.png^[colorize:#00880030",
|
"digtron_plate.png^digtron_control.png^digtron_pusher_tint.png",
|
||||||
},
|
},
|
||||||
|
|
||||||
drawtype = "nodebox",
|
drawtype = "nodebox",
|
||||||
|
BIN
textures/digtron_auto_control_tint.png
Normal file
BIN
textures/digtron_auto_control_tint.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 185 B |
BIN
textures/digtron_pusher_tint.png
Normal file
BIN
textures/digtron_pusher_tint.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 185 B |
@ -247,8 +247,7 @@ digtron.execute_dig_cycle = function(pos, clicker)
|
|||||||
pos = digtron.find_new_pos(pos, facing)
|
pos = digtron.find_new_pos(pos, facing)
|
||||||
meta = minetest.get_meta(pos)
|
meta = minetest.get_meta(pos)
|
||||||
if move_player then
|
if move_player then
|
||||||
local player_pos = clicker:getpos()
|
clicker:moveto(digtron.find_new_pos(clicker:getpos(), facing), true)
|
||||||
clicker:moveto(digtron.find_new_pos(player_pos, facing), true)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@ -352,8 +351,7 @@ digtron.execute_move_cycle = function(pos, clicker)
|
|||||||
layout:write_layout_image()
|
layout:write_layout_image()
|
||||||
pos = digtron.find_new_pos(pos, facing)
|
pos = digtron.find_new_pos(pos, facing)
|
||||||
if move_player then
|
if move_player then
|
||||||
local player_pos = clicker:getpos()
|
clicker:moveto(digtron.find_new_pos(clicker:getpos(), facing), true)
|
||||||
clicker:moveto(digtron.find_new_pos(player_pos, facing), true)
|
|
||||||
end
|
end
|
||||||
return pos, "", 0
|
return pos, "", 0
|
||||||
end
|
end
|
Loading…
Reference in New Issue
Block a user