Index: cookbook.lua ================================================================== --- cookbook.lua +++ cookbook.lua @@ -475,12 +475,12 @@ if notes_right then nx = 5.25 - (3 - k.w) -- :/ ny = 0 nw = 4 nh = k.h else - nx = 0 ny = 3 - nw = 4 nh = k,h + nx = 0 ny = 2 + nw = 4 nh = k.h end t = t .. string.format([[ hypertext[%f,%f;%f,%f;note;%s] ]], nx,ny,nw,nh, minetest.formspec_escape(props.note)) end Index: keg.lua ================================================================== --- keg.lua +++ keg.lua @@ -156,12 +156,12 @@ } minetest.after(0.2, function() minetest.add_particlespawner { amount = math.random(5,11) * chg, time = 0.13 * chg; texture = drop:render(); - minpos = vector.offset(minnoz, 0,-0.05,0); - maxpos = vector.offset(maxnoz, 0,-0.05,0); + minpos = minnoz; + maxpos = maxnoz; minvel = vector.new(0,-0.1,0); maxvel = vector.new(0,-0.4,0); minacc = vector.new(0,-0.15,0); maxacc = vector.new(0,-0.18,0); minsize = 0.3, maxsize = 0.5; Index: lib/color.lua ================================================================== --- lib/color.lua +++ lib/color.lua @@ -209,10 +209,15 @@ if type(r) == 'string' then assert(false) -- TODO parse color string elseif type(r) == 'table' then if r.hue then return from_hsl(r, r.alpha or g) + elseif r.r and r.g and r.b then + new.red = r.r + new.green = r.g + new.blue = r.b + new.alpha = r.a else new.red = r[1] new.green = r[2] new.blue = r[3] new.alpha = r[4] Index: potions.lua ================================================================== --- potions.lua +++ potions.lua @@ -116,20 +116,21 @@ local desc = 'A ' .. ((glow and 'glowing ') or '') .. 'bottle of ' .. string.lower(n) .. ((kind == 'sparkle' and ', fiercely bubbling') or '') .. ' liquid' local fullname = n .. ' Potion' - sorcery.register.liquid.link('sorcery:'..id, { + sorcery.liquid.register{ + id = 'sorcery:'..id; name = fullname; color = v.color; proto = v; kind = 'sorcery:potion'; measure = function(amt) return string.format('%s draughts', amt / 3) end; containers = { ['vessels:glass_bottle'] = 'sorcery:' .. id; }; - }) + } v.kind = kind_potion; sorcery.register_potion(id, fullname, desc, color, kind, glow, { groups = { sorcery_potion = 1; sorcery_magical = 1; @@ -297,18 +298,20 @@ empty = 'vessels:glass_bottle'; }; }; }) - sorcery.register.liquid.link(liqid, { + sorcery.liquid.register { + id = liqid; name = desc; kind = 'sorcery:extract'; proto = v; + color = v[2]; containers = { - ['vessels:glass_bottle'] = name; + ['vessels:glass_bottle'] = liqid; }; - }) + } local add_alcohol = function(booze) minetest.register_craft { type = "shapeless"; recipe = {