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.64 by root, Fri Nov 6 13:31:47 2009 UTC vs.
Revision 1.87 by root, Fri Apr 30 21:13:41 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
47 * 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
48 * may be better. 48 * may be better.
49 * Basically, for the use/nonuse, the code does something like: 49 * Basically, for the use/nonuse, the code does something like:
50 * "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
51 */ 51 */
52// see include/object.h
52Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 53Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
53 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"}, 54 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
54 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"}, 55 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
55 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"}, 56 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
56 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"}, 57 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
… …
70static char numbers_10[10][20] = { 71static char numbers_10[10][20] = {
71 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 72 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
72 "eighty", "ninety" 73 "eighty", "ninety"
73}; 74};
74 75
75static char levelnumbers[21][20] = { 76static char ordnumbers[21][20] = {
76 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", 77 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
77 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", 78 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
78 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", 79 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
79 "nineteen", "twentieth" 80 "nineteenth", "twentieth"
80}; 81};
81 82
82static char levelnumbers_10[11][20] = { 83static char ordnumbers_10[11][20] = {
83 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", 84 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
84 "seventieth", "eightieth", "ninetieth" 85 "seventieth", "eightieth", "ninetieth"
85}; 86};
86 87
87/* The following is a large table of item types, the fields are: 88/* The following is a large table of item types, the fields are:
… …
150 {EXIT, "exit", "exits", 0, 0}, 151 {EXIT, "exit", "exits", 0, 0},
151 {ENCOUNTER, "encounter", "encounters", 0, 0}, 152 {ENCOUNTER, "encounter", "encounters", 0, 0},
152 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, 153 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
153 {SHOP_MAT, "shop mat", "shop mats", 0, 0}, 154 {SHOP_MAT, "shop mat", "shop mats", 0, 0},
154 {RING, "ring", "rings", SK_JEWELER, 0}, 155 {RING, "ring", "rings", SK_JEWELER, 0},
155 {FLOOR, "floor", "floors", 0, 0}, 156// {FLOOR, "floor", "floors", 0, 0},
156 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 157 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
157 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 158 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
158 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 159 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
159 {LIGHTER, "lighter", "lighters", 0, 0}, 160 {LIGHTER, "lighter", "lighters", 0, 0},
160 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 161 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
… …
201 {BUILDER, "item builder", "item builders", 0, 0}, 202 {BUILDER, "item builder", "item builders", 0, 0},
202 {MATERIAL, "building material", "building materials", 0, 0}, 203 {MATERIAL, "building material", "building materials", 0, 0},
203 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 204 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
204}; 205};
205 206
206static const int item_types_size = sizeof (item_types) / sizeof (*item_types); 207static const int item_types_size = array_length (item_types);
207
208materialtype_t *materialt;
209
210/*
211materialtype material[NROFMATERIALS] = {
212 * P M F E C C A D W G P S P T F C D D C C G H B I *
213 * H A I L O O C R E H O L A U E A E E H O O O L N *
214 * Y G R E L N I A A O I O R R A N P A A U D L I T *
215 * S I E C D F D I P S S W A N R C L T O N Y N R *
216 * I C T U N O T O L E E H S T P D N *
217 {"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}},
218 {"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}},
219 {"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}},
220 {"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}},
221 {"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}},
222 {"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}},
223 {"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}},
224 {"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}},
225 {"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}},
226 {"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}},
227 {"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}},
228 {"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}},
229 {"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}}
230};
231*/
232 208
233/* 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
234 * 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
235 * wear whatever they want with no worries. Perhaps having the steep 211 * wear whatever they want with no worries. Perhaps having the steep
236 * curve is good (maybe even steeper), but allowing players to 212 * curve is good (maybe even steeper), but allowing players to
… …
238 * able to use 2-3 of the most powerful items. 214 * able to use 2-3 of the most powerful items.
239 * note that this table is only really used for program generated items - 215 * note that this table is only really used for program generated items -
240 * custom objects can use whatever they want. 216 * custom objects can use whatever they want.
241 */ 217 */
242static int enc_to_item_power[21] = { 218static int enc_to_item_power[21] = {
219 0,
243 0, 0, 1, 2, 3, 4, /* 5 */ 220 0, 1, 2, 3, 4, // 5
244 5, 7, 9, 11, 13, /* 10 */ 221 5, 7, 9, 11, 13, // 10
245 15, 18, 21, 24, 27, /* 15 */ 222 15, 18, 21, 24, 27, // 15
246 30, 35, 40, 45, 50 /* 20 */ 223 30, 35, 40, 45, 50 // 20
247}; 224};
248 225
249int 226int
250get_power_from_ench (int ench) 227get_power_from_ench (int ench)
251{ 228{
252 return enc_to_item_power [clamp (ench, 0, 20)]; 229 return enc_to_item_power [clamp (ench, 0, 20)];
230}
231
232static const struct need_identify_types : typeset
233{
234 need_identify_types ()
235 {
236 set (RING);
237 set (WAND);
238 set (ROD);
239 set (HORN);
240 set (SCROLL);
241 set (SKILL);
242 set (SKILLSCROLL);
243 set (SPELLBOOK);
244 set (FOOD);
245 set (POTION);
246 set (BOW);
247 set (ARROW);
248 set (WEAPON);
249 set (ARMOUR);
250 set (SHIELD);
251 set (HELMET);
252 set (AMULET);
253 set (BOOTS);
254 set (GLOVES);
255 set (BRACERS);
256 set (GIRDLE);
257 set (CONTAINER);
258 set (DRINK);
259 set (FLESH);
260 set (INORGANIC);
261 set (CLOSE_CON);
262 set (CLOAK);
263 set (GEM);
264 set (POWER_CRYSTAL);
265 set (POISON);
266 set (BOOK);
267 set (SKILL_TOOL);
268 }
269} need_identify_types;
270
271bool
272object::need_identify () const
273{
274 return need_identify_types [type];
253} 275}
254 276
255/* This takes an object 'op' and figures out what its item_power 277/* This takes an object 'op' and figures out what its item_power
256 * rating should be. This should only really be used by the treasure 278 * rating should be. This should only really be used by the treasure
257 * generation code, and when loading legacy objects. It returns 279 * generation code, and when loading legacy objects. It returns
… …
313 335
314 enc += op->stats.luck; 336 enc += op->stats.luck;
315 337
316 /* Do spell paths now */ 338 /* Do spell paths now */
317 for (i = 1; i < NRSPELLPATHS; i++) 339 for (i = 1; i < NRSPELLPATHS; i++)
318 {
319 if (op->path_attuned & (1 << i)) 340 if (op->path_attuned & (1 << i))
320 enc++; 341 enc++;
321 else if (op->path_denied & (1 << i)) 342 else if (op->path_denied & (1 << i))
322 enc -= 2; 343 enc -= 2;
323 else if (op->path_repelled & (1 << i)) 344 else if (op->path_repelled & (1 << i))
324 enc--; 345 enc--;
325 }
326 346
327 if (op->flag [FLAG_LIFESAVE ]) enc += 5; 347 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
328 if (op->flag [FLAG_REFL_SPELL ]) enc += 3; 348 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
329 if (op->flag [FLAG_REFL_MISSILE]) enc += 2; 349 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
330 if (op->flag [FLAG_XRAYS ]) enc += 2; 350 if (op->flag [FLAG_XRAYS ]) enc += 2;
… …
333 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1; 353 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
334 354
335 return get_power_from_ench (enc); 355 return get_power_from_ench (enc);
336} 356}
337 357
358static const struct get_typedata
359{
360 const typedata *data [NUM_TYPES];
361
362 get_typedata ()
363 {
364 for (int i = 0; i < item_types_size; i++)
365 data [item_types[i].number] = &item_types [i];
366 }
367
368 const typedata *operator ()(int itemtype) const
369 {
370 return data [itemtype];
371 }
372} get_typedata_;
373
338/* returns the typedata that has a number equal to itemtype, if there 374/* returns the typedata that has a number equal to itemtype, if there
339 * isn't one, returns NULL */ 375 * isn't one, returns NULL */
340const typedata * 376const typedata *
341get_typedata (int itemtype) 377get_typedata (int itemtype)
342{ 378{
343 for (int i = 0; i < item_types_size; i++) 379 return get_typedata_ (itemtype);
344 if (item_types[i].number == itemtype)
345 return &item_types[i];
346
347 return NULL;
348} 380}
349 381
350/* returns the typedata that has a name equal to itemtype, if there 382/* returns the typedata that has a name equal to itemtype, if there
351 * isn't one, return the plural name that matches, if there still isn't 383 * isn't one, return the plural name that matches, if there still isn't
352 * one return NULL */ 384 * one return NULL */
… …
413/* 445/*
414 * Returns the pointer to a static buffer containing 446 * Returns the pointer to a static buffer containing
415 * the number requested (of the form first, second, third...) 447 * the number requested (of the form first, second, third...)
416 */ 448 */
417const char * 449const char *
418get_levelnumber (int i) 450ordinal (int i)
419{ 451{
420 static char buf[MAX_BUF]; 452 if (i < 0)
421 453 return format ("minus %s", ordinal (-i));
422 if (i > 99)
423 {
424 sprintf (buf, "%d.", i);
425 return buf;
426 }
427 454
428 if (i < 21) 455 if (i < 21)
429 return levelnumbers[i]; 456 return ordnumbers[i];
430 457
458 int digit = i % 10;
459
431 if (!(i % 10)) 460 if (i >= 100)
461 return format (
462 digit == 1 ? "%dst"
463 : digit == 2 ? "%dnd"
464 : digit == 3 ? "%drd"
465 : "%dth",
466 i
467 );
468
469 if (digit == 0)
432 return levelnumbers_10[i / 10]; 470 return ordnumbers_10[i / 10];
433 471 else
434 strcpy (buf, numbers_10[i / 10]); 472 return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
435 strcat (buf, levelnumbers[i % 10]);
436 return buf;
437} 473}
438 474
439/* 475/*
440 * Returns pointer to static buffer containing ring's or amulet's 476 * Returns pointer to static buffer containing ring's or amulet's
441 * abilities 477 * abilities
… …
453ring_desc (const object *op) 489ring_desc (const object *op)
454{ 490{
455 static dynbuf_text buf; buf.clear (); 491 static dynbuf_text buf; buf.clear ();
456 int attr, val, len; 492 int attr, val, len;
457 493
458 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 494 if (op->flag [FLAG_IDENTIFIED])
459 { 495 {
460 for (attr = 0; attr < NUM_STATS; attr++) 496 for (attr = 0; attr < NUM_STATS; attr++)
461 if ((val = op->stats.stat (attr))) 497 if ((val = op->stats.stat (attr)))
462 buf.printf ("(%s%+d)", short_stat_name[attr], val); 498 buf.printf ("(%s%+d)", short_stat_name[attr], val);
463 499
… …
472 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace); 508 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
473 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp); 509 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
474 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp); 510 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
475 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck); 511 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
476 512
477 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 513 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
478 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 514 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
479 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 515 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
480 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 516 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
481 517
482 buf.add_paths ("Attuned" , op->path_attuned); 518 buf.add_paths ("Attuned" , op->path_attuned);
483 buf.add_paths ("Repelled", op->path_repelled); 519 buf.add_paths ("Repelled", op->path_repelled);
484 buf.add_paths ("Denied" , op->path_denied); 520 buf.add_paths ("Denied" , op->path_denied);
485 521
… …
511 547
512 static dynbuf_text buf; buf.clear (); 548 static dynbuf_text buf; buf.clear ();
513 549
514 buf << (op->nrof <= 1 ? op->name : op->name_pl); 550 buf << (op->nrof <= 1 ? op->name : op->name_pl);
515 551
516 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 552 if (op->title && op->flag [FLAG_IDENTIFIED])
517 buf << ' ' << op->title; 553 buf << ' ' << op->title;
518 554
519 switch (op->type) 555 switch (op->type)
520 { 556 {
521 case SPELLBOOK: 557 case SPELLBOOK:
522 case SCROLL: 558 case SCROLL:
523 case WAND: 559 case WAND:
524 case ROD: 560 case ROD:
525 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 561 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
526 { 562 {
527 if (!op->title) 563 if (!op->title)
528 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 564 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
529 565
530 if (op->type != SPELLBOOK) 566 if (op->type != SPELLBOOK)
… …
569 buf << " " << s; 605 buf << " " << s;
570 } 606 }
571 break; 607 break;
572 608
573 default: 609 default:
574 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 610 if (op->magic
611 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
612 || op->flag [FLAG_IDENTIFIED]))
575 buf.printf (" %+d", op->magic); 613 buf.printf (" %+d", op->magic);
576 } 614 }
577 615
578 return buf; 616 return buf;
579} 617}
… …
588 * returned is good forever.) However, it makes printing statements that 626 * returned is good forever.) However, it makes printing statements that
589 * use several names much easier (don't need to store them to temp variables.) 627 * use several names much easier (don't need to store them to temp variables.)
590 * 628 *
591 * It is used extensively within messages, so should return only a prose 629 * It is used extensively within messages, so should return only a prose
592 * and short description of the item. 630 * and short description of the item.
631 * It is also used by examine/ex and similar functions.
593 */ 632 */
594const char * 633const char *
595query_name (const object *op) 634query_name (const object *op)
596{ 635{
597 int len = 0; 636 int len = 0;
… …
602 use_buf %= 5; 641 use_buf %= 5;
603 642
604 dynbuf_text &buf = bufs [use_buf]; 643 dynbuf_text &buf = bufs [use_buf];
605 buf.clear (); 644 buf.clear ();
606 645
646#if 0
607 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 647 if ((op->is_armor () || op->is_weapon ()) && op->material)
608 if (materialtype_t *mt = name_to_material (op->materialname))
609 buf << mt->description << ' '; 648 buf << op->material->description << ' ';
649#endif
610 650
611 buf << query_short_name (op); 651 buf << query_short_name (op);
612 652
613 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 653 if (op->flag [FLAG_INV_LOCKED])
614 buf << " *"; 654 buf << " *";
615 if (op->is_open_container ()) 655 if (op->is_open_container ())
616 buf << " (open)"; 656 buf << " (open)";
617 657
618 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 658 if (op->flag [FLAG_KNOWN_CURSED])
619 { 659 {
620 if (QUERY_FLAG (op, FLAG_DAMNED)) 660 if (op->flag [FLAG_DAMNED])
621 buf << " (damned)"; 661 buf << " (damned)";
622 else if (QUERY_FLAG (op, FLAG_CURSED)) 662 else if (op->flag [FLAG_CURSED])
623 buf << " (cursed)"; 663 buf << " (cursed)";
624 } 664 }
625 665
626 /* Basically, if the object is known magical (detect magic spell on it), 666 /* Basically, if the object is known magical (detect magic spell on it),
627 * and it isn't identified, print out the fact that 667 * and it isn't identified, print out the fact that
… …
630 * 670 *
631 * Changed in V 0.91.4 - still print that the object is magical even 671 * Changed in V 0.91.4 - still print that the object is magical even
632 * if it has been applied. Equipping an item does not tell full 672 * if it has been applied. Equipping an item does not tell full
633 * abilities, especially for artifact items. 673 * abilities, especially for artifact items.
634 */ 674 */
635 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 675 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
636 buf << " (magic)"; 676 buf << " (magic)";
637 677
638#if 0 678#if 0
639 /* item_power will be returned in describe_item - it shouldn't really 679 /* item_power will be returned in describe_item - it shouldn't really
640 * be returned in the name. 680 * be returned in the name.
… …
642 if (op->item_power) 682 if (op->item_power)
643 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); 683 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
644 684
645#endif 685#endif
646 686
647 if (QUERY_FLAG (op, FLAG_APPLIED)) 687 if (op->flag [FLAG_APPLIED])
648 { 688 {
649 switch (op->type) 689 switch (op->type)
650 { 690 {
651 case BOW: 691 case BOW:
652 case WAND: 692 case WAND:
653 case ROD: 693 case ROD:
654 case HORN: 694 case HORN:
655 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)"); 695 buf << " (applied)";
656 break; 696 break;
657 case WEAPON: 697 case WEAPON:
658 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)"); 698 buf << " (applied)";
659 break; 699 break;
660 case ARMOUR: 700 case ARMOUR:
661 case HELMET: 701 case HELMET:
662 case SHIELD: 702 case SHIELD:
663 case RING: 703 case RING:
… …
695 else if (op->stats.food <= 0) 735 else if (op->stats.food <= 0)
696 buf << " (burned out)"; 736 buf << " (burned out)";
697 break; 737 break;
698 } 738 }
699 739
700 if (QUERY_FLAG (op, FLAG_UNPAID)) 740 if (op->flag [FLAG_UNPAID])
701 buf << " (unpaid)"; 741 buf << " (unpaid)";
702 742
703 return buf; 743 return buf;
704} 744}
705 745
… …
712 * and sending to client. 752 * and sending to client.
713 * If plural is set, we generate the plural name of this. 753 * If plural is set, we generate the plural name of this.
714 * 754 *
715 * It is sometimes used to display messages, and usually only used to match stuff, 755 * It is sometimes used to display messages, and usually only used to match stuff,
716 * so maybe this function should be removed. 756 * so maybe this function should be removed.
757 * It is also used for client-side inventory/item descriptions.
717 */ 758 */
718const char * 759const char *
719query_base_name (const object *op, int plural) 760query_base_name (const object *op, int plural)
720{ 761{
721 if ((!plural && !op->name) || (plural && !op->name_pl)) 762 if ((!plural && !op->name) || (plural && !op->name_pl))
722 return "(null)"; 763 return "(null)";
723 764
724 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 765 if (!op->nrof && !op->weight && !op->title && !is_magical (op)
766 && op->type != EXIT)
725 return op->name; /* To speed things up (or make things slower?) */ 767 return op->name; /* To speed things up (or make things slower?) */
726 768
727 static dynbuf_text buf; buf.clear (); 769 static dynbuf_text buf; buf.clear ();
728 770
771#if 0
729 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 772 if ((op->is_armor () || op->is_weapon ()) && op->material)
730 if (materialtype_t *mt = name_to_material (op->materialname))
731 if (op->arch->materialname != mt->name) 773 if (op->arch->material != op->material)
732 buf << mt->description << ' '; 774 buf << op->material->description << ' ';
775#endif
733 776
734 buf << (plural ? op->name_pl : op->name); 777 buf << (plural ? op->name_pl : op->name);
735 778
736 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 779 if (op->title && op->flag [FLAG_IDENTIFIED])
737 buf << ' ' << op->title; 780 buf << ' ' << op->title;
738 781
739 switch (op->type) 782 switch (op->type)
740 { 783 {
741 case SPELLBOOK: 784 case SPELLBOOK:
742 case SCROLL: 785 case SCROLL:
743 case WAND: 786 case WAND:
744 case ROD: 787 case ROD:
745 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 788 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
746 { 789 {
747 if (!op->title) 790 if (!op->title)
748 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 791 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
749 792
750 if (op->type != SPELLBOOK) 793 if (op->type != SPELLBOOK)
… …
764 if (s && *s) 807 if (s && *s)
765 buf << ' ' << s; 808 buf << ' ' << s;
766 } 809 }
767 break; 810 break;
768 811
812 case EXIT:
813 // random map exits "unfortunately" get patched, so this only works before entering
814 if (EXIT_PATH (op) == shstr_random_map_exit)
815 buf << " (random map)";
816 else if (!EXIT_PATH (op))
817 buf << " (closed)";
818 break;
819
769 default: 820 default:
770 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 821 if (op->magic
822 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
823 || op->flag [FLAG_IDENTIFIED]))
771 buf.printf (" %+d", op->magic); 824 buf.printf (" %+d", op->magic);
772 } 825 }
773 826
774 return buf; 827 return buf;
775} 828}
… …
788 /* Note that the resolution this provides for players really isn't 841 /* Note that the resolution this provides for players really isn't
789 * very good. Any player with a speed greater than .67 will 842 * very good. Any player with a speed greater than .67 will
790 * fall into the 'lightning fast movement' category. 843 * fall into the 'lightning fast movement' category.
791 */ 844 */
792 if (op->has_active_speed ()) 845 if (op->has_active_speed ())
793 switch ((int) ((FABS (op->speed)) * 15)) 846 switch ((int)(op->speed * 15.))
794 { 847 {
795 case 0: 848 case 0:
796 buf << "(very slow movement)"; 849 buf << "(very slow movement)";
797 break; 850 break;
798 case 1: 851 case 1:
… …
818 default: 871 default:
819 buf << "(lightning fast movement)"; 872 buf << "(lightning fast movement)";
820 break; 873 break;
821 } 874 }
822 875
823 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)"; 876 if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
824 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)"; 877 if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
825 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)"; 878 if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
826 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)"; 879 if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
827 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)"; 880 if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
828 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)"; 881 if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
829 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)"; 882 if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
830 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)"; 883 if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
831 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)"; 884 if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
832 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)"; 885 if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
833 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)"; 886 if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
834 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)"; 887 if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
835 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)"; 888 if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
836 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)"; 889 if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
837 890
838 if (op->randomitems) 891 if (op->randomitems)
839 { 892 {
840 bool first = 1; 893 bool first = 1;
841 894
… …
868 if (op->stats.luck) 921 if (op->stats.luck)
869 buf.printf ("(luck%+d)", op->stats.luck); 922 buf.printf ("(luck%+d)", op->stats.luck);
870 } 923 }
871 924
872 /* describe attacktypes */ 925 /* describe attacktypes */
873 if (is_dragon_pl (op)) 926 if (op->is_dragon ())
874 { 927 {
875 /* for dragon players display the attacktypes from clawing skill 928 /* for dragon players display the attacktypes from clawing skill
876 * Break apart the for loop - move the comparison checking down - 929 * Break apart the for loop - move the comparison checking down -
877 * this makes it more readable. 930 * this makes it more readable.
878 */ 931 */
… …
923 * item (eg, debug dump or the like) 976 * item (eg, debug dump or the like)
924 */ 977 */
925const char * 978const char *
926describe_item (const object *op, object *owner) 979describe_item (const object *op, object *owner)
927{ 980{
928 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) 981 if (op->flag [FLAG_MONSTER] || op->type == PLAYER)
929 return describe_monster (op); 982 return describe_monster (op);
930 983
931 static dynbuf_text buf; buf.clear (); 984 static dynbuf_text buf; buf.clear ();
932 int identified, i; 985 int identified, i;
933 986
934 /* figure this out once, instead of making multiple calls to need_identify. 987 /* figure this out once, instead of making multiple calls to need_identify.
935 * also makes the code easier to read. 988 * also makes the code easier to read.
936 */ 989 */
937 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED); 990 identified = !op->need_identify () || op->flag [FLAG_IDENTIFIED];
938 if (!identified) 991 if (!identified)
939 buf << "(unidentified)"; 992 buf << "(unidentified)";
940 993
941 switch (op->type) 994 switch (op->type)
942 { 995 {
… …
961 if (op->stats.maxsp > 1000) 1014 if (op->stats.maxsp > 1000)
962 { /*higher capacity crystals */ 1015 { /*higher capacity crystals */
963 i = (op->stats.maxsp % 1000) / 100; 1016 i = (op->stats.maxsp % 1000) / 100;
964 1017
965 if (i) 1018 if (i)
966 buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i); 1019 buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i);
967 else 1020 else
968 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000); 1021 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
969 } 1022 }
970 else 1023 else
971 buf.printf ("(capacity %d). It is ", op->stats.maxsp); 1024 buf.printf ("(capacity %d; it is ", op->stats.maxsp);
972 1025
973 i = (op->stats.sp * 10) / op->stats.maxsp; 1026 i = (op->stats.sp * 10) / op->stats.maxsp;
974 if (op->stats.sp == 0) 1027 if (op->stats.sp == 0)
975 buf << "empty."; 1028 buf << "empty";
976 else if (i == 0) 1029 else if (i == 0)
977 buf << "almost empty."; 1030 buf << "almost empty";
978 else if (i < 3) 1031 else if (i < 3)
979 buf << "partially filled."; 1032 buf << "partially filled";
980 else if (i < 6) 1033 else if (i < 6)
981 buf << "half full."; 1034 buf << "half full";
982 else if (i < 9) 1035 else if (i < 9)
983 buf << "well charged."; 1036 buf << "well charged";
984 else if (op->stats.sp == op->stats.maxsp) 1037 else if (op->stats.sp == op->stats.maxsp)
985 buf << "fully charged."; 1038 buf << "fully charged";
986 else 1039 else
987 buf << "almost full."; 1040 buf << "almost full";
1041
1042 buf << ')';
988 break; 1043 break;
989 1044
990 case LAMP: 1045 case LAMP:
991 { 1046 {
992 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food; 1047 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
… …
1010 break; 1065 break;
1011 1066
1012 case FOOD: 1067 case FOOD:
1013 case FLESH: 1068 case FLESH:
1014 case DRINK: 1069 case DRINK:
1015 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1070 if (identified || op->flag [FLAG_BEEN_APPLIED])
1016 { 1071 {
1017 buf.printf ("(food+%d)", op->stats.food); 1072 buf.printf ("(food+%d)", op->stats.food);
1018 1073
1019 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 1074 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1020 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]); 1075 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1021 1076
1022 if (!QUERY_FLAG (op, FLAG_CURSED)) 1077 if (!op->flag [FLAG_CURSED])
1023 { 1078 {
1024 if (op->stats.hp) buf << "(heals)"; 1079 if (op->stats.hp) buf << "(heals)";
1025 if (op->stats.sp) buf << "(spellpoint regen)"; 1080 if (op->stats.sp) buf << "(spellpoint regen)";
1026 } 1081 }
1027 else 1082 else
… …
1048 } 1103 }
1049 1104
1050 /* Down here, we more further describe equipment type items. 1105 /* Down here, we more further describe equipment type items.
1051 * only describe them if they have been identified or the like. 1106 * only describe them if they have been identified or the like.
1052 */ 1107 */
1053 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1108 if (identified || op->flag [FLAG_BEEN_APPLIED])
1054 { 1109 {
1055 int attr, val; 1110 int attr, val;
1056 1111
1057 for (attr = 0; attr < NUM_STATS; attr++) 1112 for (attr = 0; attr < NUM_STATS; attr++)
1058 if ((val = op->stats.stat (attr))) 1113 if ((val = op->stats.stat (attr)))
… …
1089 1144
1090 default: 1145 default:
1091 break; 1146 break;
1092 } 1147 }
1093 1148
1094 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)"; 1149 if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1095 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)"; 1150 if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1096 1151
1097 /* levitate was what is was before, so we'll keep it */ 1152 /* levitate was what is was before, so we'll keep it */
1098 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)"; 1153 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1099 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)"; 1154 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1100 if (op->move_type & MOVE_SWIM) buf << "(swim)"; 1155 if (op->move_type & MOVE_SWIM) buf << "(swim)";
… …
1162 } 1217 }
1163 1218
1164 if (op->stats.luck) 1219 if (op->stats.luck)
1165 buf.printf ("(luck%+d)", op->stats.luck); 1220 buf.printf ("(luck%+d)", op->stats.luck);
1166 1221
1167 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 1222 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1168 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 1223 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1169 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 1224 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1170 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1225 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1171 1226
1172 if (op->slaying && op->type != FOOD) 1227 if (op->slaying && op->type != FOOD)
1173 buf.printf ("(slay %s)", &op->slaying); 1228 buf.printf ("(slay %s)", &op->slaying);
1174 1229
1175 if (op->type == SKILL_TOOL && op->skill) 1230 if (op->type == SKILL_TOOL && op->skill)
… …
1177 1232
1178 buf.add_abilities ("Attacks", op->attacktype); 1233 buf.add_abilities ("Attacks", op->attacktype);
1179 /* resistance on flesh is only visible for quetzals. If 1234 /* resistance on flesh is only visible for quetzals. If
1180 * non flesh, everyone can see its resistances 1235 * non flesh, everyone can see its resistances
1181 */ 1236 */
1182 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1237 if (op->type != FLESH || (owner && owner->is_dragon ()))
1183 buf << describe_resistance (op, 0); 1238 buf << describe_resistance (op, 0);
1184 1239
1185 buf.add_paths ("Attuned", op->path_attuned); 1240 buf.add_paths ("Attuned", op->path_attuned);
1186 buf.add_paths ("Repelled", op->path_repelled); 1241 buf.add_paths ("Repelled", op->path_repelled);
1187 buf.add_paths ("Denied", op->path_denied); 1242 buf.add_paths ("Denied", op->path_denied);
… …
1192 1247
1193std::string 1248std::string
1194object::describe_item (object *who) 1249object::describe_item (object *who)
1195{ 1250{
1196 return std::string (::describe_item (this, who)); 1251 return std::string (::describe_item (this, who));
1252}
1253
1254static void
1255describe_dump_object (dynbuf &buf, object *ob)
1256{
1257 char *txt = dump_object (ob);
1258 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1259 buf << "\n" << txt << "\n";
1260
1261 if (!ob->is_arch ())
1262 describe_dump_object (buf, ob->arch);
1263}
1264
1265std::string
1266object::describe (object *who)
1267{
1268 dynbuf_text buf (1024, 1024);
1269
1270 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1271
1272 if (custom_name)
1273 buf.printf ("You call it %s.\r", &custom_name);
1274
1275 switch (type)
1276 {
1277 case SPELLBOOK:
1278 if (flag [FLAG_IDENTIFIED] && inv)
1279 buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill);
1280 break;
1281
1282 case BOOK:
1283 if (msg)
1284 buf << "Something is written in it.\r";
1285 break;
1286
1287 case CONTAINER:
1288 if (race)
1289 {
1290 if (weight_limit && stats.Str < 100)
1291 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1292 &race, weight_limit / (10.0 * (100 - stats.Str)));
1293 else
1294 buf.printf ("It can hold only %s.\r", &race);
1295 }
1296 else if (weight_limit && stats.Str < 100)
1297 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1298 break;
1299
1300 case WAND:
1301 if (flag [FLAG_IDENTIFIED])
1302 buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
1303 break;
1304 }
1305
1306 if (material != MATERIAL_NULL && !msg)
1307 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1308 << material->description
1309 << ".\r";
1310
1311 if (who)
1312 /* Where to wear this item */
1313 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1314 if (slot[i].info)
1315 {
1316 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1317
1318 if (slot[i].info < -1 && who->slot[i].info)
1319 buf.printf ("(%d)", -slot[i].info);
1320
1321 buf << ".\r";
1322 }
1323
1324 if (weight)
1325 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1326
1327 if (flag [FLAG_STARTEQUIP])
1328 buf << (nrof > 1 ? "They were" : "It was")
1329 << " given by a god and will vanish when dropped.\r";
1330
1331 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1332 {
1333 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1334
1335 if (who->is_in_shop ())
1336 {
1337 if (flag [FLAG_UNPAID])
1338 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1339 else
1340 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1341 }
1342 }
1343
1344 if (flag [FLAG_MONSTER])
1345 buf << describe_monster (who);
1346
1347 /* Is this item buildable? */
1348 if (flag [FLAG_IS_BUILDABLE])
1349 buf << "This is a buildable item.\r";
1350
1351 /* Does the object have a message? Don't show message for all object
1352 * types - especially if the first entry is a match
1353 */
1354 if (msg)
1355 {
1356 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1357 {
1358 if (!need_identify ())
1359 buf << '\r' << msg << '\n';
1360 else if (flag [FLAG_IDENTIFIED])
1361 buf << '\r' << "The object has a story:\r" << msg;
1362 }
1363 }
1364 else if (inv
1365 && inv->msg
1366 && inv->type == SPELL
1367 && flag [FLAG_IDENTIFIED]
1368 && (type == SPELLBOOK || type == ROD || type == WAND
1369 || type == ROD || type == POTION || type == SCROLL))
1370 // for spellbooks and other stuff that contains spells, print the spell message,
1371 // unless the object has a custom message handled above.
1372 buf << '\r' << inv->msg << '\n';
1373
1374 // try to display the duration for some potions and scrolls
1375 // this includes change ability potions and group spells,
1376 // but does not handle protection potions
1377 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1378 && (type == POTION || type == SCROLL))
1379 {
1380 object *spell = inv;
1381
1382 if (spell->subtype == SP_PARTY_SPELL)
1383 spell = spell->other_arch;
1384
1385 if (spell->subtype == SP_CHANGE_ABILITY)
1386 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1387 TICK2TIME (change_ability_duration (spell, this)));
1388 }
1389
1390 // some help text for skill tools
1391 if (type == SKILL_TOOL)
1392 buf << "\nH<This item is a skill tool: as long as you have this item applied "
1393 "you can use the " << &skill << " skill as if you had learned it.>";
1394
1395 // Display a hint about inscribable items [empty books]
1396 // This includes the amount of text they can hold.
1397 if (type == INSCRIBABLE)
1398 {
1399 if (other_arch && other_arch->type == SCROLL)
1400 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1401 else
1402 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1403 weight_limit);
1404 }
1405
1406 buf << '\n';
1407
1408 // the dungeon master additionally gets a complete dump
1409 if (who && who->flag [FLAG_WIZLOOK])
1410 {
1411 buf << "\nT<Object>\n";
1412 describe_dump_object (buf, this);
1413
1414 if (inv)
1415 {
1416 buf << "\nT<Top Inventory>\n";
1417 describe_dump_object (buf, inv);
1418 }
1419 }
1420
1421 return std::string (buf.linearise (), buf.size ());
1197} 1422}
1198 1423
1199void 1424void
1200examine (object *op, object *tmp) 1425examine (object *op, object *tmp)
1201{ 1426{
… …
1213object::query_inventory (object *who, const char *indent) 1438object::query_inventory (object *who, const char *indent)
1214{ 1439{
1215 static dynbuf_text buf; buf.clear (); 1440 static dynbuf_text buf; buf.clear ();
1216 1441
1217 for (object *tmp = inv; tmp; tmp = tmp->below) 1442 for (object *tmp = inv; tmp; tmp = tmp->below)
1218 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1443 if (who && who->flag [FLAG_WIZ])
1219 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ()); 1444 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1220 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1445 else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED]))
1221 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ()); 1446 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1222 1447
1223 if (buf.size ()) 1448 if (buf.size ())
1224 buf.printf ("%s(total weight: %s)\n", indent, query_weight ()); 1449 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1225 else 1450 else
… …
1238is_magical (const object *op) 1463is_magical (const object *op)
1239{ 1464{
1240 int i; 1465 int i;
1241 1466
1242 /* living creatures are considered non magical */ 1467 /* living creatures are considered non magical */
1243 if (QUERY_FLAG (op, FLAG_ALIVE)) 1468 if (op->flag [FLAG_ALIVE])
1244 return 0; 1469 return 0;
1245 1470
1246 /* This is a test for it being an artifact, as artifacts have titles */ 1471 /* This is a test for it being an artifact, as artifacts have titles */
1247 if (op->title != NULL) 1472 if (op->title != NULL)
1248 return 1; 1473 return 1;
… …
1254 (op->stats.ac || op->stats.food || op->stats.exp || op->stats.dam || op->stats.wc || op->stats.sp || op->stats.hp || op->stats.luck)) 1479 (op->stats.ac || op->stats.food || op->stats.exp || op->stats.dam || op->stats.wc || op->stats.sp || op->stats.hp || op->stats.luck))
1255 return 1; 1480 return 1;
1256 1481
1257 /* Check for stealty, speed, flying, or just plain magic in the boots */ 1482 /* Check for stealty, speed, flying, or just plain magic in the boots */
1258 /* Presume any boots that hvae a move_type are special. */ 1483 /* Presume any boots that hvae a move_type are special. */
1259 if (op->type == BOOTS && ((QUERY_FLAG (op, FLAG_STEALTH) || op->move_type || op->stats.exp))) 1484 if (op->type == BOOTS && ((op->flag [FLAG_STEALTH] || op->move_type || op->stats.exp)))
1260 return 1; 1485 return 1;
1261 1486
1262 /* Take care of amulet/shield that reflects spells/missiles */ 1487 /* Take care of amulet/shield that reflects spells/missiles */
1263 if ((op->type == AMULET || op->type == SHIELD) && (QUERY_FLAG (op, FLAG_REFL_SPELL) || QUERY_FLAG (op, FLAG_REFL_MISSILE))) 1488 if ((op->type == AMULET || op->type == SHIELD) && (op->flag [FLAG_REFL_SPELL] || op->flag [FLAG_REFL_MISSILE]))
1264 return 1; 1489 return 1;
1265 1490
1266 /* Take care of helmet of xrays */ 1491 /* Take care of helmet of xrays */
1267 if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) 1492 if (op->type == HELMET && op->flag [FLAG_XRAYS])
1268 return 1; 1493 return 1;
1269 1494
1270 /* Potions & rods are always magical. Wands/staves are also magical, 1495 /* Potions & rods are always magical. Wands/staves are also magical,
1271 * assuming they still have any charges left. 1496 * assuming they still have any charges left.
1272 */ 1497 */
… …
1301 * be non magical. 1526 * be non magical.
1302 */ 1527 */
1303 return 0; 1528 return 0;
1304} 1529}
1305 1530
1306/* need_identify returns true if the item should be identified. This
1307 * function really should not exist - by default, any item not identified
1308 * should need it.
1309 */
1310
1311int
1312need_identify (const object *op)
1313{
1314 switch (op->type)
1315 {
1316 case RING:
1317 case WAND:
1318 case ROD:
1319 case HORN:
1320 case SCROLL:
1321 case SKILL:
1322 case SKILLSCROLL:
1323 case SPELLBOOK:
1324 case FOOD:
1325 case POTION:
1326 case BOW:
1327 case ARROW:
1328 case WEAPON:
1329 case ARMOUR:
1330 case SHIELD:
1331 case HELMET:
1332 case AMULET:
1333 case BOOTS:
1334 case GLOVES:
1335 case BRACERS:
1336 case GIRDLE:
1337 case CONTAINER:
1338 case DRINK:
1339 case FLESH:
1340 case INORGANIC:
1341 case CLOSE_CON:
1342 case CLOAK:
1343 case GEM:
1344 case POWER_CRYSTAL:
1345 case POISON:
1346 case BOOK:
1347 case SKILL_TOOL:
1348 return 1;
1349 }
1350
1351 /* Try to track down some stuff that may show up here. Thus, the
1352 * archetype file can be updated, and this function removed.
1353 */
1354#if 0
1355 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1356#endif
1357 return 0;
1358}
1359
1360/* 1531/*
1361 * Supposed to fix face-values as well here, but later. 1532 * Supposed to fix face-values as well here, but later.
1362 */ 1533 */
1363void 1534void
1364identify (object *op) 1535identify (object *op)
1365{ 1536{
1366 SET_FLAG (op, FLAG_IDENTIFIED); 1537 op->set_flag (FLAG_IDENTIFIED);
1367 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1538 op->clr_flag (FLAG_KNOWN_MAGICAL);
1368 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1539 op->clr_flag (FLAG_NO_SKILL_IDENT);
1369 1540
1370 /* 1541 /*
1371 * We want autojoining of equal objects: 1542 * We want autojoining of equal objects:
1372 */ 1543 */
1373 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 1544 if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])
1374 SET_FLAG (op, FLAG_KNOWN_CURSED); 1545 op->set_flag (FLAG_KNOWN_CURSED);
1375 1546
1376 if (op->type == POTION) 1547 if (op->type == POTION)
1377 { 1548 {
1378 if (op->inv && op->randomitems) 1549 if (op->inv && op->randomitems)
1379 op->title = op->inv->name; 1550 op->title = op->inv->name;

Diff Legend

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