From 337e9e2c55d1a038f6618278a7da71470fa4f717 Mon Sep 17 00:00:00 2001 From: HybridDog Date: Tue, 7 Aug 2018 15:39:28 +0200 Subject: [PATCH] Fix default settings Some boolean settings disappeared in https://github.com/Splizard/minetest-mod-snow/commit/0c90b5dcf30c9f85b4030dd05b12f45427426cd1 --- settingtypes.txt | 26 +++++++++++++------------- src/util.lua | 41 +++++++++++++---------------------------- 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/settingtypes.txt b/settingtypes.txt index 3dfc990..d9204be 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -1,38 +1,38 @@ #The gravity of thrown snowballs. -snowball_gravity (Snowball Gravity) float 0.91 +snow_snowball_gravity (Snowball Gravity) float 0.91 #How fast players throw snowballs. -snowball_velocity (Snowball Velocity) float 19 +snow_snowball_velocity (Snowball Velocity) float 19 #Enable/Disable sleds. -sleds (Enable Sleds) bool true +snow_sleds (Enable Sleds) bool true #Enables falling snow. -enable_snowfall (Enable Snowfall) bool true +snow_enable_snowfall (Enable Snowfall) bool true #Reduces the amount of resources and fps used by snowfall. -lighter_snowfall (Use Light Snowfall) bool false +snow_lighter_snowfall (Use Light Snowfall) bool false #Enables debug output. Currently it only prints mgv6 info. -debug (Debug Mode) bool false +snow_debug (Debug Mode) bool false #Disable this to remove christmas saplings from being found. -christmas_content (Enable Christmas Content) bool true +snow_christmas_content (Enable Christmas Content) bool true #Enables debug output. Currently it only prints mgv6 info. -smooth_biomes (Smooth Biome Transitions) bool true +snow_smooth_biomes (Smooth Biome Transitions) bool true #The minumum height a snow biome will generate (mgv7) -min_height (Minumum Height for Snow Biomes) int 3 +snow_min_height (Minumum Height for Snow Biomes) int 3 #Disable this to stop snow from being smoothed. -smooth_snow (Multiple Snow Levels) bool true +snow_smooth_snow (Multiple Snow Levels) bool true #mapgen rarity in %. -mapgen_rarity (Snow Biome Rarity %) float 18 +snow_mapgen_rarity (Snow Biome Rarity %) float 18 #size of the generated… (has an effect to the rarity, too) -mapgen_size (Snow Biome Size) float 210 +snow_mapgen_size (Snow Biome Size) float 210 #Minetest finally has capable snow biomes by default, lets not mess it up with the old snowgen. -disable_mapgen (Disable mod-generated biomes) bool true +snow_disable_mapgen (Disable mod-generated biomes) bool true diff --git a/src/util.lua b/src/util.lua index 0651587..d5a89e0 100644 --- a/src/util.lua +++ b/src/util.lua @@ -1,35 +1,20 @@ --Global config and function table. snow = { - snowball_gravity = tonumber(minetest.settings:get("snowball_gravity")) or 0.91, - snowball_velocity = tonumber(minetest.settings:get("snowball_velocity")) or 19, - sleds = minetest.settings:get_bool("sleds"), - enable_snowfall = minetest.settings:get_bool("enable_snowfall"), - lighter_snowfall = minetest.settings:get_bool("lighter_snowfall"), - debug = minetest.settings:get_bool("debug"), - smooth_biomes = minetest.settings:get_bool("smooth_biomes"), - christmas_content = minetest.settings:get_bool("christmas_content"), - smooth_snow = minetest.settings:get_bool("smooth_snow"), - min_height = tonumber(minetest.settings:get("min_height")) or 3, - mapgen_rarity = tonumber(minetest.settings:get("mapgen_rarity")) or 18, - mapgen_size = tonumber(minetest.settings:get("mapgen_size")) or 210, - disable_mapgen = minetest.settings:get_bool("disable_mapgen"), + snowball_gravity = tonumber(minetest.settings:get("snow_snowball_gravity")) or 0.91, + snowball_velocity = tonumber(minetest.settings:get("snow_snowball_velocity")) or 19, + sleds = minetest.settings:get_bool("snow_sleds", true), + enable_snowfall = minetest.settings:get_bool("snow_enable_snowfall", true), + lighter_snowfall = minetest.settings:get_bool("snow_lighter_snowfall", false), + debug = minetest.settings:get_bool("snow_debug", false), + smooth_biomes = minetest.settings:get_bool("snow_smooth_biomes", true), + christmas_content = minetest.settings:get_bool("snow_christmas_content", true), + smooth_snow = minetest.settings:get_bool("snow_smooth_snow", true), + min_height = tonumber(minetest.settings:get("snow_min_height")) or 3, + mapgen_rarity = tonumber(minetest.settings:get("snow_mapgen_rarity")) or 18, + mapgen_size = tonumber(minetest.settings:get("snow_mapgen_size")) or 210, + disable_mapgen = minetest.settings:get_bool("snow_disable_mapgen", true), } -if snow.sleds == nil then - snow.sleds = true -end - -if snow.debug == nil then - snow.debug = false -end - -if snow.disable_mapgen == nil then - snow.disable_mapgen = true -end - -if snow.enable_snowfall == nil then - snow.enable_snowfall = true -end -- functions for dynamically changing settings