1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /* Created July 95 to separate skill utilities from actual skills -b.t. */ |
25 | /* Created July 95 to separate skill utilities from actual skills -b.t. */ |
… | |
… | |
50 | # define def(uc, flags) flags, |
51 | # define def(uc, flags) flags, |
51 | # include "skillinc.h" |
52 | # include "skillinc.h" |
52 | # undef def |
53 | # undef def |
53 | }; |
54 | }; |
54 | |
55 | |
|
|
56 | vector<object_ptr> skillvec; |
|
|
57 | |
55 | 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); |
56 | 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); |
57 | |
60 | |
58 | /* init_skills basically just sets up the skill_names table |
61 | /* init_skills basically just sets up the skill_names table |
59 | * above. The index into the array is set up by the |
62 | * above. The index into the array is set up by the |
60 | * subtypes. |
63 | * subtypes. |
61 | */ |
64 | */ |
62 | void |
65 | void |
63 | init_skills (void) |
66 | init_skills () |
64 | { |
67 | { |
65 | for_all_archetypes (at) |
68 | // nop |
66 | if (at->type == SKILL) |
69 | } |
|
|
70 | |
|
|
71 | void |
|
|
72 | add_skill_archetype (object *o) |
|
|
73 | { |
|
|
74 | assert (("skill name must equal skill skill", o->name == o->skill)); |
|
|
75 | |
|
|
76 | for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i) |
|
|
77 | if ((*i)->name == o->name) |
67 | { |
78 | { |
68 | if (skill_names[at->subtype]) |
79 | // replace existing entry |
69 | LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", |
80 | SKILL_INDEX (o) = i - skillvec.begin (); |
70 | at->subtype, &skill_names[at->subtype], &at->skill); |
81 | *i = o; |
71 | else |
82 | return; |
72 | skill_names[at->subtype] = at->skill; |
|
|
73 | } |
83 | } |
74 | |
84 | |
75 | /* This isn't really an error if there is no skill subtype set, but |
85 | // add new entry |
76 | * checking for this may catch some user errors. |
86 | assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS)); |
77 | */ |
87 | SKILL_INDEX (o) = skillvec.size (); |
78 | for (int i = 1; i < NUM_SKILLS; i++) |
88 | skillvec.push_back (o); |
79 | if (!skill_names[i]) |
|
|
80 | LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); |
|
|
81 | } |
89 | } |
82 | |
90 | |
83 | /* This function goes through the player inventory and sets |
91 | /* This function goes through the player inventory and sets |
84 | * up the last_skills[] array in the player object. |
92 | * up the last_skills[] array in the player object. |
85 | * the last_skills[] is used to more quickly lookup skills - |
93 | * the last_skills[] is used to more quickly lookup skills - |
86 | * mostly used for sending exp. |
94 | * mostly used for sending exp. |
87 | */ |
95 | */ |
88 | void |
96 | void |
89 | player::link_skills () |
97 | player::link_skills () |
90 | { |
98 | { |
91 | for (int i = 0; i < NUM_SKILLS; ++i) |
99 | for (int i = 0; i < CS_NUM_SKILLS; ++i) |
92 | last_skill_ob [i] = 0; |
100 | last_skill_ob [i] = 0; |
93 | |
101 | |
94 | for (object *tmp = ob->inv; tmp; tmp = tmp->below) |
102 | for (object *tmp = ob->inv; tmp; tmp = tmp->below) |
95 | if (tmp->type == SKILL) |
103 | if (tmp->type == SKILL) |
96 | { |
104 | { |
|
|
105 | int idx = SKILL_INDEX (tmp); |
|
|
106 | |
97 | assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS)); |
107 | assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS)); |
98 | |
108 | |
99 | if (last_skill_ob [tmp->subtype] != tmp) |
109 | if (last_skill_ob [idx] != tmp) |
100 | { |
110 | { |
101 | /* This is really a warning, hence no else below */ |
|
|
102 | if (last_skill_ob [tmp->subtype]) |
|
|
103 | LOG (llevError, "Multiple skills with the same subtype? %s, %s\n", |
|
|
104 | &last_skill_ob [tmp->subtype]->skill, &tmp->skill); |
|
|
105 | |
|
|
106 | last_skill_ob [tmp->subtype] = tmp; |
111 | last_skill_ob [idx] = tmp; |
107 | if (ns) |
112 | if (ns) |
108 | ns->last_skill_exp [tmp->subtype] = -1; |
113 | ns->last_skill_exp [idx] = -1; |
109 | } |
114 | } |
110 | } |
115 | } |
111 | } |
116 | } |
112 | |
117 | |
113 | static object * |
118 | static object * |
… | |
… | |
123 | return splay (tmp); |
128 | return splay (tmp); |
124 | |
129 | |
125 | return 0; |
130 | return 0; |
126 | } |
131 | } |
127 | |
132 | |
|
|
133 | object * |
128 | object *player::find_skill (shstr_cmp name) const |
134 | player::find_skill (shstr_cmp name) const |
129 | { |
135 | { |
130 | // might want to use last_skill_obj at one point, or maybe not |
136 | // might want to use last_skill_obj at one point, or maybe not |
131 | return ::find_skill (ob, name); |
137 | return ::find_skill (ob, name); |
132 | } |
138 | } |
133 | |
139 | |
… | |
… | |
161 | |
167 | |
162 | /* Player has a tool to use the skill. If not applied, apply it - |
168 | /* Player has a tool to use the skill. If not applied, apply it - |
163 | * if not successful, return null. If they do have the skill tool |
169 | * if not successful, return null. If they do have the skill tool |
164 | * but not the skill itself, give it to them. |
170 | * but not the skill itself, give it to them. |
165 | */ |
171 | */ |
166 | object *skill = find_skill (who, skill_tool->skill); |
172 | object *skill = who->give_skill (skill_tool->skill); |
167 | |
|
|
168 | if (!skill) |
|
|
169 | skill = give_skill_by_name (who, skill_tool->skill); |
|
|
170 | |
173 | |
171 | if (!skill_tool->flag [FLAG_APPLIED]) |
174 | if (!skill_tool->flag [FLAG_APPLIED]) |
172 | if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY)) |
175 | if (!who->apply (splay (skill_tool))) |
173 | return 0; |
176 | return 0; |
174 | |
177 | |
175 | return splay (skill); |
178 | return splay (skill); |
176 | } |
179 | } |
177 | |
180 | |
178 | object * |
181 | object * |
179 | find_skill_by_name_fuzzy (object *who, const char *name) |
182 | find_skill_by_name_fuzzy (object *who, const char *name) |
180 | { |
183 | { |
181 | if (!name) |
184 | if (name) |
182 | return 0; |
|
|
183 | |
|
|
184 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
185 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
185 | if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) |
186 | if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) |
186 | && tmp->skill.starts_with (name)) |
187 | && tmp->skill.starts_with (name)) |
187 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
188 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
188 | return skop; |
189 | return skop; |
189 | |
190 | |
190 | return 0; |
191 | return 0; |
191 | } |
192 | } |
192 | |
193 | |
193 | /* This returns the skill pointer of the given name (the |
194 | /* This returns the skill pointer of the given name (the |
… | |
… | |
198 | * tool, this code will equip it. |
199 | * tool, this code will equip it. |
199 | * |
200 | * |
200 | * This code is basically the same as find_skill_by_name() above, |
201 | * This code is basically the same as find_skill_by_name() above, |
201 | * but instead a skill name, we search by matching number. |
202 | * but instead a skill name, we search by matching number. |
202 | * this replaces find_skill. |
203 | * this replaces find_skill. |
|
|
204 | * |
|
|
205 | * MUST NOT BE USED IN NEW CODE! (schmorp) |
203 | */ |
206 | */ |
204 | object * |
207 | object * |
205 | find_skill_by_number (object *who, int skillno) |
208 | find_skill_by_number (object *who, int skillno) |
206 | { |
209 | { |
207 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
210 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
… | |
… | |
210 | return skop; |
213 | return skop; |
211 | |
214 | |
212 | return 0; |
215 | return 0; |
213 | } |
216 | } |
214 | |
217 | |
215 | /* This changes the objects chosen_skill to new_skill. |
218 | object * |
216 | * return 1 on success, 0 on error |
219 | object::give_skill (shstr_cmp name, bool can_use) |
217 | */ |
|
|
218 | bool |
|
|
219 | object::change_skill (object *new_skill) |
|
|
220 | { |
220 | { |
221 | if (type != PLAYER) |
221 | object *skill = find_skill (this, name); |
222 | return 0; |
|
|
223 | |
222 | |
224 | // optimise this supposedly common case |
|
|
225 | if (new_skill == chosen_skill) |
|
|
226 | return 1; |
|
|
227 | |
|
|
228 | if (chosen_skill) |
223 | if (!skill) |
229 | { |
224 | skill = give_skill_by_name (this, name); |
230 | chosen_skill->flag [FLAG_APPLIED] = false; |
|
|
231 | change_abil (this, chosen_skill); |
|
|
232 | } |
|
|
233 | |
225 | |
234 | chosen_skill = new_skill; |
226 | if (skill && can_use) |
|
|
227 | skill->flag [FLAG_CAN_USE_SKILL] = true; |
235 | |
228 | |
236 | if (chosen_skill) |
|
|
237 | { |
|
|
238 | chosen_skill->flag [FLAG_APPLIED] = true; |
|
|
239 | change_abil (this, chosen_skill); |
|
|
240 | } |
|
|
241 | |
|
|
242 | // always clear current weapon, as the selected skill could |
|
|
243 | // conflict with the current weapon skill, which would go |
|
|
244 | // undetected and exp would be given to the wrong skill. |
|
|
245 | current_weapon = 0; |
|
|
246 | |
|
|
247 | update_stats (); |
|
|
248 | return 1; |
229 | return skill; |
249 | } |
230 | } |
250 | |
231 | |
251 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
232 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
252 | * We handle all requests for skill use outside of some combat here. |
233 | * We handle all requests for skill use outside of some combat here. |
253 | * We require a separate routine outside of fire() so as to allow monsters |
234 | * We require a separate routine outside of fire() so as to allow monsters |
… | |
… | |
294 | /* Not 100% sure if this will work with new movement code - |
275 | /* Not 100% sure if this will work with new movement code - |
295 | * the levitation skill has move_type for flying, so when |
276 | * the levitation skill has move_type for flying, so when |
296 | * equipped, that should transfer to player, when not, |
277 | * equipped, that should transfer to player, when not, |
297 | * shouldn't. |
278 | * shouldn't. |
298 | */ |
279 | */ |
299 | if (QUERY_FLAG (skill, FLAG_APPLIED)) |
280 | if (skill->flag [FLAG_APPLIED]) |
300 | { |
281 | { |
301 | CLEAR_FLAG (skill, FLAG_APPLIED); |
282 | skill->clr_flag (FLAG_APPLIED); |
302 | new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); |
283 | new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); |
303 | } |
284 | } |
304 | else |
285 | else |
305 | { |
286 | { |
306 | SET_FLAG (skill, FLAG_APPLIED); |
287 | skill->set_flag (FLAG_APPLIED); |
307 | new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); |
288 | new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); |
308 | } |
289 | } |
309 | |
290 | |
310 | op->update_stats (); |
291 | op->update_stats (); |
311 | success = 1; |
292 | success = 1; |
… | |
… | |
401 | |
382 | |
402 | for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) |
383 | for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) |
403 | { |
384 | { |
404 | next = tmp->above; |
385 | next = tmp->above; |
405 | |
386 | |
406 | if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) |
387 | if (tmp->flag [FLAG_IS_CAULDRON]) |
407 | { |
388 | { |
408 | found_cauldron = true; |
389 | found_cauldron = true; |
409 | |
390 | |
410 | if (tmp->skill != skill->skill) |
391 | if (tmp->skill != skill->skill) |
411 | { |
392 | { |
412 | op->failmsg (format ("You can't use the %s with the %s skill!", |
393 | op->failmsgf ("You can't use the %s with the %s skill!", |
413 | query_name (tmp), |
394 | query_name (tmp), |
414 | query_name (skill))); |
395 | query_name (skill)); |
415 | break; |
396 | break; |
416 | } |
397 | } |
417 | |
398 | |
418 | attempt_do_alchemy (op, tmp, skill); |
399 | attempt_do_alchemy (op, tmp, skill); |
419 | |
400 | |
420 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
401 | if (tmp->flag [FLAG_APPLIED]) |
421 | esrv_send_inventory (op, tmp); |
402 | esrv_send_inventory (op, tmp); |
422 | } |
403 | } |
423 | } |
404 | } |
424 | |
405 | |
425 | if (!found_cauldron) |
406 | if (!found_cauldron) |
… | |
… | |
461 | case SK_EVOCATION: |
442 | case SK_EVOCATION: |
462 | case SK_PYROMANCY: |
443 | case SK_PYROMANCY: |
463 | case SK_SUMMONING: |
444 | case SK_SUMMONING: |
464 | case SK_CLIMBING: |
445 | case SK_CLIMBING: |
465 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
446 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
|
|
447 | break; |
|
|
448 | |
|
|
449 | case SK_MINING: |
|
|
450 | success = skill_mining (op, part, skill, dir, string); |
466 | break; |
451 | break; |
467 | |
452 | |
468 | default: |
453 | default: |
469 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
454 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
470 | break; |
455 | break; |
… | |
… | |
546 | } |
531 | } |
547 | else |
532 | else |
548 | { /* all other items/living creatures */ |
533 | { /* all other items/living creatures */ |
549 | op_exp = op->stats.exp; |
534 | op_exp = op->stats.exp; |
550 | op_lvl = op->level; |
535 | op_lvl = op->level; |
551 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
536 | if (!op->flag [FLAG_ALIVE]) |
552 | op_lvl += 5 * abs (op->magic); /* for ident/make items */ |
537 | op_lvl += 5 * abs (op->magic); /* for ident/make items */ |
553 | } |
538 | } |
554 | |
539 | |
555 | if (op_lvl < 1) |
540 | if (op_lvl < 1) |
556 | op_lvl = 1; |
541 | op_lvl = 1; |
… | |
… | |
620 | } |
605 | } |
621 | |
606 | |
622 | object *tmp = find_skill (pl, scroll->skill); |
607 | object *tmp = find_skill (pl, scroll->skill); |
623 | |
608 | |
624 | /* player already knows it */ |
609 | /* player already knows it */ |
625 | if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) |
610 | if (tmp && tmp->flag [FLAG_CAN_USE_SKILL]) |
626 | return 0; |
611 | return 0; |
627 | |
612 | |
628 | /* now a random change to learn, based on player Int. |
613 | /* now a random change to learn, based on player Int. |
629 | * give bonus based on level - otherwise stupid characters |
614 | * give bonus based on level - otherwise stupid characters |
630 | * might never be able to learn anything. |
615 | * might never be able to learn anything. |
… | |
… | |
639 | { |
624 | { |
640 | LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); |
625 | LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); |
641 | return 2; |
626 | return 2; |
642 | } |
627 | } |
643 | |
628 | |
644 | SET_FLAG (tmp, FLAG_CAN_USE_SKILL); |
629 | tmp->set_flag (FLAG_CAN_USE_SKILL); |
645 | |
630 | |
646 | return 1; |
631 | return 1; |
647 | } |
632 | } |
648 | |
633 | |
649 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
634 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
… | |
… | |
715 | * it so it doesn't crash the server - otherwise, one character may |
700 | * it so it doesn't crash the server - otherwise, one character may |
716 | * crash the server numerous times. |
701 | * crash the server numerous times. |
717 | */ |
702 | */ |
718 | if (num_skills_found >= NUM_SKILLS) |
703 | if (num_skills_found >= NUM_SKILLS) |
719 | { |
704 | { |
720 | new_draw_info (NDI_RED, 0, op, "Your character has too many skills."); |
705 | new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills."); |
721 | new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin"); |
706 | new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin"); |
722 | break; |
707 | break; |
723 | } |
708 | } |
724 | } |
709 | } |
725 | } |
710 | } |
726 | |
711 | |
… | |
… | |
759 | |
744 | |
760 | if (!string) |
745 | if (!string) |
761 | return 0; |
746 | return 0; |
762 | |
747 | |
763 | for (skop = op->inv; skop; skop = skop->below) |
748 | for (skop = op->inv; skop; skop = skop->below) |
764 | { |
749 | if ((skop->type == SKILL || skop->type == SKILL_TOOL) |
765 | if (skop->type == SKILL |
|
|
766 | && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) |
|
|
767 | && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) |
750 | && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill)))) |
|
|
751 | { |
|
|
752 | skop = find_skill_by_name (op, skop->skill); |
768 | break; |
753 | break; |
769 | else if (skop->type == SKILL_TOOL |
|
|
770 | && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) |
|
|
771 | break; |
|
|
772 | } |
754 | } |
773 | |
755 | |
774 | if (!skop) |
756 | if (!skop) |
775 | { |
757 | { |
776 | new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); |
758 | op->failmsgf ("Unable to find skill %s.", string); |
|
|
759 | return 0; |
|
|
760 | } |
|
|
761 | |
|
|
762 | if (!(skill_flags [skop->subtype] & SF_USE)) |
|
|
763 | { |
|
|
764 | op->failmsgf ( |
|
|
765 | "You feel as if you wanted to do something funny, but you can't remember what. " |
|
|
766 | "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, " |
|
|
767 | "use it with some item, or it's always active.>", |
|
|
768 | &skop->skill |
|
|
769 | ); |
777 | return 0; |
770 | return 0; |
778 | } |
771 | } |
779 | |
772 | |
780 | len = strlen (skop->skill); |
773 | len = strlen (skop->skill); |
781 | |
774 | |
… | |
… | |
807 | } |
800 | } |
808 | |
801 | |
809 | static bool |
802 | static bool |
810 | hth_skill_p (object *skill) |
803 | hth_skill_p (object *skill) |
811 | { |
804 | { |
812 | return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; |
805 | return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT; |
813 | } |
806 | } |
814 | |
807 | |
815 | /* This finds the first unarmed skill the player has, and returns it. |
808 | /* This finds the first unarmed skill the player has, and returns it. |
816 | */ |
809 | */ |
817 | static object * |
810 | static object * |
818 | find_player_hth_skill (object *op) |
811 | find_player_hth_skill (object *op) |
819 | { |
812 | { |
820 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
813 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
821 | if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) |
814 | if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp)) |
822 | return tmp; |
815 | return tmp; |
823 | |
816 | |
824 | return 0; |
817 | return 0; |
825 | } |
818 | } |
826 | |
819 | |
… | |
… | |
846 | * through that code if skill is set to change to the skill. |
839 | * through that code if skill is set to change to the skill. |
847 | */ |
840 | */ |
848 | if (player *pl = op->contr) |
841 | if (player *pl = op->contr) |
849 | { |
842 | { |
850 | if (skill) |
843 | if (skill) |
851 | op->change_skill (skill); |
844 | { |
|
|
845 | if (!op->apply (skill)) |
|
|
846 | return 0; |
|
|
847 | } |
852 | else |
848 | else |
853 | { |
849 | { |
854 | if (!pl->combat_ob) |
850 | if (!pl->combat_ob) |
855 | { |
851 | { |
856 | if (QUERY_FLAG (op, FLAG_READY_WEAPON)) |
852 | if (op->flag [FLAG_READY_WEAPON]) |
857 | { |
853 | { |
858 | for (tmp = op->inv; tmp; tmp = tmp->below) |
854 | for (tmp = op->inv; tmp; tmp = tmp->below) |
859 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) |
855 | if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED]) |
860 | break; |
856 | break; |
861 | |
857 | |
862 | if (!tmp) |
858 | if (!tmp) |
863 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
859 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
864 | |
860 | |
… | |
… | |
878 | |
874 | |
879 | if (!skill) |
875 | if (!skill) |
880 | new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); |
876 | new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); |
881 | } |
877 | } |
882 | |
878 | |
883 | if (skill) |
879 | op->apply (skill); |
884 | { |
|
|
885 | op->change_skill (0); |
|
|
886 | apply_special (op, skill, AP_APPLY); |
|
|
887 | } |
|
|
888 | } |
880 | } |
889 | |
881 | |
890 | if (!pl->combat_ob) |
882 | if (!pl->combat_ob) |
891 | { |
883 | { |
892 | LOG (llevError, "Could not find anything to attack on %s\n", &op->name); |
884 | LOG (llevError, "Could not find anything to attack on %s\n", &op->name); |
893 | return 0; |
885 | return 0; |
894 | } |
886 | } |
895 | } |
887 | } |
896 | |
888 | |
897 | if (!op->change_weapon (pl->combat_ob)) |
889 | if (!op->apply (pl->combat_ob)) |
898 | return 0; |
890 | return 0; |
|
|
891 | |
|
|
892 | if (!op->chosen_skill) |
|
|
893 | LOG (llevError, "do_skill_attack: weapon has no skill (%s)", pl->combat_ob->debug_desc ()); |
899 | } |
894 | } |
900 | |
895 | |
901 | /* lose invisiblity/hiding status for running attacks */ |
896 | /* lose invisiblity/hiding status for running attacks */ |
902 | if (pl->tmp_invis) |
897 | if (pl->tmp_invis) |
903 | { |
898 | { |
… | |
… | |
910 | |
905 | |
911 | int success = attack_ob (tmp, op); |
906 | int success = attack_ob (tmp, op); |
912 | |
907 | |
913 | /* print appropriate messages to the player */ |
908 | /* print appropriate messages to the player */ |
914 | |
909 | |
915 | if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) |
910 | if (success && string && tmp && !tmp->flag [FLAG_FREED]) |
916 | { |
911 | { |
917 | if (op->type == PLAYER) |
912 | if (op->type == PLAYER) |
918 | new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); |
913 | new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); |
919 | else if (tmp->type == PLAYER) |
914 | else if (tmp->type == PLAYER) |
920 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); |
915 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); |
… | |
… | |
963 | /* space must be blocked for there to be anything interesting to do */ |
958 | /* space must be blocked for there to be anything interesting to do */ |
964 | if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) |
959 | if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) |
965 | return 0; |
960 | return 0; |
966 | |
961 | |
967 | for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) |
962 | for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) |
968 | if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) |
963 | if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR) |
969 | { |
964 | { |
970 | /* Don't attack party members */ |
965 | /* Don't attack party members */ |
971 | if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) |
966 | if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) |
972 | return 0; |
967 | return 0; |
973 | |
968 | |
… | |
… | |
995 | static int |
990 | static int |
996 | attack_hth (object *pl, int dir, const char *string, object *skill) |
991 | attack_hth (object *pl, int dir, const char *string, object *skill) |
997 | { |
992 | { |
998 | object *enemy = NULL, *weapon; |
993 | object *enemy = NULL, *weapon; |
999 | |
994 | |
1000 | if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) |
995 | if (pl->flag [FLAG_READY_WEAPON]) |
1001 | for (weapon = pl->inv; weapon; weapon = weapon->below) |
996 | for (weapon = pl->inv; weapon; weapon = weapon->below) |
1002 | { |
997 | { |
1003 | if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) |
998 | if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED]) |
1004 | { |
999 | { |
1005 | CLEAR_FLAG (weapon, FLAG_APPLIED); |
1000 | weapon->clr_flag (FLAG_APPLIED); |
1006 | CLEAR_FLAG (pl, FLAG_READY_WEAPON); |
1001 | pl->clr_flag (FLAG_READY_WEAPON); |
1007 | pl->update_stats (); |
1002 | pl->update_stats (); |
1008 | if (pl->type == PLAYER) |
1003 | if (pl->type == PLAYER) |
1009 | { |
1004 | { |
1010 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
1005 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
1011 | esrv_update_item (UPD_FLAGS, pl, weapon); |
1006 | esrv_update_item (UPD_FLAGS, pl, weapon); |
… | |
… | |
1029 | */ |
1024 | */ |
1030 | static int |
1025 | static int |
1031 | attack_melee_weapon (object *op, int dir, const char *string, object *skill) |
1026 | attack_melee_weapon (object *op, int dir, const char *string, object *skill) |
1032 | { |
1027 | { |
1033 | |
1028 | |
1034 | if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) |
1029 | if (!op->flag [FLAG_READY_WEAPON]) |
1035 | { |
1030 | { |
1036 | if (op->type == PLAYER) |
1031 | if (op->type == PLAYER) |
1037 | new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); |
1032 | new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); |
1038 | |
1033 | |
1039 | return 0; |
1034 | return 0; |