From 754db18c429782ca1f2faebce2690a86607cc3e2 Mon Sep 17 00:00:00 2001 From: Michieal Date: Wed, 15 Feb 2023 14:47:24 -0500 Subject: [PATCH] Added scraped variant for waxed slabs / stairs. --- mods/ITEMS/mcl_copper/functions.lua | 118 +++++++++++++++++++--------- 1 file changed, 80 insertions(+), 38 deletions(-) diff --git a/mods/ITEMS/mcl_copper/functions.lua b/mods/ITEMS/mcl_copper/functions.lua index bb4d6bc1d..b28c57644 100644 --- a/mods/ITEMS/mcl_copper/functions.lua +++ b/mods/ITEMS/mcl_copper/functions.lua @@ -7,28 +7,28 @@ local block_oxidation = { { "_weathered_cut", "_oxidized_cut" } } -local stair_oxidation = { - { "stair", "cut", "exposed_cut" }, - { "stair", "cut_inner", "exposed_cut_inner" }, - { "stair", "cut_outer", "exposed_cut_outer" }, - { "stair", "exposed_cut", "weathered_cut" }, - { "stair", "exposed_cut_inner", "weathered_cut_inner" }, - { "stair", "exposed_cut_outer", "weathered_cut_outer" }, - { "stair", "weathered_cut", "oxidized_cut" }, - { "stair", "weathered_cut_inner", "oxidized_cut_inner" }, - { "stair", "weathered_cut_outer", "oxidized_cut_outer" } +local stair_oxidization = { + { "cut", "exposed_cut" }, + { "cut_inner", "exposed_cut_inner" }, + { "cut_outer", "exposed_cut_outer" }, + { "exposed_cut", "weathered_cut" }, + { "exposed_cut_inner", "weathered_cut_inner" }, + { "exposed_cut_outer", "weathered_cut_outer" }, + { "weathered_cut", "oxidized_cut" }, + { "weathered_cut_inner", "oxidized_cut_inner" }, + { "weathered_cut_outer", "oxidized_cut_outer" } } local slab_oxidization = { - { "slab", "cut", "exposed_cut" }, - { "slab", "cut_top", "exposed_cut_top" }, - { "slab", "cut_double", "exposed_cut_double" }, - { "slab", "exposed_cut", "weathered_cut" }, - { "slab", "exposed_cut_top", "weathered_cut_top" }, - { "slab", "exposed_cut_double", "weathered_cut_double" }, - { "slab", "weathered_cut", "oxidized_cut" }, - { "slab", "weathered_cut_top", "oxidized_cut_double" }, - { "slab", "weathered_cut_double", "oxidized_cut_double" }, + { "cut", "exposed_cut" }, + { "cut_top", "exposed_cut_top" }, + { "cut_double", "exposed_cut_double" }, + { "exposed_cut", "weathered_cut" }, + { "exposed_cut_top", "weathered_cut_top" }, + { "exposed_cut_double", "weathered_cut_double" }, + { "weathered_cut", "oxidized_cut" }, + { "weathered_cut_top", "oxidized_cut_double" }, + { "weathered_cut_double", "oxidized_cut_double" }, } for _, b in pairs(block_oxidation) do @@ -41,41 +41,83 @@ local def_variant_waxed local def_variant_scraped -- register abm, then set up oxidized and waxed variants. -for _, s in pairs(stair_oxidation) do - register_oxidation_abm("mcl_stairs:" .. s[1] .. "_copper_" .. s[2]) - register_oxidation_abm("mcl_stairs:" .. s[1] .. "_copper_" .. s[2]) +for i = 1, #stair_oxidization do + register_oxidation_abm("mcl_stairs:stair_copper_" .. stair_oxidization[i][1]) + register_oxidation_abm("mcl_stairs:slab_copper_" .. slab_oxidization[i][1]) - def = "mcl_stairs:" .. s[1] .. "_copper_" .. s[2] - def_variant_oxidized = "mcl_stairs:" .. s[1] .. "_copper_" .. s[3] + -- 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:" .. s[1] .. "_copper_" .. s[2] .. "_waxed" + def_variant_waxed = "mcl_stairs:stair_waxed_copper_" .. stair_oxidization[i][2] minetest.override_item(def, { _mcl_copper_waxed_variant = def_variant_waxed }) - def = "mcl_stairs:" .. s[1] .. "_copper_" .. s[2] - def_variant_oxidized = "mcl_stairs:" .. s[1] .. "_copper_" .. s[3] + + -- 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:" .. s[1] .. "_copper_" .. s[2] .. "_waxed" + def_variant_waxed = "mcl_stairs:slab_waxed_copper_" .. slab_oxidization[i][1] minetest.override_item(def, { _mcl_copper_waxed_variant = def_variant_waxed }) end -- Set up scraped variants. -for i=1, #stair_oxidation do +for i = 1, #stair_oxidization do + -- does both stairs and slabs. if i > 3 then - def = "mcl_stairs:" .. stair_oxidation[i][1] .. "_copper_" .. stair_oxidation[i][2] - def_variant_scraped="mcl_stairs:" .. stair_oxidation[i-3][1] .. "_copper_" .. stair_oxidation[i-3][2] + 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_oxidization[i][1] .. "_copper_" .. slab_oxidization[i][2] - def_variant_scraped="mcl_stairs:" .. slab_oxidization[i-3][1] .. "_copper_" .. slab_oxidization[i-3][2] + + 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_oxidation[i][1] .. "_copper_" .. stair_oxidation[i][3] - def_variant_scraped="mcl_stairs:" .. stair_oxidation[i][1] .. "_copper_" .. stair_oxidation[i][2] + 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_oxidization[i][1] .. "_copper_" .. slab_oxidization[i][3] - def_variant_scraped="mcl_stairs:" .. slab_oxidization[i][1] .. "_copper_" .. slab_oxidization[i][2] + + 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" }, +} + +for i = 1, #waxed_variants do + -- stairs + def = "mcl_stairs:stair_" .. waxed_variants[i][1] + def_variant_scraped = "mcl_stairs:stair_" .. waxed_variants[i][2] + minetest.override_item(def, { _mcl_stripped_variant = def_variant_scraped }) + + 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