From 838246d8d5d9febf38452f82692b25d7dc092ef3 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Apr 2012 15:56:19 +0200 Subject: Lua: Remove add_new_power() Lua function --- lib/core/player.lua | 32 -------------------------------- lib/mods/theme/core/player.lua | 32 -------------------------------- src/lua_bind.c | 27 --------------------------- src/spells.pkg | 31 ------------------------------- 4 files changed, 122 deletions(-) diff --git a/lib/core/player.lua b/lib/core/player.lua index 03e9824f..e194b45a 100644 --- a/lib/core/player.lua +++ b/lib/core/player.lua @@ -60,38 +60,6 @@ function player.get_wild_coord() end end --- Create a new power -__power_fct = {} -function add_power(p) - local i - - assert(p.name, "No power name!") - assert(p.desc, "No power desc!") - assert(p.desc_get, "No power desc get!") - assert(p.desc_lose, "No power desc lose!") - assert(p.stat, "No power stat!") - assert(p.level, "No power level!") - assert(p.cost, "No power cost!") - assert(p.fail, "No power fail!") - assert(p.power, "No power power!") - - i = add_new_power(p.name, p.desc, p.desc_get, p.desc_lose, p.level, p.cost, p.stat, p.fail) - __power_fct[i] = p.power - return i -end - -function __power_fct_activate(power) - if __power_fct[power] then - __power_fct[power]() - return TRUE - else - return FALSE - end -end - --- Register in the hook list -add_hook_script(HOOK_ACTIVATE_POWER, "__power_fct_activate", "__power_fct_activate") - --- Mkeys diff --git a/lib/mods/theme/core/player.lua b/lib/mods/theme/core/player.lua index 03e9824f..e194b45a 100644 --- a/lib/mods/theme/core/player.lua +++ b/lib/mods/theme/core/player.lua @@ -60,38 +60,6 @@ function player.get_wild_coord() end end --- Create a new power -__power_fct = {} -function add_power(p) - local i - - assert(p.name, "No power name!") - assert(p.desc, "No power desc!") - assert(p.desc_get, "No power desc get!") - assert(p.desc_lose, "No power desc lose!") - assert(p.stat, "No power stat!") - assert(p.level, "No power level!") - assert(p.cost, "No power cost!") - assert(p.fail, "No power fail!") - assert(p.power, "No power power!") - - i = add_new_power(p.name, p.desc, p.desc_get, p.desc_lose, p.level, p.cost, p.stat, p.fail) - __power_fct[i] = p.power - return i -end - -function __power_fct_activate(power) - if __power_fct[power] then - __power_fct[power]() - return TRUE - else - return FALSE - end -end - --- Register in the hook list -add_hook_script(HOOK_ACTIVATE_POWER, "__power_fct_activate", "__power_fct_activate") - --- Mkeys diff --git a/src/lua_bind.c b/src/lua_bind.c index df335dd3..fa88a7c1 100644 --- a/src/lua_bind.c +++ b/src/lua_bind.c @@ -77,33 +77,6 @@ void end_object(object_type *o_ptr) FREE(o_ptr, object_type); } -/* - * Powers - */ -s16b add_new_power(cptr name, cptr desc, cptr gain, cptr lose, byte level, byte cost, byte stat, byte diff) -{ - /* Increase the size */ - reinit_powers_type(power_max + 1); - - /* Copy the strings */ - C_MAKE(powers_type[power_max - 1].name, strlen(name) + 1, char); - strcpy(powers_type[power_max - 1].name, name); - C_MAKE(powers_type[power_max - 1].desc_text, strlen(desc) + 1, char); - strcpy(powers_type[power_max - 1].desc_text, desc); - C_MAKE(powers_type[power_max - 1].gain_text, strlen(gain) + 1, char); - strcpy(powers_type[power_max - 1].gain_text, gain); - C_MAKE(powers_type[power_max - 1].lose_text, strlen(lose) + 1, char); - strcpy(powers_type[power_max - 1].lose_text, lose); - - /* Copy the other stuff */ - powers_type[power_max - 1].level = level; - powers_type[power_max - 1].cost = cost; - powers_type[power_max - 1].stat = stat; - powers_type[power_max - 1].diff = diff; - - return (power_max - 1); -} - static char *lua_item_tester_fct; static bool_ lua_item_tester(object_type* o_ptr) { diff --git a/src/spells.pkg b/src/spells.pkg index c972a814..041959d6 100644 --- a/src/spells.pkg +++ b/src/spells.pkg @@ -2163,37 +2163,6 @@ extern magic_power *grab_magic_power @ get_magic_power(magic_power *m_ptr, int n */ extern bool lua_spell_success @ magic_power_sucess(magic_power *spell, int stat, char *oups_fct=NULL); -/** @fn add_new_power(cptr name, cptr desc, cptr gain, cptr lose, byte level, byte cost, byte stat, byte diff) - * @dgonly - * @brief Add a new power to the array of magic powers.\n - * @param name String \n name is the name of the power. - * @brief Name - * @param desc String \n desc is the description of the power. - * @brief Description - * @param gain String \n gain describes the effect when the power starts - * working. - * @brief Gain message - * @param lose String \n loss describes the effect when the power stops - * working. - * @brief Lose message - * @param level Number \n level is the magic skill level a player needs to - * use the power. - * @brief Level - * @param cost Number \n cost is the number of mana points required to use the - * power. - * @brief Mana cost - * @param stat Number \n stat is the required casting statistic (INT or WIS). - * @brief Casting statistic - * @param diff Number \n diff is the difficulty. - * @brief Difficulty - * @return Number \n The index of the new power in the magic power array. - * @note - * Note: do not call this function.\n - * By order of DG. - * @note (see file lua_bind.c) - */ -s16b add_new_power(cptr name, cptr desc, cptr gain, cptr lose, byte level, byte cost, byte stat, byte diff); - /** @var power_max * @brief Number * @note Maximum number of innate powers. -- cgit v1.2.3