Compare commits

...

5 Commits

Author SHA1 Message Date
Vanessa Dannenberg 0fda965aa4 swap punch and right-click actions 2019-06-04 02:48:21 -04:00
cheapie 855c1b219d Finish the wall knob 2019-06-02 19:01:17 -05:00
cheapie d773a87c6a Improve some selection boxes 2019-06-02 13:21:05 -05:00
cheapie 4547e436f7 Remove collision from most conductors 2019-06-02 13:02:56 -05:00
cheapie d0b0b3aab6 Add some extra button rules 2019-06-02 12:58:22 -05:00
3 changed files with 1123 additions and 24 deletions

View File

@ -5,7 +5,8 @@ digistuff.remove_receiver = function(pos,node)
if rnode.name == "digistuff:receiver" then
rnode.name = "digilines:wire_std_00000000"
minetest.remove_node(rpos)
minetest.place_node(rpos,rnode)
minetest.set_node(rpos,rnode)
digilines.update_autoconnect(rpos)
end
end
@ -125,16 +126,24 @@ minetest.register_node("digistuff:receiver", {
is_ground_content = false,
paramtype = "light",
paramtype2 = "facedir",
walkable = false,
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
{-0.05,-0.05,-1.49,0.05,0.05,-0.5},
{-0.2,-0.2,-0.5,0.2,0.2,-0.4},
{-0.0625,-0.5,-0.5,0.0625,-0.2,-0.4},
{-0.0625,-0.5,-0.4,0.0625,-0.4375,0.5},
{-0.05,-0.05,-1.49,0.05,0.05,-0.5},
{-0.2,-0.2,-0.5,0.2,0.2,-0.4},
{-0.0625,-0.5,-0.5,0.0625,-0.2,-0.4},
{-0.0625,-0.5,-0.4,0.0625,-0.4375,0.5},
},
},
selection_box = {
type = "fixed",
fixed = {
{-0.2,-0.5,-0.5,0.2,0.2,0.5},
{-0.075,-0.075,-1.49,0.075,0.075,-0.5},
},
},
digiline = {
receptor = {},
wire = {
@ -189,6 +198,12 @@ minetest.register_node("digistuff:vertical_bottom", {
{-0.05,-0.4375,-0.05,0.05,0.5,0.05},
},
},
collision_box = {
type = "fixed",
fixed = {
{-0.5,-0.5,-0.5,0.5,-0.4375,0.5},
},
},
after_place_node = digistuff.vertical_autoconnect,
after_destruct = digistuff.vertical_remove,
digiline = {
@ -214,6 +229,7 @@ minetest.register_node("digistuff:vertical_middle", {
drop = "digistuff:vertical_bottom",
is_ground_content = false,
paramtype = "light",
walkable = false,
drawtype = "nodebox",
node_box = {
type = "fixed",
@ -277,6 +293,7 @@ minetest.register_node("digistuff:insulated_straight", {
},
paramtype = "light",
paramtype2 = "facedir",
walkable = false,
on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple,
groups = {dig_immediate = 3,},
is_ground_content = false,
@ -288,6 +305,12 @@ minetest.register_node("digistuff:insulated_straight", {
{-0.5,-0.5,-0.1,0.5,-0.4,0.1},
},
},
selection_box = {
type = "fixed",
fixed = {
{-0.5,-0.5,-0.15,0.5,-0.35,0.15},
},
},
after_place_node = digilines.update_autoconnect,
after_destruct = digilines.update_autoconnect,
digiline = {
@ -316,6 +339,7 @@ minetest.register_node("digistuff:insulated_tjunction", {
},
paramtype = "light",
paramtype2 = "facedir",
walkable = false,
on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple,
groups = {dig_immediate = 3,},
is_ground_content = false,
@ -328,6 +352,12 @@ minetest.register_node("digistuff:insulated_tjunction", {
{-0.1,-0.5,-0.5,0.1,-0.4,-0.1},
},
},
selection_box = {
type = "fixed",
fixed = {
{-0.5,-0.5,-0.5,0.5,-0.35,0.15},
},
},
after_place_node = digilines.update_autoconnect,
after_destruct = digilines.update_autoconnect,
digiline = {
@ -357,6 +387,7 @@ minetest.register_node("digistuff:insulated_corner", {
},
paramtype = "light",
paramtype2 = "facedir",
walkable = false,
on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple,
groups = {dig_immediate = 3,},
is_ground_content = false,
@ -369,6 +400,12 @@ minetest.register_node("digistuff:insulated_corner", {
{-0.5,-0.5,-0.1,0.1,-0.4,0.1},
},
},
selection_box = {
type = "fixed",
fixed = {
{-0.5,-0.5,-0.5,0.15,-0.35,0.15},
},
},
after_place_node = digilines.update_autoconnect,
after_destruct = digilines.update_autoconnect,
digiline = {
@ -396,6 +433,7 @@ minetest.register_node("digistuff:insulated_fourway", {
"digistuff_insulated_edge.png",
},
paramtype = "light",
walkable = false,
groups = {dig_immediate = 3,},
is_ground_content = false,
paramtype = "light",
@ -408,6 +446,12 @@ minetest.register_node("digistuff:insulated_fourway", {
{-0.1,-0.5,0.1,0.1,-0.4,0.5},
},
},
selection_box = {
type = "fixed",
fixed = {
{-0.5,-0.5,-0.5,0.5,-0.35,0.5},
},
},
after_place_node = digilines.update_autoconnect,
after_destruct = digilines.update_autoconnect,
digiline = {

File diff suppressed because it is too large Load Diff

View File

@ -13,6 +13,8 @@ digistuff.button_get_rules = function(node)
{x = 0,y = 0,z = 1},
{x = 0,y = 0,z = -1},
{x = 0,y = 0,z = 2},
{x = 0,y = 1,z = 1},
{x = 0,y = -1,z = 1},
}
local dir = minetest.facedir_to_dir(node.param2)
rules = digistuff.rotate_rules(rules,dir)
@ -179,9 +181,6 @@ minetest.register_craft({
})
minetest.register_node("digistuff:wall_knob", {
tiles = {
"digistuff_digibutton_sides.png",
},
paramtype = "light",
paramtype2 = "facedir",
walkable = false,
@ -193,10 +192,17 @@ minetest.register_node("digistuff:wall_knob", {
rules = digistuff.button_get_rules,
},
},
drawtype = "nodebox",
node_box = {
drawtype = "mesh",
mesh = "digistuff_wall_knob.obj",
tiles = {
"digistuff_digibutton_sides.png",
"digistuff_digiline_full.png",
},
selection_box = {
type = "fixed",
fixed = {-0.2,-0.2,0.4,0.2,0.2,0.5,},
fixed = {
{-0.4,-0.4,0,0.4,0.4,0.5},
},
},
groups = {dig_immediate = 2,digiline_receiver = 1,},
description = "Digilines Wall Knob",
@ -216,7 +222,7 @@ minetest.register_node("digistuff:wall_knob", {
meta:set_int("min",math.floor(tonumber(fields.min)))
meta:set_int("max",math.floor(tonumber(fields.max)))
meta:set_int("value",math.floor(tonumber(fields.min)))
meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn up or right-click to turn down",math.floor(tonumber(fields.min))))
meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn down or right-click to turn up",math.floor(tonumber(fields.min))))
meta:set_string("formspec","")
minetest.swap_node(pos, {name = "digistuff:wall_knob_configured", param2=minetest.get_node(pos).param2})
else
@ -230,9 +236,6 @@ minetest.register_node("digistuff:wall_knob", {
})
minetest.register_node("digistuff:wall_knob_configured", {
tiles = {
"digistuff_digibutton_sides.png",
},
paramtype = "light",
paramtype2 = "facedir",
walkable = false,
@ -244,32 +247,41 @@ minetest.register_node("digistuff:wall_knob_configured", {
rules = digistuff.button_get_rules,
},
},
drawtype = "nodebox",
node_box = {
drawtype = "mesh",
mesh = "digistuff_wall_knob.obj",
tiles = {
"digistuff_digibutton_sides.png",
"digistuff_digiline_full.png",
},
selection_box = {
type = "fixed",
fixed = {-0.2,-0.2,0.4,0.2,0.2,0.5,},
fixed = {
{-0.4,-0.4,0,0.4,0.4,0.5},
},
},
groups = {dig_immediate = 2,digiline_receiver = 1,not_in_creative_inventory = 1,},
description = "Digilines Wall Knob (configured state - you hacker you!)",
drop = "digistuff:wall_knob",
after_place_node = digistuff.place_receiver,
after_destruct = digistuff.remove_receiver,
on_punch = function(pos,node)
on_rightclick = function(pos,node,player)
local meta = minetest.get_meta(pos)
local max = meta:get_int("max")
local value = meta:get_int("value")
value = math.min(max,value+1)
local full = player:get_player_control().aux1
value = full and max or math.min(max,value+1)
meta:set_int("value",value)
meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn up or right-click to turn down",math.floor(tonumber(value))))
meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn down or right-click to turn up",math.floor(tonumber(value))))
digiline:receptor_send(pos,digistuff.button_get_rules(node),meta:get_string("channel"),value)
end,
on_rightclick = function(pos,node)
on_punch = function(pos,node,player)
local meta = minetest.get_meta(pos)
local min = meta:get_int("min")
local value = meta:get_int("value")
value = math.max(min,value-1)
local full = player:get_player_control().aux1
value = full and min or math.max(min,value-1)
meta:set_int("value",value)
meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn up or right-click to turn down",math.floor(tonumber(value))))
meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn down or right-click to turn up",math.floor(tonumber(value))))
digiline:receptor_send(pos,digistuff.button_get_rules(node),meta:get_string("channel"),value)
end,
sounds = default and default.node_sound_stone_defaults(),