sorcery  Diff

Differences From Artifact [6a04c7ee36]:

To Artifact [39659f8d92]:


    30     30   				{'default:obsidian_shard','stairs:slab_goldblock','default:bronze_ingot'};
    31     31   			};
    32     32   		};
    33     33   		bless = {
    34     34   			potions = {};
    35     35   			tools = {};
    36     36   		};
    37         -		gifts = {};
           37  +		gifts = {
           38  +			['sorcery:screw_steel'] = {7,1};
           39  +			['sorcery:pipe'] = {16,2};
           40  +			['sorcery:valve'] = {18,3};
           41  +			['sorcery:fragment_vidrium'] = {20,4};
           42  +			['sorcery:fragment_lithium'] = {23,5};
           43  +			['sorcery:screw_platinum'] = {31,5};
           44  +			['sorcery:screw_tungsten'] = {33,5};
           45  +			['sorcery:powder_firestorm'] = {48,7};
           46  +		};
    38     47   		consecrate = {
    39     48   			["sorcery:dagger"] = {17, "sorcery:dagger_consecrated"};
    40     49   			["sorcery:oil_mystic"] = {9, "sorcery:oil_purifying"};
    41     50   			["sorcery:potion_water"] = {4, "sorcery:holy_water"};
    42     51   			["default:paper"] = function(ctx)
    43     52   				local stack = ItemStack('sorcery:recipe')
    44         -				local mode = select(2,L.tbl.pick{'cook','craft','infuse','grind','enchant'})
           53  +				local mode = select(2,L.tbl.pick{'cook','craft','grind','enchant'})
    45     54   				sorcery.cookbook.setrecipe(stack, mode, nil, {
    46     55   					pred = function(c)
    47     56   						local me = ctx.god
           57  +						local g = function(n)
           58  +							return minetest.get_item_group(c.item, n) ~= 0
           59  +						end
    48     60   						if (mode == 'enchant' or
    49         -							minetest.get_item_group(c.item, 'sorcery_magical') ~= 0 or
    50         -							minetest.get_item_group(c.item, 'sorcery_magitech') ~= 0 or
    51         -							minetest.get_item_group(c.item, 'sorcery_ley_device') ~= 0 or
    52         -							minetest.get_item_group(c.item, 'sorcery_tech') ~= 0 or
    53         -							minetest.get_item_group(c.item, 'crafttool') ~= 0 or
    54         -							me.sacrifice [c.item] or
    55         -							me.consecrate[c.item]) and
    56         -							mod ~= 'farming'
           61  +							(ctx.favor > 35 and (g 'sorcery_magical'
           62  +											or g 'sorcery_magitech'
           63  +											or g 'sorcery_ley_device'))
           64  +							or g 'sorcery_tech'
           65  +							or g 'crafttool'
           66  +							or me.sacrifice [c.item]
           67  +							or me.consecrate[c.item])
           68  +							and mod ~= 'farming'
    57     69   								then return true end
    58     70   					end;
    59     71   				})
    60         -				return 6, stack
           72  +				return 3, stack
    61     73   			end;
    62     74   			-- ["default:gold_ingot"] = {15, "sorcery:holy_token_magic"};
    63     75   		};
    64     76   		sacrifice = {
    65         -			['sorcery:essence_frost'] = 25;
    66         -			['sorcery:essence_flame'] = 25;
    67         -			['sorcery:essence_force'] = 30;
           77  +			['sorcery:essence_frost'] = 15;
           78  +			['sorcery:essence_flame'] = 15;
           79  +			['sorcery:essence_force'] = 20;
    68     80   
    69         -			['sorcery:gem_luxite'] = 6;
    70         -			['sorcery:gem_ruby'] = 10;
    71         -			['sorcery:gem_amethyst'] = 16;
    72         -			['sorcery:gem_sapphire'] = 25;
    73         -			['sorcery:gem_emerald'] = 34;
    74         -			['default:mese_crystal'] = 42;
    75         -			['default:diamond'] = 50;
           81  +			['sorcery:gem_luxite'] = 4;
           82  +			['sorcery:gem_ruby'] = 7;
           83  +			['sorcery:gem_amethyst'] = 9;
           84  +			['sorcery:gem_sapphire'] = 12;
           85  +			['sorcery:gem_emerald'] = 14;
           86  +			['default:mese_crystal'] = 18;
           87  +			['default:diamond'] = 25;
    76     88   
    77         -			['sorcery:gem_luxite_amulet'] = 20;
    78         -			['sorcery:gem_ruby_amulet'] = 35;
    79         -			['sorcery:gem_amethyst_amulet'] = 48;
    80         -			['sorcery:gem_sapphire_amulet'] = 56;
    81         -			['sorcery:gem_emerald_amulet'] = 63;
    82         -			['sorcery:gem_mese_amulet'] = 78;
    83         -			['sorcery:gem_diamond_amulet'] = 91;
           89  +			['sorcery:gem_luxite_amulet'] = 8;
           90  +			['sorcery:gem_ruby_amulet'] = 14;
           91  +			['sorcery:gem_amethyst_amulet'] = 18;
           92  +			['sorcery:gem_sapphire_amulet'] = 23;
           93  +			['sorcery:gem_emerald_amulet'] = 14;
           94  +			['sorcery:gem_mese_amulet'] = 36;
           95  +			['sorcery:gem_diamond_amulet'] = 50;
    84     96   
    85     97   			['sorcery:oil_mystic'] = 2;
    86         -			['sorcery:oil_berry'] = 4;
    87         -			['sorcery:oil_wind'] = 6;
    88         -			['sorcery:oil_bleak'] = 6;
    89         -			['sorcery:oil_stone'] = 7;
    90         -			['sorcery:oil_mushroom'] = 8;
    91         -			['sorcery:oil_flame'] = 8;
    92         -			['sorcery:oil_dawn'] = 11;
    93         -			['sorcery:oil_luscious'] = 12;
    94         -			['sorcery:oil_luck'] = 16;
           98  +			['sorcery:oil_berry'] = 3;
           99  +			['sorcery:oil_wind'] = 4;
          100  +			['sorcery:oil_bleak'] = 4;
          101  +			['sorcery:oil_stone'] = 5;
          102  +			['sorcery:oil_mushroom'] = 6;
          103  +			['sorcery:oil_flame'] = 7;
          104  +			['sorcery:oil_dawn'] = 8;
          105  +			['sorcery:oil_luscious'] = 9;
          106  +			['sorcery:oil_luck'] = 11;
    95    107   			['sorcery:oil_sagnuine'] = -15;
    96    108   
    97         -			['sorcery:grease_fog'] = 17;
    98         -			['sorcery:grease_pine'] = 18;
    99         -			['sorcery:grease_storm'] = 20;
   100         -			['sorcery:grease_whisper'] = 21;
   101         -			['sorcery:grease_thunder'] = 22;
   102         -			['sorcery:grease_enchanting'] = 24;
   103         -			['sorcery:grease_lift'] = 32;
          109  +			['sorcery:grease_fog'] = 15;
          110  +			['sorcery:grease_pine'] = 16;
          111  +			['sorcery:grease_storm'] = 18;
          112  +			['sorcery:grease_whisper'] = 19;
          113  +			['sorcery:grease_thunder'] = 20;
          114  +			['sorcery:grease_enchanting'] = 22;
          115  +			['sorcery:grease_lift'] = 28;
   104    116   			['sorcery:grease_war'] = -5;
   105    117   
   106         -			['sorcery:warding_plate'] = 6;
          118  +			['sorcery:warding_plate'] = 5;
   107    119   			['sorcery:ley_puncture'] = 8;
   108    120   			['sorcery:pulse_rectifier'] = 8;
   109    121   			['sorcery:current_felicitator'] = 12;
   110         -			['sorcery:infuser_concentrator'] = 15;
   111         -			['sorcery:infuser_tube'] = 23;
   112         -			['sorcery:inverter_coil'] = 31;
   113         -			['sorcery:inversion_matrix'] = 70;
   114         -			['sorcery:inferno_crystal'] = 75;
   115         -			['sorcery:beam_generator'] = 83;
   116         -			['sorcery:field_emitter'] = 92;
   117         -			['sorcery:catalytic_converter'] = 95;
   118         -			['sorcery:gravity_manipulator'] = 97;
          122  +			['sorcery:infuser_concentrator'] = 7;
          123  +			['sorcery:infuser_tube'] = 9;
          124  +			['sorcery:inverter_coil'] = 10;
          125  +			['sorcery:inversion_matrix'] = 22;
          126  +			['sorcery:inferno_crystal'] = 24;
          127  +			['sorcery:beam_generator'] = 27;
          128  +			['sorcery:field_emitter'] = 30;
          129  +			['sorcery:catalytic_converter'] = 30;
          130  +			['sorcery:gravity_manipulator'] = 50;
   119    131   
   120         -			['sorcery:core_syncretic'] = 64;
   121         -			['sorcery:core_mandatic'] = 53;
   122         -			['sorcery:core_praxic'] = 72;
   123         -			['sorcery:core_counterpraxic'] = 31;
          132  +			['sorcery:core_syncretic'] = 25;
          133  +			['sorcery:core_mandatic'] = 27;
          134  +			['sorcery:core_praxic'] = 29;
          135  +			['sorcery:core_counterpraxic'] = 17;
   124    136   
   125    137   			['sorcery:sap'] = 1;
   126    138   			['sorcery:sap_apple'] = 2;
   127    139   			['sorcery:sap_aspen'] = 3;
   128    140   			['sorcery:sap_pine'] = 3;
   129    141   			['sorcery:sap_jungle'] = 4;
   130    142   			['sorcery:sap_acacia'] = 5;