Merge branch 'master' of Grossam/scifi_nodes into master

This commit is contained in:
fwhcat 2019-04-22 20:01:23 +00:00 committed by Gitea
commit e673027be4
2 changed files with 70 additions and 26 deletions

View File

@ -129,7 +129,8 @@ minetest.register_node("scifi_nodes:rfloor", {
paramtype = "light",
paramtype2 = "facedir",
light_source = 10,
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_metal_defaults()
})
minetest.register_node("scifi_nodes:bfloor", {
@ -140,7 +141,8 @@ minetest.register_node("scifi_nodes:bfloor", {
paramtype = "light",
paramtype2 = "facedir",
light_source = 10,
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_metal_defaults()
})
@ -156,7 +158,8 @@ minetest.register_node("scifi_nodes:stripes2", {
"scifi_nodes_stripes2.png"
},
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_metal_defaults()
})
minetest.register_node("scifi_nodes:gblock", {
@ -171,7 +174,8 @@ minetest.register_node("scifi_nodes:gblock", {
"scifi_nodes_gblock.png"
},
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1};
sounds = default.node_sound_metal_defaults()
})
minetest.register_node("scifi_nodes:gblock2", {
@ -187,7 +191,8 @@ minetest.register_node("scifi_nodes:gblock2", {
},
paramtype = "light",
paramtype2 = "facedir",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_metal_defaults()
})
minetest.register_node("scifi_nodes:gblock3", {
@ -203,7 +208,8 @@ minetest.register_node("scifi_nodes:gblock3", {
},
paramtype = "light",
paramtype2 = "facedir",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_metal_defaults()
})
@ -221,7 +227,8 @@ minetest.register_node("scifi_nodes:green_light", {
},
light_source = 10,
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:red_light", {
@ -237,7 +244,8 @@ minetest.register_node("scifi_nodes:red_light", {
},
light_source = 10,
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:discs", {
@ -252,7 +260,8 @@ minetest.register_node("scifi_nodes:discs", {
"scifi_nodes_discs.png"
},
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:disc", {
@ -279,6 +288,7 @@ minetest.register_node("scifi_nodes:blink", {
paramtype = "light",
groups = {cracky=1},
light_source = 5,
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:black_lights", {
@ -290,6 +300,7 @@ minetest.register_node("scifi_nodes:black_lights", {
}},
paramtype = "light",
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:black_screen", {
@ -302,6 +313,7 @@ minetest.register_node("scifi_nodes:black_screen", {
paramtype = "light",
groups = {cracky=1},
light_source = 1,
sounds = default.node_sound_stone_defaults()
})
minetest.register_node("scifi_nodes:screen", {
@ -314,6 +326,7 @@ minetest.register_node("scifi_nodes:screen", {
paramtype = "light",
groups = {cracky=1},
light_source = 5,
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:screen2", {
@ -326,6 +339,7 @@ minetest.register_node("scifi_nodes:screen2", {
paramtype = "light",
groups = {cracky=1},
light_source = 5,
sounds = default.node_sound_glass_defaults()
})
@ -343,7 +357,8 @@ minetest.register_node("scifi_nodes:white_pad", {
},
paramtype = "light",
paramtype2 = "facedir",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:white_base", {
@ -359,7 +374,8 @@ minetest.register_node("scifi_nodes:white_base", {
},
paramtype = "light",
paramtype2 = "facedir",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:grnpipe", {
@ -376,6 +392,7 @@ minetest.register_node("scifi_nodes:grnpipe", {
paramtype = "light",
paramtype2 = "facedir",
groups = {cracky=1},
sounds = default.node_sound_metal_defaults(),
on_place = minetest.rotate_node
})
@ -394,6 +411,7 @@ minetest.register_node("scifi_nodes:grnpipe2", {
paramtype = "light",
paramtype2 = "facedir",
groups = {cracky=1},
sounds = default.node_sound_metal_defaults(),
on_place = minetest.rotate_node
})
@ -410,6 +428,7 @@ minetest.register_node("scifi_nodes:octrng", {
light_source = 10,
groups = {cracky=2},
sounds = default.node_sound_glass_defaults(),
sounds = default.node_sound_glass_defaults(),
})
minetest.register_node("scifi_nodes:octgrn", {
@ -440,6 +459,7 @@ minetest.register_node("scifi_nodes:octbl", {
light_source = 10,
groups = {cracky=2},
sounds = default.node_sound_glass_defaults(),
sounds = default.node_sound_glass_defaults(),
})
minetest.register_node("scifi_nodes:octppl", {
@ -469,6 +489,7 @@ minetest.register_node("scifi_nodes:tower", {
inventory_image = "scifi_nodes_tower.png",
paramtype = "light",
groups = {cracky=2},
sounds = default.node_sound_metal_defaults()
})
minetest.register_node("scifi_nodes:junk", {
@ -594,6 +615,7 @@ for _, row in ipairs(node.types) do
paramtype = "light",
paramtype2 = "facedir",
light_source = light,
sounds = default.node_sound_glass_defaults()
})
end
@ -782,7 +804,8 @@ minetest.register_node("scifi_nodes:blumetlight", {
},
light_source = 10,
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
@ -794,7 +817,8 @@ minetest.register_node("scifi_nodes:lightstp", {
},
light_source = default.LIGHT_MAX,
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:blklt2", {
@ -805,7 +829,8 @@ minetest.register_node("scifi_nodes:blklt2", {
},
light_source = 10,
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:blumetstr", {
@ -816,7 +841,8 @@ minetest.register_node("scifi_nodes:blumetstr", {
},
light_source = 10,
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:glass", {
@ -828,7 +854,8 @@ minetest.register_node("scifi_nodes:glass", {
},
use_texture_alpha = true,
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
minetest.register_node("scifi_nodes:whtlightbnd", {
@ -839,7 +866,8 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
},
light_source = 10,
paramtype = "light",
groups = {cracky=1}
groups = {cracky=1},
sounds = default.node_sound_glass_defaults()
})
--extra stuff

View File

@ -32,6 +32,7 @@ minetest.register_node("scifi_nodes:alienslope", {
{-0.125, 0.375, -0.5, 0.5, 0.5, 0.5}, -- NodeBox17
}
},
sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
})
@ -61,6 +62,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
{-0.5, -0.125, 0, 0.5, 0, 0.0625}, -- NodeBox24
}
},
sounds = default.node_sound_wood_defaults()
})
minetest.register_node("scifi_nodes:plant_trap", {
@ -88,7 +90,8 @@ minetest.register_node("scifi_nodes:plant_trap", {
{-0.0625, -0.5, -0.0625, 0, -0.4375, 0.375}, -- NodeBox27
{-0.0625, -0.5, 0.3125, 0, 0.5, 0.375}, -- NodeBox28
}
}
},
sounds = default.node_sound_wood_defaults(),
})
minetest.register_node("scifi_nodes:egg", {
@ -118,7 +121,8 @@ minetest.register_node("scifi_nodes:egg", {
{-0.1875, 0.6875, -0.1875, 0.1875, 0.75, 0.1875}, -- NodeBox7
{-0.125, 0.75, -0.125, 0.125, 0.8125, 0.125}, -- NodeBox8
{-0.375, -0.3125, -0.4375, 0.375, 0.3125, 0.4375}, -- NodeBox9
}
},
sounds = default.node_sound_wood_defaults()
}
})
@ -261,7 +265,8 @@ minetest.register_node("scifi_nodes:pad", {
{-0.8125, -0.5, -0.875, 0.75, -0.375, 0.875}, -- NodeBox2
{-0.875, -0.5, -0.8125, 0.8125, -0.375, 0.8125}, -- NodeBox3
{-0.8125, -0.5, -0.75, 0.75, -0.3125, 0.75}, -- NodeBox4
}
},
sounds = default.node_sound_wood_defaults()
}
})
@ -506,7 +511,8 @@ minetest.register_node("scifi_nodes:ladder", {
{0.3125, -0.5, 0.3125, 0.4375, -0.375, 0.4375}, -- NodeBox24
{0.3125, -0.5, 0.0625, 0.4375, -0.375, 0.1875}, -- NodeBox25
{0.3125, -0.5, -0.1875, 0.4375, -0.375, -0.0625}, -- NodeBox26
}
},
sounds = default.node_sound_metal_defaults()
},
paramtype2 = "wallmounted",
walkable = false,
@ -631,6 +637,7 @@ minetest.register_node("scifi_nodes:cover", {
{-0.3125, -0.375, -0.3125, 0.3125, -0.3125, 0.3125}, -- NodeBox6
}
},
sounds = default.node_sound_wood_defaults(),
groups = {cracky=1, oddly_breakable_by_hand=1}
})
@ -735,6 +742,7 @@ minetest.register_node("scifi_nodes:table", {
{-0.0625, 0.25, -0.125, 0.0625, 0.4375, -0.0625}, -- NodeBox7
}
},
sounds = default.node_sound_metal_defaults(),
groups = {cracky=1}
})
@ -1209,9 +1217,11 @@ if (mesecon ~= nil) and
wield_image = "scifi_nodes_switch_on.png",
drawtype = "signlike",
sunlight_propagates = true,
node_box = {
type = "wallmounted",
},
selection_box = {
type = "wallmounted",
fixed = {-0.5, -0.3, -0.3, -0.45, 0.3, 0.3}
},
paramtype = "light",
paramtype2 = "wallmounted",
@ -1233,9 +1243,11 @@ if (mesecon ~= nil) and
inventory_image = "scifi_nodes_switch_on.png",
wield_image = "scifi_nodes_switch_on.png",
drawtype = "signlike",
node_box = {
type = "wallmounted",
},
selection_box = {
type = "wallmounted",
fixed = {-0.5, -0.3, -0.3, -0.45, 0.3, 0.3}
},
paramtype = "light",
paramtype2 = "wallmounted",
@ -1267,9 +1279,11 @@ else
wield_image = "scifi_nodes_switch_on.png",
drawtype = "signlike",
sunlight_propagates = true,
node_box = {
type = "wallmounted",
},
selection_box = {
type = "wallmounted",
fixed = {-0.5, -0.3, -0.3, -0.45, 0.3, 0.3}
},
paramtype = "light",
paramtype2 = "wallmounted",
@ -1289,9 +1303,11 @@ else
inventory_image = "scifi_nodes_switch_on.png",
wield_image = "scifi_nodes_switch_on.png",
drawtype = "signlike",
selection_box = {
node_box = {
type = "wallmounted",
},
selecion_box = {
type = "wallmounted",
fixed = {-0.5, -0.3, -0.3, -0.45, 0.3, 0.3}
},
paramtype = "light",
paramtype2 = "wallmounted",