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