From f0ade73b34928a374eb644eedf039811f4d16fa8 Mon Sep 17 00:00:00 2001
From: LeMagnesium <mg.minetest@gmail.com>
Date: Fri, 15 Apr 2016 14:06:30 +0200
Subject: [PATCH] [runes & default] Add charging wand to recharge glyphs

 - ... And also add a missing texture in default
 - Add a charging wand with its texture to recharge runes with a player's mana
   (note: it doesn't check for ownership -yet)
---
 .../default/textures/default_clay_burned.png  | Bin 0 -> 320 bytes
 mods/runes/glyphs.lua                         |  56 +++++++++++++++++-
 mods/runes/textures/runes_recharge_wand.png   | Bin 0 -> 240 bytes
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 minetestforfun_game/mods/default/textures/default_clay_burned.png
 create mode 100644 mods/runes/textures/runes_recharge_wand.png

diff --git a/minetestforfun_game/mods/default/textures/default_clay_burned.png b/minetestforfun_game/mods/default/textures/default_clay_burned.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6a980301bef020424e59129a975ef8633c5487a
GIT binary patch
literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000^P)t-sl5b0s
za7>nRO__8~n|4s0cTk>qQJ;BIp?XrHdsCx)RHlAasDM|gfmo`7S*n9utAt#vg<Y(M
zU#*8=u83i-iDR#dWUz~6v5jc5j%kjmnl}Id0If+xK~xwS1;GJ=gD?mLK#WohyM!35
z_5T0So002!{;sNZqbYM7GBD%mT$Kbnx>O9jRli`t>0L5^V=b2R9oaO*`V*uMt`{7j
zocP8}<CxQPvlOye_!x+M0T&#uFgSfT<b=!^=4ze=t3VgjGV$ne^=Jy&0on<N9sX&%
z$);!Crhr<vKo>(Yv+>+rLsg}6A@dkGy?L%BYXmQK=7efh2=1hAQ!#xSy8Z*L-3!0Z
Sy=k-n0000<MNUMnLSTY)9*5BY

literal 0
HcmV?d00001

diff --git a/mods/runes/glyphs.lua b/mods/runes/glyphs.lua
index 2551658f..40669c00 100644
--- a/mods/runes/glyphs.lua
+++ b/mods/runes/glyphs.lua
@@ -63,6 +63,56 @@ minetest.register_craft({
 	},
 })
 
+minetest.register_craftitem("runes:recharge_wand", {
+	description = "Recharge wand",
+	inventory_image = "runes_recharge_wand.png",
+	on_use = function(itemstack, user, pointed_thing)
+		if not pointed_thing.type == "node" then
+			return
+		end
+
+		local node = minetest.get_node_or_nil(pointed_thing.under)
+		if not node or not minetest.registered_nodes[node.name]
+			or minetest.get_item_group(node.name, "glyph") == 0 then
+			return
+		end
+
+		local meta = minetest.get_meta(pointed_thing.under)
+		local charge = meta:get_int("charge")
+		local rname = node.name:sub(13)
+		local msg = "Rune already charged at maximum capacity"
+
+		if charge < runes.glyphs[rname].max_charge then
+			local pmana = mana.get(user:get_player_name())
+			-- Lower the index of pmana if it is higher than 20 (to simplify calculations)
+			if pmana > 20 then
+				pmana = 20
+			end
+			local delta = runes.glyphs[rname].max_charge - charge
+
+			if delta < pmana then
+				meta:set_int("charge", runes.glyphs[rname].max_charge)
+				mana.subtract(user:get_player_name(), delta)
+				msg = "Rune recharged at maximum capacity"
+			else
+				meta:set_int("charge", charge + pmana)
+				mana.subtract(user:get_player_name(), 20)
+				msg = "Rune recharged"
+			end
+		end				
+		minetest.chat_send_player(user:get_player_name(), msg)
+	end,
+})
+
+minetest.register_craft({
+	output = "runes:recharge_wand",
+	recipe = {
+		{"", "", "default:diamond"},
+		{"", "default:mese_crystal_fragment", ""},
+		{"default:stick", "", ""},
+	},
+})
+
 function register_glyph(name, basics, tab)
 	--[[ Basics can contain :
 		- texture = "runes_glyph_unknown.png",
@@ -73,6 +123,7 @@ function register_glyph(name, basics, tab)
 
 	runes.glyphs[name] = {}
 	runes.glyphs[name].mana_cost = basics.mana_cost or 0
+	runes.glyphs[name].max_charge = basics.maximum_charge or 100
 
 	local def = table.copy(tab)
 	def.groups.glyph = 1
@@ -103,7 +154,8 @@ end
 register_glyph("watchdog", {
 		description = "Watch Dog Glyph",
 		texture = "runes_glyph_watchdog.png",
-		initial_charge = 250,
+		initial_charge = 300,
+		maximum_charge = 300,
 		mana_cost = 10,
 	}, {
 		light_source = 8,
@@ -112,6 +164,7 @@ register_glyph("watchdog", {
 			minetest.get_node_timer(pos):start(0.2)
 		end,
 		on_timer = function(pos, elapsed)
+			local vel = 2
 			local meta = minetest.get_meta(pos)
 			if meta:get_int("charge") <= 0 then
 				minetest.add_particlespawner({
@@ -161,6 +214,7 @@ register_glyph("manasucker", {
 		description = "Mana Sucker Glyph",
 		texture = "runes_glyph_manasucker.png",
 		initial_charge = 100,
+		maximum_charge = 100,
 		mana_cost = 20,
 	}, {
 		groups = {snappy = 1},
diff --git a/mods/runes/textures/runes_recharge_wand.png b/mods/runes/textures/runes_recharge_wand.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e21f4cf173b8e59843df3c61f5f9b64fc213e46
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPN3qO~%!B_6e5TFoGW=KSdbAE1aYF-JD%fPT_-KLp9
zD%I1)F~s8Z(@Bn84F)_c>W_l|#C_DA^!}^<$As2tS(ERvd>3J|E{^;WUUtP`%|G3X
zn~Fq3Z~d1teO{zKL9?MLH9@&FRouX6H^X@w7MC;Y8&>=jG)Ug3eAdH@Z<5RRi@cf3
a{`AgC2~ga5=8j$<$YM`dKbLh*2~7ay(NLNI

literal 0
HcmV?d00001