diff options
| -rw-r--r-- | lib/mods/theme/scpt/help.lua | 12 | ||||
| -rw-r--r-- | lib/scpt/help.lua | 12 | ||||
| -rw-r--r-- | src/help.c | 17 |
3 files changed, 16 insertions, 25 deletions
diff --git a/lib/mods/theme/scpt/help.lua b/lib/mods/theme/scpt/help.lua index 7ab4871f..1273eab4 100644 --- a/lib/mods/theme/scpt/help.lua +++ b/lib/mods/theme/scpt/help.lua @@ -291,18 +291,6 @@ ingame_help ingame_help { ["hook"] = HOOK_GET, - ["event"] = function(obj, idx) if obj.tval == TV_ROD_MAIN then return TRUE end end, - ["desc"] = - { - "This is a rod. You will need to attach a rod tip to it before you", - "can use it. This main part of the rod may give the rod bonuses", - "like quicker charging time, or a larger capacity for charges.", - } -} - -ingame_help -{ - ["hook"] = HOOK_GET, ["event"] = function(obj, idx) if obj.tval == TV_ROD then return TRUE end end, ["desc"] = { diff --git a/lib/scpt/help.lua b/lib/scpt/help.lua index c6597521..189805fb 100644 --- a/lib/scpt/help.lua +++ b/lib/scpt/help.lua @@ -257,18 +257,6 @@ ingame_help ingame_help { ["hook"] = HOOK_GET, - ["event"] = function(obj, idx) if obj.tval == TV_ROD_MAIN then return TRUE end end, - ["desc"] = - { - "This is a rod. You will need to attach a rod tip to it before you", - "can use it. This main part of the rod may give the rod bonuses", - "like quicker charging time, or a larger capacity for charges.", - } -} - -ingame_help -{ - ["hook"] = HOOK_GET, ["event"] = function(obj, idx) if obj.tval == TV_ROD then return TRUE end end, ["desc"] = { @@ -14,7 +14,7 @@ #include "angband.h" #define DESC_MAX 10 -#define TRIGGERED_HELP_MAX 7 +#define TRIGGERED_HELP_MAX 8 #define HELP_VOID_JUMPGATE 0 #define HELP_FOUNTAIN 1 @@ -23,6 +23,7 @@ #define HELP_FOUND_STAIR 4 #define HELP_GET_ESSENCE 5 #define HELP_GET_RUNE 6 +#define HELP_GET_ROD 7 /** * Struct for help triggered by a boolean condition @@ -80,6 +81,11 @@ static bool_ trigger_get_rune(void *in, void *out) { (g->o_ptr->tval == TV_RUNE2)); } +static bool_ trigger_get_rod(void *in, void *out) { + hook_get_in *g = (hook_get_in *) in; + return (g->o_ptr->tval == TV_ROD_MAIN); +} + /** * Trigger-based help items */ @@ -139,6 +145,15 @@ static triggered_help_type triggered_help[TRIGGERED_HELP_MAX] = "create spells on your own.", NULL } + }, + { HELP_GET_ROD, + HOOK_GET, + trigger_get_rod, + { "This is a rod. You will need to attach a rod tip to it before you", + "can use it. This main part of the rod may give the rod bonuses", + "like quicker charging time, or a larger capacity for charges.", + NULL + } } }; |