From 0a957ee2ef3460e083ed518807c2790d69cf10b1 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 31 Aug 2017 04:56:09 +0200 Subject: [PATCH] New oak and birch tree schematics Also fix broken glacier biome --- mods/ITEMS/mcl_core/functions.lua | 22 ++++++++++++++---- mods/ITEMS/mcl_core/schematics/aspen_tree.mts | Bin 174 -> 0 bytes .../mcl_core/schematics/mcl_core_birch.mts | Bin 0 -> 133 bytes .../schematics/mcl_core_birch_tall.mts | Bin 0 -> 143 bytes .../schematics/mcl_core_oak_classic.mts | Bin 139 -> 120 bytes mods/MAPGEN/mcl_biomes/init.lua | 13 ++++++----- mods/MISC/mcl_temp_schematic_aliases/init.lua | 2 -- 7 files changed, 25 insertions(+), 12 deletions(-) delete mode 100644 mods/ITEMS/mcl_core/schematics/aspen_tree.mts create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_birch.mts create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_birch_tall.mts diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua index 2cf6ad8e3..8a1b81341 100644 --- a/mods/ITEMS/mcl_core/functions.lua +++ b/mods/ITEMS/mcl_core/functions.lua @@ -2,6 +2,8 @@ -- Lava vs water interactions -- +local mg_name = minetest.get_mapgen_setting("mg_name") + minetest.register_abm({ label = "Lava cooling", nodenames = {"group:lava"}, @@ -247,8 +249,10 @@ function mcl_core.generate_tree(pos, tree_type, two_by_two) end end --- For oak and birch -local function generate_oaklike_tree(pos, trunk, leaves) +-- Classic oak in v6 style +local function generate_v6_oak(pos) + local trunk = "mcl_core:tree" + local leaves = "mcl_core:leaves" node = {name = ""} for dy=1,4 do pos.y = pos.y+dy @@ -310,12 +314,22 @@ local function generate_oaklike_tree(pos, trunk, leaves) end end +-- Oak function mcl_core.generate_oak_tree(pos) - generate_oaklike_tree(pos, "mcl_core:tree", "mcl_core:leaves") + if mg_name == "v6" then + generate_v6_oak_tree(pos) + else + local path = minetest.get_modpath("mcl_core") .. + "/schematics/mcl_core_oak_classic.mts" + minetest.place_schematic({x = pos.x - 2, y = pos.y - 1 , z = pos.z - 2}, path, "random", nil, false) + end end +-- Birch function mcl_core.generate_birch_tree(pos) - generate_oaklike_tree(pos, "mcl_core:birchtree", "mcl_core:birchleaves") + local path = minetest.get_modpath("mcl_core") .. + "/schematics/mcl_core_birch.mts" + minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2}, path, "random", nil, false) end -- BEGIN of spruce tree generation functions -- diff --git a/mods/ITEMS/mcl_core/schematics/aspen_tree.mts b/mods/ITEMS/mcl_core/schematics/aspen_tree.mts deleted file mode 100644 index 429a831c775320ace3f86c566380abea4dafb162..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeYb3HD`RVPIw8V_>bXx3{kc0(&5=uV-LpU{1^|Vh~A5O-n4zDX~f{E=bLb&q+-z zOD$#)LKQ73N=>bplbo=CE1|{t($N*H3D1;nJFb$@N>G}8lq2QfnbfA+j%y?i>0aSb zf7Q;t^^VK$FG=&`=jZoNcI9EvVtZ6&&^ect_5Vk~um4|5zG`%_EfW)9z8Y{|mxb}^ OLnAH?CI+>4*1Z5>DMP^k diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_birch.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_birch.mts new file mode 100644 index 0000000000000000000000000000000000000000..fae91424f9d10b936bc062ea02af4484d0f2ebd4 GIT binary patch literal 133 zcmeYb3HD`RVPIw8U|_9>0tRLV=ETe*29ez4ocQGYqExG-%%bFsoYcg!)M5r9RMC>6 z)YOVO$q5RK226@QX)3PDe48&Qt~$vfJ)-=wD5$6c1q_AHeDsHQZ#SM&aE0SwFx%!!#r3?jM7Iq}K)MX6RvnMKJNIjMgy0eB5fR8vg=1ONp92LJ_skqj|9AOIM_5S2wLV8j9$P)tLxm~gT{>Y3pB lnUG8&#eLY_g6taN{796&^+O8~<#Cb#BPu~%006gAR}%yo9Yz2E delta 98 zcmV-o0Gw2!~$XBFcmPsgvJ7?VS?*o zg6bj8E!gcvR*%mYMA=b4C;_rB7#X1iHZQ^fh>ac|KoPJMghn?7NiRek)e0;+018@4 E+Yb656951J diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index b22ff7082..f4546b5fb 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -28,9 +28,10 @@ local function register_biomes() -- Icesheet minetest.register_biome({ name = "icesheet", - node_top = "mcl_core:gravel", + node_dust = "mcl_core:snowblock", + node_top = "mcl_core:snowblock", depth_top = 2, - node_filler = "mcl_core:dirt", + node_filler = "mcl_core:snowblock", depth_filler = 3, node_stone = "mcl_core:packed_ice", node_water_top = "mcl_core:ice", @@ -38,7 +39,7 @@ local function register_biomes() node_river_water = "mcl_core:ice", node_riverbed = "mcl_core:gravel", depth_riverbed = 2, - y_min = 0, + y_min = 1, y_max = mcl_vars.mg_overworld_max, heat_point = 0, humidity_point = 73, @@ -56,7 +57,7 @@ local function register_biomes() node_riverbed = "mcl_core:gravel", depth_riverbed = 2, y_min = mcl_vars.mg_overworld_min, - y_max = -1, + y_max = 0, heat_point = 0, humidity_point = 73, }) @@ -1033,7 +1034,7 @@ local function register_decorations() biomes = {"deciduous_forest"}, y_min = 1, y_max = mcl_vars.mg_overworld_max, - schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_oak_v6.mts", + schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_oak_classic.mts", flags = "place_center_x, place_center_z", rotation = "random", }) @@ -1266,7 +1267,7 @@ local function register_decorations() biomes = {"deciduous_forest"}, y_min = 1, y_max = mcl_vars.mg_overworld_max, - schematic = minetest.get_modpath("mcl_core").."/schematics/aspen_tree.mts", + schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_birch.mts", flags = "place_center_x, place_center_z", }) diff --git a/mods/MISC/mcl_temp_schematic_aliases/init.lua b/mods/MISC/mcl_temp_schematic_aliases/init.lua index 6f37594a1..910c25aa3 100644 --- a/mods/MISC/mcl_temp_schematic_aliases/init.lua +++ b/mods/MISC/mcl_temp_schematic_aliases/init.lua @@ -3,9 +3,7 @@ -- TODO: Update the offending schematics and delete this mod. minetest.register_alias("default:jungletree", "mcl_core:jungletree") -minetest.register_alias("default:aspen_tree", "mcl_core:birchtree") minetest.register_alias("default:pine_tree", "mcl_core:sprucetree") minetest.register_alias("default:jungleleaves", "mcl_core:jungleleaves") -minetest.register_alias("default:aspen_leaves", "mcl_core:birchleaves") minetest.register_alias("default:pine_needles", "mcl_core:spruceleaves")