From 8945239ad0fb338b00d4942c97b9b782f8377b58 Mon Sep 17 00:00:00 2001 From: alek13 Date: Mon, 29 Jul 2024 20:00:03 +0300 Subject: [PATCH] Balance: Food: change points; renames/translations; add satiety for egg; remove from salt-block. Closes #1571. Closes #1576. #1581. --- .../Blocks/lord_trees/src/tree/fruits.lua | 4 +- mods/lord/Blocks/lottfarming/athelas.lua | 6 +- mods/lord/Blocks/lottfarming/barley.lua | 15 ++--- mods/lord/Blocks/lottfarming/berries.lua | 10 ++-- mods/lord/Blocks/lottfarming/blue.lua | 16 +++--- mods/lord/Blocks/lottfarming/brown.lua | 6 +- mods/lord/Blocks/lottfarming/cabbage.lua | 18 +++--- mods/lord/Blocks/lottfarming/carrots.lua | 11 ++-- mods/lord/Blocks/lottfarming/corn.lua | 10 ++-- mods/lord/Blocks/lottfarming/crafting.lua | 8 +-- mods/lord/Blocks/lottfarming/green.lua | 10 ++-- .../lottfarming/locale/lottfarming.ru.tr | 4 ++ mods/lord/Blocks/lottfarming/melon.lua | 12 ++-- mods/lord/Blocks/lottfarming/orc_food.lua | 6 +- mods/lord/Blocks/lottfarming/other.lua | 26 ++++----- mods/lord/Blocks/lottfarming/pipeweed.lua | 10 ++-- mods/lord/Blocks/lottfarming/potato.lua | 12 ++-- mods/lord/Blocks/lottfarming/red.lua | 10 ++-- mods/lord/Blocks/lottfarming/tomatoes.lua | 22 ++++---- mods/lord/Blocks/lottfarming/turnips.lua | 16 +++--- mods/lord/Blocks/lottfarming/white.lua | 10 ++-- mods/lord/Blocks/lottores/init.lua | 3 - mods/lord/Blocks/lottplants/src/nodes.lua | 4 +- mods/lord/Entities/bees/init.lua | 8 +-- .../Entities/lottmobs/locale/lottmobs.en.tr | 4 +- .../Entities/lottmobs/locale/lottmobs.ru.tr | 4 +- .../Entities/lottmobs/locale/template.txt | 4 +- .../src/animals/livestock/chicken.lua | 8 ++- .../lord/Entities/lottmobs/src/craftitems.lua | 56 +++++++++---------- mods/lord/Tools/lord_food/init.lua | 4 +- mods/lord/Tools/lottpotion/init.lua | 20 +++---- mods/lord/_overwrites/MTG/default/food.lua | 5 +- mods/lord/_overwrites/MTG/farming/init.lua | 3 +- mods/lord/_overwrites/various/mobs/init.lua | 3 +- 34 files changed, 188 insertions(+), 180 deletions(-) diff --git a/mods/lord/Blocks/lord_trees/src/tree/fruits.lua b/mods/lord/Blocks/lord_trees/src/tree/fruits.lua index 45e959a96..a3a2d218a 100644 --- a/mods/lord/Blocks/lord_trees/src/tree/fruits.lua +++ b/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 diff --git a/mods/lord/Blocks/lottfarming/athelas.lua b/mods/lord/Blocks/lottfarming/athelas.lua index 3a592ce53..ab3813ad3 100644 --- a/mods/lord/Blocks/lottfarming/athelas.lua +++ b/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", }) diff --git a/mods/lord/Blocks/lottfarming/barley.lua b/mods/lord/Blocks/lottfarming/barley.lua index 35c939010..d55b9c9d1 100644 --- a/mods/lord/Blocks/lottfarming/barley.lua +++ b/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, }) diff --git a/mods/lord/Blocks/lottfarming/berries.lua b/mods/lord/Blocks/lottfarming/berries.lua index 1ac830244..2856adbd2 100644 --- a/mods/lord/Blocks/lottfarming/berries.lua +++ b/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( diff --git a/mods/lord/Blocks/lottfarming/blue.lua b/mods/lord/Blocks/lottfarming/blue.lua index 3efb885a0..36e11daea 100644 --- a/mods/lord/Blocks/lottfarming/blue.lua +++ b/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, }) diff --git a/mods/lord/Blocks/lottfarming/brown.lua b/mods/lord/Blocks/lottfarming/brown.lua index d0f7a93fa..d58e82d0e 100644 --- a/mods/lord/Blocks/lottfarming/brown.lua +++ b/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", diff --git a/mods/lord/Blocks/lottfarming/cabbage.lua b/mods/lord/Blocks/lottfarming/cabbage.lua index 1655b9cf2..6c9fec856 100644 --- a/mods/lord/Blocks/lottfarming/cabbage.lua +++ b/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, }) diff --git a/mods/lord/Blocks/lottfarming/carrots.lua b/mods/lord/Blocks/lottfarming/carrots.lua index 4345c28df..fc4d7c591 100644 --- a/mods/lord/Blocks/lottfarming/carrots.lua +++ b/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( diff --git a/mods/lord/Blocks/lottfarming/corn.lua b/mods/lord/Blocks/lottfarming/corn.lua index bcc2131a6..0494a2793 100644 --- a/mods/lord/Blocks/lottfarming/corn.lua +++ b/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", diff --git a/mods/lord/Blocks/lottfarming/crafting.lua b/mods/lord/Blocks/lottfarming/crafting.lua index 8b042bb1d..b5f1a1f2f 100644 --- a/mods/lord/Blocks/lottfarming/crafting.lua +++ b/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) diff --git a/mods/lord/Blocks/lottfarming/green.lua b/mods/lord/Blocks/lottfarming/green.lua index dd5d61e47..3f9a12090 100644 --- a/mods/lord/Blocks/lottfarming/green.lua +++ b/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", diff --git a/mods/lord/Blocks/lottfarming/locale/lottfarming.ru.tr b/mods/lord/Blocks/lottfarming/locale/lottfarming.ru.tr index f95986b02..5a74e8606 100644 --- a/mods/lord/Blocks/lottfarming/locale/lottfarming.ru.tr +++ b/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=Капуста diff --git a/mods/lord/Blocks/lottfarming/melon.lua b/mods/lord/Blocks/lottfarming/melon.lua index cd56d1bb7..af3526d25 100644 --- a/mods/lord/Blocks/lottfarming/melon.lua +++ b/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) diff --git a/mods/lord/Blocks/lottfarming/orc_food.lua b/mods/lord/Blocks/lottfarming/orc_food.lua index 08b77439b..f70659da4 100644 --- a/mods/lord/Blocks/lottfarming/orc_food.lua +++ b/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) diff --git a/mods/lord/Blocks/lottfarming/other.lua b/mods/lord/Blocks/lottfarming/other.lua index 2c56ba063..3eaaf9301 100644 --- a/mods/lord/Blocks/lottfarming/other.lua +++ b/mods/lord/Blocks/lottfarming/other.lua @@ -1,11 +1,11 @@ -local SL = minetest.get_translator("lottfarming") +local S = minetest.get_translator("lottfarming") minetest.register_craftitem("lottfarming:cookie_cracker", { - description = SL("Cracker"), + description = S("Cracker"), inventory_image = "lottfarming_cookie_cracker.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(14), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = 14, }) minetest.register_craft({ @@ -35,27 +35,27 @@ minetest.register_craft({ }) minetest.register_craftitem("lottfarming:dough", { - description = SL("Dough"), + description = S("Dough"), inventory_image = "lottfarming_dough.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(2), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 2, }) minetest.register_craftitem("lottfarming:yeast_dough", { - description = SL("Yeast Dough"), + description = S("Yeast Dough"), inventory_image = "lottfarming_ydough.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(3), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 3, }) minetest.register_craftitem("lottfarming:salted_dough", { - description = SL("Salted Dough"), + description = S("Salted Dough"), inventory_image = "lottfarming_sdough.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(4), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 4, }) --[[ minetest.register_craft({ diff --git a/mods/lord/Blocks/lottfarming/pipeweed.lua b/mods/lord/Blocks/lottfarming/pipeweed.lua index 41b14f0ac..bfa208f6d 100644 --- a/mods/lord/Blocks/lottfarming/pipeweed.lua +++ b/mods/lord/Blocks/lottfarming/pipeweed.lua @@ -1,7 +1,7 @@ -local SL = minetest.get_translator("lottfarming") +local S = minetest.get_translator("lottfarming") minetest.register_craftitem("lottfarming:pipeweed_seed", { - description = SL("Pipeweed Seeds"), + description = S("Pipeweed Seeds"), inventory_image = "lottfarming_pipeweed_seed.png", on_place = function(itemstack, placer, pointed_thing) local ptu = pointed_thing.under @@ -90,7 +90,7 @@ minetest.register_node("lottfarming:pipeweed_4", { }) minetest.register_craftitem("lottfarming:pipeweed", { - description = SL("Pipeweed"), + description = S("Pipeweed"), inventory_image = "lottfarming_pipeweed.png", }) @@ -103,7 +103,7 @@ farming:add_plant( ) minetest.register_craftitem("lottfarming:pipeweed_cooked", { - description = SL("Cooked Pipeweed"), + description = S("Cooked Pipeweed"), inventory_image = "lottfarming_pipeweed_cooked.png", }) @@ -121,7 +121,7 @@ pipeweed = { } minetest.register_tool("lottfarming:pipe", { - description = SL("Pipe"), + description = S("Pipe"), inventory_image = "lottfarming_pipe.png", on_use = function(itemstack, player) for _, arrow in ipairs(pipeweed) do diff --git a/mods/lord/Blocks/lottfarming/potato.lua b/mods/lord/Blocks/lottfarming/potato.lua index 82be7ce1b..5859f1829 100644 --- a/mods/lord/Blocks/lottfarming/potato.lua +++ b/mods/lord/Blocks/lottfarming/potato.lua @@ -1,7 +1,7 @@ -local SL = minetest.get_translator("lottfarming") +local S = minetest.get_translator("lottfarming") minetest.register_craftitem("lottfarming:potato_seed", { - description = SL("Half of potato"), + description = S("Half of potato"), inventory_image = "lottfarming_potato_seed.png", on_place = function(itemstack, placer, pointed_thing) local ptu = pointed_thing.under @@ -69,7 +69,7 @@ minetest.register_node("lottfarming:potato_3", { }) minetest.register_craftitem("lottfarming:potato", { - description = SL("Potato"), + description = S("Potato"), inventory_image = "lottfarming_potato.png", on_use = minetest.item_eat(1), _tt_food = true, @@ -79,9 +79,9 @@ minetest.register_craftitem("lottfarming:potato", { farming:add_plant("lottfarming:potato_3", {"lottfarming:potato_1", "lottfarming:potato_2"}, 50, 20, 40) minetest.register_craftitem("lottfarming:potato_cooked", { - description = SL("Cooked Potato"), + description = S("Cooked Potato"), inventory_image = "lottfarming_potato_cooked.png", - on_use = minetest.item_eat(5), + on_use = minetest.item_eat(7), _tt_food = true, - _tt_food_hp = 5, + _tt_food_hp = 7, }) diff --git a/mods/lord/Blocks/lottfarming/red.lua b/mods/lord/Blocks/lottfarming/red.lua index f7740ce34..e3adea49f 100644 --- a/mods/lord/Blocks/lottfarming/red.lua +++ b/mods/lord/Blocks/lottfarming/red.lua @@ -1,7 +1,7 @@ -local SL = minetest.get_translator("lottfarming") +local S = minetest.get_translator("lottfarming") minetest.register_craftitem("lottfarming:red_mushroom_spore", { - description = SL("Red Mushroom Spores"), + description = S("Red Mushroom Spores"), inventory_image = "lottfarming_red_mushroom_spore.png", on_place = function(itemstack, placer, pointed_thing) local ptu = pointed_thing.under @@ -14,7 +14,7 @@ minetest.register_craftitem("lottfarming:red_mushroom_spore", { }) minetest.register_node("lottfarming:red_mushroom", { - description = SL("Red Mushroom"), + description = S("Red Mushroom"), paramtype = "light", paramtype2 = "meshoptions", place_param2 = 9, @@ -31,9 +31,9 @@ minetest.register_node("lottfarming:red_mushroom", { groups = { snappy = 3, flammable = 2, mushroom = 1, flower = 1, color_red = 1 }, sounds = default.node_sound_leaves_defaults(), inventory_image = "lottfarming_red_mushroom.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(-8), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = -8, }) minetest.register_node("lottfarming:red_mushroom_1", { paramtype = "light", diff --git a/mods/lord/Blocks/lottfarming/tomatoes.lua b/mods/lord/Blocks/lottfarming/tomatoes.lua index d03bad229..13f31b184 100644 --- a/mods/lord/Blocks/lottfarming/tomatoes.lua +++ b/mods/lord/Blocks/lottfarming/tomatoes.lua @@ -1,7 +1,7 @@ -local SL = minetest.get_translator("lottfarming") +local S = minetest.get_translator("lottfarming") minetest.register_craftitem("lottfarming:tomatoes_seed", { - description = SL("Tomato Seeds"), + description = S("Tomato Seeds"), inventory_image = "lottfarming_tomatoes_seed.png", on_place = function(itemstack, placer, pointed_thing) local ptu = pointed_thing.under @@ -90,11 +90,11 @@ minetest.register_node("lottfarming:tomatoes_4", { }) minetest.register_craftitem("lottfarming:tomatoes", { - description = SL("Tomato"), + description = S("Tomato"), inventory_image = "lottfarming_tomatoes.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(4), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = 4, groups = { salad = 1 }, }) @@ -114,19 +114,19 @@ minetest.register_craft({ }) minetest.register_craftitem("lottfarming:tomatoes_cooked", { - description = SL("Cooked Tomato"), + description = S("Cooked Tomato"), inventory_image = "lottfarming_tomatoes_cooked.png", - on_use = minetest.item_eat(5), + on_use = minetest.item_eat(7), _tt_food = true, - _tt_food_hp = 5, + _tt_food_hp = 7, }) minetest.register_craftitem("lottfarming:tomato_soup", { - description = "Tomato Soup", + description = S("Tomato Soup"), inventory_image = "lottfarming_tomato_soup.png", - on_use = minetest.item_eat(10), + on_use = minetest.item_eat(18), _tt_food = true, - _tt_food_hp = 10, + _tt_food_hp = 18, }) minetest.register_craft({ diff --git a/mods/lord/Blocks/lottfarming/turnips.lua b/mods/lord/Blocks/lottfarming/turnips.lua index 4ba53b7c9..23f95156b 100644 --- a/mods/lord/Blocks/lottfarming/turnips.lua +++ b/mods/lord/Blocks/lottfarming/turnips.lua @@ -1,7 +1,7 @@ -local SL = minetest.get_translator("lottfarming") +local S = minetest.get_translator("lottfarming") minetest.register_craftitem("lottfarming:turnips_seed", { - description = SL("Turnip Seeds"), + description = S("Turnip Seeds"), inventory_image = "lottfarming_turnips_seed.png", on_place = function(itemstack, placer, pointed_thing) local ptu = pointed_thing.under @@ -90,11 +90,11 @@ minetest.register_node("lottfarming:turnips_4", { }) minetest.register_craftitem("lottfarming:turnips", { - description = SL("Turnips"), + description = S("Turnips"), inventory_image = "lottfarming_turnips.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( @@ -106,9 +106,9 @@ farming:add_plant( ) minetest.register_craftitem("lottfarming:turnips_cooked", { - description = SL("Cooked Turnips"), + description = S("Cooked Turnips"), inventory_image = "lottfarming_turnips_cooked.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(7), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = 7, }) diff --git a/mods/lord/Blocks/lottfarming/white.lua b/mods/lord/Blocks/lottfarming/white.lua index 823e0db62..eaaf00e5c 100644 --- a/mods/lord/Blocks/lottfarming/white.lua +++ b/mods/lord/Blocks/lottfarming/white.lua @@ -1,5 +1,7 @@ +local S = minetest.get_translator("lottfarming") + minetest.register_craftitem("lottfarming:white_mushroom_spore", { - description = "White Mushroom Spores", + description = S("White Mushroom Spores"), inventory_image = "lottfarming_white_mushroom_spore.png", on_place = function(itemstack, placer, pointed_thing) return place_spore(itemstack, placer, pointed_thing, "lottfarming:white_mushroom_1", 9) @@ -7,7 +9,7 @@ minetest.register_craftitem("lottfarming:white_mushroom_spore", { }) minetest.register_node("lottfarming:white_mushroom", { - description = "White Mushroom", + description = S("White Mushroom"), paramtype = "light", paramtype2 = "meshoptions", place_param2 = 9, @@ -25,9 +27,9 @@ minetest.register_node("lottfarming:white_mushroom", { groups = { snappy = 3, flammable = 2, mushroom = 1, flower = 1, color_white = 1 }, sounds = default.node_sound_leaves_defaults(), inventory_image = "lottfarming_white_mushroom.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(4), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = 4, }) minetest.register_node("lottfarming:white_mushroom_1", { paramtype = "light", diff --git a/mods/lord/Blocks/lottores/init.lua b/mods/lord/Blocks/lottores/init.lua index a561d19b8..d358bd705 100644 --- a/mods/lord/Blocks/lottores/init.lua +++ b/mods/lord/Blocks/lottores/init.lua @@ -917,9 +917,6 @@ minetest.register_node( "lottores:salt_block", { tiles = { "default_clay.png^lottores_salt_block.png" }, is_ground_content = true, groups = { snappy = 2, cracky = 3, oddly_breakable_by_hand = 3 }, - on_use = minetest.item_eat(9), - _tt_food = true, - _tt_food_hp = 9, sounds = default.node_sound_stone_defaults(), }) diff --git a/mods/lord/Blocks/lottplants/src/nodes.lua b/mods/lord/Blocks/lottplants/src/nodes.lua index 9017ead7e..e53a300e7 100644 --- a/mods/lord/Blocks/lottplants/src/nodes.lua +++ b/mods/lord/Blocks/lottplants/src/nodes.lua @@ -97,7 +97,7 @@ minetest.register_abm({ minetest.register_craftitem("lottplants:honey", { description = S("Honey"), inventory_image = "lottplants_honey.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(18), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 18, }) diff --git a/mods/lord/Entities/bees/init.lua b/mods/lord/Entities/bees/init.lua index e93816f4f..456f389aa 100644 --- a/mods/lord/Entities/bees/init.lua +++ b/mods/lord/Entities/bees/init.lua @@ -323,9 +323,9 @@ local S = minetest.get_translator("bees") minetest.register_craftitem('bees:bottle_honey', { description = S('honey bottle'), inventory_image = 'bees_bottle_honey.png', - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(22), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 22, }) minetest.register_craftitem('bees:wax', { @@ -336,9 +336,9 @@ local S = minetest.get_translator("bees") minetest.register_craftitem('bees:honey_comb', { description = S('honey comb'), inventory_image = 'bees_comb.png', - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(20), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = 20, }) --minetest.register_craftitem('bees:queen', { diff --git a/mods/lord/Entities/lottmobs/locale/lottmobs.en.tr b/mods/lord/Entities/lottmobs/locale/lottmobs.en.tr index 0aabf4f48..736417e7a 100644 --- a/mods/lord/Entities/lottmobs/locale/lottmobs.en.tr +++ b/mods/lord/Entities/lottmobs/locale/lottmobs.en.tr @@ -7,8 +7,8 @@ Warg=Warg Spider Poison=Spider Poison Cooked Meat=Cooked Meat Raw Meat=Raw Meat -Raw Porkchop=Raw Porkchop -Cooked Porkchop=Cooked Porkchop +Raw Boar Meat=Raw Boar Meat +Cooked Boar Meat=Cooked Boar Meat Dirty Jacket=Dirty Jacket Dirty Trousers=Dirty Trousers Raw Fish=Raw Fish diff --git a/mods/lord/Entities/lottmobs/locale/lottmobs.ru.tr b/mods/lord/Entities/lottmobs/locale/lottmobs.ru.tr index 948c488c5..f3468c72d 100644 --- a/mods/lord/Entities/lottmobs/locale/lottmobs.ru.tr +++ b/mods/lord/Entities/lottmobs/locale/lottmobs.ru.tr @@ -7,8 +7,8 @@ Warg=Варг Spider Poison=Паучий яд Cooked Meat=Жареное мясо Raw Meat=Сырое мясо -Raw Porkchop=Кабанье мясо -Cooked Porkchop=Жареное кабанье мясо +Raw Boar Meat=Сырое кабанье мясо +Cooked Boar Meat=Жареное кабанье мясо Dirty Jacket=Грязная куртка Dirty Trousers=Грязные штаны Raw Fish=Сырая рыба diff --git a/mods/lord/Entities/lottmobs/locale/template.txt b/mods/lord/Entities/lottmobs/locale/template.txt index d288caeb5..eccc7278c 100644 --- a/mods/lord/Entities/lottmobs/locale/template.txt +++ b/mods/lord/Entities/lottmobs/locale/template.txt @@ -7,8 +7,8 @@ Warg= Spider Poison= Cooked Meat= Raw Meat= -Raw Porkchop= -Cooked Porkchop= +Raw Boar Meat= +Cooked Boar Meat= Dirty Jacket= Dirty Trousers= Raw Fish= diff --git a/mods/lord/Entities/lottmobs/src/animals/livestock/chicken.lua b/mods/lord/Entities/lottmobs/src/animals/livestock/chicken.lua index 2d65dfd52..b1809f3e7 100644 --- a/mods/lord/Entities/lottmobs/src/animals/livestock/chicken.lua +++ b/mods/lord/Entities/lottmobs/src/animals/livestock/chicken.lua @@ -37,13 +37,15 @@ arrows:register_throwing_weapon("lottmobs:egg", { end, }, craftitem = { + description = SL("Chicken Egg"), + inventory_image = "lottmobs_egg.png", shoot_sound = { sound = "default_place_node_hard", distance = 5, }, - - description = SL("Chicken Egg"), - inventory_image = "lottmobs_egg.png", + on_use = minetest.item_eat(2), + _tt_food = true, + _tt_food_hp = 2, }, }) diff --git a/mods/lord/Entities/lottmobs/src/craftitems.lua b/mods/lord/Entities/lottmobs/src/craftitems.lua index b5b3803b2..492051099 100644 --- a/mods/lord/Entities/lottmobs/src/craftitems.lua +++ b/mods/lord/Entities/lottmobs/src/craftitems.lua @@ -3,17 +3,17 @@ local SL = minetest.get_translator("lottmobs") minetest.register_craftitem("lottmobs:meat", { description = SL("Cooked Meat"), inventory_image = "lottmobs_meat.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(13), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 13, }) minetest.register_craftitem("lottmobs:meat_raw", { description = SL("Raw Meat"), inventory_image = "lottmobs_meat_raw.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(3), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 3, }) minetest.register_craft({ @@ -23,19 +23,19 @@ minetest.register_craft({ }) minetest.register_craftitem("lottmobs:pork_raw", { - description = SL("Raw Porkchop"), + description = SL("Raw Boar Meat"), inventory_image = "mobs_pork_raw.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(4), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = 4, }) minetest.register_craftitem("lottmobs:pork_cooked", { - description = SL("Cooked Porkchop"), + description = SL("Cooked Boar Meat"), inventory_image = "mobs_pork_cooked.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(14), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = 14, }) minetest.register_craft({ @@ -81,17 +81,17 @@ minetest.register_craftitem("lottmobs:spiderpoison", { minetest.register_craftitem("lottmobs:fish_raw", { description = SL("Raw Fish"), inventory_image = "lottmobs_fish_raw.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(2), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 2, }) minetest.register_craftitem("lottmobs:horsemeat_raw", { description = SL("Raw Horsemeat"), inventory_image = "lottmobs_horsemeat_raw.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(3), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = 3, }) minetest.register_craftitem("lottmobs:chicken_raw", { @@ -105,57 +105,57 @@ minetest.register_craftitem("lottmobs:chicken_raw", { minetest.register_craftitem("lottmobs:rabbit_raw", { description = SL("Raw Rabbit"), inventory_image = "lottmobs_rabbit_raw.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(2), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 2, }) minetest.register_craftitem("lottmobs:fish_cooked", { description = SL("Cooked Fish"), inventory_image = "lottmobs_fish_cooked.png", - on_use = minetest.item_eat(3), + on_use = minetest.item_eat(11), _tt_food = true, - _tt_food_hp = 3, + _tt_food_hp = 11, }) minetest.register_craftitem("lottmobs:horsemeat_cooked", { description = SL("Cooked Horsemeat"), inventory_image = "lottmobs_horsemeat_cooked.png", - on_use = minetest.item_eat(5), + on_use = minetest.item_eat(13), _tt_food = true, - _tt_food_hp = 5, + _tt_food_hp = 13, }) minetest.register_craftitem("lottmobs:chicken_cooked", { description = SL("Cooked Chiсken"), inventory_image = "lottmobs_chicken_cooked.png", - on_use = minetest.item_eat(4), + on_use = minetest.item_eat(11), _tt_food = true, - _tt_food_hp = 4, + _tt_food_hp = 11, }) minetest.register_craftitem("lottmobs:rabbit_cooked", { description = SL("Cooked Rabbit"), inventory_image = "lottmobs_rabbit_cooked.png", - on_use = minetest.item_eat(3), + on_use = minetest.item_eat(9), _tt_food = true, - _tt_food_hp = 3, + _tt_food_hp = 9, }) minetest.register_craftitem("lottmobs:rotten_meat", { description = SL("Rotten Meat"), inventory_image = "lottmobs_rotten_meat.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(-6), _tt_food = true, - _tt_food_hp = 2, + _tt_food_hp = -6, }) minetest.register_craftitem("lottmobs:fried_egg", { description = SL("Omelette"), inventory_image = "lottmobs_fried_egg.png", - on_use = minetest.item_eat(3), + on_use = minetest.item_eat(5), _tt_food = true, - _tt_food_hp = 3, + _tt_food_hp = 5, }) minetest.register_craft({ diff --git a/mods/lord/Tools/lord_food/init.lua b/mods/lord/Tools/lord_food/init.lua index 7ea369243..c2b160c09 100644 --- a/mods/lord/Tools/lord_food/init.lua +++ b/mods/lord/Tools/lord_food/init.lua @@ -7,7 +7,7 @@ minetest.register_craftitem("lord_food:lembas", { description = S("Lembas"), inventory_image = "lord_food_lembas.png", groups = { food_bread = 1 }, - on_use = minetest.item_eat(20), + on_use = minetest.item_eat(30), _tt_food = true, - _tt_food_hp = 20, + _tt_food_hp = 30, }) diff --git a/mods/lord/Tools/lottpotion/init.lua b/mods/lord/Tools/lottpotion/init.lua index bf263d42e..a1efec2d5 100644 --- a/mods/lord/Tools/lottpotion/init.lua +++ b/mods/lord/Tools/lottpotion/init.lua @@ -495,45 +495,45 @@ minetest.register_craftitem( "lottpotion:wine", { description = SL("Wine"), inventory_image = "lottpotion_wine.png", wield_image = "lottpotion_wine.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(9), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 9, }) minetest.register_craftitem( "lottpotion:beer", { description = SL("Beer"), inventory_image = "lottpotion_beer.png", wield_image = "lottpotion_beer.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(8), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 8, }) minetest.register_craftitem("lottpotion:ale", { description = SL("Ale"), inventory_image = "lottpotion_ale.png", wield_image = "lottpotion_ale.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(9), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 9, }) minetest.register_craftitem("lottpotion:mead", { description = SL("Mead"), inventory_image = "lottpotion_mead.png", wield_image = "lottpotion_mead.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(15), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 15, }) minetest.register_craftitem("lottpotion:cider", { description = SL("Cider"), inventory_image = "lottpotion_cider.png", wield_image = "lottpotion_cider.png", - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(9), _tt_food = true, - _tt_food_hp = 1, + _tt_food_hp = 9, }) function lottpotion.can_dig(pos, player) diff --git a/mods/lord/_overwrites/MTG/default/food.lua b/mods/lord/_overwrites/MTG/default/food.lua index 87c439651..0a5e23f30 100644 --- a/mods/lord/_overwrites/MTG/default/food.lua +++ b/mods/lord/_overwrites/MTG/default/food.lua @@ -2,8 +2,8 @@ -- Add food points description: local food_points = { - ["default:blueberries"] = 2, - ["default:apple"] = 2, + ["default:blueberries"] = 3, + ["default:apple"] = 4, -- unregistered in our game: --["flowers:mushroom_red"] = -5, --["flowers:mushroom_brown"] = 1, @@ -11,6 +11,7 @@ local food_points = { for item, points in pairs(food_points) do minetest.override_item(item, { + on_use = minetest.item_eat(points), _tt_food = true, _tt_food_hp = points, }) diff --git a/mods/lord/_overwrites/MTG/farming/init.lua b/mods/lord/_overwrites/MTG/farming/init.lua index a93177efe..49e021710 100644 --- a/mods/lord/_overwrites/MTG/farming/init.lua +++ b/mods/lord/_overwrites/MTG/farming/init.lua @@ -18,6 +18,7 @@ minetest.unregister_item("farming:hoe_diamond") -- Add food points description: minetest.override_item("farming:bread", { + on_use = minetest.item_eat(9), _tt_food = true, - _tt_food_hp = 5, + _tt_food_hp = 9, }) diff --git a/mods/lord/_overwrites/various/mobs/init.lua b/mods/lord/_overwrites/various/mobs/init.lua index 0280f62c2..f06daf985 100644 --- a/mods/lord/_overwrites/various/mobs/init.lua +++ b/mods/lord/_overwrites/various/mobs/init.lua @@ -1,5 +1,6 @@ minetest.override_item("mobs:honey", { + on_use = minetest.item_eat(18), _tt_food = true, - _tt_food_hp = 6, + _tt_food_hp = 18, })