From 48089a51c61cea13e5feae5f3442ac37e151e680 Mon Sep 17 00:00:00 2001 From: Duane Date: Mon, 13 Jun 2016 05:45:07 -0500 Subject: [PATCH] Add tree interior and adjust height. --- textures/fun_caves_bucket_sap.png | Bin 0 -> 392 bytes textures/fun_caves_sap.png | Bin 0 -> 567 bytes textures/fun_caves_sap_source_animated.png | Bin 0 -> 3316 bytes textures/fun_caves_syrup.png | Bin 0 -> 3742 bytes textures/ores_petrified_wood.png | Bin 0 -> 827 bytes treegen.lua | 161 ++++++++++++++++++++- 6 files changed, 154 insertions(+), 7 deletions(-) create mode 100644 textures/fun_caves_bucket_sap.png create mode 100644 textures/fun_caves_sap.png create mode 100644 textures/fun_caves_sap_source_animated.png create mode 100644 textures/fun_caves_syrup.png create mode 100644 textures/ores_petrified_wood.png diff --git a/textures/fun_caves_bucket_sap.png b/textures/fun_caves_bucket_sap.png new file mode 100644 index 0000000000000000000000000000000000000000..f14e3c0ceac9f4175afabdeb283377a966b242ad GIT binary patch literal 392 zcmV;30eAk1P)z| zyi^j0(nn~bL`1yXJ&$`h=broEzsu?ZrId9So~EhwEx~&5>eS`st>9Q}1MsRehAn!^v5L#hgjvSKzb0T_>5%H^s*IdZXWIJ?aZiPa_h?tF*k$EqDT7PEQD;lUQc zbkVZoG%bW-2tY8I80`LH$o}qtV7kEbJdz|Kj$`xgY%WCzVTb_Ufjw^UeV;tfTZ^^( zMD_HX^@~wTSw~TXQp#XjYqBgO&vPTcnL=H;fgI<>Ep8i0000aPF*0mMl} zK~y-)U6bLC+At7=Kc9UrL7Y{fRVq*`Rcc?e@6ng)BOFqzLqdgc1eBmnBKOC}hU@;x zkKOUk&P>d&AMbuL*3`p#ZrIh4egGNB->HXhpFG=2=m&Tz47*e0Ar#=O4gkCyBV{ld z6bf=}E1?XA_1w@(Wa_~c-T)EMZO(#qkASdRc#fBjsn>qpLfyv9)VfDpn83Nc(OfNj zKIeGpxbMrLOr!;8BZcp9);+SGcbVqzzk;(+219+lvGEpqtB-hlJIie=p%JAI_XCmD zLPcvt8BINe5nP7xg#W>yIy9neWYi_OQ+Pv|Fghi;bT5D#ZOazgw+6+ z!*Zt9fNoEs$)LUZ3ZSBfFYB*5LwQKN!jYn|;K6FAbnK zr3w?MubRA}@7UFmM)ZLcHfOc(5^%NfnAvCg*Jn2Sh_?_XH?X(Rj0;{{cwfNKcXuvS zLfJo4Uv*dp-fZ@Tf)b0TLS1pm<3^O)mye$LOjG!$iaC`jT&XsDecYu~HKMi+eaFi& z=1lle)Z~3)u$&qCQ{*B2L@7Y`fl765WByCi{NbWY{sD^b6YNXI!Xp3x002ovPDHLk FV1m}?0J;DG literal 0 HcmV?d00001 diff --git a/textures/fun_caves_sap_source_animated.png b/textures/fun_caves_sap_source_animated.png new file mode 100644 index 0000000000000000000000000000000000000000..87ea39b896c77f1fb8bacdc20628553858ec96cf GIT binary patch literal 3316 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 K^&>0ar2hip>uiAl literal 0 HcmV?d00001 diff --git a/textures/fun_caves_syrup.png b/textures/fun_caves_syrup.png new file mode 100644 index 0000000000000000000000000000000000000000..16fee97029339808f875c59db6bdbda9d97a68e7 GIT binary patch literal 3742 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

#f^&>zx$9za=9og04M3(e6rhRc(Sf>j09nl zQO+v7->mDpF;9qYuNqoyVAw^DU#y}$2SP#*j2q@QAdsP}(#CNfXEgt7e@J6mRVsUY z-ng7DY$v;!wbpU3SzpKTj#gq)%;X58Zf<88I%sLTh0?drU-ZYeGcj+cW(**yZ{{Re z=RuJNf4;hALf^F(VK5qMM~BvUsMIzps=ADWjHX#G=VF{(jkeS##*~`Ij-Rp*IvSs? zc#8B+PC9S*7z#c+|7B&~et7&~?uG$C8z{GwWtt?TnF|7+{Xpiv`0C5=`sVr1=SL5Z zBf~s>cv|k>OIh?s|H6;_4nhhK%tf+Y6|QC$ThfHRnmoKPuI^S_jF;x5d>V&t&~2)A z;Jtge|9tRjZ@GvhaN-zd zrc?!rDzZ;ccWJS;CRwRg`Shbl;X3^O?}6>im1><3;!$fV3Zj%qirCI$E|+IpjfOrR zi;(r~>!oRgX$sSXN06gJMWIEq*01M#HOWhe<@giZ`ya=;cEzGS4=?}#002ovPDHLk FV1l+Agc1M% literal 0 HcmV?d00001 diff --git a/treegen.lua b/treegen.lua index 2bf7da5..3e4bc98 100644 --- a/treegen.lua +++ b/treegen.lua @@ -26,6 +26,29 @@ minetest.register_craft({ } }) +minetest.register_node("fun_caves:ironwood", { + description = "Ironwood", + tiles = {"fun_caves_tree.png^[colorize:#B7410E:80"}, + is_ground_content = false, + groups = {tree = 1, choppy = 2, level=1}, + sounds = default.node_sound_wood_defaults(), +}) + +minetest.register_node("fun_caves:diamondwood", { + description = "Diamondwood", + tiles = {"fun_caves_tree.png^[colorize:#5D8AA8:80"}, + is_ground_content = false, + groups = {tree = 1, choppy = 2, level=2}, + sounds = default.node_sound_wood_defaults(), +}) + +minetest.register_node("fun_caves:petrified_wood", { + description = "Petrified Wood", + tiles = {"ores_petrified_wood.png"}, + groups = {cracky = 3, stone = 1}, + sounds = default.node_sound_stone_defaults(), +}) + minetest.register_node("fun_caves:leaves", { description = "Leaves", visual_scale = 1.3, @@ -48,8 +71,111 @@ minetest.register_node("fun_caves:leaves", { sounds = default.node_sound_leaves_defaults(), }) +local newnode = fun_caves.clone_node("default:water_source") +newnode.description = "Sap" +newnode.inventory_image = minetest.inventorycube("default_water.png^[colorize:#FF7E00:B0") +newnode.tiles[1].name = "fun_caves_sap_source_animated.png" +newnode.special_tiles[1].name = "fun_caves_sap_source_animated.png" +newnode.liquid_alternative_flowing = "fun_caves:sap" +newnode.liquid_alternative_source = "fun_caves:sap" +newnode.liquid_viscosity = 15 +newnode.liquid_range = 0 +newnode.post_effect_color = {a = 120, r = 255, g = 191, b = 0} +minetest.register_node("fun_caves:sap", newnode) + +minetest.register_node("fun_caves:syrup", { + description = "Syrup", + drawtype = "plantlike", + tiles = {"fun_caves_syrup.png"}, + inventory_image = "fun_caves_syrup.png", + paramtype = "light", + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25} + }, + groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, + on_use = minetest.item_eat(2, "vessels:glass_bottle"), + sounds = default.node_sound_glass_defaults(), +}) + +minetest.register_craftitem("fun_caves:charcoal", { + description = "Charcoal Briquette", + inventory_image = "default_coal_lump.png", + groups = {coal = 1} +}) + +minetest.register_craft({ + type = "fuel", + recipe = "fun_caves:charcoal", + burntime = 50, +}) + +minetest.register_craft({ + type = "cooking", + output = "default:sand", + recipe = "fun_caves:bark", +}) + +minetest.register_craft({ + type = "cooking", + output = "default:iron_lump", + recipe = "fun_caves:ironwood", +}) + +minetest.register_craft({ + type = "cooking", + output = "default:diamond", + recipe = "fun_caves:diamondwood", +}) + +minetest.register_craft({ + type = "cooking", + output = "fun_caves:charcoal", + recipe = "group:tree", +}) + +minetest.register_craft({ + output = 'default:torch 4', + recipe = { + {'fun_caves:charcoal'}, + {'group:stick'}, + } +}) + +minetest.register_craft({ + output = 'fun_caves:syrup', + type = "shapeless", + recipe = { + 'vessels:glass_bottle', + 'fun_caves:bucket_sap', + }, + replacements = {{'fun_caves:bucket_sap', 'bucket:bucket_empty'},}, +}) + +bucket.register_liquid( + "fun_caves:sap", + "fun_caves:sap", + "fun_caves:bucket_sap", + "fun_caves_bucket_sap.png", + "Bucket of Sap", + {} +) + + +--minetest.register_craft( { +-- output = "vessels:glass_bottle 10", +-- recipe = { +-- { "fun_caves:amber", "", "fun_caves:amber" }, +-- { "fun_caves:amber", "", "fun_caves:amber" }, +-- { "", "fun_caves:amber", "" } +-- } +--}) + + local tree_noise_1 = {offset = 0, scale = 1, seed = 7227, spread = {x = 10, y = 10, z = 10}, octaves = 3, persist = 1, lacunarity = 2} -local limb_noise_1 = {offset = 0, scale = 1, seed = 3901, spread = {x = 80, y = 3, z = 80}, octaves = 3, persist = 1, lacunarity = 2} +local wood_noise = {offset = 0, scale = 1, seed = -4640, spread = {x = 32, y = 32, z = 32}, octaves = 4, persist = 0.7, lacunarity = 2} + fun_caves.treegen = function(minp, maxp, data, p2data, area, node) local tree_n = minetest.get_perlin(tree_noise_1):get2d({x=floor((minp.x + 32) / 160) * 80, y=floor((minp.z + 32) / 160) * 80}) @@ -61,7 +187,7 @@ fun_caves.treegen = function(minp, maxp, data, p2data, area, node) local map_max = {x = csize.x, y = csize.y, z = csize.z} local map_min = {x = minp.x, y = minp.y, z = minp.z} - local limb_1 = minetest.get_perlin_map(limb_noise_1, map_max):get3dMap_flat(map_min) + local wood_1 = minetest.get_perlin_map(wood_noise, map_max):get3dMap_flat(map_min) local write = false @@ -80,16 +206,37 @@ fun_caves.treegen = function(minp, maxp, data, p2data, area, node) for y = minp.y, maxp.y do local dy = y - minp.y local r = 20 - if abs(y - 80) > 100 then - r = max(0, r - floor((abs(y - 80) - 100) / 2)) + if abs(y - 50) > 130 then + r = max(0, r - floor((abs(y - 50) - 130) / 2)) end - if floor(dx ^ 2 + dz ^ 2) < r ^ 2 then - data[ivm] = node['fun_caves:tree'] + local distance = floor(math.sqrt(dx ^ 2 + dz ^ 2)) + if distance < r then + if rand(500) == 1 then + data[ivm] = node['fun_caves:sap'] + elseif distance % 8 == 7 and wood_1[index3d] < 0.3 then + data[ivm] = node['fun_caves:petrified_wood'] + elseif wood_1[index3d] < -0.98 then + data[ivm] = node['default:water_source'] + elseif wood_1[index3d] < -0.8 then + data[ivm] = node['air'] + elseif wood_1[index3d] < -0.05 then + data[ivm] = node['fun_caves:tree'] + elseif wood_1[index3d] < 0.05 then + data[ivm] = node['air'] + elseif wood_1[index3d] < 0.6 then + data[ivm] = node['fun_caves:tree'] + elseif wood_1[index3d] < 0.97 then + data[ivm] = node['fun_caves:ironwood'] + else + data[ivm] = node['fun_caves:diamondwood'] + end write = true - elseif y < 222 and y > -102 and floor(dx ^ 2 + dz ^ 2) < (r + 2) ^ 2 then + elseif y < 222 and y > -132 and floor(dx ^ 2 + dz ^ 2) < (r + 2) ^ 2 then data[ivm] = node['fun_caves:bark'] write = true + + -- foliage elseif y < 272 and y > 112 and floor(dx ^ 2 + dz ^ 2 + (y - 192) ^ 2) < r2 ^ 2 and y % 10 == 0 and (floor(dx / 4) % 3 == 0 or floor(dz / 4) % 3 == 0) then if data[ivm] == node['air'] then data[ivm] = node['fun_caves:tree']