tons of small changes, 2 new biomes and lots of swamp stuff

minetest.conf

@@ -71,9 +71,9 @@ mg_flags = trees, caves
 mgv6_spflags = nojungles
 mgv6_freq_desert = 0.65
 mgv6_freq_beach = -0.04
-water_level = 0
+water_level = 1
 
 # i don't really know what these numbers change, but whatever :)
 # offset, scale, (spread factors), seed offset, number of octaves, persistence, lacunarity.
 mg_biome_np_humidity = 50, 20, (600, 850, 600), 31478, 2, 0.5, 2.0
-mgv7_np_terrain_base = 10, 30, (750, 1500, 750), 88533, 6, 0.65, 2, 2
+mgv7_np_terrain_base = 10, 25, (750, 1500, 750), 88533, 5, 0.65, 2, 2

mods/default/init.lua

@@ -5,6 +5,9 @@
 
 default = {}
 
+default.SWAMP_WATER_ALPHA = 220
+default.SWAMP_WATER_VISC = 4
+
 default.RIVER_WATER_ALPHA = 160
 default.RIVER_WATER_VISC = 2
 

mods/default/mapgen.lua

@@ -25,88 +25,6 @@ minetest.register_alias("mapgen_mese", "default:block_steel")
 minetest.register_alias("mapgen_stair_cobble", "default:reinforced_frame")
 minetest.register_alias("mapgen_lava_source", "default:water_source")
 
---
--- Ore generation
---
-
--- Coal
-
-minetest.register_ore(
-   {
-      ore_type       = "scatter",
-      ore            = "default:stone_with_coal",
-      wherein        = "default:stone",
-      clust_scarcity = 10*10*10,
-      clust_num_ores = 6,
-      clust_size     = 4,
-      height_min     = -31000,
-      height_max     = 32,
-   })
-
-minetest.register_ore(
-   {
-      ore_type       = "scatter",
-      ore            = "default:stone_with_coal",
-      wherein        = "default:stone",
-      clust_scarcity = 8*8*8,
-      clust_num_ores = 8,
-      clust_size     = 6,
-      height_min     = -31000,
-      height_max     = -32,
-   })
-
-minetest.register_ore(
-   {
-      ore_type       = "scatter",
-      ore            = "default:stone_with_coal",
-      wherein        = "default:stone",
-      clust_scarcity = 9*9*9,
-      clust_num_ores = 20,
-      clust_size     = 10,
-      height_min     = -31000,
-      height_max     = -64,
-   })
-
--- Iron
-
-minetest.register_ore(
-   {
-      ore_type       = "scatter",
-      ore            = "default:stone_with_iron",
-      wherein        = "default:stone",
-      clust_scarcity = 8*8*8,
-      clust_num_ores = 6,
-      clust_size     = 4,
-      height_min     = -31000,
-      height_max     = 0,
-   })
-
-minetest.register_ore(
-   {
-      ore_type       = "scatter",
-      ore            = "default:stone_with_iron",
-      wherein        = "default:stone",
-      clust_scarcity = 8*8*8,
-      clust_num_ores = 20,
-      clust_size     = 10,
-      height_min     = -31000,
-      height_max     = -32,
-   })
-
--- Steel blocks
-
-minetest.register_ore(
-   {
-      ore_type       = "blob",
-      ore            = "default:block_steel",
-      wherein        = "default:stone",
-      clust_scarcity = 12*12*12,
-      clust_num_ores = 10,
-      clust_size     = 10,
-      height_min     = -31000,
-      height_max     = -128,
-   })
-
 --
 -- Biome setup
 --
@@ -115,6 +33,40 @@ minetest.clear_registered_biomes()
 
 -- Aboveground biomes
 
+minetest.register_biome(
+   {
+      name = "Marsh",
+
+      node_top = "default:dirt_with_grass",
+      node_filler = "default:dirt",
+
+      depth_filler = 0,
+      depth_top = 1,
+
+      y_min = 2,
+      y_max = 6,
+
+      heat_point = 35,
+      humidity_point = 55,
+   })
+
+minetest.register_biome(
+   {
+      name = "Swamp",
+
+      node_top = "default:dirt_with_swamp_grass",
+      node_filler = "default:swamp_dirt",
+
+      depth_filler = 7,
+      depth_top = 1,
+
+      y_min = 2,
+      y_max = 10,
+
+      heat_point = 30,
+      humidity_point = 42,
+   })
+
 minetest.register_biome(
    {
       name = "Deep Forest",
@@ -218,6 +170,25 @@ minetest.register_biome(
    })
 
 -- Oceans
+
+minetest.register_biome(
+   {
+      name = "Swamp Ocean",
+
+      node_water = "default:swamp_water_source",
+      node_top = "default:swamp_dirt",
+      node_filler = "default:swamp_dirt",
+
+      depth_filler = 0,
+      depth_top = 9,
+
+      y_min = -3,
+      y_max = 1,
+
+      heat_point = 30,
+      humidity_point = 50,
+   })
+
 minetest.register_biome(
    {
       name = "Grassland Ocean",
@@ -357,6 +328,18 @@ minetest.register_decoration(
       y_max = 32000,
    })
 
+minetest.register_decoration(
+   {
+      deco_type = "simple",
+      place_on = "default:dirt_with_swamp_grass",
+      sidelen = 16,
+      fill_ratio = 0.04,
+      biomes = {"Swamp"},
+      decoration = {"default:swamp_grass"},
+      y_min = 2,
+      y_max = 40,
+   })
+
 minetest.register_decoration(
    {
       deco_type = "simple",
@@ -387,7 +370,7 @@ minetest.register_decoration(
       place_on = "default:dirt_with_grass",
       sidelen = 16,
       fill_ratio = 0.08,
-      biomes = {"Forest"},
+      biomes = {"Forest", "Marsh"},
       decoration = {"default:tall_grass"},
       y_min = 0,
       y_max = 32000,
@@ -481,4 +464,126 @@ minetest.register_decoration(
       rotation = "0",
    })
 
+--
+-- Ore generation
+--
+
+-- Coal
+
+minetest.register_ore(
+   {
+      ore_type       = "scatter",
+      ore            = "default:stone_with_coal",
+      wherein        = "default:stone",
+      clust_scarcity = 10*10*10,
+      clust_num_ores = 6,
+      clust_size     = 4,
+      height_min     = -31000,
+      height_max     = 32,
+   })
+
+minetest.register_ore(
+   {
+      ore_type       = "scatter",
+      ore            = "default:stone_with_coal",
+      wherein        = "default:stone",
+      clust_scarcity = 8*8*8,
+      clust_num_ores = 8,
+      clust_size     = 6,
+      height_min     = -31000,
+      height_max     = -32,
+   })
+
+minetest.register_ore(
+   {
+      ore_type       = "scatter",
+      ore            = "default:stone_with_coal",
+      wherein        = "default:stone",
+      clust_scarcity = 9*9*9,
+      clust_num_ores = 20,
+      clust_size     = 10,
+      height_min     = -31000,
+      height_max     = -64,
+   })
+
+-- Iron
+
+minetest.register_ore(
+   {
+      ore_type       = "scatter",
+      ore            = "default:stone_with_iron",
+      wherein        = "default:stone",
+      clust_scarcity = 8*8*8,
+      clust_num_ores = 6,
+      clust_size     = 4,
+      height_min     = -31000,
+      height_max     = 0,
+   })
+
+minetest.register_ore(
+   {
+      ore_type       = "scatter",
+      ore            = "default:stone_with_iron",
+      wherein        = "default:stone",
+      clust_scarcity = 8*8*8,
+      clust_num_ores = 20,
+      clust_size     = 10,
+      height_min     = -31000,
+      height_max     = -32,
+   })
+
+-- Steel blocks
+
+minetest.register_ore(
+   {
+      ore_type       = "blob",
+      ore            = "default:block_steel",
+      wherein        = "default:stone",
+      clust_scarcity = 12*12*12,
+      clust_num_ores = 10,
+      clust_size     = 10,
+      height_min     = -31000,
+      height_max     = -128,
+   })
+
+-- Water
+
+minetest.register_ore( -- Springs
+   {
+      ore_type       = "blob",
+      ore            = "default:water_source",
+      wherein        = "default:dirt_with_grass",
+      clust_scarcity = 18*18*18,
+      clust_num_ores = 1,
+      clust_size     = 1,
+      height_min     = 20,
+      height_max     = 31000,
+   })
+
+minetest.register_ore( -- Swamp
+   {
+      ore_type       = "blob",
+      ore            = "default:swamp_water_source",
+      wherein        = {"default:dirt_with_swamp_grass", "default:swamp_dirt"},
+      biomes         = {"Swamp", "Swamp Ocean"},
+      clust_scarcity = 10*10*10,
+      clust_num_ores = 10,
+      clust_size     = 4,
+      height_min     = -31000,
+      height_max     = 31000,
+   })
+
+minetest.register_ore( -- Marsh
+   {
+      ore_type       = "blob",
+      ore            = "default:swamp_water_source",
+      wherein        = {"default:dirt_with_grass", "default:dirt"},
+      biomes         = {"Marsh"},
+      clust_scarcity = 6*6*6,
+      clust_num_ores = 10,
+      clust_size     = 6,
+      height_min     = -31000,
+      height_max     = 31000,
+   })
+
 default.log("mapgen", "loaded")

mods/default/nodes.lua

@@ -87,6 +87,17 @@ minetest.register_node(
       sounds = default.node_sound_dirt_defaults(),
    })
 
+minetest.register_node(
+   "default:swamp_dirt",
+   {
+      description = "Swamp Dirt",
+      tiles ={"default_swamp_dirt.png"},
+      stack_max = 240,
+      groups = {crumbly=3, soil=1, fall_damage_add_percent=-10},
+      is_ground_content = true,
+      sounds = default.node_sound_dirt_defaults(),
+   })
+
 minetest.register_node(
    "default:dirt_with_dry_grass",
    {
@@ -109,6 +120,28 @@ minetest.register_node(
 	 }),
    })
 
+minetest.register_node(
+   "default:dirt_with_swamp_grass",
+   {
+      description = "Dirt with Swamp Grass",
+      tiles ={"default_swamp_grass.png", "default_swamp_dirt.png", "default_swamp_dirt.png^default_swamp_grass_side.png"},
+      groups = {crumbly=3, soil=1, fall_damage_add_percent=-5, not_in_craftingguide = 1},
+      drop = {
+	 max_items = 3,
+	 items = {
+	    {items = {"default:dirt"}, rarity = 1},
+	    {items = {"default:swamp_grass 6"}, rarity = 14},
+	    {items = {"default:swamp_grass 3"}, rarity = 7},
+	    {items = {"default:swamp_grass 2"}, rarity = 3},
+	 }
+      },
+      is_ground_content = true,
+      sounds = default.node_sound_dirt_defaults(
+	 {
+	    footstep = {name="default_soft_footstep", gain=0.5},
+	 }),
+   })
+
 minetest.register_node(
    "default:dirt_with_grass",
    {
@@ -836,7 +869,7 @@ minetest.register_node(
       liquid_alternative_source = "default:river_water_source",
       liquid_viscosity = default.RIVER_WATER_VISC,
       liquid_renewable = false,
-      liquid_range = 2,
+      liquid_range = 1,
       post_effect_color = {a=40, r=40, g=70, b=100},
       groups = {water=1, flowing_water = 1, river_water = 1, liquid=1},
    })
@@ -866,11 +899,77 @@ minetest.register_node(
       liquid_alternative_source = "default:river_water_source",
       liquid_viscosity = default.RIVER_WATER_VISC,
       liquid_renewable = false,
-      liquid_range = 2,
+      liquid_range = 1,
       post_effect_color = {a=40, r=40, g=70, b=100},
       groups = {water = 1, river_water = 1, liquid = 1},
    })
 
+minetest.register_node(
+   "default:swamp_water_flowing",
+   {
+      description = "Swamp Water (flowing)",
+      inventory_image = minetest.inventorycube("default_swamp_water.png"),
+      drawtype = "flowingliquid",
+      tiles ={"default_swamp_water.png"},
+      special_tiles = {
+	 {
+	    image = "default_swamp_water_animated.png",
+	    backface_culling=false,
+	    animation={type = "vertical_frames", aspect_w= 16, aspect_h = 16, length = 1.8}
+	 },
+	 {
+	    image = "default_swamp_water_animated.png",
+	    backface_culling=false,
+	    animation={type = "vertical_frames", aspect_w= 16, aspect_h = 16, length = 1.8}
+	 },
+      },
+      alpha = default.SWAMP_WATER_ALPHA,
+      paramtype = "light",
+      walkable = false,
+      pointable = false,
+      diggable = false,
+      buildable_to = true,
+      drowning = 3,
+      liquidtype = "flowing",
+      liquid_alternative_flowing = "default:swamp_water_flowing",
+      liquid_alternative_source = "default:swamp_water_source",
+      liquid_viscosity = default.SWAMP_WATER_VISC,
+      liquid_renewable = false,
+      liquid_range = 2,
+      post_effect_color = {a=220, r=50, g=40, b=70},
+      groups = {water=1, flowing_water = 1, swamp_water = 1, liquid=1},
+   })
+
+minetest.register_node(
+   "default:swamp_water_source",
+   {
+      description = "Swamp Water",
+      inventory_image = minetest.inventorycube("default_swamp.png"),
+      drawtype = "liquid",
+      tiles ={"default_swamp_water.png"},
+      special_tiles = {
+	 {
+	    image = "default_swamp_water.png",
+	    backface_culling=false,
+	 },
+      },
+      alpha = default.SWAMP_WATER_ALPHA,
+      paramtype = "light",
+      walkable = false,
+      pointable = false,
+      diggable = false,
+      buildable_to = true,
+      drowning = 3,
+      liquidtype = "source",
+      liquid_alternative_flowing = "default:swamp_water_flowing",
+      liquid_alternative_source = "default:swamp_water_source",
+      liquid_viscosity = default.SWAMP_WATER_VISC,
+      liquid_renewable = false,
+      liquid_range = 2,
+      post_effect_color = {a=220, r=50, g=40, b=70},
+      groups = {water = 1, swamp_water = 1, liquid = 1},
+   })
+
 minetest.register_node(
    "default:torch_dead",
    {
@@ -1066,6 +1165,28 @@ minetest.register_node(
 			  end,
    })
 
+minetest.register_node(
+   "default:swamp_grass",
+   {
+      description = "Swamp Grass Clump",
+      drawtype = "plantlike",
+      selection_box = {
+	 type = "fixed",
+	 fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
+      },
+      visual_scale = 1.15,
+      tiles ={"default_swamp_grass_clump.png"},
+      inventory_image = "default_swamp_grass_clump_inventory.png",
+      wield_image = "default_swamp_grass_clump_inventory.png",
+      paramtype = "light",
+      waving = 1,
+      walkable = false,
+      buildable_to = true,
+      is_ground_content = true,
+      groups = {snappy=2,dig_immediate=3,attached_node=1},
+      sounds = default.node_sound_leaves_defaults(),
+   })
+
 minetest.register_node(
    "default:dry_grass",
    {