update basic_materials, farmind-redo, ropes

This commit is contained in:
Vanessa Dannenberg 2019-04-28 21:13:18 -04:00
parent d17c01a297
commit 9d1d680fee
10 changed files with 129 additions and 79 deletions

View File

@ -41,7 +41,7 @@ minetest.register_node("basic_materials:concrete_block", {
minetest.register_craft({
type = "shapeless",
output = "basic_materials:oil_extract 1",
output = "basic_materials:oil_extract 2",
recipe = {
"group:leaves",
"group:leaves",

View File

@ -13,6 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
### Changelog:
- 1.41 - Each crop has it's own spawn rate (can be changed in farming.conf)
- 1.40 - Added Mithril Scythe to quick harvest and replant crops on right-click. Added Hoe's for MoreOres with Toolrank support.
- 1.39 - Added Rice, Rye and Oats thanks to Ademants Grains mod. Added Jaffa Cake and multigrain bread.
- 1.38 - Pumpkin grows into block, use chopping board to cut into 4x slices, same with melon block, 2x2 slices makes a block, cocoa pods are no longer walkable

View File

@ -5,31 +5,32 @@
world folder for map specific settings.
--]]
-- true to enable crop/food in-game and on mapgen
farming.carrot = true
farming.potato = true
farming.tomato = true
farming.cucumber = true
farming.corn = true
farming.coffee = true
farming.melon = true
farming.pumpkin = true
farming.cocoa = true
farming.raspberry = true
farming.blueberry = true
farming.rhubarb = true
farming.beans = true
farming.grapes = true
farming.barley = true
farming.chili = true
farming.hemp = true
farming.onion = true
farming.garlic = true
farming.pepper = true
farming.pineapple = true
farming.peas = true
farming.beetroot = true
farming.grains = true
-- rarety of crops on map, default is 0.001 (higher number = more crops)
-- true to enable crop/food in-game and on mapgen set spawn rarety
farming.carrot = 0.001
farming.potato = 0.001
farming.tomato = 0.001
farming.cucumber = 0.001
farming.corn = 0.001
farming.coffee = 0.001
farming.melon = 0.001
farming.pumpkin = 0.001
farming.cocoa = true -- true or false only
farming.raspberry = 0.001
farming.blueberry = 0.001
farming.rhubarb = 0.001
farming.beans = 0.001
farming.grapes = 0.001
farming.barley = true -- true or false only
farming.chili = 0.002
farming.hemp = 0.002
farming.garlic = 0.001
farming.onion = 0.001
farming.pepper = 0.002
farming.pineapple = 0.001
farming.peas = 0.001
farming.beetroot = 0.001
farming.grains = true -- true or false only
farming.rarety = 0.002
-- default rarety of crops on map (higher number = more crops)
farming.rarety = 0.002

View File

@ -7,7 +7,7 @@
farming = {
mod = "redo",
version = "20190111",
version = "20190427",
path = minetest.get_modpath("farming"),
select = {
type = "fixed",
@ -599,31 +599,31 @@ end
-- default settings
farming.carrot = true
farming.potato = true
farming.tomato = true
farming.cucumber = true
farming.corn = true
farming.coffee = true
farming.melon = true
farming.pumpkin = true
farming.carrot = 0.001
farming.potato = 0.001
farming.tomato = 0.001
farming.cucumber = 0.001
farming.corn = 0.001
farming.coffee = 0.001
farming.melon = 0.001
farming.pumpkin = 0.001
farming.cocoa = true
farming.raspberry = true
farming.blueberry = true
farming.rhubarb = true
farming.beans = true
farming.grapes = true
farming.raspberry = 0.001
farming.blueberry = 0.001
farming.rhubarb = 0.001
farming.beans = 0.001
farming.grapes = 0.001
farming.barley = true
farming.chili = true
farming.hemp = true
farming.garlic = true
farming.onion = true
farming.pepper = true
farming.pineapple = true
farming.peas = true
farming.beetroot = true
farming.chili = 0.002
farming.hemp = 0.002
farming.garlic = 0.001
farming.onion = 0.001
farming.pepper = 0.002
farming.pineapple = 0.001
farming.peas = 0.001
farming.beetroot = 0.001
farming.grains = true
farming.rarety = 0.002 -- 0.006
farming.rarety = 0.002
-- Load new global settings if found inside mod folder

View File

@ -1,18 +1,22 @@
-- decoration function
local function register_plant(name, min, max, spawnon, spawnby, num, enabled)
local function register_plant(name, min, max, spawnon, spawnby, num, rarety)
if enabled ~= true then
-- do not place on mapgen if no value given (or not true)
if not rarety then
return
end
-- set rarety value or default to farming.rarety if not a number
rarety = tonumber(rarety) or farming.rarety
minetest.register_decoration({
deco_type = "simple",
place_on = spawnon or {"default:dirt_with_grass"},
sidelen = 16,
noise_params = {
offset = 0,
scale = farming.rarety, -- 0.006,
scale = rarety,
spread = {x = 100, y = 100, z = 100},
seed = 329,
octaves = 3,
@ -55,7 +59,7 @@ else
register_plant("carrot_8", 1, 15, nil, "", -1, farming.carrot)
register_plant("cucumber_4", 1, 10, nil, "", -1, farming.cucumber)
register_plant("melon_8", 1, 6, {"default:dirt_with_dry_grass",
"default:dirt_with_rainforest_litter"}, "", -1, farming.melon)
"default:dirt_with_rainforest_litter"}, "", -1, farming.melon)
register_plant("pumpkin_8", 1, 6, nil, "", -1, farming.pumpkin)
end
@ -66,7 +70,7 @@ minetest.register_decoration({
sidelen = 16,
noise_params = {
offset = 0,
scale = farming.rarety, -- 0.06,
scale = tonumber(farming.hemp) or farming.rarety,
spread = {x = 100, y = 100, z = 100},
seed = 420,
octaves = 3,
@ -87,7 +91,7 @@ minetest.register_decoration({
sidelen = 16,
noise_params = {
offset = 0,
scale = farming.rarety, -- 0.06,
scale = tonumber(farming.chili) or farming.rarety,
spread = {x = 100, y = 100, z = 100},
seed = 760,
octaves = 3,
@ -108,7 +112,7 @@ minetest.register_decoration({
sidelen = 16,
noise_params = {
offset = 0,
scale = farming.rarety, -- 0.06,
scale = tonumber(farming.pepper) or farming.rarety,
spread = {x = 100, y = 100, z = 100},
seed = 933,
octaves = 3,
@ -129,7 +133,7 @@ minetest.register_decoration({
sidelen = 16,
noise_params = {
offset = 0,
scale = farming.rarety, -- 0.06,
scale = tonumber(farming.pineapple) or farming.rarety,
spread = {x = 100, y = 100, z = 100},
seed = 917,
octaves = 3,

View File

@ -3,6 +3,22 @@ local S, NS = dofile(modpath.."/intllib.lua")
if ropes.extending_ladder_enabled then
local wood_recipe = {
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "", "group:stick"},
{"group:stick", "", "group:stick"},
}
local wood_name = S("Wooden Extendable Ladder")
local steel_recipe = {
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
{"default:steel_ingot", "", "default:steel_ingot"},
{"default:steel_ingot", "", "default:steel_ingot"},
}
local steel_name = S("Steel Extendable Ladder")
if ropes.replace_default_ladders then
minetest.unregister_item("default:ladder_wood")
minetest.unregister_item("default:ladder_steel")
minetest.clear_craft({output = "default:ladder_wood"})
@ -33,24 +49,31 @@ minetest.register_lbm({
end,
})
minetest.register_craft({
output = "ropes:ladder_wood 5",
recipe = {
wood_recipe = {
{"group:stick", "", "group:stick"},
{"group:stick", "group:stick", "group:stick"},
{"group:stick", "", "group:stick"},
}
})
wood_name = S("Wooden Ladder")
minetest.register_craft({
output = 'ropes:ladder_steel 15',
recipe = {
steel_recipe = {
{'default:steel_ingot', '', 'default:steel_ingot'},
{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
{'default:steel_ingot', '', 'default:steel_ingot'},
}
steel_name = S("Steel Ladder")
end
minetest.register_craft({
output = "ropes:ladder_wood 5",
recipe = wood_recipe,
})
minetest.register_craft({
output = 'ropes:ladder_steel 15',
recipe = steel_recipe,
})
local ladder_extender = function(pos, node, clicker, itemstack, pointed_thing, ladder_node, standing_limit)
-- on_rightclick can be called by other mods, make sure we have all the parameters we need
@ -105,7 +128,7 @@ local ladder_extender = function(pos, node, clicker, itemstack, pointed_thing, l
end
minetest.register_node("ropes:ladder_wood", {
description = S("Wooden Ladder"),
description = wood_name,
_doc_items_longdesc = ropes.doc.ladder_longdesc,
_doc_items_usagehelp = ropes.doc.ladder_usagehelp,
tiles = {"default_wood.png","default_wood.png","default_wood.png^[transformR270","default_wood.png^[transformR270","default_ladder_wood.png"},
@ -138,7 +161,7 @@ minetest.register_node("ropes:ladder_wood", {
})
minetest.register_node("ropes:ladder_steel", {
description = S("Steel Ladder"),
description = steel_name,
_doc_items_longdesc = ropes.doc.ladder_longdesc,
_doc_items_usagehelp = ropes.doc.ladder_usagehelp,
tiles = {"default_steel_block.png","default_steel_block.png","default_steel_block.png","default_steel_block.png","default_ladder_steel.png"},

View File

@ -18,6 +18,8 @@ ropes.extending_ladder_enabled = minetest.settings:get_bool("ropes_extending_lad
if ropes.extending_ladder_enabled == nil then
ropes.extending_ladder_enabled = true
end
ropes.replace_default_ladders = minetest.settings:get_bool("ropes_replace_default_ladders")
ropes.extending_wood_ladder_limit = tonumber(minetest.settings:get("ropes_extending_wood_ladder_limit")) or 5
ropes.extending_steel_ladder_limit = tonumber(minetest.settings:get("ropes_extending_steel_ladder_limit")) or 15
@ -35,7 +37,6 @@ dofile( MP .. "/extendingladder.lua" )
dofile( MP .. "/bridge.lua" )
dofile( MP .. "/loot.lua" )
for i=1,5 do
minetest.register_alias(string.format("vines:%irope_block", i), string.format("ropes:%irope_block", i))
end

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-11-27 22:45-0700\n"
"POT-Creation-Date: 2019-04-28 16:30-0600\n"
"PO-Revision-Date: 2018-10-27 11:26+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: bridge.lua:47
#: bridge.lua:49
msgid "Wooden Bridge"
msgstr ""
@ -189,14 +189,22 @@ msgid ""
"that juts out away from the location you're standing on."
msgstr ""
#: extendingladder.lua:103
#: extendingladder.lua:11
msgid "Wooden Ladder"
msgstr ""
#: extendingladder.lua:136
#: extendingladder.lua:18
msgid "Steel Ladder"
msgstr ""
#: extendingladder.lua:57
msgid "Wooden Extendable Ladder"
msgstr ""
#: extendingladder.lua:64
msgid "Steel Extendable Ladder"
msgstr ""
#: ropeboxes.lua:121
msgid "@1 Ropebox @2m"
msgstr "Caja de cuerda de @1 de @2m"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-11-27 22:45-0700\n"
"POT-Creation-Date: 2019-04-28 16:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: bridge.lua:47
#: bridge.lua:49
msgid "Wooden Bridge"
msgstr ""
@ -147,14 +147,22 @@ msgid ""
"that juts out away from the location you're standing on."
msgstr ""
#: extendingladder.lua:103
#: extendingladder.lua:11
msgid "Wooden Ladder"
msgstr ""
#: extendingladder.lua:136
#: extendingladder.lua:18
msgid "Steel Ladder"
msgstr ""
#: extendingladder.lua:57
msgid "Wooden Extendable Ladder"
msgstr ""
#: extendingladder.lua:64
msgid "Steel Extendable Ladder"
msgstr ""
#: ropeboxes.lua:121
msgid "@1 Ropebox @2m"
msgstr ""

View File

@ -36,12 +36,16 @@ ropes_steel_rope_box_max_multiple (Maximum steel rope box multiple) int 9 0 9
#existing rope boxes into "unknown node"s.
ropes_create_all_definitions (Create all rope box definitions) bool false
#Extending ladders replaces the default wallmounted wood and steel ladders
#with ladders capable of standing on their own, to a defined limit.
#Extending ladders are capable of standing on their own, to a defined limit.
#A ladder can extend to its unsupported limit before needing another node
#behind it to provide a new point of support. Right-clicking on an existing
#ladder with a stack of ladders will add new ladder segments to its top.
ropes_extending_ladder_enabled (Enable extendable ladders) bool true
#If extending ladders are enabled, this setting will cause them to replace
#the default ladders entirely.
ropes_replace_default_ladders (Replace default ladders with extendable ladders) bool false
ropes_extending_wood_ladder_limit (Unsupported limit of wooden ladders) int 5
ropes_extending_steel_ladder_limit (Unsupported limit of steel ladders) int 15