sorcery  Diff

Differences From Artifact [970d414eec]:

  • File data/metals.lua — part of check-in [72eebac4bc] at 2020-09-26 18:49:51 on branch trunk — add writing stand for editing codexes; add scissors, ink, erasure fluid, pens; touch up codex UI; add many recipe notes; add craft divination type for crafttools; defuckulate fucktarded crafttool impl; enhance table library with missing features like lua's table.unpack; many bug fixes and enhancements; blood for the blood god (user: lexi, size: 7930) [annotate] [blame] [check-ins using]

To Artifact [32babc7333]:

  • File data/metals.lua — part of check-in [ea6e475e44] at 2020-10-19 09:52:11 on branch trunk — continue dev on celestial mechanics, add melding+division spells (resonance), refine itemclasses, add keypunch and punchcards, add paper pulp, add a shitload of visuals, add convenience scripts for working with the wiki, make the flamebolt spell actually useful instead of just a pretty lightshow, add essences, inferno crystal, and other goodies; iterate on wands, lots of shit i can't remember, various bugfixes (user: lexi, size: 8466) [annotate] [blame] [check-ins using]

    16     16   	};
    17     17   end
    18     18   
    19     19   return {
    20     20   	tin = {
    21     21   		ingot = 'default:tin_ingot';
    22     22   		block = 'default:tinblock';
           23  +		dye = 'bright_grey';
    23     24   		tone = {172,172,172};
    24     25   		no_tools = true; no_armor = true; grindhead = true;
           26  +		durability = 120;
    25     27   		hardness = 2;
    26     28   		level = 0;
           29  +		depth = 64;
    27     30   	};
    28     31   	copper = {
    29     32   		dye = 'orange';
    30     33   		ingot = 'default:copper_ingot';
    31     34   		block = 'default:copperblock';
    32     35   		tone = {255,176,61};
    33     36   		no_tools = true; no_armor = true;
           37  +		durability = 80;
    34     38   		hardness = 2;
    35     39   		conduct = 0.3;
           40  +		depth = 64;
    36     41   		level = 0;
    37     42   	};
    38     43   	brass = {
    39     44   		tone = {255,226,87};
    40     45   		dye = 'bright_orange';
    41     46   		artificial = true;
    42     47   		no_tools = true; no_armor = true;
    43     48   		hardness = 3;
           49  +		durability = 200;
    44     50   		level = 0; 
    45     51   		mix = {
    46     52   			metals = {
    47     53   				silver = 1;
    48     54   				copper = 4;
    49     55   			};
    50     56   		};
................................................................................
    53     59   		ingot = 'default:bronze_ingot';
    54     60   		block = 'default:bronzeblock';
    55     61   		dye = 'dark_orange';
    56     62   		artificial = true;
    57     63   		tone = {229,115,52};
    58     64   		items = default_items('bronze');
    59     65   		hardness = 4;
    60         -		durability = 300;
           66  +		durability = 350;
    61     67   		maxenergy = 150;
           68  +		sharpness = 1;
    62     69   		speed = 1.4;
    63     70   		level = 0;
    64     71   		slots = {
    65     72   			{affinity = {'counterpraxic'}; confluence = 0.7};
    66     73   		};
    67     74   		mix = {
    68     75   			metals = {
................................................................................
    70     77   				tin = 1;
    71     78   			};
    72     79   		};
    73     80   	};
    74     81   	steel = {
    75     82   		ingot = 'default:steel_ingot';
    76     83   		block = 'default:steelblock';
    77         -		tone = {240,240,240};
           84  +		dye = 'grey';
           85  +		tone = {240,240,240}; depth = 128;
    78     86   		items = default_items('steel');
    79     87   		maxenergy = 200;
    80     88   		durability = 500;
           89  +		sharpness = 2;
    81     90   		hardness = 5;
    82     91   		speed = 1.9;
    83     92   		level = 1;
    84     93   		slots = {
    85     94   			{affinity = {'praxic'}; confluence = 0.5};
    86     95   		};
    87     96   	};
    88     97   	aluminum = {
    89     98   		tone = {196,64,32}, alpha = 128;
    90     99   		dye = 'red';
    91    100   		meltpoint = 1;
    92         -		rarity = 12; depth = 158;
          101  +		rarity = 12; depth = 183;
    93    102   		power = 3; speed = 2.4;
    94    103   		durability = 700; cooktime = 25;
    95    104   		hardness = 6;
          105  +		sharpness = 2;
    96    106   		armor_weight = 0.3;
    97    107   		maxenergy = 400;
    98    108   		level = 1;
    99    109   		maxlevel = 2;
   100    110   		slots = {
   101    111   			{affinity = {'syncretic'}; confluence = 0.7};
   102    112   			{affinity = {'praxic'}; confluence = 0.4};
   103    113   		};
   104    114   	};
   105    115   	levitanium = {
   106         -		tone = {17,255,191}, alpha = 40;
          116  +		tone = {0,255,163}, alpha = 70;
   107    117   		dye = 'bright_blue';
   108    118   		meltpoint = 4;
   109    119   		hardness = 3;
   110    120   		level = 1;
   111         -		rarity = 17; depth = 870;
          121  +		rarity = 18; depth = 870;
   112    122   		power = 1; durability = 50; cooktime = 70;
   113    123   		armor_weight = -2.2; armor_protection = 1;
   114         -		maxenergy = 5000;
   115    124   		no_tools = true;
   116    125   	};
   117    126   	platinum = {
   118    127   		tone = {255,233,118}, alpha = 50;
   119    128   		meltpoint = 1;
          129  +		dye = 'pastel_yellow';
   120    130   		rarity = 15; depth = 580;
   121    131   		power = 4; speed = 3;
   122    132   		hardness = 6;
          133  +		sharpness = 3;
   123    134   		level = 2;
   124    135   		durability = 1400; cooktime = 40;
   125    136   		armor_weight = 0.7;
   126    137   		maxenergy = 1000;
   127    138   		slots = {
   128         -			{affinity = {'praxic','counterpraxic'}; confluence = 0.3};
   129         -			{affinity = {'counterpraxic'}; confluence = 0.8};
          139  +			{affinity = {'praxic','counterpraxic'}; confluence = 0.7};
          140  +			{affinity = {'entropic'}; confluence = 0.4};
   130    141   		}
   131    142   	};
   132    143   	gold = {
   133    144   		dye = 'yellow';
   134    145   		ingot = 'default:gold_ingot';
   135    146   		block = 'default:goldblock';
   136    147   		tone = {255,225,47};
   137    148   		hardness = 1;
          149  +		depth = 256;
   138    150   		level = 1;
   139    151   		maxenergy = 3000;
   140    152   		slots = {
   141    153   			{affinity = {'praxic','counterpraxic'}; confluence = 1.4};
   142    154   			{affinity = {'praxic','counterpraxic'}; confluence = 1.2};
   143    155   		}
   144    156   	};
   145    157   	silver = {
   146    158   		tone = {218,255,246};
   147    159   		dye = 'white';
   148    160   		maxenergy = 2000;
   149    161   		hardness = 1;
   150    162   		level = 1;
   151         -		depth = 380; rarity = 13.5;
          163  +		depth = 210; rarity = 13.5;
   152    164   		no_armor = true; no_tools = true;
   153    165   		power = 1; cooktime = 8; hardness = 1;
   154    166   	};
   155    167   	electrum = {
   156    168   		tone = {212, 255, 0}, alpha = 80;
   157    169   		artificial = true;
   158    170   		hardness = 1;
................................................................................
   165    177   				gold = 1;
   166    178   			};
   167    179   		};
   168    180   		sinter = { 'silver', 'gold' };
   169    181   		no_tools = true;
   170    182   	};
   171    183   	tungsten = {
   172         -		tone = {0,255,163}, alpha = 70;
          184  +		tone = {17,255,191}, alpha = 40;
   173    185   		rarity = 14;
   174    186   		speed = 2.8;
   175    187   		power = 4;
   176    188   		hardness = 8;
   177    189   		meltpoint = 4;
   178    190   		cooktime = 100;
          191  +		sharpness = 2;
   179    192   		durability = 2700;
   180    193   		maxenergy = 1500;
   181    194   		level = 2;
   182    195   		maxlevel = 3;
          196  +		depth = 650;
   183    197   		slots = {
   184    198   			{affinity = {'counterpraxic'}, confluence = 0.6};
   185    199   			{affinity = {'praxic','counterpraxic'}, confluence = 1};
   186    200   			{affinity = {'praxic'}, confluence = 0.5};
   187    201   		};
   188    202   	};
   189    203   	cobalt = {
   190    204   		dye = 'blue';
   191    205   		tone = {48,101,255}, alpha = 90;
   192    206   		rarity = 17;
   193         -		durabilty = 900;
          207  +		durability = 400;
   194    208   		hardness = 6;
   195    209   		power = 3;
          210  +		sharpness = 1;
   196    211   		speed = 3.5;
          212  +		depth = 780;
   197    213   		cooktime = 30;
   198    214   		maxenergy = 3500;
   199    215   		level = 2;
   200    216   		slots = {
   201    217   			{
   202    218   				affinity = {'counterpraxic'};
   203    219   				confluence = 0.65;
................................................................................
   207    223   	};
   208    224   	lithium = {
   209    225   		tone = {255,252,93}, alpha = 80;
   210    226   		dye = 'yellow';
   211    227   		rarity = 13;
   212    228   		hardness = 2;
   213    229   		fuel = 80;
          230  +		depth = 670;
   214    231   		level = 1;
   215    232   		no_tools = true;
   216    233   		no_armor = true;
   217    234   	};
   218    235   	vidrium = {
   219    236   		tone = {119,185,221}, alpha = 140;
   220    237   		artificial = true;
................................................................................
   241    258   	iridium = {
   242    259   		tone = {209,88,241}, alpha = 80;
   243    260   		dye = 'purple';
   244    261   		rarity = 18;
   245    262   		meltpoint = 3;
   246    263   		cooktime = 340;
   247    264   		hardness = 7;
          265  +		sharpness = 4;
   248    266   		level = 3;
   249    267   		maxenergy = 1800;
          268  +		depth = 1370;
   250    269   		conduct = 10;
   251    270   		durability = 1900;
   252    271   		speed = 3;
   253         -		img = {
   254         -			-- ingot = 'sorcery_iridium_ingot.png';
   255         -			-- block = 'sorcery_iridium_block.png';
   256         -		};
   257    272   		slots = {
   258    273   			{affinity={'counterpraxic','syncretic'}, confluence = 1.1};
   259    274   			{affinity={'cognic','entropic'}, confluence = 0.8};
   260    275   		};
   261    276   	};
   262    277   	duridium = {
   263    278   		tone = {255,64,175}, alpha = 70;
   264    279   		cooktime = 120;
   265    280   		artificial = true;
   266    281   		durability = 3400;
   267    282   		speed = 3.1;
   268    283   		hardness = 9;
          284  +		sharpness = 3;
   269    285   		power = 5;
   270    286   		level = 4;
   271    287   		mix = {
   272    288   			metals = {
   273    289   				platinum = 4;
   274    290   				aluminum = 4;
   275    291   				tin = 1;
   276    292   			};
   277    293   		};
   278         -		img = {
   279         -			-- ingot = 'sorcery_duranium_ingot.png';
   280         -		};
   281    294   		maxenergy = 1300;
   282    295   		slots = {
   283    296   			{affinity={'counterpraxic'}, confluence = 0.6};
   284    297   			{affinity={'counterpraxic'}, confluence = 0.4};
   285    298   		};
   286    299   	};
   287    300   	impervium = {
   288    301   		tone = {226,255,107}, alpha = 90;
   289    302   		cooktime = 260;
   290    303   		meltpoint = 5;
   291    304   		artificial = true;
   292         -		speed = 2.1;
          305  +		speed = 2.8;
   293    306   		hardness = 15;
          307  +		sharpness = 5;
   294    308   		level = 4;
   295    309   		maxlevel = 5;
   296    310   		durability = 5300;
   297    311   		maxenergy = 2300;
   298    312   		watercool = true;
   299    313   		mix = {
   300    314   			metals = {
   301         -				duranium = 4;
   302         -				iridium = 2;
          315  +				duridium = 4;
          316  +				vidrium = 2;
   303    317   				levitanium = 1;
   304    318   			};
   305    319   		};
   306    320   		slots = {
   307    321   			{affinity={'praxic'}, confluence = 1.2, interference={durability=2}};
   308    322   			{affinity={'praxic','syncretic'}, confluence = 0.8};
   309    323   			{affinity={'cognic'}, confluence = 0.9};
   310    324   		};
   311    325   	};
   312    326   	eternium = {
   313         -		tone = {156,82,222}, alpha = 100;
          327  +		tone = {229,188,121}, alpha = 100;
   314    328   		cooktime = 500;
   315    329   		meltpoint = 6;
   316    330   		artificial = true;
   317         -		speed = 2;
          331  +		speed = 2.5;
   318    332   		hardness = 10;
          333  +		sharpness = 4;
   319    334   		level = 4;
   320    335   		maxenergy = 1200;
   321    336   		durability = 8100;
   322    337   		watercool = true;
   323    338   		mix = {
   324    339   			metals = {
   325    340   				iridium = 2;
................................................................................
   342    357   		meltpoint = 3;
   343    358   		cooktime = 330;
   344    359   		artificial = true;
   345    360   		maxenergy = 4000;
   346    361   		hardness = 7;
   347    362   		durability = 3300;
   348    363   		level = 5;
          364  +		sharpness = 3;
   349    365   		conduct = 20;
   350    366   		speed = 3.4;
   351    367   		slots = {
   352    368   			{affinity={'praxic'}, confluence = 0.7};
   353    369   			{affinity={'counterpraxic'}, confluence = 1.2};
   354    370   			{affinity={'cognic'}, confluence = 1.1};
   355    371   		};
................................................................................
   364    380   	draconium = {
   365    381   		tone = {255,20,80}, alpha = 110;
   366    382   		artificial=true;
   367    383   		meltpoint = 5;
   368    384   		cooktime = 120;
   369    385   		hardness = 8;
   370    386   		maxconduct = 15;
          387  +		sharpness = 5;
   371    388   		level = 2;
   372    389   		speed = 1.7;
   373    390   		maxenergy = 2200;
   374    391   		durability = 1500;
   375    392   		slots = {
   376    393   			{affinity={'praxic'},confluence=3};
   377    394   			{affinity={'syncretic'},confluence=2};
................................................................................
   384    401   	tyrannium = {
   385    402   		tone = {46,255,245}, alpha = 80;
   386    403   		artificial=true;
   387    404   		hardness = 20;
   388    405   		meltpoint = 6;
   389    406   		cooktime = 240;
   390    407   		maxenergy = 800;
          408  +		sharpness = 6;
   391    409   		durability = 4000;
   392    410   		speed = 3.0;
   393    411   		level = 3;
   394    412   		maxlevel = 4;
   395         -		slots = {};
          413  +		mix = {
          414  +			metals = {
          415  +				draconium = 1;
          416  +				tungsten = 4;
          417  +				platinum = 4;
          418  +			};
          419  +		};
          420  +		slots = {
          421  +			{affinity={'imperic','entropic'},confluence=2.5};
          422  +			{affinity={'praxic','cognic'},confluence=1.8};
          423  +			{affinity={'counterpraxic','syncretic'},confluence=0.7};
          424  +		};
   396    425   	};
   397    426   };