0ldude
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Potions registering API fully works with creative

This commit is contained in:
the-real-herowl 2023-11-03 22:28:00 +01:00 committed by the-real-herowl
parent 2c63903e8e
commit 9251cc1583
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/HUD/mcl_inventory/creative.lua
View File

@ -126,13 +126,15 @@ minetest.register_on_mods_loaded(function()
if def.groups._mcl_potion == 1 then if def.groups._mcl_potion == 1 then
if def.has_potent then if def.has_potent then
local stack = ItemStack(name) local stack = ItemStack(name)
stack:get_meta():set_int("mcl_potions:potion_potent", 1) local potency = def._default_potent_level - 1
stack:get_meta():set_int("mcl_potions:potion_potent", potency)
tt.reload_itemstack_description(stack) tt.reload_itemstack_description(stack)
table.insert(inventory_lists["brew"], stack:to_string()) table.insert(inventory_lists["brew"], stack:to_string())
end end
if def.has_plus then if def.has_plus then
local stack = ItemStack(name) local stack = ItemStack(name)
stack:get_meta():set_int("mcl_potions:potion_plus", 1) local extend = def._default_extend_level
stack:get_meta():set_int("mcl_potions:potion_plus", extend)
tt.reload_itemstack_description(stack) tt.reload_itemstack_description(stack)
table.insert(inventory_lists["brew"], stack:to_string()) table.insert(inventory_lists["brew"], stack:to_string())
end end

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

@ -8,7 +8,7 @@ local function potion_image(colorstring, opacity)
end end
local how_to_drink = S("Use the “Place” key to drink it.") local how_to_drink = S("Use the “Place” key to drink it.")
local potion_intro = S("Drinking a potion gives you a particular effect.") local potion_intro = S("Drinking a potion gives you a particular effect or set of effects.")
local function time_string(dur) local function time_string(dur)
if not dur then if not dur then
@ -166,7 +166,8 @@ end
-- has_lingering - bool - defaults to true -- has_lingering - bool - defaults to true
-- has_arrow - bool - defaults to false -- has_arrow - bool - defaults to false
-- has_potent - bool - whether there is a potent (e.g. II) variant - defaults to the value of uses_level -- has_potent - bool - whether there is a potent (e.g. II) variant - defaults to the value of uses_level
-- default_potent_level - int - effect level used for the potent variant - defaults to 2 -- default_potent_level - int - potion level used for the default potent variant - defaults to 2
-- default_extend_level - int - extention level (amount of +) used for the default extended variant - defaults to 1
-- custom_on_use - function(user, level) - called when the potion is drunk -- custom_on_use - function(user, level) - called when the potion is drunk
-- custom_effect - function(object, level) - called when the potion effects are applied -- custom_effect - function(object, level) - called when the potion effects are applied
-- custom_splash_effect - function(pos, level) - called when the splash potion explodes -- custom_splash_effect - function(pos, level) - called when the splash potion explodes
@ -225,6 +226,8 @@ function mcl_potions.register_potion(def)
pdef.uses_level = uses_level pdef.uses_level = uses_level
if def.has_potent ~= nil then pdef.has_potent = def.has_potent if def.has_potent ~= nil then pdef.has_potent = def.has_potent
else pdef.has_potent = uses_level end else pdef.has_potent = uses_level end
pdef._default_potent_level = def.default_potent_level or 2
pdef._default_extend_level = def.default_extend_level or 1
pdef.has_plus = has_plus pdef.has_plus = has_plus
local on_use local on_use
if def.drinkable ~= false then if def.drinkable ~= false then
@ -259,6 +262,8 @@ mcl_potions.register_potion({
dur = 10, dur = 10,
}, },
}, },
default_potent_level = 5,
default_extend_level = 3,
}) })