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.12 by elmex, Wed Dec 20 12:13:48 2006 UTC vs.
Revision 1.39 by root, Tue Jul 10 05:51:37 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines