From: paramat Date: Wed, 1 Jul 2015 05:16:06 +0000 (+0100) Subject: Default/mapgen: Add missing spaces X-Git-Tag: 0.4.13~44 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0914e595c7ab01a66188fca52561df26f852d7c4;p=oweals%2Fminetest_game.git Default/mapgen: Add missing spaces --- diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index 378614e2..48653418 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -47,18 +47,18 @@ function default.register_ores() ore_type = "blob", ore = "default:clay", wherein = {"default:sand"}, - clust_scarcity = 24*24*24, + clust_scarcity = 24 * 24 * 24, clust_size = 7, y_min = -15, y_max = 0, noise_threshhold = 0, noise_params = { - offset=0.35, - scale=0.2, - spread={x=5, y=5, z=5}, - seed=-316, - octaves=1, - persist=0.5 + offset = 0.35, + scale = 0.2, + spread = {x = 5, y = 5, z = 5}, + seed = -316, + octaves = 1, + persist = 0.5 }, }) @@ -66,18 +66,18 @@ function default.register_ores() ore_type = "blob", ore = "default:sand", wherein = {"default:stone"}, - clust_scarcity = 24*24*24, + clust_scarcity = 24 * 24 * 24, clust_size = 7, y_min = -63, y_max = 4, noise_threshhold = 0, noise_params = { - offset=0.35, - scale=0.2, - spread={x=5, y=5, z=5}, - seed=2316, - octaves=1, - persist=0.5 + offset = 0.35, + scale = 0.2, + spread = {x = 5, y = 5, z = 5}, + seed = 2316, + octaves = 1, + persist = 0.5 }, }) @@ -85,18 +85,18 @@ function default.register_ores() ore_type = "blob", ore = "default:dirt", wherein = {"default:stone"}, - clust_scarcity = 24*24*24, + clust_scarcity = 24 * 24 * 24, clust_size = 7, y_min = -63, y_max = 31000, noise_threshhold = 0, noise_params = { - offset=0.35, - scale=0.2, - spread={x=5, y=5, z=5}, - seed=17676, - octaves=1, - persist=0.5 + offset = 0.35, + scale = 0.2, + spread = {x = 5, y = 5, z = 5}, + seed = 17676, + octaves = 1, + persist = 0.5 }, }) @@ -104,18 +104,18 @@ function default.register_ores() ore_type = "blob", ore = "default:gravel", wherein = {"default:stone"}, - clust_scarcity = 24*24*24, + clust_scarcity = 24 * 24 * 24, clust_size = 7, y_min = -31000, y_max = 31000, noise_threshhold = 0, noise_params = { - offset=0.35, - scale=0.2, - spread={x=5, y=5, z=5}, - seed=766, - octaves=1, - persist=0.5 + offset = 0.35, + scale = 0.2, + spread = {x = 5, y = 5, z = 5}, + seed = 766, + octaves = 1, + persist = 0.5 }, }) @@ -123,7 +123,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_coal", wherein = "default:stone", - clust_scarcity = 8*8*8, + clust_scarcity = 8 * 8 * 8, clust_num_ores = 8, clust_size = 3, y_min = -31000, @@ -134,7 +134,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_coal", wherein = "default:stone", - clust_scarcity = 24*24*24, + clust_scarcity = 24 * 24 * 24, clust_num_ores = 27, clust_size = 6, y_min = -31000, @@ -145,7 +145,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_iron", wherein = "default:stone", - clust_scarcity = 12*12*12, + clust_scarcity = 12 * 12 * 12, clust_num_ores = 3, clust_size = 2, y_min = -15, @@ -156,7 +156,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_iron", wherein = "default:stone", - clust_scarcity = 9*9*9, + clust_scarcity = 9 * 9 * 9, clust_num_ores = 5, clust_size = 3, y_min = -63, @@ -167,7 +167,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_iron", wherein = "default:stone", - clust_scarcity = 7*7*7, + clust_scarcity = 7 * 7 * 7, clust_num_ores = 5, clust_size = 3, y_min = -31000, @@ -178,7 +178,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_iron", wherein = "default:stone", - clust_scarcity = 24*24*24, + clust_scarcity = 24 * 24 * 24, clust_num_ores = 27, clust_size = 6, y_min = -31000, @@ -189,7 +189,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_mese", wherein = "default:stone", - clust_scarcity = 18*18*18, + clust_scarcity = 18 * 18 * 18, clust_num_ores = 3, clust_size = 2, y_min = -255, @@ -200,7 +200,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_mese", wherein = "default:stone", - clust_scarcity = 14*14*14, + clust_scarcity = 14 * 14 * 14, clust_num_ores = 5, clust_size = 3, y_min = -31000, @@ -211,7 +211,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:mese", wherein = "default:stone", - clust_scarcity = 36*36*36, + clust_scarcity = 36 * 36 * 36, clust_num_ores = 3, clust_size = 2, y_min = -31000, @@ -222,7 +222,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_gold", wherein = "default:stone", - clust_scarcity = 15*15*15, + clust_scarcity = 15 * 15 * 15, clust_num_ores = 3, clust_size = 2, y_min = -255, @@ -233,7 +233,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_gold", wherein = "default:stone", - clust_scarcity = 13*13*13, + clust_scarcity = 13 * 13 * 13, clust_num_ores = 5, clust_size = 3, y_min = -31000, @@ -244,7 +244,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_diamond", wherein = "default:stone", - clust_scarcity = 17*17*17, + clust_scarcity = 17 * 17 * 17, clust_num_ores = 4, clust_size = 3, y_min = -255, @@ -255,7 +255,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_diamond", wherein = "default:stone", - clust_scarcity = 15*15*15, + clust_scarcity = 15 * 15 * 15, clust_num_ores = 4, clust_size = 3, y_min = -31000, @@ -266,7 +266,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_copper", wherein = "default:stone", - clust_scarcity = 12*12*12, + clust_scarcity = 12 * 12 * 12, clust_num_ores = 4, clust_size = 3, y_min = -63, @@ -277,7 +277,7 @@ function default.register_ores() ore_type = "scatter", ore = "default:stone_with_copper", wherein = "default:stone", - clust_scarcity = 9*9*9, + clust_scarcity = 9 * 9 * 9, clust_num_ores = 5, clust_size = 3, y_min = -31000, @@ -346,7 +346,7 @@ function default.register_mgv6_decorations() noise_params = { offset = -0.3, scale = 0.7, - spread = {x=100, y=100, z=100}, + spread = {x = 100, y = 100, z = 100}, seed = 354, octaves = 3, persist = 0.7 @@ -369,7 +369,7 @@ function default.register_mgv6_decorations() noise_params = { offset = -0.012, scale = 0.024, - spread = {x=100, y=100, z=100}, + spread = {x = 100, y = 100, z = 100}, seed = 230, octaves = 3, persist = 0.6 @@ -391,7 +391,7 @@ function default.register_mgv6_decorations() noise_params = { offset = 0, scale = 0.007, - spread = {x=100, y=100, z=100}, + spread = {x = 100, y = 100, z = 100}, seed = 329, octaves = 3, persist = 0.6 @@ -411,7 +411,7 @@ function default.register_mgv6_decorations() noise_params = { offset = 0, scale = 0.035, - spread = {x=100, y=100, z=100}, + spread = {x = 100, y = 100, z = 100}, seed = 329, octaves = 3, persist = 0.6 @@ -439,7 +439,7 @@ function default.register_decorations() noise_params = { offset = -0.02, scale = 0.03, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 436, octaves = 3, persist = 0.6 @@ -457,7 +457,7 @@ function default.register_decorations() noise_params = { offset = -0.02, scale = 0.03, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 19822, octaves = 3, persist = 0.6 @@ -475,7 +475,7 @@ function default.register_decorations() noise_params = { offset = -0.02, scale = 0.03, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 1220999, octaves = 3, persist = 0.6 @@ -493,7 +493,7 @@ function default.register_decorations() noise_params = { offset = -0.02, scale = 0.03, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 36662, octaves = 3, persist = 0.6 @@ -511,7 +511,7 @@ function default.register_decorations() noise_params = { offset = -0.02, scale = 0.03, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 1133, octaves = 3, persist = 0.6 @@ -529,7 +529,7 @@ function default.register_decorations() noise_params = { offset = -0.02, scale = 0.03, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 73133, octaves = 3, persist = 0.6 @@ -549,7 +549,7 @@ function default.register_decorations() noise_params = { offset = 0.04, scale = 0.04, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 66440, octaves = 3, persist = 0.6 @@ -567,7 +567,7 @@ function default.register_decorations() noise_params = { offset = 0.02, scale = 0.06, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 66440, octaves = 3, persist = 0.6 @@ -585,7 +585,7 @@ function default.register_decorations() noise_params = { offset = 0, scale = 0.08, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 66440, octaves = 3, persist = 0.6 @@ -603,7 +603,7 @@ function default.register_decorations() noise_params = { offset = -0.02, scale = 0.10, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 66440, octaves = 3, persist = 0.6 @@ -621,7 +621,7 @@ function default.register_decorations() noise_params = { offset = -0.04, scale = 0.12, - spread = {x=200, y=200, z=200}, + spread = {x = 200, y = 200, z = 200}, seed = 66440, octaves = 3, persist = 0.6 @@ -661,7 +661,7 @@ end -- facedir: 0/1/2/3 (head node facedir value) -- length: length of rainbow tail function default.make_nyancat(pos, facedir, length) - local tailvec = {x=0, y=0, z=0} + local tailvec = {x = 0, y = 0, z = 0} if facedir == 0 then tailvec.z = 1 elseif facedir == 1 then @@ -675,12 +675,12 @@ function default.make_nyancat(pos, facedir, length) facedir = 0 tailvec.z = 1 end - local p = {x=pos.x, y=pos.y, z=pos.z} - minetest.set_node(p, {name="default:nyancat", param2=facedir}) - for i=1,length do + local p = {x = pos.x, y = pos.y, z = pos.z} + minetest.set_node(p, {name = "default:nyancat", param2 = facedir}) + for i = 1, length do p.x = p.x + tailvec.x p.z = p.z + tailvec.z - minetest.set_node(p, {name="default:nyancat_rainbow", param2=facedir}) + minetest.set_node(p, {name = "default:nyancat_rainbow", param2 = facedir}) end end @@ -693,16 +693,16 @@ function default.generate_nyancats(minp, maxp, seed) end local y_min = math.max(minp.y, height_min) local y_max = math.min(maxp.y, height_max) - local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1) + local volume = (maxp.x - minp.x + 1) * (y_max - y_min + 1) * (maxp.z - minp.z + 1) local pr = PseudoRandom(seed + 9324342) - local max_num_nyancats = math.floor(volume / (16*16*16)) - for i=1,max_num_nyancats do + local max_num_nyancats = math.floor(volume / (16 * 16 * 16)) + for i = 1, max_num_nyancats do if pr:next(0, 1000) == 0 then local x0 = pr:next(minp.x, maxp.x) local y0 = pr:next(minp.y, maxp.y) local z0 = pr:next(minp.z, maxp.z) - local p0 = {x=x0, y=y0, z=z0} - default.make_nyancat(p0, pr:next(0,3), pr:next(3,15)) + local p0 = {x = x0, y = y0, z = z0} + default.make_nyancat(p0, pr:next(0, 3), pr:next(3, 15)) end end end