Overview
| Comment: | bug fixes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
612f10a00d9742ff0bf8e55526efdfa0 |
| User & Date: | lexi on 2021-07-07 08:23:24 |
| Other Links: | manifest | tags |
Context
|
2021-07-07
| ||
| 11:35 | fix many bugs, rebalance & update alchemy recipes, more helpful display of extracts in recipes check-in: 1ee0f58037 user: lexi tags: trunk | |
| 08:23 | bug fixes check-in: 612f10a00d user: lexi tags: trunk | |
| 07:56 | tweak interval check-in: b79f4e8611 user: lexi tags: trunk | |
Changes
Modified data/trees.lua from [85c10552c5] to [66384fbe7c].
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
};
aspen = {
desc = 'Aspen';
node = 'default:aspen_tree';
sapling = 'default:aspen_sapling';
sap = 'Aspen Sap';
leaves = 'default:aspen_leaves';
color = {242, 241, 221};
imgvariant = 'dull';
};
acacia = {
desc = 'Acacia';
node = 'default:acacia_tree';
sapling = 'default:acacia_sapling';
leaves = 'default:acacia_leaves';
sap = 'Acacia Sap';
color = {245, 40, 40};
};
jungle = {
desc = 'Jungle';
node = 'default:jungletree';
sapling = 'default:junglesapling';
leaves = 'default:jungleleaves';
sap = 'Tropical Syrup';
color = {86, 39, 71};
imgvariant = 'dull';
};
}
|
| | |
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
};
aspen = {
desc = 'Aspen';
node = 'default:aspen_tree';
sapling = 'default:aspen_sapling';
sap = 'Aspen Sap';
leaves = 'default:aspen_leaves';
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 = {217, 51, 22};
};
jungle = {
desc = 'Jungle';
node = 'default:jungletree';
sapling = 'default:junglesapling';
leaves = 'default:jungleleaves';
sap = 'Tropical Syrup';
color = {86, 39, 71};
imgvariant = 'dull';
};
}
|
Modified liquid.lua from [db73c43862] to [b7e36caf54].
89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 ... 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 ... 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 |
local geom = {
pxl {2,0,2; 14, 2, 14};
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};
}, geom)
else return geom end
................................................................................
for i = 1*f,M*f do
local top = L.image('sorcery_trough_top_overlay.png')
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)
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))
minetest.register_node(':'..lid(i), {
description = liq and L.ui.tooltip {
................................................................................
trough_caption(pos, vol)
end;
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)
end
}
};
})
end
end
sorcery.liquid.mktrough()
|
< > | | > > | > | |
89 90 91 92 93 94 95 96 97 98 99 100 101 102 ... 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 ... 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 |
local geom = {
pxl {2,0,2; 14, 2, 14};
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};
}, geom)
else return geom end
................................................................................
for i = 1*f,M*f do
local top = L.image('sorcery_trough_top_overlay.png')
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 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))
minetest.register_node(':'..lid(i), {
description = liq and L.ui.tooltip {
................................................................................
trough_caption(pos, vol)
end;
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, liq)
end
}
};
})
end
end
sorcery.liquid.mktrough()
|