From f36ea184362647689ddfea73aaddff93c0ce85e5 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Dec 2021 15:04:24 +0100 Subject: [PATCH] update --- mods/biome_lib/api.lua | 29 ++--------- mods/mobs_redo/api.lua | 4 +- mods/mobs_redo/locale/de_DE.po | 2 +- .../locale/{mobs.de_DE.tr => mobs.de.tr} | 0 mods/plantlife_modpack/vines/init.lua | 49 +++++++++--------- mods/plantlife_modpack/vines/settingtypes.txt | 10 ++-- mods/skinsdb/meta/character_2144.txt | 3 ++ mods/skinsdb/textures/character_2144.png | Bin 0 -> 1194 bytes mods/techpack/tubelib_addons3/pusher.lua | 2 +- mods/unified_inventory/internal.lua | 5 +- 10 files changed, 42 insertions(+), 62 deletions(-) rename mods/mobs_redo/locale/{mobs.de_DE.tr => mobs.de.tr} (100%) create mode 100644 mods/skinsdb/meta/character_2144.txt create mode 100644 mods/skinsdb/textures/character_2144.png diff --git a/mods/biome_lib/api.lua b/mods/biome_lib/api.lua index a00ff428..b75beb11 100644 --- a/mods/biome_lib/api.lua +++ b/mods/biome_lib/api.lua @@ -14,16 +14,6 @@ biome_lib.fertile_perlin_octaves = 3 biome_lib.fertile_perlin_persistence = 0.6 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")) biome_lib.time_scale = 1 @@ -37,10 +27,6 @@ biome_lib.air = {name = "air"} -- still specify a wider range if needed. 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 @@ -55,17 +41,10 @@ end local function get_biome_data(pos, perlin_fertile) 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) - if data then - return fertility, data.heat / 100, data.humidity / 100 - 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 + local data = minetest.get_biome_data(pos) + -- Original values this method returned were +1 (lowest) to -1 (highest) + -- so we need to convert the 0-100 range from get_biome_data() to that. + return fertility, 1 - (data.heat / 100 * 2), 1 - (data.humidity / 100 * 2) end function biome_lib.is_node_loaded(node_pos) diff --git a/mods/mobs_redo/api.lua b/mods/mobs_redo/api.lua index 8022605d..6ca5feda 100644 --- a/mods/mobs_redo/api.lua +++ b/mods/mobs_redo/api.lua @@ -1,6 +1,6 @@ -- Load support for intllib. 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") -- CMI support check @@ -8,7 +8,7 @@ local use_cmi = minetest.global_exists("cmi") mobs = { mod = "redo", - version = "20211116", + version = "20211212", intllib = S, invis = minetest.global_exists("invisibility") and invisibility or {} } diff --git a/mods/mobs_redo/locale/de_DE.po b/mods/mobs_redo/locale/de_DE.po index 210990d8..ac406bf8 100644 --- a/mods/mobs_redo/locale/de_DE.po +++ b/mods/mobs_redo/locale/de_DE.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2017-07-02 14:27+0200\n" "Last-Translator: Wuzzy \n" "Language-Team: \n" -"Language: de_DE\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/mods/mobs_redo/locale/mobs.de_DE.tr b/mods/mobs_redo/locale/mobs.de.tr similarity index 100% rename from mods/mobs_redo/locale/mobs.de_DE.tr rename to mods/mobs_redo/locale/mobs.de.tr diff --git a/mods/plantlife_modpack/vines/init.lua b/mods/plantlife_modpack/vines/init.lua index 594a00dc..7873e54a 100644 --- a/mods/plantlife_modpack/vines/init.lua +++ b/mods/plantlife_modpack/vines/init.lua @@ -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_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_standard = tonumber(minetest.settings:get("vines_rarity_standard")) 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 drop_item = vine_name_end end - + wielded_item = player:get_wielded_item() if wielded_item then wielded_item:add_wear(1) @@ -93,10 +93,6 @@ vines.register_vine = function( name, defs, biome ) end end - local vine_group = 'group:' .. name .. '_vines' - - biome.surface[#biome.surface + 1] = vine_group - local selection_box = {type = "wallmounted",} local drawtype = 'signlike' @@ -362,24 +358,21 @@ minetest.register_tool("vines:shears", { }) -- VINES -local spawn_root_surfaces = {} - if enable_roots ~= false then - spawn_root_surfaces = { - "default:dirt_with_grass", - "default:dirt" - } - vines.register_vine('root', {description = S("Roots"), average_length = 9}, { - choose_random_wall = true, + check_air = false, avoid_nodes = {"vines:root_middle"}, avoid_radius = 5, - surface = spawn_root_surfaces, + surface = { + "default:dirt_with_grass", + "default:dirt" + }, spawn_on_bottom = true, plantlife_limit = -0.6, rarity = rarity_roots, - -- humidity_min = 0.4, + humidity_min = 0.4, + temp_min = 0.4, }) else minetest.register_alias('vines:root_middle', 'air') @@ -389,7 +382,7 @@ end if enable_standard ~= false then vines.register_vine('vine', {description = S("Vines"), average_length = 5}, { - choose_random_wall = true, + check_air = false, avoid_nodes = {"group:vines"}, avoid_radius = 5, surface = { @@ -402,7 +395,8 @@ if enable_standard ~= false then spawn_on_bottom = true, plantlife_limit = -0.9, rarity = rarity_standard, - -- humidity_min = 0.7, + humidity_min = 0.7, + temp_min = 0.4, }) else minetest.register_alias('vines:vine_middle', 'air') @@ -412,7 +406,7 @@ end if enable_side ~= false then vines.register_vine('side', {description = S("Vines"), average_length = 6}, { - choose_random_wall = true, + check_air = false, avoid_nodes = {"group:vines", "default:apple"}, avoid_radius = 3, surface = { @@ -425,7 +419,8 @@ if enable_side ~= false then spawn_on_side = true, plantlife_limit = -0.9, rarity = rarity_side, - -- humidity_min = 0.4, + humidity_min = 0.4, + temp_min = 0.4, }) else minetest.register_alias('vines:side_middle', 'air') @@ -435,13 +430,15 @@ end if enable_jungle ~= false then vines.register_vine("jungle", {description = S("Jungle Vines"), average_length = 7}, { - choose_random_wall = true, - neighbors = { + check_air = false, + near_nodes = { "default:jungleleaves", "moretrees:jungletree_leaves_red", "moretrees:jungletree_leaves_yellow", "moretrees:jungletree_leaves_green" }, + near_nodes_size = 4, + near_nodes_vertical = 4, avoid_nodes = { "vines:jungle_middle", "vines:jungle_end", @@ -454,7 +451,8 @@ if enable_jungle ~= false then spawn_on_side = true, plantlife_limit = -0.9, rarity = rarity_jungle, - -- humidity_min = 0.2, + humidity_min = 0.2, + temp_min = 0.3, }) else minetest.register_alias('vines:jungle_middle', 'air') @@ -464,7 +462,7 @@ end if enable_willow ~= false then vines.register_vine( 'willow', {description = S("Willow Vines"), average_length = 9}, { - choose_random_wall = true, + check_air = false, avoid_nodes = {"vines:willow_middle"}, avoid_radius = 5, near_nodes = {'default:water_source'}, @@ -475,7 +473,8 @@ if enable_willow ~= false then spawn_on_side = true, surface = {"moretrees:willow_leaves"}, rarity = rarity_willow, - -- humidity_min = 0.5 + humidity_min = 0.5, + temp_min = 0.5, }) else minetest.register_alias('vines:willow_middle', 'air') diff --git a/mods/plantlife_modpack/vines/settingtypes.txt b/mods/plantlife_modpack/vines/settingtypes.txt index 4e0f6d80..a1936bf6 100644 --- a/mods/plantlife_modpack/vines/settingtypes.txt +++ b/mods/plantlife_modpack/vines/settingtypes.txt @@ -8,31 +8,31 @@ vines_enable_rope (Enable vine ropes) bool true vines_enable_roots (Enable root vines) bool true #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. vines_enable_standard (Enable standard vines) bool true #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. vines_enable_side (Enable side vines) bool true #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. vines_enable_jungle (Enable jungle vines) bool true #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. vines_enable_willow (Enable willow vines) bool true #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. vines_growth_min (Minimum number of seconds between growth) int 180 1 3600 diff --git a/mods/skinsdb/meta/character_2144.txt b/mods/skinsdb/meta/character_2144.txt new file mode 100644 index 00000000..52db983a --- /dev/null +++ b/mods/skinsdb/meta/character_2144.txt @@ -0,0 +1,3 @@ +SDS008 Skin 1 +SaranSDS008 +CC BY-SA 3.0 diff --git a/mods/skinsdb/textures/character_2144.png b/mods/skinsdb/textures/character_2144.png new file mode 100644 index 0000000000000000000000000000000000000000..6058e4c549bc148294935dd48409300927ef94d5 GIT binary patch literal 1194 zcmV;b1XcTqP)Px(WJyFpRA@u(nQ2H=Q546|r8Ko1#7UxP`(l(u(MD*LCD8&wi)CP|v{E1yL}HN@ zB}NNj3sFHULW@QaZG;h_eJBZ|D2hH5L9~oaj*X)hH_om5c=yfqo@X;!QV)h1-#z!9 zbAIQ4m-l2qTyrK4DcLhK~kP47M=50OKxdEgN>}3J)H#CZ3CH06`rT`|Nos*{&vi#yH zp^CiXi~j-qNr_Xw$?CY70?z77r>KHXKLy+@f>USaYC+$=R@V6!K{wlAdRDd;z=O(i z`0Ka9CDTV6SNXI7Dd2AiK~iEo`0Il|7eP+~_ydhlA8dk##%AL=0PRiZh_g3q$Z3dU zT;I2xqtDM@zKZd-9KY$R-{;|jIri`QFEKgKdFG-tEQU)5E7;&PPJ1~E-T9AQug+#gvsN1q~O?fQb7no zP62!MF*a7ZeijKJ|KL@j82++Se6vAW;=6SHEb(oc<5YY8!K=mu?D5rq4Z+bX4=j6Z zqxz$N2|%|}vr~mRMgW-HlI>?;#{OEUUi@8*k#VjIRPUS!hc?U>C&EYoP$$LRE2oM0 zaKW`FPaSaFwzJE-7Ly8?TX+V>7u{C?RPC4m6~#*--YKT9KCE>m*MQdI@IAaBny58}MH|4q{JsK!^9d233=u+R={qH6 zX|H>yh_GZLxDNX9ip-^nFZQBBm}7dv`zLT0F2-CJ9%4uIvfD6IRW1qd|`0I7+Y(NgE%kW(1ARoLP9%