From c18c67820580ef329314b430285eeddc66499943 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 14 Oct 2024 10:06:17 +0100 Subject: [PATCH] update setting names --- biomes.lua | 47 +++++++++++++++++++++---------------------- init.lua | 23 +++++++++++---------- settings.conf_example | 45 ----------------------------------------- settingtypes.txt | 23 +++++++++++---------- 4 files changed, 47 insertions(+), 91 deletions(-) delete mode 100644 settings.conf_example diff --git a/biomes.lua b/biomes.lua index c45c6d2..00907d2 100644 --- a/biomes.lua +++ b/biomes.lua @@ -223,25 +223,6 @@ register_biome(ethereal.frost, { node_top = "default:silver_sand", depth_top = 1, node_filler = "default:sand", depth_filler = 3}) --- snowy grassland (inbetween frost and taiga/jumble) - -if not old then -- was not available in old biomes - - register_biome(1, { - name = "snowy_grassland", - heat_point = 15, humidity_point = 58, y_min = 3, y_max = 30, - node_top = "ethereal:cold_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3}) - - register_biome(1, { - name = "snowy_grassland_ocean", - node_dust = "default:snow", - heat_point = 15, humidity_point = 58, y_min = -192, y_max = 2, - node_top = "default:sand", depth_top = 1, - node_filler = "default:sand", depth_filler = 3, - vertical_blend = 1}) -end - -- deciduous forest register_biome(ethereal.grassy, { @@ -606,18 +587,20 @@ register_biome(ethereal.tundra, { heat_point = 0, humidity_point = 40, y_max = -256, y_min = -31000, node_cave_liquid = {"default:water_source", "default:lava_source"}}) --- Cold desert (was heat, humidity 40,0, changed to 20,85 to fill biome gap) +-- only register when using new mapgen -if not old then -- was not available in old biomes +if not old then - register_biome(1, { + -- cold desert + + register_biome(ethereal.cold_desert, { name = "cold_desert", heat_point = 20, humidity_point = 85, y_min = 4, y_max = 100, node_top = "default:silver_sand", depth_top = 1, node_filler = "default:silver_sand", depth_filler = 1, node_riverbed = "default:silver_sand", depth_riverbed = 2}) - register_biome(1, { + register_biome(ethereal.cold_desert, { name = "cold_desert_ocean", heat_point = 20, humidity_point = 85, y_min = -255, y_max = 3, node_top = "default:sand", depth_top = 1, @@ -625,8 +608,24 @@ if not old then -- was not available in old biomes node_cave_liquid = "default:water_source", vertical_blend = 1}) - register_biome(1, { + register_biome(ethereal.cold_desert, { name = "cold_desert_under", node_cave_liquid = {"default:water_source", "default:lava_source"}, heat_point = 20, humidity_point = 85, y_min = -31000, y_max = -256}) + + -- snowy grassland (inbetween frost and taiga/jumble) + + register_biome(ethereal.snowy_grassland, { + name = "snowy_grassland", + heat_point = 15, humidity_point = 58, y_min = 3, y_max = 30, + node_top = "ethereal:cold_dirt", depth_top = 1, + node_filler = "default:dirt", depth_filler = 3}) + + register_biome(ethereal.snowy_grassland, { + name = "snowy_grassland_ocean", + node_dust = "default:snow", + heat_point = 15, humidity_point = 58, y_min = -192, y_max = 2, + node_top = "default:sand", depth_top = 1, + node_filler = "default:sand", depth_filler = 3, + vertical_blend = 1}) end diff --git a/init.lua b/init.lua index 6c93603..774224e 100644 --- a/init.lua +++ b/init.lua @@ -8,7 +8,7 @@ -- global -ethereal = {version = "20240910"} +ethereal = {version = "20241014"} -- setting helper @@ -42,37 +42,38 @@ setting("bool", "flight", true) setting("number", "glacier", 1) setting("number", "bamboo", 1) setting("number", "mesa", 1) -setting("number", "alpine", 1) -setting("number", "healing", 1) -setting("number", "snowy", 1) +setting("number", "alpine", 1)--taiga +setting("number", "snowy", 1)--coniferous_forest setting("number", "frost", 1) -setting("number", "grassy", 1) +setting("number", "grassy", 1)--deciduous_forest setting("number", "caves", 1) setting("number", "grayness", 1) setting("number", "grassytwo", 1) setting("number", "prairie", 1) setting("number", "jumble", 1) -setting("number", "junglee", 1) +setting("number", "junglee", 1)--rainforest setting("number", "desert", 1) setting("number", "grove", 1) setting("number", "mushroom", 1) -setting("number", "sandstone", 1) -setting("number", "quicksand", 1) +setting("number", "sandstone", 1)--sandstone_desert setting("number", "plains", 1) setting("number", "savanna", 1) setting("number", "fiery", 1) setting("number", "swamp", 1) -setting("number", "sealife", 1) -setting("number", "reefs", 1) +setting("number", "quicksand", 1)--swamp quicksand setting("number", "tundra", 1) setting("number", "mediterranean", 1) +setting("number", "cold_desert", 1) +setting("number", "snowy_grassland", 1) +setting("number", "sealife", 1) +setting("number", "reefs", 1) setting("number", "logs", 1) setting("bool", "wood_rotate", true) local path = minetest.get_modpath("ethereal") --- Load settings.conf file if found +-- Load settings.conf file if found [DEPRECATED] local input = io.open(path.."/settings.conf", "r") diff --git a/settings.conf_example b/settings.conf_example deleted file mode 100644 index 7eda301..0000000 --- a/settings.conf_example +++ /dev/null @@ -1,45 +0,0 @@ - ---[[ - Ethereal Settings can be changed here and kept even after the mod - has been updated ---]] - -ethereal.leaftype = 0 -- 0 for 2D plantlike, 1 for 3D allfaces -ethereal.leafwalk = false -- true for walkable leaves, false to fall through -ethereal.cavedirt = true -- caves chop through dirt when true -ethereal.torchdrop = true -- torches drop when touching water -ethereal.papyruswalk = true -- papyrus can be walked on -ethereal.lilywalk = true -- waterlilies can be walked on -ethereal.xcraft = true -- allow cheat crafts for cobble->gravel->dirt->sand, ice->snow, dry dirt->desert sand -ethereal.flight = true -- enable flight potion - --- Set following to 1 to enable biome or false to disable -ethereal.glacier = 1 -- Ice glaciers with snow -ethereal.bamboo = 1 -- Bamboo with sprouts -ethereal.mesa = 1 -- Mesa red and orange clay with giant redwood -ethereal.alpine = 1 -- Snowy grass -ethereal.healing = 1 -- Snowy peaks with healing trees -ethereal.snowy = 1 -- Cold grass with pine trees and snow spots -ethereal.frost = 1 -- Blue dirt with blue/pink frost trees -ethereal.grassy = 1 -- Green grass with flowers and trees -ethereal.caves = 1 -- Desert stone ares with huge caverns underneath -ethereal.grayness = 1 -- Grey grass with willow trees -ethereal.grassytwo = 1 -- Sparse trees with old trees and flowers -ethereal.prairie = 1 -- Flowery grass with many plants and flowers -ethereal.jumble = 1 -- Green grass with trees and jungle grass -ethereal.junglee = 1 -- Jungle grass with tall jungle trees -ethereal.desert = 1 -- Desert sand with cactus -ethereal.grove = 1 -- Banana groves and ferns -ethereal.mushroom = 1 -- Purple grass with giant mushrooms -ethereal.sandstone = 1 -- Sandstone with smaller cactus -ethereal.quicksand = 1 -- Quicksand banks -ethereal.plains = 1 -- Dry dirt with scorched trees -ethereal.savanna = 1 -- Dry yellow grass with acacia tree's -ethereal.fiery = 1 -- Red grass with lava craters -ethereal.sandclay = 1 -- Sand areas with clay underneath -ethereal.swamp = 1 -- Swamp areas with vines on tree's, mushrooms, lilly's and clay sand -ethereal.sealife = 1 -- Enable coral and seaweed -ethereal.reefs = 1 -- Enable new coral reefs in default -ethereal.sakura = 1 -- Enable sakura biomes with trees -ethereal.mediterranean = 1 -- Enable Mediterranean biome - diff --git a/settingtypes.txt b/settingtypes.txt index 72f03a0..c92ca35 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -11,30 +11,31 @@ ethereal.flight (Enable Flight Potion) bool true ethereal.glacier (Glacier biome, 1 = Enable / 0 = Disable) int 1 ethereal.bambo (Bamboo biome, 1 = Enable / 0 = Disable) int 1 ethereal.mesa (Mesa biome, 1 = Enable / 0 = Disable) int 1 -ethereal.alpine (Alpine biome, 1 = Enable / 0 = Disable) int 1 -ethereal.healing (Healing Tree biome, 1 = Enable / 0 = Disable) int 1 -ethereal.snowy (Pine Tree biome, 1 = Enable / 0 = Disable) int 1 -ethereal.frost (Blue Frost biome, 1 = Enable / 0 = Disable) int 1 -ethereal.grassy (Grassy biome, 1 = Enable / 0 = Disable) int 1 +ethereal.alpine (Taiga biome, 1 = Enable / 0 = Disable) int 1 +ethereal.snowy (Coniferous forest biome, 1 = Enable / 0 = Disable) int 1 +ethereal.frost (Crystal biome, 1 = Enable / 0 = Disable) int 1 +ethereal.grassy (Deciduous forest biome, 1 = Enable / 0 = Disable) int 1 ethereal.caves (Desertstone biome, 1 = Enable / 0 = Disable) int 1 ethereal.grayness (Grey Willow biome, 1 = Enable / 0 = Disable) int 1 ethereal.grassytwo (GrassyTwo biome, 1 = Enable / 0 = Disable) int 1 ethereal.prairie (Prairie biome, 1 = Enable / 0 = Disable) int 1 ethereal.jumble (Jumble biome, 1 = Enable / 0 = Disable) int 1 -ethereal.junglee (Jungle biome, 1 = Enable / 0 = Disable) int 1 +ethereal.junglee (Rainforest biome, 1 = Enable / 0 = Disable) int 1 ethereal.desert (Desert biome, 1 = Enable / 0 = Disable) int 1 ethereal.grove (Banana Grove biome, 1 = Enable / 0 = Disable) int 1 ethereal.mushroom (Mushroom biome, 1 = Enable / 0 = Disable) int 1 -ethereal.sandstone (Sandstone biome, 1 = Enable / 0 = Disable) int 1 -ethereal.quicksand (Quicksand, 1 = Enable / 0 = Disable) int 1 +ethereal.sandstone (Sandstone desert biome, 1 = Enable / 0 = Disable) int 1 ethereal.plains (Scorched Plains biome, 1 = Enable / 0 = Disable) int 1 ethereal.savanna (Savanna biome, 1 = Enable / 0 = Disable) int 1 -ethereal.fiery (Feiry Lava biome, 1 = Enable / 0 = Disable) int 1 +ethereal.fiery (Fiery Lava biome, 1 = Enable / 0 = Disable) int 1 ethereal.swamp (Swamp biome, 1 = Enable / 0 = Disable) int 1 -ethereal.sealife (Coral and Seaweed biome, 1 = Enable / 0 = Disable) int 1 -ethereal.reefs (MT5 Coral biome, 1 = Enable / 0 = Disable) int 1 +ethereal.quicksand (Swamp quicksand, 1 = Enable / 0 = Disable) int 1 ethereal.tundra (Tundra biome, 1 = Enable / 0 = Disable) int 1 ethereal.mediterranean (Mediterranean biome, 1 = Enable / 0 = Disable) int 1 +ethereal.cold_desert (Grey sand desert biome, 1 = Enable / 0 = Disable) int 1 +ethereal.snowy_grassland (Snowy grasslands biome, 1 = Enable / 0 = Disable) int 1 +ethereal.sealife (Coral and Seaweed biome, 1 = Enable / 0 = Disable) int 1 +ethereal.reefs (MT5 Coral biome, 1 = Enable / 0 = Disable) int 1 ethereal.logs (Tree log decor, 1 = Enable / 0 = Disable) int 1 ethereal.wood_rotate (Enable directional placement of wood) bool true ethereal.leaf_particles (Enable falling leaf particles) bool true