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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines