From cae854e5baefd2f73ce1682bd35b77222b701b94 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 29 Dec 2014 11:03:11 +0000 Subject: Updated to work with MT 0.4.11 --- README.md | 11 +- extra.lua | 19 +- fences.lua | 1 + fishing.lua | 2 +- flowers.lua | 12 ++ gates.lua | 4 +- init.lua | 12 +- mapgen_v7l.lua | 559 ------------------------------------------------ mapgen_v7s.lua | 129 ++++++----- schematics/pinetree.mts | Bin 142 -> 146 bytes schematics/rail.mts | Bin 73 -> 0 bytes schematics/railtwo.mts | Bin 76 -> 0 bytes stairs.lua | 7 + water.lua | 20 ++ 14 files changed, 131 insertions(+), 645 deletions(-) delete mode 100644 mapgen_v7l.lua delete mode 100644 schematics/rail.mts delete mode 100644 schematics/railtwo.mts diff --git a/README.md b/README.md index 8dd8ebe..6d22e7e 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,18 @@ Ethereal v7 Mapgen mod for Minetest Changelog: +1.14 + +Changed Ethereal to work with Minetest 0.4.11 update and new mapgen features +Changed Pine tree's to use default pine wood +Added pine wood fence, gate and stairs +Crystal Spikes now re-generate in crystal biomes +Removed layer mapgen, keeping spread as default + + 1.13 -Changed melting feature to work with 0.4.10 dev now that group:hot and group:melt has been removed +Changed melting feature to work with 0.4.11 pre-release now that group:hot and group:melt have been removed 1.12 diff --git a/extra.lua b/extra.lua index 11959aa..c6c6a31 100644 --- a/extra.lua +++ b/extra.lua @@ -167,23 +167,8 @@ minetest.register_craft({ } }) --- Obsidian Brick -minetest.register_node("ethereal:obsidian_brick", { - description = "Obsidian Brick", - inventory_image = minetest.inventorycube("obsidian_brick.png"), - tiles = {"obsidian_brick.png"}, - paramtype = "facedir", - groups = {cracky=1,level=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_craft({ - output = 'ethereal:obsidian_brick 2', - recipe = { - {'default:obsidian', 'default:obsidian'}, - {'default:obsidian', 'default:obsidian'}, - } -}) +-- Obsidian Brick (now in default game so added compatibility for old maps) +minetest.register_alias("ethereal:obsidian_brick", "default:obsidianbrick") -- Quicksand (old style, sinking inside shows black instead of yellow effect, -- works ok with noclip enabled though) diff --git a/fences.lua b/fences.lua index 76e7b44..c67018a 100644 --- a/fences.lua +++ b/fences.lua @@ -11,6 +11,7 @@ fence.type = { {"banana", "Banana Wood", "banana_wood.png", "ethereal:banana_wood"}, {"mushroom", "Mushroom", "mushroom_trunk.png", "ethereal:mushroom_trunk"}, {"acacia", "Acacia Wood", "moretrees_acacia_wood.png","ethereal:acacia_wood"}, + {"pine", "Pine Wood", "default_pinewood.png", "default:pinewood"}, } for _, row in ipairs(fence.type) do diff --git a/fishing.lua b/fishing.lua index 7ac3bdc..b47095d 100644 --- a/fishing.lua +++ b/fishing.lua @@ -57,7 +57,7 @@ minetest.register_craftitem("ethereal:fishing_rod_baited", { inv:add_item("main", {name="ethereal:fish_raw"}) return {name="ethereal:fishing_rod"} else - minetest.chat_send_player(user:get_player_name(), "Your Fish Got Away! Inventory Too Full") + minetest.chat_send_player(user:get_player_name(), "Your Fish Got Away! Inventory Full") end end end diff --git a/flowers.lua b/flowers.lua index 94f20bd..1979599 100644 --- a/flowers.lua +++ b/flowers.lua @@ -16,6 +16,18 @@ minetest.register_abm({ local pos1 = {x=pos.x+4,y=pos.y+2,z=pos.z+4} if #minetest.find_nodes_in_area(pos0, pos1, "group:flora") > 3 then + + local crystal = minetest.find_nodes_in_area(pos0, pos1, {"ethereal:crystalgrass"}) + if #crystal > 6 then + local ppos = crystal[1] + ppos.y = ppos.y - 1 + local nod = minetest.get_node(ppos).name + ppos.y = ppos.y + 1 + if nod == "ethereal:crystal_dirt" then + minetest.set_node(crystal[1], {name="ethereal:crystal_spike"}) + end + end + return end diff --git a/gates.lua b/gates.lua index aab18fa..ecd8238 100644 --- a/gates.lua +++ b/gates.lua @@ -43,7 +43,7 @@ gate.type = { {"banana", "Banana Wood", "banana_wood.png", "ethereal:banana_wood"}, {"mushroom", "Mushroom", "mushroom_trunk.png", "ethereal:mushroom_trunk"}, {"acacia", "Acacia Wood", "moretrees_acacia_wood.png","ethereal:acacia_wood"}, - + {"pine", "Pine Wood", "default_pinewood.png", "default:pinewood"}, } for _, row in ipairs(gate.type) do @@ -87,7 +87,7 @@ minetest.register_node("ethereal:"..name.."gate_open", { }) minetest.register_node("ethereal:"..name.."gate_closed", { - description = name.." fence gate", + description = desc.." Gate", tiles = {texture}, inventory_image = "default_gate_overlay.png^"..texture.."^default_gate_overlay.png^[makealpha:255,126,126", wield_image = "default_gate_overlay.png^"..texture.."^default_gate_overlay.png^[makealpha:255,126,126", diff --git a/init.lua b/init.lua index eeb7c3a..68af676 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,6 @@ --[[ - Minetest Ethereal Mod 1.12 (21st Nov 2014) + Minetest Ethereal Mod 1.14 (29th Dec 2014) Created by ChinChow @@ -9,7 +9,6 @@ ]] ethereal = {} -ethereal.mapstyle = 0 -- 0 for spread-style, 1 for layered-style ethereal.leaftype = 0 -- 0 for 2D plantlike, 1 for 3D allfaces -- Set following to 1 to enable biome or 0 to disable @@ -32,17 +31,12 @@ ethereal.grove = 1 -- Banana groves and ferns ethereal.mushroom = 1 -- Purple grass with giant mushrooms ethereal.desertstone = 1 -- Desert stone with smaller cactus ethereal.quicksand = 1 -- Quicksand banks -ethereal.lake = 1 -- Small sandy lake areas with gravel below +ethereal.lake = 1 -- Small sandy lake areas with gravel below, also used for ocean floor ethereal.plains = 1 -- Dry dirt with scorched trees ethereal.fiery = 1 -- Red grass with lava craters ethereal.sandclay = 1 -- Sand areas with clay underneath -if ethereal.mapstyle == 0 then - dofile(minetest.get_modpath("ethereal").."/mapgen_v7s.lua") -else - dofile(minetest.get_modpath("ethereal").."/mapgen_v7l.lua") -end - +dofile(minetest.get_modpath("ethereal").."/mapgen_v7s.lua") dofile(minetest.get_modpath("ethereal").."/plantlife.lua") dofile(minetest.get_modpath("ethereal").."/mushroom.lua") dofile(minetest.get_modpath("ethereal").."/onion.lua") diff --git a/mapgen_v7l.lua b/mapgen_v7l.lua deleted file mode 100644 index b48e481..0000000 --- a/mapgen_v7l.lua +++ /dev/null @@ -1,559 +0,0 @@ --- Disable Ridges (NOTE: changed sidelen from 16 to 80 in all decoration) -minetest.register_on_mapgen_init(function(mapgen_params) - mapgen_params.flags = "nov7_ridges" - minetest.set_mapgen_params(mapgen_params) -end) - --- Warm Biome -minetest.register_biome({ - name = "clay", - node_top = "default:sand", depth_top = 3, - node_filler = "default:clay", depth_filler = 2, - height_min = 1, height_max = 11, - heat_point = 65.0, humidity_point = 2.0, -}) - -minetest.register_biome({ - name = "lake", - node_top = "default:sand", depth_top = 2, - node_filler = "default:gravel", depth_filler = 1, - node_water = "default:water_source", node_dust_water= "default:water_source", - height_min = -31000, height_max = 3, - heat_point = 50, humidity_point = 40, -}) - -minetest.register_biome({ - name = "quicksand", - node_top = "ethereal:quicksand2", depth_top = 3, - node_filler = "default:gravel", depth_filler = 1, - height_min = 1, height_max = 1, - heat_point = 50, humidity_point = 38, -}) - -minetest.register_biome({ - name = "grass", - node_top = "ethereal:green_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 1, height_max = 20, - heat_point = 10.0, humidity_point = 40.0, -}) - -minetest.register_biome({ - name = "prairie", - node_top = "ethereal:prairie_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 21, height_max = 40, - heat_point = 10.0, humidity_point = 40.0, -}) - -minetest.register_biome({ - name = "cold", - node_top = "ethereal:cold_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 41, height_max = 60, - heat_point = 10.0, humidity_point = 40.0, -}) - -minetest.register_biome({ - name = "snow", - node_top = "default:dirt_with_snow", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 61, height_max = 80, - heat_point = 10.0, humidity_point = 40.0, -}) - -minetest.register_biome({ - name = "alpine", - node_top = "default:snowblock", depth_top = 1, - node_filler = "default:dirt_with_snow", depth_filler = 1, - height_min = 81, height_max = 120, - heat_point = 10.0, humidity_point = 40.0, -}) - --- Cold Biome -minetest.register_biome({ - name = "ice", - node_top = "default:ice", depth_top = 1, - node_filler = "default:water_source", depth_filler = 1, - height_min = 1, height_max = 1, - heat_point = 5.0, humidity_point = 30.0, -}) - -minetest.register_biome({ - name = "gray", - node_top = "ethereal:gray_dirt ", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 1, height_max = 30, - heat_point = 15.0, humidity_point = 30.0, -}) - -minetest.register_biome({ - name = "frost", - node_top = "ethereal:crystal_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 31, height_max = 60, - heat_point = 15.0, humidity_point = 30.0, -}) - -minetest.register_biome({ - name = "cold2", - node_top = "ethereal:cold_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 61, height_max = 90, - heat_point = 15.0, humidity_point = 30.0, -}) - -minetest.register_biome({ - name = "healing", - node_top = "default:dirt_with_snow", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 91, height_max = 120, - heat_point = 15.0, humidity_point = 30.0, -}) - --- Humid Biome -minetest.register_biome({ - name = "jungle", - node_top = "ethereal:jungle_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 1, height_max = 20, - heat_point = 40.0, humidity_point = 60.0, -}) - -minetest.register_biome({ - name = "bamboo", - node_top = "ethereal:bamboo_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 21, height_max = 40, - heat_point = 40.0, humidity_point = 60.0, -}) - -minetest.register_biome({ - name = "mushroom", - node_top = "ethereal:mushroom_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 41, height_max = 60, - heat_point = 40.0, humidity_point = 60.0, -}) - -minetest.register_biome({ - name = "grove", - node_top = "ethereal:grove_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 61, height_max = 100, - heat_point = 40.0, humidity_point = 60.0, -}) - --- Hot Biomes -minetest.register_biome({ - name = "plains", - node_top = "ethereal:dry_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 4, height_max = 36, - heat_point = 59.0, humidity_point = 25.0, -}) - -minetest.register_biome({ - name = "fiery", - node_top = "ethereal:fiery_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3, - height_min = 16, height_max = 35, - heat_point = 60.0, humidity_point = 25.0, -}) - -minetest.register_biome({ - name = "desertstone", - node_top = "default:sandstone", depth_top = 3, - node_filler = "default:desert_stone", depth_filler = 70, - height_min = 36, height_max = 50, - heat_point = 60.0, humidity_point = 25.0, -}) - -minetest.register_biome({ - name = "desert", - node_top = "default:desert_sand", depth_top = 5, - node_filler = "default:desert_stone", depth_filler = 70, - height_min = 51, height_max = 80, - heat_point = 60.0, humidity_point = 25.0, -}) - --- Caves and Mesa -minetest.register_biome({ - name = "mesa", - node_top = "bakedclay:red", depth_top = 1, - node_filler = "bakedclay:orange", depth_filler = 5, - height_min = 1, height_max = 40, - heat_point = 15.0, humidity_point = 20.0, -}) - -minetest.register_biome({ - name = "caves", - node_top = "default:desert_stone", depth_top = 3, - node_filler = "air", depth_filler = 8, - height_min = 41, height_max = 60, - heat_point = 15.0, humidity_point = 20.0, -}) - --- Schematics -local path = minetest.get_modpath("ethereal").."/schematics/" - -minetest.register_decoration({ -- Acacia Tree - deco_type = "schematic", - place_on = {"default:desert_sand"}, - sidelen = 16, - fill_ratio = 0.004, - biomes = {"desert"}, - schematic = path.."acaciatree.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Redwood Tree - deco_type = "schematic", - place_on = {"bakedclay:red","bakedclay:orange"}, - sidelen = 80, - fill_ratio = 0.025, - biomes = {"mesa"}, - schematic = path.."redwood.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Pine Tree - deco_type = "schematic", - place_on = {"ethereal:cold_dirt", "default:dirt_with_snow"}, - sidelen = 80, - fill_ratio = 0.025, - biomes = {"snow", "cold", "cold2"}, - schematic = path.."pinetree.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Apple Tree - deco_type = "schematic", - place_on = "ethereal:green_dirt", - sidelen = 80, - fill_ratio = 0.030, - biomes = {"grass"}, - schematic = path.."tree.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Orange Tree - deco_type = "schematic", - place_on = {"ethereal:prairie_dirt"}, - sidelen = 80, - fill_ratio = 0.005, - biomes = {"prairie"}, - schematic = path.."orangetree.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Big Old Tree - deco_type = "schematic", - place_on = "ethereal:green_dirt", - sidelen = 80, - fill_ratio = 0.010, - biomes = {"grass"}, - schematic = path.."bigtree.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Willow Tree - deco_type = "schematic", - place_on = "ethereal:gray_dirt", - sidelen = 80, - fill_ratio = 0.025, - biomes = {"gray"}, - schematic = path.."willow.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Healing Tree - deco_type = "schematic", - place_on = "default:dirt_with_snow", - sidelen = 80, - fill_ratio = 0.04, - biomes = {"healing"}, - schematic = path.."yellowtree.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Frost Tree - deco_type = "schematic", - place_on = "ethereal:crystal_dirt", - sidelen = 80, - fill_ratio = 0.010, - biomes = {"frost"}, - schematic = path.."frosttrees.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Jungle Tree - deco_type = "schematic", - place_on = "ethereal:jungle_dirt", - sidelen = 80, - fill_ratio = 0.3, - biomes = {"jungle"}, - schematic = path.."jungletree.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Banana Tree - deco_type = "schematic", - place_on = "ethereal:grove_dirt", - sidelen = 80, - fill_ratio = 0.015, - biomes = {"grove"}, - schematic = path.."bananatree.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Giant Mushroom - deco_type = "schematic", - place_on = "ethereal:mushroom_dirt", - sidelen = 80, - fill_ratio = 0.070, - biomes = {"mushroom"}, - schematic = path.."mushroomone.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Small Lava Crater - deco_type = "schematic", - place_on = "ethereal:fiery_dirt", - sidelen = 80, - fill_ratio = 0.012, - biomes = {"fiery"}, - schematic = path.."volcanom.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ -- Large Lava Crater - deco_type = "schematic", - place_on = "ethereal:fiery_dirt", - sidelen = 80, - fill_ratio = 0.010, - biomes = {"fiery"}, - schematic = path.."volcanol.mts", - flags = "place_center_x, place_center_z", --- replacements = {{"default:stone", "default:desert_stone"}}, -}) - -minetest.register_decoration({ -- Scorched Tree - deco_type = "simple", - place_on = "ethereal:dry_dirt", - sidelen = 80, - fill_ratio = 0.006, - biomes = {"plains", "plains2"}, - decoration = "ethereal:scorched_tree", - height_max = 6, -}) - --- Decoration -minetest.register_decoration({ -- Bamboo Stalks - deco_type = "simple", - place_on = "ethereal:bamboo_dirt", - sidelen = 80, - fill_ratio = 0.055, - biomes = {"bamboo"}, - decoration = "ethereal:bamboo", - height_max = 5, -}) - -minetest.register_decoration({ -- Bamboo Sprouts and Grass for filler - deco_type = "simple", - place_on = "ethereal:bamboo_dirt", - sidelen = 80, - fill_ratio = 0.25, - biomes = {"bamboo"}, - decoration = {"ethereal:bamboo_sprout", "default:grass_2", "default:grass_3"}, -}) - -minetest.register_decoration({ -- Dry Shrub - deco_type = "simple", - place_on = {"default:sand", "bakedclay:red"}, - sidelen = 80, - fill_ratio = 0.015, - biomes = {"lake", "clay", "mesa"}, - decoration = "default:dry_shrub", -}) - -minetest.register_decoration({ -- Grass - deco_type = "simple", - place_on = {"ethereal:green_dirt", "ethereal:prairie_dirt", "ethereal:jungle_dirt", "ethereal:grove_dirt"}, - sidelen = 80, - fill_ratio = 0.40, - biomes = {"grass", "prairie", "cold", "cold2", "jungle", "grove"}, - decoration = "default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5", -}) - -minetest.register_decoration({ -- Flowers - deco_type = "simple", - place_on = "ethereal:green_dirt", - sidelen = 80, - fill_ratio = 0.030, - biomes = {"grass"}, - decoration = {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola"}, -}) - -minetest.register_decoration({ -- Flowers & Strawberry - deco_type = "simple", - place_on = "ethereal:prairie_dirt", - sidelen = 80, - fill_ratio = 0.050, - biomes = {"prairie"}, - decoration = {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}, -}) - -minetest.register_decoration({ -- Wild Onions - deco_type = "simple", - place_on = {"ethereal:green_dirt", "ethereal:prairie_dirt"}, - sidelen = 80, - fill_ratio = 0.25, - biomes = {"grass", "prairie"}, - decoration = "ethereal:onion_4", -}) - -minetest.register_decoration({ -- Snowy Grass - deco_type = "simple", - place_on = {"ethereal:cold_dirt", "default:dirt_with_snow", "ethereal:gray_dirt_top"}, - sidelen = 80, - fill_ratio = 0.05, - biomes = {"cold", "cold2", "snow", "gray"}, - decoration = "ethereal:snowygrass", -}) - -minetest.register_decoration({ -- Snow - deco_type = "simple", - place_on = {"ethereal:cold_dirt", "default:dirt_with_snow", "default:snowblock"}, - sidelen = 80, - fill_ratio = 0.80, - biomes = {"cold", "cold2", "snow", "alpine"}, - decoration = "default:snow", -}) - -minetest.register_decoration({ -- Crystal Spike & Grass - deco_type = "simple", - place_on = "ethereal:crystal_dirt", - sidelen = 80, - fill_ratio = 0.02, - biomes = {"frost"}, - decoration = {"ethereal:crystal_spike", "ethereal:crystalgrass"}, -}) - -minetest.register_decoration({ -- Wild Mushroom - deco_type = "simple", - place_on = "ethereal:mushroom_dirt", - sidelen = 80, - fill_ratio = 0.015, - biomes = {"mushroom"}, - decoration = "ethereal:mushroom_plant", -}) - -minetest.register_decoration({ -- Jungle Grass - deco_type = "simple", - place_on = {"ethereal:jungle_dirt"}, - sidelen = 80, - fill_ratio = 0.18, - biomes = {"jungle"}, - decoration = "default:junglegrass", -}) - -minetest.register_decoration({ -- Ferns - deco_type = "simple", - place_on = "ethereal:grove_dirt", - sidelen = 80, - fill_ratio = 0.20, - biomes = {"grove"}, - decoration = "ethereal:fern", -}) - -minetest.register_decoration({ -- Red Shrub - deco_type = "simple", - place_on = "ethereal:fiery_dirt", - sidelen = 80, - fill_ratio = 0.20, - biomes = {"fiery"}, - decoration = "ethereal:dry_shrub", -}) - -minetest.register_decoration({ -- Cactus - deco_type = "simple", - place_on = "default:sandstone", - sidelen = 80, - fill_ratio = 0.010, - biomes = {"desertstone"}, - decoration = "default:cactus", - height_max = 3, -}) - -minetest.register_decoration({ -- Papyrus - deco_type = "simple", - place_on = {"ethereal:green_dirt", "ethereal:jungle_dirt"}, - sidelen = 16, - fill_ratio = 0.1, - biomes = {"grass", "jungle"}, - decoration = "default:papyrus", - height_max = 4, - spawn_by = "default:water_source", - num_spawn_by = 1, -}) - --- Palm Tree on Sand near Water -minetest.register_on_generated(function(minp, maxp, seed) - if maxp.y >= 2 and minp.y <= 0 then - local perlin1 = minetest.get_perlin(354, 3, 0.7, 100) - -- Assume X and Z lengths are equal - local divlen = 8 - local divs = (maxp.x-minp.x)/divlen+1; - for divx=0,divs-1 do - for divz=0,divs-1 do - local x0 = minp.x + math.floor((divx+0)*divlen) - local z0 = minp.z + math.floor((divz+0)*divlen) - local x1 = minp.x + math.floor((divx+1)*divlen) - local z1 = minp.z + math.floor((divz+1)*divlen) - -- Find random positions for palm based on this random - local pr = PseudoRandom(seed+1) - local x = pr:next(x0, x1) - local z = pr:next(z0, z1) - if minetest.get_node({x=x,y=1,z=z}).name == "default:sand" and - minetest.find_node_near({x=x,y=1,z=z}, 1, "default:water_source") then - minetest.place_schematic({x=x-4,y=2,z=z-4}, path.."palmtree.mts", 0, "", 0) - end - end - end - end -end) - --- Farming Redo Plants -if minetest.get_modpath("farming") and farming.mod == "redo" then - -minetest.register_decoration({ -- Potato - deco_type = "simple", - place_on = {"ethereal:jungle_dirt"}, - sidelen = 80, - fill_ratio = 0.045, - biomes = {"jungle"}, - decoration = "farming:potato_3", -}) - -minetest.register_decoration({ -- Carrot, Cucumber, Potato, Tomato, Corn, Coffee, Raspberry, Rhubarb - deco_type = "simple", - place_on = {"ethereal:green_dirt", "ethereal:prairie_dirt"}, - sidelen = 80, - fill_ratio = 0.05, - biomes = {"grass", "prairie"}, - decoration = {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, -}) - -minetest.register_decoration({ -- Melon, Pumpkin - deco_type = "simple", - place_on = {"default:green_dirt", "ethereal:jungle_dirt"}, - sidelen = 80, - fill_ratio = 0.015, - biomes = {"grass", "jungle"}, - decoration = {"farming:melon_8", "farming:pumpkin_8"}, - spawn_by = "default:water_source", - num_spawn_by = 1, -}) - -end diff --git a/mapgen_v7s.lua b/mapgen_v7s.lua index 128b387..9db06cf 100644 --- a/mapgen_v7s.lua +++ b/mapgen_v7s.lua @@ -1,3 +1,8 @@ +-- Clear default mapgen definitions +minetest.clear_registered_biomes() +minetest.clear_registered_decorations() +--minetest.clear_registered_ores() + -- Biomes if ethereal.bamboo == 1 then minetest.register_biome({ @@ -7,6 +12,7 @@ minetest.register_biome({ height_min = 1, height_max = 71, heat_point = 45.0, humidity_point = 75.0, }) +print ("Ethereal Bamboo Enabled") end if ethereal.mesa == 1 then @@ -17,6 +23,7 @@ minetest.register_biome({ height_min = 2, height_max = 71, heat_point = 25.0, humidity_point = 28.0, }) +print ("Ethereal Mesa Enabled") end if ethereal.alpine == 1 then @@ -27,6 +34,7 @@ minetest.register_biome({ height_min = 40, height_max = 90, heat_point = 10.0, humidity_point = 40.0, }) +print ("Ethereal Alpine Enabled") end if ethereal.healing == 1 then @@ -37,6 +45,7 @@ minetest.register_biome({ height_min = 75, height_max = 140, heat_point = 10.0, humidity_point = 40.0, }) +print ("Ethereal Healing Enabled") end if ethereal.snowy == 1 then @@ -47,6 +56,7 @@ minetest.register_biome({ height_min = 5, height_max = 40, heat_point = 10.0, humidity_point = 40.0, }) +print ("Ethereal Snowy Enabled") end if ethereal.frost == 1 then @@ -57,6 +67,7 @@ minetest.register_biome({ height_min = 1, height_max = 71, heat_point = 10.0, humidity_point = 40.0, }) +print ("Ethereal Frost Enabled") end if ethereal.grassy == 1 then @@ -67,6 +78,7 @@ minetest.register_biome({ height_min = 1, height_max = 91, heat_point = 13.0, humidity_point = 40.0, }) +print ("Ethereal Grassy Enabled") end if ethereal.caves == 1 then @@ -77,6 +89,7 @@ minetest.register_biome({ height_min = 4, height_max = 41, heat_point = 15.0, humidity_point = 25.0, }) +print ("Ethereal Caves Enabled") end if ethereal.grayness == 1 then @@ -87,6 +100,7 @@ minetest.register_biome({ height_min = 1, height_max = 41, heat_point = 15.0, humidity_point = 30.0, }) +print ("Ethereal Grayness Enabled") end if ethereal.grassytwo == 1 then @@ -97,6 +111,7 @@ minetest.register_biome({ height_min = 1, height_max = 91, heat_point = 15.0, humidity_point = 40.0, }) +print ("Ethereal GrassyTwo Enabled") end if ethereal.prairie == 1 then @@ -107,6 +122,7 @@ minetest.register_biome({ height_min = 3, height_max = 26, heat_point = 20.0, humidity_point = 40.0, }) +print ("Ethereal Prairie Enabled") end if ethereal.jumble == 1 then @@ -117,6 +133,7 @@ minetest.register_biome({ height_min = 1, height_max = 71, heat_point = 25.0, humidity_point = 50.0, }) +print ("Ethereal Jumble Enabled") end if ethereal.junglee == 1 then @@ -127,6 +144,7 @@ minetest.register_biome({ height_min = 1, height_max = 71, heat_point = 30.0, humidity_point = 60.0, }) +print ("Ethereal Junglee Enabled") end if ethereal.desert ==1 then @@ -137,6 +155,7 @@ minetest.register_biome({ height_min = 3, height_max = 23, heat_point = 35.0, humidity_point = 20.0, }) +print ("Ethereal Desert Enabled") end if ethereal.grove == 1 then @@ -147,6 +166,7 @@ minetest.register_biome({ height_min = 3, height_max = 23, heat_point = 40.0, humidity_point = 60.0, }) +print ("Ethereal Grove Enabled") end if ethereal.mushroom == 1 then @@ -157,6 +177,7 @@ minetest.register_biome({ height_min = 1, height_max = 50, heat_point = 45.0, humidity_point = 65.0, }) +print ("Ethereal Mushroom Enabled") end if ethereal.desertstone == 1 then @@ -167,6 +188,7 @@ minetest.register_biome({ height_min = 3, height_max = 23, heat_point = 50.0, humidity_point = 20.0, }) +print ("Ethereal DesertStone Enabled") end if ethereal.quicksand == 1 then @@ -177,6 +199,7 @@ minetest.register_biome({ height_min = 1, height_max = 1, heat_point = 50, humidity_point = 38, }) +print ("Ethereal Quicksand Enabled") end if ethereal.lake == 1 then @@ -188,6 +211,7 @@ minetest.register_biome({ height_min = -31000, height_max = 3, heat_point = 50, humidity_point = 40, }) +print ("Ethereal Lake Enabled") end if ethereal.plains == 1 then @@ -198,6 +222,7 @@ minetest.register_biome({ height_min = 3, height_max = 61, heat_point = 55.0, humidity_point = 25.0, }) +print ("Ethereal Plains Enabled") end if ethereal.fiery == 1 then @@ -208,6 +233,7 @@ minetest.register_biome({ height_min = 5, height_max = 65, heat_point = 80.0, humidity_point = 10.0, }) +print ("Ethereal Fiery Enabled") end if ethereal.sandclay == 1 then @@ -218,6 +244,7 @@ minetest.register_biome({ height_min = 1, height_max = 11, heat_point = 65.0, humidity_point = 2.0, }) +print ("Ethereal SandClay Enabled") end -- Schematics Decoration @@ -226,7 +253,7 @@ local path = minetest.get_modpath("ethereal").."/schematics/" minetest.register_decoration({ -- Redwood Tree deco_type = "schematic", place_on = {"bakedclay:red","bakedclay:orange"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.01, -- was 0.025 biomes = {"mesa"}, schematic = path.."redwood.mts", @@ -236,7 +263,7 @@ minetest.register_decoration({ -- Redwood Tree minetest.register_decoration({ -- Banana Tree deco_type = "schematic", place_on = "ethereal:grove_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.015, biomes = {"grove"}, schematic = path.."bananatree.mts", @@ -246,7 +273,7 @@ minetest.register_decoration({ -- Banana Tree minetest.register_decoration({ -- Healing Tree deco_type = "schematic", place_on = "default:dirt_with_snow", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.04, biomes = {"healing"}, schematic = path.."yellowtree.mts", @@ -256,7 +283,7 @@ minetest.register_decoration({ -- Healing Tree minetest.register_decoration({ -- Frost Tree deco_type = "schematic", place_on = "ethereal:crystal_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.010, biomes = {"frost"}, schematic = path.."frosttrees.mts", @@ -266,7 +293,7 @@ minetest.register_decoration({ -- Frost Tree minetest.register_decoration({ -- Giant Mushroom deco_type = "schematic", place_on = "ethereal:mushroom_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.070, biomes = {"mushroom"}, schematic = path.."mushroomone.mts", @@ -276,7 +303,7 @@ minetest.register_decoration({ -- Giant Mushroom minetest.register_decoration({ -- Small Lava Crater deco_type = "schematic", place_on = "ethereal:fiery_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.012, biomes = {"fiery"}, schematic = path.."volcanom.mts", @@ -286,7 +313,7 @@ minetest.register_decoration({ -- Small Lava Crater minetest.register_decoration({ -- Large Lava Crater deco_type = "schematic", place_on = "ethereal:fiery_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.010, biomes = {"fiery"}, schematic = path.."volcanol.mts", @@ -297,7 +324,7 @@ minetest.register_decoration({ -- Large Lava Crater minetest.register_decoration({ -- Jungle Tree deco_type = "schematic", place_on = "ethereal:jungle_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.3, -- was 0.250 biomes = {"junglee"}, schematic = path.."jungletree.mts", @@ -307,7 +334,7 @@ minetest.register_decoration({ -- Jungle Tree minetest.register_decoration({ -- Willow Tree deco_type = "schematic", place_on = "ethereal:gray_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.025, biomes = {"grayness"}, schematic = path.."willow.mts", @@ -317,7 +344,7 @@ minetest.register_decoration({ -- Willow Tree minetest.register_decoration({ -- Pine Tree deco_type = "schematic", place_on = {"ethereal:cold_dirt", "default:dirt_with_snow"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.025, biomes = {"snowy", "alpine"}, schematic = path.."pinetree.mts", @@ -327,7 +354,7 @@ minetest.register_decoration({ -- Pine Tree minetest.register_decoration({ -- Apple Tree deco_type = "schematic", place_on = "ethereal:green_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.030, biomes = {"grassy, jumble"}, schematic = path.."tree.mts", @@ -337,7 +364,7 @@ minetest.register_decoration({ -- Apple Tree minetest.register_decoration({ deco_type = "schematic", place_on = {"ethereal:green_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.005, biomes = {"grassytwo"}, schematic = path.."tree.mts", @@ -347,7 +374,7 @@ minetest.register_decoration({ minetest.register_decoration({ -- Orange Tree deco_type = "schematic", place_on = {"ethereal:prairie_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.005, biomes = {"prairie"}, schematic = path.."orangetree.mts", @@ -357,7 +384,7 @@ minetest.register_decoration({ -- Orange Tree minetest.register_decoration({ -- Acacia Tree deco_type = "schematic", place_on = {"default:desert_sand"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.004, biomes = {"desert"}, schematic = path.."acaciatree.mts", @@ -367,38 +394,18 @@ minetest.register_decoration({ -- Acacia Tree minetest.register_decoration({ -- Big Old Tree deco_type = "schematic", place_on = "ethereal:green_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.010, biomes = {"grassytwo"}, schematic = path.."bigtree.mts", flags = "place_center_x, place_center_z", }) -minetest.register_decoration({ -- Old Rail Section - deco_type = "schematic", - place_on = "default:sandstone", - sidelen = 16, - fill_ratio = 0.002, - biomes = {"desertsandstone"}, - schematic = path.."rail.mts", - flags = "place_center_x, place_center_z", -}) - -minetest.register_decoration({ - deco_type = "schematic", - place_on = "default:sandstone", - sidelen = 16, - fill_ratio = 0.002, - biomes = {"desertsandstone"}, - schematic = path.."railtwo.mts", - flags = "place_center_x, place_center_z", -}) - -- Simple Decoration minetest.register_decoration({ -- Scorched Tree deco_type = "simple", place_on = "ethereal:dry_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.006, biomes = {"plains"}, decoration = "ethereal:scorched_tree", @@ -408,7 +415,7 @@ minetest.register_decoration({ -- Scorched Tree minetest.register_decoration({ -- Bamboo Stalks deco_type = "simple", place_on = "ethereal:bamboo_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.055, biomes = {"bamboo"}, decoration = "ethereal:bamboo", @@ -418,7 +425,7 @@ minetest.register_decoration({ -- Bamboo Stalks minetest.register_decoration({ -- Bamboo Sprouts & Grass deco_type = "simple", place_on = "ethereal:bamboo_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.25, biomes = {"bamboo"}, decoration = {"ethereal:bamboo_sprout", "default:grass_2", "default:grass_3"}, @@ -427,7 +434,7 @@ minetest.register_decoration({ -- Bamboo Sprouts & Grass minetest.register_decoration({ -- Dry Shrub deco_type = "simple", place_on = {"ethereal:dry_dirt", "default:sand", "default:desert_sand", "sandstone", "bakedclay:red"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.015, biomes = {"plains", "lake", "desert", "desertstone", "mesa"}, decoration = "default:dry_shrub", @@ -436,7 +443,7 @@ minetest.register_decoration({ -- Dry Shrub minetest.register_decoration({ -- Flowers & Strawberry deco_type = "simple", place_on = "ethereal:green_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.030, biomes = {"grassy", "grassy", "grassytwo"}, decoration = {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}, @@ -445,7 +452,7 @@ minetest.register_decoration({ -- Flowers & Strawberry minetest.register_decoration({ -- Prairie Flowers & Strawberry deco_type = "simple", place_on = "ethereal:prairie_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.050, biomes = {"prairie"}, decoration = {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}, @@ -454,7 +461,7 @@ minetest.register_decoration({ -- Prairie Flowers & Strawberry minetest.register_decoration({ -- Crystal Spike & Crystal Grass deco_type = "simple", place_on = "ethereal:crystal_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.02, biomes = {"frost"}, decoration = {"ethereal:crystal_spike", "ethereal:crystalgrass"}, @@ -463,7 +470,7 @@ minetest.register_decoration({ -- Crystal Spike & Crystal Grass minetest.register_decoration({ -- Red Shrub deco_type = "simple", place_on = "ethereal:fiery_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.20, biomes = {"fiery"}, decoration = "ethereal:dry_shrub", @@ -472,7 +479,7 @@ minetest.register_decoration({ -- Red Shrub minetest.register_decoration({ -- Snowy Grass deco_type = "simple", place_on = {"ethereal:gray_dirt", "ethereal:cold_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.05, biomes = {"grayness", "snowy"}, decoration = "ethereal:snowygrass", @@ -481,17 +488,27 @@ minetest.register_decoration({ -- Snowy Grass minetest.register_decoration({ -- Cactus deco_type = "simple", place_on = "default:sandstone", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.010, biomes = {"desertstone"}, decoration = "default:cactus", height_max = 3, }) +minetest.register_decoration({ -- Cactus + deco_type = "simple", + place_on = "default:desert_sand", + sidelen = 80, -- was 16 + fill_ratio = 0.010, + biomes = {"desert"}, + decoration = "default:cactus", + height_max = 4, +}) + minetest.register_decoration({ -- Wild Mushroom deco_type = "simple", place_on = "ethereal:mushroom_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.015, biomes = {"mushroom"}, decoration = "ethereal:mushroom_plant", @@ -500,7 +517,7 @@ minetest.register_decoration({ -- Wild Mushroom minetest.register_decoration({ -- Jungle Grass deco_type = "simple", place_on = {"ethereal:jungle_dirt", "ethereal:green_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.18, biomes = {"junglee", "jumble"}, decoration = "default:junglegrass", @@ -509,7 +526,7 @@ minetest.register_decoration({ -- Jungle Grass minetest.register_decoration({ -- Grass deco_type = "simple", place_on = {"ethereal:green_dirt_top", "ethereal:jungle_dirt", "ethereal:prairie_dirt", "ethereal:grove_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.40, -- was 0.50 biomes = {"grassy", "grassytwo", "jumble", "junglee", "prairie", "grove"}, decoration = "default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5", @@ -518,7 +535,7 @@ minetest.register_decoration({ -- Grass minetest.register_decoration({ -- Ferns deco_type = "simple", place_on = "ethereal:grove_dirt", - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.20, biomes = {"grove"}, decoration = "ethereal:fern", @@ -527,7 +544,7 @@ minetest.register_decoration({ -- Ferns minetest.register_decoration({ -- Snow deco_type = "simple", place_on = {"ethereal:cold_dirt", "default:dirt_with_snow"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.80, biomes = {"snowy", "alpine"}, decoration = "default:snow", @@ -536,7 +553,7 @@ minetest.register_decoration({ -- Snow minetest.register_decoration({ -- Wild Onion deco_type = "simple", place_on = {"ethereal:green_dirt", "ethereal:prairie_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.25, -- was 0.35 biomes = {"grassy", "grassytwo", "jumble", "prairie"}, decoration = "ethereal:onion_4", @@ -545,7 +562,7 @@ minetest.register_decoration({ -- Wild Onion minetest.register_decoration({ -- Papyrus deco_type = "simple", place_on = {"ethereal:green_dirt", "ethereal:jungle_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.1, biomes = {"grassy", "junglee"}, decoration = "default:papyrus", @@ -587,8 +604,8 @@ if minetest.get_modpath("farming") and farming.mod == "redo" then minetest.register_decoration({ -- Potato deco_type = "simple", place_on = {"ethereal:jungle_dirt"}, - sidelen = 16, - fill_ratio = 0.045, + sidelen = 80, -- was 16 + fill_ratio = 0.035, biomes = {"junglee"}, decoration = "farming:potato_3", }) @@ -596,7 +613,7 @@ minetest.register_decoration({ -- Potato minetest.register_decoration({ -- Carrot, Cucumber, Potato, Tomato, Corn, Coffee, Raspberry, Rhubarb deco_type = "simple", place_on = {"ethereal:green_dirt", "ethereal:prairie_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.05, biomes = {"grassy", "grassytwo", "prairie", "jumble"}, decoration = {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, @@ -605,7 +622,7 @@ minetest.register_decoration({ -- Carrot, Cucumber, Potato, Tomato, Corn, C minetest.register_decoration({ -- Melon, Pumpkin deco_type = "simple", place_on = {"ethereal:green_dirt", "ethereal:jungle_dirt"}, - sidelen = 16, + sidelen = 80, -- was 16 fill_ratio = 0.015, biomes = {"grassy", "grassytwo", "junglee", "jumble"}, decoration = {"farming:melon_8", "farming:pumpkin_8"}, diff --git a/schematics/pinetree.mts b/schematics/pinetree.mts index d25b903..edd9b1d 100644 Binary files a/schematics/pinetree.mts and b/schematics/pinetree.mts differ diff --git a/schematics/rail.mts b/schematics/rail.mts deleted file mode 100644 index 7e6f65b..0000000 Binary files a/schematics/rail.mts and /dev/null differ diff --git a/schematics/railtwo.mts b/schematics/railtwo.mts deleted file mode 100644 index c4351d2..0000000 Binary files a/schematics/railtwo.mts and /dev/null differ diff --git a/stairs.lua b/stairs.lua index b086658..49ebc3f 100644 --- a/stairs.lua +++ b/stairs.lua @@ -80,6 +80,13 @@ stairs.register_stair_and_slab("willow_wood", "ethereal:willow_wood", "Willow Wood Slab", default.node_sound_wood_defaults()) +stairs.register_stair_and_slab("pine_wood", "default:pinewood", + {choppy=2,oddly_breakable_by_hand=1,flammable=3, not_in_craft_guide=1}, + {"default_pinewood.png"}, + "Pine Wood Stair", + "Pine Wood Slab", + default.node_sound_wood_defaults()) + stairs.register_stair_and_slab("redwood_wood", "ethereal:redwood_wood", {choppy=2,oddly_breakable_by_hand=1,flammable=3, not_in_craft_guide=1}, {"redwood_wood.png"}, diff --git a/water.lua b/water.lua index 7de32ec..3ba84ef 100644 --- a/water.lua +++ b/water.lua @@ -107,3 +107,23 @@ minetest.register_abm({ minetest.add_node(pos,{name="default:dirt"}) end, }) +--[[ +-- If water next to mushroom pore then remove water +minetest.register_abm({ + nodenames = {"ethereal:mushroom_pore"}, + neighbors = {"group:water"}, + interval = 2, + chance = 1, + action = function(pos, node) + local pos0 = {x=pos.x-1,y=pos.y-1,z=pos.z-1} + local pos1 = {x=pos.x+1,y=pos.y+1,z=pos.z+1} + + local water = minetest.env:find_nodes_in_area(pos0, pos1, "group:water") + if water then + for n = 1, #water do + minetest.env:set_node(water[n], {name="air"}) + end + end + end, +}) +]] -- cgit v1.2.3