Index: data/trees.lua ================================================================== --- data/trees.lua +++ data/trees.lua @@ -25,20 +25,20 @@ desc = 'Aspen'; node = 'default:aspen_tree'; sapling = 'default:aspen_sapling'; sap = 'Aspen Sap'; leaves = 'default:aspen_leaves'; - color = {242, 241, 221}; + color = {255, 251, 172}; imgvariant = 'dull'; }; acacia = { desc = 'Acacia'; node = 'default:acacia_tree'; sapling = 'default:acacia_sapling'; leaves = 'default:acacia_leaves'; sap = 'Acacia Sap'; - color = {245, 40, 40}; + color = {217, 51, 22}; }; jungle = { desc = 'Jungle'; node = 'default:jungletree'; sapling = 'default:junglesapling'; Index: liquid.lua ================================================================== --- liquid.lua +++ liquid.lua @@ -91,11 +91,10 @@ pxl {2,2,2; 4,h,14}; 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({ pxl {4,2,4; 12, 2 + ((h-3)*fac), 12}; @@ -108,13 +107,17 @@ if liq then top = top:blit( 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 sorcery.register.residue.link(lid(i),lid(0)) @@ -176,11 +179,11 @@ set_node_liq = function(pos, liq, vol) 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 } }; }) end