Merge pull request #1 from adrido/master

Some bugfixes
This commit is contained in:
Vanessa Ezekowitz 2017-02-19 11:58:34 -05:00 committed by GitHub
commit afc0917979
2 changed files with 25 additions and 19 deletions

View File

@ -16,6 +16,8 @@ bobblocks.colorlist = {
"grey" "grey"
} }
bobblocks.opacity = 150 -- Opacity: 0-255; 0 Full transparent, 255 Full opaque
bobblocks.update_bobblock = function (pos, node) bobblocks.update_bobblock = function (pos, node)
local newnode = node local newnode = node
if string.find(newnode.name, "_off") then if string.find(newnode.name, "_off") then
@ -39,7 +41,7 @@ minetest.register_node("bobblocks:block", {
paramtype2 = "color", paramtype2 = "color",
palette = "unifieddyes_palette.png", palette = "unifieddyes_palette.png",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = false,
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
light_source = LIGHT_MAX-0, light_source = LIGHT_MAX-0,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1},
@ -48,19 +50,20 @@ minetest.register_node("bobblocks:block", {
offstate = "bobblocks:block_off" offstate = "bobblocks:block_off"
} }
}, },
on_punch = bobblocks.update_bobblock, on_rightclick = bobblocks.update_bobblock,
after_dig_node = unifieddyes.after_dig_node after_dig_node = unifieddyes.after_dig_node
}) })
minetest.register_node("bobblocks:block_off", { minetest.register_node("bobblocks:block_off", {
description = "Bobblocks Plain Block (off)", description = "Bobblocks Plain Block (off)",
tiles = {"bobblocks_block.png"}, drawtype = "glasslike",
tiles = {"bobblocks_block.png^[opacity:"..bobblocks.opacity},
paramtype2 = "color", paramtype2 = "color",
palette = "unifieddyes_palette.png", palette = "unifieddyes_palette.png",
is_ground_content = true, is_ground_content = false,
alpha = WATER_ALPHA, use_texture_alpha = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1, ud_param2_colorable = 1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1, ud_param2_colorable = 1},
drop = 'bobblocks:redblock', drop = "bobblocks:block",
mesecons = {conductor={ mesecons = {conductor={
state = mesecon.state.off, state = mesecon.state.off,
onstate = "bobblocks:block" onstate = "bobblocks:block"
@ -80,7 +83,7 @@ minetest.register_node("bobblocks:pole", {
paramtype2 = "color", paramtype2 = "color",
palette = "unifieddyes_palette.png", palette = "unifieddyes_palette.png",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = false,
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
light_source = LIGHT_MAX-0, light_source = LIGHT_MAX-0,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1},
@ -96,16 +99,17 @@ minetest.register_node("bobblocks:pole", {
minetest.register_node("bobblocks:pole_off", { minetest.register_node("bobblocks:pole_off", {
description = "Bobblocks Pole (off)", description = "Bobblocks Pole (off)",
drawtype = "fencelike", drawtype = "fencelike",
tiles = {"bobblocks_block.png"}, tiles = {"bobblocks_block.png^[opacity:"..bobblocks.opacity},
paramtype = "light", paramtype = "light",
paramtype2 = "color", paramtype2 = "color",
palette = "unifieddyes_palette.png", palette = "unifieddyes_palette.png",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = false,
use_texture_alpha = true,
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
light_source = LIGHT_MAX-10, light_source = LIGHT_MAX-10,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1, ud_param2_colorable = 1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1, ud_param2_colorable = 1},
drop = 'bobblocks:redpole', drop = 'bobblocks:pole',
mesecons = {conductor={ mesecons = {conductor={
state = mesecon.state.off, state = mesecon.state.off,
onstate = "bobblocks:pole" onstate = "bobblocks:pole"
@ -123,7 +127,6 @@ minetest.register_node("bobblocks:btm", {
"bobblocks_btm_sides.png", "bobblocks_btm_sides.png", "bobblocks_btm.png"}, "bobblocks_btm_sides.png", "bobblocks_btm_sides.png", "bobblocks_btm.png"},
inventory_image = "bobblocks_btm.png", inventory_image = "bobblocks_btm.png",
paramtype2 = "facedir", paramtype2 = "facedir",
material = minetest.digprop_dirtlike(1.0),
legacy_facedir_simple = true, legacy_facedir_simple = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
}) })
@ -136,7 +139,7 @@ minetest.register_node("bobblocks:wavyblock", {
paramtype2 = "color", paramtype2 = "color",
palette = "unifieddyes_palette.png", palette = "unifieddyes_palette.png",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = false,
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
light_source = LIGHT_MAX-0, light_source = LIGHT_MAX-0,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1},
@ -146,24 +149,27 @@ minetest.register_node("bobblocks:wavyblock", {
offstate = "bobblocks:wavyblock_off" offstate = "bobblocks:wavyblock_off"
} }
}, },
on_rightclick = bobblocks.update_bobblock,
after_dig_node = unifieddyes.after_dig_node after_dig_node = unifieddyes.after_dig_node
}) })
minetest.register_node("bobblocks:wavyblock_off", { minetest.register_node("bobblocks:wavyblock_off", {
description = "Bobblocks Wavy-textured Block (off)", description = "Bobblocks Wavy-textured Block (off)",
tiles = {"bobblocks_wavyblock.png"}, drawtype = "glasslike",
tiles = {"bobblocks_wavyblock.png^[opacity:"..bobblocks.opacity},
paramtype2 = "color", paramtype2 = "color",
palette = "unifieddyes_palette.png", palette = "unifieddyes_palette.png",
is_ground_content = true, is_ground_content = false,
alpha = WATER_ALPHA, use_texture_alpha = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1, ud_param2_colorable = 1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1, ud_param2_colorable = 1},
drop = 'bobblocks:wavyblock', drop = "bobblocks:wavyblock",
mesecons = {conductor= mesecons = {conductor=
{ {
state = mesecon.state.off, state = mesecon.state.off,
onstate = "bobblocks:wavyblock" onstate = "bobblocks:wavyblock"
} }
}, },
on_rightclick = bobblocks.update_bobblock,
after_dig_node = unifieddyes.after_dig_node after_dig_node = unifieddyes.after_dig_node
}) })
@ -176,7 +182,7 @@ minetest.register_node("bobblocks:wavypole", {
paramtype2 = "color", paramtype2 = "color",
palette = "unifieddyes_palette.png", palette = "unifieddyes_palette.png",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = false,
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1},
after_dig_node = unifieddyes.after_dig_node, after_dig_node = unifieddyes.after_dig_node,

View File

@ -37,7 +37,7 @@ minetest.register_node("bobblocks:health_off", {
paramtype2 = "facedir", paramtype2 = "facedir",
legacy_facedir_simple = true, legacy_facedir_simple = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
is_ground_content = true, is_ground_content = false,
walkable = false, walkable = false,
climbable = false, climbable = false,
mesecons = {conductor={ mesecons = {conductor={
@ -53,7 +53,7 @@ minetest.register_node("bobblocks:health_on", {
legacy_facedir_simple = true, legacy_facedir_simple = true,
light_source = LIGHT_MAX-0, light_source = LIGHT_MAX-0,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
is_ground_content = true, is_ground_content = false,
walkable = false, walkable = false,
climbable = false, climbable = false,
drop = "bobblocks:health_off", drop = "bobblocks:health_off",