Merge pull request #20 from VanessaE/master

Multiple changes as discussed on IRC today
This commit is contained in:
Jeija 2012-08-11 22:18:47 -07:00
commit 6d208f6bca
34 changed files with 65 additions and 42 deletions

@ -38,8 +38,8 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_blinkyplant:blinky_plant_off" 1', output = '"mesecons_blinkyplant:blinky_plant_off" 1',
recipe = { recipe = {
{'','"mesecons:mesecon_off"',''}, {'','"group:mesecon_conductor_craftable"',''},
{'','"mesecons:mesecon_off"',''}, {'','"group:mesecon_conductor_craftable"',''},
{'"default:junglegrass"','"default:junglegrass"','"default:junglegrass"'}, {'"default:junglegrass"','"default:junglegrass"','"default:junglegrass"'},
} }
}) })

@ -95,7 +95,7 @@ end
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_button:button_off" 2', output = '"mesecons_button:button_off" 2',
recipe = { recipe = {
{'"mesecons:mesecon_off"','"default:stone"'}, {'"group:mesecon_conductor_craftable"','"default:stone"'},
} }
}) })

@ -6,23 +6,39 @@ else
groups = {bendy=2,snappy=1,dig_immediate=2, not_in_creative_inventory=1, mesecon = 2} groups = {bendy=2,snappy=1,dig_immediate=2, not_in_creative_inventory=1, mesecon = 2}
end end
boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 }, -- the main slab
{ -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 }, -- the jeweled "on" indicator
{ -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 },
{ -4/16, -7/16, -2/16, 4/16, -26/64, 2/16 },
{ -3/16, -7/16, 2/16, 3/16, -26/64, 3/16 },
{ -2/16, -7/16, 3/16, 2/16, -26/64, 4/16 },
{ -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 }, -- the timer indicator
{ -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 }, -- the two wire stubs
{ 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }}
minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), { minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
description = "Delayer", description = "Delayer",
drawtype = "nodebox", drawtype = "nodebox",
tiles = { tiles = {
"mesecons_delayer_off_"..tostring(i)..".png", "mesecons_delayer_off_"..tostring(i)..".png",
"mesecons_delayer_sides.png" "mesecons_delayer_bottom.png",
"mesecons_delayer_ends_off.png",
"mesecons_delayer_ends_off.png",
"mesecons_delayer_sides_off.png",
"mesecons_delayer_sides_off.png"
}, },
inventory_image = "mesecons_delayer_off_1.png", inventory_image = "mesecons_delayer_off_1.png",
wield_image = "mesecons_delayer_off_1.png", wield_image = "mesecons_delayer_off_1.png",
walkable = true, walkable = true,
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
}, },
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, fixed = boxes
}, },
groups = groups, groups = groups,
paramtype = "light", paramtype = "light",
@ -38,16 +54,20 @@ minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), {
drawtype = "nodebox", drawtype = "nodebox",
tiles = { tiles = {
"mesecons_delayer_on_"..tostring(i)..".png", "mesecons_delayer_on_"..tostring(i)..".png",
"mesecons_delayer_sides.png" "mesecons_delayer_bottom.png",
"mesecons_delayer_ends_on.png",
"mesecons_delayer_ends_on.png",
"mesecons_delayer_sides_on.png",
"mesecons_delayer_sides_on.png"
}, },
walkable = true, walkable = true,
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
}, },
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, fixed = boxes
}, },
groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1, mesecon = 2}, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1, mesecon = 2},
paramtype = "light", paramtype = "light",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 438 B

After

Width:  |  Height:  |  Size: 438 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 707 B

After

Width:  |  Height:  |  Size: 562 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 558 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 561 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 702 B

After

Width:  |  Height:  |  Size: 556 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 729 B

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 724 B

After

Width:  |  Height:  |  Size: 632 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 729 B

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

@ -23,8 +23,8 @@ minetest.register_craft({
output = 'mesecons_detector:object_detector_off', output = 'mesecons_detector:object_detector_off',
recipe = { recipe = {
{"default:steelblock", '', "default:steelblock"}, {"default:steelblock", '', "default:steelblock"},
{"default:steelblock", "mesecons_materials:ic", "default:steelblock"}, {"default:steelblock", "mesecons_microcontroller:microcontroller0000", "default:steelblock"},
{"default:steelblock", "mesecons:mesecon_off", "default:steelblock"}, {"default:steelblock", "group:mesecon_conductor_craftable", "default:steelblock"},
} }
}) })

@ -176,8 +176,8 @@ minetest.register_node("mesecons_wireless:wireless_receiver_on", {
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_wireless:wireless_receiver_off" 2', output = '"mesecons_wireless:wireless_receiver_off" 2',
recipe = { recipe = {
{'', "mesecons:mesecon_off", ''}, {'', "group:mesecon_conductor_craftable", ''},
{'', "mesecons:mesecon_off", ''}, {'', "group:mesecon_conductor_craftable", ''},
{'', "mesecons_materials:ic", ''}, {'', "mesecons_materials:ic", ''},
} }
}) })
@ -242,8 +242,8 @@ minetest.register_craft({
output = '"mesecons_wireless:wireless_inverter_off" 2', output = '"mesecons_wireless:wireless_inverter_off" 2',
recipe = { recipe = {
{'', 'default:steel_ingot', ''}, {'', 'default:steel_ingot', ''},
{'mesecons_materials:ic', 'mesecons:mesecon_off', 'mesecons_materials:ic'}, {'mesecons_materials:ic', 'group:mesecon_conductor_craftable', 'mesecons_materials:ic'},
{'', 'mesecons:mesecon_off', ''}, {'', 'group:mesecon_conductor_craftable', ''},
} }
}) })
@ -284,8 +284,8 @@ minetest.register_node("mesecons_wireless:wireless_transmitter_off", {
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_wireless:wireless_transmitter_off" 2', output = '"mesecons_wireless:wireless_transmitter_off" 2',
recipe = { recipe = {
{'default:steel_ingot', 'mesecons:mesecon_off', 'default:steel_ingot'}, {'default:steel_ingot', 'group:mesecon_conductor_craftable', 'default:steel_ingot'},
{'', 'mesecons:mesecon_off', ''}, {'', 'group:mesecon_conductor_craftable', ''},
{'', 'mesecons_materials:ic', ''}, {'', 'mesecons_materials:ic', ''},
} }
}) })

@ -53,7 +53,7 @@ minetest.register_craft({
output = '"mesecons_lamp:lamp_off" 1', output = '"mesecons_lamp:lamp_off" 1',
recipe = { recipe = {
{'', '"default:glass"', ''}, {'', '"default:glass"', ''},
{'"mesecons:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'}, {'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'},
{'', '"default:glass"', ''}, {'', '"default:glass"', ''},
} }
}) })

@ -29,8 +29,8 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
output = "node mesecons_lightstone:lightstone_" .. name .. "_off 1", output = "node mesecons_lightstone:lightstone_" .. name .. "_off 1",
recipe = { recipe = {
{'',base_item,''}, {'',base_item,''},
{base_item,'node default:torch 1',base_item}, {base_item,'default:torch',base_item},
{'','node mesecons:mesecon_off 1',''}, {'','group:mesecon_conductor_craftable',''},
} }
}) })
end end

@ -27,14 +27,14 @@ minetest.register_node(nodename, {
drop = '"mesecons_microcontroller:microcontroller0000" 1', drop = '"mesecons_microcontroller:microcontroller0000" 1',
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -8/16, -8/16, -8/16, 8/16, -4/16, 8/16 }, fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 },
}, },
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
{ -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, -- bottom slab { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab
{ -5/16, -6/16, -5/16, 5/16, -5/16, 5/16 }, -- circuit board { -5/16, -7/16, -5/16, 5/16, -6/16, 5/16 }, -- circuit board
{ -3/16, -5/16, -3/16, 3/16, -4/16, 3/16 }, -- IC { -3/16, -6/16, -3/16, 3/16, -5/16, 3/16 }, -- IC
} }
}, },
on_construct = function(pos) on_construct = function(pos)
@ -107,9 +107,9 @@ end
minetest.register_craft({ minetest.register_craft({
output = 'craft "mesecons_microcontroller:microcontroller0000" 2', output = 'craft "mesecons_microcontroller:microcontroller0000" 2',
recipe = { recipe = {
{'mesecons_materials:silicon', 'mesecons_materials:silicon', 'mesecons:mesecon_off'}, {'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'},
{'mesecons_materials:silicon', 'mesecons_materials:silicon', 'mesecons:mesecon_off'}, {'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'},
{'mesecons:mesecon_off', 'mesecons:mesecon_off', ''}, {'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable', ''},
} }
}) })

@ -79,7 +79,7 @@ minetest.register_craft({
output = '"mesecons_movestones:movestone" 2', output = '"mesecons_movestones:movestone" 2',
recipe = { recipe = {
{'"default:stone"', '"default:stone"', '"default:stone"'}, {'"default:stone"', '"default:stone"', '"default:stone"'},
{'"mesecons:mesecon_off"', '"mesecons:mesecon_off"', '"mesecons:mesecon_off"'}, {'"group:mesecon_conductor_craftable"', '"group:mesecon_conductor_craftable"', '"group:mesecon_conductor_craftable"'},
{'"default:stone"', '"default:stone"', '"default:stone"'}, {'"default:stone"', '"default:stone"', '"default:stone"'},
} }
}) })

@ -14,7 +14,7 @@ minetest.register_craft({
output = '"mesecons_noteblock:noteblock" 1', output = '"mesecons_noteblock:noteblock" 1',
recipe = { recipe = {
{"default:wood", "default:wood", "default:wood"}, {"default:wood", "default:wood", "default:wood"},
{"mesecons:mesecon_off", "default:steel_ingot", "mesecons:mesecon_off"}, {"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"},
{"default:wood", "default:wood", "default:wood"}, {"default:wood", "default:wood", "default:wood"},
} }
}) })

@ -44,7 +44,7 @@ minetest.register_craft({
recipe = { recipe = {
{"default:wood", "default:wood", "default:wood"}, {"default:wood", "default:wood", "default:wood"},
{"default:cobble", "default:steel_ingot", "default:cobble"}, {"default:cobble", "default:steel_ingot", "default:cobble"},
{"default:cobble", "mesecons:mesecon_off", "default:cobble"}, {"default:cobble", "group:mesecon_conductor_craftable", "default:cobble"},
} }
}) })

@ -25,8 +25,8 @@ minetest.register_node("mesecons_powerplant:power_plant", {
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_powerplant:power_plant" 1', output = '"mesecons_powerplant:power_plant" 1',
recipe = { recipe = {
{'"mesecons:mesecon_off"'}, {'"group:mesecon_conductor_craftable"'},
{'"mesecons:mesecon_off"'}, {'"group:mesecon_conductor_craftable"'},
{'"default:junglegrass"'}, {'"default:junglegrass"'},
} }
}) })

@ -12,7 +12,7 @@ minetest.register_craft({
output = '"mesecons_random:removestone" 4', output = '"mesecons_random:removestone" 4',
recipe = { recipe = {
{'', '"default:cobble"',''}, {'', '"default:cobble"',''},
{'"default:cobble"', '"mesecons:mesecon_off"', '"default:cobble"'}, {'"default:cobble"', '"group:mesecon_conductor_craftable"', '"default:cobble"'},
{'', '"default:cobble"',''}, {'', '"default:cobble"',''},
} }
}) })

@ -1,7 +1,10 @@
-- Solar Panel -- Solar Panel
minetest.register_node("mesecons_solarpanel:solar_panel", { minetest.register_node("mesecons_solarpanel:solar_panel", {
drawtype = "nodebox", drawtype = "nodebox",
tile_images = {"jeija_solar_panel.png"}, tile_images = {
"jeija_solar_panel.png",
"jeija_solar_panel_sides.png"
},
inventory_image = "jeija_solar_panel.png", inventory_image = "jeija_solar_panel.png",
wield_image = "jeija_solar_panel.png", wield_image = "jeija_solar_panel.png",
paramtype = "light", paramtype = "light",

@ -38,6 +38,6 @@ minetest.register_craft({
output = '"mesecons_switch:mesecon_switch_off" 2', output = '"mesecons_switch:mesecon_switch_off" 2',
recipe = { recipe = {
{'"default:steel_ingot"', '"default:cobble"', '"default:steel_ingot"'}, {'"default:steel_ingot"', '"default:cobble"', '"default:steel_ingot"'},
{'"mesecons:mesecon_off"','', '"mesecons:mesecon_off"'}, {'"group:mesecon_conductor_craftable"','', '"group:mesecon_conductor_craftable"'},
} }
}) })

@ -123,9 +123,9 @@ minetest.register_node("mesecons_temperest:mesecon_plug", {
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_temperest:mesecon_plug" 2', output = '"mesecons_temperest:mesecon_plug" 2',
recipe = { recipe = {
{'', '"mesecons:mesecon_off"', ''}, {'', '"group:mesecon_conductor_craftable"', ''},
{'"mesecons:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'}, {'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'},
{'', '"mesecons:mesecon_off"', ''}, {'', '"group:mesecon_conductor_craftable"', ''},
} }
}) })
@ -236,9 +236,9 @@ if ENABLE_TEMPEREST then
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_temperest:mesecon_inverter_on" 2', output = '"mesecons_temperest:mesecon_inverter_on" 2',
recipe = { recipe = {
{'"mesecons_temperest:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'}, {'"mesecons_temperest:mesecon_off"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'},
{'"default:steel_ingot"', '', '"default:steel_ingot"'}, {'"default:steel_ingot"', '', '"default:steel_ingot"'},
{'"mesecons:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'}, {'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'},
} }
}) })
end end

Binary file not shown.

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 613 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 704 B

After

Width:  |  Height:  |  Size: 686 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

@ -3,7 +3,7 @@
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_torch:mesecon_torch_on" 4', output = '"mesecons_torch:mesecon_torch_on" 4',
recipe = { recipe = {
{"mesecons:mesecon_off"}, {"group:mesecon_conductor_craftable"},
{"default:stick"}, {"default:stick"},
} }
}) })

@ -78,7 +78,7 @@ end)
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_walllever:wall_lever_off" 2', output = '"mesecons_walllever:wall_lever_off" 2',
recipe = { recipe = {
{'"mesecons:mesecon_off"'}, {'"group:mesecon_conductor_craftable"'},
{'"default:stone"'}, {'"default:stone"'},
{'"default:stick"'}, {'"default:stick"'},
} }