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.16 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.46 by root, Sun Apr 20 22:03:21 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines