From 100c02865a00776b1f8cc5c19e39b87ce52676b2 Mon Sep 17 00:00:00 2001 From: paramat Date: Fri, 19 Feb 2016 20:57:24 +0000 Subject: [PATCH] Re-add force-placed root node to mapgen trees/large cactus Add missing spaces and missing empty lines --- init.lua | 155 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 75 deletions(-) diff --git a/init.lua b/init.lua index b7e3178..d93747a 100644 --- a/init.lua +++ b/init.lua @@ -17,11 +17,11 @@ end -- Mapgen Aspen tree -local _ = {name="air", prob=0} -local T = {name="default:aspen_tree", prob=255, force_place = true} -local B = {name="default:aspen_tree", prob=255} -local L = {name="default:aspen_leaves", prob=255} -local O = {name="default:aspen_leaves", prob=127} +local _ = {name = "air", prob = 0} +local T = {name = "default:aspen_tree", prob = 255, force_place = true} +local B = {name = "default:aspen_tree", prob = 255} +local L = {name = "default:aspen_leaves", prob = 255} +local O = {name = "default:aspen_leaves", prob = 127} mts_save("aspen_tree", { size = { x = 5, y = 10, z = 5 }, @@ -48,7 +48,7 @@ mts_save("aspen_tree", { L, L, L, L, L, _, O, L, O, _, - _, _, _, _, _, + _, _, T, _, _, _, _, T, _, _, _, _, T, _, _, _, O, T, O, _, @@ -82,8 +82,8 @@ mts_save("aspen_tree", { _, _, _, _, _, }, yslice_prob = { - {ypos=2, prob=191}, - {ypos=7, prob=191}, + {ypos = 2, prob = 191}, + {ypos = 7, prob = 191}, }, }) @@ -112,7 +112,7 @@ mts_save("aspen_tree_from_sapling", { L, L, L, L, L, _, O, L, O, _, - _, _, _, _, _, + _, _, B, _, _, _, _, T, _, _, _, _, B, _, _, _, O, B, O, _, @@ -146,24 +146,24 @@ mts_save("aspen_tree_from_sapling", { _, _, _, _, _, }, yslice_prob = { - {ypos=2, prob=191}, - {ypos=7, prob=191}, + {ypos = 2, prob = 191}, + {ypos = 7, prob = 191}, }, }) -- Mapgen Apple tree -local L = {name="default:leaves", prob=191} -local N = {name="default:leaves", prob=223} -local M = {name="default:leaves", prob=255} -local F = {name="default:apple", prob=63} -local T = {name="default:tree", prob=255} -local Y = {name="default:tree", prob=255, force_place = true} -local U = {name="default:tree", prob=191} -local I = {name="default:tree", prob=191, force_place = true} +local L = {name = "default:leaves", prob = 191} +local N = {name = "default:leaves", prob = 223} +local M = {name = "default:leaves", prob = 255} +local F = {name = "default:apple", prob = 63} +local T = {name = "default:tree", prob = 255} +local Y = {name = "default:tree", prob = 255, force_place = true} +local U = {name = "default:tree", prob = 191} +local I = {name = "default:tree", prob = 191, force_place = true} mts_save("apple_tree", { - size = {x=5, y=8, z=5}, + size = {x = 5, y = 8, z = 5}, data = { _, _, _, _, _, _, _, _, _, _, @@ -183,7 +183,7 @@ mts_save("apple_tree", { N, M, M, M, N, _, N, N, N, _, - _, _, T, _, _, + _, _, Y, _, _, _, _, Y, _, _, _, _, Y, _, _, _, _, Y, _, _, @@ -211,14 +211,14 @@ mts_save("apple_tree", { _, _, _, _, _, }, yslice_prob = { - {ypos=2, prob=127}, - {ypos=6, prob=127}, + {ypos = 2, prob = 127}, + {ypos = 6, prob = 127}, }, }) -- Apple tree from sapling mts_save("apple_tree_from_sapling", { - size = {x=5, y=8, z=5}, + size = {x = 5, y = 8, z = 5}, data = { _, _, _, _, _, _, _, _, _, _, @@ -266,23 +266,23 @@ mts_save("apple_tree_from_sapling", { _, _, _, _, _, }, yslice_prob = { - {ypos=2, prob=127}, - {ypos=6, prob=127}, + {ypos = 2, prob = 127}, + {ypos = 6, prob = 127}, }, }) -- Mapgen Jungle tree -local L = {name="default:jungleleaves", prob=255} -local N = {name="default:jungleleaves", prob=223} -local M = {name="default:jungleleaves", prob=191} -local B = {name="default:jungletree", prob=255, force_place = true} -local Y = {name="default:jungletree", prob=191, force_place = true} -local U = {name="default:jungletree", prob=127, force_place = true} -local I = {name="default:jungletree", prob=255} +local L = {name = "default:jungleleaves", prob = 255} +local N = {name = "default:jungleleaves", prob = 223} +local M = {name = "default:jungleleaves", prob = 191} +local B = {name = "default:jungletree", prob = 255, force_place = true} +local Y = {name = "default:jungletree", prob = 191, force_place = true} +local U = {name = "default:jungletree", prob = 127, force_place = true} +local I = {name = "default:jungletree", prob = 255} mts_save("jungle_tree", { - size = {x=5, y=17, z=5}, + size = {x = 5, y = 17, z = 5}, data = { _, _, _, _, _, _, _, _, _, _, @@ -384,12 +384,12 @@ mts_save("jungle_tree", { -- Jungle tree from sapling -local B = {name="default:jungletree", prob=255} -local Y = {name="default:jungletree", prob=191} -local U = {name="default:jungletree", prob=127} +local B = {name = "default:jungletree", prob = 255} +local Y = {name = "default:jungletree", prob = 191} +local U = {name = "default:jungletree", prob = 127} mts_save("jungle_tree_from_sapling", { - size = {x=5, y=17, z=5}, + size = {x = 5, y = 17, z = 5}, data = { _, _, _, _, _, _, _, _, _, _, @@ -428,7 +428,7 @@ mts_save("jungle_tree_from_sapling", { _, N, N, N, _, _, B, B, B, _, - _, B, {name="default:jungletree", prob=255, force_place = true}, B, _, + _, B, {name = "default:jungletree", prob = 255, force_place = true}, B, _, _, U, B, U, _, _, _, B, _, _, _, _, B, _, _, @@ -482,23 +482,23 @@ mts_save("jungle_tree_from_sapling", { _, _, _, _, _, }, yslice_prob = { - {ypos=8, prob=127}, - {ypos=9, prob=127}, - {ypos=10, prob=127}, - {ypos=11, prob=127}, + {ypos = 8, prob = 127}, + {ypos = 9, prob = 127}, + {ypos = 10, prob = 127}, + {ypos = 11, prob = 127}, }, }) -- Mapgen Pine tree -local L = {name="default:pine_needles", prob=255} -local M = {name="default:pine_needles", prob=223} -local N = {name="default:pine_needles", prob=191} -local T = {name="default:pine_tree", prob=255, force_place = true} -local B = {name="default:pine_tree", prob=255} +local L = {name = "default:pine_needles", prob = 255} +local M = {name = "default:pine_needles", prob = 223} +local N = {name = "default:pine_needles", prob = 191} +local T = {name = "default:pine_tree", prob = 255, force_place = true} +local B = {name = "default:pine_tree", prob = 255} mts_save("pine_tree", { - size = {x=5, y=14, z=5}, + size = {x = 5, y = 14, z = 5}, data = { _, _, _, _, _, _, _, _, _, _, @@ -530,7 +530,7 @@ mts_save("pine_tree", { _, L, L, L, _, _, _, _, _, _, - _, _, B, _, _, + _, _, T, _, _, _, _, T, _, _, _, _, T, _, _, _, _, T, _, _, @@ -576,19 +576,19 @@ mts_save("pine_tree", { _, _, _, _, _, }, yslice_prob = { - {ypos=2, prob=127}, - {ypos=3, prob=127}, - {ypos=7, prob=127}, - {ypos=10, prob=127}, + {ypos = 2, prob = 127}, + {ypos = 3, prob = 127}, + {ypos = 7, prob = 127}, + {ypos = 10, prob = 127}, }, }) -- Pine tree from sapling -local T = {name="default:pine_tree", prob=255} +local T = {name = "default:pine_tree", prob = 255} mts_save("pine_tree_from_sapling", { - size = {x=5, y=14, z=5}, + size = {x = 5, y = 14, z = 5}, data = { _, _, _, _, _, _, _, _, _, _, @@ -621,7 +621,7 @@ mts_save("pine_tree_from_sapling", { _, _, _, _, _, _, _, T, _, _, - _, _, {name="default:pine_tree", prob=255, force_place = true}, _, _, + _, _, {name = "default:pine_tree", prob = 255, force_place = true}, _, _, _, _, T, _, _, _, _, T, _, _, _, _, T, _, _, @@ -666,21 +666,21 @@ mts_save("pine_tree_from_sapling", { _, _, _, _, _, }, yslice_prob = { - {ypos=2, prob=127}, - {ypos=3, prob=127}, - {ypos=7, prob=127}, - {ypos=10, prob=127}, + {ypos = 2, prob = 127}, + {ypos = 3, prob = 127}, + {ypos = 7, prob = 127}, + {ypos = 10, prob = 127}, }, }) -- Mapgen Acacia tree -local L = {name="default:acacia_leaves", prob=255} -local M = {name="default:acacia_leaves", prob=223} -local T = {name="default:acacia_tree", prob=255, force_place = true} +local L = {name = "default:acacia_leaves", prob = 255} +local M = {name = "default:acacia_leaves", prob = 223} +local T = {name = "default:acacia_tree", prob = 255, force_place = true} mts_save("acacia_tree", { - size = {x=9, y=8, z=9}, + size = {x = 9, y = 8, z = 9}, data = { _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, @@ -718,7 +718,7 @@ mts_save("acacia_tree", { M, M, M, M, _, _, _, _, _, _, _, _, _, M, L, L, L, M, - _, _, _, _, {name="default:acacia_tree", prob=255} , _, _, _, _, + _, _, _, _, T, _, _, _, _, _, _, _, _, T, _, _, _, _, _, _, _, _, T, _, _, _, _, _, _, _, _, T, _, _, _, _, @@ -764,16 +764,16 @@ mts_save("acacia_tree", { M, M, M, M, M, _, _, _, _, }, yslice_prob = { - {ypos=2, prob=127}, + {ypos = 2, prob = 127}, }, }) -- Acacia tree from sapling -local T = {name="default:acacia_tree", prob=255} +local T = {name = "default:acacia_tree", prob = 255} mts_save("acacia_tree_from_sapling", { - size = {x=9, y=8, z=9}, + size = {x = 9, y = 8, z = 9}, data = { _, _, _, _, _, _, _, _, _, @@ -813,7 +813,7 @@ mts_save("acacia_tree_from_sapling", { _, _, _, _, M, L, L, L, M, _, _, _, _, T, _, _, _, _, - _, _, _, _, {name="default:acacia_tree", prob=255, force_place = true}, _, _, _, _, + _, _, _, _, {name = "default:acacia_tree", prob = 255, force_place = true}, _, _, _, _, _, _, _, _, T, _, _, _, _, _, _, _, _, T, _, _, _, _, _, _, _, _, T, _, _, _, _, @@ -858,17 +858,20 @@ mts_save("acacia_tree_from_sapling", { M, M, M, M, M, _, _, _, _, }, yslice_prob = { - {ypos=2, prob=127}, + {ypos = 2, prob = 127}, }, }) -- Large cactus -local C = {name="default:cactus", prob=255, param2=20} -local E = {name="default:cactus", prob=127, param2=20} + +local C = {name = "default:cactus", prob = 255, param2 = 20} +local R = {name = "default:cactus", prob = 255, param2 = 20, force_place = true} +local E = {name = "default:cactus", prob = 127, param2 = 20} + mts_save("large_cactus", { - size = {x=5, y=7, z=1}, + size = {x = 5, y = 7, z = 1}, data = { - _, _, C, _, _, + _, _, R, _, _, _, _, C, _, _, _, _, C, _, _, C, C, C, C, C, @@ -879,6 +882,7 @@ mts_save("large_cactus", { }) -- Papyrus + mts_save("papyrus", { size = {x = 1, y = 7, z = 1}, data = { @@ -897,6 +901,7 @@ mts_save("papyrus", { }) -- Waterlily + mts_save("waterlily", { size = {x = 1, y = 3, z = 1}, data = {