From d0efa15b983f7a0a96e1a7abcdad713715dfeeeb Mon Sep 17 00:00:00 2001 From: Zefram <zefram@fysh.org> Date: Mon, 18 Aug 2014 16:14:15 +0200 Subject: [PATCH] In quarry, skip past undiggable nodes --- technic/machines/register/grinder_recipes.lua | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 6 deletions(-) diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 4453ea8..6ab19e7 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -1,7 +1,7 @@ local S = technic.getter -technic.register_recipe_type("grinding", S("Grinding")) +technic.register_recipe_type("grinding", { description = S("Grinding") }) function technic.register_grinder_recipe(data) data.time = data.time or 3 @@ -15,10 +15,8 @@ {"default:desert_stone", "default:desert_sand"}, {"default:gold_lump", "technic:gold_dust 2"}, {"default:iron_lump", "technic:wrought_iron_dust 2"}, - {"moreores:mithril_lump", "technic:mithril_dust 2"}, - {"moreores:silver_lump", "technic:silver_dust 2"}, - {"moreores:tin_lump", "technic:tin_dust 2"}, {"technic:chromium_lump", "technic:chromium_dust 2"}, + {"technic:uranium_lump", "technic:uranium_dust 2"}, {"technic:zinc_lump", "technic:zinc_dust 2"}, -- Other @@ -26,6 +24,12 @@ {"default:gravel", "default:dirt"}, {"default:stone", "default:sand"}, } + +if minetest.get_modpath("moreores") then + table.insert(recipes, {"moreores:mithril_lump", "technic:mithril_dust 2"}) + table.insert(recipes, {"moreores:silver_lump", "technic:silver_dust 2"}) + table.insert(recipes, {"moreores:tin_lump", "technic:tin_dust 2"}) +end if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then table.insert(recipes, {"gloopores:alatro_lump", "technic:alatro_dust 2"}) @@ -40,7 +44,7 @@ end for _, data in pairs(recipes) do - technic.register_grinder_recipe({input = data[1], output = data[2]}) + technic.register_grinder_recipe({input = {data[1]}, output = data[2]}) end local function register_dust(name, ingot) @@ -57,7 +61,7 @@ recipe = "technic:"..lname.."_dust", output = ingot, }) - technic.register_grinder_recipe({ input = ingot, output = "technic:"..lname.."_dust 1" }) + technic.register_grinder_recipe({ input = {ingot}, output = "technic:"..lname.."_dust 1" }) end end @@ -84,6 +88,41 @@ register_dust("Talinite", "glooptest:talinite_ingot") end +for p = 0, 35 do + local nici = (p ~= 0 and p ~= 7 and p ~= 35) and 1 or nil + local psuffix = p == 7 and "" or p + local ingot = "technic:uranium"..psuffix.."_ingot" + local dust = "technic:uranium"..psuffix.."_dust" + minetest.register_craftitem(dust, { + description = S("%s Dust"):format(string.format(S("%.1f%%-Fissile Uranium"), p/10)), + inventory_image = "technic_uranium_dust.png", + on_place_on_ground = minetest.craftitem_place_item, + groups = {uranium_dust=1, not_in_creative_inventory=nici}, + }) + minetest.register_craft({ + type = "cooking", + recipe = dust, + output = ingot, + }) + technic.register_grinder_recipe({ input = {ingot}, output = dust }) +end + +local function uranium_dust(p) + return "technic:uranium"..(p == 7 and "" or p).."_dust" +end +for pa = 0, 34 do + for pb = pa+1, 35 do + local pc = (pa+pb)/2 + if pc == math.floor(pc) then + minetest.register_craft({ + type = "shapeless", + recipe = { uranium_dust(pa), uranium_dust(pb) }, + output = uranium_dust(pc).." 2", + }) + end + end +end + minetest.register_craft({ type = "fuel", recipe = "technic:coal_dust", -- Gitblit v1.8.0