epCode
/
MineClone2
forked from VoxeLibre/VoxeLibre
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

master #5

Merged
epCode merged 255 commits from VoxeLibre/VoxeLibre:master into master 2021-02-02 23:20:01 +01:00
Conversation 0 Commits 255 Files Changed 165 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit abdb76c2a0 - Show all commits

7
mods/ITEMS/mcl_core/functions.lua
View File

@ -1450,10 +1450,11 @@ end
-- * tiles: Optional custom tiles -- * tiles: Optional custom tiles
-- * sounds: Optional custom sounds -- * sounds: Optional custom sounds
-- * clear_colorization: Optional. If true, will clear all paramtype2="color" related node def. fields -- * clear_colorization: Optional. If true, will clear all paramtype2="color" related node def. fields
-- * desc: Item description
-- --
-- The snowable nodes also MUST have _mcl_snowed defined to contain the name -- The snowable nodes also MUST have _mcl_snowed defined to contain the name
-- of the snowed node. -- of the snowed node.
mcl_core.register_snowed_node = function(itemstring_snowed, itemstring_clear, tiles, sounds, clear_colorization) mcl_core.register_snowed_node = function(itemstring_snowed, itemstring_clear, tiles, sounds, clear_colorization, desc)
local def = table.copy(minetest.registered_nodes[itemstring_clear]) local def = table.copy(minetest.registered_nodes[itemstring_clear])
local create_doc_alias local create_doc_alias
if def.description then if def.description then
@ -1462,7 +1463,7 @@ mcl_core.register_snowed_node = function(itemstring_snowed, itemstring_clear, ti
create_doc_alias = false create_doc_alias = false
end end
-- Just some group clearing -- Just some group clearing
def.description = nil def.description = desc
def._doc_items_longdesc = nil def._doc_items_longdesc = nil
def._doc_items_usagehelp = nil def._doc_items_usagehelp = nil
def._doc_items_create_entry = false def._doc_items_create_entry = false
@ -1503,6 +1504,8 @@ mcl_core.register_snowed_node = function(itemstring_snowed, itemstring_clear, ti
def.sounds = sounds def.sounds = sounds
end end
def._mcl_silk_touch_drop = {itemstring_clear}
-- Register stuff -- Register stuff
minetest.register_node(itemstring_snowed, def) minetest.register_node(itemstring_snowed, def)

8
mods/ITEMS/mcl_core/nodes_base.lua
View File

@ -380,7 +380,7 @@ minetest.register_node("mcl_core:dirt_with_grass", {
_mcl_hardness = 0.6, _mcl_hardness = 0.6,
_mcl_silk_touch_drop = true, _mcl_silk_touch_drop = true,
}) })
mcl_core.register_snowed_node("mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", nil, nil, true) mcl_core.register_snowed_node("mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", nil, nil, true, S("Dirt with Snow"))
minetest.register_node("mcl_core:grass_path", { minetest.register_node("mcl_core:grass_path", {
tiles = {"mcl_core_grass_path_top.png", "default_dirt.png", "mcl_core_grass_path_side.png"}, tiles = {"mcl_core_grass_path_top.png", "default_dirt.png", "mcl_core_grass_path_side.png"},
@ -424,7 +424,7 @@ minetest.register_node("mcl_core:mycelium", {
_mcl_hardness = 0.6, _mcl_hardness = 0.6,
_mcl_silk_touch_drop = true, _mcl_silk_touch_drop = true,
}) })
mcl_core.register_snowed_node("mcl_core:mycelium_snow", "mcl_core:mycelium") mcl_core.register_snowed_node("mcl_core:mycelium_snow", "mcl_core:mycelium", nil, nil, false, S("Mycelium with Snow"))
minetest.register_node("mcl_core:podzol", { minetest.register_node("mcl_core:podzol", {
description = S("Podzol"), description = S("Podzol"),
@ -441,7 +441,7 @@ minetest.register_node("mcl_core:podzol", {
_mcl_hardness = 0.6, _mcl_hardness = 0.6,
_mcl_silk_touch_drop = true, _mcl_silk_touch_drop = true,
}) })
mcl_core.register_snowed_node("mcl_core:podzol_snow", "mcl_core:podzol") mcl_core.register_snowed_node("mcl_core:podzol_snow", "mcl_core:podzol", nil, nil, false, S("Podzol with Snow"))
minetest.register_node("mcl_core:dirt", { minetest.register_node("mcl_core:dirt", {
description = S("Dirt"), description = S("Dirt"),
@ -924,7 +924,7 @@ for i=1,8 do
desc = S("Top Snow") desc = S("Top Snow")
tt_help = S("Stackable") tt_help = S("Stackable")
longdesc = S("Top snow is a layer of snow. It melts near light sources other than the sun with a light level of 12 or higher.").."\n"..S("Top snow can be stacked and has one of 8 different height levels. At levels 2-8, top snow is collidable. Top snow drops 2-9 snowballs, depending on its height.") longdesc = S("Top snow is a layer of snow. It melts near light sources other than the sun with a light level of 12 or higher.").."\n"..S("Top snow can be stacked and has one of 8 different height levels. At levels 2-8, top snow is collidable. Top snow drops 2-9 snowballs, depending on its height.")
usagehelp = S("This block can only be placed on full solid blocks and on another top snow (which increases its height).") usagehelp = S("This block can only be placed on full solid blocks and on another top snow (which increases its height).")
walkable = false walkable = false
else else
id = "mcl_core:snow_"..i id = "mcl_core:snow_"..i