From 2447ebac2f0bba50c240a8edba151c59118792cc Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Thu, 10 May 2012 19:06:47 +0200
Subject: Lua: Move "Mind" spell functions to C (Theme)

---
 lib/mods/theme/scpt/s_mind.lua | 60 ++++++------------------------------------
 1 file changed, 8 insertions(+), 52 deletions(-)

(limited to 'lib')

diff --git a/lib/mods/theme/scpt/s_mind.lua b/lib/mods/theme/scpt/s_mind.lua
index d1b25e9e..7f24709b 100644
--- a/lib/mods/theme/scpt/s_mind.lua
+++ b/lib/mods/theme/scpt/s_mind.lua
@@ -18,22 +18,8 @@ CHARM = add_spell
 				["max_level"] =		{ 20, 40 },
 			},
 	},
-	["spell"] = 	function()
-			if get_level(CHARM, 50) >= 35 then
-				return project_los(GF_CHARM, 10 + get_level(CHARM, 150))
-			elseif get_level(CHARM, 50) >= 15 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_CHARM, dir, 10 + get_level(CHARM, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_CHARM, dir, 10 + get_level(CHARM, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(CHARM, 150))
-	end,
+	["spell"] = 	function() return mind_charm() end,
+	["info"] = 	function() return mind_charm_info() end,
 	["desc"] =	{
 			"Tries to manipulate the mind of a monster to make it friendly",
 			"At level 15 it turns into a ball",
@@ -59,22 +45,8 @@ CONFUSE = add_spell
 				["max_level"] =		{ 20, 40 },
 			},
 	},
-	["spell"] = 	function()
-			if get_level(CONFUSE, 50) >= 35 then
-				return project_los(GF_OLD_CONF, 10 + get_level(CONFUSE, 150))
-			elseif get_level(CONFUSE, 50) >= 15 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_OLD_CONF, dir, 10 + get_level(CONFUSE, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_OLD_CONF, dir, 10 + get_level(CONFUSE, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(CONFUSE, 150))
-	end,
+	["spell"] = 	function() return mind_confuse() end,
+	["info"] = 	function() return mind_confuse_info() end,
 	["desc"] =	{
 			"Tries to manipulate the mind of a monster to confuse it",
 			"At level 15 it turns into a ball",
@@ -91,12 +63,8 @@ ARMOROFFEAR = add_spell
 	["mana_max"] = 	50,
 	["fail"] = 	35,
 	["inertia"] = 	{ 2, 20 },
-	["spell"] = 	function()
-			return set_shield(randint(10) + 10 + get_level(ARMOROFFEAR, 100), 10, SHIELD_FEAR, 1 + get_level(ARMOROFFEAR, 7), 5 + get_level(ARMOROFFEAR, 20))
-	end,
-	["info"] = 	function()
-			return "dur "..(10 + get_level(ARMOROFFEAR, 100)).." power "..(1 + get_level(ARMOROFFEAR, 7)).."d"..(5 + get_level(ARMOROFFEAR, 20))
-	end,
+	["spell"] = 	function() return mind_armor_of_fear() end,
+	["info"] = 	function() return mind_armor_of_fear_info() end,
 	["desc"] =	{
 			"Creates a shield of pure fear around you. Any monster attempting to hit you",
 			"must save or flee",
@@ -111,20 +79,8 @@ STUN = add_spell
 	["mana"] = 	10,
 	["mana_max"] = 	90,
 	["fail"] = 	45,
-	["spell"] = 	function()
-			if get_level(STUN, 50) >= 20 then
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_ball(GF_STUN, dir, 10 + get_level(STUN, 150), 3)
-			else
-				local ret, dir = get_aim_dir()
-				if ret == FALSE then return end
-				return fire_bolt(GF_STUN, dir, 10 + get_level(STUN, 150))
-			end
-	end,
-	["info"] = 	function()
-			return "power "..(10 + get_level(STUN, 150))
-	end,
+	["spell"] = 	function() return mind_stun() end,
+	["info"] = 	function() return mind_stun_info() end,
 	["desc"] =	{
 			"Tries to manipulate the mind of a monster to stun it",
 			"At level 20 it turns into a ball",
-- 
cgit v1.2.3