X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=enchanting.lua;h=7c2a3b41e4e64a832d1ab16a8927d34c0478d6db;hb=9dfbe6e8afe3423153142afd1a8ea90cef887cff;hp=bab67d5aaeea330cadddbf6a2e05f9a1db1f77b6;hpb=64c26e2d2529da9327526e04efadc7a47aa045ef;p=xdecor.git diff --git a/enchanting.lua b/enchanting.lua index bab67d5..7c2a3b4 100644 --- a/enchanting.lua +++ b/enchanting.lua @@ -1,89 +1,99 @@ local enchanting = {} -local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots - -function enchanting.tools_fs() - return "size[8,7;]"..xbg.. - "label[0.85,-0.15;Enchant]image[0.6,0.2;2,2;xdecor_enchbook.png]list[current_name;tool;0.5,2;1,1;]list[current_name;mese;1.5,2;1,1;]image[1.5,2;1,1;mese_layout.png]image[3,-0.15;5.7,3.8;ench_ui.png]list[current_player;main;0,3.35;8,4;]".. - "image_button[3.35,0.2;4,0.8;bg_btn.png;fast;Efficiency]image_button[3.35,1.2;4,0.8;bg_btn.png;durable;Durability]" +screwdriver = screwdriver or {} + +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.swords_fs() - return "size[8,7;]"..xbg.. - "label[0.85,-0.15;Enchant]image[0.6,0.2;2,2;xdecor_enchbook.png]list[current_name;tool;0.5,2;1,1;]list[current_name;mese;1.5,2;1,1;]image[1.5,2;1,1;mese_layout.png]image[3,-0.15;5.7,3.8;ench_ui.png]list[current_player;main;0,3.35;8,4;]".. - "image_button[3.35,2.2;4,0.8;bg_btn.png;sharp;Sharpness]" +function enchanting.on_put(pos, listname, _, stack) + if listname == "tool" then + 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.default_fs(pos) - local meta = minetest.get_meta(pos) - local formspec = "size[8,7;]"..xbg.. - "label[0.85,-0.15;Enchant]image[0.6,0.2;2,2;xdecor_enchbook.png]list[current_name;tool;0.5,2;1,1;]list[current_name;mese;1.5,2;1,1;]image[1.5,2;1,1;mese_layout.png]image[3,-0.15;5.7,3.8;ench_ui.png]list[current_player;main;0,3.35;8,4;]" - - 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) +function enchanting.fields(pos, _, fields) + if fields.quit then return end + local inv = minetest.get_meta(pos):get_inventory() + 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.on_put(pos, listname, _, stack, _) - local stn = stack:get_name() - local meta = minetest.get_meta(pos) - - if listname == "tool" then - if stn:find("sword") then - meta:set_string("formspec", enchanting.swords_fs()) - else - meta:set_string("formspec", enchanting.tools_fs()) - end - end +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.is_allowed(toolname) - local tdef = minetest.registered_tools[toolname] - if tdef and toolname:find("default:") and not toolname:find("stone") and not - toolname:find("wood") then - return 1 - else return 0 end +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 -function enchanting.fields(pos, _, fields, _) - local inv = minetest.get_meta(pos):get_inventory() - local toolstack = inv:get_stack("tool", 1) - local mesestack = inv:get_stack("mese", 1) - local toolname = toolstack:get_name() - local toolwear = toolstack:get_wear() - local mese = mesestack:get_count() - local ench = dump(fields):match("%w+") - - if enchanting.is_allowed(toolname) ~= 0 and mese > 0 and - fields[ench] and ench ~= "quit" then - toolstack:replace("xdecor:enchanted_"..toolname:sub(9).."_"..ench) - toolstack:add_wear(toolwear) - mesestack:take_item() - inv:set_stack("mese", 1, mesestack) - inv:set_stack("tool", 1, toolstack) +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 0 end -function enchanting.dig(pos, _) - local inv = minetest.get_meta(pos):get_inventory() - if not inv:is_empty("tool") or not inv:is_empty("mese") then - return false +function enchanting.on_take(pos, listname) + if listname == "tool" then + enchanting.formspec(pos, nil) end - return true end -function enchanting.put(_, listname, _, stack, _) - local toolname = stack:get_name() - local count = stack:get_count() +function enchanting.construct(pos) + local meta = minetest.get_meta(pos) + meta:set_string("infotext", "Enchantment Table") + enchanting.formspec(pos, nil) - if listname == "mese" then - if toolname == "default:mese_crystal" then return count - else return 0 end - end - if listname == "tool" then return enchanting.is_allowed(toolname) end - return count + local inv = meta:get_inventory() + inv:set_size("tool", 1) + inv:set_size("mese", 1) end xdecor.register("enchantment_table", { @@ -93,60 +103,119 @@ xdecor.register("enchantment_table", { "xdecor_enchantment_side.png", "xdecor_enchantment_side.png", "xdecor_enchantment_side.png", "xdecor_enchantment_side.png" }, - groups = {cracky=1}, + 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.default_fs, + 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.default_fs(pos) 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 sharp_factor = 1 - -function enchanting.register_enchtools() - local materials = {"steel", "bronze", "mese", "diamond"} - local tools = { {"axe", "choppy"}, {"pick", "cracky"}, {"shovel", "crumbly"}, {"sword", "fleshy"} } - local chants = {"durable", "fast", "sharp"} - - for _, m in pairs(materials) do - for k, t in pairs(tools) do - for _, c in pairs(chants) do - local original_tool = minetest.registered_tools["default:"..t[1].."_"..m] - 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 - - if c == "durable" and k <= 3 then - groupcaps[t[2]].uses = original_groupcaps[t[2]].uses * use_factor - elseif c == "fast" and k <= 3 then - for i = 1, 3 do - groupcaps[t[2]].times[i] = original_groupcaps[t[2]].times[i] - times_subtractor +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"} + } +} + +for mod, defs in pairs(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] + local original_tool = minetest.registered_tools[mod..":"..tool.."_"..material] + + if original_tool then + if mod == "default" 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 + + if enchant == "durable" then + 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] - enchanting.times + end + elseif enchant == "sharp" then + fleshy = fleshy + enchanting.damages end - elseif c == "sharp" and k == 4 then - fleshy = fleshy + sharp_factor + + minetest.register_tool(":"..mod..":enchanted_"..tool.."_"..material.."_"..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}, + tool_capabilities = { + groupcaps = groupcaps, damage_groups = {fleshy = fleshy}, + full_punch_interval = full_punch_interval, max_drop_level = max_drop_level + } + }) end - minetest.register_tool("xdecor:enchanted_"..t[1].."_"..m.."_"..c, { - description = string.format("Enchanted %s %s (%s)", cap(m), cap(t[1]), cap(c)), - inventory_image = original_tool.inventory_image.."^[colorize:violet:50", - wield_image = original_tool.wield_image, - groups = {not_in_creative_inventory=1}, - tool_capabilities = {groupcaps = groupcaps, damage_groups = {fleshy = fleshy}} - }) - end - end + 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 + + for armor_group, value in pairs(original_armor_groups) do + if enchant == "strong" then + armorcaps[armor_group] = math.ceil(value * enchanting.strength) + elseif enchant == "speed" then + armorcaps[armor_group] = value + armorcaps.physics_speed = enchanting.speed + armorcaps.physics_jump = enchanting.jump + end + end + + minetest.register_tool(":"..mod..":enchanted_"..tool.."_"..material.."_"..enchant, { + 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 end +end +end +end -enchanting.register_enchtools()