From 206c98e354eae57562a94044ac60441de1ce0cf4 Mon Sep 17 00:00:00 2001 From: kay27 Date: Sat, 5 Feb 2022 20:49:45 +0400 Subject: [PATCH] Fix various amethyst errors, better seed function --- mods/ITEMS/mcl_amethyst/init.lua | 51 +++++++++++++------ .../mcl_amethyst/locale/mcl_anvils.ru.tr | 14 ++--- mods/ITEMS/mcl_amethyst/locale/template.txt | 14 ++--- mods/ITEMS/mcl_amethyst/mod.conf | 2 +- 4 files changed, 52 insertions(+), 29 deletions(-) diff --git a/mods/ITEMS/mcl_amethyst/init.lua b/mods/ITEMS/mcl_amethyst/init.lua index 1406e5de6..c0e61c50c 100644 --- a/mods/ITEMS/mcl_amethyst/init.lua +++ b/mods/ITEMS/mcl_amethyst/init.lua @@ -14,7 +14,7 @@ minetest.register_node("mcl_amethyst:amethyst_block",{ sounds = mcl_sounds.node_sound_glass_defaults(), is_ground_content = true, stack_max = 64, - _doc_items_longdesc = S("The Block of Amethyst is a decoration block creft from amethyst shards."), + _doc_items_longdesc = S("The Block of Amethyst is a decoration block crafted from amethyst shards."), }) minetest.register_node("mcl_amethyst:budding_amethyst_block",{ @@ -84,18 +84,40 @@ minetest.register_node("mcl_amethyst:tinted_glass",{ -- Amethyst Cluster local bud_def = { - {"small","Small","mcl_amethyst:medium_amethyst_bud"}, - {"medium","Medium","mcl_amethyst:large_amethyst_bud"}, - {"large","Large","mcl_amethyst:amethyst_cluster"}, + { + size = "small", + description = S("Small Amethyst Bud"), + long_desc = S("Small Amethyst Bud is the first growth of amethyst bud."), + light_source = 3, + next_stage = "mcl_amethyst:medium_amethyst_bud", + }, + { + size = "medium", + description = S("Medium Amethyst Bud"), + long_desc = S("Medium Amethyst Bud is the second growth of amethyst bud."), + light_source = 4, + next_stage = "mcl_amethyst:large_amethyst_bud", + }, + { + size = "large", + description = S("Large Amethyst Bud"), + long_desc = S("Large Amethyst Bud is the third growth of amethyst bud."), + light_source = 5, + next_stage = "mcl_amethyst:amethyst_cluster", + }, } -for x,y in pairs(bud_def) do - minetest.register_node("mcl_amethyst:" .. y[1] .. "_amethyst_bud",{ - description = y[2] .. " Amethyst Bud", +for _, def in pairs(bud_def) do + local size = def.size + local name = "mcl_amethyst:" .. size .. "_amethyst_bud" + local tile = size .. "_amethyst_bud.png" + local inventory_image = size .. "_amethyst_bud.png" + minetest.register_node(name, { + description = def.description, _mcl_hardness = 1.5, _mcl_blast_resistance = 1.5, drop = "", - tiles = {y[1] .. "_amethyst_bud.png",}, - inventory_image = y[1] .. "_amethyst_bud.png", + tiles = {tile}, + inventory_image = inventory_image, paramtype1 = "light", paramtype2 = "wallmounted", drawtype = "plantlike", @@ -112,17 +134,15 @@ for x,y in pairs(bud_def) do }, selection_box = { type = "fixed", - -- fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 }, }, collision_box = { type = "fixed", - -- fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 }, }, _mcl_silk_touch_drop = true, - _mcl_amethyst_next_grade = y[3], - _doc_items_longdesc = S("@1 Amethyst Bud is the @2 grouth of amethyst bud.", y[2], y[1]), + _mcl_amethyst_next_grade = def.next_stage, + _doc_items_longdesc = def.longdesc, }) end @@ -130,7 +150,7 @@ minetest.register_node("mcl_amethyst:amethyst_cluster",{ description = "Amethyst Cluster", _mcl_hardness = 1.5, _mcl_blast_resistance = 1.5, - _doc_items_longdesc = S("Amethyst Cluster is the final grouth of amethyst bud."), + _doc_items_longdesc = S("Amethyst Cluster is the final growth of amethyst bud."), drop = { max_items = 1, items = { @@ -150,6 +170,7 @@ minetest.register_node("mcl_amethyst:amethyst_cluster",{ paramtype1 = "light", use_texture_alpha = "clip", sunlight_propagates = true, + light_source = 7, groups = { dig_by_water = 1, destroy_by_lava_flow = 1, @@ -160,12 +181,10 @@ minetest.register_node("mcl_amethyst:amethyst_cluster",{ }, selection_box = { type = "fixed", - -- fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 }, }, collision_box = { type = "fixed", - -- fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 }, }, _mcl_silk_touch_drop = true, diff --git a/mods/ITEMS/mcl_amethyst/locale/mcl_anvils.ru.tr b/mods/ITEMS/mcl_amethyst/locale/mcl_anvils.ru.tr index f1d6e92a6..9f1d0f572 100644 --- a/mods/ITEMS/mcl_amethyst/locale/mcl_anvils.ru.tr +++ b/mods/ITEMS/mcl_amethyst/locale/mcl_anvils.ru.tr @@ -1,17 +1,19 @@ # textdomain: mcl_amethyst -@1 Amethyst Bud is the @2 grouth of amethyst bud.=@1 Аметистовый Бутон - это @2-я стадия роста аместистового бутона. Amethyst Cluster=Аметистовая друза -Amethyst Cluster is the final grouth of amethyst bud.=Аметистовая друза - это последняя 4-я стадия роста аметистового бутона. -Amethyst Growing Tool=Выращиватель аметиста +Amethyst Cluster is the final growth of amethyst bud.=Аметистовая друза - это последняя 4-я стадия роста аметистового бутона. Amethyst Shard=Осколок аметиста An amethyst shard is a crystalline mineral.=Осколок аметиста - это кристаллический минерал, получаемый в результате разрушения кластеров аметиста. Block of Amethyst=Аметистовый блок Budding Amethyst=Растущий аметист Calcite=Кальцит Calcite can be found as part of amethyst geodes.=Кальцит можно найти в составе аметистовых жеод. -Growing Failed=Выращивание не удалось -Not allowed to use Amethyst Growing Tool in a protected area!=Выращиватель аметиста нельзя использовать в защищённых частях мира -The Block of Amethyst is a decoration block creft from amethyst shards.=Блок аметиста - декоративный блок, скрафченный из осколков аметиста. +Large Amethyst Bud=Большой росток аметиста +Large Amethyst Bud is the third growth of amethyst bud.=Большой росток - третья стадия роста аметиста. +Medium Amethyst Bud=Средний росток аметиста +Medium Amethyst Bud is the second growth of amethyst bud.=Средний росток - вторая стадия роста аметиста. +Small Amethyst Bud=Маленький росток аметиста +Small Amethyst Bud is the first growth of amethyst bud.=Маленький росток - первая стадия роста аметиста. +The Block of Amethyst is a decoration block crafted from amethyst shards.=Блок аметиста - декоративный блок, скрафченный из осколков аметиста. The Budding Amethyst can grow amethyst=Растущий аметист может вырастить аметист Tinted Glass=Тонированное стекло Tinted Glass is a type of glass which blocks lights while it is visually transparent.=Тонированное стекло блокирует свет, но визуально прозрачно. diff --git a/mods/ITEMS/mcl_amethyst/locale/template.txt b/mods/ITEMS/mcl_amethyst/locale/template.txt index e9f6a81cb..7f23e9965 100644 --- a/mods/ITEMS/mcl_amethyst/locale/template.txt +++ b/mods/ITEMS/mcl_amethyst/locale/template.txt @@ -1,17 +1,19 @@ # textdomain: mcl_amethyst -@1 Amethyst Bud is the @2 grouth of amethyst bud.= Amethyst Cluster= -Amethyst Cluster is the final grouth of amethyst bud.= -Amethyst Growing Tool= +Amethyst Cluster is the final growth of amethyst bud.= Amethyst Shard= An amethyst shard is a crystalline mineral.= Block of Amethyst= Budding Amethyst= Calcite= Calcite can be found as part of amethyst geodes.= -Growing Failed= -Not allowed to use Amethyst Growing Tool in a protected area!= -The Block of Amethyst is a decoration block creft from amethyst shards.= +Large Amethyst Bud= +Large Amethyst Bud is the third growth of amethyst bud.= +Medium Amethyst Bud= +Medium Amethyst Bud is the second growth of amethyst bud.= +Small Amethyst Bud= +Small Amethyst Bud is the first growth of amethyst bud.= +The Block of Amethyst is a decoration block crafted from amethyst shards.= The Budding Amethyst can grow amethyst= Tinted Glass= Tinted Glass is a type of glass which blocks lights while it is visually transparent.= diff --git a/mods/ITEMS/mcl_amethyst/mod.conf b/mods/ITEMS/mcl_amethyst/mod.conf index 8daa75008..97ed6ae99 100644 --- a/mods/ITEMS/mcl_amethyst/mod.conf +++ b/mods/ITEMS/mcl_amethyst/mod.conf @@ -1,5 +1,5 @@ name = mcl_amethyst author = Emojiminetest, kay27 -description = Amethyst related stuff for MCL5 +description = Amethyst related stuff depends = mcl_init, mcl_core, mcl_wip optional_depends = mcl_spyglass, mcl_copper