Merge remote-tracking branch 'upstream/master'

This commit is contained in:
2023-11-25 15:30:28 +01:00
130 changed files with 1214 additions and 1926 deletions

View File

@ -30,7 +30,7 @@ minetest.register_craft({
-----------------------------------------------------------------------------------------------
-- FIDDLEHEAD
-----------------------------------------------------------------------------------------------
minetest.register_alias("archaeplantae:fiddlehead", "ferns:fiddlehead")
minetest.register_alias("archaeplantae:fiddlehead", "ferns:fiddlehead")
minetest.register_craftitem("ferns:fiddlehead", {
description = S("Fiddlehead"),
@ -51,7 +51,7 @@ minetest.register_craftitem("ferns:fiddlehead_roasted", {
-----------------------------------------------------------------------------------------------
-- FERN TUBER
-----------------------------------------------------------------------------------------------
minetest.register_alias("archaeplantae:ferntuber", "ferns:ferntuber")
minetest.register_alias("archaeplantae:ferntuber", "ferns:ferntuber")
minetest.register_craftitem("ferns:ferntuber", {
description = S("Fern Tuber"),
@ -64,7 +64,7 @@ minetest.register_craft({
cooktime = 3,
})
minetest.register_alias("archaeplantae:ferntuber_roasted", "ferns:ferntuber_roasted")
minetest.register_alias("archaeplantae:ferntuber_roasted", "ferns:ferntuber_roasted")
minetest.register_craftitem("ferns:ferntuber_roasted", {
description = S("Roasted Fern Tuber"),

View File

@ -84,8 +84,8 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
local brk = false
for i = 1, size-3 do
pos_aux.y = pos.y + i
local name = minetest.get_node(pos_aux).name
if not (name == "air" or (i == 1 and name == "ferns:sapling_giant_tree_fern")) then
local nodename = minetest.get_node(pos_aux).name
if not (nodename == "air" or (i == 1 and nodename == "ferns:sapling_giant_tree_fern")) then
brk = true
break
end

View File

@ -34,13 +34,13 @@ local function create_nodes()
local node_drop = "ferns:horsetail_04"
if i == 1 then
node_desc = S("Young Horsetail (Equisetum)")
node_desc = S("Young Horsetail (Equisetum) @1", 1)
node_on_use = minetest.item_eat(1) -- young ones edible https://en.wikipedia.org/wiki/Equisetum
node_drop = node_name
elseif i == 4 then
node_desc = S("Horsetail (Equisetum)")
else
node_desc = S("Horsetail (Equisetum)").." ".. string.format("%02d", i)
node_desc = S("Horsetail (Equisetum) @1", i)
end
node_names[i] = node_name
@ -75,13 +75,10 @@ create_nodes()
-- Spawning
-----------------------------------------------------------------------------------------------
if abstract_ferns.config.enable_horsetails_spawning == true then
biome_lib.register_active_spawner({
spawn_delay = 1200,
spawn_plants = node_names,
spawn_chance = 400,
spawn_surfaces = {
minetest.register_abm({
nodenames = {
"default:dirt_with_grass",
"default:dirt_with_coniferous_litter", -- minetest >= 0.5
"default:dirt_with_coniferous_litter",
"default:desert_sand",
"default:sand",
"dryplants:grass_short",
@ -89,13 +86,28 @@ if abstract_ferns.config.enable_horsetails_spawning == true then
"default:mossycobble",
"default:gravel"
},
seed_diff = 329,
min_elevation = 1, -- above sea level
near_nodes = {"default:water_source","default:river_water_source","default:gravel"},
near_nodes_size = 2,
near_nodes_vertical = 1,
near_nodes_count = 1,
--random_facedir = { 0, 179 },
interval = 1200,
chance = 400,
label = "[ferns] spawn horsetails",
min_y = 1,
max_y = 48,
action = function(pos, node)
local p_top = {x = pos.x, y = pos.y + 1, z = pos.z}
local n_top = minetest.get_node_or_nil(p_top)
if not n_top or n_top.name ~= "air" then return end
local NEAR_DST = 2
if #minetest.find_nodes_in_area(
{x=pos.x-NEAR_DST, y=pos.y-1, z=pos.z-NEAR_DST},
{x=pos.x+NEAR_DST, y=pos.y+1, z=pos.z+NEAR_DST},
{"default:water_source","default:river_water_source","default:gravel"}
) < 1 then return
end
local plant_to_spawn = node_names[math.random(1, #node_names)]
minetest.swap_node(p_top, {name = plant_to_spawn, param2 = 0})
end
})
end

View File

@ -1,16 +1,5 @@
-----------------------------------------------------------------------------------------------
local title = "Ferns" -- former "Archae Plantae"
local version = "0.2.1"
local mname = "ferns" -- former "archaeplantae"
-----------------------------------------------------------------------------------------------
-- (by Mossmanikin)
-----------------------------------------------------------------------------------------------
abstract_ferns = {}
-- support for i18n
local S = minetest.get_translator("ferns")
dofile(minetest.get_modpath("ferns").."/settings.lua")
if abstract_ferns.config.enable_lady_fern == true then
@ -30,42 +19,3 @@ if abstract_ferns.config.enable_giant_treefern == true then
end
dofile(minetest.get_modpath("ferns").."/crafting.lua")
-----------------------------------------------------------------------------
-- TESTS
-----------------------------------------------------------------------------
local run_tests = true -- set to false to skip
if run_tests then
-- These are, essentially, unit tests to make sure that all required item
-- strings are registered. The init sequence is not time critical so leaving
-- them here won't affect performance.
-- Check node names
if abstract_ferns.config.enable_horsetails then
print("[Mod] " ..title.. " Checking horsetail item strings")
assert(minetest.registered_items["ferns:horsetail_01"] ~= nil)
assert(minetest.registered_items["ferns:horsetail_02"] ~= nil)
assert(minetest.registered_items["ferns:horsetail_03"] ~= nil)
assert(minetest.registered_items["ferns:horsetail_04"] ~= nil)
end
if abstract_ferns.config.enable_lady_fern then
print("[Mod] ".. title .." Checking lady fern item strings")
assert(minetest.registered_items["ferns:fern_01"] ~= nil)
assert(minetest.registered_items["ferns:fern_02"] ~= nil)
assert(minetest.registered_items["ferns:fern_03"] ~= nil)
end
if abstract_ferns.config.enable_treefern then
print("[Mod] ".. title .." Checking tree fern item strings")
assert(minetest.registered_items["ferns:tree_fern_leaves"] ~= nil)
assert(minetest.registered_items["ferns:tree_fern_leaves_02"] ~= nil)
assert(minetest.registered_items["ferns:fern_trunk"] ~= nil)
assert(minetest.registered_items["ferns:sapling_tree_fern"] ~= nil)
end
end
-----------------------------------------------------------------------------------------------
print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...")
-----------------------------------------------------------------------------------------------

View File

@ -1,23 +1,16 @@
# textdomain: ferns
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# reusityback, 2022.
#
Fiddlehead=Geigenkopf
Roasted Fiddlehead=Gerösteter Geigenkopf
Fern Tuber=Farnknolle
Roasted Fern Tuber=Geröstete Farnknolle
Lady-fern (Athyrium)=Frauenfarn (Athyrium)
Tree Fern Crown (Dicksonia)=Baumfarnkrone (Dicksonia)
Giant Tree Fern Leaves=Riesige Baumfarnblätter
Giant Tree Fern Leave End=Riesiges Baumfarnblattende
Giant Fern Trunk=Riesiger Baumfarnstamm
Giant Tree Fern Sapling=Riesiger Baumfarnsetzling
Young Horsetail (Equisetum)=Junger Schachtelhalm (Equisetum)
Tree Fern Crown (Dicksonia)=Baumfarnkrone (Dicksonia)
Young Horsetail (Equisetum) @1=Junger Schachtelhalm (Equisetum) @1
Horsetail (Equisetum)=Schachtelhalm (Equisetum)
Horsetail (Equisetum) @1= Schachtelhalm (Equisetum) @1
Fern Trunk (Dicksonia)=Farnstamm (Dicksonia)
Tree Fern Sapling (Dicksonia)=Baumfarnsetzling (Dicksonia)

View File

@ -1,23 +1,16 @@
# textdomain: ferns
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Jolesh, 2022.
#
Fiddlehead=Filika Supro
Roasted Fiddlehead=Rostita Filika Supro
Fern Tuber=Filika Tubero
Roasted Fern Tuber=Rostita Filika Tubero
Lady-fern (Athyrium)=Afiriumo (Athyrium)
Tree Fern Crown (Dicksonia)=Krono de Arba Filiko
Giant Tree Fern Leaves=Folioj de Giganta Arba Filiko
Giant Tree Fern Leave End=Folifino de Giganta Arba Filiko
Giant Fern Trunk=Trunko de Giganta Arba Filiko
Giant Tree Fern Sapling=Arbido de Giganta Arba Filiko
Young Horsetail (Equisetum)=Juna Ekvizeto (Equisetum)
Tree Fern Crown (Dicksonia)=Krono de Arba Filiko
Young Horsetail (Equisetum) @1=Juna Ekvizeto (Equisetum) @1
Horsetail (Equisetum)=Ekvizeto (Equisetum)
Horsetail (Equisetum) @1=Ekvizeto (Equisetum) @1
Fern Trunk (Dicksonia)=Trunko de Arba Filiko (Dicksonia)
Tree Fern Sapling (Dicksonia)=Arbido de Arba Filiko (Dicksonia)

View File

@ -1,22 +1,16 @@
# textdomain: ferns
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# fat115 <fat115@framasoft.org>, 2017.
#
Fiddlehead=Crosse de fougère
Roasted Fiddlehead=Crosse de fougère rôtie
Fern Tuber=Tubercule de fougère
Roasted Fern Tuber=Tubercule de fougère rôti
Lady-fern (Athyrium)=Fougère (Athyrium)
Tree Fern Crown (Dicksonia)=Fougère en couronne (Dicksonia)
Giant Tree Fern Leaves=Feuilles de fougère géante
Giant Tree Fern Leave End=Feuilles de fougère géante (extrémité)
Giant Fern Trunk=Tronc de fougère géante
Giant Tree Fern Sapling=Pousse de fougère géante
Young Horsetail (Equisetum)=Pousse de prêle (Equisetum)
Tree Fern Crown (Dicksonia)=Fougère en couronne (Dicksonia)
Young Horsetail (Equisetum) @1=Pousse de prêle (Equisetum) @1
Horsetail (Equisetum)=Prêle (Equisetum)
Horsetail (Equisetum) @1=Prêle (Equisetum) @1
Fern Trunk (Dicksonia)=Tronc de fougère en couronne (Dicksonia)
Tree Fern Sapling (Dicksonia)=Pousse de fougère en couronne (Dicksonia)

View File

@ -1,23 +1,16 @@
# textdomain: ferns
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
Fiddlehead=
Roasted Fiddlehead=
Fern Tuber=
Roasted Fern Tuber=
Lady-fern (Athyrium)=
Tree Fern Crown (Dicksonia)=
Giant Tree Fern Leaves=
Giant Tree Fern Leave End=
Giant Fern Trunk=
Giant Tree Fern Sapling=
Young Horsetail (Equisetum)=
Tree Fern Crown (Dicksonia)=
Young Horsetail (Equisetum) @1=
Horsetail (Equisetum)=
Horsetail (Equisetum) @1=
Fern Trunk (Dicksonia)=
Tree Fern Sapling (Dicksonia)=