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.29 by root, Thu May 3 04:50:26 2007 UTC vs.
Revision 1.49 by root, Fri Apr 25 11:40:34 2008 UTC

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

Diff Legend

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