sorcery  Check-in [49345366f9]

Overview
Comment:fix textures, add wires, add more magitech parts
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 49345366f9bbb82b929b7b6e80dc081d965ce4b5b54f6cae0fdff7d21454b3df
User & Date: lexi on 2021-07-23 22:48:13
Other Links: manifest | tags
Context
2021-07-24
01:01
add beds, external lights, fix various glitches check-in: d44d0ac782 user: lexi tags: trunk
2021-07-23
22:48
fix textures, add wires, add more magitech parts check-in: 49345366f9 user: lexi tags: trunk
19:33
add shelter spell check-in: 65ce625814 user: lexi tags: trunk
Changes

Modified data/metals.lua from [36b84b05c4] to [30e3ea6f27].

35
36
37
38
39
40
41

42
43
44
45
46
47
48
..
90
91
92
93
94
95
96

97
98
99
100
101
102
103
...
151
152
153
154
155
156
157

158
159
160
161
162
163
164
165
166
167

168
169
170
171
172
173
174
...
220
221
222
223
224
225
226

227
228
229
230
231
232
233
...
244
245
246
247
248
249
250

251
252
253
254
255
256
257
...
273
274
275
276
277
278
279

280
281
282
283
284
285
286
...
372
373
374
375
376
377
378

379
380
381
382
383
384
385
		tone = {255,176,61};
		no_tools = true; no_armor = true;
		durability = 80;
		hardness = 2;
		conduct = 0.3;
		depth = 64;
		level = 0;

	};
	brass = {
		tone = {255,226,87};
		dye = 'bright_orange';
		artificial = true;
		no_tools = true; no_armor = true;
		hardness = 3;
................................................................................
		sharpness = 2;
		hardness = 5;
		speed = 1.9;
		level = 1;
		slots = {
			{affinity = {'praxic'}; confluence = 0.5};
		};

	};
	aluminum = {
		tone = {196,64,32}, alpha = 128;
		dye = 'red';
		meltpoint = 1;
		rarity = 12; depth = 183;
		power = 3; speed = 2.4;
................................................................................
		level = 1;
		maxenergy = 3000;
		slots = {
			{affinity = {'praxic','counterpraxic'}; confluence = 1.4};
			{affinity = {'praxic','counterpraxic'}; confluence = 1.2};
		};
		amulet = {};

	};
	silver = {
		tone = {218,255,246};
		dye = 'white';
		maxenergy = 2000;
		hardness = 1;
		level = 1;
		depth = 210; rarity = 13.5;
		no_armor = true; no_tools = true;
		power = 1; cooktime = 8; hardness = 1;

	};
	electrum = {
		tone = {212, 255, 0}, alpha = 80;
		artificial = true;
		hardness = 1;
		conduct = 2;
		level = 1;
................................................................................
			{
				affinity = {'counterpraxic'};
				confluence = 0.65;
				interference = {speed = 1};
			};
		};
		amulet = { power = 1.5 };

	};
	lithium = {
		tone = {255,252,93}, alpha = 80;
		dye = 'yellow';
		rarity = 13;
		hardness = 2;
		fuel = 80;
................................................................................
		hardness = 1;
		durability = 300;
		meltpoint = 2;
		cooktime = 20;
		no_tools = true, no_armor = true;
		conduct = 5;
		level = 1;

		image = {
			block = 'sorcery_metal_vidrium_shiny.png';
		};
		mix = {
			metals = {
				lithium = 2;
				tin = 4;
................................................................................
		sharpness = 4;
		level = 3;
		maxenergy = 1800;
		depth = 1370;
		conduct = 10;
		durability = 1900;
		speed = 3;

		image = {
			block = 'sorcery_metal_iridium_shiny.png';
		};
		slots = {
			{affinity={'counterpraxic','syncretic'}, confluence = 1.1};
			{affinity={'cognic','entropic'}, confluence = 0.8};
		};
................................................................................
		maxenergy = 4000;
		hardness = 7;
		durability = 3300;
		level = 5;
		sharpness = 3;
		conduct = 20;
		speed = 3.4;

		slots = {
			{affinity={'praxic'}, confluence = 0.7};
			{affinity={'counterpraxic'}, confluence = 1.2};
			{affinity={'cognic'}, confluence = 1.1};
		};
		mix = {
			metals = {







>







 







>







 







>










>







 







>







 







>







 







>







 







>







35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
..
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
...
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
...
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
...
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
...
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
...
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
		tone = {255,176,61};
		no_tools = true; no_armor = true;
		durability = 80;
		hardness = 2;
		conduct = 0.3;
		depth = 64;
		level = 0;
		wire = 'basic_materials:copper_wire';
	};
	brass = {
		tone = {255,226,87};
		dye = 'bright_orange';
		artificial = true;
		no_tools = true; no_armor = true;
		hardness = 3;
................................................................................
		sharpness = 2;
		hardness = 5;
		speed = 1.9;
		level = 1;
		slots = {
			{affinity = {'praxic'}; confluence = 0.5};
		};
		wire = 'basic_materials:steel_wire';
	};
	aluminum = {
		tone = {196,64,32}, alpha = 128;
		dye = 'red';
		meltpoint = 1;
		rarity = 12; depth = 183;
		power = 3; speed = 2.4;
................................................................................
		level = 1;
		maxenergy = 3000;
		slots = {
			{affinity = {'praxic','counterpraxic'}; confluence = 1.4};
			{affinity = {'praxic','counterpraxic'}; confluence = 1.2};
		};
		amulet = {};
		wire = 'basic_materials:gold_wire';
	};
	silver = {
		tone = {218,255,246};
		dye = 'white';
		maxenergy = 2000;
		hardness = 1;
		level = 1;
		depth = 210; rarity = 13.5;
		no_armor = true; no_tools = true;
		power = 1; cooktime = 8; hardness = 1;
		wire = 'basic_materials:silver_wire';
	};
	electrum = {
		tone = {212, 255, 0}, alpha = 80;
		artificial = true;
		hardness = 1;
		conduct = 2;
		level = 1;
................................................................................
			{
				affinity = {'counterpraxic'};
				confluence = 0.65;
				interference = {speed = 1};
			};
		};
		amulet = { power = 1.5 };
		wire = true;
	};
	lithium = {
		tone = {255,252,93}, alpha = 80;
		dye = 'yellow';
		rarity = 13;
		hardness = 2;
		fuel = 80;
................................................................................
		hardness = 1;
		durability = 300;
		meltpoint = 2;
		cooktime = 20;
		no_tools = true, no_armor = true;
		conduct = 5;
		level = 1;
		wire = true;
		image = {
			block = 'sorcery_metal_vidrium_shiny.png';
		};
		mix = {
			metals = {
				lithium = 2;
				tin = 4;
................................................................................
		sharpness = 4;
		level = 3;
		maxenergy = 1800;
		depth = 1370;
		conduct = 10;
		durability = 1900;
		speed = 3;
		wire = true;
		image = {
			block = 'sorcery_metal_iridium_shiny.png';
		};
		slots = {
			{affinity={'counterpraxic','syncretic'}, confluence = 1.1};
			{affinity={'cognic','entropic'}, confluence = 0.8};
		};
................................................................................
		maxenergy = 4000;
		hardness = 7;
		durability = 3300;
		level = 5;
		sharpness = 3;
		conduct = 20;
		speed = 3.4;
		wire = true;
		slots = {
			{affinity={'praxic'}, confluence = 0.7};
			{affinity={'counterpraxic'}, confluence = 1.2};
			{affinity={'cognic'}, confluence = 1.1};
		};
		mix = {
			metals = {

Modified metal.lua from [b8a7748341] to [fd032c3f0d].

69
70
71
72
73
74
75
76
77
78
79
80
81
82































83
84
85
86
87
88
89
		sorcery.matreg.lookup[(metal.items and metal.items[a]) or ('sorcery:' .. a .. '_' .. name)] = {
			metal = true;
			id = name; data = metal;
			value = c.cost * fragments_per_ingot;
		}
	end end
	local install = function(part,amt)
			sorcery.data.metallookup[part] = { id = name, data = metal, value = amt }
	end
	install(ingot,    fragments_per_ingot)
	install(block,    fragments_per_ingot*9)
	install(fragment, 1)
	install(powder,   1)
	install(disc,     8/3)
































	if not metal.no_craftables then
		install(screw, 0.5)
		minetest.register_craftitem(screw, {
			description = sorcery.lib.str.capitalize(name) .. ' Screw';
			inventory_image = sorcery.lib.image('sorcery_screw.png'):multiply(sorcery.lib.color(metal.tone)):render();
			groups = { metal = 1; sorcery_screw = 1; sorcery_tech_component = 1; };







|






>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
		sorcery.matreg.lookup[(metal.items and metal.items[a]) or ('sorcery:' .. a .. '_' .. name)] = {
			metal = true;
			id = name; data = metal;
			value = c.cost * fragments_per_ingot;
		}
	end end
	local install = function(part,amt)
		sorcery.data.metallookup[part] = { id = name, data = metal, value = amt }
	end
	install(ingot,    fragments_per_ingot)
	install(block,    fragments_per_ingot*9)
	install(fragment, 1)
	install(powder,   1)
	install(disc,     8/3)
	if metal.wire then
		if metal.wire == true then
			metal.parts.wire = 'sorcery:wire_' .. name
			minetest.register_craftitem(metal.parts.wire, {
				inventory_image = string.format('basic_materials_empty_spool.png^sorcery_%s_wire.png', name);
				description = string.format('Spool of %s wire',name);
				groups = {metal = 1, wire = 1};
			})
			minetest.register_craft {
				type = 'shapeless';
				output = metal.parts.wire .. ' 2';
				recipe = {
					metal.parts.ingot;
					'basic_materials:empty_spool';
					'basic_materials:empty_spool';
				}
			}
		else
			metal.parts.wire = metal.wire
		end
		minetest.register_craft {
			type = 'shapeless';
			output = metal.parts.wire;
			recipe = {
				metal.parts.fragment;
				metal.parts.fragment;
				'basic_materials:empty_spool';
			}
		}
		install(metal.parts.wire, 2)
	end

	if not metal.no_craftables then
		install(screw, 0.5)
		minetest.register_craftitem(screw, {
			description = sorcery.lib.str.capitalize(name) .. ' Screw';
			inventory_image = sorcery.lib.image('sorcery_screw.png'):multiply(sorcery.lib.color(metal.tone)):render();
			groups = { metal = 1; sorcery_screw = 1; sorcery_tech_component = 1; };

Modified recipes.lua from [c159082683] to [d8acf55fed].

438
439
440
441
442
443
444






































445
446
447
448
449
450
451
	{'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',mtlp('tungsten','disc'),'group:sorcery_ley_cable'};
	{'','group:sorcery_ley_cable',''};
	{'group:sorcery_ley_cable',mtlp('tungsten','disc'),'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,{







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
	{'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',mtlp('tungsten','disc'),'group:sorcery_ley_cable'};
	{'','group:sorcery_ley_cable',''};
	{'group:sorcery_ley_cable',mtlp('tungsten','disc'),'default:flint'};
})
regtech('radiatic_filament', 'Radiatic Filament', {metal=1},{
	{mtlp('gold','wire'),mtlp('steel','wire'),mtlp('gold','wire')};
	{ingot'tungsten',mtlp('steel','wire'),ingot'tungsten'};
	{mtlp('silver','wire'),mtlp('steel','wire'),mtlp('silver','wire')};
}, 3, {
	{mtlp('steel','wire'), 'basic_materials:empty_spool'};
	{mtlp('steel','wire'), 'basic_materials:empty_spool'};
	{mtlp('steel','wire'), 'basic_materials:empty_spool'};
	{mtlp('silver','wire'), 'basic_materials:empty_spool'};
	{mtlp('silver','wire'), 'basic_materials:empty_spool'};
	{mtlp('gold','wire'), 'basic_materials:empty_spool'};
	{mtlp('gold','wire'), 'basic_materials:empty_spool'};
})
regtech('tacit_couple', 'Tacit Couple', {metal=1}, {
	{mtlp('steel','fragment'),mtlp('copper','wire'),mtlp('steel','fragment')};
	{'sorcery:radiatic_filament', 'basic_materials:steel_bar', 'sorcery:radiatic_filament'};
	{mtlp('steel','fragment'),mtlp('copper','wire'),mtlp('steel','fragment')};
})
regtech('tacit_web', 'Tacit Web', {metal=1},{
	{mtlp('gold',  'fragment'),mtlp('vidrium','wire'),    mtlp('gold',  'fragment')};
	{mtlp('copper','wire'),    mtlp('iridium','fragment'),mtlp('copper','wire')};
	{mtlp('silver','fragment'),mtlp('vidrium','wire'),    mtlp('silver','fragment')};
},1,{
	{mtlp('vidrium','wire'), 'basic_materials:empty_spool'};
	{mtlp('copper','wire'), 'basic_materials:empty_spool'};
	{mtlp('copper','wire'), 'basic_materials:empty_spool'};
	{mtlp('vidrium','wire'), 'basic_materials:empty_spool'};
})
regtech('aetherial_harmonizer', 'Aetherial Harmonizer', {metal=1}, {
	{ingot'brass'};
	{mtlp('tungsten','disc')};
	{ingot'brass'};
})
regtech('aether_coruscator', 'Aether Coruscator', {metal=1}, {
	{'sorcery:aetherial_harmonizer','','sorcery:aetherial_harmonizer'};
	{ingot'aluminum','sorcery:radiatic_filament',ingot'aluminum'};
	{ingot'aluminum',ingot'aluminum',ingot'aluminum'};
})
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,{

Added textures/sorcery_aether_coruscator.png version [cd811a55fe].

cannot compute difference between binary files

Added textures/sorcery_aetherial_harmonizer.png version [8e627df916].

cannot compute difference between binary files

Modified textures/sorcery_amulet_frame_cobalt.png from [6fbe72d151] to [3cd2449b29].

cannot compute difference between binary files

Modified textures/sorcery_amulet_frame_gold.png from [89ee3cc793] to [c26ecea1e3].

cannot compute difference between binary files

Modified textures/sorcery_amulet_frame_iridium.png from [24acb71aad] to [9dc3aa0c0f].

cannot compute difference between binary files

Modified textures/sorcery_amulet_frame_tungsten.png from [0f1d4c4eba] to [6075b8196a].

cannot compute difference between binary files

Added textures/sorcery_axial_dispulsor.png version [176eaecbc0].

cannot compute difference between binary files

Added textures/sorcery_cobalt_wire.png version [1bbb441d29].

cannot compute difference between binary files

Added textures/sorcery_flux_amplifier.png version [280f88b4dd].

cannot compute difference between binary files

Added textures/sorcery_iridium_wire.png version [baf63da61f].

cannot compute difference between binary files

Added textures/sorcery_radiatic_filament.png version [843838bba4].

cannot compute difference between binary files

Added textures/sorcery_tacit_couple.png version [d637fb94c7].

cannot compute difference between binary files

Added textures/sorcery_tacit_web.png version [ddc29e7188].

cannot compute difference between binary files

Added textures/sorcery_unobtanium_wire.png version [d5d37e3d55].

cannot compute difference between binary files

Added textures/sorcery_vidrium_wire.png version [2621ccf9ee].

cannot compute difference between binary files