Clean up more potion-related strings

This commit is contained in:
Wuzzy 2020-08-05 15:10:05 +02:00
parent 87bf6c12b2
commit e519c62c8b
8 changed files with 43 additions and 15 deletions

View File

@ -7,6 +7,7 @@ Building Blocks=Baublöcke
Decoration Blocks=Dekoblöcke Decoration Blocks=Dekoblöcke
Redstone=Redstone Redstone=Redstone
Transportation=Transport Transportation=Transport
Brewing=Gebräu
Miscellaneous=Sonstiges Miscellaneous=Sonstiges
Search Items=Gegenstände durchsuchen Search Items=Gegenstände durchsuchen
Foodstuffs=Lebensmittel Foodstuffs=Lebensmittel

View File

@ -7,6 +7,7 @@ Building Blocks=Bloques de construcción
Decoration Blocks=Bloques de decoración Decoration Blocks=Bloques de decoración
Redstone=Redstone Redstone=Redstone
Transportation=Transporte Transportation=Transporte
Brewing=
Miscellaneous=Variado Miscellaneous=Variado
Search Items=Buscar artículos Search Items=Buscar artículos
Foodstuffs=Productos alimenticios Foodstuffs=Productos alimenticios

View File

@ -7,6 +7,7 @@ Building Blocks=Blocs de Construction
Decoration Blocks=Blocs de Décoration Decoration Blocks=Blocs de Décoration
Redstone=Redstone Redstone=Redstone
Transportation=Transport Transportation=Transport
Brewing=
Miscellaneous=Divers Miscellaneous=Divers
Search Items=Rechercher des objets Search Items=Rechercher des objets
Foodstuffs=Denrées alimentaires Foodstuffs=Denrées alimentaires

View File

@ -7,6 +7,7 @@ Building Blocks=Строительные блоки
Decoration Blocks=Декоративные блоки Decoration Blocks=Декоративные блоки
Redstone=Редстоун (красный камень) Redstone=Редстоун (красный камень)
Transportation=Транспорт Transportation=Транспорт
Brewing=
Miscellaneous=Прочее Miscellaneous=Прочее
Search Items=Искать предметы Search Items=Искать предметы
Foodstuffs=Продовольствие Foodstuffs=Продовольствие

View File

@ -7,6 +7,7 @@ Building Blocks=
Decoration Blocks= Decoration Blocks=
Redstone= Redstone=
Transportation= Transportation=
Brewing=
Miscellaneous= Miscellaneous=
Search Items= Search Items=
Foodstuffs= Foodstuffs=

View File

@ -278,8 +278,8 @@ minetest.register_craftitem("mcl_potions:river_water", {
}) })
-- TODO: Extinguish fire, damage mobs -- TODO: Extinguish fire, damage mobs
mcl_potions.register_splash("water", S("Splash Water Bottle"), "#0022FF", {tt="No effect", potion_fun=function() end}) mcl_potions.register_splash("water", S("Splash Water Bottle"), "#0022FF", {tt=S("No effect"), potion_fun=function() end})
mcl_potions.register_lingering("water", S("Lingering Water Bottle"), "#0022FF", {tt="No effect", potion_fun=function() end}) mcl_potions.register_lingering("water", S("Lingering Water Bottle"), "#0022FF", {tt=S("No effect"), potion_fun=function() end})
minetest.register_craftitem("mcl_potions:speckled_melon", { minetest.register_craftitem("mcl_potions:speckled_melon", {
description = S("Glistering Melon"), description = S("Glistering Melon"),

View File

@ -67,10 +67,10 @@ local function register_potion(def)
if effect and def.is_dur then if effect and def.is_dur then
_tt = perc_string(effect).." | "..time_string(dur) _tt = perc_string(effect).." | "..time_string(dur)
if def.name == "poison" or def.name == "regeneration" then if def.name == "poison" or def.name == "regeneration" then
_tt = "1/2 heart/"..effect.."s | "..time_string(dur) _tt = S("1 HP/@1s | @2", effect, time_string(dur))
end end
elseif def.name == "healing" or def.name == "harming" then elseif def.name == "healing" or def.name == "harming" then
_tt = ((effect / 2) - ((effect / 2)% 0.5)).." hearts" _tt = S("@1 HP", effect)
else else
_tt = tt or time_string(dur) or S("No effect") _tt = tt or time_string(dur) or S("No effect")
end end
@ -109,7 +109,11 @@ local function register_potion(def)
local desc local desc
if not def.no_potion then if not def.no_potion then
desc = S("@1 Potion", def.description) if def.description_potion then
desc = def.description_potion
else
desc = S("@1 Potion", def.description)
end
else else
desc = def.description desc = def.description
end end
@ -173,8 +177,19 @@ local function register_potion(def)
} }
if def.color and not def.no_throwable then if def.color and not def.no_throwable then
mcl_potions.register_splash(def.name, S("Splash @1 Potion", def.description), def.color, splash_def) local desc
mcl_potions.register_lingering(def.name, S("Lingering @1 Potion", def.description), def.color, ling_def) if def.description_splash then
desc = def.description_splash
else
desc = S("Splash @1 Potion", def.description)
end
mcl_potions.register_splash(def.name, desc, def.color, splash_def)
if def.description_lingering then
desc = def.description_lingering
else
desc = S("Lingering @1 Potion", def.description)
end
mcl_potions.register_lingering(def.name, desc, def.color, ling_def)
if not def.no_arrow then if not def.no_arrow then
mcl_potions.register_arrow(def.name, S("Arrow of @1", def.description), def.color, arrow_def) mcl_potions.register_arrow(def.name, S("Arrow of @1", def.description), def.color, arrow_def)
end end
@ -357,7 +372,9 @@ end
local awkward_def = { local awkward_def = {
name = "awkward", name = "awkward",
description = S("Awkward"), description_potion = S("Awkward Potion"),
description_splash = S("Awkward Splash Potion"),
description_lingering = S("Awkward Lingering Potion"),
no_arrow = true, no_arrow = true,
no_effect = true, no_effect = true,
_tt = S("No effect"), _tt = S("No effect"),
@ -369,7 +386,9 @@ local awkward_def = {
local mundane_def = { local mundane_def = {
name = "mundane", name = "mundane",
description = S("Mundane"), description_potion = S("Mundane Potion"),
description_splash = S("Mundane Splash Potion"),
description_lingering = S("Mundane Lingering Potion"),
no_arrow = true, no_arrow = true,
no_effect = true, no_effect = true,
_tt = S("No effect"), _tt = S("No effect"),
@ -380,7 +399,9 @@ local mundane_def = {
local thick_def = { local thick_def = {
name = "thick", name = "thick",
description = S("Thick"), description_potion = S("Thick Potion"),
description_splash = S("Thick Splash Potion"),
description_lingering = S("Thick Lingering Potion"),
no_arrow = true, no_arrow = true,
no_effect = true, no_effect = true,
_tt = S("No effect"), _tt = S("No effect"),
@ -406,8 +427,8 @@ local dragon_breath_def = {
local healing_def = { local healing_def = {
name = "healing", name = "healing",
description = S("Healing"), description = S("Healing"),
_tt = S("+2 hearts"), _tt = S("+4 HP"),
_tt_2 = S("+4 hearts"), _tt_2 = S("+8 HP"),
_longdesc = S("Instantly heals."), _longdesc = S("Instantly heals."),
color = "#CC0000", color = "#CC0000",
effect = 4, effect = 4,
@ -419,8 +440,8 @@ local healing_def = {
local harming_def = { local harming_def = {
name = "harming", name = "harming",
description = S("Harming"), description = S("Harming"),
_tt = S("-3 hearts"), _tt = S("-6 HP"),
_tt_II = S("-6 hearts"), _tt_II = S("-12 HP"),
_longdesc = S("Instantly deals damage."), _longdesc = S("Instantly deals damage."),
color = "#660099", color = "#660099",
effect = -6, effect = -6,

View File

@ -41,7 +41,9 @@ function mcl_potions.register_arrow(name, desc, color, def)
minetest.register_craftitem("mcl_potions:"..name.."_arrow", { minetest.register_craftitem("mcl_potions:"..name.."_arrow", {
description = desc, description = desc,
_tt_help = arrow_tt .. "\n" .. def.tt, _tt_help = arrow_tt .. "\n" .. def.tt,
_doc_items_longdesc = arrow_longdesc .. "\n" .. longdesc, _doc_items_longdesc = arrow_longdesc .. "\n" ..
S("This particular arrow is tipped and will give an effect when it hits a player or mob.") .. "\n" ..
longdesc,
_doc_items_usagehelp = how_to_shoot, _doc_items_usagehelp = how_to_shoot,
inventory_image = "mcl_bows_arrow_inv.png^(mcl_potions_arrow_inv.png^[colorize:"..color..":100)", inventory_image = "mcl_bows_arrow_inv.png^(mcl_potions_arrow_inv.png^[colorize:"..color..":100)",
groups = { ammo=1, ammo_bow=1, brewitem=1}, groups = { ammo=1, ammo_bow=1, brewitem=1},