Slight tweaking of iron lightbox texture

[xdecor.git] / enchanting.lua

diff --git a/enchanting.lua b/enchanting.lua
index b6c10a5ff387c82a7c896adc42f1c88221f071c7..44ecd7deaa4f586dea988ba59b240dd64b77da4f 100644 (file)
--- a/enchanting.lua
+++ b/enchanting.lua
@@ -36,12 +36,12 @@ end
 function enchanting.on_put(pos, listname, _, stack)
        if listname == "tool" then
                local tools_cat = {
-                       ["tool"] = {"pick", "axe", "shovel"},
-                       ["armor"] = {"chestplate", "leggings", "helmet"},
-                       ["sword"] = {"sword"}, ["boots"] = {"boots"} }
+                       ["tool"] = "pick, axe, shovel",
+                       ["armor"] = "chestplate, leggings, helmet",
+                       ["sword"] = "sword", ["boots"] = "boots" }
 
                for cat, name in pairs(tools_cat) do
-               for _, n in pairs(name) do
+               for n in name:gmatch("[%w_]+") do
                        if stack:get_name():find(n) then
                                enchanting.formspec(pos, cat)
                        end
@@ -56,7 +56,7 @@ function enchanting.fields(pos, _, fields)
        local tool = inv:get_stack("tool", 1)
        local mese = inv:get_stack("mese", 1)
        local orig_wear = tool:get_wear()
-       local mod, name = tool:get_name():match("([%w_]+):([%w_]+)")
+       local mod, name = tool:get_name():match("(.*):(.*)")
        local enchanted_tool = mod..":enchanted_"..name.."_"..next(fields)
 
        if mese:get_count() > 0 and minetest.registered_tools[enchanted_tool] then
@@ -75,9 +75,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:match("enchanted_"..tool) then return true end
        end
        return false
 end
@@ -133,41 +131,41 @@ local function cap(str)
 end
 
  -- Higher number = stronger enchant.
-local use_factor = 1.2
-local times_subtractor = 0.1
-local damage_adder = 1
-local strength_factor = 1.2
-local speed_factor = 0.2
-local jump_factor = 0.2
+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 :
+       --[[ Registration format:
                [Mod name] = {
-                       {materials},
-                       {tool name, tool group, {enchantments}}
+                       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"}}
+               "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"}}
+               "steel, bronze, gold, diamond",
+               {"boots", nil, "strong, speed"},
+               {"chestplate", nil, "strong"},
+               {"helmet", nil, "strong"},
+               {"leggings", nil, "strong"}
        }
 }
 
 for mod, defs in pairs(tools) do
-for _, mat in pairs(defs[1]) do
+for material in defs[1]:gmatch("[%w_]+") do
 for _, tooldef in next, defs, 1 do
-for _, ench in pairs(tooldef[3]) do
-       local tool, group, material, enchant = tooldef[1], tooldef[2], mat, ench
+for enchant in tooldef[3]:gmatch("[%w_]+") do
+       local tool, group = tooldef[1], tooldef[2]
        local original_tool = minetest.registered_tools[mod..":"..tool.."_"..material]
 
        if original_tool then
@@ -180,13 +178,13 @@ for _, ench in pairs(tooldef[3]) do
                        local max_drop_level = original_tool.tool_capabilities.max_drop_level
 
                        if enchant == "durable" then
-                               groupcaps[group].uses = math.ceil(original_groupcaps[group].uses * use_factor)
+                               groupcaps[group].uses = math.ceil(original_groupcaps[group].uses * enchanting.uses)
                        elseif enchant == "fast" then
                                for i = 1, 3 do
-                                       groupcaps[group].times[i] = original_groupcaps[group].times[i] - times_subtractor
+                                       groupcaps[group].times[i] = original_groupcaps[group].times[i] - enchanting.times
                                end
                        elseif enchant == "sharp" then
-                               fleshy = fleshy + damage_adder
+                               fleshy = fleshy + enchanting.damages
                        end
 
                        minetest.register_tool(":"..mod..":enchanted_"..tool.."_"..material.."_"..enchant, {
@@ -205,15 +203,15 @@ for _, ench in pairs(tooldef[3]) do
                        local original_armor_groups = original_tool.groups
                        local armorcaps = table.copy(original_armor_groups)
                        local armorcaps = {}
-                       armorcaps.not_in_creative_inventory=1
+                       armorcaps.not_in_creative_inventory = 1
 
                        for armor_group, value in pairs(original_armor_groups) do
                                if enchant == "strong" then
-                                       armorcaps[armor_group] = math.ceil(value * strength_factor)
+                                       armorcaps[armor_group] = math.ceil(value * enchanting.strength)
                                elseif enchant == "speed" then
                                        armorcaps[armor_group] = value
-                                       armorcaps.physics_speed = speed_factor
-                                       armorcaps.physics_jump = jump_factor
+                                       armorcaps.physics_speed = enchanting.speed
+                                       armorcaps.physics_jump = enchanting.jump
                                end
                        end