ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/skills.h
(Generate patch)

Comparing deliantra/server/include/skills.h (file contents):
Revision 1.13 by pippijn, Mon Jan 15 21:06:19 2007 UTC vs.
Revision 1.14 by root, Mon Apr 30 04:25:30 2007 UTC

32 * The order of this list has no special meaning. 0 is not used 32 * The order of this list has no special meaning. 0 is not used
33 * to denote improperly set objects. 33 * to denote improperly set objects.
34 */ 34 */
35enum { 35enum {
36 SK_NONE = 0, 36 SK_NONE = 0,
37# define def(uc) SK_ ## uc, 37# define def(uc, flags) SK_ ## uc,
38# include "skillinc.h" 38# include "skillinc.h"
39# undef def 39# undef def
40 NUM_SKILLS, 40 NUM_SKILLS,
41};
42
43enum {
44 SF_COMBAT = 0x01, // skill is used only in direct attack combat
45 SF_RANGED = 0x02, // skill is only used for ranged attacks
46 SF_READY = 0x04, // skill can be used but is directionless
47 SF_NEED_WEAPON = 0x10, // skill requires a weapon object
48 SF_NEED_BOW = 0x20, // skill requires a bow object
49 SF_MANA = 0x40, // skill requires a mana-consuming spell
50 SF_GRACE = 0x80, // skill can use a grace-consuming spell
41}; 51};
42 52
43/* This is used in the exp functions - basically what to do if 53/* This is used in the exp functions - basically what to do if
44 * the player doesn't have the skill he should get exp in. 54 * the player doesn't have the skill he should get exp in.
45 */ 55 */
53#define USING_SKILL(op, skill) ((op)->chosen_skill && (op)->chosen_skill->subtype == skill) 63#define USING_SKILL(op, skill) ((op)->chosen_skill && (op)->chosen_skill->subtype == skill)
54 64
55/* This macro is used in fix_player() to define if this is a skill 65/* This macro is used in fix_player() to define if this is a skill
56 * that should be used to calculate wc's and the like. 66 * that should be used to calculate wc's and the like.
57 */ 67 */
58#define IS_COMBAT_SKILL(num) \ 68#define IS_COMBAT_SKILL(num) (skill_flags [num] & SF_COMBAT)
59 ((num==SK_PUNCHING) || (num==SK_FLAME_TOUCH) || (num==SK_KARATE) || \
60 (num==SK_ONE_HANDED_WEAPON) || (num==SK_MISSILE_WEAPON) || \
61 (num==SK_THROWING) || (num==SK_CLAWING) || (num==SK_TWO_HANDED_WEAPON) || \
62 (num==SK_SPARK_TOUCH) || (num==SK_SHIVER) || \
63 (num==SK_ACID_SPLASH) || (num==SK_POISON_NAIL))
64 69
65/* Like IS_COMBAT_SKILL above, but instead this is used to determine 70/* Like IS_COMBAT_SKILL above, but instead this is used to determine
66 * how many mana points the player has. 71 * how many mana points the player has.
67 */ 72 */
68#define IS_MANA_SKILL(num) \ 73#define IS_MANA_SKILL(num) (skill_flags [num] & SF_MANA)
69 ((num==SK_SORCERY) || (num==SK_EVOCATION) || \
70 (num==SK_PYROMANCY) || (num==SK_SUMMONING))
71 74
72/* Currently only one of these, but put the define here to make 75/* Currently only one of these, but put the define here to make
73 * it easier to expand it in the future */ 76 * it easier to expand it in the future */
74#define IS_GRACE_SKILL(num) \ 77#define IS_GRACE_SKILL(num) (skill_flags [num] & SF_GRACE)
75 (num==SK_PRAYING)
76 78
79extern const uint8_t skill_flags[NUM_SKILLS];
77extern shstr skill_names[NUM_SKILLS]; 80extern shstr skill_names[NUM_SKILLS];
78 81
79#endif 82#endif
80 83

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines