sorcery  Diff

Differences From Artifact [b325d7e9c3]:

To Artifact [f4099f1a65]:


    42     42   	};
    43     43   	bronze = {
    44     44   		ingot = 'default:bronze_ingot';
    45     45   		block = 'default:bronzeblock';
    46     46   		artificial = true;
    47     47   		tone = {229,115,52};
    48     48   		items = default_items('bronze');
           49  +		maxenergy = 150;
    49     50   		slots = {
    50         -			{affinity = {'counterpraxic'}; confluence = 0.7;};
           51  +			{affinity = {'counterpraxic'}; confluence = 0.7};
    51     52   		};
    52     53   		mix = {
    53     54   			metals = {
    54     55   				copper = 4;
    55     56   				tin = 1;
    56     57   			};
    57     58   		};
    58     59   	};
    59     60   	steel = {
    60     61   		ingot = 'default:steel_ingot';
    61     62   		block = 'default:steelblock';
    62     63   		tone = {240,240,240};
    63     64   		items = default_items('steel');
           65  +		maxenergy = 200;
    64     66   		slots = {
    65         -			{affinity = {'praxic'}; confluence = 0.5;};
           67  +			{affinity = {'praxic'}; confluence = 0.5};
    66     68   		};
    67     69   	};
    68     70   	aluminum = {
    69     71   		tone = {196,64,32}, alpha = 128;
    70     72   		meltpoint = 1;
    71     73   		rarity = 12; depth = 158;
    72     74   		power = 3; speed = 2.4;
    73     75   		durability = 700; cooktime = 25;
    74     76   		armor_weight = 0.3;
           77  +		maxenergy = 400;
    75     78   		slots = {
    76         -			{affinity = {'syncretic'}; confluence = 0.7;};
    77         -			{affinity = {'praxic'}; confluence = 0.4;};
           79  +			{affinity = {'syncretic'}; confluence = 0.7};
           80  +			{affinity = {'praxic'}; confluence = 0.4};
    78     81   		};
    79     82   	};
    80     83   	levitanium = {
    81     84   		tone = {17,255,191}, alpha = 40;
    82     85   		meltpoint = 4;
    83     86   		rarity = 17; depth = 870;
    84     87   		power = 1; durability = 50; cooktime = 70;
    85     88   		armor_weight = -2.2; armor_protection = 1;
           89  +		maxenergy = 5000;
    86     90   		no_tools = true;
    87     91   	};
    88     92   	platinum = {
    89     93   		tone = {255,233,118}, alpha = 50;
    90     94   		meltpoint = 1;
    91     95   		rarity = 15; depth = 580;
    92     96   		power = 4; speed = 3;
    93     97   		durability = 1400; cooktime = 40;
    94     98   		armor_weight = 0.7;
           99  +		maxenergy = 1000;
    95    100   		slots = {
    96    101   			{affinity = {'praxic','counterpraxic'}; confluence = 0.3};
    97    102   			{affinity = {'counterpraxic'}; confluence = 0.8};
    98    103   		}
    99    104   	};
   100    105   	gold = {
   101    106   		ingot = 'default:gold_ingot';
   102    107   		block = 'default:goldblock';
   103    108   		tone = {255,225,47};
          109  +		maxenergy = 3000;
   104    110   		slots = {
   105    111   			{affinity = {'praxic','counterpraxic'}; confluence = 1.4};
   106    112   			{affinity = {'praxic','counterpraxic'}; confluence = 1.2};
   107    113   		}
   108    114   	};
   109    115   	silver = {
   110    116   		tone = {218,255,246};
   111    117   
          118  +		maxenergy = 2000;
   112    119   		depth = 380; rarity = 13.5;
   113    120   		no_armor = true; no_tools = true;
   114    121   		power = 1; cooktime = 8; hardness = 1;
   115    122   	};
   116    123   	electrum = {
   117    124   		tone = {212, 255, 0}, alpha = 80;
   118    125   		artificial = true;
................................................................................
   123    130   			};
   124    131   		};
   125    132   		no_tools = true;
   126    133   	};
   127    134   	tungsten = {
   128    135   		tone = {0,255,163}, alpha = 70;
   129    136   		rarity = 14;
   130         -		speed = 2.5;
          137  +		speed = 2.8;
   131    138   		power = 4;
   132    139   		meltpoint = 4;
   133    140   		cooktime = 100;
   134         -		durability = 2500;
          141  +		durability = 2700;
          142  +		maxenergy = 1500;
   135    143   		slots = {
   136    144   			{affinity = {'counterpraxic'}, confluence = 0.6};
   137         -			{affinity = {'praxic','counterpraxic'}, confluence = 0.8};
          145  +			{affinity = {'praxic','counterpraxic'}, confluence = 1};
   138    146   			{affinity = {'praxic'}, confluence = 0.5};
   139    147   		};
   140    148   	};
   141    149   	cobalt = {
   142    150   		tone = {48,101,255}, alpha = 90;
   143         -		rarity = 15;
   144         -		durabilty = 650;
          151  +		rarity = 17;
          152  +		durabilty = 900;
   145    153   		power = 3;
   146    154   		speed = 3.5;
   147    155   		cooktime = 30;
          156  +		maxenergy = 3500;
          157  +		slots = {
          158  +			{
          159  +				affinity = {'counterpraxic'};
          160  +				confluence = 0.65;
          161  +				interference = {speed = 1};
          162  +			};
          163  +		}
   148    164   	};
   149    165   	lithium = {
   150    166   		tone = {255,252,93}, alpha = 80;
   151         -		rarity = 12.5;
          167  +		rarity = 13;
   152    168   		no_tools = true;
   153    169   		no_armor = true;
   154    170   	};
   155    171   	iridium = {
   156    172   		tone = {209,88,241}, alpha = 80;
   157         -		rarity = 17;
          173  +		rarity = 18;
   158    174   		meltpoint = 3;
   159    175   		cooktime = 340;
   160         -		durability = 1700;
          176  +		maxenergy = 1800;
          177  +		durability = 1900;
   161    178   		speed = 3.2;
   162    179   		img = {
   163    180   			-- ingot = 'sorcery_iridium_ingot.png';
   164    181   			-- block = 'sorcery_iridium_block.png';
   165    182   		};
   166    183   		slots = {
   167    184   			{affinity={'counterpraxic','syncretic'}, confluence = 1.1};
   168    185   			{affinity={'cognic','entropic'}, confluence = 0.8};
   169    186   		};
   170    187   	};
   171         -	duranium = {
          188  +	duridium = {
   172    189   		tone = {255,64,175}, alpha = 70;
   173    190   		cooktime = 120;
   174    191   		artificial = true;
   175    192   		durability = 3400;
   176    193   		speed = 3.1;
   177    194   		power = 5;
   178    195   		mix = {
................................................................................
   181    198   				aluminum = 4;
   182    199   				tin = 1;
   183    200   			};
   184    201   		};
   185    202   		img = {
   186    203   			-- ingot = 'sorcery_duranium_ingot.png';
   187    204   		};
          205  +		maxenergy = 1300;
   188    206   		slots = {
   189    207   			{affinity={'counterpraxic'}, confluence = 0.6};
   190    208   			{affinity={'counterpraxic'}, confluence = 0.4};
   191    209   		};
   192    210   	};
   193    211   	impervium = {
   194    212   		tone = {226,255,107}, alpha = 90;
   195    213   		cooktime = 260;
   196    214   		meltpoint = 5;
   197    215   		artificial = true;
   198    216   		speed = 2.1;
   199    217   		durability = 5300;
          218  +		maxenergy = 2300;
   200    219   		watercool = true;
   201    220   		mix = {
   202    221   			metals = {
   203    222   				duranium = 4;
   204    223   				iridium = 2;
   205    224   				levitanium = 1;
   206    225   			};
   207    226   		};
   208    227   		slots = {
   209         -			{affinity={'praxic'}, confluence = 1.2};
          228  +			{affinity={'praxic'}, confluence = 1.2, interference={durability=2}};
   210    229   			{affinity={'praxic','syncretic'}, confluence = 0.8};
   211    230   			{affinity={'cognic'}, confluence = 0.9};
   212    231   		};
   213    232   	};
   214    233   	eternium = {
   215    234   		tone = {156,82,222}, alpha = 100;
   216    235   		cooktime = 500;
   217    236   		meltpoint = 6;
   218    237   		artificial = true;
   219    238   		speed = 2;
          239  +		maxenergy = 1200;
   220    240   		durability = 8100;
   221    241   		watercool = true;
   222    242   		mix = {
   223    243   			metals = {
   224    244   				iridium = 2;
   225    245   				tungsten = 2;
   226    246   				lithium = 1;
................................................................................
   232    252   		}
   233    253   	};
   234    254   	unobtanium = {
   235    255   		tone = {114,255,214}, alpha = 120;
   236    256   		meltpoint = 3;
   237    257   		cooktime = 330;
   238    258   		artificial = true;
          259  +		maxenergy = 4000;
   239    260   		durability = 3300;
   240    261   		speed = 3.4;
   241    262   		slots = {
   242    263   			{affinity={'praxic'}, confluence = 0.7};
   243    264   			{affinity={'counterpraxic'}, confluence = 1.2};
   244    265   			{affinity={'cognic'}, confluence = 1.1};
   245    266   		};