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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines