Overview
| Comment: | fixed recipes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
ac4c799281c1bda4f70c25a6707b4837 |
| User & Date: | lexi on 2021-07-06 21:15:54 |
| Other Links: | manifest | tags |
Context
|
2021-07-06
| ||
| 22:21 | correct recipe check-in: 99e19cc14f user: lexi tags: trunk | |
| 21:15 | fixed recipes check-in: ac4c799281 user: lexi tags: trunk | |
| 19:26 | bug fixes check-in: b82a675e76 user: lexi tags: trunk | |
Changes
Modified liquid.lua from [7230727dfc] to [db73c43862].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
...
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
-- liquid.lua
-- the liquid registry is used to keep track of abstract liquids,
-- their properties, and their representation in-game.
sorcery.registry.mk('liquid', false)
sorcery.liquid = {
constants = {
drams_per_glass = 64;
glasses_per_bottle = 3;
bottles_per_bucket = 3;
bottles_per_trough = 6;
}
}
local constants = sorcery.liquid.constants
local L = sorcery.lib
local log = sorcery.logger('liquid')
sorcery.liquid.fill_from_basin = function(ctr, liquid, basin)
local liq = sorcery.register.liquid.db[liquid]
local filled
................................................................................
}
};
})
end
end
sorcery.liquid.mktrough()
sorcery.liquid.measure_default = function(amt)
return string.format('%s drams', amt*constants.drams_per_glass)
end
sorcery.liquid.container = function(liq, ctr)
return liq.containers[({
bottle = 'vessels:glass_bottle';
glass = 'vessels:drinking_glass';
keg = 'sorcery:keg';
trough = 'sorcery:trough';
|
>
>
>
>
>
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>
|
<
<
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
...
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
-- liquid.lua
-- the liquid registry is used to keep track of abstract liquids,
-- their properties, and their representation in-game.
sorcery.registry.mk('liquid', false)
local mkunit = function(unit,fac)
return function(amt)
-- allow division for more accurate results
if fac >= 0 then
amt = amt * fac
else
amt = amt / (-fac)
end
return string.format('%s %s%s', amt, unit, (amt == 1) and '' or 's')
end
end
sorcery.liquid = {
constants = {
drams_per_glass = 64;
pints_per_glass = 0.5;
glasses_per_bottle = 3;
bottles_per_bucket = 3;
bottles_per_trough = 6;
};
unit = mkunit;
}
local constants = sorcery.liquid.constants
sorcery.liquid.units = {
dram = mkunit('dram', constants.drams_per_glass);
pint = mkunit('pint', constants.pints_per_glass);
draught = mkunit('draught', -3);
drink = mkunit('drink', 1);
};
local L = sorcery.lib
local log = sorcery.logger('liquid')
sorcery.liquid.fill_from_basin = function(ctr, liquid, basin)
local liq = sorcery.register.liquid.db[liquid]
local filled
................................................................................
}
};
})
end
end
sorcery.liquid.mktrough()
sorcery.liquid.measure_default = sorcery.liquid.units.dram
sorcery.liquid.container = function(liq, ctr)
return liq.containers[({
bottle = 'vessels:glass_bottle';
glass = 'vessels:drinking_glass';
keg = 'sorcery:keg';
trough = 'sorcery:trough';
|
Modified potions.lua from [715b9ce25c] to [22f82424c6].
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
...
302
303
304
305
306
307
308
309
310
311
312
313
314
315
|
local fullname = n .. ' Potion'
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.liquid.register {
id = liqid;
name = desc;
kind = 'sorcery:extract';
proto = v;
color = v[2];
containers = {
['vessels:glass_bottle'] = liqid;
};
}
local add_alcohol = function(booze)
minetest.register_craft {
|
|
>
|
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
...
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
|
local fullname = n .. ' Potion'
sorcery.liquid.register{
id = 'sorcery:'..id;
name = fullname;
color = v.color;
proto = v;
kind = 'sorcery:potion';
measure = sorcery.liquid.units.draught;
containers = {
['vessels:glass_bottle'] = 'sorcery:' .. id;
};
}
v.kind = kind_potion;
sorcery.register_potion(id, fullname, desc, color, kind, glow, {
groups = {
................................................................................
sorcery.liquid.register {
id = liqid;
name = desc;
kind = 'sorcery:extract';
proto = v;
color = v[2];
measure = sorcery.liquid.units.pint;
containers = {
['vessels:glass_bottle'] = liqid;
};
}
local add_alcohol = function(booze)
minetest.register_craft {
|
Modified recipes.lua from [2f8b7e24c9] to [553d976f64].
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
...
543
544
545
546
547
548
549
550
551
552
553
554
555
556
|
})
regtech('warding_plate', 'Warding Plate', {metal = 1}, {
{'basic_materials:gold_wire','basic_materials:gold_wire','basic_materials:gold_wire'};
{'',mtlp('vidrium','block'),''};
{'basic_materials:gold_wire','basic_materials:gold_wire','basic_materials:gold_wire'};
}, 4)
regtech('ley_puncture', 'Ley Puncture', {metal = 1}, {
{'default:flint','sorcery:tungsten_ingot','group:sorcery_ley_cable'};
{'','group:sorcery_ley_cable',''};
{'group:sorcery_ley_cable','sorcery:tungsten_ingot','default:flint'};
})
regtech('pulse_rectifier', 'Pulse Rectifier', {metal = 1})
regtech('current_felicitator', 'Current Felicitator', {metal = 1}, {
{'basic_materials:silver_wire','basic_materials:silver_wire','basic_materials:silver_wire'};
{'sorcery:cobalt_ingot','sorcery:inversion_matrix','sorcery:cobalt_ingot'};
{'default:bronze_ingot','sorcery:platinum_ingot','default:bronze_ingot'};
})
regtech('conduction_plate', 'Conduction Plate', {metal = 1}, {
{'','default:copper_ingot',''};
{'','stairs:slab_stone',''};
{'basic_materials:copper_wire','basic_materials:steel_bar','basic_materials:copper_wire'};
})
regtech('catalytic_convector', 'Catalytic Convector', {metal = 1}, {
{'basic_materials:heating_element','default:gold_ingot','basic_materials:heating_element'};
{'default:mese_crystal','default:mese_crystal','default:mese_crystal'};
{'sorcery:tungsten_ingot','sorcery:oil_flame','sorcery:tungsten_ingot'};
}, 1, {
................................................................................
minetest.register_craft {
output = 'sorcery:inversion_matrix';
recipe = {
{'','sorcery:inverter_coil','basic_materials:gold_wire'};
{'sorcery:inverter_coil','sorcery:leyline_stabilizer','sorcery:inverter_coil'};
{'basic_materials:gold_wire','sorcery:inverter_coil',''};
};
}
minetest.register_craft {
output = 'sorcery:field_emitter';
recipe = {
{'basic_materials:steel_bar','xpanes:pane_flat','basic_materials:steel_bar'};
|
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
...
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
|
})
regtech('warding_plate', 'Warding Plate', {metal = 1}, {
{'basic_materials:gold_wire','basic_materials:gold_wire','basic_materials:gold_wire'};
{'',mtlp('vidrium','block'),''};
{'basic_materials:gold_wire','basic_materials:gold_wire','basic_materials:gold_wire'};
}, 4, {
{'basic_materials:gold_wire', 'basic_materials:empty_spool'};
{'basic_materials:gold_wire', 'basic_materials:empty_spool'};
{'basic_materials:gold_wire', 'basic_materials:empty_spool'};
{'basic_materials:gold_wire', 'basic_materials:empty_spool'};
{'basic_materials:gold_wire', 'basic_materials:empty_spool'};
{'basic_materials:gold_wire', 'basic_materials:empty_spool'};
})
regtech('ley_puncture', 'Ley Puncture', {metal = 1}, {
{'default:flint','sorcery:tungsten_ingot','group:sorcery_ley_cable'};
{'','group:sorcery_ley_cable',''};
{'group:sorcery_ley_cable','sorcery:tungsten_ingot','default:flint'};
})
regtech('pulse_rectifier', 'Pulse Rectifier', {metal = 1})
regtech('current_felicitator', 'Current Felicitator', {metal = 1}, {
{'basic_materials:silver_wire','basic_materials:silver_wire','basic_materials:silver_wire'};
{'sorcery:cobalt_ingot','sorcery:inversion_matrix','sorcery:cobalt_ingot'};
{'default:bronze_ingot','sorcery:platinum_ingot','default:bronze_ingot'};
},1,{
{'basic_materials:silver_wire', 'basic_materials:empty_spool'};
{'basic_materials:silver_wire', 'basic_materials:empty_spool'};
{'basic_materials:silver_wire', 'basic_materials:empty_spool'};
})
regtech('conduction_plate', 'Conduction Plate', {metal = 1}, {
{'','default:copper_ingot',''};
{'','stairs:slab_stone',''};
{'basic_materials:copper_wire','basic_materials:steel_bar','basic_materials:copper_wire'};
}, 1, {
{'basic_materials:copper_wire', 'basic_materials:empty_spool'};
{'basic_materials:copper_wire', 'basic_materials:empty_spool'};
})
regtech('catalytic_convector', 'Catalytic Convector', {metal = 1}, {
{'basic_materials:heating_element','default:gold_ingot','basic_materials:heating_element'};
{'default:mese_crystal','default:mese_crystal','default:mese_crystal'};
{'sorcery:tungsten_ingot','sorcery:oil_flame','sorcery:tungsten_ingot'};
}, 1, {
................................................................................
minetest.register_craft {
output = 'sorcery:inversion_matrix';
recipe = {
{'','sorcery:inverter_coil','basic_materials:gold_wire'};
{'sorcery:inverter_coil','sorcery:leyline_stabilizer','sorcery:inverter_coil'};
{'basic_materials:gold_wire','sorcery:inverter_coil',''};
};
replacements = {
{'basic_materials:gold_wire', 'basic_materials:empty_spool'};
};
}
minetest.register_craft {
output = 'sorcery:field_emitter';
recipe = {
{'basic_materials:steel_bar','xpanes:pane_flat','basic_materials:steel_bar'};
|
Modified tree.lua from [e171bc2182] to [be6e1c803c].
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
sap = 'Sap';
sapliq = 'sorcery:sap';
sapling = 'default:sapling';
}
local log = sorcery.logger('tree')
local L = sorcery.lib
local measure_sap = function(v) -- v in half-pints
return string.format('%s pints', v / 2)
end
sorcery.register.trees.foreach('sorcery:treesetup', {}, function(id, t)
-- generates sap and hooks handlers appropriately
if t.node then
local def = minetest.registered_nodes[t.node]
local nextfn = def.on_place
minetest.override_item(t.node, { on_place = function(stack, who, pointed, ...)
if nextfn then nextfn(stack, who, pointed, ...) end
................................................................................
sorcery.liquid.register {
id = t.sapliq;
name = sapdesc;
kind = 'sorcery:sap';
color = t.sapcolor or t.color or {119,24,30};
autogen = true;
imgvariant = 'sparkle';
measure = measure_sap;
usetrough = t.sap ~= false;
}
end
end)
sorcery.tree.get = function(what)
|
<
<
<
<
|
|
4
5
6
7
8
9
10
11
12
13
14
15
16
17
..
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
sap = 'Sap';
sapliq = 'sorcery:sap';
sapling = 'default:sapling';
}
local log = sorcery.logger('tree')
local L = sorcery.lib
sorcery.register.trees.foreach('sorcery:treesetup', {}, function(id, t)
-- generates sap and hooks handlers appropriately
if t.node then
local def = minetest.registered_nodes[t.node]
local nextfn = def.on_place
minetest.override_item(t.node, { on_place = function(stack, who, pointed, ...)
if nextfn then nextfn(stack, who, pointed, ...) end
................................................................................
sorcery.liquid.register {
id = t.sapliq;
name = sapdesc;
kind = 'sorcery:sap';
color = t.sapcolor or t.color or {119,24,30};
autogen = true;
imgvariant = 'sparkle';
measure = sorcery.liquid.units.pint;
usetrough = t.sap ~= false;
}
end
end)
sorcery.tree.get = function(what)
|