X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=enchanting.lua;h=362c6b9d1fa261cf0d2a836408231c1d96263478;hb=4fc0cb1687b517379ad79d1b910dba0e4174db09;hp=a16aac91ee0446f9323eddc08cf535aae9f68365;hpb=a8bb3f83fd0f81aae5f3466d78514dbb143f5c2a;p=xdecor.git

diff --git a/enchanting.lua b/enchanting.lua
index a16aac9..362c6b9 100644
--- a/enchanting.lua
+++ b/enchanting.lua
@@ -1,222 +1,282 @@
 local enchanting = {}
 screwdriver = screwdriver or {}
-local xbg = default.gui_slots..default.get_hotbar_bg(0.5,4.5)
 
-function enchanting.tools_fs()
-	return "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;]"..
-		"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]"
+-- Cost in Mese crystal(s) for enchanting.
+local mese_cost = 1
+
+-- Force of the enchantments.
+enchanting.uses     = 1.2  -- Durability
+enchanting.times    = 0.1  -- Efficiency
+enchanting.damages  = 1    -- Sharpness
+enchanting.strength = 1.2  -- Armor strength (3d_armor only)
+enchanting.speed    = 0.2  -- Player speed (3d_armor only)
+enchanting.jump     = 0.2  -- Player jumping (3d_armor only)
+
+function enchanting.formspec(pos, num)
+	local meta = minetest.get_meta(pos)
+	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 weapon inflicts more damages]
+			tooltip[durable;Your tool last longer]
+			tooltip[fast;Your tool digs faster]
+			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 enchant_buttons = {
+		[[ 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..(enchant_buttons[num] or "")
+	meta:set_string("formspec", formspec)
+end
+
+function enchanting.on_put(pos, listname, _, stack)
+	if listname == "tool" then
+		local stackname = stack:get_name()
+		local tool_groups = {
+			"axe, pick, shovel",
+			"chestplate, leggings, helmet",
+			"sword", "boots"
+		}
+
+		for idx, tools in pairs(tool_groups) do
+			if tools:find(stackname:match(":(%w+)")) then
+				enchanting.formspec(pos, idx)
+			end
+		end
+	end
 end
 
-function enchanting.swords_fs()
-	return "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;]"..
-		"image_button[3.9,2.95;4,0.9;bg_btn.png;sharp;Sharpness]"
+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 or "")..":enchanted_"..(name or "").."_"..next(fields)
+
+	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_cost)
+		inv:set_stack("mese", 1, mese)
+		inv:set_stack("tool", 1, tool)
+	end
 end
 
-function enchanting.armors_fs()
-	return "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;]"..
-		"image_button[3.9,0.9;4,0.9;bg_btn.png;strong;Strength]"
+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.boots_fs()
-	return "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;]"..
-		"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]"
+local function allowed(tool)
+	for item in pairs(minetest.registered_tools) do
+		if item:find("enchanted_"..tool) then return true end
+	end
+	return false
 end
 
-function enchanting.default_fs(pos)
-	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;]"
+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
 
-	meta:set_string("formspec", formspec)
+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
 
-function enchanting.on_put(pos, listname, _, stack, _)
-	local stn = stack:get_name()
-	local meta = minetest.get_meta(pos)
+	minetest.add_entity({x=pos.x, y=pos.y+0.85, z=pos.z}, "xdecor:book_open")
+	local timer = minetest.get_node_timer(pos)
+	timer:start(5.0)
+end
 
-	if listname == "tool" then
-		if stn:find("sword") then
-			meta:set_string("formspec", enchanting.swords_fs())
-		elseif stn:find("pick") or stn:find("axe") or stn:find("shovel") then
-			meta:set_string("formspec", enchanting.tools_fs())
-		elseif stn:find("3d_armor:chestplate") or stn:find("3d_armor:helmet") or
-			stn:find("3d_armor:leggings") then
-			meta:set_string("formspec", enchanting.armors_fs())
-		elseif stn:find("3d_armor:boots") then
-			meta:set_string("formspec", enchanting.boots_fs())
+function enchanting.destruct(pos)
+	for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.9)) do
+		if obj and obj:get_luaentity() and
+				obj:get_luaentity().name == "xdecor:book_open" then
+			obj:remove() break
 		end
 	end
 end
 
-function enchanting.fields(pos, _, fields, _)
-	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
+function enchanting.timer(pos)
+	local node = minetest.get_node(pos)
+	local num = #minetest.get_objects_inside_radius(pos, 0.9)
+
+	if num == 0 then
+		minetest.add_entity({x=pos.x, y=pos.y+0.85, z=pos.z}, "xdecor:book_open")
 	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
+	local minp = {x=pos.x-2, y=pos.y, z=pos.z-2}
+	local maxp = {x=pos.x+2, y=pos.y+1, z=pos.z+2}
+	local bookshelves = minetest.find_nodes_in_area(minp, maxp, "default:bookshelf")
+	if #bookshelves == 0 then return true end
 
-function enchanting.put(_, listname, _, stack, _)
-	local toolstack = stack:get_name()
-	local count = stack:get_count()
+	local bookshelf_pos = bookshelves[math.random(1, #bookshelves)]
+	local x = pos.x - bookshelf_pos.x
+	local y = bookshelf_pos.y - pos.y
+	local z = pos.z - bookshelf_pos.z
 
-	if listname == "mese" and
-		toolstack ~= "default:mese_crystal" then return 0
-	elseif listname == "tool" and not
-		minetest.registered_tools[toolstack] then return 0
+	if tostring(x..z):find(2) then
+		minetest.add_particle({
+			pos = bookshelf_pos,
+			velocity = {x=x, y=2-y, z=z},
+			acceleration = {x=0, y=-2.2, z=0},
+			expirationtime = 1,
+			size = 2,
+			texture = "xdecor_glyph"..math.random(1,18)..".png"
+		})
 	end
-	return count
+	return true
 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"
-	},
-	groups = {cracky=1, oddly_breakable_by_hand=1, level=2},
+	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, level=1},
 	sounds = default.node_sound_stone_defaults(),
 	on_rotate = screwdriver.rotate_simple,
 	can_dig = enchanting.dig,
-	on_construct = enchanting.default_fs,
+	on_timer = enchanting.timer,
+	on_construct = enchanting.construct,
+	on_destruct = enchanting.destruct,
 	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
+	allow_metadata_inventory_move = function() return 0 end
+})
+
+minetest.register_entity("xdecor:book_open", {
+	visual = "sprite",
+	visual_size = {x=0.75, y=0.75},
+	collisionbox = {0},
+	physical = false,
+	textures = {"xdecor_book_open.png"},
+	on_activate = function(self)
+		local pos = self.object:getpos()
+		local pos_under = {x=pos.x, y=pos.y-1, z=pos.z}
+
+		if minetest.get_node(pos_under).name ~= "xdecor:enchantment_table" then
+			self.object:remove()
+		end
 	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
-
-local tools = {
-
-	--[[ 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 _, mat in pairs(defs[1]) 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
-	local original_tool = minetest.registered_tools[mod..":"..tool.."_"..material]
+function enchanting:register_tools(mod, def)
+	for tool in pairs(def.tools) do
+	for material in def.materials:gmatch("[%w_]+") do
+	for enchant in def.tools[tool].enchants:gmatch("[%w_]+") do
+		local original_tool = minetest.registered_tools[mod..":"..tool.."_"..material]
+		if not original_tool then return end
 
-	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
+			local group = next(original_groupcaps)
 
 			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
+				for i, time in pairs(original_groupcaps[group].times) do
+					groupcaps[group].times[i] = time - 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},
-				tool_capabilities = {groupcaps = groupcaps, damage_groups = {fleshy = fleshy}}
+				tool_capabilities = {
+					groupcaps = groupcaps, damage_groups = {fleshy = fleshy},
+					full_punch_interval = full_punch_interval, max_drop_level = max_drop_level
+				}
 			})
 		end
 
 		if mod == "3d_armor" then
-			local original_protect_groups = original_tool.groups
-			local protectcaps = table.copy(original_protect_groups)
-			local protectcaps = {}
-			protectcaps.not_in_creative_inventory=1
-
-			if enchant == "strong" then
-				for protect_group, value in pairs(original_protect_groups) do
-					protectcaps[protect_group] = math.ceil(value * 1.2)
-				end
-			elseif enchant == "speed" then
-				for protect_group, value in pairs(original_protect_groups) do
-					protectcaps[protect_group] = value
-					protectcaps.physics_speed = 0.8
-					protectcaps.physics_jump = 0.3
+			local original_armor_groups = original_tool.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 = 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 = protectcaps,
+				groups = armorcaps,
 				wear = 0
 			})
 		end
 	end
-	minetest.register_alias("xdecor:enchanted_"..tool.."_"..material.."_"..enchant,
-			":"..mod..":enchanted_"..tool.."_"..material.."_"..enchant)
-end
-end
-end
+	end
+	end
 end
 
+enchanting:register_tools("default", {
+	materials = "steel, bronze, mese, diamond",
+	tools = {
+		axe    = {enchants = "durable, fast"},
+		pick   = {enchants = "durable, fast"}, 
+		shovel = {enchants = "durable, fast"},
+		sword  = {enchants = "sharp"}
+	}
+})
+
+enchanting:register_tools("3d_armor", {
+	materials = "steel, bronze, gold, diamond",
+	tools = {
+		boots      = {enchants = "strong, speed"},
+		chestplate = {enchants = "strong"},
+		helmet     = {enchants = "strong"},
+		leggings   = {enchants = "strong"}
+	}
+})
+