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.32 by root, Fri May 11 08:08:02 2007 UTC vs.
Revision 1.46 by root, Sun Apr 20 22:03:21 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27#include <living.h> 26#include <living.h>
28#include <spells.h> 27#include <spells.h>
28
29const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 };
29 30
30/* the ordering of this is actually doesn't make a difference 31/* the ordering of this is actually doesn't make a difference
31 * However, for ease of use, new entries should go at the end 32 * However, for ease of use, new entries should go at the end
32 * so those people that debug the code that get used to something 33 * so those people that debug the code that get used to something
33 * being in the location 4 don't get confused. 34 * being in the location 4 don't get confused.
… …
47 * may be better. 48 * may be better.
48 * Basically, for the use/nonuse, the code does something like: 49 * Basically, for the use/nonuse, the code does something like:
49 * "This item goes %s\n", with the use/nonuse values filling in the %s 50 * "This item goes %s\n", with the use/nonuse values filling in the %s
50 */ 51 */
51Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 52Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52 {"body_range" , "You can use it as your range weapon" , "It is used as a range weapon"},
53 {"body_shield" , "You can wield it as a shield" , "It is used as a shield"}, 53 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
54 {"body_combat" , "You can wield it as your weapon" , "It is used as a combat weapon"}, 54 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
55 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
56 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
55 {"body_arm" , "You can put it on your arm" , "It goes on a human's arm"}, 57 {KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
56 {"body_torso" , "You can wear it on your body" , "It goes on a human's torso"}, 58 {KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
57 {"body_head" , "You can wear it on your head" , "It goes on a human's head"}, 59 {KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
58 {"body_neck" , "You can wear it around your neck" , "It goes around a human's neck"}, 60 {KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
59 {"body_skill" , "You can have it in your skill slot" , "It goes in a human's skill slot"},
60 {"body_finger" , "You can wear it on your finger" , "It goes on a human's finger"} , 61 {KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
61 {"body_shoulder", "You can wear it around your shoulders", "It goes around a human's shoulders"}, 62 {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
62 {"body_foot" , "You can put your feets into it" , "It goes on a human's feet"}, 63 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
63 {"body_hand" , "You can put it on your hands" , "It goes on a human's hands"}, 64 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
64 {"body_wrist" , "You can wear it around your wrists" , "It goes around a human's wrist"}, 65 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
65 {"body_waist" , "You can wear it around your waist" , "It goes around a human's waist"}, 66 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
66/*{"body_dragon_torso", "your body", "a dragon's body"} */ 67/*{"body_dragon_torso", "your body", "a dragon's body"} */
67}; 68};
68 69
69static char numbers[21][20] = { 70static char numbers[21][20] = {
70 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", 71 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
… …
272{ 273{
273 int i, tmp, enc; 274 int i, tmp, enc;
274 275
275 enc = 0; 276 enc = 0;
276 for (i = 0; i < NUM_STATS; i++) 277 for (i = 0; i < NUM_STATS; i++)
277 enc += get_attr_value (&op->stats, i); 278 enc += op->stats.stat (i);
278 279
279 /* This protection logic is pretty flawed. 20% fire resistance 280 /* This protection logic is pretty flawed. 20% fire resistance
280 * is much more valuable than 20% confusion, or 20% slow, or 281 * is much more valuable than 20% confusion, or 20% slow, or
281 * several others. Start at 1 - ignore physical - all that normal 282 * several others. Start at 1 - ignore physical - all that normal
282 * armour shouldn't be counted against 283 * armour shouldn't be counted against
… …
418 */ 419 */
419const char * 420const char *
420query_weight (const object *op) 421query_weight (const object *op)
421{ 422{
422 static char buf[10]; 423 static char buf[10];
423 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 424 sint32 i = op->total_weight ();
424 425
425 if (op->weight < 0) 426 if (op->weight < 0)
426 return " "; 427 return " ";
427 428
428 if (i % 1000) 429 if (i % 1000)
… …
492 * from stats.sp - b.t. 493 * from stats.sp - b.t.
493 */ 494 */
494const char * 495const char *
495ring_desc (const object *op) 496ring_desc (const object *op)
496{ 497{
497 static char buf[VERY_BIG_BUF]; 498 static dynbuf_text buf; buf.clear ();
498 int attr, val, len; 499 int attr, val, len;
499 500
500 buf[0] = 0;
501
502 if (!QUERY_FLAG (op, FLAG_IDENTIFIED)) 501 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
503 return buf; 502 {
504
505 for (attr = 0; attr < NUM_STATS; attr++) 503 for (attr = 0; attr < NUM_STATS; attr++)
506 { 504 if ((val = op->stats.stat (attr)))
507 if ((val = get_attr_value (&(op->stats), attr)) != 0)
508 {
509 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 505 buf.printf ("(%s%+d)", short_stat_name[attr], val);
510 }
511 }
512 506
513 if (op->stats.exp) 507 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);
514 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 508 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
515 if (op->stats.wc) 509 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
516 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc); 510 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
517 if (op->stats.dam)
518 sprintf (buf + strlen (buf), "(dam%+d)", op->stats.dam);
519 if (op->stats.ac)
520 sprintf (buf + strlen (buf), "(ac%+d)", op->stats.ac);
521 511
522 strcat (buf, describe_resistance (op, 0)); 512 buf << describe_resistance (op, 0);
523 513
524 if (op->stats.food != 0) 514 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
525 sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food); 515 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
526 /* else if (op->stats.food < 0) 516 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
527 sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */ 517 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
528 if (op->stats.grace) 518 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
529 sprintf (buf + strlen (buf), "(grace%+d)", op->stats.grace);
530 if (op->stats.sp && op->type != SKILL)
531 sprintf (buf + strlen (buf), "(magic%+d)", op->stats.sp);
532 if (op->stats.hp)
533 sprintf (buf + strlen (buf), "(regeneration%+d)", op->stats.hp);
534 if (op->stats.luck)
535 sprintf (buf + strlen (buf), "(luck%+d)", op->stats.luck);
536 if (QUERY_FLAG (op, FLAG_LIFESAVE))
537 strcat (buf, "(lifesaving)");
538 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
539 strcat (buf, "(reflect spells)");
540 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
541 strcat (buf, "(reflect missiles)");
542 if (QUERY_FLAG (op, FLAG_STEALTH))
543 strcat (buf, "(stealth)");
544 519
545 /* Shorten some of the names, so they appear better in the windows */ 520 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
546 len = strlen (buf); 521 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
547 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF); 522 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
548 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF); 523 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
549 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
550 524
551 /* if(op->item_power) 525 buf.add_paths ("Attuned" , op->path_attuned);
552 sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power); 526 buf.add_paths ("Repelled", op->path_repelled);
553 */ 527 buf.add_paths ("Denied" , op->path_denied);
554 if (buf[0] == 0 && op->type != SKILL)
555 strcpy (buf, "of adornment");
556 528
529 if (buf.empty ())
530 buf << "of adornment";
531 }
557 532
558 return buf; 533 return buf;
559} 534}
560 535
561/* 536/*
… …
563 * contain any information about object status (worn/cursed/etc.) 538 * contain any information about object status (worn/cursed/etc.)
564 */ 539 */
565const char * 540const char *
566query_short_name (const object *op) 541query_short_name (const object *op)
567{ 542{
568 static char buf[HUGE_BUF];
569 char buf2[HUGE_BUF];
570 int len = 0;
571
572 if (op->name == NULL) 543 if (op->name == 0)
573 return "(null)"; 544 return "(null)";
574 545
575 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 546 if (!op->nrof
547 && !op->weight
548 && !op->title
549 && !is_magical (op)
550 && op->slaying != shstr_money)
576 return op->name; /* To speed things up (or make things slower?) */ 551 return op->name; /* To speed things up (or make things slower?) */
577 552
578 if (op->nrof <= 1) 553 static dynbuf_text buf; buf.clear ();
579 safe_strcat (buf, op->name, &len, HUGE_BUF); 554
580 else 555 buf << (op->nrof <= 1 ? op->name : op->name_pl);
581 safe_strcat (buf, op->name_pl, &len, HUGE_BUF);
582 556
583 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 557 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
584 { 558 buf << ' ' << op->title;
585 safe_strcat (buf, " ", &len, HUGE_BUF);
586 safe_strcat (buf, op->title, &len, HUGE_BUF);
587 }
588 559
589 switch (op->type) 560 switch (op->type)
590 { 561 {
591 case SPELLBOOK: 562 case SPELLBOOK:
592 case SCROLL: 563 case SCROLL:
593 case WAND: 564 case WAND:
594 case ROD: 565 case ROD:
595 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 566 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
567 {
568 if (!op->title)
569 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
570
571 if (op->type != SPELLBOOK)
572 buf.printf (" (lvl %d)", op->level);
573 }
574 break;
575
576 case ALTAR:
577 case TRIGGER_ALTAR:
578 case IDENTIFY_ALTAR:
579 case CONVERTER:
580 if (op->slaying == shstr_money)
596 { 581 {
597 if (!op->title) 582 bool wrap = !!buf.size ();
598 { 583
599 safe_strcat (buf, " of ", &len, HUGE_BUF); 584 if (wrap) buf << " [";
600 if (op->inv) 585
601 safe_strcat (buf, op->inv->name, &len, HUGE_BUF); 586 archetype *coin = 0;
587
588 for (char const *const *c = coins; *coins; ++c)
589 if ((coin = archetype::find (*c)))
590 if (op->stats.food % coin->value == 0)
602 else 591 break;
603 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 592
604 } 593 sint32 coins = op->stats.food / coin->value;
605 if (op->type != SPELLBOOK) 594
606 { 595 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
607 sprintf (buf2, " (lvl %d)", op->level); 596
608 safe_strcat (buf, buf2, &len, HUGE_BUF); 597 if (wrap) buf << ']';
609 }
610 } 598 }
611 break; 599 break;
612 600
613 case SKILL: 601 case SKILL:
614 case AMULET: 602 case AMULET:
615 case RING: 603 case RING:
616 if (!op->title) 604 if (!op->title)
617 { 605 {
618 /* If ring has a title, full description isn't so useful */ 606 /* If ring has a title, full description isn't so useful */
619 const char *s = ring_desc (op); 607 const char *s = ring_desc (op);
620 608
621 if (s[0]) 609 if (s && *s)
622 { 610 buf << " " << s;
623 safe_strcat (buf, " ", &len, HUGE_BUF);
624 safe_strcat (buf, s, &len, HUGE_BUF);
625 }
626 } 611 }
627 break; 612 break;
613
628 default: 614 default:
629 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 615 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
630 {
631 sprintf (buf2, " %+d", op->magic); 616 buf.printf (" %+d", op->magic);
632 safe_strcat (buf, buf2, &len, HUGE_BUF);
633 }
634 } 617 }
618
635 return buf; 619 return buf;
636} 620}
637 621
638/* 622/*
639 * query_name(object) returns a character pointer pointing to a static 623 * query_name(object) returns a character pointer pointing to a static
… …
647 * 631 *
648 */ 632 */
649const char * 633const char *
650query_name (const object *op) 634query_name (const object *op)
651{ 635{
652 static char buf[5][HUGE_BUF]; // OMFG 636 int len = 0;
637 static dynbuf_text bufs[5];
653 static int use_buf = 0; 638 static int use_buf = 0;
654 int len = 0;
655
656#ifdef NEW_MATERIAL_CODE
657 materialtype_t *mt;
658#endif
659 639
660 use_buf++; 640 use_buf++;
661 use_buf %= 5; 641 use_buf %= 5;
662 642
663#ifdef NEW_MATERIAL_CODE 643 dynbuf_text &buf = bufs [use_buf];
644 buf.clear ();
645
664 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 646 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
665 {
666 mt = name_to_material (op->materialname); 647 if (materialtype_t *mt = name_to_material (op->materialname))
667 if (mt) 648 buf << mt->description << ' ';
668 {
669 safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
670 safe_strcat (buf[use_buf], " ", &len, HUGE_BUF);
671 }
672 }
673#endif
674 649
675 safe_strcat (buf[use_buf], query_short_name (op), &len, HUGE_BUF); 650 buf << query_short_name (op);
676 651
677 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 652 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
678 safe_strcat (buf[use_buf], " *", &len, HUGE_BUF); 653 buf << " *";
679 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 654 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
680 safe_strcat (buf[use_buf], " (open)", &len, HUGE_BUF); 655 buf << " (open)";
681 656
682 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 657 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
683 { 658 {
684 if (QUERY_FLAG (op, FLAG_DAMNED)) 659 if (QUERY_FLAG (op, FLAG_DAMNED))
685 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 660 buf << " (damned)";
686 else if (QUERY_FLAG (op, FLAG_CURSED)) 661 else if (QUERY_FLAG (op, FLAG_CURSED))
687 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 662 buf << " (cursed)";
688 } 663 }
689 664
690 /* Basically, if the object is known magical (detect magic spell on it), 665 /* Basically, if the object is known magical (detect magic spell on it),
691 * and it isn't identified, print out the fact that 666 * and it isn't identified, print out the fact that
692 * it is magical. Assume that the detect magical spell will only set 667 * it is magical. Assume that the detect magical spell will only set
… …
695 * Changed in V 0.91.4 - still print that the object is magical even 670 * Changed in V 0.91.4 - still print that the object is magical even
696 * if it has been applied. Equipping an item does not tell full 671 * if it has been applied. Equipping an item does not tell full
697 * abilities, especially for artifact items. 672 * abilities, especially for artifact items.
698 */ 673 */
699 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 674 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
700 safe_strcat (buf[use_buf], " (magic)", &len, HUGE_BUF); 675 buf << " (magic)";
701 676
702#if 0 677#if 0
703 /* item_power will be returned in desribe_item - it shouldn't really 678 /* item_power will be returned in desribe_item - it shouldn't really
704 * be returned in the name. 679 * be returned in the name.
705 */ 680 */
… …
714 { 689 {
715 case BOW: 690 case BOW:
716 case WAND: 691 case WAND:
717 case ROD: 692 case ROD:
718 case HORN: 693 case HORN:
719 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF); 694 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
720 break; 695 break;
721 case WEAPON: 696 case WEAPON:
722 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF); 697 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");
723 break; 698 break;
724 case ARMOUR: 699 case ARMOUR:
725 case HELMET: 700 case HELMET:
726 case SHIELD: 701 case SHIELD:
727 case RING: 702 case RING:
… …
729 case GLOVES: 704 case GLOVES:
730 case AMULET: 705 case AMULET:
731 case GIRDLE: 706 case GIRDLE:
732 case BRACERS: 707 case BRACERS:
733 case CLOAK: 708 case CLOAK:
734 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 709 buf << " (worn)";
735 break; 710 break;
736 case CONTAINER: 711 case CONTAINER:
737 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 712 buf << " (active)";
738 break; 713 break;
739 case SKILL: 714 case SKILL:
740 default: 715 default:
741 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 716 buf << " (applied)";
742 } 717 }
743 } 718 }
744 719
745 if (QUERY_FLAG (op, FLAG_UNPAID)) 720 if (QUERY_FLAG (op, FLAG_UNPAID))
746 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 721 buf << " (unpaid)";
747 722
748 return buf [use_buf]; 723 return buf;
749} 724}
750 725
751/* 726/*
752 * query_base_name(object) returns a character pointer pointing to a static 727 * query_base_name(object) returns a character pointer pointing to a static
753 * buffer which contains a verbose textual representation of the name 728 * buffer which contains a verbose textual representation of the name
… …
758 * If plural is set, we generate the plural name of this. 733 * If plural is set, we generate the plural name of this.
759 */ 734 */
760const char * 735const char *
761query_base_name (const object *op, int plural) 736query_base_name (const object *op, int plural)
762{ 737{
763 static char buf[MAX_BUF], buf2[MAX_BUF];
764 int len;
765 materialtype_t *mt;
766
767 if ((!plural && !op->name) || (plural && !op->name_pl)) 738 if ((!plural && !op->name) || (plural && !op->name_pl))
768 return "(null)"; 739 return "(null)";
769 740
770 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 741 if (!op->nrof && !op->weight && !op->title && !is_magical (op))
771 return op->name; /* To speed things up (or make things slower?) */ 742 return op->name; /* To speed things up (or make things slower?) */
772 743
744 static dynbuf_text buf; buf.clear ();
745
773 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 746 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
774 mt = name_to_material (op->materialname); 747 if (materialtype_t *mt = name_to_material (op->materialname))
748 if (op->arch->materialname != mt->name)
749 buf << mt->description << ' ';
775 750
776#ifdef NEW_MATERIAL_CODE 751 buf << (plural ? op->name_pl : op->name);
777 if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
778 op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
779 {
780 strcpy (buf, mt->description);
781 len = strlen (buf);
782 safe_strcat (buf, " ", &len, MAX_BUF);
783 if (!plural)
784 safe_strcat (buf, op->name, &len, MAX_BUF);
785 else
786 safe_strcat (buf, op->name_pl, &len, MAX_BUF);
787 }
788 else
789 {
790#endif
791 if (!plural)
792 assign (buf, op->name);
793 else
794 assign (buf, op->name_pl);
795
796 len = strlen (buf);
797#ifdef NEW_MATERIAL_CODE
798 }
799#endif
800 752
801 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 753 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
802 { 754 buf << ' ' << op->title;
803 safe_strcat (buf, " ", &len, MAX_BUF);
804 safe_strcat (buf, op->title, &len, MAX_BUF);
805 }
806 755
807 switch (op->type) 756 switch (op->type)
808 { 757 {
809 case SPELLBOOK: 758 case SPELLBOOK:
810 case SCROLL: 759 case SCROLL:
811 case WAND: 760 case WAND:
812 case ROD: 761 case ROD:
813 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 762 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
814 { 763 {
815 if (!op->title) 764 if (!op->title)
816 { 765 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
817 safe_strcat (buf, " of ", &len, MAX_BUF); 766
818 if (op->inv)
819 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
820 else
821 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
822 }
823 if (op->type != SPELLBOOK) 767 if (op->type != SPELLBOOK)
824 {
825 sprintf (buf2, " (lvl %d)", op->level); 768 buf.printf (" (lvl %d)", op->level);
826 safe_strcat (buf, buf2, &len, MAX_BUF);
827 }
828 } 769 }
829 break; 770 break;
830 771
831 772
832 case SKILL: 773 case SKILL:
… …
835 if (!op->title) 776 if (!op->title)
836 { 777 {
837 /* If ring has a title, full description isn't so useful */ 778 /* If ring has a title, full description isn't so useful */
838 const char *s = ring_desc (op); 779 const char *s = ring_desc (op);
839 780
840 if (s[0]) 781 if (s && *s)
841 { 782 buf << ' ' << s;
842 safe_strcat (buf, " ", &len, MAX_BUF);
843 safe_strcat (buf, s, &len, MAX_BUF);
844 }
845 } 783 }
846 break; 784 break;
847 785
848 default: 786 default:
849 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 787 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
850 sprintf (buf + strlen (buf), " %+d", op->magic); 788 buf.printf (" %+d", op->magic);
851 } 789 }
852 790
853 return buf; 791 return buf;
854} 792}
855 793
… …
857 * too long, making it difficult to read. This function deals 795 * too long, making it difficult to read. This function deals
858 * with describing the monsters & players abilities. It should only 796 * with describing the monsters & players abilities. It should only
859 * be called with monster & player objects. Returns a description 797 * be called with monster & player objects. Returns a description
860 * in a static buffer. 798 * in a static buffer.
861 */ 799 */
862static char * 800static const char *
863describe_monster (const object *op) 801describe_monster (const object *op)
864{ 802{
865 char buf[MAX_BUF]; 803 static dynbuf_text buf; buf.clear ();
866 static char retbuf[VERY_BIG_BUF];
867 int i;
868
869 retbuf[0] = '\0';
870 804
871 /* Note that the resolution this provides for players really isn't 805 /* Note that the resolution this provides for players really isn't
872 * very good. Any player with a speed greater than .67 will 806 * very good. Any player with a speed greater than .67 will
873 * fall into the 'lightning fast movement' category. 807 * fall into the 'lightning fast movement' category.
874 */ 808 */
875 if (op->has_active_speed ()) 809 if (op->has_active_speed ())
876 {
877 switch ((int) ((FABS (op->speed)) * 15)) 810 switch ((int) ((FABS (op->speed)) * 15))
878 { 811 {
879 case 0: 812 case 0:
880 strcat (retbuf, "(very slow movement)"); 813 buf << "(very slow movement";
881 break; 814 break;
882 case 1: 815 case 1:
883 strcat (retbuf, "(slow movement)"); 816 buf << "(slow movement)";
884 break; 817 break;
885 case 2: 818 case 2:
886 strcat (retbuf, "(normal movement)"); 819 buf << "(normal movement)";
887 break; 820 break;
888 case 3: 821 case 3:
889 case 4: 822 case 4:
890 strcat (retbuf, "(fast movement)"); 823 buf << "(fast movement)";
891 break; 824 break;
892 case 5: 825 case 5:
893 case 6: 826 case 6:
894 strcat (retbuf, "(very fast movement)"); 827 buf << "(very fast movement)";
895 break; 828 break;
896 case 7: 829 case 7:
897 case 8: 830 case 8:
898 case 9: 831 case 9:
899 case 10: 832 case 10:
900 strcat (retbuf, "(extremely fast movement)"); 833 buf << "(extremely fast movement)";
901 break; 834 break;
902 default: 835 default:
903 strcat (retbuf, "(lightning fast movement)"); 836 buf << "(lightning fast movement)";
904 break; 837 break;
905 } 838 }
906 } 839
907 if (QUERY_FLAG (op, FLAG_UNDEAD)) 840 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";
908 strcat (retbuf, "(undead)");
909 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) 841 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";
910 strcat (retbuf, "(see invisible)"); 842 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";
911 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) 843 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";
912 strcat (retbuf, "(wield weapon)"); 844 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";
913 if (QUERY_FLAG (op, FLAG_USE_BOW)) 845 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";
914 strcat (retbuf, "(archer)"); 846 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";
915 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) 847 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";
916 strcat (retbuf, "(wear armour)");
917 if (QUERY_FLAG (op, FLAG_USE_RING))
918 strcat (retbuf, "(wear ring)");
919 if (QUERY_FLAG (op, FLAG_USE_SCROLL))
920 strcat (retbuf, "(read scroll)");
921 if (QUERY_FLAG (op, FLAG_USE_RANGE))
922 strcat (retbuf, "(fires wand/rod/horn)");
923 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) 848 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";
924 strcat (retbuf, "(skill user)"); 849 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";
925 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) 850 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";
926 strcat (retbuf, "(spellcaster)");
927 if (QUERY_FLAG (op, FLAG_FRIENDLY))
928 strcat (retbuf, "(friendly)");
929 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) 851 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";
930 strcat (retbuf, "(unaggressive)"); 852 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";
931 if (QUERY_FLAG (op, FLAG_HITBACK)) 853 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";
932 strcat (retbuf, "(hitback)"); 854
933 if (QUERY_FLAG (op, FLAG_STEALTH))
934 strcat (retbuf, "(stealthy)");
935 if (op->randomitems != NULL) 855 if (op->randomitems)
936 { 856 {
937 treasure *t;
938 int first = 1; 857 bool first = 1;
939 858
940 for (t = op->randomitems->items; t != NULL; t = t->next) 859 for (treasure *t = op->randomitems->items; t; t = t->next)
941 if (t->item && t->item->clone.type == SPELL) 860 if (t->item && t->item->type == SPELL)
942 { 861 {
943 if (first) 862 if (first)
944 { 863 buf << "(Spell abilities:)";
864
945 first = 0; 865 first = 0;
946 strcat (retbuf, "(Spell abilities:)"); 866
947 } 867 buf << '(' << t->item->object::name << ')';
948 strcat (retbuf, "(");
949 strcat (retbuf, t->item->clone.name);
950 strcat (retbuf, ")");
951 } 868 }
952 } 869 }
870
953 if (op->type == PLAYER) 871 if (op->type == PLAYER)
954 { 872 {
955 if (op->contr->digestion) 873 if (op->contr->digestion)
956 {
957 if (op->contr->digestion != 0)
958 sprintf (buf, "(sustenance%+d)", op->contr->digestion); 874 buf.printf ("(sustenance%+d)", op->contr->digestion);
959 strcat (retbuf, buf); 875
960 }
961 if (op->contr->gen_grace) 876 if (op->contr->gen_grace)
962 {
963 sprintf (buf, "(grace%+d)", op->contr->gen_grace); 877 buf.printf ("(grace%+d)", op->contr->gen_grace);
964 strcat (retbuf, buf); 878
965 }
966 if (op->contr->gen_sp) 879 if (op->contr->gen_sp)
967 {
968 sprintf (buf, "(magic%+d)", op->contr->gen_sp); 880 buf.printf ("(magic%+d)", op->contr->gen_sp);
969 strcat (retbuf, buf); 881
970 }
971 if (op->contr->gen_hp) 882 if (op->contr->gen_hp)
972 {
973 sprintf (buf, "(regeneration%+d)", op->contr->gen_hp); 883 buf.printf ("(regeneration%+d)", op->contr->gen_hp);
974 strcat (retbuf, buf); 884
975 }
976 if (op->stats.luck) 885 if (op->stats.luck)
977 {
978 sprintf (buf, "(luck%+d)", op->stats.luck); 886 buf.printf ("(luck%+d)", op->stats.luck);
979 strcat (retbuf, buf);
980 }
981 } 887 }
982 888
983 /* describe attacktypes */ 889 /* describe attacktypes */
984 if (is_dragon_pl (op)) 890 if (is_dragon_pl (op))
985 { 891 {
… …
987 * Break apart the for loop - move the comparison checking down - 893 * Break apart the for loop - move the comparison checking down -
988 * this makes it more readable. 894 * this makes it more readable.
989 */ 895 */
990 object *tmp; 896 object *tmp;
991 897
992 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 898 for (tmp = op->inv; tmp; tmp = tmp->below)
993 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 899 if (tmp->type == SKILL && tmp->name == shstr_clawing)
994 break; 900 break;
995 901
996 if (tmp && tmp->attacktype != 0) 902 if (tmp && tmp->attacktype)
997 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") } 903 buf.add_abilities ("Claws", tmp->attacktype);
998 else 904 else
999 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") } 905 buf.add_abilities ("Attacks", op->attacktype);
1000 } 906 }
1001 else 907 else
1002 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") } 908 buf.add_abilities ("Attacks", op->attacktype);
1003 909
1004 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 910 buf.add_paths ("Attuned" , op->path_attuned);
1005 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 911 buf.add_paths ("Repelled", op->path_repelled);
1006 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 912 buf.add_paths ("Denied" , op->path_denied);
1007 913
1008 for (i = 0; i < NROFATTACKS; i++) 914 for (int i = 0; i < NROFATTACKS; i++)
1009 if (op->resist[i]) 915 if (op->resist[i])
1010 {
1011 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 916 buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1012 strcat (retbuf, buf);
1013 }
1014 917
1015 return retbuf; 918 return buf;
1016} 919}
1017
1018 920
1019/* 921/*
1020 * Returns a pointer to a static buffer which contains a 922 * Returns a pointer to a static buffer which contains a
1021 * description of the given object. 923 * description of the given object.
1022 * If it is a monster, lots of information about its abilities 924 * If it is a monster, lots of information about its abilities
… …
1043 * item (eg, debug dump or the like) 945 * item (eg, debug dump or the like)
1044 */ 946 */
1045const char * 947const char *
1046describe_item (const object *op, object *owner) 948describe_item (const object *op, object *owner)
1047{ 949{
1048 char buf[MAX_BUF]; 950 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1049 static char retbuf[VERY_BIG_BUF]; 951 return describe_monster (op);
952
953 static dynbuf_text buf; buf.clear ();
1050 int identified, i; 954 int identified, i;
1051 955
1052 retbuf[0] = '\0';
1053 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1054 {
1055 return describe_monster (op);
1056 }
1057 /* figure this out once, instead of making multiple calls to need_identify. 956 /* figure this out once, instead of making multiple calls to need_identify.
1058 * also makes the code easier to read. 957 * also makes the code easier to read.
1059 */ 958 */
1060 if (!need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED)) 959 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED);
1061 identified = 1; 960 if (!identified)
1062 else 961 buf << "(unidentified)";
1063 { 962
1064 strcpy (retbuf, "(unidentified)");
1065 identified = 0;
1066 }
1067 switch (op->type) 963 switch (op->type)
1068 { 964 {
1069 case BOW: 965 case BOW:
1070 case ARROW: 966 case ARROW:
1071 case WAND: 967 case WAND:
1072 case ROD: 968 case ROD:
1073 case HORN: 969 case HORN:
1074 case WEAPON: 970 case WEAPON:
1075 case ARMOUR: 971 case ARMOUR:
1076 case HELMET: 972 case HELMET:
1077 case SHIELD: 973 case SHIELD:
1078 case BOOTS: 974 case BOOTS:
1079 case GLOVES: 975 case GLOVES:
1080 case GIRDLE: 976 case GIRDLE:
1081 case BRACERS: 977 case BRACERS:
1082 case CLOAK: 978 case CLOAK:
1083 case SKILL_TOOL: 979 case SKILL_TOOL:
1084 break; /* We have more information to do below this switch */ 980 break; /* We have more information to do below this switch */
1085 981
1086 case POWER_CRYSTAL: 982 case POWER_CRYSTAL:
1087 if (op->stats.maxsp > 1000) 983 if (op->stats.maxsp > 1000)
1088 { /*higher capacity crystals */ 984 { /*higher capacity crystals */
1089 i = (op->stats.maxsp % 1000) / 100; 985 i = (op->stats.maxsp % 1000) / 100;
1090 986
1091 if (i) 987 if (i)
1092 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i); 988 buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1093 else 989 else
1094 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 1000); 990 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);
1095 } 991 }
1096 else 992 else
1097 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 993 buf.printf ("(capacity %d). It is ", op->stats.maxsp);
1098 994
1099 strcat (retbuf, buf);
1100 i = (op->stats.sp * 10) / op->stats.maxsp; 995 i = (op->stats.sp * 10) / op->stats.maxsp;
1101 if (op->stats.sp == 0) 996 if (op->stats.sp == 0)
1102 strcat (retbuf, "empty."); 997 buf << "empty.";
1103 else if (i == 0) 998 else if (i == 0)
1104 strcat (retbuf, "almost empty."); 999 buf << "almost empty.";
1105 else if (i < 3) 1000 else if (i < 3)
1106 strcat (retbuf, "partially filled."); 1001 buf << "partially filled.";
1107 else if (i < 6) 1002 else if (i < 6)
1108 strcat (retbuf, "half full."); 1003 buf << "half full.";
1109 else if (i < 9) 1004 else if (i < 9)
1110 strcat (retbuf, "well charged."); 1005 buf << "well charged.";
1111 else if (op->stats.sp == op->stats.maxsp) 1006 else if (op->stats.sp == op->stats.maxsp)
1112 strcat (retbuf, "fully charged."); 1007 buf << "fully charged.";
1113 else 1008 else
1114 strcat (retbuf, "almost full."); 1009 buf << "almost full.";
1115 break; 1010 break;
1011
1116 case FOOD: 1012 case FOOD:
1117 case FLESH: 1013 case FLESH:
1118 case DRINK: 1014 case DRINK:
1119 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1015 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1120 { 1016 {
1121 sprintf (buf, "(food+%d)", op->stats.food); 1017 buf.printf ("(food+%d)", op->stats.food);
1122 strcat (retbuf, buf);
1123 1018
1124 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 1019 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1125 {
1126 sprintf (buf, "(%s metabolism)", change_resist_msg[op->last_eat]); 1020 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1127 strcat (retbuf, buf);
1128 }
1129 1021
1130 if (!QUERY_FLAG (op, FLAG_CURSED)) 1022 if (!QUERY_FLAG (op, FLAG_CURSED))
1131 { 1023 {
1132 if (op->stats.hp) 1024 if (op->stats.hp) buf << "(heals)";
1133 strcat (retbuf, "(heals)");
1134 if (op->stats.sp)
1135 strcat (retbuf, "(spellpoint regen)"); 1025 if (op->stats.sp) buf << "(spellpoint regen)";
1136 } 1026 }
1137 else 1027 else
1138 { 1028 {
1139 if (op->stats.hp) 1029 if (op->stats.hp) buf << "(damages)";
1140 strcat (retbuf, "(damages)");
1141 if (op->stats.sp)
1142 strcat (retbuf, "(spellpoint depletion)"); 1030 if (op->stats.sp) buf << "(spellpoint depletion)";
1143 } 1031 }
1144 } 1032 }
1145 break; 1033 break;
1146 1034
1147
1148 case SKILL: 1035 case SKILL:
1149 case RING: 1036 case RING:
1150 case AMULET: 1037 case AMULET:
1151 if (op->item_power) 1038 if (op->item_power)
1152 {
1153 sprintf (buf, "(item_power %+d)", op->item_power); 1039 buf.printf ("(item_power %+d)", op->item_power);
1154 strcat (retbuf, buf); 1040
1155 }
1156 if (op->title) 1041 if (op->title)
1157 strcat (retbuf, ring_desc (op)); 1042 buf << ring_desc (op);
1043
1158 return retbuf; 1044 return buf;
1159 1045
1160 default: 1046 default:
1161 return retbuf; 1047 return buf;
1162 } 1048 }
1163 1049
1164 /* Down here, we more further describe equipment type items. 1050 /* Down here, we more further describe equipment type items.
1165 * only describe them if they have been identified or the like. 1051 * only describe them if they have been identified or the like.
1166 */ 1052 */
1167 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1053 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1168 { 1054 {
1169 int attr, val; 1055 int attr, val;
1170 1056
1171 for (attr = 0; attr < NUM_STATS; attr++) 1057 for (attr = 0; attr < NUM_STATS; attr++)
1172 { 1058 if ((val = op->stats.stat (attr)))
1173 if ((val = get_attr_value (&(op->stats), attr)) != 0)
1174 {
1175 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1059 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1176 strcat (retbuf, buf);
1177 }
1178 }
1179 1060
1180 if (op->stats.exp) 1061 if (op->stats.exp)
1181 {
1182 sprintf (buf, "(speed %+lld)", (long long) op->stats.exp); 1062 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1183 strcat (retbuf, buf);
1184 }
1185
1186 1063
1187 switch (op->type) 1064 switch (op->type)
1188 { 1065 {
1189 case BOW: 1066 case BOW:
1190 case ARROW: 1067 case ARROW:
1191 case GIRDLE: 1068 case GIRDLE:
1192 case HELMET: 1069 case HELMET:
1193 case SHIELD: 1070 case SHIELD:
1194 case BOOTS: 1071 case BOOTS:
1195 case GLOVES: 1072 case GLOVES:
1196 case WEAPON: 1073 case WEAPON:
1197 case SKILL: 1074 case SKILL:
1198 case RING: 1075 case RING:
1199 case AMULET: 1076 case AMULET:
1200 case ARMOUR: 1077 case ARMOUR:
1201 case BRACERS: 1078 case BRACERS:
1202 case FORCE: 1079 case FORCE:
1203 case CLOAK: 1080 case CLOAK:
1204 if (op->stats.wc) 1081 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1205 { 1082 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1206 sprintf (buf, "(wc%+d)", op->stats.wc); 1083 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1207 strcat (retbuf, buf); 1084
1208 }
1209 if (op->stats.dam)
1210 {
1211 sprintf (buf, "(dam%+d)", op->stats.dam);
1212 strcat (retbuf, buf);
1213 }
1214 if (op->stats.ac)
1215 {
1216 sprintf (buf, "(ac%+d)", op->stats.ac);
1217 strcat (retbuf, buf);
1218 }
1219 if ((op->type == WEAPON || op->type == BOW) && op->level > 0) 1085 if ((op->type == WEAPON || op->type == BOW) && op->level > 0)
1220 {
1221 sprintf (buf, "(improved %d/%d)", op->last_eat, op->level); 1086 buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1222 strcat (retbuf, buf); 1087
1223 }
1224 break; 1088 break;
1225 1089
1226 default: 1090 default:
1227 break; 1091 break;
1228 } 1092 }
1229 if (QUERY_FLAG (op, FLAG_XRAYS)) 1093
1230 strcat (retbuf, "(xray-vision)"); 1094 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";
1231 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 1095 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";
1232 strcat (retbuf, "(infravision)");
1233 1096
1234 /* levitate was what is was before, so we'll keep it */ 1097 /* levitate was what is was before, so we'll keep it */
1235 if (op->move_type & MOVE_FLY_LOW) 1098 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1236 strcat (retbuf, "(levitate)");
1237
1238 if (op->move_type & MOVE_FLY_HIGH) 1099 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1239 strcat (retbuf, "(fly)");
1240
1241 if (op->move_type & MOVE_SWIM) 1100 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1242 strcat (retbuf, "(swim)");
1243 1101
1244 /* walking is presumed as 'normal', so doesn't need mentioning */ 1102 /* walking is presumed as 'normal', so doesn't need mentioning */
1245 1103
1246 if (op->item_power) 1104 if (op->item_power)
1247 {
1248 sprintf (buf, "(item_power %+d)", op->item_power); 1105 buf.printf ("(item_power %+d)", op->item_power);
1249 strcat (retbuf, buf);
1250 }
1251 } /* End if identified or applied */ 1106 } /* End if identified or applied */
1252 1107
1253 /* This blocks only deals with fully identified object. 1108 /* This blocks only deals with fully identified object.
1254 * it is intentional that this is not an 'else' from a above - 1109 * it is intentional that this is not an 'else' from a above -
1255 * in this way, information is added. 1110 * in this way, information is added.
… …
1258 { 1113 {
1259 int more_info = 0; 1114 int more_info = 0;
1260 1115
1261 switch (op->type) 1116 switch (op->type)
1262 { 1117 {
1263 case ROD: /* These use stats.sp for spell selection and stats.food */ 1118 case ROD: /* These use stats.sp for spell selection and stats.food */
1264 case HORN: /* and stats.hp for spell-point regeneration... */ 1119 case HORN: /* and stats.hp for spell-point regeneration... */
1265 case BOW: 1120 case BOW:
1266 case ARROW: 1121 case ARROW:
1267 case WAND: 1122 case WAND:
1268 case FOOD: 1123 case FOOD:
1269 case FLESH: 1124 case FLESH:
1270 case DRINK: 1125 case DRINK:
1271 more_info = 0; 1126 more_info = 0;
1272 break; 1127 break;
1273 1128
1274 /* Armor type objects */ 1129 /* Armor type objects */
1275 case ARMOUR: 1130 case ARMOUR:
1276 case HELMET: 1131 case HELMET:
1277 case SHIELD: 1132 case SHIELD:
1278 case BOOTS: 1133 case BOOTS:
1279 case GLOVES: 1134 case GLOVES:
1280 case GIRDLE: 1135 case GIRDLE:
1281 case BRACERS: 1136 case BRACERS:
1282 case CLOAK: 1137 case CLOAK:
1283 if (ARMOUR_SPEED (op)) 1138 if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1284 { 1139 if (ARMOUR_SPELLS (op)) buf.printf ("(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1285 sprintf (buf, "(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1286 strcat (retbuf, buf);
1287 }
1288 if (ARMOUR_SPELLS (op))
1289 {
1290 sprintf (buf, "(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1291 strcat (retbuf, buf);
1292 }
1293 more_info = 1; 1140 more_info = 1;
1294 break; 1141 break;
1295 1142
1296 case WEAPON: 1143 case WEAPON:
1297 /* Calculate it the same way fix_player does so the results 1144 /* Calculate it the same way fix_player does so the results
1298 * make sense. 1145 * make sense.
1299 */ 1146 */
1300 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2; 1147 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1301 if (i < 0) 1148 if (i < 0)
1302 i = 0; 1149 i = 0;
1303 1150
1304 sprintf (buf, "(weapon speed %d)", i); 1151 buf.printf ("(weapon speed %d)", i);
1305 strcat (retbuf, buf);
1306 more_info = 1; 1152 more_info = 1;
1307 break; 1153 break;
1308
1309 } 1154 }
1155
1310 if (more_info) 1156 if (more_info)
1311 { 1157 {
1312 if (op->stats.food)
1313 {
1314 if (op->stats.food != 0)
1315 sprintf (buf, "(sustenance%+d)", op->stats.food); 1158 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
1316 strcat (retbuf, buf);
1317 }
1318 if (op->stats.grace)
1319 {
1320 sprintf (buf, "(grace%+d)", op->stats.grace); 1159 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1321 strcat (retbuf, buf); 1160 if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp);
1322 }
1323 if (op->stats.sp)
1324 {
1325 sprintf (buf, "(magic%+d)", op->stats.sp);
1326 strcat (retbuf, buf);
1327 }
1328 if (op->stats.hp)
1329 {
1330 sprintf (buf, "(regeneration%+d)", op->stats.hp); 1161 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1331 strcat (retbuf, buf);
1332 }
1333 } 1162 }
1334 1163
1335 if (op->stats.luck) 1164 if (op->stats.luck)
1336 {
1337 sprintf (buf, "(luck%+d)", op->stats.luck); 1165 buf.printf ("(luck%+d)", op->stats.luck);
1338 strcat (retbuf, buf); 1166
1339 }
1340 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 1167 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
1341 strcat (retbuf, "(lifesaving)"); 1168 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
1342 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
1343 strcat (retbuf, "(reflect spells)");
1344 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 1169 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
1345 strcat (retbuf, "(reflect missiles)");
1346 if (QUERY_FLAG (op, FLAG_STEALTH)) 1170 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1347 strcat (retbuf, "(stealth)"); 1171
1348 if (op->slaying != NULL && op->type != FOOD) 1172 if (op->slaying && op->type != FOOD)
1349 {
1350 sprintf (buf, "(slay %s)", &op->slaying); 1173 buf.printf ("(slay %s)", &op->slaying);
1351 strcat (retbuf, buf); 1174
1352 } 1175 buf.add_abilities ("Attacks", op->attacktype);
1353 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1354 /* resistance on flesh is only visible for quetzals. If 1176 /* resistance on flesh is only visible for quetzals. If
1355 * non flesh, everyone can see its resistances 1177 * non flesh, everyone can see its resistances
1356 */ 1178 */
1357 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1179 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
1358 strcat (retbuf, describe_resistance (op, 0)); 1180 buf << describe_resistance (op, 0);
1359 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1360 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1361 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1362 }
1363 1181
1182 buf.add_paths ("Attuned", op->path_attuned);
1183 buf.add_paths ("Repelled", op->path_repelled);
1184 buf.add_paths ("Denied", op->path_denied);
1185 }
1186
1364 return retbuf; 1187 return buf;
1365} 1188}
1366 1189
1367std::string 1190std::string
1368object::describe_item (object *who) 1191object::describe_item (object *who)
1369{ 1192{
1370 return std::string (::describe_item (this, who)); 1193 return std::string (::describe_item (this, who));
1194}
1195
1196void
1197examine (object *op, object *tmp)
1198{
1199 std::string info = tmp->describe (op);
1200 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1201}
1202
1203/*
1204 * inventory prints object's inventory. If inv==NULL then print player's
1205 * inventory.
1206 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1207 */
1208const char *
1209object::query_inventory (object *who, const char *indent)
1210{
1211 static dynbuf_text buf; buf.clear ();
1212
1213 for (object *tmp = inv; tmp; tmp = tmp->below)
1214 if (who && QUERY_FLAG (who, FLAG_WIZ))
1215 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp));
1216 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1217 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp));
1218
1219 if (buf.size ())
1220 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this));
1221 else
1222 buf.printf ("%s(empty)\n", indent);
1223
1224 return buf;
1371} 1225}
1372 1226
1373/* Return true if the item is magical. A magical item is one that 1227/* Return true if the item is magical. A magical item is one that
1374 * increases/decreases any abilities, provides a resistance, 1228 * increases/decreases any abilities, provides a resistance,
1375 * has a generic magical bonus, or is an artifact. 1229 * has a generic magical bonus, or is an artifact.
1376 * This function is used by detect_magic to determine if an item 1230 * This function is used by detect_magic to determine if an item
1377 * should be marked as magical. 1231 * should be marked as magical.
1378 */ 1232 */
1379
1380int 1233int
1381is_magical (const object *op) 1234is_magical (const object *op)
1382{ 1235{
1383 int i; 1236 int i;
1384 1237
… …
1435 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE) 1288 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE)
1436 return 1; 1289 return 1;
1437 1290
1438 /* Check to see if it increases/decreases any stats */ 1291 /* Check to see if it increases/decreases any stats */
1439 for (i = 0; i < NUM_STATS; i++) 1292 for (i = 0; i < NUM_STATS; i++)
1440 if (get_attr_value (&(op->stats), i) != 0) 1293 if (op->stats.stat (i))
1441 return 1; 1294 return 1;
1442 1295
1443 /* If it doesn't fall into any of the above categories, must 1296 /* If it doesn't fall into any of the above categories, must
1444 * be non magical. 1297 * be non magical.
1445 */ 1298 */
… …
1454int 1307int
1455need_identify (const object *op) 1308need_identify (const object *op)
1456{ 1309{
1457 switch (op->type) 1310 switch (op->type)
1458 { 1311 {
1459 case RING: 1312 case RING:
1460 case WAND: 1313 case WAND:
1461 case ROD: 1314 case ROD:
1462 case HORN: 1315 case HORN:
1463 case SCROLL: 1316 case SCROLL:
1464 case SKILL: 1317 case SKILL:
1465 case SKILLSCROLL: 1318 case SKILLSCROLL:
1466 case SPELLBOOK: 1319 case SPELLBOOK:
1467 case FOOD: 1320 case FOOD:
1468 case POTION: 1321 case POTION:
1469 case BOW: 1322 case BOW:
1470 case ARROW: 1323 case ARROW:
1471 case WEAPON: 1324 case WEAPON:
1472 case ARMOUR: 1325 case ARMOUR:
1473 case SHIELD: 1326 case SHIELD:
1474 case HELMET: 1327 case HELMET:
1475 case AMULET: 1328 case AMULET:
1476 case BOOTS: 1329 case BOOTS:
1477 case GLOVES: 1330 case GLOVES:
1478 case BRACERS: 1331 case BRACERS:
1479 case GIRDLE: 1332 case GIRDLE:
1480 case CONTAINER: 1333 case CONTAINER:
1481 case DRINK: 1334 case DRINK:
1482 case FLESH: 1335 case FLESH:
1483 case INORGANIC: 1336 case INORGANIC:
1484 case CLOSE_CON: 1337 case CLOSE_CON:
1485 case CLOAK: 1338 case CLOAK:
1486 case GEM: 1339 case GEM:
1487 case POWER_CRYSTAL: 1340 case POWER_CRYSTAL:
1488 case POISON: 1341 case POISON:
1489 case BOOK: 1342 case BOOK:
1490 case SKILL_TOOL: 1343 case SKILL_TOOL:
1491 return 1; 1344 return 1;
1492 } 1345 }
1346
1493 /* Try to track down some stuff that may show up here. Thus, the 1347 /* Try to track down some stuff that may show up here. Thus, the
1494 * archetype file can be updated, and this function removed. 1348 * archetype file can be updated, and this function removed.
1495 */ 1349 */
1496#if 0 1350#if 0
1497 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name); 1351 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
… …
1521 { 1375 {
1522 if (op->inv && op->randomitems) 1376 if (op->inv && op->randomitems)
1523 op->title = op->inv->name; 1377 op->title = op->inv->name;
1524 else if (op->arch) 1378 else if (op->arch)
1525 { 1379 {
1526 op->name = op->arch->clone.name; 1380 op->name = op->arch->object::name;
1527 op->name_pl = op->arch->clone.name_pl; 1381 op->name_pl = op->arch->object::name_pl;
1528 } 1382 }
1529 } 1383 }
1530 1384
1531 /* If the object is on a map, make sure we update its face */ 1385 /* If the object is on a map, make sure we update its face */
1532 if (op->map) 1386 if (op->map)

Diff Legend

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