Fix mispelling : Leaver -> Lever

[xdecor.git] / enchanting.lua

diff --git a/enchanting.lua b/enchanting.lua
index 7c2a3b41e4e64a832d1ab16a8927d34c0478d6db..38c8a6cd3403db72123c77cf159756949404fa7a 100644 (file)
--- a/enchanting.lua
+++ b/enchanting.lua
@@ -1,6 +1,42 @@
 local enchanting = {}
 screwdriver = screwdriver or {}
 
+-- Cost in Mese crystal(s) for enchanting.
+local mese_cost = 1
+
+-- Force of the enchantments.
+enchanting.uses = 1.2
+enchanting.times = 0.1
+enchanting.damages = 1
+enchanting.strength = 1.2
+enchanting.speed = 0.2
+enchanting.jump = 0.2
+
+-- Enchanted tools registration.
+-- Available enchantments: durable, fast, sharp, strong, speed.
+enchanting.tools = {
+       --[[ Registration format:
+               [Mod name] = {
+                       materials,
+                       {tool name, enchantments}
+                }
+       ]]
+       ["default"] = {
+               "steel, bronze, mese, diamond",
+               {"axe",    "durable, fast"}, 
+               {"pick",   "durable, fast"}, 
+               {"shovel", "durable, fast"},
+               {"sword",  "sharp"}
+       },
+       ["3d_armor"] = {
+               "steel, bronze, gold, diamond",
+               {"boots",      "strong, speed"},
+               {"chestplate", "strong"},
+               {"helmet",     "strong"},
+               {"leggings",   "strong"}
+       }
+}
+
 function enchanting.formspec(pos, num)
        local formspec = [[ size[9,9;]
                        bgcolor[#080808BB;true]
@@ -33,7 +69,7 @@ function enchanting.on_put(pos, listname, _, stack)
                for k, v in pairs({"axe, pick, shovel",
                                "chestplate, leggings, helmet",
                                "sword", "boots"}) do
-                       if v:match(stack:get_name():match("([^:]+)%_")) then
+                       if v:find(stack:get_name():match(":(%w+)")) then
                                enchanting.formspec(pos, k)
                        end
                end
@@ -47,12 +83,12 @@ function enchanting.fields(pos, _, fields)
        local mese = inv:get_stack("mese", 1)
        local orig_wear = tool:get_wear()
        local mod, name = tool:get_name():match("(.*):(.*)")
-       local enchanted_tool = mod..":enchanted_"..name.."_"..next(fields)
+       local enchanted_tool = (mod or "")..":enchanted_"..(name or "").."_"..next(fields)
 
-       if mese:get_count() > 0 and minetest.registered_tools[enchanted_tool] then
+       if mese:get_count() >= mese_cost and minetest.registered_tools[enchanted_tool] then
                tool:replace(enchanted_tool)
                tool:add_wear(orig_wear)
-               mese:take_item()
+               mese:take_item(mese_cost)
                inv:set_stack("mese", 1, mese)
                inv:set_stack("tool", 1, tool)
        end
@@ -65,7 +101,7 @@ end
 
 local function allowed(tool)
        for item in pairs(minetest.registered_tools) do
-               if item:match("enchanted_"..tool) then return true end
+               if item:find("enchanted_"..tool) then return true end
        end
        return false
 end
@@ -81,9 +117,7 @@ function enchanting.put(_, listname, _, stack)
 end
 
 function enchanting.on_take(pos, listname)
-       if listname == "tool" then
-               enchanting.formspec(pos, nil)
-       end
+       if listname == "tool" then enchanting.formspec(pos, nil) end
 end
 
 function enchanting.construct(pos)
@@ -98,11 +132,9 @@ end
 
 xdecor.register("enchantment_table", {
        description = "Enchantment Table",
-       tiles = {
-               "xdecor_enchantment_top.png", "xdecor_enchantment_bottom.png",
-               "xdecor_enchantment_side.png", "xdecor_enchantment_side.png",
-               "xdecor_enchantment_side.png", "xdecor_enchantment_side.png"
-       },
+       tiles = {"xdecor_enchantment_top.png", "xdecor_enchantment_bottom.png",
+                "xdecor_enchantment_side.png", "xdecor_enchantment_side.png",
+                "xdecor_enchantment_side.png", "xdecor_enchantment_side.png"},
        groups = {cracky=1, oddly_breakable_by_hand=1, level=1},
        sounds = default.node_sound_stone_defaults(),
        on_rotate = screwdriver.rotate_simple,
@@ -115,56 +147,24 @@ xdecor.register("enchantment_table", {
        allow_metadata_inventory_move = function() return 0 end
 })
 
-local function cap(str)
-       return str:gsub("^%l", string.upper)
-end
-
- -- Higher number = stronger enchant.
-enchanting.uses = 1.2
-enchanting.times = 0.1
-enchanting.damages = 1
-enchanting.strength = 1.2
-enchanting.speed = 0.2
-enchanting.jump = 0.2
-
-local tools = {
-       --[[ Registration format:
-               [Mod name] = {
-                       materials,
-                       {tool name, tool group, enchantments}
-                }
-       --]]
-       ["default"] = {
-               "steel, bronze, mese, diamond",
-               {"axe", "choppy", "durable, fast"}, 
-               {"pick", "cracky", "durable, fast"}, 
-               {"shovel", "crumbly", "durable, fast"},
-               {"sword", "fleshy", "sharp"}
-       },
-       ["3d_armor"] = {
-               "steel, bronze, gold, diamond",
-               {"boots", nil, "strong, speed"},
-               {"chestplate", nil, "strong"},
-               {"helmet", nil, "strong"},
-               {"leggings", nil, "strong"}
-       }
-}
+local function cap(S) return S:gsub("^%l", string.upper) end
 
-for mod, defs in pairs(tools) do
+for mod, defs in pairs(enchanting.tools) do
 for material in defs[1]:gmatch("[%w_]+") do
 for _, tooldef in next, defs, 1 do
-for enchant in tooldef[3]:gmatch("[%w_]+") do
-       local tool, group = tooldef[1], tooldef[2]
+for enchant in tooldef[2]:gmatch("[%w_]+") do
+       local tool, group = tooldef[1], ""
        local original_tool = minetest.registered_tools[mod..":"..tool.."_"..material]
 
        if original_tool then
-               if mod == "default" then
+               if original_tool.tool_capabilities then
                        local original_damage_groups = original_tool.tool_capabilities.damage_groups
                        local original_groupcaps = original_tool.tool_capabilities.groupcaps
                        local groupcaps = table.copy(original_groupcaps)
                        local fleshy = original_damage_groups.fleshy
                        local full_punch_interval = original_tool.tool_capabilities.full_punch_interval
                        local max_drop_level = original_tool.tool_capabilities.max_drop_level
+                       group = tostring(next(original_groupcaps))
 
                        if enchant == "durable" then
                                groupcaps[group].uses = math.ceil(original_groupcaps[group].uses * enchanting.uses)
@@ -190,7 +190,6 @@ for enchant in tooldef[3]:gmatch("[%w_]+") do
 
                if mod == "3d_armor" then
                        local original_armor_groups = original_tool.groups
-                       local armorcaps = table.copy(original_armor_groups)
                        local armorcaps = {}
                        armorcaps.not_in_creative_inventory = 1