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.44 by root, Sat May 12 16:06:42 2007 UTC vs.
Revision 1.73 by root, Thu Jan 1 19:42:43 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copryight (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* Created July 95 to separate skill utilities from actual skills -b.t. */ 24/* Created July 95 to separate skill utilities from actual skills -b.t. */
26 25
27/* Reconfigured skills code to allow linking of skills to experience 26/* Reconfigured skills code to allow linking of skills to experience
… …
61 * subtypes. 60 * subtypes.
62 */ 61 */
63void 62void
64init_skills (void) 63init_skills (void)
65{ 64{
66 for (archetype *at = first_archetype; at; at = at->next) 65 for_all_archetypes (at)
67 if (at->clone.type == SKILL) 66 if (at->type == SKILL)
68 { 67 {
69 if (skill_names[at->clone.subtype]) 68 if (skill_names[at->subtype])
70 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", 69 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",
71 at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill); 70 at->subtype, &skill_names[at->subtype], &at->skill);
72 else 71 else
73 skill_names[at->clone.subtype] = at->clone.skill; 72 skill_names[at->subtype] = at->skill;
74 } 73 }
75 74
76 /* This isn't really an error if there is no skill subtype set, but 75 /* This isn't really an error if there is no skill subtype set, but
77 * checking for this may catch some user errors. 76 * checking for this may catch some user errors.
78 */ 77 */
… …
85 * up the last_skills[] array in the player object. 84 * up the last_skills[] array in the player object.
86 * the last_skills[] is used to more quickly lookup skills - 85 * the last_skills[] is used to more quickly lookup skills -
87 * mostly used for sending exp. 86 * mostly used for sending exp.
88 */ 87 */
89void 88void
90link_player_skills (object *op) 89player::link_skills ()
91{ 90{
91 for (int i = 0; i < NUM_SKILLS; ++i)
92 last_skill_ob [i] = 0;
93
92 for (object *tmp = op->inv; tmp; tmp = tmp->below) 94 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
93 if (tmp->type == SKILL) 95 if (tmp->type == SKILL)
94 { 96 {
95 /* This is really a warning, hence no else below */ 97 assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS));
96 if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp)
97 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
98 &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill);
99 98
100 if (tmp->subtype >= NUM_SKILLS) 99 if (last_skill_ob [tmp->subtype] != tmp)
101 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);
102 else
103 { 100 {
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
104 op->contr->last_skill_ob[tmp->subtype] = tmp; 106 last_skill_ob [tmp->subtype] = tmp;
105 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go 107 if (ns)
108 ns->last_skill_exp [tmp->subtype] = -1;
106 } 109 }
107 } 110 }
108} 111}
109 112
113static object *
114find_skill (object *who, shstr_cmp name)
115{
116 if (who->chosen_skill
117 && who->chosen_skill->skill == name
118 && who->chosen_skill->type == SKILL)
119 return who->chosen_skill;
120
121 for (object *tmp = who->inv; tmp; tmp = tmp->below)
122 if (tmp->skill == name && tmp->type == SKILL)
123 return splay (tmp);
124
125 return 0;
126}
127
128object *player::find_skill (shstr_cmp name) const
129{
130 // might want to use last_skill_obj at one point, or maybe not
131 return ::find_skill (ob, name);
132}
133
110/* This returns the skill pointer of the given name (the 134/* This returns the skill pointer of the given name (the
111 * one that accumlates exp, has the level, etc). 135 * one that accumulates exp, has the level, etc).
112 * 136 *
113 * It is presumed that the player will be needing to actually 137 * It is presumed that the player will be needing to actually
114 * use the skill, so thus if use of the skill requires a skill 138 * use the skill, so thus if use of the skill requires a skill
115 * tool, this code will equip it. 139 * tool, this code will equip it.
116 */ 140 */
117object * 141object *
118find_skill_by_name (object *who, const char *name) 142find_skill_by_name (object *who, shstr_cmp sh)
119{ 143{
120 if (!name) 144 object *skill_tool = 0;
145
146 for (object *tmp = who->inv; tmp; tmp = tmp->below)
147 if (tmp->skill == sh)
148 {
149 if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] || tmp->flag [FLAG_APPLIED]))
150 /* If this is a skill that can be used without applying tool, return it */
151 return splay (tmp);
152 /* Try to find appropriate skilltool. If the player has one already
153 * applied, we try to keep using that one.
154 */
155 else if (tmp->type == SKILL_TOOL && !skill_tool)
156 skill_tool = tmp;
157 }
158
159 if (!skill_tool)
121 return 0; 160 return 0;
122
123 object *skill = 0, *skill_tool = 0;
124
125 /* We make sure the length of the string in the object is greater
126 * in length than the passed string. Eg, if we have a skill called
127 * 'hi', we don't want to match if the user passed 'high'
128 */
129 for (object *tmp = who->inv; tmp; tmp = tmp->below)
130 {
131 if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name))
132 skill = tmp;
133
134 /* Try to find appropriate skilltool. If the player has one already
135 * applied, we try to keep using that one.
136 */
137 else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name))
138 {
139 if (QUERY_FLAG (tmp, FLAG_APPLIED))
140 skill_tool = tmp;
141 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
142 skill_tool = tmp;
143 }
144 }
145
146 /* If this is a skill that can be used without a tool, return it */
147 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
148 return skill;
149 161
150 /* Player has a tool to use the skill. If not applied, apply it - 162 /* Player has a tool to use the skill. If not applied, apply it -
151 * if not successful, return null. If they do have the skill tool 163 * if not successful, return null. If they do have the skill tool
152 * but not the skill itself, give it to them. 164 * but not the skill itself, give it to them.
153 */ 165 */
154 if (skill_tool) 166 object *skill = find_skill (who, skill_tool->skill);
155 {
156 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
157 if (apply_special (who, skill_tool, 0))
158 return 0;
159 167
160 if (!skill) 168 if (!skill)
161 {
162 skill = give_skill_by_name (who, skill_tool->skill); 169 skill = give_skill_by_name (who, skill_tool->skill);
163 link_player_skills (who);
164 }
165 170
171 if (!skill_tool->flag [FLAG_APPLIED])
172 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY))
166 return skill; 173 return 0;
167 } 174
175 return splay (skill);
176}
177
178object *
179find_skill_by_name_fuzzy (object *who, const char *name)
180{
181 if (!name)
182 return 0;
183
184 for (object *tmp = who->inv; tmp; tmp = tmp->below)
185 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
186 && tmp->skill.starts_with (name))
187 if (object *skop = find_skill_by_name (who, tmp->skill))
188 return skop;
168 189
169 return 0; 190 return 0;
170} 191}
171 192
172/* This returns the skill pointer of the given name (the 193/* This returns the skill pointer of the given name (the
173 * one that accumlates exp, has the level, etc). 194 * one that accumulates exp, has the level, etc).
174 * 195 *
175 * It is presumed that the player will be needing to actually 196 * It is presumed that the player will be needing to actually
176 * use the skill, so thus if use of the skill requires a skill 197 * use the skill, so thus if use of the skill requires a skill
177 * tool, this code will equip it. 198 * tool, this code will equip it.
178 * 199 *
… …
181 * this replaces find_skill. 202 * this replaces find_skill.
182 */ 203 */
183object * 204object *
184find_skill_by_number (object *who, int skillno) 205find_skill_by_number (object *who, int skillno)
185{ 206{
186 object *skill = NULL, *skill_tool = NULL, *tmp;
187
188 if (skillno < 1 || skillno >= NUM_SKILLS)
189 return NULL;
190
191 for (tmp = who->inv; tmp != NULL; tmp = tmp->below) 207 for (object *tmp = who->inv; tmp; tmp = tmp->below)
192 {
193 if (tmp->type == SKILL && tmp->subtype == skillno) 208 if (tmp->type == SKILL && tmp->subtype == skillno)
194 skill = tmp; 209 if (object *skop = find_skill_by_name (who, tmp->skill))
195
196 /* Try to find appropriate skilltool. If the player has one already
197 * applied, we try to keep using that one.
198 */
199 else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
200 {
201 if (QUERY_FLAG (tmp, FLAG_APPLIED))
202 skill_tool = tmp;
203 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
204 skill_tool = tmp;
205 }
206 }
207 /* If this is a skill that can be used without a tool, return it */
208 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
209 return skill;
210
211 /* Player has a tool to use the skill. IF not applied, apply it -
212 * if not successful, return null. If they do have the skill tool
213 * but not the skill itself, give it to them.
214 */
215 if (skill_tool)
216 {
217 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
218 {
219 if (apply_special (who, skill_tool, 0))
220 return NULL;
221 }
222
223 if (!skill)
224 {
225 skill = give_skill_by_name (who, skill_tool->skill);
226 link_player_skills (who);
227 }
228
229 return skill; 210 return skop;
230 }
231 211
232 return NULL; 212 return 0;
233} 213}
234 214
235/* This changes the objects skill to new_skill. 215/* This changes the objects chosen_skill to new_skill.
236 * note that this function doesn't always need to get used -
237 * you can now add skill exp to the player without the chosen_skill being
238 * set. This function is of most interest to players to update
239 * the various range information.
240 * return 1 on success, 0 on error 216 * return 1 on success, 0 on error
241 */ 217 */
242int 218bool
243change_skill (object *who, object *new_skill, int flag) 219object::change_skill (object *new_skill)
244{ 220{
245 if (who->type != PLAYER) 221 if (type != PLAYER)
246 return 0; 222 return 0;
247 223
248 // optimise this supposedly common case 224 // optimise this supposedly common case
249 if (new_skill == who->chosen_skill) 225 if (new_skill == chosen_skill)
250 return 1; 226 return 1;
251 227
252 if (who->chosen_skill) 228 if (chosen_skill)
253 {
254 apply_special (who, who->chosen_skill, AP_UNAPPLY);
255 who->chosen_skill = 0;//D verify wether necessary
256 } 229 {
257 230 chosen_skill->flag [FLAG_APPLIED] = false;
258 if (!new_skill) 231 change_abil (this, chosen_skill);
259 { 232 }
260 LOG (llevError | logBacktrace, "change_skill called on %s with NULL skill\n", 233
261 who->debug_desc ()); 234 chosen_skill = new_skill;
262 return 0; 235
236 if (chosen_skill)
263 } 237 {
238 chosen_skill->flag [FLAG_APPLIED] = true;
239 change_abil (this, chosen_skill);
240 }
264 241
265 new_skill->inv_splay (); 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;
266 246
267 if (apply_special (who, new_skill, AP_APPLY)) 247 update_stats ();
268 return 0;
269
270 return 1; 248 return 1;
271}
272
273/* This function just clears the chosen_skill and range_skill values
274 * in the player.
275 */
276void
277clear_skill (object *who)
278{
279 who->chosen_skill = 0;
280 CLEAR_FLAG (who, FLAG_READY_SKILL);
281
282 if (who->type == PLAYER)
283 if (who->contr->ranged_ob && who->contr->ranged_ob->type == SKILL)
284 who->contr->ranged_ob = 0;
285} 249}
286 250
287/* do_skill() - Main skills use function-similar in scope to cast_spell(). 251/* do_skill() - Main skills use function-similar in scope to cast_spell().
288 * We handle all requests for skill use outside of some combat here. 252 * We handle all requests for skill use outside of some combat here.
289 * We require a separate routine outside of fire() so as to allow monsters 253 * We require a separate routine outside of fire() so as to allow monsters
… …
339 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 303 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
340 } 304 }
341 else 305 else
342 { 306 {
343 SET_FLAG (skill, FLAG_APPLIED); 307 SET_FLAG (skill, FLAG_APPLIED);
344 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!."); 308 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
345 } 309 }
346 310
347 op->update_stats (); 311 op->update_stats ();
348 success = 1; 312 success = 1;
349 break; 313 break;
… …
359 case SK_HIDING: 323 case SK_HIDING:
360 exp = success = hide (op, skill); 324 exp = success = hide (op, skill);
361 break; 325 break;
362 326
363 case SK_JUMPING: 327 case SK_JUMPING:
364 success = jump (op, dir, skill); 328 exp = success = jump (op, dir, skill);
365 break; 329 break;
366 330
367 case SK_INSCRIPTION: 331 case SK_INSCRIPTION:
368 exp = success = write_on_item (op, string, skill); 332 exp = success = write_on_item (op, string, skill);
369 break; 333 break;
… …
500 * Monsters have no skill use time because of the random nature in 464 * Monsters have no skill use time because of the random nature in
501 * which use_monster_skill is called already simulates this. 465 * which use_monster_skill is called already simulates this.
502 * If certain skills should take more/less time, that should be 466 * If certain skills should take more/less time, that should be
503 * in the code for the skill itself. 467 * in the code for the skill itself.
504 */ 468 */
505
506 if (op->type == PLAYER) 469 if (op->type == PLAYER)
507 op->speed_left -= 1.0; 470 op->speed_left -= 1.f;
508 471
509 /* this is a good place to add experience for successfull use of skills. 472 /* this is a good place to add experience for successfull use of skills.
510 * Note that add_exp() will figure out player/monster experience 473 * Note that add_exp() will figure out player/monster experience
511 * gain problems. 474 * gain problems.
512 */ 475 */
… …
558 * If an object is not alive and magical we set the base exp higher to 521 * If an object is not alive and magical we set the base exp higher to
559 * help out exp awards for skill_ident skills. Also, if 522 * help out exp awards for skill_ident skills. Also, if
560 * an item is type RUNE, we give out exp based on stats.Cha 523 * an item is type RUNE, we give out exp based on stats.Cha
561 * and level (this was the old system) -b.t. 524 * and level (this was the old system) -b.t.
562 */ 525 */
563
564 if (!op) 526 if (!op)
565 { /* no item/creature */ 527 { /* no item/creature */
566 op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; 528 op_lvl = max (1, who->map->difficulty);
567 op_exp = 0; 529 op_exp = 0;
568 } 530 }
569 else if (op->type == RUNE || op->type == TRAP) 531 else if (op->type == RUNE || op->type == TRAP)
570 { /* all traps. If stats.Cha > 1 we use that 532 { /* all traps. If stats.Cha > 1 we use that
571 * for the amount of experience */ 533 * for the amount of experience */
… …
575 else 537 else
576 { /* all other items/living creatures */ 538 { /* all other items/living creatures */
577 op_exp = op->stats.exp; 539 op_exp = op->stats.exp;
578 op_lvl = op->level; 540 op_lvl = op->level;
579 if (!QUERY_FLAG (op, FLAG_ALIVE)) 541 if (!QUERY_FLAG (op, FLAG_ALIVE))
580 { /* for ident/make items */ 542 op_lvl += 5 * abs (op->magic); /* for ident/make items */
581 op_lvl += 5 * abs (op->magic);
582 }
583 } 543 }
584 544
585 if (op_lvl < 1) 545 if (op_lvl < 1)
586 op_lvl = 1; 546 op_lvl = 1;
587 547
… …
595 /* if skill really is a skill, then we can look at the skill archetype for 555 /* if skill really is a skill, then we can look at the skill archetype for
596 * bse reward value (exp) and level multiplier factor. 556 * bse reward value (exp) and level multiplier factor.
597 */ 557 */
598 if (skill->type == SKILL) 558 if (skill->type == SKILL)
599 { 559 {
600 base += skill->arch->clone.stats.exp; 560 base += skill->arch->stats.exp;
601 if (settings.simple_exp) 561 if (settings.simple_exp)
602 { 562 {
603 if (skill->arch->clone.level) 563 if (skill->arch->level)
604 lvl_mult = (float) skill->arch->clone.level / 100.0; 564 lvl_mult = (float) skill->arch->level / 100.0;
605 else 565 else
606 lvl_mult = 1.0; /* no adjustment */ 566 lvl_mult = 1.0; /* no adjustment */
607 } 567 }
608 else 568 else
609 { 569 {
610 if (skill->level) 570 if (skill->level)
611 lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0); 571 lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
612 else 572 else
613 lvl_mult = 1.0; 573 lvl_mult = 1.0;
614 } 574 }
615 } 575 }
616 else 576 else
617 { 577 {
618 /* Don't divide by zero here! */ 578 /* Don't divide by zero here! */
619 lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); 579 lvl_mult = (float) op_lvl / (float) max (1, skill->level);
620 } 580 }
621 } 581 }
622 582
623 /* assemble the exp total, and return value */ 583 /* assemble the exp total, and return value */
624 584
… …
641 * player learns the skill, 2 otherwise. 601 * player learns the skill, 2 otherwise.
642 */ 602 */
643int 603int
644learn_skill (object *pl, object *scroll) 604learn_skill (object *pl, object *scroll)
645{ 605{
646 object *tmp;
647
648 if (!scroll->skill) 606 if (!scroll->skill)
649 { 607 {
650 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); 608 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
651 return 2; 609 return 2;
652 } 610 }
653 611
654 /* can't use find_skill_by_name because we want skills the player knows 612 object *tmp = find_skill (pl, scroll->skill);
655 * but can't use natively.
656 */
657
658 for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
659 if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
660 break;
661 613
662 /* player already knows it */ 614 /* player already knows it */
663 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 615 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
664 return 0; 616 return 0;
665 617
… …
678 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 630 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
679 return 2; 631 return 2;
680 } 632 }
681 633
682 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 634 SET_FLAG (tmp, FLAG_CAN_USE_SKILL);
683 link_player_skills (pl); 635
684 return 1; 636 return 1;
685} 637}
686 638
687/* Gives a percentage clipped to 0% -> 100% of a/b. */ 639/* Gives a percentage clipped to 0% -> 100% of a/b. */
688/* Probably belongs in some global utils-type file? */ 640/* Probably belongs in some global utils-type file? */
… …
712 * Note this function is a bit more complicated becauase we 664 * Note this function is a bit more complicated becauase we
713 * we want ot sort the skills before printing them. If we 665 * we want ot sort the skills before printing them. If we
714 * just dumped this as we found it, this would be a bit 666 * just dumped this as we found it, this would be a bit
715 * simpler. 667 * simpler.
716 */ 668 */
717 669//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
718void 670void
719show_skills (object *op, const char *search) 671show_skills (object *pl, const char *search)
720{ 672{
721 object *tmp = NULL;
722 char buf[MAX_BUF];
723 const char *cp; 673 const char *cp;
724 int i, num_skills_found = 0; 674 int i, num_skills_found = 0;
725 static const char *const periods = "........................................"; 675 const char *const periods = ".............................."; // 30
726 676
727 /* Need to have a pointer and use strdup for qsort to work properly */ 677 /* Need to have a pointer and use strdup for qsort to work properly */
728 char skills[NUM_SKILLS][MAX_BUF]; 678 char skills[NUM_SKILLS][128]; // d'oh
729 679
680 object *op = pl->contr->ob;
730 681
731 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 682 for (object *tmp = op->inv; tmp; tmp = tmp->below)
732 { 683 {
733 if (tmp->type == SKILL) 684 if (tmp->type == SKILL)
734 { 685 {
735 if (search && strstr (tmp->name, search) == NULL) 686 if (search && !tmp->name.contains (search))
736 continue; 687 continue;
688
689 char buf[30];
690
737 /* Basically want to fill this out to 40 spaces with periods */ 691 /* Basically want to fill this out to 30 spaces with periods */
738 sprintf (buf, "%s%s", &tmp->name, periods); 692 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
739 buf[40] = 0;
740 693
741 if (settings.permanent_exp_ratio) 694 if (settings.permanent_exp_ratio)
742 {
743 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", 695 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
744 buf, tmp->level, tmp->stats.exp, 696 buf, tmp->level, tmp->stats.exp,
745 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 697 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
746 }
747 else 698 else
748 {
749 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", 699 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
750 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); 700 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
751 } 701
752 /* I don't know why some characters get a bunch of skills, but 702 /* I don't know why some characters get a bunch of skills, but
753 * it sometimes happens (maybe a leftover from bugier earlier code 703 * it sometimes happens (maybe a leftover from bugier earlier code
754 * and those character are still about). In any case, lets handle 704 * and those character are still about). In any case, lets handle
755 * it so it doesn't crash the server - otherwise, one character may 705 * it so it doesn't crash the server - otherwise, one character may
756 * crash the server numerous times. 706 * crash the server numerous times.
… …
762 break; 712 break;
763 } 713 }
764 } 714 }
765 } 715 }
766 716
767 clear_win_info (op); 717 dynbuf_text msg (4096, 1024);
768 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 718
719 msg << "T<Player skills:>\n\n";
769 if (num_skills_found > 1) 720 if (num_skills_found > 1)
770 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp); 721 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
771 722
772 for (i = 0; i < num_skills_found; i++) 723 for (i = 0; i < num_skills_found; i++)
773 new_draw_info (NDI_UNIQUE, 0, op, skills[i]); 724 msg << " C<" << skills [i] << ">\n";
774 725
775 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); 726 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
776 727
777 cp = determine_god (op); 728 cp = determine_god (op);
778 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); 729 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
779 730
780 new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n", 731 msg << "Your equipped item power is " << (int)op->contr->item_power
781 op->contr->item_power, (int) (op->level * settings.item_power_factor)); 732 << " out of " << int (op->level * settings.item_power_factor)
733 << ".\n";
734
735 pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
782} 736}
783 737
784/* use_skill() - similar to invoke command, it executes the skill in the 738/* use_skill() - similar to invoke command, it executes the skill in the
785 * direction that the user is facing. Returns false if we are unable to 739 * direction that the user is facing. Returns false if we are unable to
786 * change to the requested skill, or were unable to use the skill properly. 740 * change to the requested skill, or were unable to use the skill properly.
… …
794 size_t len; 748 size_t len;
795 749
796 if (!string) 750 if (!string)
797 return 0; 751 return 0;
798 752
799 for (skop = op->inv; skop != NULL; skop = skop->below) 753 for (skop = op->inv; skop; skop = skop->below)
800 { 754 {
755 if (skop->type == SKILL
801 if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) && 756 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
802 !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 757 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
803 break; 758 break;
759 else if (skop->type == SKILL_TOOL
804 else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 760 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
805 break; 761 break;
806 } 762 }
763
807 if (!skop) 764 if (!skop)
808 { 765 {
809 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 766 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);
810 return 0; 767 return 0;
811 } 768 }
… …
816 * options given to the skill. Its pretty simple - if there 773 * options given to the skill. Its pretty simple - if there
817 * are extra parameters (as deteremined by string length), we 774 * are extra parameters (as deteremined by string length), we
818 * want to skip over any leading spaces. 775 * want to skip over any leading spaces.
819 */ 776 */
820 if (len >= strlen (string)) 777 if (len >= strlen (string))
821 {
822 string = NULL; 778 string = NULL;
823 }
824 else 779 else
825 { 780 {
826 string += len; 781 string += len;
827 while (*string == 0x20) 782 while (*string == 0x20)
828 string++; 783 string++;
784
829 if (strlen (string) == 0) 785 if (strlen (string) == 0)
830 string = NULL; 786 string = NULL;
831 } 787 }
832 788
833#ifdef SKILL_UTIL_DEBUG 789#ifdef SKILL_UTIL_DEBUG
834 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); 790 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
835#endif 791#endif
836 792
837 /* Change to the new skill, then execute it. */
838 if (do_skill (op, op, skop, op->facing, string)) 793 if (do_skill (op, op, skop, op->facing, string))
839 return 1; 794 return 1;
840 795
841 return 0; 796 return 0;
842} 797}
… …
880 * the caller should have set it appropriately). We still want to pass 835 * the caller should have set it appropriately). We still want to pass
881 * through that code if skill is set to change to the skill. 836 * through that code if skill is set to change to the skill.
882 */ 837 */
883 if (player *pl = op->contr) 838 if (player *pl = op->contr)
884 { 839 {
885 if (!pl->combat_ob) 840 if (skill)
841 op->change_skill (skill);
842 else
886 { 843 {
887 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 844 if (!pl->combat_ob)
888 { 845 {
889 for (tmp = op->inv; tmp; tmp = tmp->below) 846 if (QUERY_FLAG (op, FLAG_READY_WEAPON))
890 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
891 break;
892
893 if (!tmp)
894 { 847 {
848 for (tmp = op->inv; tmp; tmp = tmp->below)
849 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
850 break;
851
852 if (!tmp)
895 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 853 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
896 return 0; 854
855 pl->combat_ob = tmp;
897 } 856 }
898 857
899 change_skill (op, find_skill_by_name (op, tmp->skill), 1); 858 if (!pl->combat_ob)
900 }
901 else
902 {
903 if (!skill)
904 { 859 {
905 /* See if the players chosen skill is a combat skill, and use 860 /* See if the players chosen skill is a combat skill, and use
906 * it if appropriate. 861 * it if appropriate.
907 */ 862 */
908 if (op->chosen_skill && hth_skill_p (op->chosen_skill)) 863 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
… …
910 else 865 else
911 { 866 {
912 skill = find_player_hth_skill (op); 867 skill = find_player_hth_skill (op);
913 868
914 if (!skill) 869 if (!skill)
915 {
916 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 870 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
917 return 0;
918 } 871 }
872
873 if (skill)
874 {
875 op->change_skill (0);
876 apply_special (op, skill, AP_APPLY);
919 } 877 }
920 } 878 }
921 879
922 /* now try to ready the new skill */ 880 if (!pl->combat_ob)
923 if (!change_skill (op, skill, 0)) 881 {
924 { /* oh oh, trouble! */ 882 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
925 new_draw_info_format (NDI_UNIQUE, 0, op, "Couldn't change to skill %s", &skill->name);
926 return 0; 883 return 0;
927 } 884 }
928 } 885 }
929 886
930 if (!pl->combat_ob) 887 if (!op->change_weapon (pl->combat_ob))
931 {
932 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
933 return 0; 888 return 0;
934 }
935 } 889 }
936
937 if (!op->change_weapon (pl->combat_ob))
938 return 0;
939 890
940 /* lose invisiblity/hiding status for running attacks */ 891 /* lose invisiblity/hiding status for running attacks */
941 if (pl->tmp_invis) 892 if (pl->tmp_invis)
942 { 893 {
943 pl->tmp_invis = 0; 894 pl->tmp_invis = 0;
944 op->invisible = 0; 895 op->invisible = 0;
945 op->hide = 0; 896 op->flag [FLAG_HIDDEN] = 0;
946 update_object (op, UP_OBJ_CHANGE); 897 update_object (op, UP_OBJ_CHANGE);
947 } 898 }
948 } 899 }
949 900
950 int success = attack_ob (tmp, op); 901 int success = attack_ob (tmp, op);
… …
962 return success; 913 return success;
963} 914}
964 915
965/* skill_attack() - Core routine for use when we attack using a skills 916/* skill_attack() - Core routine for use when we attack using a skills
966 * system. In essence, this code handles 917 * system. In essence, this code handles
967 * all skill-based attacks, ie hth, missile and melee weapons should be 918 * all skill-based attacks, i.e. hth, missile and melee weapons should be
968 * treated here. If an opponent is already supplied by move_player(), 919 * treated here. If an opponent is already supplied by move_player(),
969 * we move right onto do_skill_attack(), otherwise we find if an 920 * we move right onto do_skill_attack(), otherwise we find if an
970 * appropriate opponent exists. 921 * appropriate opponent exists.
971 * 922 *
972 * This is called by move_player() and attack_hth() 923 * This is called by move_player() and attack_hth()
… …
1077 1028
1078 return 0; 1029 return 0;
1079 } 1030 }
1080 1031
1081 return skill_attack (NULL, op, dir, string, skill); 1032 return skill_attack (NULL, op, dir, string, skill);
1082
1083} 1033}
1034

Diff Legend

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