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

Diff Legend

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