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

Diff Legend

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