… | |
… | |
51 | # define def(uc, flags) flags, |
51 | # define def(uc, flags) flags, |
52 | # include "skillinc.h" |
52 | # include "skillinc.h" |
53 | # undef def |
53 | # undef def |
54 | }; |
54 | }; |
55 | |
55 | |
|
|
56 | vector<object_ptr> skillvec; |
|
|
57 | |
56 | static int attack_hth (object *pl, int dir, const char *string, object *skill); |
58 | static int attack_hth (object *pl, int dir, const char *string, object *skill); |
57 | static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); |
59 | static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); |
58 | |
60 | |
59 | /* init_skills basically just sets up the skill_names table |
61 | /* init_skills basically just sets up the skill_names table |
60 | * above. The index into the array is set up by the |
62 | * above. The index into the array is set up by the |
61 | * subtypes. |
63 | * subtypes. |
62 | */ |
64 | */ |
63 | void |
65 | void |
64 | init_skills () |
66 | init_skills () |
65 | { |
67 | { |
66 | for_all_archetypes (at) |
68 | // nop |
67 | if (at->type == SKILL) |
69 | } |
|
|
70 | |
|
|
71 | void |
|
|
72 | add_skill_archetype (object *o) |
|
|
73 | { |
|
|
74 | printf ("<%s><%s>\n", &o->name, &o->skill);//D |
|
|
75 | |
|
|
76 | assert (("skill name must equal skill skill", o->name == o->skill)); |
|
|
77 | |
|
|
78 | for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i) |
|
|
79 | if ((*i)->name == o->name) |
68 | { |
80 | { |
69 | if (skill_names[at->subtype]) |
81 | // replace existing entry |
70 | LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", |
82 | SKILL_INDEX (o) = i - skillvec.begin (); |
71 | at->subtype, &skill_names[at->subtype], &at->skill); |
83 | *i = o; |
72 | else |
84 | return; |
73 | skill_names[at->subtype] = at->skill; |
|
|
74 | } |
85 | } |
75 | |
86 | |
76 | /* This isn't really an error if there is no skill subtype set, but |
87 | // add new entry |
77 | * checking for this may catch some user errors. |
88 | assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS)); |
78 | */ |
89 | SKILL_INDEX (o) = skillvec.size (); |
79 | for (int i = 1; i < NUM_SKILLS; i++) |
90 | skillvec.push_back (o); |
80 | if (!skill_names[i]) |
|
|
81 | LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); |
|
|
82 | } |
91 | } |
83 | |
92 | |
84 | /* This function goes through the player inventory and sets |
93 | /* This function goes through the player inventory and sets |
85 | * up the last_skills[] array in the player object. |
94 | * up the last_skills[] array in the player object. |
86 | * the last_skills[] is used to more quickly lookup skills - |
95 | * the last_skills[] is used to more quickly lookup skills - |
87 | * mostly used for sending exp. |
96 | * mostly used for sending exp. |
88 | */ |
97 | */ |
89 | void |
98 | void |
90 | player::link_skills () |
99 | player::link_skills () |
91 | { |
100 | { |
92 | for (int i = 0; i < NUM_SKILLS; ++i) |
101 | for (int i = 0; i < CS_NUM_SKILLS; ++i) |
93 | last_skill_ob [i] = 0; |
102 | last_skill_ob [i] = 0; |
94 | |
103 | |
95 | for (object *tmp = ob->inv; tmp; tmp = tmp->below) |
104 | for (object *tmp = ob->inv; tmp; tmp = tmp->below) |
96 | if (tmp->type == SKILL) |
105 | if (tmp->type == SKILL) |
97 | { |
106 | { |
|
|
107 | int idx = SKILL_INDEX (tmp); |
|
|
108 | |
98 | assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS)); |
109 | assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS)); |
99 | |
110 | |
100 | if (last_skill_ob [tmp->subtype] != tmp) |
111 | if (last_skill_ob [idx] != tmp) |
101 | { |
112 | { |
102 | /* This is really a warning, hence no else below */ |
|
|
103 | if (last_skill_ob [tmp->subtype]) |
|
|
104 | LOG (llevError, "Multiple skills with the same subtype? %s, %s\n", |
|
|
105 | &last_skill_ob [tmp->subtype]->skill, &tmp->skill); |
|
|
106 | |
|
|
107 | last_skill_ob [tmp->subtype] = tmp; |
113 | last_skill_ob [idx] = tmp; |
108 | if (ns) |
114 | if (ns) |
109 | ns->last_skill_exp [tmp->subtype] = -1; |
115 | ns->last_skill_exp [idx] = -1; |
110 | } |
116 | } |
111 | } |
117 | } |
112 | } |
118 | } |
113 | |
119 | |
114 | static object * |
120 | static object * |
… | |
… | |
124 | return splay (tmp); |
130 | return splay (tmp); |
125 | |
131 | |
126 | return 0; |
132 | return 0; |
127 | } |
133 | } |
128 | |
134 | |
|
|
135 | object * |
129 | object *player::find_skill (shstr_cmp name) const |
136 | player::find_skill (shstr_cmp name) const |
130 | { |
137 | { |
131 | // might want to use last_skill_obj at one point, or maybe not |
138 | // might want to use last_skill_obj at one point, or maybe not |
132 | return ::find_skill (ob, name); |
139 | return ::find_skill (ob, name); |
133 | } |
140 | } |
134 | |
141 | |
… | |
… | |
162 | |
169 | |
163 | /* Player has a tool to use the skill. If not applied, apply it - |
170 | /* Player has a tool to use the skill. If not applied, apply it - |
164 | * if not successful, return null. If they do have the skill tool |
171 | * if not successful, return null. If they do have the skill tool |
165 | * but not the skill itself, give it to them. |
172 | * but not the skill itself, give it to them. |
166 | */ |
173 | */ |
167 | object *skill = find_skill (who, skill_tool->skill); |
174 | object *skill = who->give_skill (skill_tool->skill); |
168 | |
|
|
169 | if (!skill) |
|
|
170 | skill = give_skill_by_name (who, skill_tool->skill); |
|
|
171 | |
175 | |
172 | if (!skill_tool->flag [FLAG_APPLIED]) |
176 | if (!skill_tool->flag [FLAG_APPLIED]) |
173 | if (!who->apply (splay (skill_tool))) |
177 | if (!who->apply (splay (skill_tool))) |
174 | return 0; |
178 | return 0; |
175 | |
179 | |
… | |
… | |
197 | * tool, this code will equip it. |
201 | * tool, this code will equip it. |
198 | * |
202 | * |
199 | * This code is basically the same as find_skill_by_name() above, |
203 | * This code is basically the same as find_skill_by_name() above, |
200 | * but instead a skill name, we search by matching number. |
204 | * but instead a skill name, we search by matching number. |
201 | * this replaces find_skill. |
205 | * this replaces find_skill. |
|
|
206 | * |
|
|
207 | * MUST NOT BE USED IN NEW CODE! (schmorp) |
202 | */ |
208 | */ |
203 | object * |
209 | object * |
204 | find_skill_by_number (object *who, int skillno) |
210 | find_skill_by_number (object *who, int skillno) |
205 | { |
211 | { |
206 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
212 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
207 | if (tmp->type == SKILL && tmp->subtype == skillno) |
213 | if (tmp->type == SKILL && tmp->subtype == skillno) |
208 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
214 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
209 | return skop; |
215 | return skop; |
210 | |
216 | |
211 | return 0; |
217 | return 0; |
|
|
218 | } |
|
|
219 | |
|
|
220 | object * |
|
|
221 | object::give_skill (shstr_cmp name, bool can_use) |
|
|
222 | { |
|
|
223 | object *skill = find_skill (this, name); |
|
|
224 | |
|
|
225 | if (!skill) |
|
|
226 | skill = give_skill_by_name (this, name); |
|
|
227 | |
|
|
228 | if (skill && can_use) |
|
|
229 | skill->flag [FLAG_CAN_USE_SKILL] = true; |
|
|
230 | |
|
|
231 | return skill; |
212 | } |
232 | } |
213 | |
233 | |
214 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
234 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
215 | * We handle all requests for skill use outside of some combat here. |
235 | * We handle all requests for skill use outside of some combat here. |
216 | * We require a separate routine outside of fire() so as to allow monsters |
236 | * We require a separate routine outside of fire() so as to allow monsters |
… | |
… | |
257 | /* Not 100% sure if this will work with new movement code - |
277 | /* Not 100% sure if this will work with new movement code - |
258 | * the levitation skill has move_type for flying, so when |
278 | * the levitation skill has move_type for flying, so when |
259 | * equipped, that should transfer to player, when not, |
279 | * equipped, that should transfer to player, when not, |
260 | * shouldn't. |
280 | * shouldn't. |
261 | */ |
281 | */ |
262 | if (QUERY_FLAG (skill, FLAG_APPLIED)) |
282 | if (skill->flag [FLAG_APPLIED]) |
263 | { |
283 | { |
264 | CLEAR_FLAG (skill, FLAG_APPLIED); |
284 | skill->clr_flag (FLAG_APPLIED); |
265 | new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); |
285 | new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); |
266 | } |
286 | } |
267 | else |
287 | else |
268 | { |
288 | { |
269 | SET_FLAG (skill, FLAG_APPLIED); |
289 | skill->set_flag (FLAG_APPLIED); |
270 | new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); |
290 | new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); |
271 | } |
291 | } |
272 | |
292 | |
273 | op->update_stats (); |
293 | op->update_stats (); |
274 | success = 1; |
294 | success = 1; |
… | |
… | |
364 | |
384 | |
365 | for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) |
385 | for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) |
366 | { |
386 | { |
367 | next = tmp->above; |
387 | next = tmp->above; |
368 | |
388 | |
369 | if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) |
389 | if (tmp->flag [FLAG_IS_CAULDRON]) |
370 | { |
390 | { |
371 | found_cauldron = true; |
391 | found_cauldron = true; |
372 | |
392 | |
373 | if (tmp->skill != skill->skill) |
393 | if (tmp->skill != skill->skill) |
374 | { |
394 | { |
… | |
… | |
378 | break; |
398 | break; |
379 | } |
399 | } |
380 | |
400 | |
381 | attempt_do_alchemy (op, tmp, skill); |
401 | attempt_do_alchemy (op, tmp, skill); |
382 | |
402 | |
383 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
403 | if (tmp->flag [FLAG_APPLIED]) |
384 | esrv_send_inventory (op, tmp); |
404 | esrv_send_inventory (op, tmp); |
385 | } |
405 | } |
386 | } |
406 | } |
387 | |
407 | |
388 | if (!found_cauldron) |
408 | if (!found_cauldron) |
… | |
… | |
428 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
448 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
429 | break; |
449 | break; |
430 | |
450 | |
431 | case SK_MINING: |
451 | case SK_MINING: |
432 | success = skill_mining (op, part, skill, dir, string); |
452 | success = skill_mining (op, part, skill, dir, string); |
433 | break; |
|
|
434 | |
|
|
435 | case SK_FISHING: |
|
|
436 | success = skill_fishing (op, part, skill, dir, string); |
|
|
437 | break; |
453 | break; |
438 | |
454 | |
439 | default: |
455 | default: |
440 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
456 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
441 | break; |
457 | break; |
… | |
… | |
517 | } |
533 | } |
518 | else |
534 | else |
519 | { /* all other items/living creatures */ |
535 | { /* all other items/living creatures */ |
520 | op_exp = op->stats.exp; |
536 | op_exp = op->stats.exp; |
521 | op_lvl = op->level; |
537 | op_lvl = op->level; |
522 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
538 | if (!op->flag [FLAG_ALIVE]) |
523 | op_lvl += 5 * abs (op->magic); /* for ident/make items */ |
539 | op_lvl += 5 * abs (op->magic); /* for ident/make items */ |
524 | } |
540 | } |
525 | |
541 | |
526 | if (op_lvl < 1) |
542 | if (op_lvl < 1) |
527 | op_lvl = 1; |
543 | op_lvl = 1; |
… | |
… | |
591 | } |
607 | } |
592 | |
608 | |
593 | object *tmp = find_skill (pl, scroll->skill); |
609 | object *tmp = find_skill (pl, scroll->skill); |
594 | |
610 | |
595 | /* player already knows it */ |
611 | /* player already knows it */ |
596 | if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) |
612 | if (tmp && tmp->flag [FLAG_CAN_USE_SKILL]) |
597 | return 0; |
613 | return 0; |
598 | |
614 | |
599 | /* now a random change to learn, based on player Int. |
615 | /* now a random change to learn, based on player Int. |
600 | * give bonus based on level - otherwise stupid characters |
616 | * give bonus based on level - otherwise stupid characters |
601 | * might never be able to learn anything. |
617 | * might never be able to learn anything. |
… | |
… | |
610 | { |
626 | { |
611 | LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); |
627 | LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); |
612 | return 2; |
628 | return 2; |
613 | } |
629 | } |
614 | |
630 | |
615 | SET_FLAG (tmp, FLAG_CAN_USE_SKILL); |
631 | tmp->set_flag (FLAG_CAN_USE_SKILL); |
616 | |
632 | |
617 | return 1; |
633 | return 1; |
618 | } |
634 | } |
619 | |
635 | |
620 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
636 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
… | |
… | |
795 | */ |
811 | */ |
796 | static object * |
812 | static object * |
797 | find_player_hth_skill (object *op) |
813 | find_player_hth_skill (object *op) |
798 | { |
814 | { |
799 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
815 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
800 | if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) |
816 | if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp)) |
801 | return tmp; |
817 | return tmp; |
802 | |
818 | |
803 | return 0; |
819 | return 0; |
804 | } |
820 | } |
805 | |
821 | |
… | |
… | |
833 | } |
849 | } |
834 | else |
850 | else |
835 | { |
851 | { |
836 | if (!pl->combat_ob) |
852 | if (!pl->combat_ob) |
837 | { |
853 | { |
838 | if (QUERY_FLAG (op, FLAG_READY_WEAPON)) |
854 | if (op->flag [FLAG_READY_WEAPON]) |
839 | { |
855 | { |
840 | for (tmp = op->inv; tmp; tmp = tmp->below) |
856 | for (tmp = op->inv; tmp; tmp = tmp->below) |
841 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) |
857 | if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED]) |
842 | break; |
858 | break; |
843 | |
859 | |
844 | if (!tmp) |
860 | if (!tmp) |
845 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
861 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
846 | |
862 | |
… | |
… | |
888 | |
904 | |
889 | int success = attack_ob (tmp, op); |
905 | int success = attack_ob (tmp, op); |
890 | |
906 | |
891 | /* print appropriate messages to the player */ |
907 | /* print appropriate messages to the player */ |
892 | |
908 | |
893 | if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) |
909 | if (success && string && tmp && !tmp->flag [FLAG_FREED]) |
894 | { |
910 | { |
895 | if (op->type == PLAYER) |
911 | if (op->type == PLAYER) |
896 | new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); |
912 | new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); |
897 | else if (tmp->type == PLAYER) |
913 | else if (tmp->type == PLAYER) |
898 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); |
914 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); |
… | |
… | |
941 | /* space must be blocked for there to be anything interesting to do */ |
957 | /* space must be blocked for there to be anything interesting to do */ |
942 | if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) |
958 | if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) |
943 | return 0; |
959 | return 0; |
944 | |
960 | |
945 | for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) |
961 | for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) |
946 | if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) |
962 | if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR) |
947 | { |
963 | { |
948 | /* Don't attack party members */ |
964 | /* Don't attack party members */ |
949 | if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) |
965 | if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) |
950 | return 0; |
966 | return 0; |
951 | |
967 | |
… | |
… | |
973 | static int |
989 | static int |
974 | attack_hth (object *pl, int dir, const char *string, object *skill) |
990 | attack_hth (object *pl, int dir, const char *string, object *skill) |
975 | { |
991 | { |
976 | object *enemy = NULL, *weapon; |
992 | object *enemy = NULL, *weapon; |
977 | |
993 | |
978 | if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) |
994 | if (pl->flag [FLAG_READY_WEAPON]) |
979 | for (weapon = pl->inv; weapon; weapon = weapon->below) |
995 | for (weapon = pl->inv; weapon; weapon = weapon->below) |
980 | { |
996 | { |
981 | if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) |
997 | if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED]) |
982 | { |
998 | { |
983 | CLEAR_FLAG (weapon, FLAG_APPLIED); |
999 | weapon->clr_flag (FLAG_APPLIED); |
984 | CLEAR_FLAG (pl, FLAG_READY_WEAPON); |
1000 | pl->clr_flag (FLAG_READY_WEAPON); |
985 | pl->update_stats (); |
1001 | pl->update_stats (); |
986 | if (pl->type == PLAYER) |
1002 | if (pl->type == PLAYER) |
987 | { |
1003 | { |
988 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
1004 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
989 | esrv_update_item (UPD_FLAGS, pl, weapon); |
1005 | esrv_update_item (UPD_FLAGS, pl, weapon); |
… | |
… | |
1007 | */ |
1023 | */ |
1008 | static int |
1024 | static int |
1009 | attack_melee_weapon (object *op, int dir, const char *string, object *skill) |
1025 | attack_melee_weapon (object *op, int dir, const char *string, object *skill) |
1010 | { |
1026 | { |
1011 | |
1027 | |
1012 | if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) |
1028 | if (!op->flag [FLAG_READY_WEAPON]) |
1013 | { |
1029 | { |
1014 | if (op->type == PLAYER) |
1030 | if (op->type == PLAYER) |
1015 | new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); |
1031 | new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); |
1016 | |
1032 | |
1017 | return 0; |
1033 | return 0; |