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.13 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.28 by root, Tue Mar 6 00:51:00 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copryight (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copryight (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Created July 95 to separate skill utilities from actual skills -b.t. */ 25/* Created July 95 to separate skill utilities from actual skills -b.t. */
25 26
26/* Reconfigured skills code to allow linking of skills to experience 27/* Reconfigured skills code to allow linking of skills to experience
27 * categories. This is done solely through the init_new_exp_system() fctn. 28 * categories. This is done solely through the init_new_exp_system() fctn.
… …
39 40
40/* #define SKILL_UTIL_DEBUG */ 41/* #define SKILL_UTIL_DEBUG */
41 42
42#include <global.h> 43#include <global.h>
43#include <object.h> 44#include <object.h>
44#ifndef __CEXTRACT__
45# include <sproto.h> 45#include <sproto.h>
46#endif
47#include <living.h> /* for defs of STR,CON,DEX,etc. -b.t. */ 46#include <living.h> /* for defs of STR,CON,DEX,etc. -b.t. */
48#include <spells.h> 47#include <spells.h>
49 48
50/* Table of unarmed attack skills. Terminated by -1. This 49/* Table of unarmed attack skills. Terminated by -1. This
51 * is also the list that we should try to use skills when 50 * is also the list that we should try to use skills when
52 * automatically applying one for the player. 51 * automatically applying one for the player.
53 * Note it is hardcoded in the skill_util.c that dragons always
54 * want clawing if possible.
55 */ 52 */
56static uint8 unarmed_skills[] = { 53static uint8 unarmed_skills[] = {
57 SK_KARATE, 54 SK_KARATE,
58 SK_CLAWING, 55 SK_CLAWING,
59 SK_FLAME_TOUCH, 56 SK_FLAME_TOUCH,
… …
96 if (!skill_names[i]) 93 if (!skill_names[i])
97 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); 94 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
98 } 95 }
99} 96}
100 97
101
102/* This function goes through the player inventory and sets 98/* This function goes through the player inventory and sets
103 * up the last_skills[] array in the player object. 99 * up the last_skills[] array in the player object.
104 * the last_skills[] is used to more quickly lookup skills - 100 * the last_skills[] is used to more quickly lookup skills -
105 * mostly used for sending exp. 101 * mostly used for sending exp.
106 */ 102 */
107void 103void
108link_player_skills (object *op) 104link_player_skills (object *op)
109{ 105{
110 object *tmp;
111
112 for (tmp = op->inv; tmp; tmp = tmp->below) 106 for (object *tmp = op->inv; tmp; tmp = tmp->below)
113 {
114 if (tmp->type == SKILL) 107 if (tmp->type == SKILL)
115 { 108 {
116 /* This is really a warning, hence no else below */ 109 /* This is really a warning, hence no else below */
117 if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp) 110 if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp)
118 {
119 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n", 111 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
120 &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill); 112 &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill);
121 } 113
122 if (tmp->subtype >= NUM_SKILLS) 114 if (tmp->subtype >= NUM_SKILLS)
123 {
124 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS); 115 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);
125 }
126 else 116 else
127 { 117 {
128 op->contr->last_skill_ob[tmp->subtype] = tmp; 118 op->contr->last_skill_ob[tmp->subtype] = tmp;
129 op->contr->last_skill_exp[tmp->subtype] = -1; 119 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go
130 } 120 }
131 } 121 }
132 }
133} 122}
134 123
135/* This returns the skill pointer of the given name (the 124/* This returns the skill pointer of the given name (the
136 * one that accumlates exp, has the level, etc). 125 * one that accumlates exp, has the level, etc).
137 * 126 *
… …
241 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED)) 230 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
242 { 231 {
243 if (apply_special (who, skill_tool, 0)) 232 if (apply_special (who, skill_tool, 0))
244 return NULL; 233 return NULL;
245 } 234 }
235
246 if (!skill) 236 if (!skill)
247 { 237 {
248 skill = give_skill_by_name (who, skill_tool->skill); 238 skill = give_skill_by_name (who, skill_tool->skill);
249 link_player_skills (who); 239 link_player_skills (who);
250 } 240 }
241
251 return skill; 242 return skill;
252 } 243 }
244
253 return NULL; 245 return NULL;
254} 246}
255 247
256/* This changes the objects skill to new_skill. 248/* This changes the objects skill to new_skill.
257 * note that this function doesn't always need to get used - 249 * note that this function doesn't always need to get used -
… …
278 if (who->chosen_skill && who->chosen_skill == new_skill) 270 if (who->chosen_skill && who->chosen_skill == new_skill)
279 { 271 {
280 /* optimization for changing skill to current skill */ 272 /* optimization for changing skill to current skill */
281 if (who->type == PLAYER && !(flag & 0x1)) 273 if (who->type == PLAYER && !(flag & 0x1))
282 who->contr->shoottype = range_skill; 274 who->contr->shoottype = range_skill;
275
283 return 1; 276 return 1;
284 } 277 }
278
279 // move skill to front, so it will be preferred next time
280 new_skill->remove ();
281 who->insert (new_skill);
285 282
286 if (!new_skill || who->chosen_skill) 283 if (!new_skill || who->chosen_skill)
287 if (who->chosen_skill) 284 if (who->chosen_skill)
288 apply_special (who, who->chosen_skill, AP_UNAPPLY); 285 apply_special (who, who->chosen_skill, AP_UNAPPLY);
289 286
290 /* Only goal in this case was to unapply a skill */ 287 /* Only goal in this case was to unapply a skill */
291 if (!new_skill) 288 if (!new_skill)
292 return 0; 289 return 0;
293 290
294 if (apply_special (who, new_skill, AP_APPLY)) 291 if (apply_special (who, new_skill, AP_APPLY))
295 {
296 return 0; 292 return 0;
297 } 293
298 if (flag & 0x1) 294 if (flag & 0x1)
299 who->contr->shoottype = (rangetype) old_range; 295 who->contr->shoottype = (rangetype)old_range;
300 296
301 return 1; 297 return 1;
302} 298}
303 299
304/* This function just clears the chosen_skill and range_skill values 300/* This function just clears the chosen_skill and range_skill values
… …
344 * the player doesn't have a bucket for that, create one. 340 * the player doesn't have a bucket for that, create one.
345 */ 341 */
346 if (skill->type != SKILL && op->type == PLAYER) 342 if (skill->type != SKILL && op->type == PLAYER)
347 { 343 {
348 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 344 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
349 {
350 if (tmp->type == SKILL && tmp->skill == skill->skill) 345 if (tmp->type == SKILL && tmp->skill == skill->skill)
351 break; 346 break;
352 } 347
353 if (!tmp) 348 if (!tmp)
354 tmp = give_skill_by_name (op, skill->skill); 349 tmp = give_skill_by_name (op, skill->skill);
350
355 skill = tmp; 351 skill = tmp;
356 } 352 }
357 353
358 // skill, by_whom, on_which_object, which direction, skill_argument 354 // skill, by_whom, on_which_object, which direction, skill_argument
359 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string))) 355 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
360 return 0; 356 return 0;
361 357
362 switch (skill->subtype) 358 switch (skill->subtype)
363 { 359 {
364 case SK_LEVITATION: 360 case SK_LEVITATION:
365 /* Not 100% sure if this will work with new movement code - 361 /* Not 100% sure if this will work with new movement code -
366 * the levitation skill has move_type for flying, so when 362 * the levitation skill has move_type for flying, so when
367 * equipped, that should transfer to player, when not, 363 * equipped, that should transfer to player, when not,
368 * shouldn't. 364 * shouldn't.
369 */ 365 */
370 if (QUERY_FLAG (skill, FLAG_APPLIED)) 366 if (QUERY_FLAG (skill, FLAG_APPLIED))
371 { 367 {
372 CLEAR_FLAG (skill, FLAG_APPLIED); 368 CLEAR_FLAG (skill, FLAG_APPLIED);
373 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 369 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
374 } 370 }
375 else 371 else
376 { 372 {
377 SET_FLAG (skill, FLAG_APPLIED); 373 SET_FLAG (skill, FLAG_APPLIED);
378 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!."); 374 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!.");
379 } 375 }
380 fix_player (op); 376
377 op->update_stats ();
381 success = 1; 378 success = 1;
382 break; 379 break;
383 380
384 case SK_STEALING: 381 case SK_STEALING:
385 exp = success = steal (op, dir, skill); 382 exp = success = steal (op, dir, skill);
386 break; 383 break;
387 384
388 case SK_LOCKPICKING: 385 case SK_LOCKPICKING:
389 exp = success = pick_lock (op, dir, skill); 386 exp = success = pick_lock (op, dir, skill);
390 break; 387 break;
391 388
392 case SK_HIDING: 389 case SK_HIDING:
393 exp = success = hide (op, skill); 390 exp = success = hide (op, skill);
394 break; 391 break;
395 392
396 case SK_JUMPING: 393 case SK_JUMPING:
397 success = jump (op, dir, skill); 394 success = jump (op, dir, skill);
398 break; 395 break;
399 396
400 case SK_INSCRIPTION: 397 case SK_INSCRIPTION:
401 exp = success = write_on_item (op, string, skill); 398 exp = success = write_on_item (op, string, skill);
402 break; 399 break;
403 400
404 case SK_MEDITATION: 401 case SK_MEDITATION:
405 meditate (op, skill); 402 meditate (op, skill);
406 success = 1; 403 success = 1;
407 break; 404 break;
408 /* note that the following 'attack' skills gain exp through hit_player() */ 405 /* note that the following 'attack' skills gain exp through hit_player() */
409 406
410 case SK_KARATE: 407 case SK_KARATE:
411 (void) attack_hth (op, dir, "karate-chopped", skill); 408 (void) attack_hth (op, dir, "karate-chopped", skill);
412 break; 409 break;
413 410
414 case SK_PUNCHING: 411 case SK_PUNCHING:
415 (void) attack_hth (op, dir, "punched", skill); 412 (void) attack_hth (op, dir, "punched", skill);
416 break; 413 break;
417 414
418 case SK_FLAME_TOUCH: 415 case SK_FLAME_TOUCH:
419 (void) attack_hth (op, dir, "flamed", skill); 416 (void) attack_hth (op, dir, "flamed", skill);
420 break; 417 break;
421 418
422 case SK_SPARK_TOUCH: 419 case SK_SPARK_TOUCH:
423 (void) attack_hth (op, dir, "zapped", skill); 420 (void) attack_hth (op, dir, "zapped", skill);
424 break; 421 break;
425 422
426 case SK_SHIVER: 423 case SK_SHIVER:
427 (void) attack_hth (op, dir, "froze", skill); 424 (void) attack_hth (op, dir, "froze", skill);
428 break; 425 break;
429 426
430 case SK_ACID_SPLASH: 427 case SK_ACID_SPLASH:
431 (void) attack_hth (op, dir, "dissolved", skill); 428 (void) attack_hth (op, dir, "dissolved", skill);
432 break; 429 break;
433 430
434 case SK_POISON_NAIL: 431 case SK_POISON_NAIL:
435 (void) attack_hth (op, dir, "injected poison into", skill); 432 (void) attack_hth (op, dir, "injected poison into", skill);
436 break; 433 break;
437 434
438 case SK_CLAWING: 435 case SK_CLAWING:
439 (void) attack_hth (op, dir, "clawed", skill); 436 (void) attack_hth (op, dir, "clawed", skill);
440 break; 437 break;
441 438
442 case SK_ONE_HANDED_WEAPON: 439 case SK_ONE_HANDED_WEAPON:
443 case SK_TWO_HANDED_WEAPON: 440 case SK_TWO_HANDED_WEAPON:
444 (void) attack_melee_weapon (op, dir, NULL, skill); 441 (void) attack_melee_weapon (op, dir, NULL, skill);
445 break; 442 break;
446 443
447 case SK_FIND_TRAPS: 444 case SK_FIND_TRAPS:
448 exp = success = find_traps (op, skill); 445 exp = success = find_traps (op, skill);
449 break; 446 break;
450 447
451 case SK_SINGING: 448 case SK_SINGING:
452 exp = success = singing (op, dir, skill); 449 exp = success = singing (op, dir, skill);
453 break; 450 break;
454 451
455 case SK_ORATORY: 452 case SK_ORATORY:
456 exp = success = use_oratory (op, dir, skill); 453 exp = success = use_oratory (op, dir, skill);
457 break; 454 break;
458 455
459 case SK_SMITHERY: 456 case SK_SMITHERY:
460 case SK_BOWYER: 457 case SK_BOWYER:
461 case SK_JEWELER: 458 case SK_JEWELER:
462 case SK_ALCHEMY: 459 case SK_ALCHEMY:
463 case SK_THAUMATURGY: 460 case SK_THAUMATURGY:
464 case SK_LITERACY: 461 case SK_LITERACY:
465 case SK_WOODSMAN: 462 case SK_WOODSMAN:
466 /* first, we try to find a cauldron, and do the alchemy thing. 463 /* first, we try to find a cauldron, and do the alchemy thing.
467 * failing that, we go and identify stuff. 464 * failing that, we go and identify stuff.
468 */ 465 */
469 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = next) 466 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next)
470 { 467 {
471 next = tmp->above; 468 next = tmp->above;
469
472 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 470 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
473 { 471 {
474 attempt_do_alchemy (op, tmp); 472 attempt_do_alchemy (op, tmp);
473
475 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 474 if (QUERY_FLAG (tmp, FLAG_APPLIED))
476 esrv_send_inventory (op, tmp); 475 esrv_send_inventory (op, tmp);
476
477 did_alc = 1; 477 did_alc = 1;
478 } 478 }
479 } 479 }
480
480 if (did_alc == 0) 481 if (did_alc == 0)
481 exp = success = skill_ident (op, skill);
482 break;
483
484 case SK_DET_MAGIC:
485 case SK_DET_CURSE:
486 exp = success = skill_ident (op, skill); 482 exp = success = skill_ident (op, skill);
483
487 break; 484 break;
488 485
486 case SK_DET_MAGIC:
487 case SK_DET_CURSE:
488 exp = success = skill_ident (op, skill);
489 break;
490
489 case SK_DISARM_TRAPS: 491 case SK_DISARM_TRAPS:
490 exp = success = remove_trap (op, dir, skill); 492 exp = success = remove_trap (op, dir, skill);
491 break; 493 break;
492 494
493 case SK_THROWING: 495 case SK_THROWING:
494 success = skill_throw (op, part, dir, string, skill); 496 success = skill_throw (op, part, dir, string, skill);
495 break; 497 break;
496 498
497 case SK_SET_TRAP: 499 case SK_SET_TRAP:
498 new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented."); 500 new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented.");
499 break; 501 break;
500 502
501 case SK_USE_MAGIC_ITEM: 503 case SK_USE_MAGIC_ITEM:
502 case SK_MISSILE_WEAPON: 504 case SK_MISSILE_WEAPON:
503 new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill."); 505 new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill.");
504 break; 506 break;
505 507
506 case SK_PRAYING: 508 case SK_PRAYING:
507 success = pray (op, skill); 509 success = pray (op, skill);
508 break; 510 break;
509 511
510 case SK_BARGAINING: 512 case SK_BARGAINING:
511 success = describe_shop (op); 513 success = describe_shop (op);
512 break; 514 break;
513 515
514 case SK_SORCERY: 516 case SK_SORCERY:
515 case SK_EVOCATION: 517 case SK_EVOCATION:
516 case SK_PYROMANCY: 518 case SK_PYROMANCY:
517 case SK_SUMMONING: 519 case SK_SUMMONING:
518 case SK_CLIMBING: 520 case SK_CLIMBING:
519 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 521 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
520 break; 522 break;
521 523
522 default: 524 default:
523 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 525 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
524 break; 526 break;
525 } 527 }
526 528
527 /* For players we now update the speed_left from using the skill. 529 /* For players we now update the speed_left from using the skill.
528 * Monsters have no skill use time because of the random nature in 530 * Monsters have no skill use time because of the random nature in
529 * which use_monster_skill is called already simulates this. 531 * which use_monster_skill is called already simulates this.
… …
691 693
692 /* player already knows it */ 694 /* player already knows it */
693 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 695 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
694 return 0; 696 return 0;
695 697
696
697
698 /* now a random change to learn, based on player Int. 698 /* now a random change to learn, based on player Int.
699 * give bonus based on level - otherwise stupid characters 699 * give bonus based on level - otherwise stupid characters
700 * might never be able to learn anything. 700 * might never be able to learn anything.
701 */ 701 */
702 if (random_roll (0, 99, pl, PREFER_LOW) > (learn_spell[pl->stats.Int] + (pl->level / 5))) 702 if (random_roll (0, 99, pl, PREFER_LOW) > (learn_spell[pl->stats.Int] + (pl->level / 5)))
… …
771 sprintf (buf, "%s%s", &tmp->name, periods); 771 sprintf (buf, "%s%s", &tmp->name, periods);
772 buf[40] = 0; 772 buf[40] = 0;
773 773
774 if (settings.permanent_exp_ratio) 774 if (settings.permanent_exp_ratio)
775 { 775 {
776 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%lld/%lld/%d%%)", 776 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
777 buf, tmp->level, 777 buf, tmp->level, tmp->stats.exp,
778 (long long) tmp->stats.exp,
779 (long long) level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 778 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
780 } 779 }
781 else 780 else
782 { 781 {
783 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%lld/%lld)", 782 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
784 buf, tmp->level, (long long) tmp->stats.exp, (long long) level_exp (tmp->level + 1, op->expmul)); 783 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
785 } 784 }
786 /* I don't know why some characters get a bunch of skills, but 785 /* I don't know why some characters get a bunch of skills, but
787 * it sometimes happens (maybe a leftover from bugier earlier code 786 * it sometimes happens (maybe a leftover from bugier earlier code
788 * and those character are still about). In any case, lets handle 787 * and those character are still about). In any case, lets handle
789 * it so it doesn't crash the server - otherwise, one character may 788 * it so it doesn't crash the server - otherwise, one character may
… …
799 } 798 }
800 799
801 clear_win_info (op); 800 clear_win_info (op);
802 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 801 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");
803 if (num_skills_found > 1) 802 if (num_skills_found > 1)
804 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) strcmp); 803 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp);
805 804
806 for (i = 0; i < num_skills_found; i++) 805 for (i = 0; i < num_skills_found; i++)
807 {
808 new_draw_info (NDI_UNIQUE, 0, op, skills[i]); 806 new_draw_info (NDI_UNIQUE, 0, op, skills[i]);
809 }
810 807
811 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); 808 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5);
812 809
813 cp = determine_god (op); 810 cp = determine_god (op);
814 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); 811 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time");
… …
876 return 1; 873 return 1;
877 874
878 return 0; 875 return 0;
879} 876}
880 877
878static bool
879hth_skill_p (object *skill)
880{
881 for (unsigned int i = 0; i < sizeof (unarmed_skills); ++i)
882 if (skill->subtype == unarmed_skills[i])
883 return 1;
881 884
885 return 0;
886}
882 887
883/* This finds the best unarmed skill the player has, and returns 888/* This finds the first unarmed skill the player has, and returns it.
884 * it. Best can vary a little - we consider clawing to always
885 * be the best for dragons.
886 * This could be more intelligent, eg, look at the skill level
887 * of the skill and go from there (eg, a level 40 puncher is
888 * is probably better than level 1 karate). OTOH, if you
889 * don't bother to set up your skill properly, that is the players
890 * problem (although, it might be nice to have a preferred skill
891 * field the player can set.
892 * Unlike the old code, we don't give out any skills - it is
893 * possible you just don't have any ability to get into unarmed
894 * combat. If everyone race/class should have one, this should
895 * be handled in the starting treasurelists, not in the code.
896 */ 889 */
897static object * 890static object *
898find_best_player_hth_skill (object *op) 891find_player_hth_skill (object *op)
899{ 892{
900 object *tmp, *best_skill = NULL;
901 int dragon = is_dragon_pl (op), last_skill = sizeof (unarmed_skills), i;
902
903 for (tmp = op->inv; tmp; tmp = tmp->below) 893 for (object *tmp = op->inv; tmp; tmp = tmp->below)
904 { 894 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp))
905 if (tmp->type == SKILL)
906 {
907 if (dragon && tmp->subtype == SK_CLAWING)
908 return tmp; 895 return tmp;
909 896
910 /* The order in the array is preferred order. So basically, 897 return 0;
911 * we just cut down the number to search - eg, if we find a skill
912 * early on in flame touch, then we only need to look into the unarmed_array
913 * to the entry before flame touch - don't care about the entries afterward,
914 * because they are infrerior skills.
915 * if we end up finding the best skill (i==0) might as well return
916 * right away - can't get any better than that.
917 */
918 for (i = 0; i < last_skill; i++)
919 {
920 if (tmp->subtype == unarmed_skills[i] && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
921 {
922 best_skill = tmp;
923 last_skill = i;
924 if (i == 0)
925 return best_skill;
926 }
927 }
928 }
929 }
930 return best_skill;
931} 898}
932 899
933/* do_skill_attack() - We have got an appropriate opponent from either 900/* do_skill_attack() - We have got an appropriate opponent from either
934 * move_player_attack() or skill_attack(). In this part we get on with 901 * move_player_attack() or skill_attack(). In this part we get on with
935 * attacking, take care of messages from the attack and changes in invisible. 902 * attacking, take care of messages from the attack and changes in invisible.
… …
956 */ 923 */
957 if (op->type == PLAYER) 924 if (op->type == PLAYER)
958 { 925 {
959 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 926 if (!QUERY_FLAG (op, FLAG_READY_WEAPON))
960 { 927 {
961 size_t i;
962
963 if (!skill) 928 if (!skill)
964 { 929 {
965 /* See if the players chosen skill is a combat skill, and use 930 /* See if the players chosen skill is a combat skill, and use
966 * it if appropriate. 931 * it if appropriate.
967 */ 932 */
933 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
968 if (op->chosen_skill) 934 skill = op->chosen_skill;
935 else
969 { 936 {
970 for (i = 0; i < sizeof (unarmed_skills); i++)
971 if (op->chosen_skill->subtype == unarmed_skills[i])
972 {
973 skill = op->chosen_skill;
974 break;
975 }
976 }
977 /* If we didn't find a skill above, look harder for a good skill */
978 if (!skill)
979 {
980 skill = find_best_player_hth_skill (op); 937 skill = find_player_hth_skill (op);
981 938
982 if (!skill) 939 if (!skill)
983 { 940 {
984 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 941 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
985 return 0; 942 return 0;
986 } 943 }
987 } 944 }
988 } 945 }
989 if (skill != op->chosen_skill) 946
990 {
991 /* now try to ready the new skill */ 947 /* now try to ready the new skill */
992 if (!change_skill (op, skill, 0)) 948 if (!change_skill (op, skill, 0))
993 { /* oh oh, trouble! */ 949 { /* oh oh, trouble! */
994 new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name); 950 new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name);
995 return 0; 951 return 0;
996 }
997 } 952 }
998 } 953 }
999 else 954 else
1000 { 955 {
1001 /* Seen some crashes below where current_weapon is not set, 956 /* Seen some crashes below where current_weapon is not set,
… …
1021 { 976 {
1022 op->current_weapon = tmp; 977 op->current_weapon = tmp;
1023 } 978 }
1024 } 979 }
1025 980
1026 /* Has ready weapon - make sure chosen_skill is set up properly */
1027 if (!op->chosen_skill || op->current_weapon->skill != op->chosen_skill->skill)
1028 {
1029 change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1); 981 change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1);
1030 }
1031 } 982 }
1032 } 983 }
1033 984
1034 /* lose invisiblity/hiding status for running attacks */ 985 /* lose invisiblity/hiding status for running attacks */
1035 986
… …
1075 maptile *m; 1026 maptile *m;
1076 int mflags; 1027 int mflags;
1077 1028
1078 if (!dir) 1029 if (!dir)
1079 dir = pl->facing; 1030 dir = pl->facing;
1031
1080 tx = freearr_x[dir]; 1032 tx = freearr_x[dir];
1081 ty = freearr_y[dir]; 1033 ty = freearr_y[dir];
1082 1034
1083 /* If we don't yet have an opponent, find if one exists, and attack. 1035 /* If we don't yet have an opponent, find if one exists, and attack.
1084 * Legal opponents are the same as outlined in move_player_attack() 1036 * Legal opponents are the same as outlined in move_player_attack()
… …
1096 1048
1097 /* space must be blocked for there to be anything interesting to do */ 1049 /* space must be blocked for there to be anything interesting to do */
1098 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) 1050 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
1099 return 0; 1051 return 0;
1100 1052
1101 for (tmp = get_map_ob (m, tx, ty); tmp; tmp = tmp->above) 1053 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
1102 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 1054 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR)
1103 { 1055 {
1104 /* Don't attack party members */ 1056 /* Don't attack party members */
1105 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 1057 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1106 return 0; 1058 return 0;
… …
1135 { 1087 {
1136 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 1088 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED))
1137 { 1089 {
1138 CLEAR_FLAG (weapon, FLAG_APPLIED); 1090 CLEAR_FLAG (weapon, FLAG_APPLIED);
1139 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 1091 CLEAR_FLAG (pl, FLAG_READY_WEAPON);
1140 fix_player (pl); 1092 pl->update_stats ();
1141 if (pl->type == PLAYER) 1093 if (pl->type == PLAYER)
1142 { 1094 {
1143 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 1095 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1144 esrv_update_item (UPD_FLAGS, pl, weapon); 1096 esrv_update_item (UPD_FLAGS, pl, weapon);
1145 } 1097 }

Diff Legend

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