From bc2b58ab8eb7593bd40abb5b6bf7ad0eded8a3d4 Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Sat, 14 Nov 2015 10:21:06 +0000 Subject: [PATCH] Added birch tree, tweaked mapgen and abm's --- README.md | 12 +++++- fences.lua | 1 + gates.lua | 1 + init.lua | 2 +- leaves.lua | 26 ++++++++++++- mapgen_v7n.lua | 42 +++++++++++---------- sapling.lua | 6 +++ schematics/birch_tree.lua | 50 +++++++++++++++++++++++++ stairs.lua | 7 ++++ textures/moretrees_birch_leaves.png | Bin 0 -> 459 bytes textures/moretrees_birch_sapling.png | Bin 0 -> 208 bytes textures/moretrees_birch_trunk.png | Bin 0 -> 975 bytes textures/moretrees_birch_trunk_top.png | Bin 0 -> 811 bytes textures/moretrees_birch_wood.png | Bin 0 -> 1075 bytes water.lua | 10 ++--- wood.lua | 28 ++++++++++++++ 16 files changed, 155 insertions(+), 30 deletions(-) create mode 100644 schematics/birch_tree.lua create mode 100644 textures/moretrees_birch_leaves.png create mode 100644 textures/moretrees_birch_sapling.png create mode 100644 textures/moretrees_birch_trunk.png create mode 100644 textures/moretrees_birch_trunk_top.png create mode 100644 textures/moretrees_birch_wood.png diff --git a/README.md b/README.md index 3852726..61ff352 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,21 @@ Ethereal v7 Mapgen mod for Minetest ## Changelog +### 1.18 + +- Added Birch tree, also stairs; fence and gate +- Added Fire flower to fiery biomes (careful, it hurts) +- Tweaked biomes and decoration slightly +- Added tree_tool for admin to quickly grow tree's +- Cobble to Mossycobble when near water has been toned down a bit + ### 1.17 - Added new Glacier biome filled with snow and ice - Changed Mesa biome to have more coloured clay patterns - Changed Bamboo biome to have tall tree-like stalks with leaves that give - Bamboo sprouts are now saplings to grow new stalks - removed farmed mushrooms and replaced with new default game mushrooms with spores +- Bamboo sprouts are now saplings to grow new stalks +- Removed farmed mushrooms and replaced with default game mushrooms with spores ### 1.16 diff --git a/fences.lua b/fences.lua index c704d00..c639a85 100644 --- a/fences.lua +++ b/fences.lua @@ -10,6 +10,7 @@ local fences = { {"mushroom", "Mushroom", "mushroom_trunk.png", "ethereal:mushroom_trunk"}, {"acacia", "Acacia Wood", "moretrees_acacia_wood.png", "ethereal:acacia_wood"}, {"pine", "Pine Wood", "default_pine_wood.png", "default:pinewood"}, + {"birch", "Birch Wood", "moretrees_birch_wood.png", "ethereal:birch_wood"}, } for _, row in ipairs(fences) do diff --git a/gates.lua b/gates.lua index 5065da8..3ffc0d6 100644 --- a/gates.lua +++ b/gates.lua @@ -47,6 +47,7 @@ local gates = { {"mushroom", "Mushroom", "mushroom_trunk.png", "ethereal:mushroom_trunk"}, {"acacia", "Acacia Wood", "moretrees_acacia_wood.png", "ethereal:acacia_wood"}, {"pine", "Pine Wood", "default_pine_wood.png", "default:pinewood"}, + {"birch", "Birch Wood", "moretrees_birch_wood.png", "ethereal:birch_wood"}, } for _, row in pairs(gates) do diff --git a/init.lua b/init.lua index 1734d91..d9697d2 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,6 @@ --[[ - Minetest Ethereal Mod 1.16 (30th September 2015) + Minetest Ethereal Mod 1.18 (14th November 2015) Created by ChinChow diff --git a/leaves.lua b/leaves.lua index bfce420..4f1fb51 100644 --- a/leaves.lua +++ b/leaves.lua @@ -106,7 +106,7 @@ minetest.override_item("default:leaves", { }, }) --- Default Orange Tree Leaves +-- Orange Tree Leaves minetest.register_node("ethereal:orange_leaves", { description = "Orange Leaves", drawtype = leaftype, @@ -143,7 +143,7 @@ minetest.override_item("default:jungleleaves", { }, }) --- Default Banana Tree Leaves +-- Banana Tree Leaves minetest.register_node("ethereal:bananaleaves", { description = "Banana Leaves", drawtype = leaftype, @@ -212,6 +212,28 @@ minetest.register_node("ethereal:palmleaves", { after_place_node = default.after_place_leaves, }) +-- Birch Tree Leaves +minetest.register_node("ethereal:birch_leaves", { + description = "Birch Leaves", + drawtype = leaftype, + visual_scale = 1.2, + tiles = {"moretrees_birch_leaves.png"}, + inventory_image = "moretrees_birch_leaves.png", + paramtype = "light", + walkable = false, + waving = 1, + groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2}, + drop = { + max_items = 1, + items = { + {items = {"ethereal:birch_sapling"}, rarity = 20}, + {items = {"ethereal:birch_leaves"}} + } + }, + sounds = default.node_sound_leaves_defaults(), + after_place_node = default.after_place_leaves, +}) + -- Pine Tree Leaves minetest.override_item("default:pine_needles", { drawtype = leaftype, diff --git a/mapgen_v7n.lua b/mapgen_v7n.lua index bc4f9cb..a9cabe1 100644 --- a/mapgen_v7n.lua +++ b/mapgen_v7n.lua @@ -9,6 +9,7 @@ dofile(path.."apple_tree.lua") dofile(path.."orange_tree.lua") dofile(path.."banana_tree.lua") dofile(path.."bamboo_tree.lua") +dofile(path.."birch_tree.lua") dofile(path.."bush.lua") --= Biomes (Minetest 0.4.13 and above) @@ -26,20 +27,20 @@ if ethereal.glacier == 1 then depth_water_top = 10, y_min = -8, y_max = 31000, - heat_point = -5, + heat_point = 0, humidity_point = 50, }) minetest.register_biome({ name = "glacier_ocean", - node_dust = "default:sand", -- was snowblock - node_top = "default:gravel", + node_dust = "default:snowblock", + node_top = "default:sand", depth_top = 1, - node_filler = "default:gravel", - depth_filler = 2, + node_filler = "default:sand", + depth_filler = 3, y_min = -112, y_max = -9, - heat_point = -5, + heat_point = 0, humidity_point = 50, }) end @@ -624,13 +625,25 @@ minetest.register_decoration({ flags = "place_center_x, place_center_z", }) +-- big old tree +minetest.register_decoration({ + deco_type = "schematic", + place_on = "ethereal:green_dirt", + sidelen = 80, + fill_ratio = 0.005, + biomes = {"jumble"}, + schematic = path.."bigtree.mts", + flags = "place_center_x, place_center_z", +}) + +-- birch tree (was apple) minetest.register_decoration({ deco_type = "schematic", place_on = {"ethereal:green_dirt"}, sidelen = 80, - fill_ratio = 0.005, + fill_ratio = 0.03, biomes = {"grassytwo"}, - schematic = ethereal.appletree, + schematic = ethereal.birchtree, flags = "place_center_x, place_center_z", }) @@ -639,7 +652,7 @@ minetest.register_decoration({ deco_type = "schematic", place_on = {"ethereal:prairie_dirt"}, sidelen = 80, - fill_ratio = 0.005, + fill_ratio = 0.01, biomes = {"prairie"}, schematic = ethereal.orangetree, flags = "place_center_x, place_center_z", @@ -677,17 +690,6 @@ minetest.register_decoration({ rotation = "random", }) --- big old tree -minetest.register_decoration({ - deco_type = "schematic", - place_on = "ethereal:green_dirt", - sidelen = 80, - fill_ratio = 0.01, - biomes = {"grassytwo"}, - schematic = path.."bigtree.mts", - flags = "place_center_x, place_center_z", -}) - -- palm tree minetest.register_decoration({ deco_type = "schematic", diff --git a/sapling.lua b/sapling.lua index 16c30d8..41ce966 100644 --- a/sapling.lua +++ b/sapling.lua @@ -36,6 +36,7 @@ ethereal.register_sapling("ethereal:palm", "Palm", "moretrees_palm") ethereal.register_sapling("ethereal:redwood", "Redwood", "redwood") ethereal.register_sapling("ethereal:orange_tree", "Orange", "orange_tree") ethereal.register_sapling("ethereal:acacia", "Acacia", "moretrees_acacia") +ethereal.register_sapling("ethereal:birch", "Birch", "moretrees_birch") ethereal.add_tree = function (pos, ofx, ofz, schem) -- check for schematic @@ -114,6 +115,11 @@ ethereal.grow_sapling = function (pos, node) elseif node.name == "ethereal:bamboo_sprout" and under == "ethereal:bamboo_dirt" then ethereal.add_tree(pos, 1, 1, ethereal.bambootree) + + elseif node.name == "ethereal:birch_sapling" + and under == "ethereal:green_dirt" then + ethereal.add_tree(pos, 2, 2, ethereal.birchtree) + end end diff --git a/schematics/birch_tree.lua b/schematics/birch_tree.lua new file mode 100644 index 0000000..32894d0 --- /dev/null +++ b/schematics/birch_tree.lua @@ -0,0 +1,50 @@ + +-- Birch Tree (built column by column, bottom to top) + +local i = "air" +local t = "ethereal:birch_trunk" +local l = "ethereal:birch_leaves" + +ethereal.birchtree = {size = {x = 5, y = 7, z = 5}, data = { + +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=l, param1=150}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=150}, +{name=l, param1=150}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=150}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, + +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, +{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, +{name=i, param1=000}, {name=l, param1=150}, {name=l, param1=255}, {name=l, param1=150}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000}, + +{name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=t, param1=255}, {name=i, param1=000}, {name=i, param1=000}, +{name=l, param1=255}, {name=l, param1=255}, {name=t, param1=255}, {name=l, param1=255}, {name=l, param1=255}, +{name=l, param1=255}, {name=l, param1=255}, {name=t, param1=255}, {name=l, param1=255}, {name=l, param1=255}, +{name=i, param1=000}, {name=l, param1=255}, {name=t, param1=255}, {name=l, param1=255}, {name=i, param1=000}, +{name=i, param1=000}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=i, param1=000}, + +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, +{name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, +{name=i, param1=000}, {name=l, param1=150}, {name=l, param1=255}, {name=l, param1=150}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=l, param1=255}, {name=i, param1=000}, {name=i, param1=000}, + +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=l, param1=150}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=150}, +{name=l, param1=150}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=255}, {name=l, param1=150}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, +{name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, {name=i, param1=000}, + +}, yslice_prob = {{ypos = 1, prob = 127}}} diff --git a/stairs.lua b/stairs.lua index 12578e3..bd511be 100644 --- a/stairs.lua +++ b/stairs.lua @@ -66,6 +66,13 @@ stairs.register_stair_and_slab("palm_wood", "ethereal:palm_wood", "Palm Wood Slab", default.node_sound_wood_defaults()) +stairs.register_stair_and_slab("birch_wood", "ethereal:birch_wood", + {choppy = 2, oddly_breakable_by_hand = 1, flammable = 3, not_in_craft_guide = 1}, + {"moretrees_birch_wood.png"}, + "Birch Wood Stair", + "Birch Wood Slab", + default.node_sound_wood_defaults()) + stairs.register_stair_and_slab("banana_wood", "ethereal:banana_wood", {choppy = 2, oddly_breakable_by_hand = 1, flammable = 3, not_in_craft_guide = 1}, {"banana_wood.png"}, diff --git a/textures/moretrees_birch_leaves.png b/textures/moretrees_birch_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..547f133b13bf38d28f501bca5b37d162851bfe3c GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf%mAMdS9UW7hGGUeeQ8bu21Y#w zaZPbfD+VnOErwtQX)OtcG6n`626ht$8Er{rDAeKjXFhI|HfS9OM528KumhIj^sSO$g?2E711b!T-=cTI+H2E$N84L1#jXa+4W zErvt}hHM5MKOG$(9c^!IhExWIbOv32U4~=^hD@O27>um;$p9(ik|4j}|0Dy3!g+i9 zfZEr2x;TbNTxLDkn#kXE?yRt?y!QO9@WRWs{87;}<2Ud%ipjmG`EX;EJktT; z2Mx+fKjb_Ph%<6my;={=ivP4^ zaJWunj?qqd{ZHF`hw*}Ce>+@R6yheXkveAoK>nG!rtC8F-aViI@O1TaS?83{1OSM3 Bs3-sc literal 0 HcmV?d00001 diff --git a/textures/moretrees_birch_sapling.png b/textures/moretrees_birch_sapling.png new file mode 100644 index 0000000000000000000000000000000000000000..afb03f3b0796cf32a8fa8a37c7705f83bcb1385a GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=4EOJpcdy7vlvn3}y(t zdGqGWmoJk93l;p?@lCIHXxUHx3vIVCg!0DAXR AYybcN literal 0 HcmV?d00001 diff --git a/textures/moretrees_birch_trunk.png b/textures/moretrees_birch_trunk.png new file mode 100644 index 0000000000000000000000000000000000000000..2b222f7b728fbdd6ff2433ab3043585327270062 GIT binary patch literal 975 zcmV;=12FuFP)bpwg3C_f^k`HOgV^dT(g~!xUr!B z{`d3i*6K`0nDEcw&NMN&olmf@xOS(8Y*%V~%D`;@8S{( z#m%~|+tJ6}(Z|upxR8KrQ$R23;@SWI{*!J~|M%?w`S8)ix44^yvzUPY`trA=m4ISQ z$GE2d{`JMWuEDdZ-`Uad=-&VO^YiWG&d0aJx2D|D#IdHG+tI}G>f)M-eY2#Hx~!YJ ztE8rymE6n%B+5-qpylq?*pbx6#G8x2c%Y$G*C(q|Lvx zwWgZ0q?@3QfZ^4|kb-Wmpp&|*nxK$hodytBx>uEDpgq?3ZHo0XuGfQ58oteu#z zq=}e?am2W(lY(x+v!chmteS~?f@@H>uAAxM*=98_+0etwv!=DIqO6#R|Mu+J)5x`{ zox`)Fx2vF8IVkh$;P7$n0T4+yESgjvhOH;tYfNdRYk;aTx>W=(a@*=gykRa9U1^nRUCEw7zTA z_9^?PPh`-R6yV>&ehO%2YF+oF{yv6n>p8f%8Q26x6fAdd>78(f;k42wKHjrug%q`P zJ+tb2&M+9MEAudM3Ip|c1Sap@+r@C&L`{WJR9;iZEjTH!vb~dGPq?wF##yjK6Eh1B zwKC*qYzherJ>?#h5Wl;isilTt&(s-{n{!hF?0jQ$4mH;9Vwg5(!TgSFe|uYN@3@NU xq9Y7PmMoiB?q}oZ&c&v%iEz-)u*9N?&A*?ZgKopFk#SQ-$Fi5qx}Kzqa?s1L zzNe1R%&^bJr@yC-$+ekuS4qUGjH-xnly6(m%dWqthtt%+sgQTj$gI)Mwb$3r%ea}) z#H_}!mRL!TEG(skZAdvWLN+ka%&gJUwm~;9)6>1pzMsCQh{djvO+GQu$*ixCbY;)YQbz!lcZ*oY>gd(bBj* zG%Zd)GD0{ov)2r500037NkliF5LSp{=DdEh!}{`qxx%?VsvnSqK>JGUXP!6-Austz$t1LQH&iL36jw zI_(i9mp_3fE-zo}ncTYc>cwEcKmtvUR%dsZkKaFSEJOteyhrMiHcxIpzV8=1jR6P; zyYk$&EU#N+=|O4_<-na+`$wm%V@nRxt8u;qft-)mXB!i`VUO2qzgr-nr$gSmp1|*aYW*Th@2Do{sA`1YQX=^ymtTq002ovPDHLkV1iSzsYU<* literal 0 HcmV?d00001 diff --git a/textures/moretrees_birch_wood.png b/textures/moretrees_birch_wood.png new file mode 100644 index 0000000000000000000000000000000000000000..621f8eec9ce18d07d035e6be2d642ae5dd631b70 GIT binary patch literal 1075 zcmV-31kC%1P)dCjSC&#QRgy^U!(0BJJ-(y4ZoW);@4 zbIqxC+p&4zx`4r(VU1n}h*bdPzk}YfbLhf`?!}Gex`X4th~2Ss@yeF#x_;ZMapSy* zaXbKyUI59XYu2@U@6DO^%$M`Uj^np>lwktq!HaP_0Nb^F<-Cf@n`Pa&hR>{S@x_#8 zEdcMwj_AUR=DK<8y@AS^V4G_Y)vtBfv3PJV0Oh)c?#Y*RIRK+|JHL}e{??x5zmRi0 z0M@U2&7)b#o?*ewT0HNb=9kI+p~blr*qGyaHe=F z?8T7fy@tAwNt0s?;JAI}zlGMWdD^#r$)0Gjg+bl3eRx9vznNZ43;^P~h}EolkY*Kt zNC0g#0O-P#*s*}#yoINEGuEzibwB{%y@uVhdEmN+-Lr1&!iCnUZsWL$nQ0Z2W(6<-LlQW)Q`rW7V;E>%^3oW*@?tVZWAD zznNI(y?)lKWu|^M#GhrJbt%@r9q-CanD%P%X-LZYrt7&000RP~o>%x83uWsGEd&!<- zx{X!hx`EB6X4tWD>&1xArftHPTXj4D``Dh$qh-~sb=$Xj;<|p@v3|*)X4tQI=E8{9 zt7fElDaoH$)~|Ehvvbp|ZPTl6j$Rnbp=NVI0Nb;8%A{%4t8v}6dC8w;;JSX^w}aEE zaMGu7$DCnkF96A*ZrZVS&!%!OD_cH(h z0T@X{K~xx51;N2e0znu6;Qi;Hota&B5S1-R3BoKXJVX&hPZ83=j$Ncfy+gi0hn}Dy zx_YT&b?#D^Gz;vem8Q{(E6&bL-v{+6&Zcz!|_JUFDJAn41(g^vVq&mTYQ zVwjeW>*A