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.6 by root, Thu Sep 14 22:33:58 2006 UTC vs.
Revision 1.54 by elmex, Mon Jan 12 00:17:22 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines