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.38 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.77 by root, Sat Apr 3 02:27:24 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines