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.55 by root, Wed May 30 03:03:10 2007 UTC vs.
Revision 1.97 by root, Thu Apr 15 00:36:51 2010 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* 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. */
26 26
27/* Reconfigured skills code to allow linking of skills to experience 27/* Reconfigured skills code to allow linking of skills to experience
… …
51# define def(uc, flags) flags, 51# define def(uc, flags) flags,
52# include "skillinc.h" 52# include "skillinc.h"
53# undef def 53# undef def
54}; 54};
55 55
56vector<object_ptr> skillvec;
57
56static int attack_hth (object *pl, int dir, const char *string, object *skill); 58static 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); 59static int attack_melee_weapon (object *op, int dir, const char *string, object *skill);
58 60
59/* init_skills basically just sets up the skill_names table 61/* init_skills basically just sets up the skill_names table
60 * above. The index into the array is set up by the 62 * above. The index into the array is set up by the
61 * subtypes. 63 * subtypes.
62 */ 64 */
63void 65void
64init_skills (void) 66init_skills ()
65{ 67{
66 for (archetype *at = first_archetype; at; at = at->next) 68 // nop
67 if (at->clone.type == SKILL) 69}
70
71void
72add_skill_archetype (object *o)
73{
74 printf ("<%s><%s>\n", &o->name, &o->skill);//D
75
76 assert (("skill name must equal skill skill", o->name == o->skill));
77
78 for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i)
79 if ((*i)->name == o->name)
68 { 80 {
69 if (skill_names[at->clone.subtype]) 81 // replace existing entry
70 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", 82 SKILL_INDEX (o) = i - skillvec.begin ();
71 at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill); 83 *i = o;
72 else 84 return;
73 skill_names[at->clone.subtype] = at->clone.skill;
74 } 85 }
75 86
76 /* This isn't really an error if there is no skill subtype set, but 87 // add new entry
77 * checking for this may catch some user errors. 88 assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS));
78 */ 89 SKILL_INDEX (o) = skillvec.size ();
79 for (int i = 1; i < NUM_SKILLS; i++) 90 skillvec.push_back (o);
80 if (!skill_names[i])
81 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
82} 91}
83 92
84/* This function goes through the player inventory and sets 93/* This function goes through the player inventory and sets
85 * up the last_skills[] array in the player object. 94 * up the last_skills[] array in the player object.
86 * the last_skills[] is used to more quickly lookup skills - 95 * the last_skills[] is used to more quickly lookup skills -
87 * mostly used for sending exp. 96 * mostly used for sending exp.
88 */ 97 */
89void 98void
90link_player_skills (object *op) 99player::link_skills ()
91{ 100{
101 for (int i = 0; i < CS_NUM_SKILLS; ++i)
102 last_skill_ob [i] = 0;
103
92 for (object *tmp = op->inv; tmp; tmp = tmp->below) 104 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
93 if (tmp->type == SKILL) 105 if (tmp->type == SKILL)
94 { 106 {
95 /* This is really a warning, hence no else below */ 107 int idx = SKILL_INDEX (tmp);
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 108
100 if (tmp->subtype >= NUM_SKILLS) 109 assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS));
101 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS); 110
102 else 111 if (last_skill_ob [idx] != tmp)
103 { 112 {
104 op->contr->last_skill_ob[tmp->subtype] = tmp; 113 last_skill_ob [idx] = tmp;
105 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go 114 if (ns)
115 ns->last_skill_exp [idx] = -1;
106 } 116 }
107 } 117 }
108} 118}
109 119
110static object * 120static object *
111find_skill (object *who, const shstr &sh) 121find_skill (object *who, shstr_cmp name)
112{ 122{
123 if (who->chosen_skill
124 && who->chosen_skill->skill == name
125 && who->chosen_skill->type == SKILL)
126 return who->chosen_skill;
127
113 for (object *tmp = who->inv; tmp; tmp = tmp->below) 128 for (object *tmp = who->inv; tmp; tmp = tmp->below)
114 if (tmp->skill == sh && tmp->type == SKILL) 129 if (tmp->skill == name && tmp->type == SKILL)
115 return tmp; 130 return splay (tmp);
116 131
117 return 0; 132 return 0;
133}
134
135object *
136player::find_skill (shstr_cmp name) const
137{
138 // might want to use last_skill_obj at one point, or maybe not
139 return ::find_skill (ob, name);
118} 140}
119 141
120/* This returns the skill pointer of the given name (the 142/* This returns the skill pointer of the given name (the
121 * one that accumulates exp, has the level, etc). 143 * one that accumulates exp, has the level, etc).
122 * 144 *
123 * It is presumed that the player will be needing to actually 145 * It is presumed that the player will be needing to actually
124 * use the skill, so thus if use of the skill requires a skill 146 * use the skill, so thus if use of the skill requires a skill
125 * tool, this code will equip it. 147 * tool, this code will equip it.
126 */ 148 */
127object * 149object *
128find_skill_by_name (object *who, const shstr &sh) 150find_skill_by_name (object *who, shstr_cmp sh)
129{ 151{
130 object *skill_tool = 0; 152 object *skill_tool = 0;
131 153
132 for (object *tmp = who->inv; tmp; tmp = tmp->below) 154 for (object *tmp = who->inv; tmp; tmp = tmp->below)
133 if (tmp->skill == sh) 155 if (tmp->skill == sh)
… …
147 169
148 /* Player has a tool to use the skill. If not applied, apply it - 170 /* Player has a tool to use the skill. If not applied, apply it -
149 * if not successful, return null. If they do have the skill tool 171 * if not successful, return null. If they do have the skill tool
150 * but not the skill itself, give it to them. 172 * but not the skill itself, give it to them.
151 */ 173 */
152 object *skill = find_skill (who, skill_tool->skill); 174 object *skill = who->give_skill (skill_tool->skill);
153
154 if (!skill)
155 {
156 skill = give_skill_by_name (who, skill_tool->skill);
157 link_player_skills (who);
158 }
159 175
160 if (!skill_tool->flag [FLAG_APPLIED]) 176 if (!skill_tool->flag [FLAG_APPLIED])
161 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY)) 177 if (!who->apply (splay (skill_tool)))
162 return 0; 178 return 0;
163 179
164 return splay (skill); 180 return splay (skill);
165} 181}
166 182
167object * 183object *
168find_skill_by_name (object *who, const char *name) 184find_skill_by_name_fuzzy (object *who, const char *name)
169{ 185{
170 if (!name) 186 if (name)
171 return 0;
172
173 for (object *tmp = who->inv; tmp; tmp = tmp->below) 187 for (object *tmp = who->inv; tmp; tmp = tmp->below)
174 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) 188 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
175 && tmp->skill.begins_with (name)) 189 && tmp->skill.starts_with (name))
176 if (object *skop = find_skill_by_name (who, tmp->skill)) 190 if (object *skop = find_skill_by_name (who, tmp->skill))
177 return skop; 191 return skop;
178 192
179 return 0; 193 return 0;
180} 194}
181 195
182/* This returns the skill pointer of the given name (the 196/* This returns the skill pointer of the given name (the
… …
187 * tool, this code will equip it. 201 * tool, this code will equip it.
188 * 202 *
189 * This code is basically the same as find_skill_by_name() above, 203 * This code is basically the same as find_skill_by_name() above,
190 * but instead a skill name, we search by matching number. 204 * but instead a skill name, we search by matching number.
191 * this replaces find_skill. 205 * this replaces find_skill.
206 *
207 * MUST NOT BE USED IN NEW CODE! (schmorp)
192 */ 208 */
193object * 209object *
194find_skill_by_number (object *who, int skillno) 210find_skill_by_number (object *who, int skillno)
195{ 211{
196 for (object *tmp = who->inv; tmp; tmp = tmp->below) 212 for (object *tmp = who->inv; tmp; tmp = tmp->below)
… …
199 return skop; 215 return skop;
200 216
201 return 0; 217 return 0;
202} 218}
203 219
204/* This changes the objects chosen_skill to new_skill. 220object *
205 * return 1 on success, 0 on error 221object::give_skill (shstr_cmp name, bool can_use)
206 */
207bool
208object::change_skill (object *new_skill)
209{ 222{
210 if (type != PLAYER) 223 object *skill = find_skill (this, name);
211 return 0;
212 224
213 // optimise this supposedly common case
214 if (new_skill == chosen_skill)
215 return 1;
216
217 if (chosen_skill) 225 if (!skill)
218 { 226 skill = give_skill_by_name (this, name);
219 chosen_skill->flag [FLAG_APPLIED] = false;
220 change_abil (this, chosen_skill);
221 }
222 227
223 chosen_skill = new_skill; 228 if (skill && can_use)
229 skill->flag [FLAG_CAN_USE_SKILL] = true;
224 230
225 if (chosen_skill)
226 {
227 chosen_skill->flag [FLAG_APPLIED] = true;
228 change_abil (this, chosen_skill);
229 }
230
231 // always clear current weapon, as the selected skill could
232 // conflict with the current weapon skill, which would go
233 // undetected and exp would be given to the wrong skill.
234 current_weapon = 0;
235
236 update_stats ();
237 return 1; 231 return skill;
238} 232}
239 233
240/* do_skill() - Main skills use function-similar in scope to cast_spell(). 234/* do_skill() - Main skills use function-similar in scope to cast_spell().
241 * We handle all requests for skill use outside of some combat here. 235 * We handle all requests for skill use outside of some combat here.
242 * We require a separate routine outside of fire() so as to allow monsters 236 * We require a separate routine outside of fire() so as to allow monsters
… …
249 */ 243 */
250int 244int
251do_skill (object *op, object *part, object *skill, int dir, const char *string) 245do_skill (object *op, object *part, object *skill, int dir, const char *string)
252{ 246{
253 int success = 0, exp = 0; 247 int success = 0, exp = 0;
254 int did_alc = 0;
255 248
256 if (!skill) 249 if (!skill)
257 return 0; 250 return 0;
258 251
259 /* The code below presumes that the skill points to the object that 252 /* The code below presumes that the skill points to the object that
… …
284 /* Not 100% sure if this will work with new movement code - 277 /* Not 100% sure if this will work with new movement code -
285 * the levitation skill has move_type for flying, so when 278 * the levitation skill has move_type for flying, so when
286 * equipped, that should transfer to player, when not, 279 * equipped, that should transfer to player, when not,
287 * shouldn't. 280 * shouldn't.
288 */ 281 */
289 if (QUERY_FLAG (skill, FLAG_APPLIED)) 282 if (skill->flag [FLAG_APPLIED])
290 { 283 {
291 CLEAR_FLAG (skill, FLAG_APPLIED); 284 skill->clr_flag (FLAG_APPLIED);
292 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 285 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
293 } 286 }
294 else 287 else
295 { 288 {
296 SET_FLAG (skill, FLAG_APPLIED); 289 skill->set_flag (FLAG_APPLIED);
297 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!."); 290 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
298 } 291 }
299 292
300 op->update_stats (); 293 op->update_stats ();
301 success = 1; 294 success = 1;
302 break; 295 break;
… …
312 case SK_HIDING: 305 case SK_HIDING:
313 exp = success = hide (op, skill); 306 exp = success = hide (op, skill);
314 break; 307 break;
315 308
316 case SK_JUMPING: 309 case SK_JUMPING:
317 success = jump (op, dir, skill); 310 exp = success = jump (op, dir, skill);
318 break; 311 break;
319 312
320 case SK_INSCRIPTION: 313 case SK_INSCRIPTION:
321 exp = success = write_on_item (op, string, skill); 314 exp = success = write_on_item (op, string, skill);
322 break; 315 break;
… …
384 case SK_LITERACY: 377 case SK_LITERACY:
385 case SK_WOODSMAN: 378 case SK_WOODSMAN:
386 /* first, we try to find a cauldron, and do the alchemy thing. 379 /* first, we try to find a cauldron, and do the alchemy thing.
387 * failing that, we go and identify stuff. 380 * failing that, we go and identify stuff.
388 */ 381 */
382 {
383 bool found_cauldron = false;
384
389 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) 385 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
390 { 386 {
391 next = tmp->above; 387 next = tmp->above;
392 388
393 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 389 if (tmp->flag [FLAG_IS_CAULDRON])
394 { 390 {
391 found_cauldron = true;
392
393 if (tmp->skill != skill->skill)
394 {
395 op->failmsgf ("You can't use the %s with the %s skill!",
396 query_name (tmp),
397 query_name (skill));
398 break;
399 }
400
395 attempt_do_alchemy (op, tmp); 401 attempt_do_alchemy (op, tmp, skill);
396 402
397 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 403 if (tmp->flag [FLAG_APPLIED])
398 esrv_send_inventory (op, tmp); 404 esrv_send_inventory (op, tmp);
399
400 did_alc = 1;
401 } 405 }
402 } 406 }
403 407
404 if (did_alc == 0) 408 if (!found_cauldron)
405 exp = success = skill_ident (op, skill); 409 exp = success = skill_ident (op, skill);
406 410 }
407 break; 411 break;
408 412
409 case SK_DET_MAGIC: 413 case SK_DET_MAGIC:
410 case SK_DET_CURSE: 414 case SK_DET_CURSE:
411 exp = success = skill_ident (op, skill); 415 exp = success = skill_ident (op, skill);
… …
442 case SK_SUMMONING: 446 case SK_SUMMONING:
443 case SK_CLIMBING: 447 case SK_CLIMBING:
444 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 448 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
445 break; 449 break;
446 450
451 case SK_MINING:
452 success = skill_mining (op, part, skill, dir, string);
453 break;
454
447 default: 455 default:
448 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 456 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
449 break; 457 break;
450 } 458 }
451 459
… …
453 * Monsters have no skill use time because of the random nature in 461 * Monsters have no skill use time because of the random nature in
454 * which use_monster_skill is called already simulates this. 462 * which use_monster_skill is called already simulates this.
455 * If certain skills should take more/less time, that should be 463 * If certain skills should take more/less time, that should be
456 * in the code for the skill itself. 464 * in the code for the skill itself.
457 */ 465 */
458
459 if (op->type == PLAYER) 466 if (op->type == PLAYER)
460 op->speed_left -= 1.f; 467 op->speed_left -= 1.f;
461 468
462 /* this is a good place to add experience for successfull use of skills. 469 /* this is a good place to add experience for successfull use of skills.
463 * Note that add_exp() will figure out player/monster experience 470 * Note that add_exp() will figure out player/monster experience
… …
511 * If an object is not alive and magical we set the base exp higher to 518 * If an object is not alive and magical we set the base exp higher to
512 * help out exp awards for skill_ident skills. Also, if 519 * help out exp awards for skill_ident skills. Also, if
513 * an item is type RUNE, we give out exp based on stats.Cha 520 * an item is type RUNE, we give out exp based on stats.Cha
514 * and level (this was the old system) -b.t. 521 * and level (this was the old system) -b.t.
515 */ 522 */
516
517 if (!op) 523 if (!op)
518 { /* no item/creature */ 524 { /* no item/creature */
519 op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; 525 op_lvl = max (1, who->map->difficulty);
520 op_exp = 0; 526 op_exp = 0;
521 } 527 }
522 else if (op->type == RUNE || op->type == TRAP) 528 else if (op->type == RUNE || op->type == TRAP)
523 { /* all traps. If stats.Cha > 1 we use that 529 { /* all traps. If stats.Cha > 1 we use that
524 * for the amount of experience */ 530 * for the amount of experience */
… …
527 } 533 }
528 else 534 else
529 { /* all other items/living creatures */ 535 { /* all other items/living creatures */
530 op_exp = op->stats.exp; 536 op_exp = op->stats.exp;
531 op_lvl = op->level; 537 op_lvl = op->level;
532 if (!QUERY_FLAG (op, FLAG_ALIVE)) 538 if (!op->flag [FLAG_ALIVE])
533 { /* for ident/make items */ 539 op_lvl += 5 * abs (op->magic); /* for ident/make items */
534 op_lvl += 5 * abs (op->magic);
535 }
536 } 540 }
537 541
538 if (op_lvl < 1) 542 if (op_lvl < 1)
539 op_lvl = 1; 543 op_lvl = 1;
540 544
… …
548 /* if skill really is a skill, then we can look at the skill archetype for 552 /* if skill really is a skill, then we can look at the skill archetype for
549 * bse reward value (exp) and level multiplier factor. 553 * bse reward value (exp) and level multiplier factor.
550 */ 554 */
551 if (skill->type == SKILL) 555 if (skill->type == SKILL)
552 { 556 {
553 base += skill->arch->clone.stats.exp; 557 base += skill->arch->stats.exp;
554 if (settings.simple_exp) 558 if (settings.simple_exp)
555 { 559 {
556 if (skill->arch->clone.level) 560 if (skill->arch->level)
557 lvl_mult = (float) skill->arch->clone.level / 100.0; 561 lvl_mult = (float) skill->arch->level / 100.0;
558 else 562 else
559 lvl_mult = 1.0; /* no adjustment */ 563 lvl_mult = 1.0; /* no adjustment */
560 } 564 }
561 else 565 else
562 { 566 {
563 if (skill->level) 567 if (skill->level)
564 lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0); 568 lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
565 else 569 else
566 lvl_mult = 1.0; 570 lvl_mult = 1.0;
567 } 571 }
568 } 572 }
569 else 573 else
570 { 574 {
571 /* Don't divide by zero here! */ 575 /* Don't divide by zero here! */
572 lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); 576 lvl_mult = (float) op_lvl / (float) max (1, skill->level);
573 } 577 }
574 } 578 }
575 579
576 /* assemble the exp total, and return value */ 580 /* assemble the exp total, and return value */
577 581
… …
603 } 607 }
604 608
605 object *tmp = find_skill (pl, scroll->skill); 609 object *tmp = find_skill (pl, scroll->skill);
606 610
607 /* player already knows it */ 611 /* player already knows it */
608 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 612 if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
609 return 0; 613 return 0;
610 614
611 /* now a random change to learn, based on player Int. 615 /* now a random change to learn, based on player Int.
612 * give bonus based on level - otherwise stupid characters 616 * give bonus based on level - otherwise stupid characters
613 * might never be able to learn anything. 617 * might never be able to learn anything.
… …
622 { 626 {
623 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 627 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
624 return 2; 628 return 2;
625 } 629 }
626 630
627 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 631 tmp->set_flag (FLAG_CAN_USE_SKILL);
628 link_player_skills (pl); 632
629 return 1; 633 return 1;
630} 634}
631 635
632/* Gives a percentage clipped to 0% -> 100% of a/b. */ 636/* Gives a percentage clipped to 0% -> 100% of a/b. */
633/* Probably belongs in some global utils-type file? */ 637/* Probably belongs in some global utils-type file? */
… …
657 * Note this function is a bit more complicated becauase we 661 * Note this function is a bit more complicated becauase we
658 * we want ot sort the skills before printing them. If we 662 * we want ot sort the skills before printing them. If we
659 * just dumped this as we found it, this would be a bit 663 * just dumped this as we found it, this would be a bit
660 * simpler. 664 * simpler.
661 */ 665 */
662 666//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
663void 667void
664show_skills (object *op, const char *search) 668show_skills (object *pl, const char *search)
665{ 669{
666 object *tmp = NULL;
667 char buf[MAX_BUF];
668 const char *cp; 670 const char *cp;
669 int i, num_skills_found = 0; 671 int i, num_skills_found = 0;
670 static const char *const periods = "........................................"; 672 const char *const periods = ".............................."; // 30
671 673
672 /* Need to have a pointer and use strdup for qsort to work properly */ 674 /* Need to have a pointer and use strdup for qsort to work properly */
673 char skills[NUM_SKILLS][MAX_BUF]; 675 char skills[NUM_SKILLS][128]; // d'oh
674 676
677 object *op = pl->contr->ob;
675 678
676 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 679 for (object *tmp = op->inv; tmp; tmp = tmp->below)
677 { 680 {
678 if (tmp->type == SKILL) 681 if (tmp->type == SKILL)
679 { 682 {
680 if (search && strstr (tmp->name, search) == NULL) 683 if (search && !tmp->name.contains (search))
681 continue; 684 continue;
685
686 char buf[30];
687
682 /* Basically want to fill this out to 40 spaces with periods */ 688 /* Basically want to fill this out to 30 spaces with periods */
683 sprintf (buf, "%s%s", &tmp->name, periods); 689 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
684 buf[40] = 0;
685 690
686 if (settings.permanent_exp_ratio) 691 if (settings.permanent_exp_ratio)
687 {
688 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", 692 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
689 buf, tmp->level, tmp->stats.exp, 693 buf, tmp->level, tmp->stats.exp,
690 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 694 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
691 }
692 else 695 else
693 {
694 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", 696 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
695 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); 697 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
696 } 698
697 /* I don't know why some characters get a bunch of skills, but 699 /* I don't know why some characters get a bunch of skills, but
698 * it sometimes happens (maybe a leftover from bugier earlier code 700 * it sometimes happens (maybe a leftover from bugier earlier code
699 * and those character are still about). In any case, lets handle 701 * and those character are still about). In any case, lets handle
700 * it so it doesn't crash the server - otherwise, one character may 702 * it so it doesn't crash the server - otherwise, one character may
701 * crash the server numerous times. 703 * crash the server numerous times.
702 */ 704 */
703 if (num_skills_found >= NUM_SKILLS) 705 if (num_skills_found >= NUM_SKILLS)
704 { 706 {
705 new_draw_info (NDI_RED, 0, op, "Your character has too many skills."); 707 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills.");
706 new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin"); 708 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
707 break; 709 break;
708 } 710 }
709 } 711 }
710 } 712 }
711 713
712 clear_win_info (op); 714 dynbuf_text &msg = msg_dynbuf; msg.clear ();
713 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 715
716 msg << "T<Player skills:>\n\n";
714 if (num_skills_found > 1) 717 if (num_skills_found > 1)
715 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp); 718 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
716 719
717 for (i = 0; i < num_skills_found; i++) 720 for (i = 0; i < num_skills_found; i++)
718 new_draw_info (NDI_UNIQUE, 0, op, skills[i]); 721 msg << " C<" << skills [i] << ">\n";
719 722
720 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); 723 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
721 724
722 cp = determine_god (op); 725 cp = determine_god (op);
723 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); 726 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
724 727
725 new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n", 728 msg << "Your equipped item power is " << (int)op->contr->item_power
726 op->contr->item_power, (int) (op->level * settings.item_power_factor)); 729 << " out of " << int (op->level * settings.item_power_factor)
730 << ".\n";
731
732 pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
727} 733}
728 734
729/* use_skill() - similar to invoke command, it executes the skill in the 735/* use_skill() - similar to invoke command, it executes the skill in the
730 * direction that the user is facing. Returns false if we are unable to 736 * direction that the user is facing. Returns false if we are unable to
731 * change to the requested skill, or were unable to use the skill properly. 737 * change to the requested skill, or were unable to use the skill properly.
… …
740 746
741 if (!string) 747 if (!string)
742 return 0; 748 return 0;
743 749
744 for (skop = op->inv; skop; skop = skop->below) 750 for (skop = op->inv; skop; skop = skop->below)
745 { 751 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
746 if (skop->type == SKILL
747 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
748 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 752 && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
753 {
754 skop = find_skill_by_name (op, skop->skill);
749 break; 755 break;
750 else if (skop->type == SKILL_TOOL
751 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
752 break;
753 } 756 }
754 757
755 if (!skop) 758 if (!skop)
756 { 759 {
757 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 760 op->failmsgf ("Unable to find skill %s.", string);
761 return 0;
762 }
763
764 if (!(skill_flags [skop->subtype] & SF_USE))
765 {
766 op->failmsgf (
767 "You feel as if you wanted to do something funny, but you can't remember what. "
768 "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
769 "use it with some item, or it's always active.>",
770 &skop->skill
771 );
758 return 0; 772 return 0;
759 } 773 }
760 774
761 len = strlen (skop->skill); 775 len = strlen (skop->skill);
762 776
… …
788} 802}
789 803
790static bool 804static bool
791hth_skill_p (object *skill) 805hth_skill_p (object *skill)
792{ 806{
793 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; 807 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT;
794} 808}
795 809
796/* This finds the first unarmed skill the player has, and returns it. 810/* This finds the first unarmed skill the player has, and returns it.
797 */ 811 */
798static object * 812static object *
799find_player_hth_skill (object *op) 813find_player_hth_skill (object *op)
800{ 814{
801 for (object *tmp = op->inv; tmp; tmp = tmp->below) 815 for (object *tmp = op->inv; tmp; tmp = tmp->below)
802 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) 816 if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
803 return tmp; 817 return tmp;
804 818
805 return 0; 819 return 0;
806} 820}
807 821
… …
826 * the caller should have set it appropriately). We still want to pass 840 * the caller should have set it appropriately). We still want to pass
827 * through that code if skill is set to change to the skill. 841 * through that code if skill is set to change to the skill.
828 */ 842 */
829 if (player *pl = op->contr) 843 if (player *pl = op->contr)
830 { 844 {
831 if (!pl->combat_ob) 845 if (skill)
832 { 846 {
833 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 847 if (!op->apply (skill))
834 { 848 return 0;
835 for (tmp = op->inv; tmp; tmp = tmp->below)
836 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
837 break;
838
839 if (!tmp)
840 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
841
842 pl->combat_ob = tmp;
843 } 849 }
844 850 else
851 {
845 if (!pl->combat_ob) 852 if (!pl->combat_ob)
846 { 853 {
854 if (op->flag [FLAG_READY_WEAPON])
855 {
856 for (tmp = op->inv; tmp; tmp = tmp->below)
857 if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
858 break;
859
847 if (!skill) 860 if (!tmp)
861 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
862
863 pl->combat_ob = tmp;
864 }
865
866 if (!pl->combat_ob)
848 { 867 {
849 /* See if the players chosen skill is a combat skill, and use 868 /* See if the players chosen skill is a combat skill, and use
850 * it if appropriate. 869 * it if appropriate.
851 */ 870 */
852 if (op->chosen_skill && hth_skill_p (op->chosen_skill)) 871 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
… …
856 skill = find_player_hth_skill (op); 875 skill = find_player_hth_skill (op);
857 876
858 if (!skill) 877 if (!skill)
859 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 878 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
860 } 879 }
880
881 op->apply (skill);
861 } 882 }
862 883
863 if (skill) 884 if (!pl->combat_ob)
864 { 885 {
865 op->change_skill (0); 886 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
866 apply_special (op, skill, AP_APPLY); 887 return 0;
867 } 888 }
868 } 889 }
869 890
870 if (!pl->combat_ob) 891 if (!op->apply (pl->combat_ob))
871 {
872 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
873 return 0; 892 return 0;
874 }
875 } 893 }
876
877 if (!op->change_weapon (pl->combat_ob))
878 return 0;
879 894
880 /* lose invisiblity/hiding status for running attacks */ 895 /* lose invisiblity/hiding status for running attacks */
881 if (pl->tmp_invis) 896 if (pl->tmp_invis)
882 { 897 {
883 pl->tmp_invis = 0; 898 pl->tmp_invis = 0;
884 op->invisible = 0; 899 op->invisible = 0;
885 op->hide = 0; 900 op->flag [FLAG_HIDDEN] = 0;
886 update_object (op, UP_OBJ_CHANGE); 901 update_object (op, UP_OBJ_CHANGE);
887 } 902 }
888 } 903 }
889 904
890 int success = attack_ob (tmp, op); 905 int success = attack_ob (tmp, op);
891 906
892 /* print appropriate messages to the player */ 907 /* print appropriate messages to the player */
893 908
894 if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 909 if (success && string && tmp && !tmp->flag [FLAG_FREED])
895 { 910 {
896 if (op->type == PLAYER) 911 if (op->type == PLAYER)
897 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 912 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
898 else if (tmp->type == PLAYER) 913 else if (tmp->type == PLAYER)
899 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 914 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
… …
902 return success; 917 return success;
903} 918}
904 919
905/* skill_attack() - Core routine for use when we attack using a skills 920/* skill_attack() - Core routine for use when we attack using a skills
906 * system. In essence, this code handles 921 * system. In essence, this code handles
907 * all skill-based attacks, ie hth, missile and melee weapons should be 922 * all skill-based attacks, i.e. hth, missile and melee weapons should be
908 * treated here. If an opponent is already supplied by move_player(), 923 * treated here. If an opponent is already supplied by move_player(),
909 * we move right onto do_skill_attack(), otherwise we find if an 924 * we move right onto do_skill_attack(), otherwise we find if an
910 * appropriate opponent exists. 925 * appropriate opponent exists.
911 * 926 *
912 * This is called by move_player() and attack_hth() 927 * This is called by move_player() and attack_hth()
… …
942 /* space must be blocked for there to be anything interesting to do */ 957 /* space must be blocked for there to be anything interesting to do */
943 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) 958 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
944 return 0; 959 return 0;
945 960
946 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) 961 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
947 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 962 if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR)
948 { 963 {
949 /* Don't attack party members */ 964 /* Don't attack party members */
950 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 965 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
951 return 0; 966 return 0;
952 967
… …
974static int 989static int
975attack_hth (object *pl, int dir, const char *string, object *skill) 990attack_hth (object *pl, int dir, const char *string, object *skill)
976{ 991{
977 object *enemy = NULL, *weapon; 992 object *enemy = NULL, *weapon;
978 993
979 if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) 994 if (pl->flag [FLAG_READY_WEAPON])
980 for (weapon = pl->inv; weapon; weapon = weapon->below) 995 for (weapon = pl->inv; weapon; weapon = weapon->below)
981 { 996 {
982 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 997 if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
983 { 998 {
984 CLEAR_FLAG (weapon, FLAG_APPLIED); 999 weapon->clr_flag (FLAG_APPLIED);
985 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 1000 pl->clr_flag (FLAG_READY_WEAPON);
986 pl->update_stats (); 1001 pl->update_stats ();
987 if (pl->type == PLAYER) 1002 if (pl->type == PLAYER)
988 { 1003 {
989 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 1004 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
990 esrv_update_item (UPD_FLAGS, pl, weapon); 1005 esrv_update_item (UPD_FLAGS, pl, weapon);
… …
1008 */ 1023 */
1009static int 1024static int
1010attack_melee_weapon (object *op, int dir, const char *string, object *skill) 1025attack_melee_weapon (object *op, int dir, const char *string, object *skill)
1011{ 1026{
1012 1027
1013 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 1028 if (!op->flag [FLAG_READY_WEAPON])
1014 { 1029 {
1015 if (op->type == PLAYER) 1030 if (op->type == PLAYER)
1016 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); 1031 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1017 1032
1018 return 0; 1033 return 0;

Diff Legend

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