nalc/nalc_game
1
0
Fork 1
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into experimental

Browse Source
This commit is contained in:
bri cassa 2021-04-08 22:50:46 +02:00
commit bb2876eebf
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mods/default/nodes.lua
View File

@ -1450,7 +1450,7 @@ minetest.register_node("default:junglegrass", {
sunlight_propagates = true, sunlight_propagates = true,
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1}, groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, junglegrass = 1, flammable = 1},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -1471,7 +1471,8 @@ minetest.register_node("default:grass_1", {
sunlight_propagates = true, sunlight_propagates = true,
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1}, groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1,
normal_grass = 1, flammable = 1},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -1501,7 +1502,8 @@ for i = 2, 5 do
buildable_to = true, buildable_to = true,
drop = "default:grass_1", drop = "default:grass_1",
groups = {snappy = 3, flora = 1, attached_node = 1, groups = {snappy = 3, flora = 1, attached_node = 1,
not_in_creative_inventory = 1, grass = 1, flammable = 1}, not_in_creative_inventory = 1, grass = 1,
normal_grass = 1, flammable = 1},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -1523,7 +1525,7 @@ minetest.register_node("default:dry_grass_1", {
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flammable = 3, flora = 1, groups = {snappy = 3, flammable = 3, flora = 1,
attached_node = 1, dry_grass = 1}, attached_node = 1, grass = 1, dry_grass = 1},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -1552,7 +1554,7 @@ for i = 2, 5 do
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1,
not_in_creative_inventory=1, dry_grass = 1}, not_in_creative_inventory = 1, grass = 1, dry_grass = 1},
drop = "default:dry_grass_1", drop = "default:dry_grass_1",
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -1574,7 +1576,8 @@ minetest.register_node("default:fern_1", {
sunlight_propagates = true, sunlight_propagates = true,
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1}, groups = {snappy = 3, flammable = 3, flora = 1, grass = 1,
fern = 1, attached_node = 1},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -1604,7 +1607,7 @@ for i = 2, 3 do
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1,
not_in_creative_inventory=1}, grass = 1, fern = 1, not_in_creative_inventory = 1},
drop = "default:fern_1", drop = "default:fern_1",
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -1626,7 +1629,8 @@ minetest.register_node("default:marram_grass_1", {
sunlight_propagates = true, sunlight_propagates = true,
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flammable = 3, attached_node = 1}, groups = {snappy = 3, flammable = 3, flora = 1, grass = 1, marram_grass = 1,
attached_node = 1},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -1654,8 +1658,8 @@ for i = 2, 3 do
sunlight_propagates = true, sunlight_propagates = true,
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flammable = 3, attached_node = 1, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1,
not_in_creative_inventory=1}, grass = 1, marram_grass = 1, not_in_creative_inventory = 1},
drop = "default:marram_grass_1", drop = "default:marram_grass_1",
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
selection_box = { selection_box = {
@ -1961,6 +1965,7 @@ minetest.register_node("default:sand_with_kelp", {
tiles = {"default_sand.png"}, tiles = {"default_sand.png"},
special_tiles = {{name = "default_kelp.png", tileable_vertical = true}}, special_tiles = {{name = "default_kelp.png", tileable_vertical = true}},
inventory_image = "default_kelp.png", inventory_image = "default_kelp.png",
wield_image = "default_kelp.png",
paramtype = "light", paramtype = "light",
paramtype2 = "leveled", paramtype2 = "leveled",
groups = {snappy = 3}, groups = {snappy = 3},
@ -2077,6 +2082,7 @@ minetest.register_node("default:coral_green", {
tiles = {"default_coral_skeleton.png"}, tiles = {"default_coral_skeleton.png"},
special_tiles = {{name = "default_coral_green.png", tileable_vertical = true}}, special_tiles = {{name = "default_coral_green.png", tileable_vertical = true}},
inventory_image = "default_coral_green.png", inventory_image = "default_coral_green.png",
wield_image = "default_coral_green.png",
groups = {snappy = 3}, groups = {snappy = 3},
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -2107,6 +2113,7 @@ minetest.register_node("default:coral_pink", {
tiles = {"default_coral_skeleton.png"}, tiles = {"default_coral_skeleton.png"},
special_tiles = {{name = "default_coral_pink.png", tileable_vertical = true}}, special_tiles = {{name = "default_coral_pink.png", tileable_vertical = true}},
inventory_image = "default_coral_pink.png", inventory_image = "default_coral_pink.png",
wield_image = "default_coral_pink.png",
groups = {snappy = 3}, groups = {snappy = 3},
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -2137,6 +2144,7 @@ minetest.register_node("default:coral_cyan", {
tiles = {"default_coral_skeleton.png"}, tiles = {"default_coral_skeleton.png"},
special_tiles = {{name = "default_coral_cyan.png", tileable_vertical = true}}, special_tiles = {{name = "default_coral_cyan.png", tileable_vertical = true}},
inventory_image = "default_coral_cyan.png", inventory_image = "default_coral_cyan.png",
wield_image = "default_coral_cyan.png",
groups = {snappy = 3}, groups = {snappy = 3},
selection_box = { selection_box = {
type = "fixed", type = "fixed",

6
mods/mtg_craftguide/init.lua
View File

@ -242,11 +242,13 @@ local function recipe_fs(fs, data)
for i, item in pairs(recipe.items) do for i, item in pairs(recipe.items) do
local x, y = coords(i - 1, width) local x, y = coords(i - 1, width)
local elem_name = item
local groups = extract_groups(item) local groups = extract_groups(item)
if groups then if groups then
item = groups_to_item(groups) item = groups_to_item(groups)
elem_name = esc(item.."."..table.concat(groups, "+"))
end end
item_button_fs(fs, base_x + x, base_y + y, item, item, groups) item_button_fs(fs, base_x + x, base_y + y, item, elem_name, groups)
end end
if shapeless or recipe.method == "cooking" then if shapeless or recipe.method == "cooking" then
@ -378,7 +380,7 @@ local function on_receive_fields(player, fields)
local item local item
for field in pairs(fields) do for field in pairs(fields) do
if field:find(":") then if field:find(":") then
item = field item = field:match("[%w_:]+")
break break
end end
end end