forked from VoxeLibre/VoxeLibre
Move redundant water bottle code to functions
This commit is contained in:
parent
06f8688f26
commit
cbe0f80d68
|
|
@ -176,18 +176,46 @@ local fill_cauldron = function(cauldron, water_type)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Itemstring of potions is “mcl_potions:<NBT Potion Tag>”
|
-- function to set node and empty water bottle (used for cauldrons and mud)
|
||||||
|
local function set_node_empty_bottle(itemstack, placer, pointed_thing, newitemstring)
|
||||||
|
local pname = placer:get_player_name()
|
||||||
|
if minetest.is_protected(pointed_thing.under, pname) then
|
||||||
|
minetest.record_protection_violation(pointed_thing.under, pname)
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
minetest.register_craftitem("mcl_potions:water", {
|
-- set the node to `itemstring`
|
||||||
description = S("Water Bottle"),
|
minetest.set_node(pointed_thing.under, {name=newitemstring})
|
||||||
_tt_help = S("No effect"),
|
|
||||||
_doc_items_longdesc = S("Water bottles can be used to fill cauldrons. Drinking water has no effect."),
|
-- play sound
|
||||||
_doc_items_usagehelp = S("Use the “Place” key to drink. Place this item on a cauldron to pour the water into the cauldron."),
|
minetest.sound_play("mcl_potions_bottle_pour", {pos=pointed_thing.under, gain=0.5, max_hear_range=16}, true)
|
||||||
stack_max = 1,
|
|
||||||
inventory_image = potion_image("#0022FF"),
|
--
|
||||||
wield_image = potion_image("#0022FF"),
|
if minetest.is_creative_enabled(placer:get_player_name()) then
|
||||||
groups = {brewitem=1, food=3, can_eat_when_full=1, water_bottle=1},
|
return itemstack
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
else
|
||||||
|
return "mcl_potions:glass_bottle"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- used for water bottles and river water bottles
|
||||||
|
local function dispense_water_bottle(stack, pos, droppos)
|
||||||
|
local node = minetest.get_node(droppos)
|
||||||
|
if node.name == "mcl_core:dirt" or node.name == "mcl_core:coarse_dirt" then
|
||||||
|
-- convert dirt/coarse dirt to mud
|
||||||
|
minetest.set_node(droppos, {name = "mcl_mud:mud"})
|
||||||
|
minetest.sound_play("mcl_potions_bottle_pour", {pos=droppos, gain=0.5, max_hear_range=16}, true)
|
||||||
|
return ItemStack("mcl_potions:glass_bottle")
|
||||||
|
|
||||||
|
elseif node.name == "mcl_mud:mud" then
|
||||||
|
-- dont dispense into mud
|
||||||
|
return stack
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- on_place function for `mcl_potions:water` and `mcl_potions:river_water`
|
||||||
|
|
||||||
|
local function water_bottle_on_place(itemstack, placer, pointed_thing)
|
||||||
if pointed_thing.type == "node" then
|
if pointed_thing.type == "node" then
|
||||||
local node = minetest.get_node(pointed_thing.under)
|
local node = minetest.get_node(pointed_thing.under)
|
||||||
local def = minetest.registered_nodes[node.name]
|
local def = minetest.registered_nodes[node.name]
|
||||||
|
|
@ -199,52 +227,38 @@ minetest.register_craftitem("mcl_potions:water", {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local cauldron = fill_cauldron(node.name, "mcl_core:water_source")
|
local cauldron = nil
|
||||||
if cauldron then
|
if itemstack:get_name() == "mcl_potions:water" then -- regular water
|
||||||
local pname = placer:get_player_name()
|
cauldron = fill_cauldron(node.name, "mcl_core:water_source")
|
||||||
if minetest.is_protected(pointed_thing.under, pname) then
|
elseif itemstack:get_name() == "mcl_potions:river_water" then -- river water
|
||||||
minetest.record_protection_violation(pointed_thing.under, pname)
|
cauldron = fill_cauldron(node.name, "mclx_core:river_water_source")
|
||||||
return itemstack
|
|
||||||
end
|
|
||||||
-- Increase water level of cauldron by 1
|
|
||||||
minetest.set_node(pointed_thing.under, {name=cauldron})
|
|
||||||
minetest.sound_play("mcl_potions_bottle_pour", {pos=pointed_thing.under, gain=0.5, max_hear_range=16}, true)
|
|
||||||
if minetest.is_creative_enabled(placer:get_player_name()) then
|
|
||||||
return itemstack
|
|
||||||
else
|
|
||||||
return "mcl_potions:glass_bottle"
|
|
||||||
end
|
|
||||||
elseif node.name == "mcl_core:dirt" or node.name == "mcl_core:coarse_dirt" then
|
|
||||||
local pname = placer:get_player_name()
|
|
||||||
if minetest.is_protected(pointed_thing.under, pname) then
|
|
||||||
minetest.record_protection_violation(pointed_thing.under, pname)
|
|
||||||
return itemstack
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- convert to mud
|
|
||||||
minetest.set_node(pointed_thing.under, {name="mcl_mud:mud"})
|
if cauldron then
|
||||||
minetest.sound_play("mcl_potions_bottle_pour", {pos=pointed_thing.under, gain=0.5, max_hear_range=16}, true)
|
set_node_empty_bottle(itemstack, placer, pointed_thing, cauldron)
|
||||||
if minetest.is_creative_enabled(placer:get_player_name()) then
|
elseif node.name == "mcl_core:dirt" or node.name == "mcl_core:coarse_dirt" then
|
||||||
return itemstack
|
set_node_empty_bottle(itemstack, placer, pointed_thing, "mcl_mud:mud")
|
||||||
else
|
|
||||||
return "mcl_potions:glass_bottle"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Drink the water by default
|
-- Drink the water by default
|
||||||
return minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, placer, pointed_thing)
|
return minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, placer, pointed_thing)
|
||||||
end,
|
|
||||||
_on_dispense = function(stack, pos, droppos)
|
|
||||||
local node = minetest.get_node(droppos)
|
|
||||||
if node.name == "mcl_core:dirt" or node.name == "mcl_core:coarse_dirt" then
|
|
||||||
minetest.set_node(droppos, {name = "mcl_mud:mud"})
|
|
||||||
minetest.sound_play("mcl_potions_bottle_pour", {pos=droppos, gain=0.5, max_hear_range=16}, true)
|
|
||||||
return ItemStack("mcl_potions:glass_bottle")
|
|
||||||
elseif node.name == "mcl_mud:mud" then
|
|
||||||
return stack
|
|
||||||
end
|
end
|
||||||
end,
|
|
||||||
|
-- Itemstring of potions is “mcl_potions:<NBT Potion Tag>”
|
||||||
|
|
||||||
|
minetest.register_craftitem("mcl_potions:water", {
|
||||||
|
description = S("Water Bottle"),
|
||||||
|
_tt_help = S("No effect"),
|
||||||
|
_doc_items_longdesc = S("Water bottles can be used to fill cauldrons. Drinking water has no effect."),
|
||||||
|
_doc_items_usagehelp = S("Use the “Place” key to drink. Place this item on a cauldron to pour the water into the cauldron."),
|
||||||
|
stack_max = 1,
|
||||||
|
inventory_image = potion_image("#0022FF"),
|
||||||
|
wield_image = potion_image("#0022FF"),
|
||||||
|
groups = {brewitem=1, food=3, can_eat_when_full=1, water_bottle=1},
|
||||||
|
on_place = water_bottle_on_place,
|
||||||
|
_on_dispense = dispense_water_bottle,
|
||||||
_dispense_into_walkable = true,
|
_dispense_into_walkable = true,
|
||||||
on_secondary_use = minetest.item_eat(0, "mcl_potions:glass_bottle"),
|
on_secondary_use = minetest.item_eat(0, "mcl_potions:glass_bottle"),
|
||||||
})
|
})
|
||||||
|
|
@ -260,64 +274,8 @@ minetest.register_craftitem("mcl_potions:river_water", {
|
||||||
inventory_image = potion_image("#0044FF"),
|
inventory_image = potion_image("#0044FF"),
|
||||||
wield_image = potion_image("#0044FF"),
|
wield_image = potion_image("#0044FF"),
|
||||||
groups = {brewitem=1, food=3, can_eat_when_full=1, water_bottle=1},
|
groups = {brewitem=1, food=3, can_eat_when_full=1, water_bottle=1},
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
on_place = water_bottle_on_place,
|
||||||
if pointed_thing.type == "node" then
|
_on_dispense = dispense_water_bottle,
|
||||||
local node = minetest.get_node(pointed_thing.under)
|
|
||||||
local def = minetest.registered_nodes[node.name]
|
|
||||||
|
|
||||||
-- Call on_rightclick if the pointed node defines it
|
|
||||||
if placer and not placer:get_player_control().sneak then
|
|
||||||
if def and def.on_rightclick then
|
|
||||||
return def.on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local cauldron = fill_cauldron(node.name, "mclx_core:river_water_source")
|
|
||||||
if cauldron then
|
|
||||||
local pname = placer:get_player_name()
|
|
||||||
if minetest.is_protected(pointed_thing.under, pname) then
|
|
||||||
minetest.record_protection_violation(pointed_thing.under, pname)
|
|
||||||
return itemstack
|
|
||||||
end
|
|
||||||
-- Increase water level of cauldron by 1
|
|
||||||
minetest.set_node(pointed_thing.under, {name=cauldron})
|
|
||||||
minetest.sound_play("mcl_potions_bottle_pour", {pos=pointed_thing.under, gain=0.5, max_hear_range=16}, true)
|
|
||||||
if minetest.is_creative_enabled(placer:get_player_name()) then
|
|
||||||
return itemstack
|
|
||||||
else
|
|
||||||
return "mcl_potions:glass_bottle"
|
|
||||||
end
|
|
||||||
elseif node.name == "mcl_core:dirt" or node.name == "mcl_core:coarse_dirt" then
|
|
||||||
local pname = placer:get_player_name()
|
|
||||||
if minetest.is_protected(pointed_thing.under, pname) then
|
|
||||||
minetest.record_protection_violation(pointed_thing.under, pname)
|
|
||||||
return itemstack
|
|
||||||
end
|
|
||||||
|
|
||||||
-- convert to mud
|
|
||||||
minetest.set_node(pointed_thing.under, {name="mcl_mud:mud"})
|
|
||||||
minetest.sound_play("mcl_potions_bottle_pour", {pos=pointed_thing.under, gain=0.5, max_hear_range=16}, true)
|
|
||||||
if minetest.is_creative_enabled(placer:get_player_name()) then
|
|
||||||
return itemstack
|
|
||||||
else
|
|
||||||
return "mcl_potions:glass_bottle"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Drink the water by default
|
|
||||||
return minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, placer, pointed_thing)
|
|
||||||
end,
|
|
||||||
_on_dispense = function(stack, pos, droppos)
|
|
||||||
local node = minetest.get_node(droppos)
|
|
||||||
if node.name == "mcl_core:dirt" or node.name == "mcl_core:coarse_dirt" then
|
|
||||||
minetest.set_node(droppos, {name = "mcl_mud:mud"})
|
|
||||||
minetest.sound_play("mcl_potions_bottle_pour", {pos=droppos, gain=0.5, max_hear_range=16}, true)
|
|
||||||
return ItemStack("mcl_potions:glass_bottle")
|
|
||||||
elseif node.name == "mcl_mud:mud" then
|
|
||||||
return stack
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
_dispense_into_walkable = true,
|
_dispense_into_walkable = true,
|
||||||
on_secondary_use = minetest.item_eat(0, "mcl_potions:glass_bottle"),
|
on_secondary_use = minetest.item_eat(0, "mcl_potions:glass_bottle"),
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue