sorcery  Diff

Differences From Artifact [f9ae7215e3]:

To Artifact [a6eaeb7ad1]:


    27     27   	copper = {
    28     28   		dye = 'orange';
    29     29   		ingot = 'default:copper_ingot';
    30     30   		block = 'default:copperblock';
    31     31   		tone = {255,176,61};
    32     32   		no_tools = true; no_armor = true;
    33     33   		hardness = 2;
           34  +		conduct = 0.1;
    34     35   	};
    35     36   	brass = {
    36     37   		tone = {255,226,87};
    37     38   		dye = 'bright_orange';
    38     39   		artificial = true;
    39     40   		no_tools = true; no_armor = true;
    40     41   		hardness = 3;
................................................................................
   136    137   		no_armor = true; no_tools = true;
   137    138   		power = 1; cooktime = 8; hardness = 1;
   138    139   	};
   139    140   	electrum = {
   140    141   		tone = {212, 255, 0}, alpha = 80;
   141    142   		artificial = true;
   142    143   		hardness = 1;
          144  +		conduct = 0.5;
   143    145   		dye = 'bright_green';
   144    146   		mix = {
   145    147   			metals = {
   146    148   				silver = 1;
   147    149   				gold = 1;
   148    150   			};
   149    151   		};
................................................................................
   172    174   		rarity = 17;
   173    175   		durabilty = 900;
   174    176   		hardness = 6;
   175    177   		power = 3;
   176    178   		speed = 3.5;
   177    179   		cooktime = 30;
   178    180   		maxenergy = 3500;
          181  +		conduct = 2.0;
   179    182   		slots = {
   180    183   			{
   181    184   				affinity = {'counterpraxic'};
   182    185   				confluence = 0.65;
   183    186   				interference = {speed = 1};
   184    187   			};
   185    188   		}
................................................................................
   197    200   		tone = {209,88,241}, alpha = 80;
   198    201   		dye = 'purple';
   199    202   		rarity = 18;
   200    203   		meltpoint = 3;
   201    204   		cooktime = 340;
   202    205   		hardness = 7;
   203    206   		maxenergy = 1800;
          207  +		conduct = 5;
   204    208   		durability = 1900;
   205    209   		speed = 3.2;
   206    210   		img = {
   207    211   			-- ingot = 'sorcery_iridium_ingot.png';
   208    212   			-- block = 'sorcery_iridium_block.png';
   209    213   		};
   210    214   		slots = {
................................................................................
   238    242   	};
   239    243   	impervium = {
   240    244   		tone = {226,255,107}, alpha = 90;
   241    245   		cooktime = 260;
   242    246   		meltpoint = 5;
   243    247   		artificial = true;
   244    248   		speed = 2.1;
   245         -		hardness = 20;
          249  +		hardness = 15;
   246    250   		durability = 5300;
   247    251   		maxenergy = 2300;
   248    252   		watercool = true;
   249    253   		mix = {
   250    254   			metals = {
   251    255   				duranium = 4;
   252    256   				iridium = 2;
................................................................................
   261    265   	};
   262    266   	eternium = {
   263    267   		tone = {156,82,222}, alpha = 100;
   264    268   		cooktime = 500;
   265    269   		meltpoint = 6;
   266    270   		artificial = true;
   267    271   		speed = 2;
   268         -		hardness = 9;
          272  +		hardness = 10;
   269    273   		maxenergy = 1200;
   270    274   		durability = 8100;
   271    275   		watercool = true;
   272    276   		mix = {
   273    277   			metals = {
   274    278   				iridium = 2;
   275    279   				tungsten = 2;
   276    280   				lithium = 1;
   277    281   			};
   278    282   		};
          283  +		sinter = {
          284  +			'sorcery:powder_iridium';
          285  +			'sorcery:powder_iridium';
          286  +			'sorcery:powder_tungsten';
          287  +			'sorcery:powder_tungsten';
          288  +			'sorcery:powder_lithium';
          289  +		};
   279    290   		slots = {
   280    291   			{affinity={'praxic','entropic'}, confluence = 1.4};
   281    292   			{affinity={'praxic','syncretic'}, confluence = 1.1};
   282    293   		}
   283    294   	};
   284    295   	unobtanium = {
   285    296   		tone = {114,255,214}, alpha = 120;
   286    297   		meltpoint = 3;
   287    298   		cooktime = 330;
   288    299   		artificial = true;
   289    300   		maxenergy = 4000;
   290    301   		hardness = 7;
   291    302   		durability = 3300;
          303  +		conduct = 15;
   292    304   		speed = 3.4;
   293    305   		slots = {
   294    306   			{affinity={'praxic'}, confluence = 0.7};
   295    307   			{affinity={'counterpraxic'}, confluence = 1.2};
   296    308   			{affinity={'cognic'}, confluence = 1.1};
   297    309   		};
   298    310   		mix = {
................................................................................
   299    311   			metals = {
   300    312   				impervium = 8;
   301    313   				eternium = 4;
   302    314   				cobalt = 1;
   303    315   			};
   304    316   		};
   305    317   	};
   306         -	-- draconium = {artificial=true;};
   307         -	-- tyrannium = {artificial=true;};
          318  +	draconium = {
          319  +		tone = {255,20,80}, alpha = 110;
          320  +		artificial=true;
          321  +		meltpoint = 5;
          322  +		cooktime = 120;
          323  +		hardness = 8;
          324  +		maxconduct = 10;
          325  +		speed = 1.7;
          326  +		maxenergy = 2200;
          327  +		durability = 1500;
          328  +		slots = {
          329  +			{affinity={'praxic'},confluence=3};
          330  +			{affinity={'syncretic'},confluence=2};
          331  +		};
          332  +		sinter = {
          333  +			'sorcery:powder_lithium';
          334  +			'sorcery:powder_aluminum';
          335  +			'sorcery:powder_iridium';
          336  +			'sorcery:oil_flame';
          337  +		};
          338  +	};
          339  +	tyrannium = {
          340  +		tone = {46,255,245}, alpha = 80;
          341  +		artificial=true;
          342  +		hardness = 20;
          343  +		meltpoint = 6;
          344  +		cooktime = 240;
          345  +		maxenergy = 800;
          346  +		durability = 4000;
          347  +		speed = 3.0;
          348  +		slots = {};
          349  +	};
   308    350   };