Lua: Move 'Manwe' spell functions to C

2 files changed, 16 insertions, 136 deletions

diff --git a/lib/mods/theme/scpt/s_manwe.lua b/lib/mods/theme/scpt/s_manwe.lua
index 6f0f9661..189f50ff 100644
--- a/lib/mods/theme/scpt/s_manwe.lua
+++ b/lib/mods/theme/scpt/s_manwe.lua
@@ -12,33 +12,8 @@ MANWE_SHIELD = add_spell
 	["piety"] =     TRUE,
 	["stat"] =      A_WIS,
 	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(MANWE_SHIELD, 50) + 10 + randint(20)
-			local obvious
-
-			obvious = set_protevil(dur)
-			if get_level(MANWE_SHIELD) >= 10 then
-				local type
-
-				type = 0
-				if get_level(MANWE_SHIELD) >= 20 then
-					type = SHIELD_COUNTER
-				end
-				obvious = is_obvious(set_shield(dur, get_level(MANWE_SHIELD, 30), type, 1 + get_level(MANWE_SHIELD, 2), 1 + get_level(MANWE_SHIELD, 6)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			local desc = "dur "..(get_level(MANWE_SHIELD, 50) + 10).."+d20"
-
-			if get_level(MANWE_SHIELD) >= 10 then
-				desc = desc.." AC "..(get_level(MANWE_SHIELD, 30))
-			end
-			if get_level(MANWE_SHIELD) >= 20 then
-				desc = desc.." dam "..(1 + get_level(MANWE_SHIELD, 2)).."d"..(1 + get_level(MANWE_SHIELD, 6))
-			end
-			return desc
-	end,
+	["spell"] = 	function() return manwe_wind_shield() end,
+	["info"] = 	function() return manwe_wind_shield_info() end,
 	["desc"] =	{
 			"It surrounds you with a shield of wind that deflects blows from evil monsters",
 			"At level 10 it increases your armour rating",
@@ -58,12 +33,8 @@ MANWE_AVATAR = add_spell
 	["piety"] =     TRUE,
 	["stat"] =      A_WIS,
 	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return set_mimic(get_level(MANWE_AVATAR, 20) + randint(10), resolve_mimic_name("Maia"), player.lev)
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(MANWE_AVATAR, 20)).."+d10"
-	end,
+	["spell"] = 	function() return manwe_avatar() end,
+	["info"] =      function() return manwe_avatar_info() end,
 	["desc"] =	{
 			"It turns you into a full grown Maia",
 	}
@@ -81,27 +52,8 @@ MANWE_BLESS = add_spell
 	["piety"] =     TRUE,
 	["stat"] =      A_WIS,
 	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(MANWE_BLESS, 70) + 30 + randint(40)
-			local obvious
-
-			obvious = set_blessed(dur)
-			obvious = is_obvious(set_afraid(0), obvious)
-			obvious = is_obvious(set_lite(0), obvious)
-			if get_level(MANWE_BLESS) >= 10 then
-				obvious = is_obvious(set_hero(dur), obvious)
-			end
-			if get_level(MANWE_BLESS) >= 20 then
-				obvious = is_obvious(set_shero(dur), obvious)
-			end
-			if get_level(MANWE_BLESS) >= 30 then
-				obvious = is_obvious(set_holy(dur), obvious)
-			end
-			return obvious
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(MANWE_BLESS, 70) + 30).."+d40"
-	end,
+	["spell"] = 	function() return manwe_blessing() end,
+	["info"] =      function() return manwe_blessing_info() end,
 	["desc"] =	{
 			"Manwe's Blessing removes your fears, blesses you and surrounds you with",
 			"holy light",
@@ -123,20 +75,8 @@ MANWE_CALL = add_spell
 	["piety"] =     TRUE,
 	["stat"] =      A_WIS,
 	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local y, x, m_idx
-
-			y, x = find_position(player.py, player.px)
-			m_idx = place_monster_one(y, x, test_monster_name("Great eagle"), 0, FALSE, MSTATUS_FRIEND)
-
-			if m_idx ~= 0 then
-				monster_set_level(m_idx, 20 + get_level(MANWE_CALL, 70, 0))
-				return TRUE
-			end
-	end,
-	["info"] =      function()
-			return "level "..(get_level(MANWE_CALL, 70) + 20)
-	end,
+	["spell"] = 	function() return manwe_call() end,
+	["info"] =      function() return manwe_call_info() end,
 	["desc"] =	{
 			"Manwe's Call summons a Great Eagle to help you battle the forces",
 			"of Morgoth"
diff --git a/lib/scpt/s_manwe.lua b/lib/scpt/s_manwe.lua
index 6f0f9661..189f50ff 100644
--- a/lib/scpt/s_manwe.lua
+++ b/lib/scpt/s_manwe.lua
@@ -12,33 +12,8 @@ MANWE_SHIELD = add_spell
 	["piety"] =     TRUE,
 	["stat"] =      A_WIS,
 	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(MANWE_SHIELD, 50) + 10 + randint(20)
-			local obvious
-
-			obvious = set_protevil(dur)
-			if get_level(MANWE_SHIELD) >= 10 then
-				local type
-
-				type = 0
-				if get_level(MANWE_SHIELD) >= 20 then
-					type = SHIELD_COUNTER
-				end
-				obvious = is_obvious(set_shield(dur, get_level(MANWE_SHIELD, 30), type, 1 + get_level(MANWE_SHIELD, 2), 1 + get_level(MANWE_SHIELD, 6)), obvious)
-			end
-			return obvious
-	end,
-	["info"] = 	function()
-			local desc = "dur "..(get_level(MANWE_SHIELD, 50) + 10).."+d20"
-
-			if get_level(MANWE_SHIELD) >= 10 then
-				desc = desc.." AC "..(get_level(MANWE_SHIELD, 30))
-			end
-			if get_level(MANWE_SHIELD) >= 20 then
-				desc = desc.." dam "..(1 + get_level(MANWE_SHIELD, 2)).."d"..(1 + get_level(MANWE_SHIELD, 6))
-			end
-			return desc
-	end,
+	["spell"] = 	function() return manwe_wind_shield() end,
+	["info"] = 	function() return manwe_wind_shield_info() end,
 	["desc"] =	{
 			"It surrounds you with a shield of wind that deflects blows from evil monsters",
 			"At level 10 it increases your armour rating",
@@ -58,12 +33,8 @@ MANWE_AVATAR = add_spell
 	["piety"] =     TRUE,
 	["stat"] =      A_WIS,
 	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			return set_mimic(get_level(MANWE_AVATAR, 20) + randint(10), resolve_mimic_name("Maia"), player.lev)
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(MANWE_AVATAR, 20)).."+d10"
-	end,
+	["spell"] = 	function() return manwe_avatar() end,
+	["info"] =      function() return manwe_avatar_info() end,
 	["desc"] =	{
 			"It turns you into a full grown Maia",
 	}
@@ -81,27 +52,8 @@ MANWE_BLESS = add_spell
 	["piety"] =     TRUE,
 	["stat"] =      A_WIS,
 	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local dur = get_level(MANWE_BLESS, 70) + 30 + randint(40)
-			local obvious
-
-			obvious = set_blessed(dur)
-			obvious = is_obvious(set_afraid(0), obvious)
-			obvious = is_obvious(set_lite(0), obvious)
-			if get_level(MANWE_BLESS) >= 10 then
-				obvious = is_obvious(set_hero(dur), obvious)
-			end
-			if get_level(MANWE_BLESS) >= 20 then
-				obvious = is_obvious(set_shero(dur), obvious)
-			end
-			if get_level(MANWE_BLESS) >= 30 then
-				obvious = is_obvious(set_holy(dur), obvious)
-			end
-			return obvious
-	end,
-	["info"] =      function()
-			return "dur "..(get_level(MANWE_BLESS, 70) + 30).."+d40"
-	end,
+	["spell"] = 	function() return manwe_blessing() end,
+	["info"] =      function() return manwe_blessing_info() end,
 	["desc"] =	{
 			"Manwe's Blessing removes your fears, blesses you and surrounds you with",
 			"holy light",
@@ -123,20 +75,8 @@ MANWE_CALL = add_spell
 	["piety"] =     TRUE,
 	["stat"] =      A_WIS,
 	["random"] = 	SKILL_SPIRITUALITY,
-	["spell"] = 	function()
-			local y, x, m_idx
-
-			y, x = find_position(player.py, player.px)
-			m_idx = place_monster_one(y, x, test_monster_name("Great eagle"), 0, FALSE, MSTATUS_FRIEND)
-
-			if m_idx ~= 0 then
-				monster_set_level(m_idx, 20 + get_level(MANWE_CALL, 70, 0))
-				return TRUE
-			end
-	end,
-	["info"] =      function()
-			return "level "..(get_level(MANWE_CALL, 70) + 20)
-	end,
+	["spell"] = 	function() return manwe_call() end,
+	["info"] =      function() return manwe_call_info() end,
 	["desc"] =	{
 			"Manwe's Call summons a Great Eagle to help you battle the forces",
 			"of Morgoth"