--- deliantra/server/include/skills.h 2006/02/03 07:12:50 1.1.1.1 +++ deliantra/server/include/skills.h 2006/09/01 17:16:47 1.7 @@ -72,13 +72,17 @@ #define SK_EVOCATION 35 #define SK_SORCERY 36 #define SK_TWO_HANDED_WEAPON 37 +#define SK_SPARK_TOUCH 38 +#define SK_SHIVER 39 +#define SK_ACID_SPLASH 40 +#define SK_POISON_NAIL 41 /* This is the highest number skill in the table +1 * This is used to store pointers to the actual skills - * to make life easier, we use the value above as index, * eg, SK_EVOCATION (35) will be in last_skills[35]. */ -#define NUM_SKILLS 38 +#define NUM_SKILLS 42 /* This is used in the exp functions - basically what to do if @@ -89,16 +93,19 @@ #define SK_EXP_TOTAL 1 /* Give player exp to total, no skill */ #define SK_EXP_NONE 2 /* Player gets nothing */ #define SK_SUBTRACT_SKILL_EXP 3 /* Used when removing exp */ +#define SK_EXP_SKILL_ONLY 4 /* Player gets only skill experience */ #define USING_SKILL(op, skill) ((op)->chosen_skill && (op)->chosen_skill->subtype == skill) -/* This macro is used in fix_player() to define if this is a sill +/* This macro is used in fix_player() to define if this is a skill * that should be used to calculate wc's and the like. */ #define IS_COMBAT_SKILL(num) \ ((num==SK_PUNCHING) || (num==SK_FLAME_TOUCH) || (num==SK_KARATE) || \ (num==SK_ONE_HANDED_WEAPON) || (num==SK_MISSILE_WEAPON) || \ - (num==SK_THROWING) || (num==SK_CLAWING) || (num==SK_TWO_HANDED_WEAPON)) + (num==SK_THROWING) || (num==SK_CLAWING) || (num==SK_TWO_HANDED_WEAPON) || \ + (num==SK_SPARK_TOUCH) || (num==SK_SHIVER) || \ + (num==SK_ACID_SPLASH) || (num==SK_POISON_NAIL)) /* Like IS_COMBAT_SKILL above, but instead this is used to determine * how many mana points the player has. @@ -133,7 +140,11 @@ SK_CLAWING, SK_FLAME_TOUCH, SK_PUNCHING, --1 +SK_SPARK_TOUCH, +SK_SHIVER, +SK_ACID_SPLASH, +SK_POISON_NAIL, +(uint8)-1 }; /* Just in case one file includes this more than once */