Merge remote-tracking branch 'origin/master'

# Conflicts:
#	models.lua
This commit is contained in:
D00Med 2017-03-07 07:07:15 +10:00
commit b984b92589
7 changed files with 1322 additions and 24 deletions

4
README.md Normal file
View File

@ -0,0 +1,4 @@
# scifi_nodes
Minetest mod that adds scifi themed nodes
**Adding Recipes for the unfinished scifi_nodes**

1252
crafts.lua Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,8 @@
default
xpanes?
xpanes?
moreblocks
mesecons
mesecons_microcontroller
mesecons_button
mesecons_torch
dye

View File

@ -417,6 +417,7 @@ minetest.register_node("scifi_nodes:octgrn", {
paramtype = "light",
paramtype2 = "facedir",
use_texture_alpha = true,
light_source = 10,
groups = {cracky=2},
sounds = default.node_sound_glass_defaults(),
})
@ -531,16 +532,16 @@ node.types = {
{"dent", "dented metal block", "dent"},
{"greenmetal", "green metal wall", "grnmetl"},
{"greenmetal2", "green metal wall2", "grnmetl2"},
{"greenlights", "green wall lights", "grnlt"},
{"greenlights2", "green wall lights2", "grnlt2"},
{"greenbar", "green light bar", "grnlghtbr"},
{"greenlights", "green wall lights", "grnlt", 10},
{"greenlights2", "green wall lights2", "grnlt2", 10},
{"greenbar", "green light bar", "grnlghtbr", 10},
{"green2", "green wall panel", "grn2"},
{"greentubes", "green pipes", "grntubes"},
{"grey", "grey wall", "gry"},
{"greybolts", "grey wall bolts", "gryblts"},
{"greybars", "grey bars", "grybrs"},
{"greydots", "grey wall dots", "grydts"},
{"greygreenbar", "gray power pipe", "grygrnbr"},
{"greygreenbar", "gray power pipe", "grygrnbr", 10},
{"octofloor", "Doom floor", "octofloor"},
{"octofloor2", "Brown Doom floor", "octofloor2"},
{"doomwall1", "Doom wall 1", "doomwall1"},
@ -732,10 +733,10 @@ minetest.register_node("scifi_nodes:box", {
"scifi_nodes_box.png"
},
paramtype2 = "facedir",
groups = {cracky = 1, oddly_breakable_by_hand = 2, fuel = 8},
groups = {cracky = 1},
legacy_facedir_simple = true,
is_ground_content = false,
sounds = default.node_sound_wood_defaults(),
sounds = default.node_sound_metal_defaults(),
after_dig_node = drop_chest_stuff(),
on_construct = function(pos)
@ -841,4 +842,5 @@ dofile(minetest.get_modpath("scifi_nodes").."/panes.lua")
end
dofile(minetest.get_modpath("scifi_nodes").."/doors.lua")
dofile(minetest.get_modpath("scifi_nodes").."/nodeboxes.lua")
dofile(minetest.get_modpath("scifi_nodes").."/models.lua")
dofile(minetest.get_modpath("scifi_nodes").."/models.lua")
dofile(minetest.get_modpath("scifi_nodes").."/crafts.lua")

View File

@ -37,15 +37,17 @@ minetest.register_node("scifi_nodes:slope_"..name, {
})
end
scifi_nodes.register_slope("white2", "Plastic", {"scifi_nodes_white2.png",}, 0)
scifi_nodes.register_slope("black", "Black", {"scifi_nodes_black.png",}, 0)
scifi_nodes.register_slope("white", "White", {"scifi_nodes_white.png",}, 0)
scifi_nodes.register_slope("grey", "Grey", {"scifi_nodes_grey.png",}, 0)
scifi_nodes.register_slope("blue", "Blue", {"scifi_nodes_bluebars.png",}, 0)
scifi_nodes.register_slope("mesh", "Mesh", {"scifi_nodes_mesh2.png",}, 0)
scifi_nodes.register_slope("bluebars", "Blue bars", {"scifi_nodes_bluebars.png",}, 0)
scifi_nodes.register_slope("mesh2", "Metal floormesh", {"scifi_nodes_mesh2.png",}, 0)
scifi_nodes.register_slope("mesh", "Metal mesh", {"scifi_nodes_mesh.png",}, 0)
scifi_nodes.register_slope("vent", "Vent", {"scifi_nodes_vent2.png",}, 0)
scifi_nodes.register_slope("rlight", "Red light", {"scifi_nodes_redlight.png",}, 0)
scifi_nodes.register_slope("blight", "Blue light", {"scifi_nodes_light.png",}, 0)
scifi_nodes.register_slope("glight", "Green light", {"scifi_nodes_greenlight.png",}, 0)
scifi_nodes.register_slope("rlight", "Red light", {"scifi_nodes_redlight.png",}, 10)
scifi_nodes.register_slope("blight", "Blue light", {"scifi_nodes_light.png",}, 10)
scifi_nodes.register_slope("glight", "Green light", {"scifi_nodes_greenlight.png",}, 10)
scifi_nodes.register_slope("holes", "Holes", {"scifi_nodes_holes.png",}, 0)
scifi_nodes.register_slope("pipe", "Pipe", {"scifi_nodes_pipe.png",}, 0)
scifi_nodes.register_slope("stripes", "Stripes", {"scifi_nodes_stripes.png",}, 0)
@ -55,4 +57,9 @@ scifi_nodes.register_slope("blight2", "Blue Light 2", {"scifi_nodes_capsule3.png
scifi_nodes.register_slope("wallpipe", "Alien Pipe", {"scifi_nodes_wallpipe.png",}, 0)
scifi_nodes.register_slope("alien", "Alien Wall", {"scifi_nodes_alnslp.png",}, 0)
scifi_nodes.register_slope("purple", "Purple", {"scifi_nodes_purple.png",}, 0)
scifi_nodes.register_slope("gblock", "Gblock", {"scifi_nodes_gblock2_front1.png",}, 0)
scifi_nodes.register_slope("gblock", "Gblock", {"scifi_nodes_gblock2_front1.png",}, 0)
scifi_nodes.register_slope("greenmetal", "Green metal", {"scifi_nodes_greenmetal.png",}, 0)
scifi_nodes.register_slope("bluemetal", "Blue metal", {"scifi_nodes_bluemetal.png",}, 0)
scifi_nodes.register_slope("wall", "Metal wall", {"scifi_nodes_wall.png",}, 0)
scifi_nodes.register_slope("rough", "Rough metal", {"scifi_nodes_rough.png",}, 0)
scifi_nodes.register_slope("blklt2", "Black stripe light", {"scifi_nodes_black_light2.png",}, 10)

View File

@ -375,7 +375,7 @@ minetest.register_node("scifi_nodes:pot", {
},
drawtype = "nodebox",
paramtype = "light",
groups = {crumbly=3, soil=1, sand=1, wet=1},
groups = {cracky=1, soil=1, sand=1},
node_box = {
type = "fixed",
fixed = {
@ -411,7 +411,7 @@ minetest.register_node("scifi_nodes:pot2", {
},
drawtype = "nodebox",
paramtype = "light",
groups = {crumbly=3, soil=3, wet=1},
groups = {cracky=1, soil=3, wet=1},
node_box = {
type = "fixed",
fixed = {
@ -1099,11 +1099,37 @@ minetest.register_node("scifi_nodes:itemholder", {
{-0.25, -0.5, -0.0625, -0.1875, -0.0625, 0.0625}, -- NodeBox5
}
},
groups = {cracky=1, oddly_breakable_by_hand=1},
groups = {cracky=1},
on_rotate = screwdriver.disallow,
after_place_node = function(pos, placer, itemstack)
local meta = minetest.get_meta(pos)
meta:set_string("owner",placer:get_player_name())
meta:set_string("infotext", "Itemholder (owned by " ..
meta:get_string("owner") .. ")")
end,
on_rightclick = function(pos, node, clicker, item, _)
local wield_item = clicker:get_wielded_item():get_name()
item:take_item()
minetest.add_item(pos, wield_item)
local name = clicker and clicker:get_player_name()
local meta = minetest.get_meta(pos)
if name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass") then
local wield_item = clicker:get_wielded_item():get_name()
item:take_item()
minetest.add_item(pos, wield_item)
end
end,
can_dig = function(pos,player)
if not player then return end
local name = player and player:get_player_name()
local meta = minetest.get_meta(pos)
return name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass")
end,
on_destruct = function(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node(pos)
if meta:get_string("item") ~= "" then
drop_item(pos, node)
end
end,
})
@ -1193,4 +1219,4 @@ minetest.register_node("scifi_nodes:tallscreen", {
}
},
groups = {cracky=1, oddly_breakable_by_hand=1}
})
})

View File

@ -13,9 +13,10 @@ xpanes.register_pane("doompane", {
textures = {"scifi_nodes_doompane.png","scifi_nodes_doompane.png","default_wood.png"},
inventory_image = "scifi_nodes_doompane.png",
wield_image = "scifi_nodes_doompane.png",
groups = {snappy=2, cracky=3, oddly_breakable_by_hand=3, pane=1},
groups = {cracky=1, pane=1},
recipe = {
{'default:iron_lump', 'default:iron_lump', 'default:iron_lump'},
{'default:iron_lump', 'default:iron_lump', 'default:iron_lump'}
{"default:iron_lump", "default:iron_lump", ""},
{"default:iron_lump", "", "default:iron_lump"},
{"", "default:iron_lump", "default:iron_lump"}
}
})