forked from VoxeLibre/VoxeLibre
conflict commit
This commit is contained in:
parent
efa704116e
commit
58df4c65e1
|
@ -73,7 +73,6 @@ local slab_oxidization = {
|
||||||
{ "weathered_cut_double", "oxidized_cut_double" },
|
{ "weathered_cut_double", "oxidized_cut_double" },
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
for _, subnode in pairs(mcl_copper.subnodes[subname]) do
|
for _, subnode in pairs(mcl_copper.subnodes[subname]) do
|
||||||
if subnode == "" then
|
if subnode == "" then
|
||||||
minetest.override_item(item, {_mcl_oxidized_variant = oxidized_item})
|
minetest.override_item(item, {_mcl_oxidized_variant = oxidized_item})
|
||||||
|
@ -127,62 +126,6 @@ end
|
||||||
--- containing the list of subnames of the block oxidation chain (without the waxed variants subnames).
|
--- containing the list of subnames of the block oxidation chain (without the waxed variants subnames).
|
||||||
local function register_waxing_and_scraping(mod_name, subname, decay_chain)
|
local function register_waxing_and_scraping(mod_name, subname, decay_chain)
|
||||||
local waxed_item, unwaxed_item
|
local waxed_item, unwaxed_item
|
||||||
=======
|
|
||||||
local def
|
|
||||||
local def_variant_oxidized
|
|
||||||
local def_variant_waxed
|
|
||||||
local def_variant_scraped
|
|
||||||
|
|
||||||
-- set up oxidized and waxed variants.
|
|
||||||
for i = 1, #stair_oxidization do
|
|
||||||
-- stairs
|
|
||||||
def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1]
|
|
||||||
def_variant_oxidized = "mcl_stairs:stair_copper_" .. stair_oxidization[i][2]
|
|
||||||
minetest.override_item(def, { _mcl_oxidized_variant = def_variant_oxidized })
|
|
||||||
|
|
||||||
def_variant_waxed = "mcl_stairs:stair_waxed_copper_" .. stair_oxidization[i][1]
|
|
||||||
minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed })
|
|
||||||
|
|
||||||
-- slabs
|
|
||||||
def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1]
|
|
||||||
def_variant_oxidized = "mcl_stairs:slab_copper_" .. slab_oxidization[i][2]
|
|
||||||
minetest.override_item(def, { _mcl_oxidized_variant = def_variant_oxidized })
|
|
||||||
|
|
||||||
def_variant_waxed = "mcl_stairs:slab_waxed_copper_" .. slab_oxidization[i][1]
|
|
||||||
minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed })
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Set up scraped variants.
|
|
||||||
for i = 1, #stair_oxidization do
|
|
||||||
-- does both stairs and slabs.
|
|
||||||
if i > 3 then
|
|
||||||
def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1]
|
|
||||||
def_variant_scraped = "mcl_stairs:stair_copper_" .. stair_oxidization[i - 3][1]
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
|
|
||||||
def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1]
|
|
||||||
def_variant_scraped = "mcl_stairs:slab_copper_" .. slab_oxidization[i - 3][1]
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
end
|
|
||||||
if i > 6 then
|
|
||||||
def = "mcl_stairs:stair_copper_" .. stair_oxidization[i][2]
|
|
||||||
def_variant_scraped = "mcl_stairs:stair_copper_" .. stair_oxidization[i][1]
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
|
|
||||||
def = "mcl_stairs:slab_copper_" .. slab_oxidization[i][2]
|
|
||||||
def_variant_scraped = "mcl_stairs:slab_copper_" .. slab_oxidization[i][1]
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Set up scraped variants for waxed stairs.
|
|
||||||
local waxed_variants = {
|
|
||||||
{ "waxed_copper_cut", "copper_cut" },
|
|
||||||
{ "waxed_copper_exposed_cut", "copper_exposed_cut" },
|
|
||||||
{ "waxed_copper_weathered_cut", "copper_weathered_cut" },
|
|
||||||
{ "waxed_copper_oxidized_cut", "copper_oxidized_cut" },
|
|
||||||
}
|
|
||||||
>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
|
|
||||||
|
|
||||||
for i = 1, #waxed_variants do
|
for i = 1, #waxed_variants do
|
||||||
-- stairs
|
-- stairs
|
||||||
|
@ -190,7 +133,6 @@ for i = 1, #waxed_variants do
|
||||||
def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2]
|
def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2]
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
for _, subnode in pairs(mcl_copper.subnodes[subname:gsub("waxed_", "")]) do
|
for _, subnode in pairs(mcl_copper.subnodes[subname:gsub("waxed_", "")]) do
|
||||||
if subnode == "" then
|
if subnode == "" then
|
||||||
minetest.override_item(waxed_item, {_mcl_stripped_variant = unwaxed_item})
|
minetest.override_item(waxed_item, {_mcl_stripped_variant = unwaxed_item})
|
||||||
|
@ -242,36 +184,6 @@ local decay_chain = {
|
||||||
"_exposed",
|
"_exposed",
|
||||||
"_weathered",
|
"_weathered",
|
||||||
"_oxidized"
|
"_oxidized"
|
||||||
=======
|
|
||||||
def = "mcl_stairs:stair_" .. waxed_variants[i][1] .. "_inner"
|
|
||||||
def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2] .. "_inner"
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
|
|
||||||
def = "mcl_stairs:stair_" .. waxed_variants[i][1] .. "_outer"
|
|
||||||
def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2] .. "_outer"
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
|
|
||||||
-- slab
|
|
||||||
def = "mcl_stairs:slab_" .. waxed_variants[i][1]
|
|
||||||
def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2]
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
|
|
||||||
def = "mcl_stairs:slab_" .. waxed_variants[i][1] .. "_top"
|
|
||||||
def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2] .. "_top"
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
|
|
||||||
def = "mcl_stairs:slab_" .. waxed_variants[i][1] .. "_double"
|
|
||||||
def_variant_scraped = "mcl_stairs:slab_" .. waxed_variants[i][2] .. "_double"
|
|
||||||
minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped })
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Waxed Oxidized Slabs and Stairs
|
|
||||||
local oxidized_slabs = {
|
|
||||||
"oxidized_cut",
|
|
||||||
"oxidized_cut_double",
|
|
||||||
"oxidized_cut_top"
|
|
||||||
>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
|
|
||||||
}
|
}
|
||||||
-- Blocks per mod. {mod_name, unwaxed (first on decay chain), waxed (first waxed on decay chain)}
|
-- Blocks per mod. {mod_name, unwaxed (first on decay chain), waxed (first waxed on decay chain)}
|
||||||
local mods_and_blocks = {
|
local mods_and_blocks = {
|
||||||
|
@ -287,7 +199,6 @@ for _, mod_and_blocks in pairs(mods_and_blocks) do
|
||||||
local oxidize_and_scrap = mod_and_blocks[2]
|
local oxidize_and_scrap = mod_and_blocks[2]
|
||||||
local wax_and_scrap = mod_and_blocks[3]
|
local wax_and_scrap = mod_and_blocks[3]
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
register_oxidation_and_scraping(mod, oxidize_and_scrap, decay_chain)
|
register_oxidation_and_scraping(mod, oxidize_and_scrap, decay_chain)
|
||||||
register_waxing_and_scraping(mod, wax_and_scrap, decay_chain)
|
register_waxing_and_scraping(mod, wax_and_scrap, decay_chain)
|
||||||
end
|
end
|
||||||
|
@ -308,22 +219,4 @@ for _, mod_and_blocks in pairs(mods_and_blocks) do
|
||||||
|
|
||||||
register_oxidation_and_scraping(mod, oxidize_and_scrap, decay_chain)
|
register_oxidation_and_scraping(mod, oxidize_and_scrap, decay_chain)
|
||||||
register_waxing_and_scraping(mod, wax_and_scrap, decay_chain)
|
register_waxing_and_scraping(mod, wax_and_scrap, decay_chain)
|
||||||
=======
|
|
||||||
for i = 1, #oxidized_slabs do
|
|
||||||
def = "mcl_stairs:slab_copper_" .. oxidized_slabs[i]
|
|
||||||
def_variant_waxed = "mcl_stairs:slab_waxed_copper_" .. oxidized_slabs[i]
|
|
||||||
minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed })
|
|
||||||
end
|
|
||||||
|
|
||||||
local oxidized_stairs = {
|
|
||||||
"oxidized_cut",
|
|
||||||
"oxidized_cut_inner",
|
|
||||||
"oxidized_cut_outer"
|
|
||||||
}
|
|
||||||
|
|
||||||
for i = 1, #oxidized_stairs do
|
|
||||||
def = "mcl_stairs:stair_copper_" .. oxidized_stairs[i]
|
|
||||||
def_variant_waxed = "mcl_stairs:stair_waxed_copper_" .. oxidized_stairs[i]
|
|
||||||
minetest.override_item(def, { _mcl_waxed_variant = def_variant_waxed })
|
|
||||||
>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -299,7 +299,6 @@ register_copper_variants("cut", {
|
||||||
_mcl_stripped_variant = "mcl_copper:block_weathered_cut",
|
_mcl_stripped_variant = "mcl_copper:block_weathered_cut",
|
||||||
_mcl_waxed_variant = "mcl_copper:waxed_block_oxidized_cut",
|
_mcl_waxed_variant = "mcl_copper:waxed_block_oxidized_cut",
|
||||||
})
|
})
|
||||||
<<<<<<< HEAD
|
|
||||||
-- Using the function above to register the copper grates.
|
-- Using the function above to register the copper grates.
|
||||||
register_copper_variants("grate", {
|
register_copper_variants("grate", {
|
||||||
drawtype = "allfaces",
|
drawtype = "allfaces",
|
||||||
|
@ -310,19 +309,6 @@ register_copper_variants("grate", {
|
||||||
--[[
|
--[[
|
||||||
register_copper_variants("chiseled", {
|
register_copper_variants("chiseled", {
|
||||||
groups = {pickaxey = 2, building_block = 1}
|
groups = {pickaxey = 2, building_block = 1}
|
||||||
=======
|
|
||||||
|
|
||||||
minetest.register_node("mcl_copper:waxed_block_oxidized_cut", {
|
|
||||||
description = S("Waxed Oxidized Cut Copper"),
|
|
||||||
_doc_items_longdesc = S("Oxidized cut copper is a decorative block."),
|
|
||||||
tiles = {"mcl_copper_oxidized_cut.png"},
|
|
||||||
is_ground_content = false,
|
|
||||||
groups = {pickaxey = 2, building_block = 1, waxed = 1},
|
|
||||||
sounds = mcl_sounds.node_sound_metal_defaults(),
|
|
||||||
_mcl_blast_resistance = 6,
|
|
||||||
_mcl_hardness = 5,
|
|
||||||
_mcl_stripped_variant = "mcl_copper:block_oxidized_cut",
|
|
||||||
>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
|
|
||||||
})
|
})
|
||||||
|
|
||||||
mcl_stairs.register_slab("copper_cut", "mcl_copper:block_cut",
|
mcl_stairs.register_slab("copper_cut", "mcl_copper:block_cut",
|
||||||
|
@ -346,7 +332,6 @@ mcl_stairs.register_slab("copper_exposed_cut", "mcl_copper:block_exposed_cut",
|
||||||
nil, nil, nil,
|
nil, nil, nil,
|
||||||
S("Double Slab of Exposed Cut Copper"))
|
S("Double Slab of Exposed Cut Copper"))
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
register_copper_variants("bulb_powered_on", {
|
register_copper_variants("bulb_powered_on", {
|
||||||
drop = "bulb_off",
|
drop = "bulb_off",
|
||||||
groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1},
|
groups = {pickaxey = 2, building_block = 1, not_in_creative_inventory = 1},
|
||||||
|
@ -386,95 +371,3 @@ minetest.register_node("mcl_copper:block_raw", {
|
||||||
_mcl_blast_resistance = 6,
|
_mcl_blast_resistance = 6,
|
||||||
_mcl_hardness = 5,
|
_mcl_hardness = 5,
|
||||||
})
|
})
|
||||||
=======
|
|
||||||
mcl_stairs.register_slab("waxed_copper_exposed_cut", "mcl_copper:waxed_block_exposed_cut",
|
|
||||||
{pickaxey = 2, waxed = 1},
|
|
||||||
{"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"},
|
|
||||||
S("Waxed Slab of Exposed Cut Copper"),
|
|
||||||
nil, nil, nil,
|
|
||||||
S("Waxed Double Slab of Exposed Cut Copper"))
|
|
||||||
|
|
||||||
mcl_stairs.register_slab("copper_weathered_cut", "mcl_copper:block_weathered_cut",
|
|
||||||
{pickaxey = 2, oxidizable = 1},
|
|
||||||
{"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"},
|
|
||||||
S("Slab of Weathered Cut Copper"),
|
|
||||||
nil, nil, nil,
|
|
||||||
S("Double Slab of Weathered Cut Copper"))
|
|
||||||
|
|
||||||
mcl_stairs.register_slab("waxed_copper_weathered_cut", "mcl_copper:waxed_block_weathered_cut",
|
|
||||||
{pickaxey = 2, waxed = 1},
|
|
||||||
{"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"},
|
|
||||||
S("Waxed Slab of Weathered Cut Copper"),
|
|
||||||
nil, nil, nil,
|
|
||||||
S("Waxed Double Slab of Weathered Cut Copper"))
|
|
||||||
|
|
||||||
mcl_stairs.register_slab("copper_oxidized_cut", "mcl_copper:block_oxidized_cut",
|
|
||||||
{pickaxey = 2},
|
|
||||||
{"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"},
|
|
||||||
S("Slab of Oxidized Cut Copper"),
|
|
||||||
nil, nil, nil,
|
|
||||||
S("Double Slab of Oxidized Cut Copper"))
|
|
||||||
|
|
||||||
mcl_stairs.register_slab("waxed_copper_oxidized_cut", "mcl_copper:waxed_block_oxidized_cut",
|
|
||||||
{pickaxey = 2, waxed = 1},
|
|
||||||
{"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"},
|
|
||||||
S("Waxed Slab of Oxidized Cut Copper"),
|
|
||||||
nil, nil, nil,
|
|
||||||
S("Waxed Double Slab of Oxidized Cut Copper"))
|
|
||||||
|
|
||||||
mcl_stairs.register_stair("copper_cut", "mcl_copper:block_cut",
|
|
||||||
{pickaxey = 2, oxidizable = 1},
|
|
||||||
{"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"},
|
|
||||||
S("Stairs of Cut Copper"),
|
|
||||||
nil, 6, nil,
|
|
||||||
"woodlike")
|
|
||||||
|
|
||||||
mcl_stairs.register_stair("waxed_copper_cut", "mcl_copper:waxed_block_cut",
|
|
||||||
{pickaxey = 2, waxed = 1},
|
|
||||||
{"mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png", "mcl_copper_block_cut.png"},
|
|
||||||
S("Waxed Stairs of Cut Copper"),
|
|
||||||
nil, 6, nil,
|
|
||||||
"woodlike")
|
|
||||||
|
|
||||||
mcl_stairs.register_stair("copper_exposed_cut", "mcl_copper:block_exposed_cut",
|
|
||||||
{pickaxey = 2, oxidizable = 1},
|
|
||||||
{"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"},
|
|
||||||
S("Stairs of Exposed Cut Copper"),
|
|
||||||
nil, 6, nil,
|
|
||||||
"woodlike")
|
|
||||||
|
|
||||||
mcl_stairs.register_stair("waxed_copper_exposed_cut", "mcl_copper:waxed_block_exposed_cut",
|
|
||||||
{pickaxey = 2, waxed = 1},
|
|
||||||
{"mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png", "mcl_copper_exposed_cut.png"},
|
|
||||||
S("Waxed Stairs of Exposed Cut Copper"),
|
|
||||||
nil, 6, nil,
|
|
||||||
"woodlike")
|
|
||||||
|
|
||||||
mcl_stairs.register_stair("copper_weathered_cut", "mcl_copper:block_weathered_cut",
|
|
||||||
{pickaxey = 2, oxidizable = 1},
|
|
||||||
{"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"},
|
|
||||||
S("Stairs of Weathered Cut Copper"),
|
|
||||||
nil, 6, nil,
|
|
||||||
"woodlike")
|
|
||||||
|
|
||||||
mcl_stairs.register_stair("waxed_copper_weathered_cut", "mcl_copper:waxed_block_weathered_cut",
|
|
||||||
{pickaxey = 2, waxed = 1},
|
|
||||||
{"mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png", "mcl_copper_weathered_cut.png"},
|
|
||||||
S("Waxed Stairs of Weathered Cut Copper"),
|
|
||||||
nil, 6, nil,
|
|
||||||
"woodlike")
|
|
||||||
|
|
||||||
mcl_stairs.register_stair("copper_oxidized_cut", "mcl_copper:block_oxidized_cut",
|
|
||||||
{pickaxey = 2},
|
|
||||||
{"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"},
|
|
||||||
S("Stairs of Oxidized Cut Copper"),
|
|
||||||
nil, 6, nil,
|
|
||||||
"woodlike")
|
|
||||||
|
|
||||||
mcl_stairs.register_stair("waxed_copper_oxidized_cut", "mcl_copper:waxed_block_oxidized_cut",
|
|
||||||
{pickaxey = 2, waxed = 1},
|
|
||||||
{"mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png", "mcl_copper_oxidized_cut.png"},
|
|
||||||
S("Waxed Stairs of Oxidized Cut Copper"),
|
|
||||||
nil, 6, nil,
|
|
||||||
"woodlike")
|
|
||||||
>>>>>>> 3bd570add365b07b129c97898f55cc6d2e83bf66
|
|
||||||
|
|
Loading…
Reference in New Issue