Skip to content

Commit 0b187ed

Browse files
paramatparamat
committedJun 12, 2015
Minimal: Add snow biome and jungleleaves nodes. Add mapgen aliases
Treegen: Remove alias checks from jungletree generation for speed
·
5.11.00.4.13
1 parent c849d32 commit 0b187ed

11 files changed

+93
-10
lines changed
 

‎games/minimal/mods/default/init.lua

+83-1
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,6 @@ minetest.register_node("default:leaves", {
834834
visual_scale = 1.3,
835835
tiles ={"default_leaves.png"},
836836
paramtype = "light",
837-
is_ground_content = false,
838837
groups = {snappy=3},
839838
drop = {
840839
max_items = 1,
@@ -854,6 +853,17 @@ minetest.register_node("default:leaves", {
854853
sounds = default.node_sound_leaves_defaults(),
855854
})
856855

856+
minetest.register_node("default:jungleleaves", {
857+
description = "Jungle Leaves",
858+
drawtype = "allfaces_optional",
859+
waving = 1,
860+
visual_scale = 1.3,
861+
tiles = {"default_jungleleaves.png"},
862+
paramtype = "light",
863+
groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
864+
sounds = default.node_sound_leaves_defaults(),
865+
})
866+
857867
minetest.register_node("default:cactus", {
858868
description = "Cactus",
859869
tiles ={"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
@@ -976,6 +986,7 @@ minetest.register_node("default:water_flowing", {
976986
pointable = false,
977987
diggable = false,
978988
buildable_to = true,
989+
is_ground_content = false,
979990
drowning = 1,
980991
liquidtype = "flowing",
981992
liquid_alternative_flowing = "default:water_flowing",
@@ -1000,6 +1011,7 @@ minetest.register_node("default:water_source", {
10001011
pointable = false,
10011012
diggable = false,
10021013
buildable_to = true,
1014+
is_ground_content = false,
10031015
drowning = 1,
10041016
liquidtype = "source",
10051017
liquid_alternative_flowing = "default:water_flowing",
@@ -1032,6 +1044,7 @@ minetest.register_node("default:lava_flowing", {
10321044
pointable = false,
10331045
diggable = false,
10341046
buildable_to = true,
1047+
is_ground_content = false,
10351048
drowning = 1,
10361049
liquidtype = "flowing",
10371050
liquid_alternative_flowing = "default:lava_flowing",
@@ -1060,6 +1073,7 @@ minetest.register_node("default:lava_source", {
10601073
pointable = false,
10611074
diggable = false,
10621075
buildable_to = true,
1076+
is_ground_content = false,
10631077
drowning = 1,
10641078
liquidtype = "source",
10651079
liquid_alternative_flowing = "default:lava_flowing",
@@ -1494,6 +1508,74 @@ minetest.register_node("default:apple", {
14941508
sounds = default.node_sound_defaults(),
14951509
})
14961510

1511+
minetest.register_node("default:dirt_with_snow", {
1512+
description = "Dirt with Snow",
1513+
tiles = {"default_snow.png", "default_dirt.png", "default_dirt.png^default_snow_side.png"},
1514+
groups = {crumbly=3,soil=1},
1515+
drop = 'default:dirt',
1516+
sounds = default.node_sound_dirt_defaults(),
1517+
})
1518+
1519+
minetest.register_node("default:snow", {
1520+
description = "Snow",
1521+
tiles = {"default_snow.png"},
1522+
inventory_image = "default_snowball.png",
1523+
wield_image = "default_snowball.png",
1524+
paramtype = "light",
1525+
buildable_to = true,
1526+
drawtype = "nodebox",
1527+
node_box = {
1528+
type = "fixed",
1529+
fixed = {
1530+
{-0.5, -0.5, -0.5, 0.5, -0.5+2/16, 0.5},
1531+
},
1532+
},
1533+
groups = {crumbly=3,falling_node=1},
1534+
sounds = default.node_sound_dirt_defaults(),
1535+
1536+
on_construct = function(pos)
1537+
pos.y = pos.y - 1
1538+
if minetest.get_node(pos).name == "default:dirt_with_grass" then
1539+
minetest.set_node(pos, {name="default:dirt_with_snow"})
1540+
end
1541+
end,
1542+
})
1543+
1544+
minetest.register_node("default:snowblock", {
1545+
description = "Snow Block",
1546+
tiles = {"default_snow.png"},
1547+
groups = {crumbly=3},
1548+
sounds = default.node_sound_dirt_defaults(),
1549+
})
1550+
1551+
minetest.register_node("default:ice", {
1552+
description = "Ice",
1553+
tiles = {"default_ice.png"},
1554+
is_ground_content = false,
1555+
paramtype = "light",
1556+
groups = {cracky=3},
1557+
sounds = default.node_sound_glass_defaults(),
1558+
})
1559+
1560+
minetest.register_node("default:pinetree", {
1561+
description = "Pine Tree",
1562+
tiles = {"default_pinetree_top.png", "default_pinetree_top.png", "default_pinetree.png"},
1563+
paramtype2 = "facedir",
1564+
groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
1565+
sounds = default.node_sound_wood_defaults(),
1566+
})
1567+
1568+
minetest.register_node("default:pine_needles",{
1569+
description = "Pine Needles",
1570+
drawtype = "allfaces_optional",
1571+
visual_scale = 1.3,
1572+
tiles = {"default_pine_needles.png"},
1573+
waving = 1,
1574+
paramtype = "light",
1575+
groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
1576+
sounds = default.node_sound_leaves_defaults(),
1577+
})
1578+
14971579
--
14981580
-- Grow tree function
14991581
--

‎games/minimal/mods/default/mapgen.lua

+8
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,19 @@ minetest.register_alias("mapgen_sand", "default:sand")
1010
minetest.register_alias("mapgen_water_source", "default:water_source")
1111
minetest.register_alias("mapgen_lava_source", "default:lava_source")
1212
minetest.register_alias("mapgen_gravel", "default:gravel")
13+
minetest.register_alias("mapgen_dirt_with_snow", "default:dirt_with_snow")
14+
minetest.register_alias("mapgen_snowblock", "default:snowblock")
15+
minetest.register_alias("mapgen_snow", "default:snow")
16+
minetest.register_alias("mapgen_ice", "default:ice")
1317

1418
minetest.register_alias("mapgen_tree", "default:tree")
1519
minetest.register_alias("mapgen_leaves", "default:leaves")
1620
minetest.register_alias("mapgen_apple", "default:apple")
21+
minetest.register_alias("mapgen_jungletree", "default:jungletree")
22+
minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
1723
minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
24+
minetest.register_alias("mapgen_pinetree", "default:pinetree")
25+
minetest.register_alias("mapgen_pine_needles", "default:pine_needles")
1826

1927
minetest.register_alias("mapgen_cobble", "default:cobble")
2028
minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")

‎games/minimal/mods/default/textures/default_ice.png

254 Bytes
Loading

‎games/minimal/mods/default/textures/default_jungleleaves.png

184 Bytes
Loading

‎games/minimal/mods/default/textures/default_pine_needles.png

203 Bytes
Loading

‎games/minimal/mods/default/textures/default_pinetree.png

280 Bytes
Loading

‎games/minimal/mods/default/textures/default_pinetree_top.png

574 Bytes
Loading

‎games/minimal/mods/default/textures/default_snow.png

164 Bytes
Loading

‎games/minimal/mods/default/textures/default_snow_side.png

360 Bytes
Loading

‎games/minimal/mods/default/textures/default_snowball.png

183 Bytes
Loading

‎src/treegen.cpp

+2-9
Original file line numberDiff line numberDiff line change
@@ -656,15 +656,8 @@ void make_jungletree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, int seed
656656
and in games that have saplings; both are deprecated but not
657657
replaced yet
658658
*/
659-
content_t c_tree = ndef->getId("mapgen_jungletree");
660-
content_t c_leaves = ndef->getId("mapgen_jungleleaves");
661-
if (c_tree == CONTENT_IGNORE)
662-
c_tree = ndef->getId("mapgen_tree");
663-
if (c_leaves == CONTENT_IGNORE)
664-
c_leaves = ndef->getId("mapgen_leaves");
665-
666-
MapNode treenode(c_tree);
667-
MapNode leavesnode(c_leaves);
659+
MapNode treenode(ndef->getId("mapgen_jungletree"));
660+
MapNode leavesnode(ndef->getId("mapgen_jungleleaves"));
668661

669662
PseudoRandom pr(seed);
670663
for (s16 x= -1; x <= 1; x++)

0 commit comments

Comments
 (0)
Please sign in to comment.