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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.17 by elmex, Wed Jan 3 02:30:51 2007 UTC vs.
Revision 1.35 by root, Sun May 27 23:56:21 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (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 authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <funcpoint.h> 26#include <funcpoint.h>
26#include <living.h> 27#include <living.h>
27#include <spells.h> 28#include <spells.h>
46 * may be better. 47 * may be better.
47 * Basically, for the use/nonuse, the code does something like: 48 * Basically, for the use/nonuse, the code does something like:
48 * "This item goes %s\n", with the use/nonuse values filling in the %s 49 * "This item goes %s\n", with the use/nonuse values filling in the %s
49 */ 50 */
50Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 51Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
51 {"body_range", "in your range slot", "in a human's range slot"}, 52 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
52 {"body_arm", "on your arm", "on a human's arm"}, 53 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
53 {"body_torso", "on your body", "on a human's torso"}, 54 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
54 {"body_head", "on your head", "on a human's head"}, 55 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
55 {"body_neck", "around your neck", "around a humans neck"}, 56 {KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
56 {"body_skill", "in your skill slot", "in a human's skill slot"}, 57 {KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
57 {"body_finger", "on your finger", "on a human's finger"} , 58 {KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
59 {KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
60 {KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
58 {"body_shoulder", "around your shoulders", "around a human's shoulders"}, 61 {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
59 {"body_foot", "on your feet", "on a human's feet"}, 62 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
60 {"body_hand", "on your hands", "on a human's hands"}, 63 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
61 {"body_wrist", "around your wrists", "around a human's wrist"}, 64 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
62 {"body_waist", "around your waist", "around a human's waist"}, 65 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
63/*{"body_dragon_torso", "your body", "a dragon's body"} */ 66/*{"body_dragon_torso", "your body", "a dragon's body"} */
64}; 67};
65 68
66static char numbers[21][20] = { 69static char numbers[21][20] = {
67 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", 70 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
249}; 252};
250 253
251int 254int
252get_power_from_ench (int ench) 255get_power_from_ench (int ench)
253{ 256{
254 if (ench < 0) 257 if (ench < 0) ench = 0;
255 ench = 0; 258 if (ench > 20) ench = 20;
256 if (ench > 20) 259
257 ench = 20;
258 return enc_to_item_power[ench]; 260 return enc_to_item_power[ench];
259} 261}
260 262
261/* This takes an object 'op' and figures out what its item_power 263/* This takes an object 'op' and figures out what its item_power
262 * rating should be. This should only really be used by the treasure 264 * rating should be. This should only really be used by the treasure
270{ 272{
271 int i, tmp, enc; 273 int i, tmp, enc;
272 274
273 enc = 0; 275 enc = 0;
274 for (i = 0; i < NUM_STATS; i++) 276 for (i = 0; i < NUM_STATS; i++)
275 enc += get_attr_value (&op->stats, i); 277 enc += op->stats.stat (i);
276 278
277 /* This protection logic is pretty flawed. 20% fire resistance 279 /* This protection logic is pretty flawed. 20% fire resistance
278 * is much more valuable than 20% confusion, or 20% slow, or 280 * is much more valuable than 20% confusion, or 20% slow, or
279 * several others. Start at 1 - ignore physical - all that normal 281 * several others. Start at 1 - ignore physical - all that normal
280 * armour shouldn't be counted against 282 * armour shouldn't be counted against
341 enc += 1; 343 enc += 1;
342 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 344 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
343 enc += 1; 345 enc += 1;
344 346
345 return get_power_from_ench (enc); 347 return get_power_from_ench (enc);
346
347} 348}
348 349
349/* returns the typedata that has a number equal to itemtype, if there 350/* returns the typedata that has a number equal to itemtype, if there
350 * isn't one, returns NULL */ 351 * isn't one, returns NULL */
351
352const typedata * 352const typedata *
353get_typedata (int itemtype) 353get_typedata (int itemtype)
354{ 354{
355 int i; 355 int i;
356 356
361} 361}
362 362
363/* returns the typedata that has a name equal to itemtype, if there 363/* returns the typedata that has a name equal to itemtype, if there
364 * isn't one, return the plural name that matches, if there still isn't 364 * isn't one, return the plural name that matches, if there still isn't
365 * one return NULL */ 365 * one return NULL */
366
367const typedata * 366const typedata *
368get_typedata_by_name (const char *name) 367get_typedata_by_name (const char *name)
369{ 368{
370 int i; 369 int i;
371 370
386 * returns a static array of the description. This can return 385 * returns a static array of the description. This can return
387 * a big buffer. 386 * a big buffer.
388 * if newline is true, we don't put parens around the description 387 * if newline is true, we don't put parens around the description
389 * but do put a newline at the end. Useful when dumping to files 388 * but do put a newline at the end. Useful when dumping to files
390 */ 389 */
391char * 390const char *
392describe_resistance (const object *op, int newline) 391describe_resistance (const object *op, int newline)
393{ 392{
394 static char buf[VERY_BIG_BUF]; 393 static char buf[VERY_BIG_BUF];
395 char buf1[VERY_BIG_BUF]; 394 char buf1[VERY_BIG_BUF];
396 int tmpvar; 395 int tmpvar;
415/* 414/*
416 * query_weight(object) returns a character pointer to a static buffer 415 * query_weight(object) returns a character pointer to a static buffer
417 * containing the text-representation of the weight of the given object. 416 * containing the text-representation of the weight of the given object.
418 * The buffer will be overwritten by the next call to query_weight(). 417 * The buffer will be overwritten by the next call to query_weight().
419 */ 418 */
420 419const char *
421char *
422query_weight (const object *op) 420query_weight (const object *op)
423{ 421{
424 static char buf[10]; 422 static char buf[10];
425 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 423 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
426 424
427 if (op->weight < 0) 425 if (op->weight < 0)
428 return " "; 426 return " ";
427
429 if (i % 1000) 428 if (i % 1000)
430 sprintf (buf, "%6.1f", i / 1000.0); 429 sprintf (buf, "%6.1f", i / 1000.0);
431 else 430 else
432 sprintf (buf, "%4d ", i / 1000); 431 sprintf (buf, "%4d ", i / 1000);
432
433 return buf; 433 return buf;
434} 434}
435 435
436/* 436/*
437 * Returns the pointer to a static buffer containing 437 * Returns the pointer to a static buffer containing
438 * the number requested (of the form first, second, third...) 438 * the number requested (of the form first, second, third...)
439 */ 439 */
440 440const char *
441char *
442get_levelnumber (int i) 441get_levelnumber (int i)
443{ 442{
444 static char buf[MAX_BUF]; 443 static char buf[MAX_BUF];
445 444
446 if (i > 99) 445 if (i > 99)
447 { 446 {
448 sprintf (buf, "%d.", i); 447 sprintf (buf, "%d.", i);
449 return buf; 448 return buf;
450 } 449 }
450
451 if (i < 21) 451 if (i < 21)
452 return levelnumbers[i]; 452 return levelnumbers[i];
453 if (!(i % 10)) 453 if (!(i % 10))
454 return levelnumbers_10[i / 10]; 454 return levelnumbers_10[i / 10];
455
455 strcpy (buf, numbers_10[i / 10]); 456 strcpy (buf, numbers_10[i / 10]);
456 strcat (buf, levelnumbers[i % 10]); 457 strcat (buf, levelnumbers[i % 10]);
457 return buf; 458 return buf;
458} 459}
459
460 460
461/* 461/*
462 * get_number(integer) returns the text-representation of the given number 462 * get_number(integer) returns the text-representation of the given number
463 * in a static buffer. The buffer might be overwritten at the next 463 * in a static buffer. The buffer might be overwritten at the next
464 * call to get_number(). 464 * call to get_number().
465 * It is currently only used by the query_name() function. 465 * It is currently only used by the query_name() function.
466 */ 466 */
467 467const char *
468char *
469get_number (int i) 468get_number (int i)
470{ 469{
471 if (i <= 20) 470 if (i <= 20)
472 return numbers[i]; 471 return numbers[i];
473 else 472 else
490 */ 489 */
491 490
492/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 491/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
493 * from stats.sp - b.t. 492 * from stats.sp - b.t.
494 */ 493 */
495char * 494const char *
496ring_desc (const object *op) 495ring_desc (const object *op)
497{ 496{
498 static char buf[VERY_BIG_BUF]; 497 static char buf[VERY_BIG_BUF];
499 int attr, val, len; 498 int attr, val, len;
500 499
503 if (!QUERY_FLAG (op, FLAG_IDENTIFIED)) 502 if (!QUERY_FLAG (op, FLAG_IDENTIFIED))
504 return buf; 503 return buf;
505 504
506 for (attr = 0; attr < NUM_STATS; attr++) 505 for (attr = 0; attr < NUM_STATS; attr++)
507 { 506 {
508 if ((val = get_attr_value (&(op->stats), attr)) != 0) 507 if ((val = op->stats.stat (attr)))
509 {
510 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 508 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);
511 }
512 } 509 }
510
513 if (op->stats.exp) 511 if (op->stats.exp)
514 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 512 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
515 if (op->stats.wc) 513 if (op->stats.wc)
516 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc); 514 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
517 if (op->stats.dam) 515 if (op->stats.dam)
539 strcat (buf, "(reflect spells)"); 537 strcat (buf, "(reflect spells)");
540 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 538 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
541 strcat (buf, "(reflect missiles)"); 539 strcat (buf, "(reflect missiles)");
542 if (QUERY_FLAG (op, FLAG_STEALTH)) 540 if (QUERY_FLAG (op, FLAG_STEALTH))
543 strcat (buf, "(stealth)"); 541 strcat (buf, "(stealth)");
542
544 /* Shorten some of the names, so they appear better in the windows */ 543 /* Shorten some of the names, so they appear better in the windows */
545 len = strlen (buf); 544 len = strlen (buf);
546 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF); 545 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
547 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF); 546 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
548 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF); 547 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
613 case AMULET: 612 case AMULET:
614 case RING: 613 case RING:
615 if (!op->title) 614 if (!op->title)
616 { 615 {
617 /* If ring has a title, full description isn't so useful */ 616 /* If ring has a title, full description isn't so useful */
618 char *s = ring_desc (op); 617 const char *s = ring_desc (op);
619 618
620 if (s[0]) 619 if (s[0])
621 { 620 {
622 safe_strcat (buf, " ", &len, HUGE_BUF); 621 safe_strcat (buf, " ", &len, HUGE_BUF);
623 safe_strcat (buf, s, &len, HUGE_BUF); 622 safe_strcat (buf, s, &len, HUGE_BUF);
643 * overwritten. This may be a bad thing (it may be easier to assume the value 642 * overwritten. This may be a bad thing (it may be easier to assume the value
644 * returned is good forever.) However, it makes printing statements that 643 * returned is good forever.) However, it makes printing statements that
645 * use several names much easier (don't need to store them to temp variables.) 644 * use several names much easier (don't need to store them to temp variables.)
646 * 645 *
647 */ 646 */
648char * 647const char *
649query_name (const object *op) 648query_name (const object *op)
650{ 649{
651 static char buf[5][HUGE_BUF]; 650 static char buf[5][HUGE_BUF]; // OMFG
652 static int use_buf = 0; 651 static int use_buf = 0;
653 int len = 0; 652 int len = 0;
654 653
655#ifdef NEW_MATERIAL_CODE 654#ifdef NEW_MATERIAL_CODE
656 materialtype_t *mt; 655 materialtype_t *mt;
683 if (QUERY_FLAG (op, FLAG_DAMNED)) 682 if (QUERY_FLAG (op, FLAG_DAMNED))
684 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 683 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
685 else if (QUERY_FLAG (op, FLAG_CURSED)) 684 else if (QUERY_FLAG (op, FLAG_CURSED))
686 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 685 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
687 } 686 }
687
688 /* Basically, if the object is known magical (detect magic spell on it), 688 /* Basically, if the object is known magical (detect magic spell on it),
689 * and it isn't identified, print out the fact that 689 * and it isn't identified, print out the fact that
690 * it is magical. Assume that the detect magical spell will only set 690 * it is magical. Assume that the detect magical spell will only set
691 * KNOWN_MAGICAL if the item actually is magical. 691 * KNOWN_MAGICAL if the item actually is magical.
692 * 692 *
708 708
709 if (QUERY_FLAG (op, FLAG_APPLIED)) 709 if (QUERY_FLAG (op, FLAG_APPLIED))
710 { 710 {
711 switch (op->type) 711 switch (op->type)
712 { 712 {
713 case BOW: 713 case BOW:
714 case WAND: 714 case WAND:
715 case ROD: 715 case ROD:
716 case HORN: 716 case HORN:
717 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 717 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF);
718 break; 718 break;
719 case WEAPON: 719 case WEAPON:
720 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 720 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF);
721 break; 721 break;
722 case ARMOUR: 722 case ARMOUR:
723 case HELMET: 723 case HELMET:
724 case SHIELD: 724 case SHIELD:
725 case RING: 725 case RING:
726 case BOOTS: 726 case BOOTS:
727 case GLOVES: 727 case GLOVES:
728 case AMULET: 728 case AMULET:
729 case GIRDLE: 729 case GIRDLE:
730 case BRACERS: 730 case BRACERS:
731 case CLOAK: 731 case CLOAK:
732 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 732 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
733 break; 733 break;
734 case CONTAINER: 734 case CONTAINER:
735 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 735 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
736 break; 736 break;
737 case SKILL: 737 case SKILL:
738 default: 738 default:
739 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 739 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
740 } 740 }
741 } 741 }
742
742 if (QUERY_FLAG (op, FLAG_UNPAID)) 743 if (QUERY_FLAG (op, FLAG_UNPAID))
743 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 744 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
744 745
745 return buf[use_buf]; 746 return buf [use_buf];
746} 747}
747 748
748/* 749/*
749 * query_base_name(object) returns a character pointer pointing to a static 750 * query_base_name(object) returns a character pointer pointing to a static
750 * buffer which contains a verbose textual representation of the name 751 * buffer which contains a verbose textual representation of the name
784 } 785 }
785 else 786 else
786 { 787 {
787#endif 788#endif
788 if (!plural) 789 if (!plural)
789 strcpy (buf, op->name); 790 assign (buf, op->name);
790 else 791 else
791 strcpy (buf, op->name_pl); 792 assign (buf, op->name_pl);
793
792 len = strlen (buf); 794 len = strlen (buf);
793#ifdef NEW_MATERIAL_CODE 795#ifdef NEW_MATERIAL_CODE
794 } 796 }
795#endif 797#endif
796 798
800 safe_strcat (buf, op->title, &len, MAX_BUF); 802 safe_strcat (buf, op->title, &len, MAX_BUF);
801 } 803 }
802 804
803 switch (op->type) 805 switch (op->type)
804 { 806 {
805 case SPELLBOOK: 807 case SPELLBOOK:
806 case SCROLL: 808 case SCROLL:
807 case WAND: 809 case WAND:
808 case ROD: 810 case ROD:
809 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 811 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
810 { 812 {
811 if (!op->title) 813 if (!op->title)
812 { 814 {
813 safe_strcat (buf, " of ", &len, MAX_BUF); 815 safe_strcat (buf, " of ", &len, MAX_BUF);
814 if (op->inv) 816 if (op->inv)
815 safe_strcat (buf, op->inv->name, &len, MAX_BUF); 817 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
816 else 818 else
817 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 819 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
818 } 820 }
819 if (op->type != SPELLBOOK) 821 if (op->type != SPELLBOOK)
820 { 822 {
821 sprintf (buf2, " (lvl %d)", op->level); 823 sprintf (buf2, " (lvl %d)", op->level);
822 safe_strcat (buf, buf2, &len, MAX_BUF); 824 safe_strcat (buf, buf2, &len, MAX_BUF);
823 } 825 }
824 } 826 }
825 break; 827 break;
826 828
827 829
828 case SKILL: 830 case SKILL:
829 case AMULET: 831 case AMULET:
830 case RING: 832 case RING:
831 if (!op->title) 833 if (!op->title)
832 { 834 {
833 /* If ring has a title, full description isn't so useful */ 835 /* If ring has a title, full description isn't so useful */
834 char *s = ring_desc (op); 836 const char *s = ring_desc (op);
835 837
836 if (s[0]) 838 if (s[0])
837 { 839 {
838 safe_strcat (buf, " ", &len, MAX_BUF); 840 safe_strcat (buf, " ", &len, MAX_BUF);
839 safe_strcat (buf, s, &len, MAX_BUF); 841 safe_strcat (buf, s, &len, MAX_BUF);
840 } 842 }
841 } 843 }
842 break; 844 break;
845
843 default: 846 default:
844 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 847 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
845 {
846 sprintf (buf + strlen (buf), " %+d", op->magic); 848 sprintf (buf + strlen (buf), " %+d", op->magic);
847 }
848 } 849 }
850
849 return buf; 851 return buf;
850} 852}
851 853
852/* Break this off from describe_item - that function was way 854/* Break this off from describe_item - that function was way
853 * too long, making it difficult to read. This function deals 855 * too long, making it difficult to read. This function deals
854 * with describing the monsters & players abilities. It should only 856 * with describing the monsters & players abilities. It should only
855 * be called with monster & player objects. Returns a description 857 * be called with monster & player objects. Returns a description
856 * in a static buffer. 858 * in a static buffer.
857 */ 859 */
858
859static char * 860static char *
860describe_monster (const object *op) 861describe_monster (const object *op)
861{ 862{
862 char buf[MAX_BUF]; 863 char buf[MAX_BUF];
863 static char retbuf[VERY_BIG_BUF]; 864 static char retbuf[VERY_BIG_BUF];
989 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 990 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
990 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 991 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))
991 break; 992 break;
992 993
993 if (tmp && tmp->attacktype != 0) 994 if (tmp && tmp->attacktype != 0)
994 {
995 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws"); 995 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") }
996 }
997 else 996 else
998 {
999 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 997 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1000 }
1001 } 998 }
1002 else 999 else
1003 {
1004 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1000 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1005 } 1001
1006 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 1002 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1007 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 1003 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1008 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 1004 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1005
1009 for (i = 0; i < NROFATTACKS; i++) 1006 for (i = 0; i < NROFATTACKS; i++)
1010 {
1011 if (op->resist[i]) 1007 if (op->resist[i])
1012 { 1008 {
1013 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 1009 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
1014 strcat (retbuf, buf); 1010 strcat (retbuf, buf);
1015 } 1011 }
1016 } 1012
1017 return retbuf; 1013 return retbuf;
1018} 1014}
1019 1015
1020 1016
1021/* 1017/*
1042 * 1038 *
1043 * Add 'owner' who is the person examining this object. 1039 * Add 'owner' who is the person examining this object.
1044 * owner can be null if no one is being associated with this 1040 * owner can be null if no one is being associated with this
1045 * item (eg, debug dump or the like) 1041 * item (eg, debug dump or the like)
1046 */ 1042 */
1047 1043const char *
1048char *
1049describe_item (const object *op, object *owner) 1044describe_item (const object *op, object *owner)
1050{ 1045{
1051 char buf[MAX_BUF]; 1046 char buf[MAX_BUF];
1052 static char retbuf[VERY_BIG_BUF]; 1047 static char retbuf[VERY_BIG_BUF];
1053 int identified, i; 1048 int identified, i;
1087 break; /* We have more information to do below this switch */ 1082 break; /* We have more information to do below this switch */
1088 1083
1089 case POWER_CRYSTAL: 1084 case POWER_CRYSTAL:
1090 if (op->stats.maxsp > 1000) 1085 if (op->stats.maxsp > 1000)
1091 { /*higher capacity crystals */ 1086 { /*higher capacity crystals */
1092 i = (op->stats.maxsp % 100) / 10; 1087 i = (op->stats.maxsp % 1000) / 100;
1088
1093 if (i) 1089 if (i)
1094 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 100, i); 1090 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1095 else 1091 else
1096 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 100); 1092 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 1000);
1097 } 1093 }
1098 else 1094 else
1099 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 1095 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp);
1096
1100 strcat (retbuf, buf); 1097 strcat (retbuf, buf);
1101 i = (op->stats.sp * 10) / op->stats.maxsp; 1098 i = (op->stats.sp * 10) / op->stats.maxsp;
1102 if (op->stats.sp == 0) 1099 if (op->stats.sp == 0)
1103 strcat (retbuf, "empty."); 1100 strcat (retbuf, "empty.");
1104 else if (i == 0) 1101 else if (i == 0)
1169 { 1166 {
1170 int attr, val; 1167 int attr, val;
1171 1168
1172 for (attr = 0; attr < NUM_STATS; attr++) 1169 for (attr = 0; attr < NUM_STATS; attr++)
1173 { 1170 {
1174 if ((val = get_attr_value (&(op->stats), attr)) != 0) 1171 if ((val = op->stats.stat (attr)))
1175 { 1172 {
1176 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1173 sprintf (buf, "(%s%+d)", short_stat_name[attr], val);
1177 strcat (retbuf, buf); 1174 strcat (retbuf, buf);
1178 } 1175 }
1179 } 1176 }
1363 } 1360 }
1364 1361
1365 return retbuf; 1362 return retbuf;
1366} 1363}
1367 1364
1365std::string
1366object::describe_item (object *who)
1367{
1368 return std::string (::describe_item (this, who));
1369}
1370
1368/* Return true if the item is magical. A magical item is one that 1371/* Return true if the item is magical. A magical item is one that
1369 * increases/decreases any abilities, provides a resistance, 1372 * increases/decreases any abilities, provides a resistance,
1370 * has a generic magical bonus, or is an artifact. 1373 * has a generic magical bonus, or is an artifact.
1371 * This function is used by detect_magic to determine if an item 1374 * This function is used by detect_magic to determine if an item
1372 * should be marked as magical. 1375 * should be marked as magical.
1430 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE) 1433 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE)
1431 return 1; 1434 return 1;
1432 1435
1433 /* Check to see if it increases/decreases any stats */ 1436 /* Check to see if it increases/decreases any stats */
1434 for (i = 0; i < NUM_STATS; i++) 1437 for (i = 0; i < NUM_STATS; i++)
1435 if (get_attr_value (&(op->stats), i) != 0) 1438 if (op->stats.stat (i))
1436 return 1; 1439 return 1;
1437 1440
1438 /* If it doesn't fall into any of the above categories, must 1441 /* If it doesn't fall into any of the above categories, must
1439 * be non magical. 1442 * be non magical.
1440 */ 1443 */
1449int 1452int
1450need_identify (const object *op) 1453need_identify (const object *op)
1451{ 1454{
1452 switch (op->type) 1455 switch (op->type)
1453 { 1456 {
1454 case RING: 1457 case RING:
1455 case WAND: 1458 case WAND:
1456 case ROD: 1459 case ROD:
1457 case HORN: 1460 case HORN:
1458 case SCROLL: 1461 case SCROLL:
1459 case SKILL: 1462 case SKILL:
1460 case SKILLSCROLL: 1463 case SKILLSCROLL:
1461 case SPELLBOOK: 1464 case SPELLBOOK:
1462 case FOOD: 1465 case FOOD:
1463 case POTION: 1466 case POTION:
1464 case BOW: 1467 case BOW:
1465 case ARROW: 1468 case ARROW:
1466 case WEAPON: 1469 case WEAPON:
1467 case ARMOUR: 1470 case ARMOUR:
1468 case SHIELD: 1471 case SHIELD:
1469 case HELMET: 1472 case HELMET:
1470 case AMULET: 1473 case AMULET:
1471 case BOOTS: 1474 case BOOTS:
1472 case GLOVES: 1475 case GLOVES:
1473 case BRACERS: 1476 case BRACERS:
1474 case GIRDLE: 1477 case GIRDLE:
1475 case CONTAINER: 1478 case CONTAINER:
1476 case DRINK: 1479 case DRINK:
1477 case FLESH: 1480 case FLESH:
1478 case INORGANIC: 1481 case INORGANIC:
1479 case CLOSE_CON: 1482 case CLOSE_CON:
1480 case CLOAK: 1483 case CLOAK:
1481 case GEM: 1484 case GEM:
1482 case POWER_CRYSTAL: 1485 case POWER_CRYSTAL:
1483 case POISON: 1486 case POISON:
1484 case BOOK: 1487 case BOOK:
1485 case SKILL_TOOL: 1488 case SKILL_TOOL:
1486 return 1; 1489 return 1;
1487 } 1490 }
1491
1488 /* Try to track down some stuff that may show up here. Thus, the 1492 /* Try to track down some stuff that may show up here. Thus, the
1489 * archetype file can be updated, and this function removed. 1493 * archetype file can be updated, and this function removed.
1490 */ 1494 */
1491#if 0 1495#if 0
1492 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name); 1496 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1523 } 1527 }
1524 } 1528 }
1525 1529
1526 /* If the object is on a map, make sure we update its face */ 1530 /* If the object is on a map, make sure we update its face */
1527 if (op->map) 1531 if (op->map)
1528 update_object (op, UP_OBJ_FACE); 1532 update_object (op, UP_OBJ_CHANGE);
1529 else 1533 else
1530 { 1534 {
1531 pl = op->in_player (); 1535 pl = op->in_player ();
1532 if (pl) 1536 if (pl)
1533 /* A lot of the values can change from an update - might as well send 1537 /* A lot of the values can change from an update - might as well send

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines