sorcery  Diff

Differences From Artifact [dce6dabf6f]:

• File metal.lua — part of check-in [93f944b581] at 2020-08-30 14:45:03 on branch trunk — add displacers; add item class mechanism; various tweaks, enhancements, and bugfixes esp. for books and paper (user: lexi, size: 5674) [annotate] [blame] [check-ins using]
• File ores.lua — part of check-in [9ef6cbcf31] at 2020-08-28 14:08:57 on branch trunk — add recipes, cookbooks, disassembly (to create recipes from items), attunement, farcasters, and portals; various edits for bug fixes and improvements (user: lexi, size: 5674) [annotate] [blame] [check-ins using]

To Artifact [32259e26c1]:

• File metal.lua — part of check-in [f165d9e39f] at 2020-09-24 23:07:33 on branch trunk — add blood god, add gravitator, add hand-drawn ore images, add mana hud display for enchanted items, various tweaks and enhancements (user: lexi, size: 5909) [annotate] [blame] [check-ins using]

   131    131   			power = metal.power;
   132    132   			speed = metal.speed;
   133    133   			artificial = metal.artificial;
   134    134   			cooktime = metal.cooktime;
   135    135   			hardness = (metal.hardness/8) * 3; -- scaled wrt diamond
   136    136   			level = math.ceil(((metal.hardness/8) * 3)) + 1;
   137    137   			ingot_image = (metal.image and metal.image.ingot) or nil;
          138  +			ore_image = 'default_stone.png^sorcery_' .. name .. '_ore.png';
   138    139   			lump_image = (metal.image and metal.image.lump) or nil;
   139    140   			armor_weight = metal.armor_weight;
   140    141   			armor_protection = metal.armor_protection;
   141    142   		}
   142    143   	end
   143    144   	minetest.register_craftitem(fragment, {
   144    145   		inventory_image = 'sorcery_' .. name .. '_fragment.png';
................................................................................
   180    181   		}))
   181    182   	end
   182    183   	if metal.sinter then
   183    184   		local powders = {}
   184    185   		for _,m in pairs(metal.sinter) do
   185    186   			powders[#powders+1] = 'sorcery:powder_' .. m
   186    187   		end
   187         -		if metal.sinter_catalyst then for _,m in pairs(metal.sinter_catalyst)
   188         -			do powders[#powders+1] = m end end
          188  +		local repl = {}
          189  +		if metal.sinter_catalyst then
          190  +			for _,m in pairs(metal.sinter_catalyst) do
          191  +				powders[#powders+1] = m
          192  +				if sorcery.data.infusion_leftovers[m] then
          193  +					repl[#repl+1] = {m, sorcery.data.infusion_leftovers[m]}
          194  +				end
          195  +			end
          196  +		end
          197  +
   189    198   		minetest.register_craft {
   190    199   			type = 'shapeless';
   191    200   			output = powder .. ' ' .. tostring(#powders);
   192    201   			recipe = powders;
          202  +			replacements = repl;
   193    203   		};
   194    204   	end
   195    205   end