Balance: Food: change points; renames/translations; add satiety for e…

…gg; remove from salt-block. Closes #1571. Closes #1576. #1581.

mods/lord/Blocks/lord_trees/src/tree/fruits.lua

@@ -17,9 +17,9 @@ minetest.register_node("lord_trees:plum", {
 	groups              = {
 		fleshy = 3, dig_immediate = 3, flammable = 2, leafdecay = 3, leafdecay_drop = 1, color_violet = 1
 	},
-	on_use              = minetest.item_eat(2),
+	on_use              = minetest.item_eat(4),
 	_tt_food            = true,
-	_tt_food_hp         = 2,
+	_tt_food_hp         = 4,
 	sounds              = default.node_sound_leaves_defaults(),
 	after_place_node    = function(pos, placer, itemstack)
 		if placer:is_player() then

mods/lord/Blocks/lottfarming/athelas.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:athelas_seed", {
-	description = SL("Athelas Seeds"),
+	description = S("Athelas Seeds"),
 	inventory_image = "lottfarming_athelas_seed.png",
 	on_place = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -72,7 +72,7 @@ minetest.register_node("lottfarming:athelas_3", {
 })
 
 minetest.register_craftitem("lottfarming:athelas", {
-	description = SL("Athelas"),
+	description = S("Athelas"),
 	inventory_image = "lottfarming_athelas.png",
 })
 

mods/lord/Blocks/lottfarming/barley.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:barley_seed", {
-	description = SL("Barley Seeds"),
+	description = S("Barley Seeds"),
 	inventory_image = "lottfarming_barley_seed.png",
 	on_place = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -69,7 +69,7 @@ minetest.register_node("lottfarming:barley_3", {
 })
 
 minetest.register_craftitem("lottfarming:sheaf_barley", {
-	description = SL("Sheaf barley"),
+	description = S("Sheaf barley"),
 	inventory_image = "lottfarming_sheaf_barley.png",
 })
 
@@ -83,9 +83,10 @@ minetest.register_craft({
 })
 
 minetest.register_craftitem("lottfarming:barley_cooked", {
-	description     = SL("Cooked Barley"),
+	description     = S("Cooked Barley"),
 	inventory_image = "lottfarming_barley_cooked.png",
-	on_use          = minetest.item_eat(2),
-	_tt_food        = true,
-	_tt_food_hp     = 2,
+	-- removed while balancing food TODO: add to horse follow & tame #1583
+	--on_use          = minetest.item_eat(2),
+	--_tt_food        = true,
+	--_tt_food_hp     = 2,
 })

mods/lord/Blocks/lottfarming/berries.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:berries_seed", {
-	description     = SL("Berries Seeds"),
+	description     = S("Berries Seeds"),
 	inventory_image = "lottfarming_berries_seed.png",
 	on_place        = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -90,11 +90,11 @@ minetest.register_node("lottfarming:berries_4", {
 })
 
 minetest.register_craftitem("lottfarming:berries", {
-	description     = SL("Berries"),
+	description     = S("Berries"),
 	inventory_image = "lottfarming_berries.png",
-	on_use          = minetest.item_eat(1),
+	on_use          = minetest.item_eat(3),
 	_tt_food        = true,
-	_tt_food_hp     = 1,
+	_tt_food_hp     = 3,
 })
 
 farming:add_plant(

mods/lord/Blocks/lottfarming/blue.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:blue_mushroom_spore", {
-	description = SL("Blue Mushroom Spores"),
+	description = S("Blue Mushroom Spores"),
 	inventory_image = "lottfarming_blue_mushroom_spore.png",
 	on_place = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -14,7 +14,7 @@ minetest.register_craftitem("lottfarming:blue_mushroom_spore", {
 })
 
 minetest.register_node("lottfarming:blue_mushroom", {
-	description = SL("Blue Mushroom"),
+	description = S("Blue Mushroom"),
 	paramtype = "light",
 	paramtype2 = "meshoptions",
 	place_param2 = 9,
@@ -32,9 +32,9 @@ minetest.register_node("lottfarming:blue_mushroom", {
 	groups = {snappy=3, flammable=2, mushroom=1, flower=1, color_blue=1},
 	sounds = default.node_sound_leaves_defaults(),
 	inventory_image = "lottfarming_blue_mushroom.png",
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(1),
 	_tt_food = true,
-	_tt_food_hp = 2,
+	_tt_food_hp = 1,
 })
 minetest.register_node("lottfarming:blue_mushroom_1", {
 	paramtype = "light",
@@ -217,9 +217,9 @@ minetest.register_abm({
 })
 
 minetest.register_craftitem("lottfarming:mushroom_soup", {
-	description     = SL("Cream of Mushroom Soup"),
+	description     = S("Cream of Mushroom Soup"),
 	inventory_image = "lottfarming_mushroom_soup.png",
-	on_use          = minetest.item_eat(6),
+	on_use          = minetest.item_eat(20),
 	_tt_food        = true,
-	_tt_food_hp     = 6,
+	_tt_food_hp     = 20,
 })

mods/lord/Blocks/lottfarming/brown.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:brown_mushroom_spore", {
-	description = SL("Brown Mushroom Spores"),
+	description = S("Brown Mushroom Spores"),
 	inventory_image = "lottfarming_brown_mushroom_spore.png",
 	on_place = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -14,7 +14,7 @@ minetest.register_craftitem("lottfarming:brown_mushroom_spore", {
 })
 
 minetest.register_craftitem("lottfarming:brown_mushroom", {
-	description     = SL("Brown Mushroom"),
+	description     = S("Brown Mushroom"),
 	tiles           = { "lottfarming_brown_mushroom_4.png" },
 	groups          = { mushroom = 1, flower = 1, color_brown = 1 },
 	inventory_image = "lottfarming_brown_mushroom.png",

mods/lord/Blocks/lottfarming/cabbage.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:cabbage_seed", {
-	description     = SL("Cabbage Seed"),
+	description     = S("Cabbage Seed"),
 	inventory_image = "lottfarming_cabbage_seed.png",
 	on_place        = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -84,7 +84,7 @@ minetest.register_node("lottfarming:cabbage_2", {
 })
 
 minetest.register_node("lottfarming:cabbage_3", {
-	description = SL("Cabbage"),
+	description = S("Cabbage"),
 	paramtype2  = "facedir",
 	tiles       = {
 		"lottfarming_cabbage_top.png",
@@ -110,7 +110,7 @@ minetest.register_node("lottfarming:cabbage_3", {
 })
 
 minetest.register_node("lottfarming:cabbage", {
-	description = SL("Cabbage"),
+	description = S("Cabbage"),
 	paramtype2  = "facedir",
 	tiles       = {
 		"lottfarming_cabbage_top.png",
@@ -122,17 +122,17 @@ minetest.register_node("lottfarming:cabbage", {
 	},
 	groups      = { choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, plant = 1, salad = 1 },
 	sounds      = default.node_sound_wood_defaults(),
-	on_use      = minetest.item_eat(4),
+	on_use      = minetest.item_eat(5),
 	_tt_food    = true,
-	_tt_food_hp = 4,
+	_tt_food_hp = 5,
 })
 
 farming:add_plant("lottfarming:cabbage_3", { "lottfarming:cabbage_1", "lottfarming:cabbage_2" }, 80, 20)
 
 minetest.register_craftitem("lottfarming:salad", {
-	description     = SL("Salad"),
+	description     = S("Salad"),
 	inventory_image = "lottfarming_salad.png",
-	on_use          = minetest.item_eat(10),
+	on_use          = minetest.item_eat(16),
 	_tt_food        = true,
-	_tt_food_hp     = 10,
+	_tt_food_hp     = 16,
 })

mods/lord/Blocks/lottfarming/carrots.lua

@@ -1,8 +1,7 @@
--- main `S` code in init.lua
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:carrot_seed", {
-	description     = SL("Carrot Seeds"),
+	description     = S("Carrot Seeds"),
 	inventory_image = "farming_carrot_seed.png",
 	on_place        = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -83,11 +82,11 @@ minetest.register_node("lottfarming:carrot", {
 })
 
 minetest.register_craftitem("lottfarming:carrot_item", {
-	description     = SL("Carrot"),
+	description     = S("Carrot"),
 	inventory_image = "farming_carrot.png",
-	on_use          = minetest.item_eat(2),
+	on_use          = minetest.item_eat(4),
 	_tt_food        = true,
-	_tt_food_hp     = 2,
+	_tt_food_hp     = 4,
 })
 
 farming:add_plant(

mods/lord/Blocks/lottfarming/corn.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:corn_seed", {
-	description     = SL("Corn"),
+	description     = S("Corn"),
 	inventory_image = "lottfarming_corn_seed.png",
 	on_place        = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -13,12 +13,12 @@ minetest.register_craftitem("lottfarming:corn_seed", {
 	end,
 })
 minetest.register_craftitem("lottfarming:ear_of_corn", {
-	description     = SL("Ear of corn"),
+	description     = S("Ear of corn"),
 	inventory_image = "lottfarming_ear_of_corn.png",
 	groups          = { salad = 1 },
-	on_use          = minetest.item_eat(4),
+	on_use          = minetest.item_eat(3),
 	_tt_food        = true,
-	_tt_food_hp     = 4,
+	_tt_food_hp     = 3,
 })
 minetest.register_node("lottfarming:corn_1", {
 	paramtype     = "light",

mods/lord/Blocks/lottfarming/crafting.lua

@@ -1,4 +1,4 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 -- ITEMS and TOOLS
 
@@ -12,12 +12,12 @@ minetest.register_craft({
 })
 
 minetest.register_craftitem("lottfarming:bowl", {
-	description = SL("Bowl"),
+	description = S("Bowl"),
 	inventory_image = "lottfarming_bowl.png",
 })
 
 minetest.register_node("lottfarming:decay_tree", {
-	description = SL("Decaying Wood"),
+	description = S("Decaying Wood"),
 	tiles = {'default_tree_top.png^lottfarming_decay_tree.png', 'default_tree.png', 	'default_tree.png'},
      is_ground_content = true,
 	groups = {crumbly=3, fungi=3},
@@ -112,7 +112,7 @@ end
 
 
 minetest.register_tool("lottfarming:bacteria_fertiliser", {
-	description = SL("Bacteria Fertiliser"),
+	description = S("Bacteria Fertiliser"),
 	tiles = {"vessels_glass_bottle.png^lottfarming_bacteria_fertiliser.png"},
 	inventory_image = "vessels_glass_bottle_inv.png^lottfarming_bacteria_fertiliser.png",
 	on_use = function(itemstack, user, pointed_thing)

mods/lord/Blocks/lottfarming/green.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:green_mushroom_spore", {
-	description = SL("Green Mushroom Spores"),
+	description = S("Green Mushroom Spores"),
 	inventory_image = "lottfarming_green_mushroom_spore.png",
 	on_place = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -14,7 +14,7 @@ minetest.register_craftitem("lottfarming:green_mushroom_spore", {
 })
 
 minetest.register_node("lottfarming:green_mushroom", {
-	description = SL("Green Mushroom"),
+	description = S("Green Mushroom"),
 	paramtype = "light",
 	paramtype2 = "meshoptions",
 	place_param2 = 9,
@@ -33,9 +33,9 @@ minetest.register_node("lottfarming:green_mushroom", {
 	groups = {snappy=3, flammable=2, mushroom=1, flower=1, color_green=1},
 	sounds = default.node_sound_leaves_defaults(),
 	inventory_image = "lottfarming_green_mushroom.png",
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(1),
 	_tt_food = true,
-	_tt_food_hp = 2,
+	_tt_food_hp = 1,
 })
 minetest.register_node("lottfarming:green_mushroom_1", {
 	paramtype = "light",

mods/lord/Blocks/lottfarming/locale/lottfarming.ru.tr

@@ -21,6 +21,10 @@ Cream of Mushroom Soup=Грибной суп
 Brown Mushroom Spores=Споры коричневых грибов
 Brown Mushroom=Коричневые грибы
 
+### white.lua ###
+White Mushroom Spores=Споры белых грибов
+White Mushroom=Белые грибы
+
 ### cabbage.lua ###
 Cabbage Seed=Семена капусты
 Cabbage=Капуста

mods/lord/Blocks/lottfarming/melon.lua

@@ -1,7 +1,7 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 minetest.register_craftitem("lottfarming:melon_seed", {
-	description     = SL("Melon Seed"),
+	description     = S("Melon Seed"),
 	inventory_image = "lottfarming_melon_seed.png",
 	on_place        = function(itemstack, placer, pointed_thing)
 		local ptu = pointed_thing.under
@@ -84,7 +84,7 @@ minetest.register_node("lottfarming:melon_2", {
 })
 
 minetest.register_node("lottfarming:melon_3", {
-	description = SL("Melon"),
+	description = S("Melon"),
 	paramtype2  = "facedir",
 	tiles       = {
 		"lottfarming_melon_top.png",
@@ -101,11 +101,11 @@ minetest.register_node("lottfarming:melon_3", {
 
 minetest.register_alias("lottfarming:melon_slice", "lottfarming:melon")
 minetest.register_craftitem("lottfarming:melon", {
-	description     = SL("Melon"),
+	description     = S("Melon"),
 	inventory_image = "lottfarming_melon.png",
-	on_use          = minetest.item_eat(2),
+	on_use          = minetest.item_eat(4),
 	_tt_food        = true,
-	_tt_food_hp     = 2,
+	_tt_food_hp     = 4,
 })
 
 farming:add_plant("lottfarming:melon_3", { "lottfarming:melon_1", "lottfarming:melon_2" }, 80, 20)

mods/lord/Blocks/lottfarming/orc_food.lua

@@ -1,4 +1,4 @@
-local SL = minetest.get_translator("lottfarming")
+local S = minetest.get_translator("lottfarming")
 
 local function make_negative_visual_effect(user)
 	local first_screen = user:hud_add({
@@ -24,7 +24,7 @@ local function make_negative_visual_effect(user)
 end
 
 minetest.register_craftitem("lottfarming:orc_food", {
-	description = SL("Orc Food"),
+	description = S("Orc Food"),
 	inventory_image = "lottfarming_orc_food.png",
 	on_use = function(itemstack, user, pointed_thing)
 		local name = user:get_player_name()
@@ -49,7 +49,7 @@ minetest.register_craft({
 })
 
 minetest.register_craftitem("lottfarming:orc_medicine", {
-	description = SL("Orc medicine"),
+	description = S("Orc medicine"),
 	inventory_image = "lottfarming_orc_medicine.png",
 	on_use = function(itemstack, user, pointed_thing)
 		user:set_hp(20)