From d191f6a204a3f2be75a95e3f7d5cc1328aa57fbe Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 27 Dec 2010 19:51:53 +0100 Subject: unify consts: ability to focus is SKILL_POOL now there were 3 different consts meaning the same. --- db/const.txt | 2 +- db/skill_db.txt | 2 +- npc/functions/magic.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/const.txt b/db/const.txt index d15c9200..ab080511 100644 --- a/db/const.txt +++ b/db/const.txt @@ -210,7 +210,7 @@ BYTE_3_MASK 4278190080 BYTE_3_SHIFT 24 // Skill pools -SKILL_FOCUS 339 +SKILL_POOL 339 SKILL_MALLARDS_EYE 45 SKILL_BRAWLING 350 SKILL_LUCKY_COUNTER 351 diff --git a/db/skill_db.txt b/db/skill_db.txt index 7b36e74e..04ddd472 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -19,7 +19,7 @@ 190, 1, 6, 4, 0, 0, 0, 100, 1, no, 0, 1, 0, none, 0, no, none, X14 //NPC_POISONATTACK 198, 0, 0, 4, 0, 1, 0, 10, 1, no, 0, 2, 0, magic, 0, no, none, X15 //NPC_SUMMONSLAVE 199, 0, 0, 4, 0, 1, 0, 10, 1, no, 0, 2, 0, none, 0, no, none, X16 //NPC_EMOTION -339 0, 0, 0, 0, 0, 0, 3, 0, no, 0, 0, 0, none, 0, no, none, Skill_Pool //TMW_SKILLPOOL +339 0, 0, 0, 0, 0, 0, 3, 0, no, 0, 0, 0, none, 0, no, none, Skill_Pool //SKILL_POOL 340, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Magic //TMW_MAGIC 341, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Life_Magic //TMW_MAGIC_LIFE 342, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, War_Magic //TMW_MAGIC_WAR diff --git a/npc/functions/magic.txt b/npc/functions/magic.txt index 3f9b620b..31baa66c 100644 --- a/npc/functions/magic.txt +++ b/npc/functions/magic.txt @@ -117,7 +117,7 @@ L_Q_post_imp: if (@ignore & @QQ_ASTRALSOUL) goto L_Q_post_astralsoul; - if (!getskillv(SKILL_MAGIC) || !getskillv(SKILL_FOCUS)) + if (!getskillv(SKILL_MAGIC) || !getskillv(SKILL_POOL)) goto L_Q_post_astralsoul; set @choice$[@choices_nr], "...ways to improve my magic?"; set @choice_idx[@choices_nr], @QQ_IMP; -- cgit v1.2.3-60-g2f50