diff --git a/minetest.conf b/minetest.conf index d6f0a05..466c4d0 100644 --- a/minetest.conf +++ b/minetest.conf @@ -1,46 +1,16 @@ ## Mapgen -# Name of map generator to be used when creating a new world. -# Creating a world in the main menu will override this. -# type: enum values: v5, v6, v7, flat, valleys, fractal, singlenode -mg_name = valleys - -# Water surface level of the world. -# type: int -water_level = 0 - -# From how far blocks are generated for clients, stated in mapblocks (16 nodes). -# type: int -# max_block_generate_distance = 6 - -# Where the map generator stops. -# Please note: -# - Limited to 31000 (setting above has no effect) -# - The map generator works in groups of 80x80x80 nodes (5x5x5 MapBlocks). -# - Those groups have an offset of -32, -32 nodes from the origin. -# - Only groups which are within the map_generation_limit are generated -# type: int min: 0 max: 31000 -# map_generation_limit = 31000 - -# Global map generation attributes. -# In Mapgen v6 the 'decorations' flag controls all decorations except trees -# and junglegrass, in all other mapgens this flag controls all decorations. -# Flags that are not specified in the flag string are not modified from the default. -# Flags starting with 'no' are used to explicitly disable them. -# type: flags possible values: caves, dungeons, light, decorations, nocaves, nodungeons, nolight, nodecorations -mg_flags = caves,light,decorations - ### Advanced # Noise parameters for biome API temperature, humidity and biome blend. # type: noise_params -mg_biome_np_heat = 50, 50, (750, 750, 750), 5349, 3, 0.5, 2.0 +mg_biome_np_heat = 50, 50, (1024, 1024, 1024), 5349, 3, 0.5, 2.0 # type: noise_params mg_biome_np_heat_blend = 0, 1.5, (8, 8, 8), 13, 2, 1.0, 2.0 # type: noise_params -mg_biome_np_humidity = 50, 50, (750, 750, 750), 842, 3, 0.5, 2.0 +mg_biome_np_humidity = 50, 50, (1024, 1024, 1024), 842, 3, 0.5, 2.0 # type: noise_params mg_biome_np_humidity_blend = 0, 1.5, (8, 8, 8), 90003, 2, 1.0, 2.0 @@ -49,32 +19,6 @@ mg_biome_np_humidity_blend = 0, 1.5, (8, 8, 8), 90003, 2, 1.0, 2.0 ##### General -# Map generation attributes specific to Mapgen Valleys. -# 'altitude_chill' makes higher elevations colder, which may cause biome issues. -# 'humid_rivers' modifies the humidity around rivers and in areas where water would tend to pool, -# it may interfere with delicately adjusted biomes. -# Flags that are not specified in the flag string are not modified from the default. -# Flags starting with 'no' are used to explicitly disable them. -# type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers -mg_valleys_spflags = altitude_chill,humid_rivers - -# The altitude at which temperature drops by 20C -# type: int -mgvalleys_altitude_chill = 90 - -# Depth below which you'll find large caves. -# type: int -mgvalleys_large_cave_depth = -33 - -# Creates unpredictable lava features in caves. -# These can make mining difficult. Zero disables them. (0-10) -# type: int -mgvalleys_lava_features = 0 - -# Depth below which you'll find massive caves. -# type: int -mgvalleys_massive_cave_depth = -256 - # How deep to make rivers # type: int mgvalleys_river_depth = 5 @@ -82,54 +26,3 @@ mgvalleys_river_depth = 5 # How wide to make rivers # type: int mgvalleys_river_size = 4 - -# Creates unpredictable water features in caves. -# These can make mining difficult. Zero disables them. (0-10) -# type: int -# mgvalleys_water_features = 0 - -# Controls width of tunnels, a smaller value creates wider tunnels. -# type: float -mgvalleys_cave_width = 0.2 - -##### Noises - -# Caves and tunnels form at the intersection of the two noises -# type: noise_params -mgvalleys_np_cave1 = 0, 12, (61, 61, 61), 52534, 3, 0.5, 2.0 - -# Caves and tunnels form at the intersection of the two noises -# type: noise_params -mgvalleys_np_cave2 = 0, 12, (67, 67, 67), 10325, 3, 0.5, 2.0 - -# The depth of dirt or other filler -# type: noise_params -mgvalleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0 - -# Massive caves form here. -# type: noise_params -mgvalleys_np_massive_caves = 0, 1, (768, 256, 768), 59033, 6, 0.63, 2.0 - -# River noise -- rivers occur close to zero -# type: noise_params -mgvalleys_np_rivers = 0, 1, (512, 512, 512), -6050, 5, 0.6, 2.0 - -# Base terrain height -# type: noise_params -mgvalleys_np_terrain_height = -10, 100, (1024, 1024, 1024), 5202, 3, 0.7, 2.0 - -# Raises terrain to make valleys around the rivers -# type: noise_params -mgvalleys_np_valley_depth = 3, 2, (512, 512, 512), -1914, 1, 1.0, 2.0 - -# Slope and fill work together to modify the heights -# type: noise_params -mgvalleys_np_inter_valley_fill = 0, 1, (512, 256, 512), 1993, 6, 0.8, 2.0 - -# Amplifies the valleys -# type: noise_params -mgvalleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0 - -# Slope and fill work together to modify the heights -# type: noise_params -mgvalleys_np_inter_valley_slope = 0, 1, (256, 256, 256), 746, 3, 0.5, 2.0 \ No newline at end of file diff --git a/mods/australia_modpack/australia/init.lua b/mods/australia_modpack/australia/init.lua index 54c74d8..6ba2a55 100644 --- a/mods/australia_modpack/australia/init.lua +++ b/mods/australia_modpack/australia/init.lua @@ -2,7 +2,7 @@ -- MOD: Australia -- See README.md for licensing and other information. --- Designed for valleys mapgen in Minetest 0.4.14. +-- Designed for Minetest 0.4.14. -- Check for necessary mod functions and abort if they aren't available. if not minetest.get_biome_id then @@ -15,38 +15,110 @@ if not minetest.get_biome_id then end minetest.register_on_mapgen_init(function(mgparams) - minetest.set_mapgen_params({mgname="valleys"}) + minetest.set_mapgen_params({mgname = "valleys", water_level = 0, + flags = "caves,light,decorations,nodungeons"}) end) - - -- Definitions made by this mod that other mods can use too aus = {} aus.path = minetest.get_modpath("australia") aus.schematics = {} --- Set the following to 1 to enable biome or 0 to disable -aus.biome_underground = 1 -aus.biome_mangroves = 1 -aus.biome_tasman_sea = 1 -aus.biome_great_australian_bight = 1 -aus.biome_indian_ocean = 1 -aus.biome_great_barrier_reef = 1 -aus.biome_timor_sea = 1 -aus.biome_tasmania = 1 -aus.biome_victorian_forests = 1 -aus.biome_jarrah_karri_forests = 1 -aus.biome_eastern_coasts = 1 -aus.biome_flinders_lofty = 1 -aus.biome_murray_darling_basin = 1 -aus.biome_goldfields_esperence = 1 -aus.biome_mulga_lands = 1 -aus.biome_far_north_queensland = 1 -aus.biome_central_australia = 1 -aus.biome_top_end = 1 -aus.biome_pilbara = 1 -aus.biome_simpson_desert = 1 -aus.biome_australian_alps = 1 + +-- Mapgen noise paramters + +-- Noise parameters for biome API temperature, humidity and biome blend. +aus.mg_biome_np_heat = {offset = 50, scale = 50, seed = 5349, + spread = {x = 24, y = 24, z = 24}, octaves = 3, persist = 0.5, lacunarity = 2,} + +aus.mg_biome_np_heat_blend = {offset = 0, scale = 1.5, seed = 13, + spread = {x = 8, y = 8, z = 8}, octaves = 2, persist = 1, lacunarity = 2,} + +aus.mg_biome_np_humidity = {offset = 50, scale = 50, seed = 842, + spread = {x = 24, y = 24, z = 24}, octaves = 3, persist = 0.5, lacunarity = 2,} + +aus.mg_biome_np_humidity_blend = {offset = 0, scale = 1.5, seed = 90003, + spread = {x = 8, y = 8, z = 8}, octaves = 2, persist = 1, lacunarity = 2,} + +-- Caves and tunnels form at the intersection of the two noises +aus.mgvalleys_np_cave1 = {offset = 0, scale = 12, seed = 52534, + spread = {x = 61, y = 61, z = 61}, octaves = 3, persist = 0.5, lacunarity = 2,} + +-- Caves and tunnels form at the intersection of the two noises +aus.mgvalleys_np_cave2 = {offset = 0, scale = 12, seed = 10325, + spread = {x = 67, y = 67, z = 67}, octaves = 3, persist = 0.5, lacunarity = 2,} + +-- The depth of dirt or other filler +aus.mgvalleys_np_filler_depth = {offset = 0, scale = 1.2, seed = 1605, + spread = {x = 256, y = 256, z = 256}, octaves = 3, persist = 0.5, lacunarity = 2,} + +-- Massive caves form here. +aus.mgvalleys_np_massive_caves = {offset = 0, scale = 1, seed = 59033, + spread = {x = 768, y = 256, z = 768}, octaves = 6, persist = 0.63, lacunarity = 2,} + +-- River noise -- rivers occur close to zero +aus.mgvalleys_np_rivers = {offset = 0, scale = 1, seed = -6050, + spread = {x = 512, y = 512, z = 512}, octaves = 5, persist = 0.6, lacunarity = 2,} + +-- Base terrain height +aus.mgvalleys_np_terrain_height = {offset = -10, scale = 100, seed = 5202, + spread = {x = 1024, y = 1024, z = 1024}, octaves = 3, persist = 0.7, lacunarity = 2,} + +-- Raises terrain to make valleys around the rivers +aus.mgvalleys_np_valley_depth = {offset = 3, scale = 2, seed = -1914, + spread = {x = 512, y = 512, z = 512}, octaves = 1, persist = 1, lacunarity = 2,} + +-- Slope and fill work together to modify the heights +aus.mgvalleys_np_inter_valley_fill = {offset = 0, scale = 1, seed = 1993, + spread = {x = 512, y = 256, z = 512}, octaves = 6, persist = 0.8, lacunarity = 2,} + +-- Amplifies the valleys +aus.mgvalleys_np_valley_profile = {offset = 0.6, scale = 0.5, seed = 777, + spread = {x = 512, y = 512, z = 512}, octaves = 1, persist = 1, lacunarity = 2,} + +-- Slope and fill work together to modify the heights +aus.mgvalleys_np_inter_valley_slope = {offset = 0, scale = 1, seed = 746, + spread = {x = 256, y = 256, z = 256}, octaves = 3, persist = 0.5, lacunarity = 2,} + + +minetest.set_noiseparams("mg_biome_np_heat", aus.mg_biome_np_heat) +minetest.set_noiseparams("mg_biome_np_heat_blend", aus.mg_biome_np_heat_blend) +minetest.set_noiseparams("mg_biome_np_humidity", aus.mg_biome_np_humidity) +minetest.set_noiseparams("mg_biome_np_humidity_blend", aus.mg_biome_np_humidity_blend) +minetest.set_noiseparams("mgvalleys_np_cave1", aus.mgvalleys_np_cave1) +minetest.set_noiseparams("mgvalleys_np_cave2", aus.mgvalleys_np_cave2) +minetest.set_noiseparams("mgvalleys_np_filler_depth", aus.mgvalleys_np_filler_depth) +minetest.set_noiseparams("mgvalleys_np_massive_caves", aus.mgvalleys_np_massive_caves) +minetest.set_noiseparams("mgvalleys_np_rivers", aus.mgvalleys_np_rivers) +minetest.set_noiseparams("mgvalleys_np_terrain_height", aus.mgvalleys_np_terrain_height) +minetest.set_noiseparams("mgvalleys_np_valley_depth", aus.mgvalleys_np_valley_depth) +minetest.set_noiseparams("mgvalleys_np_inter_valley_fill", aus.mgvalleys_np_inter_valley_fill) +minetest.set_noiseparams("mgvalleys_np_valley_profile", aus.mgvalleys_np_valley_profile) +minetest.set_noiseparams("mgvalleys_np_inter_valley_slope", aus.mgvalleys_np_inter_valley_slope) + + +-- Set the following variables to true to enable each biome +aus.biome_underground = true +aus.biome_mangroves = true +aus.biome_tasman_sea = true +aus.biome_great_australian_bight = true +aus.biome_indian_ocean = true +aus.biome_great_barrier_reef = true +aus.biome_timor_sea = true +aus.biome_tasmania = true +aus.biome_victorian_forests = true +aus.biome_jarrah_karri_forests = true +aus.biome_eastern_coasts = true +aus.biome_flinders_lofty = true +aus.biome_murray_darling_basin = true +aus.biome_goldfields_esperence = true +aus.biome_mulga_lands = true +aus.biome_far_north_queensland = true +aus.biome_central_australia = true +aus.biome_top_end = true +aus.biome_pilbara = true +aus.biome_simpson_desert = true +aus.biome_australian_alps = true aus.registered_on_first_mapgen = {} @@ -66,4 +138,4 @@ dofile(aus.path .. "/mapgen.lua") dofile(aus.path .. "/saplings.lua") dofile(aus.path .. "/voxel.lua") -minetest.log("MOD: Australia 0.5 [australia] loaded...") +minetest.log("MOD: Australia 0.8 [australia] loaded...") diff --git a/mods/australia_modpack/australia/mapgen.lua b/mods/australia_modpack/australia/mapgen.lua index f666fb2..98ec350 100644 --- a/mods/australia_modpack/australia/mapgen.lua +++ b/mods/australia_modpack/australia/mapgen.lua @@ -269,72 +269,72 @@ minetest.register_ore({ -- -- Underground -if aus.biome_underground == 1 then +if aus.biome_underground then dofile(aus.path .. "/biome_underground.lua") end -- Coast/Ocean -if aus.biome_mangroves == 1 then +if aus.biome_mangroves then dofile(aus.path .. "/biome_mangroves.lua") end -if aus.biome_tasman_sea == 1 then +if aus.biome_tasman_sea then dofile(aus.path .. "/biome_tasman_sea.lua") end -if aus.biome_great_australian_bight == 1 then +if aus.biome_great_australian_bight then dofile(aus.path .. "/biome_great_australian_bight.lua") end -if aus.biome_indian_ocean == 1 then +if aus.biome_indian_ocean then dofile(aus.path .. "/biome_indian_ocean.lua") end -if aus.biome_great_barrier_reef == 1 then +if aus.biome_great_barrier_reef then dofile(aus.path .. "/biome_great_barrier_reef.lua") end -if aus.biome_timor_sea == 1 then +if aus.biome_timor_sea then dofile(aus.path .. "/biome_timor_sea.lua") end -- Mainland -if aus.biome_tasmania == 1 then +if aus.biome_tasmania then dofile(aus.path .. "/biome_tasmania.lua") end -if aus.biome_victorian_forests == 1 then +if aus.biome_victorian_forests then dofile(aus.path .. "/biome_victorian_forests.lua") end -if aus.biome_jarrah_karri_forests == 1 then +if aus.biome_jarrah_karri_forests then dofile(aus.path .. "/biome_jarrah_karri_forests.lua") end -if aus.biome_eastern_coasts == 1 then +if aus.biome_eastern_coasts then dofile(aus.path .. "/biome_eastern_coasts.lua") end -if aus.biome_flinders_lofty == 1 then +if aus.biome_flinders_lofty then dofile(aus.path .. "/biome_flinders_lofty.lua") end -if aus.biome_murray_darling_basin == 1 then +if aus.biome_murray_darling_basin then dofile(aus.path .. "/biome_murray_darling_basin.lua") end -if aus.biome_goldfields_esperence == 1 then +if aus.biome_goldfields_esperence then dofile(aus.path .. "/biome_goldfields_esperence.lua") end -if aus.biome_mulga_lands == 1 then +if aus.biome_mulga_lands then dofile(aus.path .. "/biome_mulga_lands.lua") end -if aus.biome_far_north_queensland == 1 then +if aus.biome_far_north_queensland then dofile(aus.path .. "/biome_far_north_queensland.lua") end -if aus.biome_central_australia == 1 then +if aus.biome_central_australia then dofile(aus.path .. "/biome_central_australia.lua") end -if aus.biome_top_end == 1 then +if aus.biome_top_end then dofile(aus.path .. "/biome_top_end.lua") end -if aus.biome_pilbara == 1 then +if aus.biome_pilbara then dofile(aus.path .. "/biome_pilbara.lua") end -if aus.biome_simpson_desert == 1 then +if aus.biome_simpson_desert then dofile(aus.path .. "/biome_simpson_desert.lua") end -- Alpine -if aus.biome_australian_alps == 1 then +if aus.biome_australian_alps then dofile(aus.path .. "/biome_australian_alps.lua") end