mirror of
https://github.com/luanti-org/minetest_game.git
synced 2025-06-04 21:10:04 -04:00
Merge 60af5e8a56
into 35de5241f4
This commit is contained in:
commit
63d3cfced7
1 changed files with 7 additions and 9 deletions
|
@ -4,11 +4,10 @@
|
||||||
minetest.register_alias("wool:dark_blue", "wool:blue")
|
minetest.register_alias("wool:dark_blue", "wool:blue")
|
||||||
minetest.register_alias("wool:gold", "wool:yellow")
|
minetest.register_alias("wool:gold", "wool:yellow")
|
||||||
|
|
||||||
local wool = {}
|
|
||||||
-- This uses a trick: you can first define the recipes using all of the base
|
-- This uses a trick: you can first define the recipes using all of the base
|
||||||
-- colors, and then some recipes using more specific colors for a few non-base
|
-- colors, and then some recipes using more specific colors for a few non-base
|
||||||
-- colors available. When crafting, the last recipes will be checked first.
|
-- colors available. When crafting, the last recipes will be checked first.
|
||||||
wool.dyes = {
|
local dyes = {
|
||||||
{"white", "White", nil},
|
{"white", "White", nil},
|
||||||
{"grey", "Grey", "basecolor_grey"},
|
{"grey", "Grey", "basecolor_grey"},
|
||||||
{"black", "Black", "basecolor_black"},
|
{"black", "Black", "basecolor_black"},
|
||||||
|
@ -23,10 +22,10 @@ wool.dyes = {
|
||||||
{"brown", "Brown", "unicolor_dark_orange"},
|
{"brown", "Brown", "unicolor_dark_orange"},
|
||||||
{"pink", "Pink", "unicolor_light_red"},
|
{"pink", "Pink", "unicolor_light_red"},
|
||||||
{"dark_grey", "Dark Grey", "unicolor_darkgrey"},
|
{"dark_grey", "Dark Grey", "unicolor_darkgrey"},
|
||||||
{"dark_green", "Dark Green", "unicolor_dark_green"},
|
{"dark_green", "Dark Green", "unicolor_dark_green"}
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, row in ipairs(wool.dyes) do
|
for _, row in ipairs(dyes) do
|
||||||
local name = row[1]
|
local name = row[1]
|
||||||
local desc = row[2]
|
local desc = row[2]
|
||||||
local craft_color_group = row[3]
|
local craft_color_group = row[3]
|
||||||
|
@ -35,16 +34,15 @@ for _, row in ipairs(wool.dyes) do
|
||||||
description = desc.." Wool",
|
description = desc.." Wool",
|
||||||
tiles = {"wool_"..name..".png"},
|
tiles = {"wool_"..name..".png"},
|
||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
|
groups = {snappy=2, choppy=2, oddly_breakable_by_hand=3, flammable=3, wool=1},
|
||||||
sounds = default.node_sound_defaults(),
|
sounds = default.node_sound_defaults()
|
||||||
})
|
})
|
||||||
if craft_color_group then
|
if craft_color_group then
|
||||||
-- Crafting from dye and white wool
|
-- Crafting from dye and white wool
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
type = "shapeless",
|
type = "shapeless",
|
||||||
output = 'wool:'..name,
|
output = "wool:"..name,
|
||||||
recipe = {'group:dye,'..craft_color_group, 'group:wool'},
|
recipe = {"group:dye,"..craft_color_group, "group:wool"}
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue