]> git.lizzy.rs Git - xdecor.git/blobdiff - enchanting.lua
Fix formspec enchants not triggering when placing 3d_armor elements
[xdecor.git] / enchanting.lua
index 70918260bbb2c91f62e7a04f55e60ed6fb6793c0..c982cc6666c0d0fc372fc4d5966de59084ba3010 100644 (file)
@@ -1,89 +1,99 @@
 local enchanting = {}
 screwdriver = screwdriver or {}
 
-function enchanting.formspec(pos, tooltype)
-       local xbg = default.gui_slots..default.get_hotbar_bg(0.5,4.5)
-       local meta = minetest.get_meta(pos)
-       local formspec = "size[9,9;]"..xbg..
-               "bgcolor[#080808BB;true]background[0,0;9,9;ench_ui.png]list[context;tool;0.9,2.9;1,1;]list[context;mese;2,2.9;1,1;]image[2,2.9;1,1;mese_layout.png]list[current_player;main;0.5,4.5;8,4;]"
-       
-       if tooltype == "sword" then
-               formspec = formspec.."image_button[3.9,2.95;4,0.9;bg_btn.png;sharp;Sharpness]"
-       elseif tooltype == "tool" then
-               formspec = formspec.."image_button[3.9,0.9;4,0.9;bg_btn.png;fast;Efficiency]image_button[3.9,1.82;4,1.1;bg_btn.png;durable;Durability]"
-       elseif tooltype == "armor" then
-               formspec = formspec.."image_button[3.9,0.9;4,0.9;bg_btn.png;strong;Strength]"
-       elseif tooltype == "boots" then
-               formspec = formspec.."image_button[3.9,0.9;4,0.9;bg_btn.png;strong;Strength]image_button[3.9,1.82;4,1.1;bg_btn.png;speed;Speed]"
-       end
-
-       meta:set_string("formspec", formspec)
-       meta:set_string("infotext", "Enchantment Table")
-
-       local inv = meta:get_inventory()
-       inv:set_size("tool", 1)
-       inv:set_size("mese", 1)
-
-       return formspec
+function enchanting.formspec(pos, num)
+       local formspec = [[ size[9,9;]
+                       bgcolor[#080808BB;true]
+                       background[0,0;9,9;ench_ui.png]
+                       list[context;tool;0.9,2.9;1,1;]
+                       list[context;mese;2,2.9;1,1;]
+                       list[current_player;main;0.5,4.5;8,4;]
+                       image[2,2.9;1,1;mese_layout.png]
+                       tooltip[sharp;Your sword inflicts more damage]
+                       tooltip[durable;Your tool is more resistant]
+                       tooltip[fast;Your tool is more powerful]
+                       tooltip[strong;Your armor is more resistant]
+                       tooltip[speed;Your speed is increased] ]]
+                       ..default.gui_slots..default.get_hotbar_bg(0.5,4.5)
+
+       local tool_enchs = {
+               [[ image_button[3.9,0.85;4,0.92;bg_btn.png;fast;Efficiency]
+               image_button[3.9,1.77;4,1.12;bg_btn.png;durable;Durability] ]],
+               "image_button[3.9,0.85;4,0.92;bg_btn.png;strong;Strength]",
+               "image_button[3.9,2.9;4,0.92;bg_btn.png;sharp;Sharpness]",
+               [[ image_button[3.9,0.85;4,0.92;bg_btn.png;strong;Strength]
+               image_button[3.9,1.77;4,1.12;bg_btn.png;speed;Speed] ]] }
+
+       formspec = formspec..(tool_enchs[num] or "")
+       minetest.get_meta(pos):set_string("formspec", formspec)
 end
 
-function enchanting.on_put(pos, listname, _, stack, _)
-       local stn = stack:get_name()
-       local meta = minetest.get_meta(pos)
-
+function enchanting.on_put(pos, listname, _, stack)
        if listname == "tool" then
-               if stn:find("pick") or stn:find("axe") or stn:find("shovel") then
-                       meta:set_string("formspec", enchanting.formspec(pos, "tool"))
-               elseif stn:find("sword") then
-                       meta:set_string("formspec", enchanting.formspec(pos, "sword"))
-               elseif stn:find("chestplate") or stn:find("leggings") or stn:find("helmet") then
-                       meta:set_string("formspec", enchanting.formspec(pos, "armor"))
-               elseif stn:find("boots") then
-                       meta:set_string("formspec", enchanting.formspec(pos, "boots"))
+               for k, v in pairs({"axe, pick, shovel",
+                               "chestplate, leggings, helmet",
+                               "sword", "boots"}) do
+                       if v:match(stack:get_name():match(":(.-)%_")) then
+                               enchanting.formspec(pos, k)
+                       end
                end
        end
 end
 
-function enchanting.fields(pos, _, fields, _)
+function enchanting.fields(pos, _, fields)
+       if fields.quit then return end
        local inv = minetest.get_meta(pos):get_inventory()
-       local toolstack = inv:get_stack("tool", 1)
-       local toolstack_name = toolstack:get_name()
-       local mesestack = inv:get_stack("mese", 1)
-       local modname, toolname = toolstack_name:match("([%w_]+):([%w_]+)")
-       local toolwear = toolstack:get_wear()
-       local mese = mesestack:get_count()
-       local ench = dump(fields):match("%w+")
-       if ench == "quit" then return end
-
-       if mese > 0 and fields[ench] then
-               local enchanted_tool = modname..":enchanted_"..toolname.."_"..ench
-               local tdef = minetest.registered_tools[enchanted_tool]
-
-               if tdef then
-                       toolstack:replace(enchanted_tool)
-                       toolstack:add_wear(toolwear)
-                       mesestack:take_item()
-                       inv:set_stack("mese", 1, mesestack)
-                       inv:set_stack("tool", 1, toolstack)
-               end
+       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("(.*):(.*)")
+       local enchanted_tool = mod..":enchanted_"..name.."_"..next(fields)
+
+       if mese:get_count() > 0 and minetest.registered_tools[enchanted_tool] then
+               tool:replace(enchanted_tool)
+               tool:add_wear(orig_wear)
+               mese:take_item()
+               inv:set_stack("mese", 1, mese)
+               inv:set_stack("tool", 1, tool)
        end
 end
 
-function enchanting.dig(pos, _)
+function enchanting.dig(pos)
        local inv = minetest.get_meta(pos):get_inventory()
        return inv:is_empty("tool") and inv:is_empty("mese")
 end
 
-function enchanting.put(_, listname, _, stack, _)
-       local toolstack = stack:get_name()
-       local count = stack:get_count()
+local function allowed(tool)
+       for item in pairs(minetest.registered_tools) do
+               if item:match("enchanted_"..tool) then return true end
+       end
+       return false
+end
 
-       if listname == "mese" and
-               toolstack ~= "default:mese_crystal" then return 0
-       elseif listname == "tool" and not
-               minetest.registered_tools[toolstack] then return 0
+function enchanting.put(_, listname, _, stack)
+       local item = stack:get_name():match("[^:]+$")
+       if listname == "mese" and item == "mese_crystal" then
+               return stack:get_count()
+       elseif listname == "tool" and allowed(item) then
+               return 1 
        end
-       return count
+       return 0
+end
+
+function enchanting.on_take(pos, listname)
+       if listname == "tool" then
+               enchanting.formspec(pos, nil)
+       end
+end
+
+function enchanting.construct(pos)
+       local meta = minetest.get_meta(pos)
+       meta:set_string("infotext", "Enchantment Table")
+       enchanting.formspec(pos, nil)
+
+       local inv = meta:get_inventory()
+       inv:set_size("tool", 1)
+       inv:set_size("mese", 1)
 end
 
 xdecor.register("enchantment_table", {
@@ -93,56 +103,58 @@ xdecor.register("enchantment_table", {
                "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=2},
+       groups = {cracky=1, oddly_breakable_by_hand=1, level=1},
        sounds = default.node_sound_stone_defaults(),
        on_rotate = screwdriver.rotate_simple,
        can_dig = enchanting.dig,
-       on_construct = enchanting.formspec,
+       on_construct = enchanting.construct,
        on_receive_fields = enchanting.fields,
        on_metadata_inventory_put = enchanting.on_put,
+       on_metadata_inventory_take = enchanting.on_take,
        allow_metadata_inventory_put = enchanting.put,
-       allow_metadata_inventory_move = function(...) return 0 end,
-       on_metadata_inventory_take = function(pos, listname, _, _, _)
-               if listname == "tool" then enchanting.formspec(pos, nil) end
-       end
+       allow_metadata_inventory_move = function() return 0 end
 })
 
-local function cap(str) return str:gsub("^%l", string.upper) end
+local function cap(str)
+       return str:gsub("^%l", string.upper)
+end
 
  -- Higher number = stronger enchant.
-local use_factor = 1.2
-local times_subtractor = 0.1
-local damage_adder = 1
-local strenght_factor = 1.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
@@ -155,17 +167,17 @@ 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, {
-                               description = string.format("Enchanted %s %s (%s)", cap(material), cap(tool), cap(enchant)),
+                               description = "Enchanted "..cap(material).." "..cap(tool).." ("..cap(enchant)..")",
                                inventory_image = original_tool.inventory_image.."^[colorize:violet:50",
                                wield_image = original_tool.wield_image,
                                groups = {not_in_creative_inventory=1},
@@ -180,29 +192,28 @@ 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 * 1.2)
+                                       armorcaps[armor_group] = math.ceil(value * enchanting.strength)
                                elseif enchant == "speed" then
                                        armorcaps[armor_group] = value
-                                       armorcaps.physics_speed = 0.4
-                                       armorcaps.physics_jump = 0.2
+                                       armorcaps.physics_speed = enchanting.speed
+                                       armorcaps.physics_jump = enchanting.jump
                                end
                        end
 
                        minetest.register_tool(":"..mod..":enchanted_"..tool.."_"..material.."_"..enchant, {
-                               description = string.format("Enchanted %s %s (%s)", cap(material), cap(tool), cap(enchant)),
-                               inventory_image = original_tool.inventory_image.."^[colorize:blue:20",
+                               description = "Enchanted "..cap(material).." "..cap(tool).." ("..cap(enchant)..")",
+                               inventory_image = original_tool.inventory_image,
+                               texture = "3d_armor_"..tool.."_"..material,
                                wield_image = original_tool.wield_image,
                                groups = armorcaps,
                                wear = 0
                        })
                end
        end
-       minetest.register_alias("xdecor:enchanted_"..tool.."_"..material.."_"..enchant, mod..":enchanted_"..tool.."_"..material.."_"..enchant)
-       minetest.register_alias(":"..mod..":enchanted_"..tool.."_"..material.."_"..enchant, mod..":enchanted_"..tool.."_"..material.."_"..enchant)
 end
 end
 end