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.35 by root, Sun May 27 23:56:21 2007 UTC vs.
Revision 1.69 by root, Sat Jan 30 23:30:26 2010 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines