From b5f9a755b32b3dada753553f2341570f48a0b2b9 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 24 Oct 2018 18:16:39 +0200 Subject: [PATCH] Tweak item names and images of farming plants --- mods/ITEMS/mcl_farming/beetroot.lua | 6 +++--- mods/ITEMS/mcl_farming/melon.lua | 7 ++++++- mods/ITEMS/mcl_farming/potatoes.lua | 4 ++++ mods/ITEMS/mcl_farming/pumpkin.lua | 7 ++++++- mods/ITEMS/mcl_nether/nether_wart.lua | 10 +++++++++- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/mods/ITEMS/mcl_farming/beetroot.lua b/mods/ITEMS/mcl_farming/beetroot.lua index 1776ce030b..d88633d939 100644 --- a/mods/ITEMS/mcl_farming/beetroot.lua +++ b/mods/ITEMS/mcl_farming/beetroot.lua @@ -11,7 +11,7 @@ minetest.register_craftitem("mcl_farming:beetroot_seeds", { }) minetest.register_node("mcl_farming:beetroot_0", { - description = "Premature Beetroot Plant (First Stage)", + description = "Premature Beetroot Plant (Stage 1)", _doc_items_longdesc = "Beetroot plants are plants which grow on farmland under sunlight in 4 stages. On hydrated farmland, they grow a bit faster. They can be harvested at any time but will only yield a profit when mature.", _doc_items_entry_name = "Premature Beetroot Plant", paramtype = "light", @@ -36,7 +36,7 @@ minetest.register_node("mcl_farming:beetroot_0", { }) minetest.register_node("mcl_farming:beetroot_1", { - description = "Premature Beetroot Plant (Second Stage)", + description = "Premature Beetroot Plant (Stage 2)", _doc_items_create_entry = false, paramtype = "light", paramtype2 = "meshoptions", @@ -60,7 +60,7 @@ minetest.register_node("mcl_farming:beetroot_1", { }) minetest.register_node("mcl_farming:beetroot_2", { - description = "Premature Beetroot Plant (Third Stage)", + description = "Premature Beetroot Plant (Stage 3)", _doc_items_create_entry = false, paramtype = "light", paramtype2 = "meshoptions", diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua index 5e557d321b..72e27a228c 100644 --- a/mods/ITEMS/mcl_farming/melon.lua +++ b/mods/ITEMS/mcl_farming/melon.lua @@ -72,6 +72,7 @@ for s=1,7 do longdesc = "Melon stems grow on farmland in 8 stages. On hydrated farmland, the growth is a bit quicker. Mature melon stems are able to grow melons." end local colorstring = mcl_farming:stem_color(startcolor, endcolor, s, 8) + local texture = "([combine:16x16:0,"..((8-s)*2).."=mcl_farming_melon_stem_disconnected.png)^[colorize:"..colorstring..":127" minetest.register_node("mcl_farming:melontige_"..s, { description = string.format("Premature Melon Stem (Stage %d)", s), _doc_items_create_entry = doc, @@ -82,7 +83,9 @@ for s=1,7 do drawtype = "plantlike", sunlight_propagates = true, drop = stem_drop, - tiles = {"([combine:16x16:0,"..((8-s)*2).."=mcl_farming_melon_stem_disconnected.png)^[colorize:"..colorstring..":127"}, + tiles = {texture}, + wield_image = texture, + inventory_image = texture, selection_box = { type = "fixed", fixed = { @@ -101,6 +104,8 @@ local stem_def = { _doc_items_create_entry = true, _doc_items_longdesc = "A mature melon stem attempts to grow a melon at one of its four adjacent blocks. A melon can only grow on top of farmland, dirt, or a grass block. When a melon is next to a melon stem, the melon stem immediately bends and connects to the melon. While connected, a melon stem can't grow another melon. As soon all melons around the stem have been removed, it loses the connection and is ready to grow another melon.", tiles = {"mcl_farming_melon_stem_disconnected.png^[colorize:#FFA800:127"}, + wield_image = "mcl_farming_melon_stem_disconnected.png^[colorize:#FFA800:127", + inventory_image = "mcl_farming_melon_stem_disconnected.png^[colorize:#FFA800:127", } -- Register stem growth diff --git a/mods/ITEMS/mcl_farming/potatoes.lua b/mods/ITEMS/mcl_farming/potatoes.lua index db9a963ead..7294275a41 100644 --- a/mods/ITEMS/mcl_farming/potatoes.lua +++ b/mods/ITEMS/mcl_farming/potatoes.lua @@ -38,6 +38,8 @@ for i=1, 7 do drawtype = "plantlike", drop = "mcl_farming:potato_item", tiles = { texture }, + inventory_image = texture, + wield_image = texture, selection_box = { type = "fixed", fixed = { selbox }, @@ -59,6 +61,8 @@ minetest.register_node("mcl_farming:potato", { walkable = false, drawtype = "plantlike", tiles = {"mcl_farming_potatoes_stage_3.png"}, + wield_image = "mcl_farming_potatoes_stage_3.png", + inventory_image = "mcl_farming_potatoes_stage_3.png", drop = { items = { { items = {'mcl_farming:potato_item 1'} }, diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index e598f3448c..5df24e82ab 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -46,6 +46,7 @@ for s=1,7 do longdesc = "Pumpkin stems grow on farmland in 8 stages. On hydrated farmland, the growth is a bit quicker. Mature pumpkin stems are able to grow pumpkins." end local colorstring = mcl_farming:stem_color(startcolor, endcolor, s, 8) + local texture = "([combine:16x16:0,"..((8-s)*2).."=mcl_farming_pumpkin_stem_disconnected.png)^[colorize:"..colorstring..":127" minetest.register_node("mcl_farming:pumpkin_"..s, { description = string.format("Premature Pumpkin Stem (Stage %d)", s), _doc_items_entry_name = entry_name, @@ -56,7 +57,9 @@ for s=1,7 do drawtype = "plantlike", sunlight_propagates = true, drop = stem_drop, - tiles = {"([combine:16x16:0,"..((8-s)*2).."=mcl_farming_pumpkin_stem_disconnected.png)^[colorize:"..colorstring..":127"}, + tiles = {texture}, + inventory_image = texture, + wield_image = texture, selection_box = { type = "fixed", fixed = { @@ -74,6 +77,8 @@ local stem_def = { description = "Mature Pumpkin Stem", _doc_items_longdesc = "A mature pumpkin stem attempts to grow a pumpkin at one of its four adjacent blocks. A pumpkin can only grow on top of farmland, dirt or a grass block. When a pumpkin is next to a pumpkin stem, the pumpkin stem immediately bends and connects to the pumpkin. A connected pumpkin stem can't grow another pumpkin. As soon all pumpkins around the stem have been removed, it loses the connection and is ready to grow another pumpkin.", tiles = {"mcl_farming_pumpkin_stem_disconnected.png^[colorize:#FFA800:127"}, + wield_image = "mcl_farming_pumpkin_stem_disconnected.png^[colorize:#FFA800:127", + inventory_image = "mcl_farming_pumpkin_stem_disconnected.png^[colorize:#FFA800:127", } -- Template for pumpkin diff --git a/mods/ITEMS/mcl_nether/nether_wart.lua b/mods/ITEMS/mcl_nether/nether_wart.lua index 705fd059a0..fbe6653a22 100644 --- a/mods/ITEMS/mcl_nether/nether_wart.lua +++ b/mods/ITEMS/mcl_nether/nether_wart.lua @@ -1,5 +1,5 @@ minetest.register_node("mcl_nether:nether_wart_0", { - description = "Premature Nether Wart", + description = "Premature Nether Wart (Stage 1)", _doc_items_longdesc = "A premature nether wart has just recently been planted on soul sand. Nether wart slowly grows on soul sand in 4 stages (the second and third stages look identical). Although nether wart is home to the Nether, it grows in any dimension.", paramtype = "light", paramtype2 = "meshoptions", @@ -8,6 +8,8 @@ minetest.register_node("mcl_nether:nether_wart_0", { drawtype = "plantlike", drop = "mcl_nether:nether_wart_item", tiles = {"mcl_nether_nether_wart_stage_0.png"}, + wield_image = "mcl_nether_nether_wart_stage_0.png", + inventory_image = "mcl_nether_nether_wart_stage_0.png", selection_box = { type = "fixed", fixed = { @@ -28,6 +30,8 @@ minetest.register_node("mcl_nether:nether_wart_1", { drawtype = "plantlike", drop = "mcl_nether:nether_wart_item", tiles = {"mcl_nether_nether_wart_stage_1.png"}, + wield_image = "mcl_nether_nether_wart_stage_1.png", + inventory_image = "mcl_nether_nether_wart_stage_1.png", selection_box = { type = "fixed", fixed = { @@ -48,6 +52,8 @@ minetest.register_node("mcl_nether:nether_wart_2", { drawtype = "plantlike", drop = "mcl_nether:nether_wart_item", tiles = {"mcl_nether_nether_wart_stage_1.png"}, + wield_image = "mcl_nether_nether_wart_stage_1.png", + inventory_image = "mcl_nether_nether_wart_stage_1.png", selection_box = { type = "fixed", fixed = { @@ -75,6 +81,8 @@ minetest.register_node("mcl_nether:nether_wart", { }, }, tiles = {"mcl_nether_nether_wart_stage_2.png"}, + wield_image = "mcl_nether_nether_wart_stage_2.png", + inventory_image = "mcl_nether_nether_wart_stage_2.png", selection_box = { type = "fixed", fixed = {