sorcery  Diff

Differences From Artifact [a6eaeb7ad1]:

To Artifact [bb9d0957fb]:


    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  +		conduct = 0.3;
    35     35   	};
    36     36   	brass = {
    37     37   		tone = {255,226,87};
    38     38   		dye = 'bright_orange';
    39     39   		artificial = true;
    40     40   		no_tools = true; no_armor = true;
    41     41   		hardness = 3;
................................................................................
   137    137   		no_armor = true; no_tools = true;
   138    138   		power = 1; cooktime = 8; hardness = 1;
   139    139   	};
   140    140   	electrum = {
   141    141   		tone = {212, 255, 0}, alpha = 80;
   142    142   		artificial = true;
   143    143   		hardness = 1;
   144         -		conduct = 0.5;
          144  +		conduct = 2;
   145    145   		dye = 'bright_green';
   146    146   		mix = {
   147    147   			metals = {
   148    148   				silver = 1;
   149    149   				gold = 1;
   150    150   			};
   151    151   		};
................................................................................
   174    174   		rarity = 17;
   175    175   		durabilty = 900;
   176    176   		hardness = 6;
   177    177   		power = 3;
   178    178   		speed = 3.5;
   179    179   		cooktime = 30;
   180    180   		maxenergy = 3500;
   181         -		conduct = 2.0;
   182    181   		slots = {
   183    182   			{
   184    183   				affinity = {'counterpraxic'};
   185    184   				confluence = 0.65;
   186    185   				interference = {speed = 1};
   187    186   			};
   188    187   		}
................................................................................
   191    190   		tone = {255,252,93}, alpha = 80;
   192    191   		dye = 'yellow';
   193    192   		rarity = 13;
   194    193   		hardness = 2;
   195    194   		fuel = 80;
   196    195   		no_tools = true;
   197    196   		no_armor = true;
          197  +	};
          198  +	vidrium = {
          199  +		tone = {119,185,221}, alpha = 140;
          200  +		artificial = true;
          201  +		dye = 'cyan';
          202  +		hardness = 1;
          203  +		durability = 300;
          204  +		meltpoint = 2;
          205  +		cooktime = 20;
          206  +		no_tools = true, no_armor = true;
          207  +		conduct = 5;
          208  +		mix = {
          209  +			metals = {
          210  +				lithium = 2;
          211  +				tin = 4;
          212  +				gold = 1;
          213  +			}
          214  +		};
          215  +		sinter = {
          216  +			'gold'; 'lithium', 'lithium';
          217  +			'tin', 'tin', 'tin', 'tin';
          218  +		};
   198    219   	};
   199    220   	iridium = {
   200    221   		tone = {209,88,241}, alpha = 80;
   201    222   		dye = 'purple';
   202    223   		rarity = 18;
   203    224   		meltpoint = 3;
   204    225   		cooktime = 340;
   205    226   		hardness = 7;
   206    227   		maxenergy = 1800;
   207         -		conduct = 5;
          228  +		conduct = 10;
   208    229   		durability = 1900;
   209         -		speed = 3.2;
          230  +		speed = 3;
   210    231   		img = {
   211    232   			-- ingot = 'sorcery_iridium_ingot.png';
   212    233   			-- block = 'sorcery_iridium_block.png';
   213    234   		};
   214    235   		slots = {
   215    236   			{affinity={'counterpraxic','syncretic'}, confluence = 1.1};
   216    237   			{affinity={'cognic','entropic'}, confluence = 0.8};
................................................................................
   277    298   			metals = {
   278    299   				iridium = 2;
   279    300   				tungsten = 2;
   280    301   				lithium = 1;
   281    302   			};
   282    303   		};
   283    304   		sinter = {
   284         -			'sorcery:powder_iridium';
   285         -			'sorcery:powder_iridium';
   286         -			'sorcery:powder_tungsten';
   287         -			'sorcery:powder_tungsten';
   288         -			'sorcery:powder_lithium';
          305  +			'lithium';
          306  +			'iridium', 'iridium';
          307  +			'tungsten', 'tungsten';
   289    308   		};
   290    309   		slots = {
   291    310   			{affinity={'praxic','entropic'}, confluence = 1.4};
   292    311   			{affinity={'praxic','syncretic'}, confluence = 1.1};
   293    312   		}
   294    313   	};
   295    314   	unobtanium = {
................................................................................
   296    315   		tone = {114,255,214}, alpha = 120;
   297    316   		meltpoint = 3;
   298    317   		cooktime = 330;
   299    318   		artificial = true;
   300    319   		maxenergy = 4000;
   301    320   		hardness = 7;
   302    321   		durability = 3300;
   303         -		conduct = 15;
          322  +		conduct = 20;
   304    323   		speed = 3.4;
   305    324   		slots = {
   306    325   			{affinity={'praxic'}, confluence = 0.7};
   307    326   			{affinity={'counterpraxic'}, confluence = 1.2};
   308    327   			{affinity={'cognic'}, confluence = 1.1};
   309    328   		};
   310    329   		mix = {
................................................................................
   317    336   	};
   318    337   	draconium = {
   319    338   		tone = {255,20,80}, alpha = 110;
   320    339   		artificial=true;
   321    340   		meltpoint = 5;
   322    341   		cooktime = 120;
   323    342   		hardness = 8;
   324         -		maxconduct = 10;
          343  +		maxconduct = 15;
   325    344   		speed = 1.7;
   326    345   		maxenergy = 2200;
   327    346   		durability = 1500;
   328    347   		slots = {
   329    348   			{affinity={'praxic'},confluence=3};
   330    349   			{affinity={'syncretic'},confluence=2};
   331    350   		};
   332    351   		sinter = {
   333         -			'sorcery:powder_lithium';
   334         -			'sorcery:powder_aluminum';
   335         -			'sorcery:powder_iridium';
   336         -			'sorcery:oil_flame';
          352  +			'lithium'; 'aluminum'; 'iridium';
   337    353   		};
          354  +		sinter_catalyst = { 'sorcery:oil_flame' };
   338    355   	};
   339    356   	tyrannium = {
   340    357   		tone = {46,255,245}, alpha = 80;
   341    358   		artificial=true;
   342    359   		hardness = 20;
   343    360   		meltpoint = 6;
   344    361   		cooktime = 240;
   345    362   		maxenergy = 800;
   346    363   		durability = 4000;
   347    364   		speed = 3.0;
   348    365   		slots = {};
   349    366   	};
   350    367   };