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

Diff Legend

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