Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-22 18:41:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Tweak potion tooltips

Browse source
This commit is contained in:
Wuzzy 2020-07-10 12:50:08 +02:00
parent 7169f29a28
commit 374ab1194d
3 changed files with 128 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
mods/ITEMS/mcl_potions/lingering.lua
View file

@ -129,12 +129,12 @@ local function time_string(dur)
return math.floor(dur/60)..string.format(":%02d",math.floor(dur % 60)) return math.floor(dur/60)..string.format(":%02d",math.floor(dur % 60))
end end
register_lingering("water", "Lingering Potion", "#0000FF", { register_lingering("water", "Lingering Water Bottle", "#0000FF", {
potion_fun = function(player) end, potion_fun = function(player) end,
tt = "No effect" tt = "No effect"
}) })
register_lingering("river_water", "Lingering Potion", "#0000FF", { register_lingering("river_water", "Lingering River Water Bottle", "#0000FF", {
potion_fun = function(player) end, potion_fun = function(player) end,
tt = "No effect" tt = "No effect"
}) })
@ -154,152 +154,157 @@ register_lingering("thick", "Lingering Thick Potion", "#0000FF", {
tt = "No effect" tt = "No effect"
}) })
register_lingering("healing", "Lingering Healing", "#AA0000", { register_lingering("healing", "Lingering Healing Potion", "#AA0000", {
potion_fun = function(player) player:set_hp(player:get_hp() + 4*0.5) end, potion_fun = function(player) player:set_hp(player:get_hp() + 2) end,
tt = "+1 heart" tt = "+2 HP"
}) })
register_lingering("healing_2", "Lingering Healing II", "#DD0000", { register_lingering("healing_2", "Lingering Healing Potion II", "#DD0000", {
potion_fun = function(player) player:set_hp(player:get_hp() + 8*0.5) end, potion_fun = function(player) player:set_hp(player:get_hp() + 4) end,
tt = "+2 hearts" tt = "+4 HP"
}) })
register_lingering("harming", "Lingering Harming", "#660099", { register_lingering("harming", "Lingering Harming Potion", "#660099", {
potion_fun = function(player) mcl_potions.healing_func(player, -6*0.5) end, potion_fun = function(player) mcl_potions.healing_func(player, -3) end,
tt = "-1.5 hearts" tt = "-3 HP"
}) })
register_lingering("harming_2", "Lingering Harming II", "#330066", { register_lingering("harming_2", "Lingering Harming Potion II", "#330066", {
potion_fun = function(player) mcl_potions.healing_func(player, -12*0.5) end, potion_fun = function(player) mcl_potions.healing_func(player, -6) end,
tt = "-3 hearts" tt = "-6 HP"
}) })
register_lingering("leaping", "Lingering Leaping", "#00CC33", { register_lingering("leaping", "Lingering Leaping Potion", "#00CC33", {
potion_fun = function(player) mcl_potions.leaping_func(player, 1.2, mcl_potions.DURATION*0.25) end, potion_fun = function(player) mcl_potions.leaping_func(player, 1.2, mcl_potions.DURATION*0.25) end,
tt = "120% | "..time_string(mcl_potions.DURATION*0.25) tt = "120% | "..time_string(mcl_potions.DURATION*0.25)
}) })
register_lingering("leaping_2", "Lingering Leaping II", "#00EE33", { register_lingering("leaping_2", "Lingering Leaping Potion II", "#00EE33", {
potion_fun = function(player) mcl_potions.leaping_func(player, 1.4, mcl_potions.DURATION_2*0.25) end, potion_fun = function(player) mcl_potions.leaping_func(player, 1.4, mcl_potions.DURATION_2*0.25) end,
tt = "140% | "..time_string(mcl_potions.DURATION_2*0.25) tt = "140% | "..time_string(mcl_potions.DURATION_2*0.25)
}) })
register_lingering("leaping_plus", "Lingering Leaping +", "#00DD33", { register_lingering("leaping_plus", "Lingering Leaping Potion +", "#00DD33", {
potion_fun = function(player) mcl_potions.leaping_func(player, 1.2, mcl_potions.DURATION_PLUS*0.25) end, potion_fun = function(player) mcl_potions.leaping_func(player, 1.2, mcl_potions.DURATION_PLUS*0.25) end,
tt = "120% | "..time_string(mcl_potions.DURATION_PLUS*0.25) tt = "120% | "..time_string(mcl_potions.DURATION_PLUS*0.25)
}) })
register_lingering("swiftness", "Lingering Swiftness", "#009999", { register_lingering("swiftness", "Lingering Swiftness Potion", "#009999", {
potion_fun = function(player) mcl_potions.swiftness_func(player, 1.2, mcl_potions.DURATION*0.25) end, potion_fun = function(player) mcl_potions.swiftness_func(player, 1.2, mcl_potions.DURATION*0.25) end,
tt = "120% | "..time_string(mcl_potions.DURATION*0.25) tt = "120% | "..time_string(mcl_potions.DURATION*0.25)
}) })
register_lingering("swiftness_2", "Lingering Swiftness II", "#00BBBB", { register_lingering("swiftness_2", "Lingering Swiftness Potion II", "#00BBBB", {
potion_fun = function(player) mcl_potions.swiftness_func(player, 1.4, mcl_potions.DURATION_2*0.25) end, potion_fun = function(player) mcl_potions.swiftness_func(player, 1.4, mcl_potions.DURATION_2*0.25) end,
tt = "140% | "..time_string(mcl_potions.DURATION_2*0.25) tt = "140% | "..time_string(mcl_potions.DURATION_2*0.25)
}) })
register_lingering("swiftness_plus", "Lingering Swiftness +", "#00BBBB", { register_lingering("swiftness_plus", "Lingering Swiftness Potion +", "#00BBBB", {
potion_fun = function(player) mcl_potions.swiftness_func(player, 1.2, mcl_potions.DURATION_PLUS*0.25) end, potion_fun = function(player) mcl_potions.swiftness_func(player, 1.2, mcl_potions.DURATION_PLUS*0.25) end,
tt = "120% | "..time_string(mcl_potions.DURATION_PLUS*0.25) tt = "120% | "..time_string(mcl_potions.DURATION_PLUS*0.25)
}) })
register_lingering("slowness", "Lingering Slowness", "#000080", { register_lingering("slowness", "Lingering Slowness Potion", "#000080", {
potion_fun = function(player) mcl_potions.swiftness_func(player, 0.85, mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) end, potion_fun = function(player) mcl_potions.swiftness_func(player, 0.85, mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) end,
tt = "85% | "..time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) tt = "85% | "..time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25)
}) })
register_lingering("slowness_plus", "Lingering Slowness +", "#000066", { register_lingering("slowness_plus", "Lingering Slowness Potion +", "#000066", {
potion_fun = function(player) mcl_potions.swiftness_func(player, 0.85, mcl_potions.DURATION_PLUS*mcl_potions.INV_FACTOR*0.25) end, potion_fun = function(player) mcl_potions.swiftness_func(player, 0.85, mcl_potions.DURATION_PLUS*mcl_potions.INV_FACTOR*0.25) end,
tt = "85% | "..time_string(mcl_potions.DURATION_PLUS*mcl_potions.INV_FACTOR*0.25) tt = "85% | "..time_string(mcl_potions.DURATION_PLUS*mcl_potions.INV_FACTOR*0.25)
}) })
register_lingering("slowness_2", "Lingering Slowness IV", "#000066", { register_lingering("slowness_2", "Lingering Slowness Potion IV", "#000066", {
potion_fun = function(player) mcl_potions.swiftness_func(player, 0.4, 20*0.25) end, potion_fun = function(player) mcl_potions.swiftness_func(player, 0.4, 20*0.25) end,
tt = "40% | "..time_string(20*0.25) tt = "40% | "..time_string(20*0.25)
}) })
register_lingering("poison", "Lingering Poison", "#335544", { register_lingering("poison", "Lingering Poison Potion", "#335544", {
potion_fun = function(player) mcl_potions.poison_func(player, 2.5, 45*0.25) end, potion_fun = function(player) mcl_potions.poison_func(player, 2.5, 45*0.25) end,
tt = "-1/2 heart / 2.5sec | "..time_string(45*0.25) tt = "-1 HP / 2.5s | "..time_string(45*0.25)
}) })
register_lingering("poison_2", "Lingering Poison II", "#446655", { register_lingering("poison_2", "Lingering Poison Potion II", "#446655", {
potion_fun = function(player) mcl_potions.poison_func(player, 1.2, 21*0.25) end, potion_fun = function(player) mcl_potions.poison_func(player, 1.2, 21*0.25) end,
tt = "-1/2 heart / 1.2sec | "..time_string(21*0.25) tt = "-1 HP / 1.2s | "..time_string(21*0.25)
}) })
register_lingering("poison_plus", "Lingering Poison +", "#557766", { register_lingering("poison_plus", "Lingering Poison Potion +", "#557766", {
potion_fun = function(player) mcl_potions.poison_func(player, 2.5, 90*0.25) end, potion_fun = function(player) mcl_potions.poison_func(player, 2.5, 90*0.25) end,
tt = "-1/2 heart / 2.5sec | "..time_string(90*0.25) tt = "-1 HP / 2.5s | "..time_string(90*0.25)
}) })
register_lingering("regeneration", "Lingering Regeneration", "#A52BB2", { register_lingering("regeneration", "Lingering Regeneration Potion", "#A52BB2", {
potion_fun = function(player) mcl_potions.regeneration_func(player, 2.5, 45*0.25) end, potion_fun = function(player) mcl_potions.regeneration_func(player, 2.5, 45*0.25) end,
tt = "1/2 heart / 2.5sec | "..time_string(45*0.25) tt = "+1 HP / 2.5s | "..time_string(45*0.25)
}) })
register_lingering("regeneration_2", "Lingering Regeneration II", "#B52CC2", { register_lingering("regeneration_2", "Lingering Regeneration Potion II", "#B52CC2", {
potion_fun = function(player) mcl_potions.regeneration_func(player, 1.2, 22*0.25) end, potion_fun = function(player) mcl_potions.regeneration_func(player, 1.2, 22*0.25) end,
tt = "1/2 heart / 1.2sec | "..time_string(22*0.25) tt = "+1 HP / 1.2s | "..time_string(22*0.25)
}) })
register_lingering("regeneration_plus", "Lingering Regeneration +", "#C53DD3", { register_lingering("regeneration_plus", "Lingering Regeneration Potion +", "#C53DD3", {
potion_fun = function(player) mcl_potions.regeneration_func(player, 2.5, 90*0.25) end, potion_fun = function(player) mcl_potions.regeneration_func(player, 2.5, 90*0.25) end,
tt = "1/2 heart / 2.5sec | "..time_string(90*0.25) tt = "+1 HP / 2.5s | "..time_string(90*0.25)
}) })
register_lingering("invisibility", "Lingering Invisibility", "#B0B0B0", { register_lingering("invisibility", "Lingering Invisibility Potion", "#B0B0B0", {
potion_fun = function(player) mcl_potions.invisiblility_func(player, mcl_potions.DURATION*0.25) end, potion_fun = function(player) mcl_potions.invisiblility_func(player, mcl_potions.DURATION*0.25) end,
tt = time_string(mcl_potions.DURATION*0.25) tt = time_string(mcl_potions.DURATION*0.25)
}) })
register_lingering("invisibility_plus", "Lingering Invisibility +", "#A0A0A0", { register_lingering("invisibility_plus", "Lingering Invisibility Potion +", "#A0A0A0", {
potion_fun = function(player) mcl_potions.invisiblility_func(player, mcl_potions.DURATION_PLUS*0.25) end, potion_fun = function(player) mcl_potions.invisiblility_func(player, mcl_potions.DURATION_PLUS*0.25) end,
tt = time_string(mcl_potions.DURATION_PLUS*0.25) tt = time_string(mcl_potions.DURATION_PLUS*0.25)
}) })
register_lingering("weakness", "Lingering Weakness", "#6600AA", { register_lingering("weakness", "Lingering Weakness Potion", "#6600AA", {
potion_fun = function(player) mcl_potions.weakness_func(player, -4, mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) end, potion_fun = function(player) mcl_potions.weakness_func(player, -4, mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) end,
tt = "No effect | "..time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) -- TODO: Fix tooltip
tt = time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25)
}) })
register_lingering("weakness_plus", "Lingering Weakness +", "#7700BB", { register_lingering("weakness_plus", "Lingering Weakness Potion +", "#7700BB", {
potion_fun = function(player) mcl_potions.weakness_func(player, -4, mcl_potions.DURATION_PLUS*mcl_potions.INV_FACTOR*0.25) end, potion_fun = function(player) mcl_potions.weakness_func(player, -4, mcl_potions.DURATION_PLUS*mcl_potions.INV_FACTOR*0.25) end,
tt = "No effect | "..time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25) -- TODO: Fix tooltip
tt = time_string(mcl_potions.DURATION*mcl_potions.INV_FACTOR*0.25)
}) })
register_lingering("fire_resistance", "Lingering Fire Resistance", "#D0A040", { register_lingering("fire_resistance", "Lingering Fire Resistance Potion", "#D0A040", {
potion_fun = function(player) mcl_potions.fire_resistance_func(player, mcl_potions.DURATION*0.25) end, potion_fun = function(player) mcl_potions.fire_resistance_func(player, mcl_potions.DURATION*0.25) end,
tt = time_string(mcl_potions.DURATION*0.25) tt = time_string(mcl_potions.DURATION*0.25)
}) })
register_lingering("fire_resistance_plus", "Lingering Fire Resistance +", "#E0B050", { register_lingering("fire_resistance_plus", "Lingering Fire Resistance Potion +", "#E0B050", {
potion_fun = function(player) mcl_potions.fire_resistance_func(player, mcl_potions.DURATION_PLUS*0.25) end, potion_fun = function(player) mcl_potions.fire_resistance_func(player, mcl_potions.DURATION_PLUS*0.25) end,
tt = time_string(mcl_potions.DURATION_PLUS*0.25) tt = time_string(mcl_potions.DURATION_PLUS*0.25)
}) })
register_lingering("strength", "Lingering Strength", "#D444D4", { register_lingering("strength", "Lingering Strength Potion", "#D444D4", {
potion_fun = function(player) mcl_potions.strength_func(player, 3, mcl_potions.DURATION*0.25) end, potion_fun = function(player) mcl_potions.strength_func(player, 3, mcl_potions.DURATION*0.25) end,
tt = "No effect | "..time_string(mcl_potions.DURATION*0.25) -- TODO: Fix tooltip
tt = time_string(mcl_potions.DURATION*0.25)
}) })
register_lingering("strength_2", "Lingering Strength II", "#D444F4", { register_lingering("strength_2", "Lingering Strength Potion II", "#D444F4", {
potion_fun = function(player) mcl_potions.strength_func(player, 6, smcl_potions.DURATION_2*0.25) end, potion_fun = function(player) mcl_potions.strength_func(player, 6, smcl_potions.DURATION_2*0.25) end,
tt = "No effect | "..time_string(mcl_potions.DURATION_2*0.25) -- TODO: Fix tooltip
tt = time_string(mcl_potions.DURATION_2*0.25)
}) })
register_lingering("strength_plus", "Lingering Strength +", "#D444E4", { register_lingering("strength_plus", "Lingering Strength Potion +", "#D444E4", {
potion_fun = function(player) mcl_potions.strength_func(player, 3, mcl_potions.DURATION_PLUS*0.25) end, potion_fun = function(player) mcl_potions.strength_func(player, 3, mcl_potions.DURATION_PLUS*0.25) end,
tt = "No effect | "..time_string(mcl_potions.DURATION_PLUS*0.25) -- TODO: Fix tooltip
tt = time_string(mcl_potions.DURATION_PLUS*0.25)
}) })
register_lingering("night_vision", "Lingering Night Vision", "#1010AA", { register_lingering("night_vision", "Lingering Night Vision Potion", "#1010AA", {
potion_fun = function(player) mcl_potions.night_vision_func(player, mcl_potions.DURATION*0.25) end, potion_fun = function(player) mcl_potions.night_vision_func(player, mcl_potions.DURATION*0.25) end,
tt = time_string(mcl_potions.DURATION*0.25) tt = time_string(mcl_potions.DURATION*0.25)
}) })
register_lingering("night_vision_plus", "Lingering Night Vision +", "#2020BA", { register_lingering("night_vision_plus", "Lingering Night Vision Potion +", "#2020BA", {
potion_fun = function(player) mcl_potions.night_vision_func(player, mcl_potions.DURATION_PLUS*0.25) end, potion_fun = function(player) mcl_potions.night_vision_func(player, mcl_potions.DURATION_PLUS*0.25) end,
tt = time_string(mcl_potions.DURATION_PLUS*0.25) tt = time_string(mcl_potions.DURATION_PLUS*0.25)
}) })

30
mods/ITEMS/mcl_potions/potions.lua
View file

@ -62,7 +62,7 @@ minetest.register_craftitem("mcl_potions:dragon_breath", {
minetest.register_craftitem("mcl_potions:healing", { minetest.register_craftitem("mcl_potions:healing", {
description = S("Healing Potion"), description = S("Healing Potion"),
_tt_help = S("+2 Hearts"), _tt_help = S("+4 HP"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#CC0000"), wield_image = potion_image("#CC0000"),
inventory_image = potion_image("#CC0000"), inventory_image = potion_image("#CC0000"),
@ -86,7 +86,7 @@ minetest.register_craftitem("mcl_potions:healing", {
minetest.register_craftitem("mcl_potions:healing_2", { minetest.register_craftitem("mcl_potions:healing_2", {
description = S("Healing Potion II"), description = S("Healing Potion II"),
_tt_help = S("+4 Hearts"), _tt_help = S("+8 HP"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#DD0000"), wield_image = potion_image("#DD0000"),
inventory_image = potion_image("#DD0000"), inventory_image = potion_image("#DD0000"),
@ -111,7 +111,7 @@ minetest.register_craftitem("mcl_potions:healing_2", {
minetest.register_craftitem("mcl_potions:harming", { minetest.register_craftitem("mcl_potions:harming", {
description = S("Harming Potion"), description = S("Harming Potion"),
_tt_help = S("-3 Hearts"), _tt_help = S("-6 HP"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#660099"), wield_image = potion_image("#660099"),
inventory_image = potion_image("#660099"), inventory_image = potion_image("#660099"),
@ -135,7 +135,7 @@ minetest.register_craftitem("mcl_potions:harming", {
minetest.register_craftitem("mcl_potions:harming_2", { minetest.register_craftitem("mcl_potions:harming_2", {
description = S("Harming Potion II"), description = S("Harming Potion II"),
_tt_help = S("-6 Hearts"), _tt_help = S("-12 HP"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#330066"), wield_image = potion_image("#330066"),
inventory_image = potion_image("#330066"), inventory_image = potion_image("#330066"),
@ -427,7 +427,7 @@ minetest.register_craftitem("mcl_potions:leaping_plus", {
minetest.register_craftitem("mcl_potions:weakness", { minetest.register_craftitem("mcl_potions:weakness", {
description = S("Weakness Potion"), description = S("Weakness Potion"),
_tt_help = S("-2 hearts per damage | 1:30"), _tt_help = S("-4 HP damage | 1:30"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#6600AA"), wield_image = potion_image("#6600AA"),
inventory_image = potion_image("#6600AA"), inventory_image = potion_image("#6600AA"),
@ -451,7 +451,7 @@ minetest.register_craftitem("mcl_potions:weakness", {
minetest.register_craftitem("mcl_potions:weakness_plus", { minetest.register_craftitem("mcl_potions:weakness_plus", {
description = S("Weakness Potion +"), description = S("Weakness Potion +"),
_tt_help = S("-2 hearts per damage | 4:00"), _tt_help = S("-4 HP damage | 4:00"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#7700BB"), wield_image = potion_image("#7700BB"),
inventory_image = potion_image("#7700BB"), inventory_image = potion_image("#7700BB"),
@ -475,7 +475,7 @@ minetest.register_craftitem("mcl_potions:weakness_plus", {
minetest.register_craftitem("mcl_potions:strength", { minetest.register_craftitem("mcl_potions:strength", {
description = S("Strength Potion"), description = S("Strength Potion"),
_tt_help = S("+1.5 hearts per damage | 3:00"), _tt_help = S("+3 HP damage | 3:00"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#D444D4"), wield_image = potion_image("#D444D4"),
inventory_image = potion_image("#D444D4"), inventory_image = potion_image("#D444D4"),
@ -499,7 +499,7 @@ minetest.register_craftitem("mcl_potions:strength", {
minetest.register_craftitem("mcl_potions:strength_2", { minetest.register_craftitem("mcl_potions:strength_2", {
description = S("Strength Potion II"), description = S("Strength Potion II"),
_tt_help = S("+3 hearts per damage | 1:30"), _tt_help = S("+6 HP damage | 1:30"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#D444E4"), wield_image = potion_image("#D444E4"),
inventory_image = potion_image("#D444E4"), inventory_image = potion_image("#D444E4"),
@ -523,7 +523,7 @@ minetest.register_craftitem("mcl_potions:strength_2", {
minetest.register_craftitem("mcl_potions:strength_plus", { minetest.register_craftitem("mcl_potions:strength_plus", {
description = S("Strength Potion +"), description = S("Strength Potion +"),
_tt_help = S("1.5 hearts per damage | 8:00"), _tt_help = S("+3 HP damage | 8:00"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#D444F4"), wield_image = potion_image("#D444F4"),
inventory_image = potion_image("#D444F4"), inventory_image = potion_image("#D444F4"),
@ -546,7 +546,7 @@ minetest.register_craftitem("mcl_potions:strength_plus", {
}) })
minetest.register_craftitem("mcl_potions:poison", { minetest.register_craftitem("mcl_potions:poison", {
description = S("Poison Potion"), description = S("Poison Potion"),
_tt_help = S("-1/2 Heart / 2.5sec | 0:45"), _tt_help = S("-1 HP / 2.5s | 0:45"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#225533"), wield_image = potion_image("#225533"),
inventory_image = potion_image("#225533"), inventory_image = potion_image("#225533"),
@ -570,7 +570,7 @@ minetest.register_craftitem("mcl_potions:poison", {
minetest.register_craftitem("mcl_potions:poison_2", { minetest.register_craftitem("mcl_potions:poison_2", {
description = S("Poison Potion II"), description = S("Poison Potion II"),
_tt_help = S("-1/2 Heart / 1.2sec | 0:21"), _tt_help = S("-1 HP / 1.2s | 0:21"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#447755"), wield_image = potion_image("#447755"),
inventory_image = potion_image("#447755"), inventory_image = potion_image("#447755"),
@ -594,7 +594,7 @@ minetest.register_craftitem("mcl_potions:poison_2", {
minetest.register_craftitem("mcl_potions:poison_plus", { minetest.register_craftitem("mcl_potions:poison_plus", {
description = S("Poison Potion +"), description = S("Poison Potion +"),
_tt_help = S("-1/2 Heart / 2.5sec | 1:30"), _tt_help = S("-1 HP / 2.5s | 1:30"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#336644"), wield_image = potion_image("#336644"),
inventory_image = potion_image("#336644"), inventory_image = potion_image("#336644"),
@ -619,7 +619,7 @@ minetest.register_craftitem("mcl_potions:poison_plus", {
minetest.register_craftitem("mcl_potions:regeneration", { minetest.register_craftitem("mcl_potions:regeneration", {
description = S("Regeneration Potion"), description = S("Regeneration Potion"),
_tt_help = S("+1/2 Heart / 2.5sec | 0:45"), _tt_help = S("+1 HP / 2.5s | 0:45"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#A52BB2"), wield_image = potion_image("#A52BB2"),
inventory_image = potion_image("#A52BB2"), inventory_image = potion_image("#A52BB2"),
@ -643,7 +643,7 @@ minetest.register_craftitem("mcl_potions:regeneration", {
minetest.register_craftitem("mcl_potions:regeneration_2", { minetest.register_craftitem("mcl_potions:regeneration_2", {
description = S("Regeneration Potion II"), description = S("Regeneration Potion II"),
_tt_help = S("+1/2 Heart / 1.2sec | 0:22"), _tt_help = S("+1 HP / 1.2s | 0:22"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#B52CC2"), wield_image = potion_image("#B52CC2"),
inventory_image = potion_image("#B52CC2"), inventory_image = potion_image("#B52CC2"),
@ -667,7 +667,7 @@ minetest.register_craftitem("mcl_potions:regeneration_2", {
minetest.register_craftitem("mcl_potions:regeneration_plus", { minetest.register_craftitem("mcl_potions:regeneration_plus", {
description = S("Regeneration Potion +"), description = S("Regeneration Potion +"),
_tt_help = S("+1/2 Heart / 2.5sec | 1:30"), _tt_help = S("+1 HP / 2.5s | 1:30"),
_doc_items_longdesc = brewhelp, _doc_items_longdesc = brewhelp,
wield_image = potion_image("#C53DD3"), wield_image = potion_image("#C53DD3"),
inventory_image = potion_image("#C53DD3"), inventory_image = potion_image("#C53DD3"),

109
mods/ITEMS/mcl_potions/splash.lua
View file

@ -87,188 +87,193 @@ local splash_DUR = mcl_potions.DURATION*mcl_potions.SPLASH_FACTOR
local splash_DUR_2 = mcl_potions.DURATION_2*mcl_potions.SPLASH_FACTOR local splash_DUR_2 = mcl_potions.DURATION_2*mcl_potions.SPLASH_FACTOR
local splash_DUR_pl = mcl_potions.DURATION_PLUS*mcl_potions.SPLASH_FACTOR local splash_DUR_pl = mcl_potions.DURATION_PLUS*mcl_potions.SPLASH_FACTOR
register_splash("water", "Splash Water", "#0000FF", { register_splash("water", "Splash Water Bottle", "#0000FF", {
potion_fun = function(player, redx) end, potion_fun = function(player, redx) end,
tt = "No effect" tt = "No effect"
}) })
register_splash("river_water", "Splash River Water", "#0000FF", { register_splash("river_water", "Splash River Water Bottle", "#0000FF", {
potion_fun = function(player, redx) end, potion_fun = function(player, redx) end,
tt = "No effect" tt = "No effect"
}) })
register_splash("awkward", "Splash Awkward Potion", "#0000FF", { register_splash("awkward", "Awkward Splash Potion", "#0000FF", {
potion_fun = function(player, redx) end, potion_fun = function(player, redx) end,
tt = "No effect" tt = "No effect"
}) })
register_splash("mundane", "Splash Mundane Potion", "#0000FF", { register_splash("mundane", "Mundane Splash Potion", "#0000FF", {
potion_fun = function(player, redx) end, potion_fun = function(player, redx) end,
tt = "No effect" tt = "No effect"
}) })
register_splash("thick", "Splash Thick Potion", "#0000FF", { register_splash("thick", "Thick Splash Potion", "#0000FF", {
potion_fun = function(player, redx) end, potion_fun = function(player, redx) end,
tt = "No effect" tt = "No effect"
}) })
register_splash("healing", "Splash Healing", "#AA0000", { register_splash("healing", "Healing Splash Potion", "#AA0000", {
potion_fun = function(player, redx) mcl_potions.healing_func(player, 3*redx) end, potion_fun = function(player, redx) mcl_potions.healing_func(player, 3*redx) end,
tt = "1.5 hearts" tt = "+3 HP"
}) })
register_splash("healing_2", "Splash Healing II", "#DD0000", { register_splash("healing_2", "Healing Splash Potion II", "#DD0000", {
potion_fun = function(player, redx) mcl_potions.healing_func(player, 6*redx) end, potion_fun = function(player, redx) mcl_potions.healing_func(player, 6*redx) end,
tt = "3 hearts" tt = "+6 HP"
}) })
register_splash("harming", "Splash Harming", "#660099", { register_splash("harming", "Harming Splash Potion", "#660099", {
potion_fun = function(player, redx) mcl_potions.healing_func(player, -6*redx) end, potion_fun = function(player, redx) mcl_potions.healing_func(player, -6*redx) end,
tt = "-2 hearts" tt = "-4 HP"
}) })
register_splash("harming_2", "Splash Harming II", "#330066", { register_splash("harming_2", "Harming Splash Potion II", "#330066", {
potion_fun = function(player, redx) mcl_potions.healing_func(player, -12*redx) end, potion_fun = function(player, redx) mcl_potions.healing_func(player, -12*redx) end,
tt = "-3 hearts" tt = "-6 HP"
}) })
register_splash("leaping", "Splash Leaping", "#00CC33", { register_splash("leaping", "Leaping Splash Potion", "#00CC33", {
potion_fun = function(player, redx) mcl_potions.leaping_func(player, 1.2, splash_DUR*redx) end, potion_fun = function(player, redx) mcl_potions.leaping_func(player, 1.2, splash_DUR*redx) end,
tt = "120% | "..time_string(splash_DUR) tt = "120% | "..time_string(splash_DUR)
}) })
register_splash("leaping_2", "Splash Leaping II", "#00EE33", { register_splash("leaping_2", "Leaping Splash Potion II", "#00EE33", {
potion_fun = function(player, redx) mcl_potions.leaping_func(player, 1.4, splash_DUR_2*redx) end, potion_fun = function(player, redx) mcl_potions.leaping_func(player, 1.4, splash_DUR_2*redx) end,
tt = "140% | "..time_string(splash_DUR_2) tt = "140% | "..time_string(splash_DUR_2)
}) })
register_splash("leaping_plus", "Splash Leaping +", "#00DD33", { register_splash("leaping_plus", "Leaping Splash Potion +", "#00DD33", {
potion_fun = function(player, redx) mcl_potions.leaping_func(player, 1.2, splash_DUR_pl*redx) end, potion_fun = function(player, redx) mcl_potions.leaping_func(player, 1.2, splash_DUR_pl*redx) end,
tt = "120% | "..time_string(splash_DUR_pl) tt = "120% | "..time_string(splash_DUR_pl)
}) })
register_splash("swiftness", "Splash Swiftness", "#009999", { register_splash("swiftness", "Swiftness Splash Potion", "#009999", {
potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 1.2, splash_DUR*redx) end, potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 1.2, splash_DUR*redx) end,
tt = "120% | "..time_string(splash_DUR) tt = "120% | "..time_string(splash_DUR)
}) })
register_splash("swiftness_2", "Splash Swiftness II", "#00BBBB", { register_splash("swiftness_2", "Swiftness Splash Potion II", "#00BBBB", {
potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 1.4, splash_DUR_2*redx) end, potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 1.4, splash_DUR_2*redx) end,
tt = "140% | "..time_string(splash_DUR_2) tt = "140% | "..time_string(splash_DUR_2)
}) })
register_splash("swiftness_plus", "Splash Swiftness +", "#00BBBB", { register_splash("swiftness_plus", "Swiftness Splash Potion +", "#00BBBB", {
potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 1.2, splash_DUR_pl*redx) end, potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 1.2, splash_DUR_pl*redx) end,
tt = "120% | "..time_string(splash_DUR_2) tt = "120% | "..time_string(splash_DUR_2)
}) })
register_splash("slowness", "Splash Slowness", "#000080", { register_splash("slowness", "Slowness Splash Potion", "#000080", {
potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 0.85, splash_DUR*mcl_potions.INV_FACTOR*redx) end, potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 0.85, splash_DUR*mcl_potions.INV_FACTOR*redx) end,
tt = "85% | "..time_string(splash_DUR*mcl_potions.INV_FACTOR) tt = "85% | "..time_string(splash_DUR*mcl_potions.INV_FACTOR)
}) })
register_splash("slowness_2", "Splash Slowness IV", "#000080", { register_splash("slowness_2", "Slowness Splash Potion IV", "#000080", {
potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 0.4, 20*mcl_potions.INV_FACTOR*redx) end, potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 0.4, 20*mcl_potions.INV_FACTOR*redx) end,
tt = "40% | "..time_string(20*mcl_potions.INV_FACTOR) tt = "40% | "..time_string(20*mcl_potions.INV_FACTOR)
}) })
register_splash("slowness_plus", "Splash Slowness +", "#000066", { register_splash("slowness_plus", "Slowness Splash Potion +", "#000066", {
potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 0.85, splash_DUR_pl*mcl_potions.INV_FACTOR*redx) end, potion_fun = function(player, redx) mcl_potions.swiftness_func(player, 0.85, splash_DUR_pl*mcl_potions.INV_FACTOR*redx) end,
tt = "85% | "..time_string(splash_DUR_pl*mcl_potions.INV_FACTOR) tt = "85% | "..time_string(splash_DUR_pl*mcl_potions.INV_FACTOR)
}) })
register_splash("poison", "Splash Poison", "#335544", { register_splash("poison", "Poison Splash Potion", "#335544", {
potion_fun = function(player, redx) mcl_potions.poison_func(player, 2.5, splash_DUR*mcl_potions.INV_FACTOR^2*redx) end, potion_fun = function(player, redx) mcl_potions.poison_func(player, 2.5, splash_DUR*mcl_potions.INV_FACTOR^2*redx) end,
tt = "-1/2 heart / 2.5sec | "..time_string(splash_DUR*mcl_potions.INV_FACTOR^2) tt = "-1 HP / 2.5s | "..time_string(splash_DUR*mcl_potions.INV_FACTOR^2)
}) })
register_splash("poison_2", "Splash Poison II", "#446655", { register_splash("poison_2", "Poison Splash Potion II", "#446655", {
potion_fun = function(player, redx) mcl_potions.poison_func(player, 1.2, splash_DUR_2*mcl_potions.INV_FACTOR^2*redx) end, potion_fun = function(player, redx) mcl_potions.poison_func(player, 1.2, splash_DUR_2*mcl_potions.INV_FACTOR^2*redx) end,
tt = "-1/2 heart / 1.2sec | "..time_string(splash_DUR_2*mcl_potions.INV_FACTOR^2) tt = "-1 HP / 1.2s | "..time_string(splash_DUR_2*mcl_potions.INV_FACTOR^2)
}) })
register_splash("poison_plus", "Splash Poison +", "#557766", { register_splash("poison_plus", "Poison Splash Potion +", "#557766", {
potion_fun = function(player, redx) mcl_potions.poison_func(player, 2.5, splash_DUR*mcl_potions.INV_FACTOR*redx) end, potion_fun = function(player, redx) mcl_potions.poison_func(player, 2.5, splash_DUR*mcl_potions.INV_FACTOR*redx) end,
tt = "-1/2 heart / 2.5sec | "..time_string(splash_DUR_pl*mcl_potions.INV_FACTOR^2) tt = "-1 HP / 2.5s | "..time_string(splash_DUR_pl*mcl_potions.INV_FACTOR^2)
}) })
register_splash("regeneration", "Splash Regeneration", "#A52BB2", { register_splash("regeneration", "Regeneration Splash Potion", "#A52BB2", {
potion_fun = function(player, redx) mcl_potions.regeneration_func(player, 2.5, splash_DUR*redx) end, potion_fun = function(player, redx) mcl_potions.regeneration_func(player, 2.5, splash_DUR*redx) end,
tt = "1/2 heart / 2.5sec | "..time_string(splash_DUR) tt = "+1 HP / 2.5s | "..time_string(splash_DUR)
}) })
register_splash("regeneration_2", "Splash Regeneration II", "#B52CC2", { register_splash("regeneration_2", "Regeneration Splash Potion II", "#B52CC2", {
potion_fun = function(player, redx) mcl_potions.regeneration_func(player, 1.2, (splash_DUR_2 + 1)*redx) end, potion_fun = function(player, redx) mcl_potions.regeneration_func(player, 1.2, (splash_DUR_2 + 1)*redx) end,
tt = "1/2 heart / 1.2sec | "..time_string(splash_DUR_2 + 1) tt = "+1 HP / 1.2s | "..time_string(splash_DUR_2 + 1)
}) })
register_splash("regeneration_plus", "Splash Regeneration +", "#C53DD3", { register_splash("regeneration_plus", "Regeneration Splash Potion +", "#C53DD3", {
potion_fun = function(player, redx) mcl_potions.regeneration_func(player, 2.5, splash_DUR_pl*redx) end, potion_fun = function(player, redx) mcl_potions.regeneration_func(player, 2.5, splash_DUR_pl*redx) end,
tt = "1/2 heart / 2.5sec | "..time_string(splash_DUR_pl) tt = "+1 HP / 2.5s | "..time_string(splash_DUR_pl)
}) })
register_splash("invisibility", "Splash Invisibility", "#B0B0B0", { register_splash("invisibility", "Invisibility Splash Potion", "#B0B0B0", {
potion_fun = function(player, redx) mcl_potions.invisiblility_func(player, splash_DUR*redx) end, potion_fun = function(player, redx) mcl_potions.invisiblility_func(player, splash_DUR*redx) end,
tt = time_string(splash_DUR) tt = time_string(splash_DUR)
}) })
register_splash("invisibility_plus", "Splash Invisibility +", "#A0A0A0", { register_splash("invisibility_plus", "Invisibility Splash Potion +", "#A0A0A0", {
potion_fun = function(player, redx) mcl_potions.invisiblility_func(player, splash_DUR_pl*redx) end, potion_fun = function(player, redx) mcl_potions.invisiblility_func(player, splash_DUR_pl*redx) end,
tt = time_string(splash_DUR_pl) tt = time_string(splash_DUR_pl)
}) })
register_splash("weakness", "Splash Weakness", "#6600AA", { register_splash("weakness", "Weakness Splash Potion", "#6600AA", {
potion_fun = function(player, redx) mcl_potions.weakness_func(player, -4, splash_DUR*mcl_potions.INV_FACTOR*redx) end, potion_fun = function(player, redx) mcl_potions.weakness_func(player, -4, splash_DUR*mcl_potions.INV_FACTOR*redx) end,
tt = "No effect | "..time_string(splash_DUR*mcl_potions.INV_FACTOR) -- TODO: Fix tooltip
tt = time_string(splash_DUR*mcl_potions.INV_FACTOR)
}) })
register_splash("weakness_plus", "Splash Weakness +", "#7700BB", { register_splash("weakness_plus", "Weakness Splash Potion +", "#7700BB", {
potion_fun = function(player, redx) mcl_potions.weakness_func(player, -4, splash_DUR_pl*mcl_potions.INV_FACTOR*redx) end, potion_fun = function(player, redx) mcl_potions.weakness_func(player, -4, splash_DUR_pl*mcl_potions.INV_FACTOR*redx) end,
tt = "No effect | "..time_string(splash_DUR_pl*mcl_potions.INV_FACTOR) -- TODO: Fix tooltip
tt = time_string(splash_DUR_pl*mcl_potions.INV_FACTOR)
}) })
register_splash("strength", "Splash Strength", "#D444D4", { register_splash("strength", "Strength Splash Potion", "#D444D4", {
potion_fun = function(player, redx) mcl_potions.strength_func(player, 3, splash_DUR*redx) end, potion_fun = function(player, redx) mcl_potions.strength_func(player, 3, splash_DUR*redx) end,
tt = "No effect | "..time_string(splash_DUR) -- TODO: Fix tooltip
tt = time_string(splash_DUR)
}) })
register_splash("strength_2", "Splash Strength II", "#D444F4", { register_splash("strength_2", "Strength Splash Potion II", "#D444F4", {
potion_fun = function(player, redx) mcl_potions.strength_func(player, 6, splash_DUR_2*redx) end, potion_fun = function(player, redx) mcl_potions.strength_func(player, 6, splash_DUR_2*redx) end,
tt = "No effect | "..time_string(splash_DUR_2) -- TODO: Fix tooltip
tt = time_string(splash_DUR_2)
}) })
register_splash("strength_plus", "Splash Strength +", "#D444E4", { register_splash("strength_plus", "Strength Splash Potion +", "#D444E4", {
potion_fun = function(player, redx) mcl_potions.strength_func(player, 3, splash_DUR_pl*redx) end, potion_fun = function(player, redx) mcl_potions.strength_func(player, 3, splash_DUR_pl*redx) end,
tt = "No effect | "..time_string(splash_DUR_pl) -- TODO: Fix tooltip
tt = time_string(splash_DUR_pl)
}) })
register_splash("water_breathing", "Splash Water Breathing", "#0000AA", { register_splash("water_breathing", "Water Breathing Splash Potion", "#0000AA", {
potion_fun = function(player, redx) mcl_potions.water_breathing_func(player, splash_DUR*redx) end, potion_fun = function(player, redx) mcl_potions.water_breathing_func(player, splash_DUR*redx) end,
tt = time_string(splash_DUR) tt = time_string(splash_DUR)
}) })
register_splash("water_breathing_plus", "Splash Water Breathing +", "#0000CC", { register_splash("water_breathing_plus", "Water Breathing Splash Potion +", "#0000CC", {
potion_fun = function(player, redx) mcl_potions.water_breathing_func(player, splash_DUR_pl*redx) end, potion_fun = function(player, redx) mcl_potions.water_breathing_func(player, splash_DUR_pl*redx) end,
tt = time_string(splash_DUR_pl) tt = time_string(splash_DUR_pl)
}) })
register_splash("fire_resistance", "Splash Fire Resistance", "#D0A040", { register_splash("fire_resistance", "Fire Resistance Splash Potion", "#D0A040", {
potion_fun = function(player, redx) mcl_potions.fire_resistance_func(player, splash_DUR*redx) end, potion_fun = function(player, redx) mcl_potions.fire_resistance_func(player, splash_DUR*redx) end,
tt = time_string(splash_DUR) tt = time_string(splash_DUR)
}) })
register_splash("fire_resistance_plus", "Splash Fire Resistance +", "#E0B050", { register_splash("fire_resistance_plus", "Fire Resistance Splash Potion +", "#E0B050", {
potion_fun = function(player, redx) mcl_potions.fire_resistance_func(player, splash_DUR_pl*redx) end, potion_fun = function(player, redx) mcl_potions.fire_resistance_func(player, splash_DUR_pl*redx) end,
tt = time_string(splash_DUR_pl) tt = time_string(splash_DUR_pl)
}) })
register_splash("night_vision", "Splash Night Vision", "#1010AA", { register_splash("night_vision", "Night Vision Splash Potion", "#1010AA", {
potion_fun = function(player, redx) mcl_potions.night_vision_func(player, splash_DUR*redx) end, potion_fun = function(player, redx) mcl_potions.night_vision_func(player, splash_DUR*redx) end,
tt = time_string(splash_DUR) tt = time_string(splash_DUR)
}) })
register_splash("night_vision_plus", "Splash Night Vision +", "#2020BA", { register_splash("night_vision_plus", "Night Vision Splash Potion +", "#2020BA", {
potion_fun = function(player, redx) mcl_potions.night_vision_func(player, splash_DUR_pl*redx) end, potion_fun = function(player, redx) mcl_potions.night_vision_func(player, splash_DUR_pl*redx) end,
tt = time_string(splash_DUR_pl) tt = time_string(splash_DUR_pl)
}) })