ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/skill_util.C
(Generate patch)

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.79 by root, Sat Nov 7 18:30:06 2009 UTC vs.
Revision 1.109 by root, Sat Nov 17 23:40:04 2018 UTC

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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25/* Created July 95 to separate skill utilities from actual skills -b.t. */ 26/* Created July 95 to separate skill utilities from actual skills -b.t. */
26 27
… …
51# define def(uc, flags) flags, 52# define def(uc, flags) flags,
52# include "skillinc.h" 53# include "skillinc.h"
53# undef def 54# undef def
54}; 55};
55 56
57vector<object_ptr> skillvec;
58
56static int attack_hth (object *pl, int dir, const char *string, object *skill); 59static int attack_hth (object *pl, int dir, const char *string, object *skill);
57static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); 60static int attack_melee_weapon (object *op, int dir, const char *string, object *skill);
58 61
59/* init_skills basically just sets up the skill_names table 62/* init_skills basically just sets up the skill_names table
60 * above. The index into the array is set up by the 63 * above. The index into the array is set up by the
61 * subtypes. 64 * subtypes.
62 */ 65 */
63void 66void
64init_skills (void) 67init_skills ()
65{ 68{
66 for_all_archetypes (at) 69 // nop
67 if (at->type == SKILL) 70}
71
72void
73add_skill_archetype (object *o)
74{
75 assert (("skill name must equal skill skill", o->name == o->skill));
76
77 for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i)
78 if ((*i)->name == o->name)
68 { 79 {
69 if (skill_names[at->subtype]) 80 // replace existing entry
70 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", 81 SKILL_INDEX (o) = i - skillvec.begin ();
71 at->subtype, &skill_names[at->subtype], &at->skill); 82 *i = o;
72 else 83 return;
73 skill_names[at->subtype] = at->skill;
74 } 84 }
75 85
76 /* This isn't really an error if there is no skill subtype set, but 86 // add new entry
77 * checking for this may catch some user errors. 87 assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS));
78 */ 88 SKILL_INDEX (o) = skillvec.size ();
79 for (int i = 1; i < NUM_SKILLS; i++) 89 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} 90}
83 91
84/* This function goes through the player inventory and sets 92/* This function goes through the player inventory and sets
85 * up the last_skills[] array in the player object. 93 * up the last_skills[] array in the player object.
86 * the last_skills[] is used to more quickly lookup skills - 94 * the last_skills[] is used to more quickly lookup skills -
87 * mostly used for sending exp. 95 * mostly used for sending exp.
88 */ 96 */
89void 97void
90player::link_skills () 98player::link_skills ()
91{ 99{
92 for (int i = 0; i < NUM_SKILLS; ++i) 100 for (int i = 0; i < CS_NUM_SKILLS; ++i)
93 last_skill_ob [i] = 0; 101 last_skill_ob [i] = 0;
94 102
95 for (object *tmp = ob->inv; tmp; tmp = tmp->below) 103 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
96 if (tmp->type == SKILL) 104 if (tmp->type == SKILL)
97 { 105 {
106 int idx = SKILL_INDEX (tmp);
107
98 assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS)); 108 assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS));
99 109
100 if (last_skill_ob [tmp->subtype] != tmp) 110 if (last_skill_ob [idx] != tmp)
101 { 111 {
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; 112 last_skill_ob [idx] = tmp;
108 if (ns) 113 if (ns)
109 ns->last_skill_exp [tmp->subtype] = -1; 114 ns->last_skill_exp [idx] = -1;
110 } 115 }
111 } 116 }
112} 117}
113 118
114static object * 119static object *
… …
124 return splay (tmp); 129 return splay (tmp);
125 130
126 return 0; 131 return 0;
127} 132}
128 133
134object *
129object *player::find_skill (shstr_cmp name) const 135player::find_skill (shstr_cmp name) const
130{ 136{
131 // might want to use last_skill_obj at one point, or maybe not 137 // might want to use last_skill_obj at one point, or maybe not
132 return ::find_skill (ob, name); 138 return ::find_skill (ob, name);
133} 139}
134 140
… …
162 168
163 /* Player has a tool to use the skill. If not applied, apply it - 169 /* 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 170 * if not successful, return null. If they do have the skill tool
165 * but not the skill itself, give it to them. 171 * but not the skill itself, give it to them.
166 */ 172 */
167 object *skill = find_skill (who, skill_tool->skill); 173 object *skill = who->give_skill (skill_tool->skill);
168
169 if (!skill)
170 skill = give_skill_by_name (who, skill_tool->skill);
171 174
172 if (!skill_tool->flag [FLAG_APPLIED]) 175 if (!skill_tool->flag [FLAG_APPLIED])
173 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY)) 176 if (!who->apply (splay (skill_tool)))
174 return 0; 177 return 0;
175 178
176 return splay (skill); 179 return splay (skill);
177} 180}
178 181
179object * 182object *
180find_skill_by_name_fuzzy (object *who, const char *name) 183find_skill_by_name_fuzzy (object *who, const char *name)
181{ 184{
182 if (!name) 185 if (name)
183 return 0;
184
185 for (object *tmp = who->inv; tmp; tmp = tmp->below) 186 for (object *tmp = who->inv; tmp; tmp = tmp->below)
186 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) 187 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
187 && tmp->skill.starts_with (name)) 188 && tmp->skill.starts_with (name))
188 if (object *skop = find_skill_by_name (who, tmp->skill)) 189 if (object *skop = find_skill_by_name (who, tmp->skill))
189 return skop; 190 return skop;
190 191
191 return 0; 192 return 0;
192} 193}
193 194
194/* This returns the skill pointer of the given name (the 195/* This returns the skill pointer of the given name (the
195 * one that accumulates exp, has the level, etc). 196 * one that accumulates exp, has the level, etc).
196 * 197 *
197 * It is presumed that the player will be needing to actually 198 * It is presumed that the player will be needing to actually
198 * use the skill, so thus if use of the skill requires a skill 199 * use the skill, so thus if use of the skill requires a skill
199 * tool, this code will equip it. 200 * tool, this code will equip it.
200 * 201 *
201 * This code is basically the same as find_skill_by_name() above, 202 * This code is basically the same as find_skill_by_name() above,
202 * but instead a skill name, we search by matching number. 203 * but instead a skill name, we search by matching number.
203 * this replaces find_skill. 204 * this replaces find_skill.
205 *
206 * MUST NOT BE USED IN NEW CODE! (schmorp)
204 */ 207 */
205object * 208object *
206find_skill_by_number (object *who, int skillno) 209find_skill_by_number (object *who, int skillno)
207{ 210{
208 for (object *tmp = who->inv; tmp; tmp = tmp->below) 211 for (object *tmp = who->inv; tmp; tmp = tmp->below)
… …
211 return skop; 214 return skop;
212 215
213 return 0; 216 return 0;
214} 217}
215 218
216/* This changes the objects chosen_skill to new_skill. 219object *
217 * return 1 on success, 0 on error 220object::give_skill (shstr_cmp name, bool can_use)
218 */
219bool
220object::change_skill (object *new_skill)
221{ 221{
222 if (type != PLAYER) 222 object *skill = find_skill (this, name);
223 return 0;
224 223
225 // optimise this supposedly common case
226 if (new_skill == chosen_skill)
227 return 1;
228
229 if (chosen_skill) 224 if (!skill)
230 { 225 skill = give_skill_by_name (this, name);
231 chosen_skill->flag [FLAG_APPLIED] = false;
232 change_abil (this, chosen_skill);
233 }
234 226
235 chosen_skill = new_skill; 227 if (skill && can_use)
228 skill->flag [FLAG_CAN_USE_SKILL] = true;
236 229
237 if (chosen_skill)
238 {
239 chosen_skill->flag [FLAG_APPLIED] = true;
240 change_abil (this, chosen_skill);
241 }
242
243 // always clear current weapon, as the selected skill could
244 // conflict with the current weapon skill, which would go
245 // undetected and exp would be given to the wrong skill.
246 current_weapon = 0;
247
248 update_stats ();
249 return 1; 230 return skill;
250} 231}
251 232
252/* do_skill() - Main skills use function-similar in scope to cast_spell(). 233/* do_skill() - Main skills use function-similar in scope to cast_spell().
253 * We handle all requests for skill use outside of some combat here. 234 * We handle all requests for skill use outside of some combat here.
254 * We require a separate routine outside of fire() so as to allow monsters 235 * We require a separate routine outside of fire() so as to allow monsters
255 * to utilize skills. Returns 1 on use of skill, otherwise 0. 236 * to utilize skills. Returns 1 on use of skill, otherwise 0.
256 * This is changed (2002-11-30) from the old method that returned 237 * This is changed (2002-11-30) from the old method that returned
257 * exp - no caller needed that info, but it also prevented the callers 238 * exp - no caller needed that info, but it also prevented the callers
258 * from know if a skill was actually used, as many skills don't 239 * from know if a skill was actually used, as many skills don't
259 * give any exp for their direct use (eg, throwing). 240 * give any exp for their direct use (eg, throwing).
… …
295 /* Not 100% sure if this will work with new movement code - 276 /* Not 100% sure if this will work with new movement code -
296 * the levitation skill has move_type for flying, so when 277 * the levitation skill has move_type for flying, so when
297 * equipped, that should transfer to player, when not, 278 * equipped, that should transfer to player, when not,
298 * shouldn't. 279 * shouldn't.
299 */ 280 */
300 if (QUERY_FLAG (skill, FLAG_APPLIED)) 281 if (skill->flag [FLAG_APPLIED])
301 { 282 {
302 CLEAR_FLAG (skill, FLAG_APPLIED); 283 skill->clr_flag (FLAG_APPLIED);
303 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 284 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
304 } 285 }
305 else 286 else
306 { 287 {
307 SET_FLAG (skill, FLAG_APPLIED); 288 skill->set_flag (FLAG_APPLIED);
308 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); 289 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
309 } 290 }
310 291
311 op->update_stats (); 292 op->update_stats ();
312 success = 1; 293 success = 1;
… …
393 case SK_ALCHEMY: 374 case SK_ALCHEMY:
394 case SK_THAUMATURGY: 375 case SK_THAUMATURGY:
395 case SK_LITERACY: 376 case SK_LITERACY:
396 case SK_WOODSMAN: 377 case SK_WOODSMAN:
397 /* first, we try to find a cauldron, and do the alchemy thing. 378 /* first, we try to find a cauldron, and do the alchemy thing.
398 * failing that, we go and identify stuff. 379 * failing that, we go and identify stuff.
399 */ 380 */
400 { 381 {
401 bool found_cauldron = false; 382 bool found_cauldron = false;
402 383
403 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) 384 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
404 { 385 {
405 next = tmp->above; 386 next = tmp->above;
406 387
407 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 388 if (tmp->flag [FLAG_IS_CAULDRON])
408 { 389 {
409 found_cauldron = true; 390 found_cauldron = true;
410 391
411 if (tmp->skill != skill->skill) 392 if (tmp->skill != skill->skill)
412 { 393 {
413 op->failmsg (format ("You can't use the %s with the %s skill!", 394 op->failmsgf ("You can't use the %s with the %s skill!",
414 query_name (tmp), 395 query_name (tmp),
415 query_name (skill))); 396 query_name (skill));
416 break; 397 break;
417 } 398 }
418 399
419 attempt_do_alchemy (op, tmp, skill); 400 attempt_do_alchemy (op, tmp, skill);
420 401
421 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 402 if (tmp->flag [FLAG_APPLIED])
422 esrv_send_inventory (op, tmp); 403 esrv_send_inventory (op, tmp);
423 } 404 }
424 } 405 }
425 406
426 if (!found_cauldron) 407 if (!found_cauldron)
… …
464 case SK_SUMMONING: 445 case SK_SUMMONING:
465 case SK_CLIMBING: 446 case SK_CLIMBING:
466 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 447 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
467 break; 448 break;
468 449
450 case SK_MINING:
451 success = skill_mining (op, part, skill, dir, string);
452 break;
453
469 default: 454 default:
470 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 455 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
471 break; 456 break;
472 } 457 }
473 458
474 /* For players we now update the speed_left from using the skill. 459 /* For players we now update the speed_left from using the skill.
475 * Monsters have no skill use time because of the random nature in 460 * Monsters have no skill use time because of the random nature in
476 * which use_monster_skill is called already simulates this. 461 * which use_monster_skill is called already simulates this.
477 * If certain skills should take more/less time, that should be 462 * If certain skills should take more/less time, that should be
478 * in the code for the skill itself. 463 * in the code for the skill itself.
479 */ 464 */
480 if (op->type == PLAYER) 465 if (op->type == PLAYER)
… …
530 * non-living magic obj, runes and everything else. 515 * non-living magic obj, runes and everything else.
531 * 516 *
532 * If an object is not alive and magical we set the base exp higher to 517 * If an object is not alive and magical we set the base exp higher to
533 * help out exp awards for skill_ident skills. Also, if 518 * help out exp awards for skill_ident skills. Also, if
534 * an item is type RUNE, we give out exp based on stats.Cha 519 * an item is type RUNE, we give out exp based on stats.Cha
535 * and level (this was the old system) -b.t. 520 * and level (this was the old system) -b.t.
536 */ 521 */
537 if (!op) 522 if (!op)
538 { /* no item/creature */ 523 { /* no item/creature */
539 op_lvl = max (1, who->map->difficulty); 524 op_lvl = max (1, who->map->difficulty);
540 op_exp = 0; 525 op_exp = 0;
… …
547 } 532 }
548 else 533 else
549 { /* all other items/living creatures */ 534 { /* all other items/living creatures */
550 op_exp = op->stats.exp; 535 op_exp = op->stats.exp;
551 op_lvl = op->level; 536 op_lvl = op->level;
552 if (!QUERY_FLAG (op, FLAG_ALIVE)) 537 if (!op->flag [FLAG_ALIVE])
553 op_lvl += 5 * abs (op->magic); /* for ident/make items */ 538 op_lvl += 5 * abs (op->magic); /* for ident/make items */
554 } 539 }
555 540
556 if (op_lvl < 1) 541 if (op_lvl < 1)
557 op_lvl = 1; 542 op_lvl = 1;
… …
604} 589}
605 590
606/* Learn skill. This inserts the requested skill in the player's 591/* Learn skill. This inserts the requested skill in the player's
607 * inventory. The skill field of the scroll should have the 592 * inventory. The skill field of the scroll should have the
608 * exact name of the requested skill. 593 * exact name of the requested skill.
609 * This one actually teaches the player the skill as something 594 * This one actually teaches the player the skill as something
610 * they can equip. 595 * they can equip.
611 * Return 0 if the player knows the skill, 1 if the 596 * Return 0 if the player knows the skill, 1 if the
612 * player learns the skill, 2 otherwise. 597 * player learns the skill, 2 otherwise.
613 */ 598 */
614int 599int
… …
621 } 606 }
622 607
623 object *tmp = find_skill (pl, scroll->skill); 608 object *tmp = find_skill (pl, scroll->skill);
624 609
625 /* player already knows it */ 610 /* player already knows it */
626 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 611 if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
627 return 0; 612 return 0;
628 613
629 /* now a random change to learn, based on player Int. 614 /* now a random change to learn, based on player Int.
630 * give bonus based on level - otherwise stupid characters 615 * give bonus based on level - otherwise stupid characters
631 * might never be able to learn anything. 616 * might never be able to learn anything.
… …
640 { 625 {
641 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 626 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
642 return 2; 627 return 2;
643 } 628 }
644 629
645 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 630 tmp->set_flag (FLAG_CAN_USE_SKILL);
646 631
647 return 1; 632 return 1;
648} 633}
649 634
650/* Gives a percentage clipped to 0% -> 100% of a/b. */ 635/* Gives a percentage clipped to 0% -> 100% of a/b. */
… …
663 return 0; 648 return 0;
664 else if (rv > 100) 649 else if (rv > 100)
665 return 100; 650 return 100;
666 651
667 return rv; 652 return rv;
653}
654
655static int
656cmp_skillp (const void *sk1, const void *sk2)
657{
658 return strcmp (&((*(const object **) sk1)->name),
659 &((*(const object **) sk2)->name));
668} 660}
669 661
670/* show_skills() - Meant to allow players to examine 662/* show_skills() - Meant to allow players to examine
671 * their current skill list. 663 * their current skill list.
672 * This shows the amount of exp they have in the skills. 664 * This shows the amount of exp they have in the skills.
673 * we also include some other non skill related info (god, 665 * we also include some other non skill related info (god,
674 * max weapon improvments, item power). 666 * max weapon improvments, item power).
675 * Note this function is a bit more complicated becauase we 667 * Note this function is a bit more complicated because we
676 * we want ot sort the skills before printing them. If we 668 * we want to sort the skills before printing them. If we
677 * just dumped this as we found it, this would be a bit 669 * just dumped this as we found it, this would be a bit
678 * simpler. 670 * simpler.
679 */ 671 */
680//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
681void 672void
682show_skills (object *pl, const char *search) 673show_skills (object *pl, const char *search)
683{ 674{
684 const char *cp; 675 const char *cp;
685 int i, num_skills_found = 0; 676 int i, num_skills_found = 0;
686 const char *const periods = ".............................."; // 30 677 object *skills[CS_NUM_SKILLS];
687
688 /* Need to have a pointer and use strdup for qsort to work properly */
689 char skills[NUM_SKILLS][128]; // d'oh
690
691 object *op = pl->contr->ob; 678 object *op = pl->contr->ob;
692 679
680 /* find the skills */
693 for (object *tmp = op->inv; tmp; tmp = tmp->below) 681 for (object *tmp = op->inv; tmp; tmp = tmp->below)
694 { 682 {
695 if (tmp->type == SKILL) 683 if (tmp->type == SKILL)
696 { 684 {
697 if (search && !tmp->name.contains (search)) 685 if (search && !tmp->name.contains (search))
698 continue; 686 continue;
699 687
700 char buf[30]; 688 skills[num_skills_found++] = tmp;
701
702 /* Basically want to fill this out to 30 spaces with periods */
703 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
704
705 if (settings.permanent_exp_ratio)
706 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
707 buf, tmp->level, tmp->stats.exp,
708 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
709 else
710 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
711 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
712 689
713 /* I don't know why some characters get a bunch of skills, but 690 /* I don't know why some characters get a bunch of skills, but
714 * it sometimes happens (maybe a leftover from bugier earlier code 691 * it sometimes happens (maybe a leftover from bugier earlier code
715 * and those character are still about). In any case, lets handle 692 * and those character are still about). In any case, lets handle
716 * it so it doesn't crash the server - otherwise, one character may 693 * it so it doesn't crash the server - otherwise, one character may
717 * crash the server numerous times. 694 * crash the server numerous times.
718 */ 695 */
719 if (num_skills_found >= NUM_SKILLS) 696 if (num_skills_found >= CS_NUM_SKILLS)
720 { 697 {
721 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills."); 698 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills.");
722 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin"); 699 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
723 break; 700 break;
724 } 701 }
… …
727 704
728 dynbuf_text &msg = msg_dynbuf; msg.clear (); 705 dynbuf_text &msg = msg_dynbuf; msg.clear ();
729 706
730 msg << "T<Player skills:>\n\n"; 707 msg << "T<Player skills:>\n\n";
731 if (num_skills_found > 1) 708 if (num_skills_found > 1)
732 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp); 709 qsort (skills, num_skills_found, sizeof (skills [0]), cmp_skillp);
733 710
711 char buf[31]; /* +1 for '\0' */
712 const char *const periods = ".............................."; // 30
713
734 for (i = 0; i < num_skills_found; i++) 714 for (i = 0; i < num_skills_found; i++) {
735 msg << " C<" << skills [i] << ">\n"; 715 object *tmp = skills[i];
716
717 /* Basically want to fill this out to 30 spaces with periods */
718 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
719
720 msg << " C<";
721
722 if (settings.permanent_exp_ratio)
723 msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
724 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul),
725 clipped_percent (tmp->perm_exp, tmp->stats.exp));
726 else
727 msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
728 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
729
730 msg << ">\n";
731 }
736 732
737 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r"; 733 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
738 734
739 cp = determine_god (op); 735 cp = determine_god (op);
740 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r"; 736 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
… …
744 << ".\n"; 740 << ".\n";
745 741
746 pl->contr->infobox (MSG_CHANNEL ("skills"), msg); 742 pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
747} 743}
748 744
749/* use_skill() - similar to invoke command, it executes the skill in the 745/* use_skill() - similar to invoke command, it executes the skill in the
750 * direction that the user is facing. Returns false if we are unable to 746 * direction that the user is facing. Returns false if we are unable to
751 * change to the requested skill, or were unable to use the skill properly. 747 * change to the requested skill, or were unable to use the skill properly.
752 * This is tricky because skills can have spaces. We basically roll 748 * This is tricky because skills can have spaces. We basically roll
753 * our own find_skill_by_name so we can try to do better string matching. 749 * our own find_skill_by_name so we can try to do better string matching.
754 */ 750 */
755int 751int
756use_skill (object *op, const char *string) 752use_skill (object *op, const char *string)
757{ 753{
… …
760 756
761 if (!string) 757 if (!string)
762 return 0; 758 return 0;
763 759
764 for (skop = op->inv; skop; skop = skop->below) 760 for (skop = op->inv; skop; skop = skop->below)
765 { 761 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
766 if (skop->type == SKILL
767 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
768 && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill)))) 762 && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
763 {
764 skop = find_skill_by_name (op, skop->skill);
769 break; 765 break;
770 else if (skop->type == SKILL_TOOL
771 && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill))))
772 break;
773 } 766 }
774 767
775 if (!skop) 768 if (!skop)
776 { 769 {
777 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 770 op->failmsgf ("Unable to find skill %s.", string);
771 return 0;
772 }
773
774 if (!(skill_flags [skop->subtype] & SF_USE))
775 {
776 op->failmsgf (
777 "You feel as if you wanted to do something funny, but you can't remember what. "
778 "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
779 "use it with some item, or it's always active.>",
780 &skop->skill
781 );
778 return 0; 782 return 0;
779 } 783 }
780 784
781 len = strlen (skop->skill); 785 len = strlen (skop->skill);
782 786
… …
808} 812}
809 813
810static bool 814static bool
811hth_skill_p (object *skill) 815hth_skill_p (object *skill)
812{ 816{
813 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; 817 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT;
814} 818}
815 819
816/* This finds the first unarmed skill the player has, and returns it. 820/* This finds the first unarmed skill the player has, and returns it.
817 */ 821 */
818static object * 822static object *
819find_player_hth_skill (object *op) 823find_player_hth_skill (object *op)
820{ 824{
821 for (object *tmp = op->inv; tmp; tmp = tmp->below) 825 for (object *tmp = op->inv; tmp; tmp = tmp->below)
822 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) 826 if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
823 return tmp; 827 return tmp;
824 828
825 return 0; 829 return 0;
826} 830}
827 831
… …
847 * through that code if skill is set to change to the skill. 851 * through that code if skill is set to change to the skill.
848 */ 852 */
849 if (player *pl = op->contr) 853 if (player *pl = op->contr)
850 { 854 {
851 if (skill) 855 if (skill)
852 op->change_skill (skill); 856 {
857 if (!op->apply (skill))
858 return 0;
859 }
853 else 860 else
854 { 861 {
855 if (!pl->combat_ob) 862 if (!pl->combat_ob)
856 { 863 {
857 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 864 if (op->flag [FLAG_READY_WEAPON])
858 { 865 {
859 for (tmp = op->inv; tmp; tmp = tmp->below) 866 for (tmp = op->inv; tmp; tmp = tmp->below)
860 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) 867 if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
861 break; 868 break;
862 869
863 if (!tmp) 870 if (!tmp)
864 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 871 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
865 872
… …
879 886
880 if (!skill) 887 if (!skill)
881 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 888 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
882 } 889 }
883 890
884 if (skill) 891 op->apply (skill);
885 {
886 op->change_skill (0);
887 apply_special (op, skill, AP_APPLY);
888 }
889 } 892 }
890 893
891 if (!pl->combat_ob) 894 if (!pl->combat_ob)
892 { 895 {
893 LOG (llevError, "Could not find anything to attack on %s\n", &op->name); 896 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
894 return 0; 897 return 0;
895 } 898 }
896 } 899 }
897 900
898 if (!op->change_weapon (pl->combat_ob)) 901 if (!op->apply (pl->combat_ob))
899 return 0; 902 return 0;
903
904 if (!op->chosen_skill)
905 {
906 LOG (llevError, "do_skill_attack: weapon has no skill (%s)", pl->combat_ob->debug_desc ());
907 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "You hit a bug in the server, please contact an admin!");
908 return 0;
909 }
900 } 910 }
901 911
902 /* lose invisiblity/hiding status for running attacks */ 912 /* lose invisiblity/hiding status for running attacks */
903 if (pl->tmp_invis) 913 if (pl->tmp_invis)
904 { 914 {
… …
911 921
912 int success = attack_ob (tmp, op); 922 int success = attack_ob (tmp, op);
913 923
914 /* print appropriate messages to the player */ 924 /* print appropriate messages to the player */
915 925
916 if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 926 if (success && string && tmp && !tmp->flag [FLAG_FREED])
917 { 927 {
918 if (op->type == PLAYER) 928 if (op->type == PLAYER)
919 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 929 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
920 else if (tmp->type == PLAYER) 930 else if (tmp->type == PLAYER)
921 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 931 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
… …
943 int mflags; 953 int mflags;
944 954
945 if (!dir) 955 if (!dir)
946 dir = pl->facing; 956 dir = pl->facing;
947 957
948 tx = freearr_x[dir]; 958 tx = DIRX (dir);
949 ty = freearr_y[dir]; 959 ty = DIRY (dir);
950 960
951 /* If we don't yet have an opponent, find if one exists, and attack. 961 /* If we don't yet have an opponent, find if one exists, and attack.
952 * Legal opponents are the same as outlined in move_player_attack() 962 * Legal opponents are the same as outlined in move_player_attack()
953 */ 963 */
954 if (!tmp) 964 if (!tmp)
955 { 965 {
956 m = pl->map; 966 m = pl->map;
957 tx = pl->x + freearr_x[dir]; 967 tx = pl->x + DIRX (dir);
958 ty = pl->y + freearr_y[dir]; 968 ty = pl->y + DIRY (dir);
959 969
960 mflags = get_map_flags (m, &m, tx, ty, &tx, &ty); 970 mflags = get_map_flags (m, &m, tx, ty, &tx, &ty);
961 if (mflags & P_OUT_OF_MAP) 971 if (mflags & P_OUT_OF_MAP)
962 return 0; 972 return 0;
963 973
964 /* space must be blocked for there to be anything interesting to do */ 974 /* space must be blocked for there to be anything interesting to do */
965 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) 975 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
966 return 0; 976 return 0;
967 977
968 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) 978 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
969 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 979 if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR)
970 { 980 {
971 /* Don't attack party members */ 981 /* Don't attack party members */
972 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 982 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
973 return 0; 983 return 0;
974 984
… …
996static int 1006static int
997attack_hth (object *pl, int dir, const char *string, object *skill) 1007attack_hth (object *pl, int dir, const char *string, object *skill)
998{ 1008{
999 object *enemy = NULL, *weapon; 1009 object *enemy = NULL, *weapon;
1000 1010
1001 if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) 1011 if (pl->flag [FLAG_READY_WEAPON])
1002 for (weapon = pl->inv; weapon; weapon = weapon->below) 1012 for (weapon = pl->inv; weapon; weapon = weapon->below)
1003 { 1013 {
1004 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 1014 if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
1005 { 1015 {
1006 CLEAR_FLAG (weapon, FLAG_APPLIED); 1016 weapon->clr_flag (FLAG_APPLIED);
1007 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 1017 pl->clr_flag (FLAG_READY_WEAPON);
1008 pl->update_stats (); 1018 pl->update_stats ();
1009 if (pl->type == PLAYER) 1019 if (pl->type == PLAYER)
1010 { 1020 {
1011 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 1021 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1012 esrv_update_item (UPD_FLAGS, pl, weapon); 1022 esrv_update_item (UPD_FLAGS, pl, weapon);
… …
1030 */ 1040 */
1031static int 1041static int
1032attack_melee_weapon (object *op, int dir, const char *string, object *skill) 1042attack_melee_weapon (object *op, int dir, const char *string, object *skill)
1033{ 1043{
1034 1044
1035 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 1045 if (!op->flag [FLAG_READY_WEAPON])
1036 { 1046 {
1037 if (op->type == PLAYER) 1047 if (op->type == PLAYER)
1038 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); 1048 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1039 1049
1040 return 0; 1050 return 0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines