ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/item.C
(Generate patch)

Comparing deliantra/server/common/item.C (file contents):
Revision 1.38 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.58 by root, Mon Oct 12 14:00:57 2009 UTC

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

Diff Legend

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