From d98a999477698bb0a304c4995df44f2b7ef5389d Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 29 May 2012 06:25:07 +0200
Subject: Lua: Convert all the spell metadata to C code

(Yay automated translation!)
---
 lib/core/s_aux.lua | 251 +++--------------------------------------------------
 1 file changed, 11 insertions(+), 240 deletions(-)

(limited to 'lib/core')

diff --git a/lib/core/s_aux.lua b/lib/core/s_aux.lua
index b0c500a6..9a39df14 100644
--- a/lib/core/s_aux.lua
+++ b/lib/core/s_aux.lua
@@ -3,9 +3,6 @@
 __schools = {}
 __schools_num = 0
 
-__tmp_spells = {}
-__tmp_spells_num = 0
-
 function add_school(s)
 	__schools[__schools_num] = s
 	
@@ -28,74 +25,9 @@ function finish_school(i)
 	new_school(i, s.name, s.skill)
 end
 
-function add_spell(s)
-	__tmp_spells[__tmp_spells_num] = s
-	
-	__tmp_spells_num = __tmp_spells_num + 1
-	return (__tmp_spells_num - 1)
-end
-
-function finish_spell(must_i)
-	local i, s
-	
-	s = __tmp_spells[must_i]
-	assert(s.name, "No spell name!")
-	assert(s.school, "No spell school!")
-	assert(s.level, "No spell level!")
-	assert(s.mana, "No spell mana!")
-	if not s.mana_max then s.mana_max = s.mana end
-	assert(s.fail, "No spell failure rate!")
-	assert(s.spell, "No spell function!")
-	if not s.info then s.info = function() return "" end end
-	assert(s.desc, "No spell desc!")
-	if not s.random then s.random = SKILL_MAGIC end
-	if s.lasting then
-		assert(type(s.lasting) == "function", "Spell lasting is not function")
-	end
-	if s.stick then
-		local k, e
-		for k, e in s.stick do
-			if type(k) == "table" then
-				assert(e.base_level, "Arg no stick base level")
-				assert(e.max_level, "Arg no stick max level")
-			end
-		end
-	end
-
-	i = new_spell(must_i, s.name)
-	assert(i == must_i, "ACK ! i != must_i ! please contact the maintainer")
-	if type(s.school) == "number" then __spell_school[i] = {s.school}
-	else __spell_school[i] = s.school end
-	spell(i).mana = s.mana
-	spell(i).mana_max = s.mana_max
-	spell(i).fail = s.fail
-	spell(i).skill_level = s.level
-	__spell_spell[i] = s.spell
-	__spell_info[i] = s.info
-	local j,desc
-	for j,desc in s.desc do
-		spell_description_add_line(i, desc)
-	end
-	return i
-end
-
 -- Creates the school books array
-__spell_spell = {}
-__spell_info = {}
 __spell_school = {}
 
--- Find a spell by name
-function find_spell(name)
-	local i
-
-	i = 0
-	while (i < __tmp_spells_num) do
-		if __tmp_spells[i].name == name then return i end
-		i = i + 1
-	end
-	return -1
-end
-
 -- Find if the school is under the influence of a god, returns nil or the level
 function get_god_level(sch)
 	if __schools[sch].gods[player.pgod] then
@@ -107,7 +39,7 @@ end
 
 -- Change this fct if I want to switch to learnable spells
 function get_level_school(s, max, min)
-	local lvl, sch, index, num, bonus
+	local lvl, sch, num, bonus
 	local allow_spell_power = TRUE
 
 	lvl = 0
@@ -123,13 +55,18 @@ function get_level_school(s, max, min)
 	end
 
 	-- Do we pass tests?
-	if __tmp_spells[s].depend then
-		if __tmp_spells[s].depend() ~= TRUE then
-			return min, "n/a"
-		end
+	if check_spell_depends(s) ~= TRUE then
+		return min, "n/a"
 	end
 
-	for index, sch in __spell_school[s] do
+        local index = 0
+        while 1 do
+		sch = spell_get_school_idx(s, index)
+                if sch == -1 then
+                   break
+                end
+                index = index + 1
+
 		local r, s, p, ok = 0, 0, 0, 0
 
 		-- Does it require we worship a specific god?
@@ -208,87 +145,6 @@ function get_level(s, max, min)
    return %get_level(s, max, min)
 end
 
--- Can we cast the spell ?
-function is_ok_spell(s, obj)
-	if get_level(s, 50, 0) == 0 then return nil end
-	if __tmp_spells[s].pval and obj.pval < __tmp_spells[s].pval then return nil end
-	return 1
-end
-
--- Get the amount of mana(or power) needed
-function get_mana(s)
-	return spell(s).mana + get_level(s, spell(s).mana_max - spell(s).mana, 0)
-end
-
--- Get spell school name(s) as a /-separated string.
-function spell_school_name(s)
-	local xx, sch_str
-	xx = nil
-	sch_str = ""
-	for index, sch in __spell_school[s] do
-		if xx then
-			sch_str = sch_str.."/"..school(sch).name
-		else
-			xx = 1
-			sch_str = sch_str..school(sch).name
-		end
-	end
-	return sch_str
-end
-
-function check_affect(s, name, default)
-	local s_ptr = __tmp_spells[s]
-	local a
-
-	if type(s_ptr[name]) == "number" then
-		a = s_ptr[name]
-	else
-		a = default
-	end
-	if a == FALSE then
-		return nil
-	else
-		return TRUE
-	end
-end
-
--- Returns the stat to use for the spell, INT by default
-function get_spell_stat(s)
-	if not __tmp_spells[s].stat then return A_INT
-	else return __tmp_spells[s].stat end
-end
-
-
--- Can the spell be randomly found(in random books)
-function can_spell_random(i)
-	return __tmp_spells[i].random
-end
-
--- Find a random spell
-function get_random_spell(typ, level)
-	local spl, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		spl = rand_int(__tmp_spells_num)
-		if (can_spell_random(spl) == typ) and (rand_int(spell(spl).skill_level * 3) < level) then
-			break
-		end
-	end
-	if tries > 0 then
-		return spl
-	else
-		return -1
-	end
-end
-
--- Execute a lasting spell
-function exec_lasting_spell(spl)
-	assert(__tmp_spells[spl].lasting, "No lasting effect for spell "..__tmp_spells[spl].name.." but called as such")
-	return __tmp_spells[spl].lasting()
-end
-
 -- Helper function for spell effect to know if they are or not obvious
 function is_obvious(effect, old)
 	if old then
@@ -301,88 +157,3 @@ function is_obvious(effect, old)
 		return effect
 	end
 end
-
--------------------------Sticks-------------------------
-
--- Fire off the spell
-function activate_stick(spl)
-	local ret = __spell_spell[spl]()
-	local charge, obvious
-	if not ret then
-		charge = FALSE
-		obvious = FALSE
-	else
-		charge = TRUE
-		obvious = ret
-	end
-	return obvious, charge
-end
-
------------------------------------ Wand, Staves, Rods specific functions ----------------------------
-
--- Get a spell for a given stick(wand, staff, rod)
-function get_random_stick(stick, level)
-	local spl, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		spl = rand_int(__tmp_spells_num)
-		if __tmp_spells[spl].stick and (type(__tmp_spells[spl].stick[stick]) == "table") then
-			if (rand_int(spell(spl).skill_level * 3) < level) and (magik(100 - __tmp_spells[spl].stick[stick].rarity) == TRUE) then
-				break
-			end
-		end
-	end
-	if tries > 0 then
-		return spl
-	else
-		return -1
-	end
-end
-
--- Get a random base level
-function get_stick_base_level(stick, level, spl)
-	-- Paranoia
-	if spl < 0 or spl >= __tmp_spells_num or not __tmp_spells[spl].stick[stick] then return 0 end
-
-	local min, max = __tmp_spells[spl].stick[stick].base_level[1], __tmp_spells[spl].stick[stick].base_level[2]
-	local range = max - min;
-
-	-- Ok the basic idea is to have a max possible level of half the dungeon level
-	if range * 2 > level then range = level / 2 end
-
-	-- Randomize a bit
-	range = m_bonus(range, dun_level)
-
-	-- And get the result
-	return min + range
-end
-
--- Get a random max level
-function get_stick_max_level(stick, level, spl)
-	-- Paranoia
-	if spl < 0 or spl >= __tmp_spells_num or not __tmp_spells[spl].stick[stick] then return 0 end
-
-	local min, max = __tmp_spells[spl].stick[stick].max_level[1], __tmp_spells[spl].stick[stick].max_level[2]
-	local range = max - min;
-
-	-- Ok the basic idea is to have a max possible level of half the dungeon level
-	if range * 2 > level then range = level / 2 end
-
-	-- Randomize a bit
-	range = m_bonus(range, dun_level)
-
-	-- And get the result
-	return min + range
-end
-
--- Get the number of desired charges
-function get_stick_charges(spl)
-	return __tmp_spells[spl].stick.charge[1] + randint(__tmp_spells[spl].stick.charge[2]);
-end
-
--- Fire off the spell
-function activate_activation(spl, item)
-	__spell_spell[spl](item)
-end
-- 
cgit v1.2.3