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.38 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.51 by root, Sun Sep 7 21:31:23 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <funcpoint.h>
26#include <living.h> 25#include <living.h>
27#include <spells.h> 26#include <spells.h>
27
28const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 };
28 29
29/* the ordering of this is actually doesn't make a difference 30/* the ordering of this is actually doesn't make a difference
30 * However, for ease of use, new entries should go at the end 31 * However, for ease of use, new entries should go at the end
31 * so those people that debug the code that get used to something 32 * so those people that debug the code that get used to something
32 * being in the location 4 don't get confused. 33 * being in the location 4 don't get confused.
… …
298 if (op->type == WEAPON) 299 if (op->type == WEAPON)
299 { 300 {
300 for (i = 1; i < NROFATTACKS; i++) 301 for (i = 1; i < NROFATTACKS; i++)
301 if (op->attacktype & (1 << i)) 302 if (op->attacktype & (1 << i))
302 enc++; 303 enc++;
304
303 if (op->slaying) 305 if (op->slaying)
304 enc += 2; /* What it slays is probably more relevent */ 306 enc += 2; /* What it slays is probably more relevent */
305 } 307 }
308
306 /* Items the player can equip */ 309 /* Items the player can equip */
307 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) || 310 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
308 (op->type == SHIELD) || (op->type == RING) || 311 (op->type == SHIELD) || (op->type == RING) ||
309 (op->type == BOOTS) || (op->type == GLOVES) || 312 (op->type == BOOTS) || (op->type == GLOVES) ||
310 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 313 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
… …
313 enc += op->stats.hp; /* hp regen */ 316 enc += op->stats.hp; /* hp regen */
314 enc += op->stats.sp; /* mana regen */ 317 enc += op->stats.sp; /* mana regen */
315 enc += op->stats.grace; /* grace regen */ 318 enc += op->stats.grace; /* grace regen */
316 enc += op->stats.exp; /* speed bonus */ 319 enc += op->stats.exp; /* speed bonus */
317 } 320 }
321
318 enc += op->stats.luck; 322 enc += op->stats.luck;
319 323
320 /* Do spell paths now */ 324 /* Do spell paths now */
321 for (i = 1; i < NRSPELLPATHS; i++) 325 for (i = 1; i < NRSPELLPATHS; i++)
322 { 326 {
… …
354 int i; 358 int i;
355 359
356 for (i = 0; i < item_types_size; i++) 360 for (i = 0; i < item_types_size; i++)
357 if (item_types[i].number == itemtype) 361 if (item_types[i].number == itemtype)
358 return &item_types[i]; 362 return &item_types[i];
363
359 return NULL; 364 return NULL;
360} 365}
361 366
362/* returns the typedata that has a name equal to itemtype, if there 367/* returns the typedata that has a name equal to itemtype, if there
363 * isn't one, return the plural name that matches, if there still isn't 368 * isn't one, return the plural name that matches, if there still isn't
… …
368 int i; 373 int i;
369 374
370 for (i = 0; i < item_types_size; i++) 375 for (i = 0; i < item_types_size; i++)
371 if (!strcmp (item_types[i].name, name)) 376 if (!strcmp (item_types[i].name, name))
372 return &item_types[i]; 377 return &item_types[i];
378
373 for (i = 0; i < item_types_size; i++) 379 for (i = 0; i < item_types_size; i++)
374 if (!strcmp (item_types[i].name_pl, name)) 380 if (!strcmp (item_types[i].name_pl, name))
375 { 381 {
376 LOG (llevInfo, 382 LOG (llevInfo,
377 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is preffered\n", name, item_types[i].name); 383 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
378 return &item_types[i]; 384 return &item_types[i];
379 } 385 }
386
380 return NULL; 387 return NULL;
381} 388}
382 389
383/* describe_resistance generates the visible naming for resistances. 390/* describe_resistance generates the visible naming for resistances.
384 * returns a static array of the description. This can return 391 * returns a static array of the description. This can return
… …
417 */ 424 */
418const char * 425const char *
419query_weight (const object *op) 426query_weight (const object *op)
420{ 427{
421 static char buf[10]; 428 static char buf[10];
422 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 429 sint32 i = op->total_weight ();
423 430
424 if (op->weight < 0) 431 if (op->weight < 0)
425 return " "; 432 return " ";
426 433
427 if (i % 1000) 434 if (i % 1000)
… …
491 * from stats.sp - b.t. 498 * from stats.sp - b.t.
492 */ 499 */
493const char * 500const char *
494ring_desc (const object *op) 501ring_desc (const object *op)
495{ 502{
496 static char buf[VERY_BIG_BUF]; 503 static dynbuf_text buf; buf.clear ();
497 int attr, val, len; 504 int attr, val, len;
498 505
499 buf[0] = 0;
500
501 if (!QUERY_FLAG (op, FLAG_IDENTIFIED)) 506 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
502 return buf; 507 {
503
504 for (attr = 0; attr < NUM_STATS; attr++) 508 for (attr = 0; attr < NUM_STATS; attr++)
505 {
506 if ((val = op->stats.stat (attr))) 509 if ((val = op->stats.stat (attr)))
507 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 510 buf.printf ("(%s%+d)", short_stat_name[attr], val);
508 }
509 511
510 if (op->stats.exp) 512 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);
511 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 513 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
512 if (op->stats.wc) 514 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
513 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc); 515 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
514 if (op->stats.dam)
515 sprintf (buf + strlen (buf), "(dam%+d)", op->stats.dam);
516 if (op->stats.ac)
517 sprintf (buf + strlen (buf), "(ac%+d)", op->stats.ac);
518 516
519 strcat (buf, describe_resistance (op, 0)); 517 buf << describe_resistance (op, 0);
520 518
521 if (op->stats.food != 0) 519 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
522 sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food); 520 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
523 /* else if (op->stats.food < 0) 521 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
524 sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */ 522 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
525 if (op->stats.grace) 523 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
526 sprintf (buf + strlen (buf), "(grace%+d)", op->stats.grace);
527 if (op->stats.sp && op->type != SKILL)
528 sprintf (buf + strlen (buf), "(magic%+d)", op->stats.sp);
529 if (op->stats.hp)
530 sprintf (buf + strlen (buf), "(regeneration%+d)", op->stats.hp);
531 if (op->stats.luck)
532 sprintf (buf + strlen (buf), "(luck%+d)", op->stats.luck);
533 if (QUERY_FLAG (op, FLAG_LIFESAVE))
534 strcat (buf, "(lifesaving)");
535 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
536 strcat (buf, "(reflect spells)");
537 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
538 strcat (buf, "(reflect missiles)");
539 if (QUERY_FLAG (op, FLAG_STEALTH))
540 strcat (buf, "(stealth)");
541 524
542 /* Shorten some of the names, so they appear better in the windows */ 525 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
543 len = strlen (buf); 526 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
544 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF); 527 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
545 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF); 528 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
546 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
547 529
548 /* if(op->item_power) 530 buf.add_paths ("Attuned" , op->path_attuned);
549 sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power); 531 buf.add_paths ("Repelled", op->path_repelled);
550 */ 532 buf.add_paths ("Denied" , op->path_denied);
551 if (buf[0] == 0 && op->type != SKILL)
552 strcpy (buf, "of adornment");
553 533
534 if (buf.empty ())
535 buf << "of adornment";
536 }
554 537
555 return buf; 538 return buf;
556} 539}
557 540
558/* 541/*
… …
560 * contain any information about object status (worn/cursed/etc.) 543 * contain any information about object status (worn/cursed/etc.)
561 */ 544 */
562const char * 545const char *
563query_short_name (const object *op) 546query_short_name (const object *op)
564{ 547{
565 static char buf[HUGE_BUF];
566 char buf2[HUGE_BUF];
567 int len = 0;
568
569 if (op->name == NULL) 548 if (op->name == 0)
570 return "(null)"; 549 return "(null)";
571 550
572 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 551 if (!op->nrof
552 && !op->weight
553 && !op->title
554 && !is_magical (op)
555 && op->slaying != shstr_money)
573 return op->name; /* To speed things up (or make things slower?) */ 556 return op->name; /* To speed things up (or make things slower?) */
574 557
575 if (op->nrof <= 1) 558 static dynbuf_text buf; buf.clear ();
576 safe_strcat (buf, op->name, &len, HUGE_BUF); 559
577 else 560 buf << (op->nrof <= 1 ? op->name : op->name_pl);
578 safe_strcat (buf, op->name_pl, &len, HUGE_BUF);
579 561
580 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 562 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
581 { 563 buf << ' ' << op->title;
582 safe_strcat (buf, " ", &len, HUGE_BUF);
583 safe_strcat (buf, op->title, &len, HUGE_BUF);
584 }
585 564
586 switch (op->type) 565 switch (op->type)
587 { 566 {
588 case SPELLBOOK: 567 case SPELLBOOK:
589 case SCROLL: 568 case SCROLL:
590 case WAND: 569 case WAND:
591 case ROD: 570 case ROD:
592 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 571 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
572 {
573 if (!op->title)
574 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
575
576 if (op->type != SPELLBOOK)
577 buf.printf (" (lvl %d)", op->level);
578 }
579 break;
580
581 case ALTAR:
582 case TRIGGER_ALTAR:
583 case IDENTIFY_ALTAR:
584 case CONVERTER:
585 if (op->slaying == shstr_money)
593 { 586 {
594 if (!op->title) 587 bool wrap = !!buf.size ();
595 { 588
596 safe_strcat (buf, " of ", &len, HUGE_BUF); 589 if (wrap) buf << " [";
597 if (op->inv) 590
598 safe_strcat (buf, op->inv->name, &len, HUGE_BUF); 591 archetype *coin = 0;
592
593 for (char const *const *c = coins; *coins; ++c)
594 if ((coin = archetype::find (*c)))
595 if (op->stats.food % coin->value == 0)
599 else 596 break;
600 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 597
601 } 598 sint32 coins = op->stats.food / coin->value;
602 if (op->type != SPELLBOOK) 599
603 { 600 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
604 sprintf (buf2, " (lvl %d)", op->level); 601
605 safe_strcat (buf, buf2, &len, HUGE_BUF); 602 if (wrap) buf << ']';
606 }
607 } 603 }
608 break; 604 break;
609 605
610 case SKILL: 606 case SKILL:
611 case AMULET: 607 case AMULET:
612 case RING: 608 case RING:
613 if (!op->title) 609 if (!op->title)
614 { 610 {
615 /* If ring has a title, full description isn't so useful */ 611 /* If ring has a title, full description isn't so useful */
616 const char *s = ring_desc (op); 612 const char *s = ring_desc (op);
617 613
618 if (s[0]) 614 if (s && *s)
619 { 615 buf << " " << s;
620 safe_strcat (buf, " ", &len, HUGE_BUF);
621 safe_strcat (buf, s, &len, HUGE_BUF);
622 }
623 } 616 }
624 break; 617 break;
618
625 default: 619 default:
626 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 620 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
627 {
628 sprintf (buf2, " %+d", op->magic); 621 buf.printf (" %+d", op->magic);
629 safe_strcat (buf, buf2, &len, HUGE_BUF);
630 }
631 } 622 }
623
632 return buf; 624 return buf;
633} 625}
634 626
635/* 627/*
636 * query_name(object) returns a character pointer pointing to a static 628 * query_name(object) returns a character pointer pointing to a static
… …
644 * 636 *
645 */ 637 */
646const char * 638const char *
647query_name (const object *op) 639query_name (const object *op)
648{ 640{
649 static char buf[5][HUGE_BUF]; // OMFG 641 int len = 0;
642 static dynbuf_text bufs[5];
650 static int use_buf = 0; 643 static int use_buf = 0;
651 int len = 0;
652
653#ifdef NEW_MATERIAL_CODE
654 materialtype_t *mt;
655#endif
656 644
657 use_buf++; 645 use_buf++;
658 use_buf %= 5; 646 use_buf %= 5;
659 647
660#ifdef NEW_MATERIAL_CODE 648 dynbuf_text &buf = bufs [use_buf];
649 buf.clear ();
650
661 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 651 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
662 {
663 mt = name_to_material (op->materialname); 652 if (materialtype_t *mt = name_to_material (op->materialname))
664 if (mt) 653 buf << mt->description << ' ';
665 {
666 safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
667 safe_strcat (buf[use_buf], " ", &len, HUGE_BUF);
668 }
669 }
670#endif
671 654
672 safe_strcat (buf[use_buf], query_short_name (op), &len, HUGE_BUF); 655 buf << query_short_name (op);
673 656
674 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 657 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
675 safe_strcat (buf[use_buf], " *", &len, HUGE_BUF); 658 buf << " *";
676 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 659 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
677 safe_strcat (buf[use_buf], " (open)", &len, HUGE_BUF); 660 buf << " (open)";
678 661
679 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 662 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
680 { 663 {
681 if (QUERY_FLAG (op, FLAG_DAMNED)) 664 if (QUERY_FLAG (op, FLAG_DAMNED))
682 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 665 buf << " (damned)";
683 else if (QUERY_FLAG (op, FLAG_CURSED)) 666 else if (QUERY_FLAG (op, FLAG_CURSED))
684 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 667 buf << " (cursed)";
685 } 668 }
686 669
687 /* Basically, if the object is known magical (detect magic spell on it), 670 /* Basically, if the object is known magical (detect magic spell on it),
688 * and it isn't identified, print out the fact that 671 * and it isn't identified, print out the fact that
689 * it is magical. Assume that the detect magical spell will only set 672 * it is magical. Assume that the detect magical spell will only set
… …
692 * Changed in V 0.91.4 - still print that the object is magical even 675 * Changed in V 0.91.4 - still print that the object is magical even
693 * if it has been applied. Equipping an item does not tell full 676 * if it has been applied. Equipping an item does not tell full
694 * abilities, especially for artifact items. 677 * abilities, especially for artifact items.
695 */ 678 */
696 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 679 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
697 safe_strcat (buf[use_buf], " (magic)", &len, HUGE_BUF); 680 buf << " (magic)";
698 681
699#if 0 682#if 0
700 /* item_power will be returned in desribe_item - it shouldn't really 683 /* item_power will be returned in desribe_item - it shouldn't really
701 * be returned in the name. 684 * be returned in the name.
702 */ 685 */
… …
711 { 694 {
712 case BOW: 695 case BOW:
713 case WAND: 696 case WAND:
714 case ROD: 697 case ROD:
715 case HORN: 698 case HORN:
716 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF); 699 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
717 break; 700 break;
718 case WEAPON: 701 case WEAPON:
719 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF); 702 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");
720 break; 703 break;
721 case ARMOUR: 704 case ARMOUR:
722 case HELMET: 705 case HELMET:
723 case SHIELD: 706 case SHIELD:
724 case RING: 707 case RING:
… …
726 case GLOVES: 709 case GLOVES:
727 case AMULET: 710 case AMULET:
728 case GIRDLE: 711 case GIRDLE:
729 case BRACERS: 712 case BRACERS:
730 case CLOAK: 713 case CLOAK:
731 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 714 buf << " (worn)";
732 break; 715 break;
733 case CONTAINER: 716 case CONTAINER:
734 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 717 buf << " (active)";
735 break; 718 break;
736 case SKILL: 719 case SKILL:
737 default: 720 default:
738 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 721 buf << " (applied)";
739 } 722 }
740 } 723 }
741 724
742 if (QUERY_FLAG (op, FLAG_UNPAID)) 725 if (QUERY_FLAG (op, FLAG_UNPAID))
743 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 726 buf << " (unpaid)";
744 727
745 return buf [use_buf]; 728 return buf;
746} 729}
747 730
748/* 731/*
749 * query_base_name(object) returns a character pointer pointing to a static 732 * query_base_name(object) returns a character pointer pointing to a static
750 * buffer which contains a verbose textual representation of the name 733 * buffer which contains a verbose textual representation of the name
… …
755 * If plural is set, we generate the plural name of this. 738 * If plural is set, we generate the plural name of this.
756 */ 739 */
757const char * 740const char *
758query_base_name (const object *op, int plural) 741query_base_name (const object *op, int plural)
759{ 742{
760 static char buf[MAX_BUF], buf2[MAX_BUF];
761 int len;
762 materialtype_t *mt;
763
764 if ((!plural && !op->name) || (plural && !op->name_pl)) 743 if ((!plural && !op->name) || (plural && !op->name_pl))
765 return "(null)"; 744 return "(null)";
766 745
767 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 746 if (!op->nrof && !op->weight && !op->title && !is_magical (op))
768 return op->name; /* To speed things up (or make things slower?) */ 747 return op->name; /* To speed things up (or make things slower?) */
769 748
749 static dynbuf_text buf; buf.clear ();
750
770 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 751 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
771 mt = name_to_material (op->materialname); 752 if (materialtype_t *mt = name_to_material (op->materialname))
753 if (op->arch->materialname != mt->name)
754 buf << mt->description << ' ';
772 755
773#ifdef NEW_MATERIAL_CODE 756 buf << (plural ? op->name_pl : op->name);
774 if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
775 op->arch->materialname != mt->name && !(op->material & M_SPECIAL))
776 {
777 strcpy (buf, mt->description);
778 len = strlen (buf);
779 safe_strcat (buf, " ", &len, MAX_BUF);
780 if (!plural)
781 safe_strcat (buf, op->name, &len, MAX_BUF);
782 else
783 safe_strcat (buf, op->name_pl, &len, MAX_BUF);
784 }
785 else
786 {
787#endif
788 if (!plural)
789 assign (buf, op->name);
790 else
791 assign (buf, op->name_pl);
792
793 len = strlen (buf);
794#ifdef NEW_MATERIAL_CODE
795 }
796#endif
797 757
798 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 758 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
799 { 759 buf << ' ' << op->title;
800 safe_strcat (buf, " ", &len, MAX_BUF);
801 safe_strcat (buf, op->title, &len, MAX_BUF);
802 }
803 760
804 switch (op->type) 761 switch (op->type)
805 { 762 {
806 case SPELLBOOK: 763 case SPELLBOOK:
807 case SCROLL: 764 case SCROLL:
808 case WAND: 765 case WAND:
809 case ROD: 766 case ROD:
810 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 767 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
811 { 768 {
812 if (!op->title) 769 if (!op->title)
813 { 770 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
814 safe_strcat (buf, " of ", &len, MAX_BUF); 771
815 if (op->inv)
816 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
817 else
818 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
819 }
820 if (op->type != SPELLBOOK) 772 if (op->type != SPELLBOOK)
821 {
822 sprintf (buf2, " (lvl %d)", op->level); 773 buf.printf (" (lvl %d)", op->level);
823 safe_strcat (buf, buf2, &len, MAX_BUF);
824 }
825 } 774 }
826 break; 775 break;
827 776
828 777
829 case SKILL: 778 case SKILL:
… …
832 if (!op->title) 781 if (!op->title)
833 { 782 {
834 /* If ring has a title, full description isn't so useful */ 783 /* If ring has a title, full description isn't so useful */
835 const char *s = ring_desc (op); 784 const char *s = ring_desc (op);
836 785
837 if (s[0]) 786 if (s && *s)
838 { 787 buf << ' ' << s;
839 safe_strcat (buf, " ", &len, MAX_BUF);
840 safe_strcat (buf, s, &len, MAX_BUF);
841 }
842 } 788 }
843 break; 789 break;
844 790
845 default: 791 default:
846 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 792 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
847 sprintf (buf + strlen (buf), " %+d", op->magic); 793 buf.printf (" %+d", op->magic);
848 } 794 }
849 795
850 return buf; 796 return buf;
851} 797}
852 798
… …
854 * too long, making it difficult to read. This function deals 800 * too long, making it difficult to read. This function deals
855 * with describing the monsters & players abilities. It should only 801 * with describing the monsters & players abilities. It should only
856 * be called with monster & player objects. Returns a description 802 * be called with monster & player objects. Returns a description
857 * in a static buffer. 803 * in a static buffer.
858 */ 804 */
859static char * 805static const char *
860describe_monster (const object *op) 806describe_monster (const object *op)
861{ 807{
862 char buf[MAX_BUF]; 808 static dynbuf_text buf; buf.clear ();
863 static char retbuf[VERY_BIG_BUF];
864 int i;
865
866 retbuf[0] = '\0';
867 809
868 /* Note that the resolution this provides for players really isn't 810 /* Note that the resolution this provides for players really isn't
869 * very good. Any player with a speed greater than .67 will 811 * very good. Any player with a speed greater than .67 will
870 * fall into the 'lightning fast movement' category. 812 * fall into the 'lightning fast movement' category.
871 */ 813 */
872 if (op->has_active_speed ()) 814 if (op->has_active_speed ())
873 {
874 switch ((int) ((FABS (op->speed)) * 15)) 815 switch ((int) ((FABS (op->speed)) * 15))
875 { 816 {
876 case 0: 817 case 0:
877 strcat (retbuf, "(very slow movement)"); 818 buf << "(very slow movement)";
878 break; 819 break;
879 case 1: 820 case 1:
880 strcat (retbuf, "(slow movement)"); 821 buf << "(slow movement)";
881 break; 822 break;
882 case 2: 823 case 2:
883 strcat (retbuf, "(normal movement)"); 824 buf << "(normal movement)";
884 break; 825 break;
885 case 3: 826 case 3:
886 case 4: 827 case 4:
887 strcat (retbuf, "(fast movement)"); 828 buf << "(fast movement)";
888 break; 829 break;
889 case 5: 830 case 5:
890 case 6: 831 case 6:
891 strcat (retbuf, "(very fast movement)"); 832 buf << "(very fast movement)";
892 break; 833 break;
893 case 7: 834 case 7:
894 case 8: 835 case 8:
895 case 9: 836 case 9:
896 case 10: 837 case 10:
897 strcat (retbuf, "(extremely fast movement)"); 838 buf << "(extremely fast movement)";
898 break; 839 break;
899 default: 840 default:
900 strcat (retbuf, "(lightning fast movement)"); 841 buf << "(lightning fast movement)";
901 break; 842 break;
902 } 843 }
903 } 844
904 if (QUERY_FLAG (op, FLAG_UNDEAD)) 845 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";
905 strcat (retbuf, "(undead)");
906 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) 846 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";
907 strcat (retbuf, "(see invisible)"); 847 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";
908 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) 848 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";
909 strcat (retbuf, "(wield weapon)"); 849 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";
910 if (QUERY_FLAG (op, FLAG_USE_BOW)) 850 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";
911 strcat (retbuf, "(archer)"); 851 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";
912 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) 852 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";
913 strcat (retbuf, "(wear armour)");
914 if (QUERY_FLAG (op, FLAG_USE_RING))
915 strcat (retbuf, "(wear ring)");
916 if (QUERY_FLAG (op, FLAG_USE_SCROLL))
917 strcat (retbuf, "(read scroll)");
918 if (QUERY_FLAG (op, FLAG_USE_RANGE))
919 strcat (retbuf, "(fires wand/rod/horn)");
920 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) 853 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";
921 strcat (retbuf, "(skill user)"); 854 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";
922 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) 855 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";
923 strcat (retbuf, "(spellcaster)");
924 if (QUERY_FLAG (op, FLAG_FRIENDLY))
925 strcat (retbuf, "(friendly)");
926 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) 856 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";
927 strcat (retbuf, "(unaggressive)"); 857 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";
928 if (QUERY_FLAG (op, FLAG_HITBACK)) 858 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";
929 strcat (retbuf, "(hitback)"); 859
930 if (QUERY_FLAG (op, FLAG_STEALTH))
931 strcat (retbuf, "(stealthy)");
932 if (op->randomitems != NULL) 860 if (op->randomitems)
933 { 861 {
934 treasure *t;
935 int first = 1; 862 bool first = 1;
936 863
937 for (t = op->randomitems->items; t != NULL; t = t->next) 864 for (treasure *t = op->randomitems->items; t; t = t->next)
938 if (t->item && t->item->type == SPELL) 865 if (t->item && t->item->type == SPELL)
939 { 866 {
940 if (first) 867 if (first)
941 { 868 buf << "(Spell abilities:)";
869
942 first = 0; 870 first = 0;
943 strcat (retbuf, "(Spell abilities:)"); 871
944 } 872 buf << '(' << t->item->object::name << ')';
945 strcat (retbuf, "(");
946 strcat (retbuf, t->item->object::name);
947 strcat (retbuf, ")");
948 } 873 }
949 } 874 }
875
950 if (op->type == PLAYER) 876 if (op->type == PLAYER)
951 { 877 {
952 if (op->contr->digestion) 878 if (op->contr->digestion)
953 {
954 if (op->contr->digestion != 0)
955 sprintf (buf, "(sustenance%+d)", op->contr->digestion); 879 buf.printf ("(sustenance%+d)", op->contr->digestion);
956 strcat (retbuf, buf); 880
957 }
958 if (op->contr->gen_grace) 881 if (op->contr->gen_grace)
959 {
960 sprintf (buf, "(grace%+d)", op->contr->gen_grace); 882 buf.printf ("(grace%+d)", op->contr->gen_grace);
961 strcat (retbuf, buf); 883
962 }
963 if (op->contr->gen_sp) 884 if (op->contr->gen_sp)
964 {
965 sprintf (buf, "(magic%+d)", op->contr->gen_sp); 885 buf.printf ("(magic%+d)", op->contr->gen_sp);
966 strcat (retbuf, buf); 886
967 }
968 if (op->contr->gen_hp) 887 if (op->contr->gen_hp)
969 {
970 sprintf (buf, "(regeneration%+d)", op->contr->gen_hp); 888 buf.printf ("(regeneration%+d)", op->contr->gen_hp);
971 strcat (retbuf, buf); 889
972 }
973 if (op->stats.luck) 890 if (op->stats.luck)
974 {
975 sprintf (buf, "(luck%+d)", op->stats.luck); 891 buf.printf ("(luck%+d)", op->stats.luck);
976 strcat (retbuf, buf);
977 }
978 } 892 }
979 893
980 /* describe attacktypes */ 894 /* describe attacktypes */
981 if (is_dragon_pl (op)) 895 if (is_dragon_pl (op))
982 { 896 {
… …
984 * Break apart the for loop - move the comparison checking down - 898 * Break apart the for loop - move the comparison checking down -
985 * this makes it more readable. 899 * this makes it more readable.
986 */ 900 */
987 object *tmp; 901 object *tmp;
988 902
989 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 903 for (tmp = op->inv; tmp; tmp = tmp->below)
990 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 904 if (tmp->type == SKILL && tmp->name == shstr_clawing)
991 break; 905 break;
992 906
993 if (tmp && tmp->attacktype != 0) 907 if (tmp && tmp->attacktype)
994 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") } 908 buf.add_abilities ("Claws", tmp->attacktype);
995 else 909 else
996 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") } 910 buf.add_abilities ("Attacks", op->attacktype);
997 } 911 }
998 else 912 else
999 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") } 913 buf.add_abilities ("Attacks", op->attacktype);
1000 914
1001 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 915 buf.add_paths ("Attuned" , op->path_attuned);
1002 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 916 buf.add_paths ("Repelled", op->path_repelled);
1003 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 917 buf.add_paths ("Denied" , op->path_denied);
1004 918
1005 for (i = 0; i < NROFATTACKS; i++) 919 for (int i = 0; i < NROFATTACKS; i++)
1006 if (op->resist[i]) 920 if (op->resist[i])
1007 {
1008 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 921 buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1009 strcat (retbuf, buf);
1010 }
1011 922
1012 return retbuf; 923 return buf;
1013} 924}
1014
1015 925
1016/* 926/*
1017 * Returns a pointer to a static buffer which contains a 927 * Returns a pointer to a static buffer which contains a
1018 * description of the given object. 928 * description of the given object.
1019 * If it is a monster, lots of information about its abilities 929 * If it is a monster, lots of information about its abilities
… …
1040 * item (eg, debug dump or the like) 950 * item (eg, debug dump or the like)
1041 */ 951 */
1042const char * 952const char *
1043describe_item (const object *op, object *owner) 953describe_item (const object *op, object *owner)
1044{ 954{
1045 char buf[MAX_BUF]; 955 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1046 static char retbuf[VERY_BIG_BUF]; 956 return describe_monster (op);
957
958 static dynbuf_text buf; buf.clear ();
1047 int identified, i; 959 int identified, i;
1048 960
1049 retbuf[0] = '\0';
1050 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1051 {
1052 return describe_monster (op);
1053 }
1054 /* figure this out once, instead of making multiple calls to need_identify. 961 /* figure this out once, instead of making multiple calls to need_identify.
1055 * also makes the code easier to read. 962 * also makes the code easier to read.
1056 */ 963 */
1057 if (!need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED)) 964 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED);
1058 identified = 1; 965 if (!identified)
1059 else 966 buf << "(unidentified)";
1060 { 967
1061 strcpy (retbuf, "(unidentified)");
1062 identified = 0;
1063 }
1064 switch (op->type) 968 switch (op->type)
1065 { 969 {
1066 case BOW: 970 case BOW:
1067 case ARROW: 971 case ARROW:
1068 case WAND: 972 case WAND:
1069 case ROD: 973 case ROD:
1070 case HORN: 974 case HORN:
1071 case WEAPON: 975 case WEAPON:
1072 case ARMOUR: 976 case ARMOUR:
1073 case HELMET: 977 case HELMET:
1074 case SHIELD: 978 case SHIELD:
1075 case BOOTS: 979 case BOOTS:
1076 case GLOVES: 980 case GLOVES:
1077 case GIRDLE: 981 case GIRDLE:
1078 case BRACERS: 982 case BRACERS:
1079 case CLOAK: 983 case CLOAK:
1080 case SKILL_TOOL: 984 case SKILL_TOOL:
1081 break; /* We have more information to do below this switch */ 985 break; /* We have more information to do below this switch */
1082 986
1083 case POWER_CRYSTAL: 987 case POWER_CRYSTAL:
1084 if (op->stats.maxsp > 1000) 988 if (op->stats.maxsp > 1000)
1085 { /*higher capacity crystals */ 989 { /*higher capacity crystals */
1086 i = (op->stats.maxsp % 1000) / 100; 990 i = (op->stats.maxsp % 1000) / 100;
1087 991
1088 if (i) 992 if (i)
1089 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i); 993 buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1090 else 994 else
1091 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 1000); 995 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);
1092 } 996 }
1093 else 997 else
1094 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 998 buf.printf ("(capacity %d). It is ", op->stats.maxsp);
1095 999
1096 strcat (retbuf, buf);
1097 i = (op->stats.sp * 10) / op->stats.maxsp; 1000 i = (op->stats.sp * 10) / op->stats.maxsp;
1098 if (op->stats.sp == 0) 1001 if (op->stats.sp == 0)
1099 strcat (retbuf, "empty."); 1002 buf << "empty.";
1100 else if (i == 0) 1003 else if (i == 0)
1101 strcat (retbuf, "almost empty."); 1004 buf << "almost empty.";
1102 else if (i < 3) 1005 else if (i < 3)
1103 strcat (retbuf, "partially filled."); 1006 buf << "partially filled.";
1104 else if (i < 6) 1007 else if (i < 6)
1105 strcat (retbuf, "half full."); 1008 buf << "half full.";
1106 else if (i < 9) 1009 else if (i < 9)
1107 strcat (retbuf, "well charged."); 1010 buf << "well charged.";
1108 else if (op->stats.sp == op->stats.maxsp) 1011 else if (op->stats.sp == op->stats.maxsp)
1109 strcat (retbuf, "fully charged."); 1012 buf << "fully charged.";
1110 else 1013 else
1111 strcat (retbuf, "almost full."); 1014 buf << "almost full.";
1112 break; 1015 break;
1016
1113 case FOOD: 1017 case FOOD:
1114 case FLESH: 1018 case FLESH:
1115 case DRINK: 1019 case DRINK:
1116 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1020 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1117 { 1021 {
1118 sprintf (buf, "(food+%d)", op->stats.food); 1022 buf.printf ("(food+%d)", op->stats.food);
1119 strcat (retbuf, buf);
1120 1023
1121 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 1024 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]); 1025 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1124 strcat (retbuf, buf);
1125 }
1126 1026
1127 if (!QUERY_FLAG (op, FLAG_CURSED)) 1027 if (!QUERY_FLAG (op, FLAG_CURSED))
1128 { 1028 {
1129 if (op->stats.hp) 1029 if (op->stats.hp) buf << "(heals)";
1130 strcat (retbuf, "(heals)");
1131 if (op->stats.sp)
1132 strcat (retbuf, "(spellpoint regen)"); 1030 if (op->stats.sp) buf << "(spellpoint regen)";
1133 } 1031 }
1134 else 1032 else
1135 { 1033 {
1136 if (op->stats.hp) 1034 if (op->stats.hp) buf << "(damages)";
1137 strcat (retbuf, "(damages)");
1138 if (op->stats.sp)
1139 strcat (retbuf, "(spellpoint depletion)"); 1035 if (op->stats.sp) buf << "(spellpoint depletion)";
1140 } 1036 }
1141 } 1037 }
1142 break; 1038 break;
1143 1039
1144
1145 case SKILL: 1040 case SKILL:
1146 case RING: 1041 case RING:
1147 case AMULET: 1042 case AMULET:
1148 if (op->item_power) 1043 if (op->item_power)
1149 {
1150 sprintf (buf, "(item_power %+d)", op->item_power); 1044 buf.printf ("(item_power %+d)", op->item_power);
1151 strcat (retbuf, buf); 1045
1152 }
1153 if (op->title) 1046 if (op->title)
1154 strcat (retbuf, ring_desc (op)); 1047 buf << ring_desc (op);
1048
1155 return retbuf; 1049 return buf;
1156 1050
1157 default: 1051 default:
1158 return retbuf; 1052 return buf;
1159 } 1053 }
1160 1054
1161 /* Down here, we more further describe equipment type items. 1055 /* Down here, we more further describe equipment type items.
1162 * only describe them if they have been identified or the like. 1056 * only describe them if they have been identified or the like.
1163 */ 1057 */
1164 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1058 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1165 { 1059 {
1166 int attr, val; 1060 int attr, val;
1167 1061
1168 for (attr = 0; attr < NUM_STATS; attr++) 1062 for (attr = 0; attr < NUM_STATS; attr++)
1169 {
1170 if ((val = op->stats.stat (attr))) 1063 if ((val = op->stats.stat (attr)))
1171 {
1172 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1064 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1173 strcat (retbuf, buf);
1174 }
1175 }
1176 1065
1177 if (op->stats.exp) 1066 if (op->stats.exp)
1178 {
1179 sprintf (buf, "(speed %+lld)", (long long) op->stats.exp); 1067 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1180 strcat (retbuf, buf);
1181 }
1182
1183 1068
1184 switch (op->type) 1069 switch (op->type)
1185 { 1070 {
1186 case BOW: 1071 case BOW:
1187 case ARROW: 1072 case ARROW:
1188 case GIRDLE: 1073 case GIRDLE:
1189 case HELMET: 1074 case HELMET:
1190 case SHIELD: 1075 case SHIELD:
1191 case BOOTS: 1076 case BOOTS:
1192 case GLOVES: 1077 case GLOVES:
1193 case WEAPON: 1078 case WEAPON:
1194 case SKILL: 1079 case SKILL:
1195 case RING: 1080 case RING:
1196 case AMULET: 1081 case AMULET:
1197 case ARMOUR: 1082 case ARMOUR:
1198 case BRACERS: 1083 case BRACERS:
1199 case FORCE: 1084 case FORCE:
1200 case CLOAK: 1085 case CLOAK:
1201 if (op->stats.wc) 1086 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1202 { 1087 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1203 sprintf (buf, "(wc%+d)", op->stats.wc); 1088 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1204 strcat (retbuf, buf); 1089
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) 1090 if ((op->type == WEAPON || op->type == BOW) && op->level > 0)
1217 {
1218 sprintf (buf, "(improved %d/%d)", op->last_eat, op->level); 1091 buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1219 strcat (retbuf, buf); 1092
1220 }
1221 break; 1093 break;
1222 1094
1223 default: 1095 default:
1224 break; 1096 break;
1225 } 1097 }
1226 if (QUERY_FLAG (op, FLAG_XRAYS)) 1098
1227 strcat (retbuf, "(xray-vision)"); 1099 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";
1228 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 1100 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";
1229 strcat (retbuf, "(infravision)");
1230 1101
1231 /* levitate was what is was before, so we'll keep it */ 1102 /* levitate was what is was before, so we'll keep it */
1232 if (op->move_type & MOVE_FLY_LOW) 1103 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1233 strcat (retbuf, "(levitate)");
1234
1235 if (op->move_type & MOVE_FLY_HIGH) 1104 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1236 strcat (retbuf, "(fly)");
1237
1238 if (op->move_type & MOVE_SWIM) 1105 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1239 strcat (retbuf, "(swim)");
1240 1106
1241 /* walking is presumed as 'normal', so doesn't need mentioning */ 1107 /* walking is presumed as 'normal', so doesn't need mentioning */
1242 1108
1243 if (op->item_power) 1109 if (op->item_power)
1244 {
1245 sprintf (buf, "(item_power %+d)", op->item_power); 1110 buf.printf ("(item_power %+d)", op->item_power);
1246 strcat (retbuf, buf);
1247 }
1248 } /* End if identified or applied */ 1111 } /* End if identified or applied */
1249 1112
1250 /* This blocks only deals with fully identified object. 1113 /* This blocks only deals with fully identified object.
1251 * it is intentional that this is not an 'else' from a above - 1114 * it is intentional that this is not an 'else' from a above -
1252 * in this way, information is added. 1115 * in this way, information is added.
… …
1255 { 1118 {
1256 int more_info = 0; 1119 int more_info = 0;
1257 1120
1258 switch (op->type) 1121 switch (op->type)
1259 { 1122 {
1260 case ROD: /* These use stats.sp for spell selection and stats.food */ 1123 case ROD: /* These use stats.sp for spell selection and stats.food */
1261 case HORN: /* and stats.hp for spell-point regeneration... */ 1124 case HORN: /* and stats.hp for spell-point regeneration... */
1262 case BOW: 1125 case BOW:
1263 case ARROW: 1126 case ARROW:
1264 case WAND: 1127 case WAND:
1265 case FOOD: 1128 case FOOD:
1266 case FLESH: 1129 case FLESH:
1267 case DRINK: 1130 case DRINK:
1268 more_info = 0; 1131 more_info = 0;
1269 break; 1132 break;
1270 1133
1271 /* Armor type objects */ 1134 /* Armor type objects */
1272 case ARMOUR: 1135 case ARMOUR:
1273 case HELMET: 1136 case HELMET:
1274 case SHIELD: 1137 case SHIELD:
1275 case BOOTS: 1138 case BOOTS:
1276 case GLOVES: 1139 case GLOVES:
1277 case GIRDLE: 1140 case GIRDLE:
1278 case BRACERS: 1141 case BRACERS:
1279 case CLOAK: 1142 case CLOAK:
1280 if (ARMOUR_SPEED (op)) 1143 if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1281 { 1144 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; 1145 more_info = 1;
1291 break; 1146 break;
1292 1147
1293 case WEAPON: 1148 case WEAPON:
1294 /* Calculate it the same way fix_player does so the results 1149 /* Calculate it the same way fix_player does so the results
1295 * make sense. 1150 * make sense.
1296 */ 1151 */
1297 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2; 1152 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1298 if (i < 0) 1153 if (i < 0)
1299 i = 0; 1154 i = 0;
1300 1155
1301 sprintf (buf, "(weapon speed %d)", i); 1156 buf.printf ("(weapon speed %d)", i);
1302 strcat (retbuf, buf);
1303 more_info = 1; 1157 more_info = 1;
1304 break; 1158 break;
1305
1306 } 1159 }
1160
1307 if (more_info) 1161 if (more_info)
1308 { 1162 {
1309 if (op->stats.food)
1310 {
1311 if (op->stats.food != 0)
1312 sprintf (buf, "(sustenance%+d)", op->stats.food); 1163 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); 1164 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1318 strcat (retbuf, buf); 1165 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); 1166 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1328 strcat (retbuf, buf);
1329 }
1330 } 1167 }
1331 1168
1332 if (op->stats.luck) 1169 if (op->stats.luck)
1333 {
1334 sprintf (buf, "(luck%+d)", op->stats.luck); 1170 buf.printf ("(luck%+d)", op->stats.luck);
1335 strcat (retbuf, buf); 1171
1336 }
1337 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 1172 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
1338 strcat (retbuf, "(lifesaving)"); 1173 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)) 1174 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
1342 strcat (retbuf, "(reflect missiles)");
1343 if (QUERY_FLAG (op, FLAG_STEALTH)) 1175 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1344 strcat (retbuf, "(stealth)"); 1176
1345 if (op->slaying != NULL && op->type != FOOD) 1177 if (op->slaying && op->type != FOOD)
1346 {
1347 sprintf (buf, "(slay %s)", &op->slaying); 1178 buf.printf ("(slay %s)", &op->slaying);
1348 strcat (retbuf, buf); 1179
1349 } 1180 buf.add_abilities ("Attacks", op->attacktype);
1350 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1351 /* resistance on flesh is only visible for quetzals. If 1181 /* resistance on flesh is only visible for quetzals. If
1352 * non flesh, everyone can see its resistances 1182 * non flesh, everyone can see its resistances
1353 */ 1183 */
1354 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1184 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
1355 strcat (retbuf, describe_resistance (op, 0)); 1185 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 1186
1187 buf.add_paths ("Attuned", op->path_attuned);
1188 buf.add_paths ("Repelled", op->path_repelled);
1189 buf.add_paths ("Denied", op->path_denied);
1190 }
1191
1361 return retbuf; 1192 return buf;
1362} 1193}
1363 1194
1364std::string 1195std::string
1365object::describe_item (object *who) 1196object::describe_item (object *who)
1366{ 1197{
1367 return std::string (::describe_item (this, who)); 1198 return std::string (::describe_item (this, who));
1199}
1200
1201void
1202examine (object *op, object *tmp)
1203{
1204 std::string info = tmp->describe (op);
1205 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1206}
1207
1208/*
1209 * inventory prints object's inventory. If inv==NULL then print player's
1210 * inventory.
1211 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1212 */
1213const char *
1214object::query_inventory (object *who, const char *indent)
1215{
1216 static dynbuf_text buf; buf.clear ();
1217
1218 for (object *tmp = inv; tmp; tmp = tmp->below)
1219 if (who && QUERY_FLAG (who, FLAG_WIZ))
1220 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp));
1221 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1222 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp));
1223
1224 if (buf.size ())
1225 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this));
1226 else
1227 buf.printf ("%s(empty)\n", indent);
1228
1229 return buf;
1368} 1230}
1369 1231
1370/* Return true if the item is magical. A magical item is one that 1232/* Return true if the item is magical. A magical item is one that
1371 * increases/decreases any abilities, provides a resistance, 1233 * increases/decreases any abilities, provides a resistance,
1372 * has a generic magical bonus, or is an artifact. 1234 * has a generic magical bonus, or is an artifact.
1373 * This function is used by detect_magic to determine if an item 1235 * This function is used by detect_magic to determine if an item
1374 * should be marked as magical. 1236 * should be marked as magical.
1375 */ 1237 */
1376
1377int 1238int
1378is_magical (const object *op) 1239is_magical (const object *op)
1379{ 1240{
1380 int i; 1241 int i;
1381 1242
… …
1501 * Supposed to fix face-values as well here, but later. 1362 * Supposed to fix face-values as well here, but later.
1502 */ 1363 */
1503void 1364void
1504identify (object *op) 1365identify (object *op)
1505{ 1366{
1506 object *pl;
1507
1508 SET_FLAG (op, FLAG_IDENTIFIED); 1367 SET_FLAG (op, FLAG_IDENTIFIED);
1509 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1368 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
1510 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1369 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
1511 1370
1512 /* 1371 /*
… …
1519 { 1378 {
1520 if (op->inv && op->randomitems) 1379 if (op->inv && op->randomitems)
1521 op->title = op->inv->name; 1380 op->title = op->inv->name;
1522 else if (op->arch) 1381 else if (op->arch)
1523 { 1382 {
1524 op->name = op->arch->object::name; 1383 op->name = op->arch->object::name;
1525 op->name_pl = op->arch->object::name_pl; 1384 op->name_pl = op->arch->object::name_pl;
1526 } 1385 }
1527 } 1386 }
1528 1387
1529 /* If the object is on a map, make sure we update its face */ 1388 /* If the object is on a map, make sure we update its face */
1530 if (op->map) 1389 if (op->map)
1531 update_object (op, UP_OBJ_CHANGE); 1390 update_object (op, UP_OBJ_CHANGE);
1532 else 1391
1533 { 1392 if (object *pl = op->visible_to ())
1534 pl = op->in_player ();
1535 if (pl)
1536 /* A lot of the values can change from an update - might as well send 1393 /* A lot of the values can change from an update - might as well send
1537 * it all. 1394 * it all.
1538 */ 1395 */
1539 esrv_send_item (pl, op); 1396 esrv_send_item (pl, op);
1540 }
1541} 1397}
1542 1398

Diff Legend

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