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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines