From dd3a7d13c785b7b571e2c3465091c9b4d6a34441 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Fri, 2 Nov 2018 20:40:25 +0100 Subject: [PATCH] Corrige un crash avec la splash potion orange Corrige la collision avec la gauge bar --- init.lua | 166 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 84 insertions(+), 82 deletions(-) diff --git a/init.lua b/init.lua index da9fefb..c001723 100644 --- a/init.lua +++ b/init.lua @@ -178,7 +178,7 @@ minetest.register_craft({ output = 'witchcraft:shelf', recipe = { {'group:wood', 'group:wood', 'group:wood'}, - {'group:potion', 'group:potion', 'group:potion'}, + {'group:potion2', 'group:potion2', 'group:potion2'}, {'group:wood', 'group:wood', 'group:wood'}, } }) @@ -922,7 +922,7 @@ minetest.register_entity("witchcraft:tnt_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:tnt_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:tnt_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar"then obj:punch(self.object, 1.0, { full_punch_interval=1.0, damage_groups={fleshy=3}, @@ -938,7 +938,7 @@ minetest.register_entity("witchcraft:tnt_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:tnt_splash" and n ~="default:obsidian" and n ~= "air" then + if n ~= "witchcraft:tnt_splash" and n ~="default:obsidian" and n ~= "air" and n ~= "gauges:hp_bar" then local pos = self.object:getpos() minetest.sound_play("default_break_glass.1", { pos = self.object:getpos(), @@ -992,7 +992,7 @@ minetest.register_entity("witchcraft:fire_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:fire_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:fire_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then obj:punch(self.object, 1.0, { full_punch_interval=1.0, damage_groups={fleshy=1}, @@ -1007,16 +1007,18 @@ minetest.register_entity("witchcraft:fire_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:fire_splash" and n ~= "air" then - if not ignore_protection and minetest.is_protected(npos, "") then - return - end - minetest.env:set_node(t, {name="fire:basic_flame"}) - minetest.sound_play("default_break_glass.1", { - pos = self.object:getpos(), - max_hear_distance = 20, - gain = 10.0, - }) + if n ~= "witchcraft:fire_splash" and n ~= "air" and n ~= "gauges:hp_bar" then + if not ignore_protection and minetest.is_protected(p, "") then + return + end + minetest.env:set_node(t, {name="fire:basic_flame"}) + minetest.sound_play( + "default_break_glass.1", + { + pos = self.object:getpos(), + max_hear_distance = 20, + gain = 10.0, + }) self.object:remove() elseif n =="default:dirt_with_grass" or n =="default:dirt_with_dry_grass" then self.object:remove() @@ -1060,7 +1062,7 @@ minetest.register_entity("witchcraft:death_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:death_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:death_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then obj:punch(self.object, 1.0, { full_punch_interval=1.0, damage_groups={fleshy=50}, @@ -1075,7 +1077,7 @@ minetest.register_entity("witchcraft:death_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:death_splash" and n ~= "air" then + if n ~= "witchcraft:death_splash" and n ~= "air" and n ~= "gauges:hp_bar" then minetest.sound_play("default_break_glass.1", { pos = self.object:getpos(), max_hear_distance = 20, @@ -1107,7 +1109,7 @@ minetest.register_entity("witchcraft:heal_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:heal_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:heal_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then obj:punch(self.object, 1.0, { full_punch_interval=1.0, damage_groups={fleshy=-20}, @@ -1122,7 +1124,7 @@ minetest.register_entity("witchcraft:heal_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:heal_splash" and n ~= "air" then + if n ~= "witchcraft:heal_splash" and n ~= "air" and n ~= "gauges:hp_bar" then minetest.sound_play("default_break_glass.1", { pos = self.object:getpos(), max_hear_distance = 20, @@ -1154,7 +1156,7 @@ minetest.register_entity("witchcraft:slow_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:slow_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:slow_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then local vel = obj:getvelocity() obj:setvelocity({x=vel.x*0.5, y=vel.y*0.5, z=vel.z*0.5}) self.object:remove() @@ -1167,7 +1169,7 @@ minetest.register_entity("witchcraft:slow_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:slow_splash" and n ~= "air" then + if n ~= "witchcraft:slow_splash" and n ~= "air" and n ~= "gauges:hp_bar" then self.object:remove() elseif n =="default:dirt_with_grass" or n =="default:dirt_with_dry_grass" then @@ -1200,7 +1202,7 @@ minetest.register_entity("witchcraft:fast_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:fast_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:fast_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then local vel = obj:getvelocity() obj:setvelocity({x=vel.x*4, y=vel.y*1, z=vel.z*4}) self.object:remove() @@ -1213,7 +1215,7 @@ minetest.register_entity("witchcraft:fast_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:fast_splash" and n ~= "air" then + if n ~= "witchcraft:fast_splash" and n ~= "air" and n ~= "gauges:hp_bar" then self.object:remove() elseif n =="default:dirt_with_grass" or n =="default:dirt_with_dry_grass" then @@ -1246,7 +1248,7 @@ minetest.register_entity("witchcraft:antigrav_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:antigrav_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:antigrav_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then local vel = obj:getvelocity() obj:setvelocity({x=vel.x*1, y=vel.y*0.1, z=vel.z*1}) self.object:remove() @@ -1259,7 +1261,7 @@ minetest.register_entity("witchcraft:antigrav_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:antigrav_splash" and n ~= "air" then + if n ~= "witchcraft:antigrav_splash" and n ~= "air" and n ~= "gauges:hp_bar" then self.object:remove() elseif n =="default:dirt_with_grass" or n =="default:dirt_with_dry_grass" then @@ -1292,7 +1294,7 @@ minetest.register_entity("witchcraft:jump_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:jump_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:jump_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then local vel = obj:getvelocity() obj:setvelocity({x=vel.x*1, y=(vel.y+2)*3, z=vel.z*1}) self.object:remove() @@ -1305,7 +1307,7 @@ minetest.register_entity("witchcraft:jump_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:jump_splash" and n ~= "air" then + if n ~= "witchcraft:jump_splash" and n ~= "air" and n ~= "gauges:hp_bar" then self.object:remove() elseif n =="default:dirt_with_grass" or n =="default:dirt_with_dry_grass" then @@ -1338,7 +1340,7 @@ minetest.register_entity("witchcraft:murky_splash", { local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2) for k, obj in pairs(objs) do if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "witchcraft:murky_splash" and obj:get_luaentity().name ~= "__builtin:item" then + if obj:get_luaentity().name ~= "witchcraft:murky_splash" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then obj:punch(self.object, 1.0, { full_punch_interval=1.0, damage_groups={fleshy=20}, @@ -1353,7 +1355,7 @@ minetest.register_entity("witchcraft:murky_splash", { local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz} local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local n = minetest.env:get_node(p).name - if n ~= "witchcraft:murky_splash" and n ~= "air" then + if n ~= "witchcraft:murky_splash" and n ~= "air" and n ~= "gauges:hp_bar" then minetest.sound_play("default_break_glass.1", { pos = self.object:getpos(), max_hear_distance = 20, @@ -1653,7 +1655,7 @@ minetest.register_node("witchcraft:splash_orange", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_orange.png", on_use = function(item, placer, pos) @@ -1682,7 +1684,7 @@ minetest.register_node("witchcraft:splash_purple", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_purple.png", on_use = function(item, placer, pos) @@ -1711,7 +1713,7 @@ minetest.register_node("witchcraft:splash_red", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_red.png", on_use = function(item, placer, pos) @@ -1740,7 +1742,7 @@ minetest.register_node("witchcraft:splash_green", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_green.png", on_use = function(item, placer, pos) @@ -1769,7 +1771,7 @@ minetest.register_node("witchcraft:splash_cyan", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_cyan.png", on_use = function(item, placer, pos) @@ -1798,7 +1800,7 @@ minetest.register_node("witchcraft:splash_redbrown", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_redbrown.png", on_use = function(item, placer, pos) @@ -1827,7 +1829,7 @@ minetest.register_node("witchcraft:splash_magenta", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_magenta.png", on_use = function(item, placer, pos) @@ -1856,7 +1858,7 @@ minetest.register_node("witchcraft:splash_brown", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_brown.png", on_use = function(item, placer, pos) @@ -1885,7 +1887,7 @@ minetest.register_node("witchcraft:splash_grey", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_grey.png", on_use = function(item, placer, pos) @@ -1916,7 +1918,7 @@ minetest.register_node("witchcraft:splash_ggreen", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_ggreen.png", on_use = function(item, placer, pos) @@ -1945,7 +1947,7 @@ minetest.register_node("witchcraft:splash_yellwgrn", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_yellgrn.png", on_use = function(item, placer, pos) @@ -1976,7 +1978,7 @@ minetest.register_node("witchcraft:potion_red", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_red.png", on_use = function(itemstack, player) @@ -2000,7 +2002,7 @@ minetest.register_node("witchcraft:potion_red_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_red.png^[colorize:black:50", on_use = function(itemstack, player) @@ -2022,7 +2024,7 @@ minetest.register_node("witchcraft:potion_darkpurple", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), stack_max = 1, wield_image = "witchcraft_potion_darkpurple.png", @@ -2110,7 +2112,7 @@ minetest.register_node("witchcraft:potion_darkpurple_2", { fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, paramtype = "light", - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), stack_max = 1, wield_image = "witchcraft_potion_darkpurple.png^[colorize:black:50", @@ -2198,7 +2200,7 @@ minetest.register_node("witchcraft:potion_brown", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_brown.png", on_use = minetest.item_eat(-5, "vessels:glass_bottle"), @@ -2217,7 +2219,7 @@ minetest.register_node("witchcraft:potion_brown_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_brown.png^[colorize:black:50", on_use = minetest.item_eat(-10, "vessels:glass_bottle"), @@ -2238,7 +2240,7 @@ minetest.register_node("witchcraft:potion_yllwgrn", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_yellgrn.png", on_use = function(pos, placer, itemstack) @@ -2261,7 +2263,7 @@ minetest.register_node("witchcraft:potion_yllwgrn_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_yellgrn.png^[colorize:black:50", on_use = function(pos, placer, itemstack) @@ -2364,7 +2366,7 @@ minetest.register_node("witchcraft:potion_orange", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_orange.png", on_use = function(item, placer, pos) @@ -2408,7 +2410,7 @@ minetest.register_node("witchcraft:potion_orange_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_orange.png^[colorize:black:50", on_use = function(item, placer, pos) @@ -2452,7 +2454,7 @@ minetest.register_node("witchcraft:splash_orange", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_orange.png", on_use = function(item, placer, pos) @@ -2481,7 +2483,7 @@ minetest.register_node("witchcraft:splash_yellwgrn", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_splash_yellgrn.png", on_use = function(item, placer, pos) @@ -2510,7 +2512,7 @@ minetest.register_node("witchcraft:potion_purple", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_purple.png", on_use = function(item, placer, pos) @@ -2556,7 +2558,7 @@ minetest.register_node("witchcraft:potion_gpurple", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_gpurple.png", on_use = function(item, placer, pos) @@ -2578,7 +2580,7 @@ minetest.register_node("witchcraft:potion_gred", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_gred.png", on_use = function(item, placer, pos) @@ -2604,7 +2606,7 @@ else type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_purple.png", on_use = function(itemstack, player) @@ -2627,7 +2629,7 @@ else type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_gred.png", on_use = function(itemstack, player) @@ -2653,7 +2655,7 @@ minetest.register_node("witchcraft:potion_purple_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_purple.png^[colorize:black:20", on_use = function(item, placer, pos) @@ -2695,7 +2697,7 @@ minetest.register_node("witchcraft:potion_grey", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_grey.png", on_use = minetest.item_eat(-100, "vessels:glass_bottle"), @@ -2714,7 +2716,7 @@ minetest.register_node("witchcraft:potion_grey_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_grey.png^[colorize:black:50", on_use = minetest.item_eat(-200, "vessels:glass_bottle"), @@ -2733,7 +2735,7 @@ minetest.register_node("witchcraft:potion_blue", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_blue.png", on_use = function(item, user, pointed_thing) @@ -2765,7 +2767,7 @@ minetest.register_node("witchcraft:potion_silver", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_silver.png", on_use = function(item, user, pointed_thing) @@ -2788,7 +2790,7 @@ minetest.register_node("witchcraft:potion_silver_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_silver.png^[colorize:black:50", on_use = function(item, user, pointed_thing) @@ -2812,7 +2814,7 @@ minetest.register_node("witchcraft:potion_green", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_green.png", on_use = function(item, user, pointed_thing) @@ -2860,7 +2862,7 @@ minetest.register_node("witchcraft:potion_green", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_green.png", on_use = function(item, user, pointed_thing) @@ -2909,7 +2911,7 @@ minetest.register_node("witchcraft:potion_gold", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_gold.png", on_use = function(item, user, pointed_thing) @@ -2957,7 +2959,7 @@ minetest.register_node("witchcraft:potion_gold_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_gold.png^[colorize:black:50", on_use = function(item, user, pointed_thing) @@ -3008,7 +3010,7 @@ minetest.register_node("witchcraft:potion_aqua", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_aqua.png", on_use = function(item, placer, pos) @@ -3053,7 +3055,7 @@ minetest.register_node("witchcraft:potion_aqua", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_aqua.png", on_use = function(item, placer, pos) @@ -3100,7 +3102,7 @@ minetest.register_node("witchcraft:potion_magenta", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_magenta.png", on_use = function(item, user, pointed_thing) @@ -3143,7 +3145,7 @@ minetest.register_node("witchcraft:potion_magenta_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_magenta.png^[colorize:black:50", on_use = function(item, user, pointed_thing) @@ -3186,7 +3188,7 @@ minetest.register_node("witchcraft:potion_cyan", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_cyan.png", on_use = function(item, user, pointed_thing) @@ -3228,7 +3230,7 @@ minetest.register_node("witchcraft:potion_gcyan", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_gcyan.png", on_use = function(item, user, pointed_thing) @@ -3269,7 +3271,7 @@ minetest.register_node("witchcraft:potion_cyan_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_cyan.png^[colorize:black:50", on_use = function(item, user, pointed_thing) @@ -3311,7 +3313,7 @@ minetest.register_node("witchcraft:potion_green2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_green2.png", on_use = function(item, user, pointed_thing) @@ -3353,7 +3355,7 @@ minetest.register_node("witchcraft:potion_ggreen", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_ggreen.png", on_use = function(item, user, pointed_thing) @@ -3400,7 +3402,7 @@ minetest.register_node("witchcraft:potion_green2_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_green2.png^[colorize:black:50", on_use = function(item, user, pointed_thing) @@ -3442,7 +3444,7 @@ minetest.register_node("witchcraft:potion_redbrown", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_redbrown.png", on_use = function(item, user, pointed_thing) @@ -3484,7 +3486,7 @@ minetest.register_node("witchcraft:potion_redbrown_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_redbrown.png^[colorize:black:50", on_use = function(item, user, pointed_thing) @@ -3526,7 +3528,7 @@ minetest.register_node("witchcraft:potion_blue2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion=1}, + groups = {dig_immediate=3,attached_node=1, potion=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_blue2.png", on_use = function(item, user, pointed_thing) @@ -3570,7 +3572,7 @@ minetest.register_node("witchcraft:potion_blue2_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_blue2.png^[colorize:black:50", on_use = function(item, user, pointed_thing) @@ -3626,7 +3628,7 @@ minetest.register_node("witchcraft:potion_yellow", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_yellow.png", on_use = function(item, user, pointed_thing) @@ -3667,7 +3669,7 @@ minetest.register_node("witchcraft:potion_yellow_2", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25} }, - groups = {vessel=1,dig_immediate=3,attached_node=1, potion2=1}, + groups = {dig_immediate=3,attached_node=1, potion2=1}, sounds = default.node_sound_glass_defaults(), inventory_image = "witchcraft_potion_yellow.png^[colorize:black:50", on_use = function(item, user, pointed_thing)