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

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

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

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

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