@@ -92,9 +92,8 @@ pxl {2,2,2; 14,h,4}; pxl {12,2,2; 14,h,14}; pxl {2,2,12; 14,h,14}; - } if lvl > 0 then local fac = lvl / M return L.tbl.append({ @@ -109,11 +108,15 @@ L.image('sorcery_node_liquid.png'):multiply(L.color(liq.color)) ) else top=top:blit( L.image('sorcery_trough_bottom.png') ) end - local trough_title = liq and string.format('%s Trough', L.str.capitalize(liq.name)) - local trough_content = liq and string.format('%s of %s', liq.measure(i * Q), liq.name) - local function trough_caption(pos,i) + local ttlc = function(liq) return + liq and string.format('%s Trough', L.str.capitalize(liq.name)), + liq and string.format('%s of %s', liq.measure(i * Q), liq.name) + end + local trough_title, trough_content = ttlc(liq) + local function trough_caption(pos,i,l) + local trough_title, trough_content = ttlc(l or liq) minetest.get_meta(pos):set_string('infotext', i > 0 and string.format( '%s\n(%s)', trough_title, trough_content ) or 'Empty Trough') end @@ -177,9 +180,9 @@ log.act('adding', vol, 'to trough at', liq) vol = vol or Q * i local idx = math.min(M, math.floor(vol/Q)) minetest.swap_node(pos, {name = trough_mkid(liq, idx)}) - trough_caption(pos, idx) + trough_caption(pos, idx, liq) end } }; })