OgelGames
/
VoxeLibre
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Potion conversion fix (#4426) 

Reviewed-on: VoxeLibre/VoxeLibre#4426
Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
Co-authored-by: the-real-herowl <wiktor_t-i@proton.me>
Co-committed-by: the-real-herowl <wiktor_t-i@proton.me>
This commit is contained in:
the-real-herowl 2024-06-13 13:22:14 +02:00 committed by the-real-herowl
parent 173f8a0bca
commit 35e14dd415
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mods/ITEMS/mcl_potions/potions.lua
View File

@ -841,20 +841,22 @@ local function replace_legacy_potion(itemstack)
end end
local compat = "mcl_potions:compat_potion" local compat = "mcl_potions:compat_potion"
local compat_arrow = "mcl_potions:compat_arrow" local compat_arrow = "mcl_potions:compat_arrow"
minetest.register_craftitem(compat, { local compat_def = {
description = S("Unknown Potion"), description = S("Unknown Potion") .. "\n" .. minetest.colorize("#ff0", S("Right-click to identify")),
_tt_help = S("Right-click to identify"),
image = "mcl_potions_potion_overlay.png^[colorize:#00F:127^mcl_potions_potion_bottle.png^vl_unknown.png", image = "mcl_potions_potion_overlay.png^[colorize:#00F:127^mcl_potions_potion_bottle.png^vl_unknown.png",
groups = {not_in_creative_inventory = 1},
on_secondary_use = replace_legacy_potion, on_secondary_use = replace_legacy_potion,
on_place = replace_legacy_potion, on_place = replace_legacy_potion,
}) }
minetest.register_craftitem(compat_arrow, { local compat_arrow_def = {
description = S("Unknown Tipped Arrow"), description = S("Unknown Tipped Arrow") .. "\n" .. minetest.colorize("#ff0", S("Right-click to identify")),
_tt_help = S("Right-click to identify"),
image = "mcl_bows_arrow_inv.png^(mcl_potions_arrow_inv.png^[colorize:#FFF:100)^vl_unknown.png", image = "mcl_bows_arrow_inv.png^(mcl_potions_arrow_inv.png^[colorize:#FFF:100)^vl_unknown.png",
groups = {not_in_creative_inventory = 1},
on_secondary_use = replace_legacy_potion, on_secondary_use = replace_legacy_potion,
on_place = replace_legacy_potion, on_place = replace_legacy_potion,
}) }
minetest.register_craftitem(compat, compat_def)
minetest.register_craftitem(compat_arrow, compat_arrow_def)
local old_potions_plus = { local old_potions_plus = {
"fire_resistance", "water_breathing", "invisibility", "regeneration", "poison", "fire_resistance", "water_breathing", "invisibility", "regeneration", "poison",
@ -866,14 +868,14 @@ local old_potions_2 = {
} }
for _, name in pairs(old_potions_2) do for _, name in pairs(old_potions_2) do
minetest.register_alias("mcl_potions:" .. name .. "_2", compat) minetest.register_craftitem("mcl_potions:" .. name .. "_2", compat_def)
minetest.register_alias("mcl_potions:" .. name .. "_2_splash", compat) minetest.register_craftitem("mcl_potions:" .. name .. "_2_splash", compat_def)
minetest.register_alias("mcl_potions:" .. name .. "_2_lingering", compat) minetest.register_craftitem("mcl_potions:" .. name .. "_2_lingering", compat_def)
minetest.register_alias("mcl_potions:" .. name .. "_2_arrow", compat_arrow) minetest.register_craftitem("mcl_potions:" .. name .. "_2_arrow", compat_arrow_def)
end end
for _, name in pairs(old_potions_plus) do for _, name in pairs(old_potions_plus) do
minetest.register_alias("mcl_potions:" .. name .. "_plus", compat) minetest.register_craftitem("mcl_potions:" .. name .. "_plus", compat_def)
minetest.register_alias("mcl_potions:" .. name .. "_plus_splash", compat) minetest.register_craftitem("mcl_potions:" .. name .. "_plus_splash", compat_def)
minetest.register_alias("mcl_potions:" .. name .. "_plus_lingering", compat) minetest.register_craftitem("mcl_potions:" .. name .. "_plus_lingering", compat_def)
minetest.register_alias("mcl_potions:" .. name .. "_plus_arrow", compat_arrow) minetest.register_craftitem("mcl_potions:" .. name .. "_plus_arrow", compat_arrow_def)
end end