This commit is contained in:
root 2021-12-13 15:04:24 +01:00
parent 8069e4cffd
commit f36ea18436
10 changed files with 42 additions and 62 deletions

View file

@ -14,16 +14,6 @@ biome_lib.fertile_perlin_octaves = 3
biome_lib.fertile_perlin_persistence = 0.6 biome_lib.fertile_perlin_persistence = 0.6
biome_lib.fertile_perlin_scale = 100 biome_lib.fertile_perlin_scale = 100
local temp_seeddiff = 112
local temp_octaves = 3
local temp_persistence = 0.5
local temp_scale = 150
local humidity_seeddiff = 9130
local humidity_octaves = 3
local humidity_persistence = 0.5
local humidity_scale = 250
local time_speed = tonumber(minetest.settings:get("time_speed")) local time_speed = tonumber(minetest.settings:get("time_speed"))
biome_lib.time_scale = 1 biome_lib.time_scale = 1
@ -37,10 +27,6 @@ biome_lib.air = {name = "air"}
-- still specify a wider range if needed. -- still specify a wider range if needed.
biome_lib.mapgen_elevation_limit = { ["min"] = -16, ["max"] = 48 } biome_lib.mapgen_elevation_limit = { ["min"] = -16, ["max"] = 48 }
--PerlinNoise(seed, octaves, persistence, scale)
biome_lib.perlin_temperature = PerlinNoise(temp_seeddiff, temp_octaves, temp_persistence, temp_scale)
biome_lib.perlin_humidity = PerlinNoise(humidity_seeddiff, humidity_octaves, humidity_persistence, humidity_scale)
-- Local functions -- Local functions
@ -55,17 +41,10 @@ end
local function get_biome_data(pos, perlin_fertile) local function get_biome_data(pos, perlin_fertile)
local fertility = perlin_fertile:get_2d({x=pos.x, y=pos.z}) local fertility = perlin_fertile:get_2d({x=pos.x, y=pos.z})
if type(minetest.get_biome_data) == "function" then local data = minetest.get_biome_data(pos)
local data = minetest.get_biome_data(pos) -- Original values this method returned were +1 (lowest) to -1 (highest)
if data then -- so we need to convert the 0-100 range from get_biome_data() to that.
return fertility, data.heat / 100, data.humidity / 100 return fertility, 1 - (data.heat / 100 * 2), 1 - (data.humidity / 100 * 2)
end
end
local temperature = biome_lib.perlin_temperature:get2d({x=pos.x, y=pos.z})
local humidity = biome_lib.perlin_humidity:get2d({x=pos.x+150, y=pos.z+50})
return fertility, temperature, humidity
end end
function biome_lib.is_node_loaded(node_pos) function biome_lib.is_node_loaded(node_pos)

View file

@ -1,6 +1,6 @@
-- Load support for intllib. -- Load support for intllib.
local MP = minetest.get_modpath(minetest.get_current_modname()) local MP = minetest.get_modpath(minetest.get_current_modname())
local S = minetest.get_translator and minetest.get_translator("mobs_redo") or local S = minetest.get_translator and minetest.get_translator("mobs") or
dofile(MP .. "/intllib.lua") dofile(MP .. "/intllib.lua")
-- CMI support check -- CMI support check
@ -8,7 +8,7 @@ local use_cmi = minetest.global_exists("cmi")
mobs = { mobs = {
mod = "redo", mod = "redo",
version = "20211116", version = "20211212",
intllib = S, intllib = S,
invis = minetest.global_exists("invisibility") and invisibility or {} invis = minetest.global_exists("invisibility") and invisibility or {}
} }

View file

@ -11,7 +11,7 @@ msgstr ""
"PO-Revision-Date: 2017-07-02 14:27+0200\n" "PO-Revision-Date: 2017-07-02 14:27+0200\n"
"Last-Translator: Wuzzy <almikes@aol.com>\n" "Last-Translator: Wuzzy <almikes@aol.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: de_DE\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

View file

@ -11,7 +11,7 @@ local enable_side = minetest.settings:get_bool("vines_enable_side", true)
local enable_jungle = minetest.settings:get_bool("vines_enable_jungle", true) local enable_jungle = minetest.settings:get_bool("vines_enable_jungle", true)
local enable_willow = minetest.settings:get_bool("vines_enable_willow", true) local enable_willow = minetest.settings:get_bool("vines_enable_willow", true)
local default_rarity = 90 local default_rarity = 75
local rarity_roots = tonumber(minetest.settings:get("vines_rarity_roots")) or default_rarity local rarity_roots = tonumber(minetest.settings:get("vines_rarity_roots")) or default_rarity
local rarity_standard = tonumber(minetest.settings:get("vines_rarity_standard")) or default_rarity local rarity_standard = tonumber(minetest.settings:get("vines_rarity_standard")) or default_rarity
local rarity_side = tonumber(minetest.settings:get("vines_rarity_side")) or default_rarity local rarity_side = tonumber(minetest.settings:get("vines_rarity_side")) or default_rarity
@ -42,7 +42,7 @@ local function on_dig(pos, node, player)
if enable_vines == false then if enable_vines == false then
drop_item = vine_name_end drop_item = vine_name_end
end end
wielded_item = player:get_wielded_item() wielded_item = player:get_wielded_item()
if wielded_item then if wielded_item then
wielded_item:add_wear(1) wielded_item:add_wear(1)
@ -93,10 +93,6 @@ vines.register_vine = function( name, defs, biome )
end end
end end
local vine_group = 'group:' .. name .. '_vines'
biome.surface[#biome.surface + 1] = vine_group
local selection_box = {type = "wallmounted",} local selection_box = {type = "wallmounted",}
local drawtype = 'signlike' local drawtype = 'signlike'
@ -362,24 +358,21 @@ minetest.register_tool("vines:shears", {
}) })
-- VINES -- VINES
local spawn_root_surfaces = {}
if enable_roots ~= false then if enable_roots ~= false then
spawn_root_surfaces = {
"default:dirt_with_grass",
"default:dirt"
}
vines.register_vine('root', vines.register_vine('root',
{description = S("Roots"), average_length = 9}, { {description = S("Roots"), average_length = 9}, {
choose_random_wall = true, check_air = false,
avoid_nodes = {"vines:root_middle"}, avoid_nodes = {"vines:root_middle"},
avoid_radius = 5, avoid_radius = 5,
surface = spawn_root_surfaces, surface = {
"default:dirt_with_grass",
"default:dirt"
},
spawn_on_bottom = true, spawn_on_bottom = true,
plantlife_limit = -0.6, plantlife_limit = -0.6,
rarity = rarity_roots, rarity = rarity_roots,
-- humidity_min = 0.4, humidity_min = 0.4,
temp_min = 0.4,
}) })
else else
minetest.register_alias('vines:root_middle', 'air') minetest.register_alias('vines:root_middle', 'air')
@ -389,7 +382,7 @@ end
if enable_standard ~= false then if enable_standard ~= false then
vines.register_vine('vine', vines.register_vine('vine',
{description = S("Vines"), average_length = 5}, { {description = S("Vines"), average_length = 5}, {
choose_random_wall = true, check_air = false,
avoid_nodes = {"group:vines"}, avoid_nodes = {"group:vines"},
avoid_radius = 5, avoid_radius = 5,
surface = { surface = {
@ -402,7 +395,8 @@ if enable_standard ~= false then
spawn_on_bottom = true, spawn_on_bottom = true,
plantlife_limit = -0.9, plantlife_limit = -0.9,
rarity = rarity_standard, rarity = rarity_standard,
-- humidity_min = 0.7, humidity_min = 0.7,
temp_min = 0.4,
}) })
else else
minetest.register_alias('vines:vine_middle', 'air') minetest.register_alias('vines:vine_middle', 'air')
@ -412,7 +406,7 @@ end
if enable_side ~= false then if enable_side ~= false then
vines.register_vine('side', vines.register_vine('side',
{description = S("Vines"), average_length = 6}, { {description = S("Vines"), average_length = 6}, {
choose_random_wall = true, check_air = false,
avoid_nodes = {"group:vines", "default:apple"}, avoid_nodes = {"group:vines", "default:apple"},
avoid_radius = 3, avoid_radius = 3,
surface = { surface = {
@ -425,7 +419,8 @@ if enable_side ~= false then
spawn_on_side = true, spawn_on_side = true,
plantlife_limit = -0.9, plantlife_limit = -0.9,
rarity = rarity_side, rarity = rarity_side,
-- humidity_min = 0.4, humidity_min = 0.4,
temp_min = 0.4,
}) })
else else
minetest.register_alias('vines:side_middle', 'air') minetest.register_alias('vines:side_middle', 'air')
@ -435,13 +430,15 @@ end
if enable_jungle ~= false then if enable_jungle ~= false then
vines.register_vine("jungle", vines.register_vine("jungle",
{description = S("Jungle Vines"), average_length = 7}, { {description = S("Jungle Vines"), average_length = 7}, {
choose_random_wall = true, check_air = false,
neighbors = { near_nodes = {
"default:jungleleaves", "default:jungleleaves",
"moretrees:jungletree_leaves_red", "moretrees:jungletree_leaves_red",
"moretrees:jungletree_leaves_yellow", "moretrees:jungletree_leaves_yellow",
"moretrees:jungletree_leaves_green" "moretrees:jungletree_leaves_green"
}, },
near_nodes_size = 4,
near_nodes_vertical = 4,
avoid_nodes = { avoid_nodes = {
"vines:jungle_middle", "vines:jungle_middle",
"vines:jungle_end", "vines:jungle_end",
@ -454,7 +451,8 @@ if enable_jungle ~= false then
spawn_on_side = true, spawn_on_side = true,
plantlife_limit = -0.9, plantlife_limit = -0.9,
rarity = rarity_jungle, rarity = rarity_jungle,
-- humidity_min = 0.2, humidity_min = 0.2,
temp_min = 0.3,
}) })
else else
minetest.register_alias('vines:jungle_middle', 'air') minetest.register_alias('vines:jungle_middle', 'air')
@ -464,7 +462,7 @@ end
if enable_willow ~= false then if enable_willow ~= false then
vines.register_vine( 'willow', vines.register_vine( 'willow',
{description = S("Willow Vines"), average_length = 9}, { {description = S("Willow Vines"), average_length = 9}, {
choose_random_wall = true, check_air = false,
avoid_nodes = {"vines:willow_middle"}, avoid_nodes = {"vines:willow_middle"},
avoid_radius = 5, avoid_radius = 5,
near_nodes = {'default:water_source'}, near_nodes = {'default:water_source'},
@ -475,7 +473,8 @@ if enable_willow ~= false then
spawn_on_side = true, spawn_on_side = true,
surface = {"moretrees:willow_leaves"}, surface = {"moretrees:willow_leaves"},
rarity = rarity_willow, rarity = rarity_willow,
-- humidity_min = 0.5 humidity_min = 0.5,
temp_min = 0.5,
}) })
else else
minetest.register_alias('vines:willow_middle', 'air') minetest.register_alias('vines:willow_middle', 'air')

View file

@ -8,31 +8,31 @@ vines_enable_rope (Enable vine ropes) bool true
vines_enable_roots (Enable root vines) bool true vines_enable_roots (Enable root vines) bool true
#Rarity of root vines, from 1 to 100, higher numbers are rarer. #Rarity of root vines, from 1 to 100, higher numbers are rarer.
vines_rarity_roots (Rarity of roots vines) int 90 1 100 vines_rarity_roots (Rarity of roots vines) int 75 1 100
#Enables the standard type of vines. #Enables the standard type of vines.
vines_enable_standard (Enable standard vines) bool true vines_enable_standard (Enable standard vines) bool true
#Rarity of standard vines, from 1 to 100, higher numbers are rarer. #Rarity of standard vines, from 1 to 100, higher numbers are rarer.
vines_rarity_standard (Rarity of standard vines) int 90 1 100 vines_rarity_standard (Rarity of standard vines) int 75 1 100
#Enables the type of vines that grow on the sides of leaf blocks. #Enables the type of vines that grow on the sides of leaf blocks.
vines_enable_side (Enable side vines) bool true vines_enable_side (Enable side vines) bool true
#Rarity of side vines, from 1 to 100, higher numbers are rarer. #Rarity of side vines, from 1 to 100, higher numbers are rarer.
vines_rarity_side (Rarity of side vines) int 90 1 100 vines_rarity_side (Rarity of side vines) int 75 1 100
#Enables jungle style vines. #Enables jungle style vines.
vines_enable_jungle (Enable jungle vines) bool true vines_enable_jungle (Enable jungle vines) bool true
#Rarity of jungle vines, from 1 to 100, higher numbers are rarer. #Rarity of jungle vines, from 1 to 100, higher numbers are rarer.
vines_rarity_jungle (Rarity of jungle vines) int 90 1 100 vines_rarity_jungle (Rarity of jungle vines) int 75 1 100
#Enables willow vines. #Enables willow vines.
vines_enable_willow (Enable willow vines) bool true vines_enable_willow (Enable willow vines) bool true
#Rarity of willow vines, from 1 to 100, higher numbers are rarer. #Rarity of willow vines, from 1 to 100, higher numbers are rarer.
vines_rarity_willow (Rarity of willow vines) int 90 1 100 vines_rarity_willow (Rarity of willow vines) int 75 1 100
#Vine growth speed, minimum number of seconds between each growth. #Vine growth speed, minimum number of seconds between each growth.
vines_growth_min (Minimum number of seconds between growth) int 180 1 3600 vines_growth_min (Minimum number of seconds between growth) int 180 1 3600

View file

@ -0,0 +1,3 @@
SDS008 Skin 1
SaranSDS008
CC BY-SA 3.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

@ -77,7 +77,7 @@ minetest.register_node("tubelib_addons3:pusher", {
'tubelib_pusher1.png^tubelib_addons3_node_frame4.png', 'tubelib_pusher1.png^tubelib_addons3_node_frame4.png',
'tubelib_outp.png^tubelib_addons3_node_frame4.png', 'tubelib_outp.png^tubelib_addons3_node_frame4.png',
'tubelib_inp.png^tubelib_addons3_node_frame4.png', 'tubelib_inp.png^tubelib_addons3_node_frame4.png',
"tubelib_pusher1.png^[transformR180]^tubelib_addons3_node_frame4.png^[transformR180]", "tubelib_pusher1.png^tubelib_addons3_node_frame4.png^[transformR180]",
"tubelib_pusher1.png^tubelib_addons3_node_frame4.png", "tubelib_pusher1.png^tubelib_addons3_node_frame4.png",
}, },

View file

@ -238,9 +238,8 @@ local function formspec_add_item_browser(player, formspec, ui_peruser)
ui_peruser.btn_size, ui_peruser.btn_size, ui_peruser.btn_size, ui_peruser.btn_size,
name, button_name name, button_name
) )
formspec[n + 1] = ("tooltip[%s;%s \\[%s\\]]"):format( formspec[n + 1] = ("tooltip[%s;%s]"):format(
button_name, minetest.formspec_escape(item.description), button_name, minetest.formspec_escape(item.description)
item.mod_origin or "??"
) )
n = n + 2 n = n + 2
list_index = list_index + 1 list_index = list_index + 1