From 75b891a6a569dc2125cbf2ef0c1e7d8d3c091384 Mon Sep 17 00:00:00 2001 From: thunderdog1138 Date: Thu, 23 Jul 2020 00:23:56 +0000 Subject: [PATCH] Update 'mods/farming/mapgen.lua' --- mods/farming/mapgen.lua | 146 +++------------------------------------- 1 file changed, 10 insertions(+), 136 deletions(-) diff --git a/mods/farming/mapgen.lua b/mods/farming/mapgen.lua index ca7048df..16f848ff 100644 --- a/mods/farming/mapgen.lua +++ b/mods/farming/mapgen.lua @@ -12,7 +12,7 @@ local function register_plant(name, min, max, spawnon, spawnby, num, rarety) minetest.register_decoration({ deco_type = "simple", - place_on = spawnon or {"default:dirt_with_grass"}, + place_on = spawnon or {"ethereal:grass_dirt"}, sidelen = 16, noise_params = { offset = 0, @@ -32,138 +32,12 @@ end -- add crops to mapgen -register_plant("potato_3", 15, 40, nil, "", -1, farming.potato) -register_plant("tomato_7", 5, 20, nil, "", -1, farming.tomato) -register_plant("corn_7", 12, 22, nil, "", -1, farming.corn) -register_plant("coffee_5", 20, 45, {"default:dirt_with_dry_grass", - "default:dirt_with_rainforest_litter", - "default:dry_dirt_with_dry_grass"}, "", -1, farming.coffee) -register_plant("raspberry_4", 3, 10, nil, "", -1, farming.raspberry) -register_plant("rhubarb_3", 3, 15, nil, "", -1, farming.rhubarb) -register_plant("blueberry_4", 3, 10, nil, "", -1, farming.blueberry) -register_plant("beanbush", 18, 35, nil, "", -1, farming.beans) -register_plant("grapebush", 25, 45, nil, "", -1, farming.grapes) -register_plant("onion_5", 5, 22, nil, "", -1, farming.onion) -register_plant("garlic_5", 3, 30, nil, "group:tree", 1, farming.garlic) -register_plant("pea_5", 25, 50, nil, "", -1, farming.peas) -register_plant("beetroot_5", 1, 15, nil, "", -1, farming.beetroot) -register_plant("mint_4", 1, 75, {"default:dirt_with_grass", -"default:dirt_with_coniferous_litter"}, "group:water", 1, farming.mint) -register_plant("cabbage_6", 2, 10, nil, "", -1, farming.cabbage) - - -if minetest.get_mapgen_setting("mg_name") == "v6" then - - register_plant("carrot_8", 1, 30, nil, "group:water", 1, farming.carrot) - register_plant("cucumber_4", 1, 20, nil, "group:water", 1, farming.cucumber) - register_plant("melon_8", 1, 20, nil, "group:water", 1, farming.melon) - register_plant("pumpkin_8", 1, 20, nil, "group:water", 1, farming.pumpkin) -else - -- v7 maps have a beach so plants growing near water is limited to 6 high - register_plant("carrot_8", 1, 15, nil, "", -1, farming.carrot) - register_plant("cucumber_4", 1, 10, nil, "", -1, farming.cucumber) - register_plant("melon_8", 1, 6, {"default:dirt_with_dry_grass", - "default:dirt_with_rainforest_litter"}, "", -1, farming.melon) - register_plant("pumpkin_8", 1, 6, nil, "", -1, farming.pumpkin) -end - -if farming.hemp then -minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.hemp) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 420, - octaves = 3, - persist = 0.6 - }, - y_min = 3, - y_max = 45, - decoration = "farming:hemp_7", - spawn_by = "group:tree", - num_spawn_by = 1 -}) -end - -if farming.chili then -minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.chili) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 760, - octaves = 3, - persist = 0.6 - }, - y_min = 5, - y_max = 35, - decoration = {"farming:chili_8"}, - spawn_by = "group:tree", - num_spawn_by = 1 -}) -end - -if farming.pepper then -minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_rainforest_litter"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.pepper) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 933, - octaves = 3, - persist = 0.6 - }, - y_min = 5, - y_max = 35, - decoration = {"farming:pepper_5"}, - spawn_by = "group:tree", - num_spawn_by = 1 -}) -end - -if farming.pineapple then -minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.pineapple) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 917, - octaves = 3, - persist = 0.6 - }, - y_min = 18, - y_max = 30, - decoration = {"farming:pineapple_8"} -}) -end - -minetest.register_decoration({ - name = "farming:cotton_wild", - deco_type = "simple", - place_on = {"default:dry_dirt_with_dry_grass"}, - sidelen = 16, - noise_params = { - offset = -0.1, - scale = 0.1, - spread = {x = 50, y = 50, z = 50}, - seed = 4242, - octaves = 3, - persist = 0.7 - }, - biomes = {"savanna"}, - y_max = 31000, - y_min = 1, - decoration = "farming:cotton_wild" -}) +register_plant("calarantrum_4", 15, 40, nil, "", -1, farming.calarantrum) +register_plant("celonslay_4", 5, 20, nil, "", -1, farming.celonslay) +register_plant("rishi_corn_8", 12, 22, nil, "", -1, farming.rishi_corn) +register_plant("groundapple_6", 3, 10, nil, "", -1, farming.groundapple) +register_plant("doll_gourd_5", 3, 15, nil, "", -1, farming.doll_gourd) +register_plant("blumfruit_4", 3, 10, nil, "", -1, farming.blumfruit) +register_plant("emerald_grape_bush", 25, 45, nil, "", -1, farming.grapes) +register_plant("taba_4", 5, 22, nil, "", -1, farming.taba) +register_plant("celto_4", 1, 15, nil, "", -1, farming.celto) \ No newline at end of file