merge upstream 🐈

master
tchncs 2017-05-25 21:18:43 +02:00
commit e6b35042d2
1 changed files with 135 additions and 20 deletions

155
init.lua
View File

@ -12,8 +12,6 @@ local materials = {
{"stonebrick", "Stone Brick", "default_stone_brick", default.node_sound_stone_defaults(), {cracky=2, stone=1},},
{"mossycobble", "MossyCobble", "default_mossycobble", default.node_sound_stone_defaults(), {cracky=3, stone=1},},
{"serpentine", "Serpentine", "darkage_serpentine", default.node_sound_stone_defaults(), {cracky=3, stone=1},},
{"marble", "Marble", "darkage_marble", default.node_sound_stone_defaults(), {cracky=3, stone=1},},
{"desert_stone", "Desert Stone", "default_desert_stone", default.node_sound_stone_defaults(), {cracky=3, stone=1},},
{"desert_stone", "Desert Stone", "default_desert_stone", default.node_sound_stone_defaults(), {cracky=3, stone=1},},
{"desert_stone_block", "Desert Stone Block", "default_desert_stone_block", default.node_sound_stone_defaults(), {cracky=3, stone=1},},
@ -35,6 +33,11 @@ local materials = {
{"acacia_wood", "Acacia Wood", "default_acacia_wood", default.node_sound_wood_defaults(), {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},},
}
local darkage_materials = {
{"marble", "Marble", "darkage_marble", default.node_sound_stone_defaults(), {cracky=3, stone=1},},
{"serpentine", "Serpentine", "darkage_serpentine", default.node_sound_stone_defaults(), {cracky=3, stone=1},},
}
-- convert integer coordinates to nodebox coordinates
function nb(n)
return n/16-1/2
@ -74,16 +77,16 @@ for i in ipairs(materials) do
sounds = sound,
})
minetest.register_craft({
output = "pkarcs:"..nodename.."_arc".." 5",
recipe = {
{ "darkage:"..nodename, "darkage:"..nodename, "darkage:"..nodename },
{ "darkage:"..nodename, "", "" },
{ "darkage:"..nodename, "", "" }
}
})
minetest.register_craft({
output = "pkarcs:"..nodename.."_arc".." 5",
recipe = {
{ "default:"..nodename, "default:"..nodename, "default:"..nodename },
{ "default:"..nodename, "", "" },
{ "default:"..nodename, "", "" }
}
})
minetest.register_node("pkarcs:"..nodename.."_outer_arc", {
minetest.register_node("pkarcs:"..nodename.."_outer_arc", {
description = desc.." Outer Arc",
paramtype = "light",
paramtype2 = "facedir",
@ -117,15 +120,6 @@ for i in ipairs(materials) do
}
})
minetest.register_craft({
output = "pkarcs:"..nodename.."_outer_arc".." 5",
recipe = {
{ "default:torch", "darkage:"..nodename, "darkage:"..nodename },
{ "darkage:"..nodename, "", "" },
{ "darkage:"..nodename, "", "" }
}
})
minetest.register_node("pkarcs:"..nodename.."_inner_arc", {
description = desc.." Inner Arc",
paramtype = "light",
@ -178,6 +172,127 @@ for i in ipairs(materials) do
}
})
end
for i in ipairs(darkage_materials) do
local nodename = darkage_materials[i][1]
local desc = darkage_materials[i][2]
local tile = darkage_materials[i][3]
local sound = darkage_materials[i][4]
local group = darkage_materials[i][5]
minetest.register_node("pkarcs:"..nodename.."_arc", {
description = desc.." Arc",
paramtype = "light",
paramtype2 = "facedir",
tiles = {tile..".png"},
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
{ nb(0), nb(0), nb(0), nb(1), nb(16), nb(16) },
{ nb(1), nb(4), nb(0), nb(2), nb(16), nb(16) },
{ nb(2), nb(7), nb(0), nb(3), nb(16), nb(16) },
{ nb(3), nb(8), nb(0), nb(4), nb(16), nb(16) },
{ nb(4), nb(10), nb(0), nb(5), nb(16), nb(16) },
{ nb(5), nb(11), nb(0), nb(6), nb(16), nb(16) },
{ nb(6), nb(12), nb(0), nb(8), nb(16), nb(16) },
{ nb(8), nb(13), nb(0), nb(9), nb(16), nb(16) },
{ nb(9), nb(14), nb(0), nb(12), nb(16), nb(16) },
{ nb(12), nb(15), nb(0), nb(16), nb(16), nb(16) },
}
},
groups = group,
sounds = sound,
})
minetest.register_craft({
output = "pkarcs:"..nodename.."_arc".." 5",
recipe = {
{ "darkage:"..nodename, "darkage:"..nodename, "darkage:"..nodename },
{ "darkage:"..nodename, "", "" },
{ "darkage:"..nodename, "", "" }
}
})
minetest.register_node("pkarcs:"..nodename.."_outer_arc", {
description = desc.." Outer Arc",
paramtype = "light",
paramtype2 = "facedir",
tiles = {tile..".png"},
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
{ nb(0), nb(0), nb(16), nb(1), nb(16), nb(16-1) },
{ nb(0), nb(4), nb(16), nb(2), nb(16), nb(16-2) },
{ nb(0), nb(7), nb(16), nb(3), nb(16), nb(16-3) },
{ nb(0), nb(8), nb(16), nb(4), nb(16), nb(16-4) },
{ nb(0), nb(10), nb(16), nb(5), nb(16), nb(16-5) },
{ nb(0), nb(11), nb(16), nb(6), nb(16), nb(16-6) },
{ nb(0), nb(12), nb(16), nb(8), nb(16), nb(16-8) },
{ nb(0), nb(13), nb(16), nb(9), nb(16), nb(16-9) },
{ nb(0), nb(14), nb(16), nb(12), nb(16), nb(16-12) },
{ nb(0), nb(15), nb(16), nb(16), nb(16), nb(16-16) },
}
},
groups = group,
sounds = sound,
})
minetest.register_craft({
output = "pkarcs:"..nodename.."_outer_arc".." 5",
recipe = {
{ "default:torch", "darkage:"..nodename, "darkage:"..nodename },
{ "darkage:"..nodename, "", "" },
{ "darkage:"..nodename, "", "" }
}
})
minetest.register_node("pkarcs:"..nodename.."_inner_arc", {
description = desc.." Inner Arc",
paramtype = "light",
paramtype2 = "facedir",
tiles = {tile..".png"},
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
{ nb(0), nb(0), nb(16), nb(1), nb(16), nb(0) },
{ nb(0), nb(0), nb(16), nb(16), nb(16), nb(16-1) },
{ nb(0), nb(4), nb(16), nb(2), nb(16), nb(0) },
{ nb(0), nb(4), nb(16), nb(16), nb(16), nb(16-2) },
{ nb(0), nb(7), nb(16), nb(3), nb(16), nb(0) },
{ nb(0), nb(7), nb(16), nb(16), nb(16), nb(16-3) },
{ nb(0), nb(8), nb(16), nb(4), nb(16), nb(0) },
{ nb(0), nb(8), nb(16), nb(16), nb(16), nb(16-4) },
{ nb(0), nb(10), nb(16), nb(5), nb(16), nb(0) },
{ nb(0), nb(10), nb(16), nb(16), nb(16), nb(16-5) },
{ nb(0), nb(11), nb(16), nb(6), nb(16), nb(0) },
{ nb(0), nb(11), nb(16), nb(16), nb(16), nb(16-6) },
{ nb(0), nb(12), nb(16), nb(8), nb(16), nb(0) },
{ nb(0), nb(12), nb(16), nb(16), nb(16), nb(16-8) },
{ nb(0), nb(13), nb(16), nb(9), nb(16), nb(0) },
{ nb(0), nb(13), nb(16), nb(16), nb(16), nb(16-9) },
{ nb(0), nb(14), nb(16), nb(12), nb(16), nb(0) },
{ nb(0), nb(14), nb(16), nb(16), nb(16), nb(16-12) },
{ nb(0), nb(15), nb(16), nb(16), nb(16), nb(16-16) },
}
},
groups = group,
sounds = sound,
})
minetest.register_craft({
output = "pkarcs:"..nodename.."_inner_arc".." 5",
recipe = {