diff options
| -rw-r--r-- | lib/mods/theme/scpt/help.lua | 19 | ||||
| -rw-r--r-- | lib/scpt/help.lua | 19 | ||||
| -rw-r--r-- | src/help.c | 28 |
3 files changed, 27 insertions, 39 deletions
diff --git a/lib/mods/theme/scpt/help.lua b/lib/mods/theme/scpt/help.lua index d827e5dc..d9f637bd 100644 --- a/lib/mods/theme/scpt/help.lua +++ b/lib/mods/theme/scpt/help.lua @@ -221,25 +221,6 @@ ingame_help ingame_help { - ["hook"] = HOOK_IDENTIFY, - ["event"] = function(i, mode) - if mode == "full" then - local obj = get_object(i) - local f1, f2, f3, f4, f5, esp = object_flags(obj) - if band(f5, TR5_SPELL_CONTAIN) ~= 0 then return TRUE end - end - end, - ["desc"] = - { - "Ah, an item that can contain a spell. To use it you must have some levels of", - "Magic skill and then you get the option to copy a spell when pressing m.", - "Then just select which spell to copy and to which object. Note that doing so", - "is permanent; the spell cannot be removed or changed later.", - } -} - -ingame_help -{ ["hook"] = HOOK_RECALC_SKILLS, ["event"] = function() if game.started and (get_melee_skills() > 1) then return TRUE end end, ["desc"] = diff --git a/lib/scpt/help.lua b/lib/scpt/help.lua index bbda148d..0ee307cb 100644 --- a/lib/scpt/help.lua +++ b/lib/scpt/help.lua @@ -187,25 +187,6 @@ ingame_help ingame_help { - ["hook"] = HOOK_IDENTIFY, - ["event"] = function(i, mode) - if mode == "full" then - local obj = get_object(i) - local f1, f2, f3, f4, f5, esp = object_flags(obj) - if band(f5, TR5_SPELL_CONTAIN) ~= 0 then return TRUE end - end - end, - ["desc"] = - { - "Ah, an item that can contain a spell. To use it you must have some levels of", - "Magic skill and then you get the option to copy a spell when pressing m.", - "Then just select which spell to copy and to which object. Note that doing so", - "is permanent; the spell cannot be removed or changed later.", - } -} - -ingame_help -{ ["hook"] = HOOK_RECALC_SKILLS, ["event"] = function() if game.started and (get_melee_skills() > 1) then return TRUE end end, ["desc"] = @@ -14,7 +14,7 @@ #include "angband.h" #define DESC_MAX 14 -#define TRIGGERED_HELP_MAX 16 +#define TRIGGERED_HELP_MAX 17 #define HELP_VOID_JUMPGATE 0 #define HELP_FOUNTAIN 1 @@ -32,6 +32,7 @@ #define HELP_GAME_THEME 13 #define HELP_1ST_LEVEL 14 #define HELP_20TH_LEVEL 15 +#define HELP_ID_SPELL_ITM 16 /** * Struct for help triggered by a boolean condition @@ -132,6 +133,21 @@ static bool_ trigger_20th_level(void *in, void *out) { return (p_ptr->lev >= 20); } +static bool_ trigger_identify_spell_item(void *in_, void *out) { + hook_identify_in *in = (hook_identify_in *) in_; + + if (in->mode == IDENT_FULL) + { + u32b f1, f2, f3, f4, f5, esp; + object_flags(in->o_ptr, &f1, &f2, &f3, &f4, &f5, &esp); + if (f5 & TR5_SPELL_CONTAIN) + { + return TRUE; + } + } + return FALSE; +} + /** * Trigger-based help items */ @@ -296,6 +312,16 @@ static triggered_help_type triggered_help[TRIGGERED_HELP_MAX] = "http://angband.oook.cz/ where it will end up in the ladder.", NULL } + }, + { HELP_ID_SPELL_ITM, + HOOK_IDENTIFY, + trigger_identify_spell_item, + { "Ah, an item that can contain a spell. To use it you must have some levels of", + "Magic skill and then you get the option to copy a spell when pressing m.", + "Then just select which spell to copy and to which object. Note that doing so", + "is permanent; the spell cannot be removed or changed later.", + NULL + } } }; |