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.26 by root, Mon Apr 23 18:09:57 2007 UTC vs.
Revision 1.47 by root, Mon Apr 21 23:35:24 2008 UTC

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

Diff Legend

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