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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines