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.58 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.89 by root, Sat May 15 23:41:05 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"},
… …
65 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"}, 66 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
66 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"}, 67 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
67/*{"body_dragon_torso", "your body", "a dragon's body"} */ 68/*{"body_dragon_torso", "your body", "a dragon's body"} */
68}; 69};
69 70
70static char numbers[21][20] = {
71 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
72 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
73 "eighteen", "nineteen", "twenty"
74};
75
76static char numbers_10[10][20] = { 71static char numbers_10[10][20] = {
77 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 72 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
78 "eighty", "ninety" 73 "eighty", "ninety"
79}; 74};
80 75
81static char levelnumbers[21][20] = { 76static char ordnumbers[21][20] = {
82 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", 77 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
83 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", 78 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
84 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", 79 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
85 "nineteen", "twentieth" 80 "nineteenth", "twentieth"
86}; 81};
87 82
88static char levelnumbers_10[11][20] = { 83static char ordnumbers_10[11][20] = {
89 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", 84 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
90 "seventieth", "eightieth", "ninetieth" 85 "seventieth", "eightieth", "ninetieth"
91}; 86};
92 87
93/* 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:
… …
156 {EXIT, "exit", "exits", 0, 0}, 151 {EXIT, "exit", "exits", 0, 0},
157 {ENCOUNTER, "encounter", "encounters", 0, 0}, 152 {ENCOUNTER, "encounter", "encounters", 0, 0},
158 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, 153 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
159 {SHOP_MAT, "shop mat", "shop mats", 0, 0}, 154 {SHOP_MAT, "shop mat", "shop mats", 0, 0},
160 {RING, "ring", "rings", SK_JEWELER, 0}, 155 {RING, "ring", "rings", SK_JEWELER, 0},
161 {FLOOR, "floor", "floors", 0, 0}, 156// {FLOOR, "floor", "floors", 0, 0},
162 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 157 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
163 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 158 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
164 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 159 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
165 {LIGHTER, "lighter", "lighters", 0, 0}, 160 {LIGHTER, "lighter", "lighters", 0, 0},
166 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 161 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
… …
170 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 165 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
171 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 166 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
172 {SPINNER, "spinner", "spinners", 0, 0}, 167 {SPINNER, "spinner", "spinners", 0, 0},
173 {GATE, "gate", "gates", 0, 0}, 168 {GATE, "gate", "gates", 0, 0},
174 {BUTTON, "button", "buttons", 0, 0}, 169 {BUTTON, "button", "buttons", 0, 0},
175 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 170 {T_HANDLE, "cf handle", "cf handles", 0, 0},
176 {HOLE, "hole", "holes", 0, 0}, 171 {HOLE, "hole", "holes", 0, 0},
177 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 172 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
178 {SIGN, "sign", "signs", 0, 0}, 173 {SIGN, "sign", "signs", 0, 0},
179 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 174 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
180 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 175 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
… …
207 {BUILDER, "item builder", "item builders", 0, 0}, 202 {BUILDER, "item builder", "item builders", 0, 0},
208 {MATERIAL, "building material", "building materials", 0, 0}, 203 {MATERIAL, "building material", "building materials", 0, 0},
209 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 204 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
210}; 205};
211 206
212const int item_types_size = sizeof (item_types) / sizeof (*item_types); 207static const int item_types_size = array_length (item_types);
213
214materialtype_t *materialt;
215
216/*
217materialtype material[NROFMATERIALS] = {
218 * P M F E C C A D W G P S P T F C D D C C G H B I *
219 * H A I L O O C R E H O L A U E A E E H O O O L N *
220 * Y G R E L N I A A O I O R R A N P A A U D L I T *
221 * S I E C D F D I P S S W A N R C L T O N Y N R *
222 * I C T U N O T O L E E H S T P D N *
223 {"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}},
224 {"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}},
225 {"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}},
226 {"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}},
227 {"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}},
228 {"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}},
229 {"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}},
230 {"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}},
231 {"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}},
232 {"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}},
233 {"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}},
234 {"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}},
235 {"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}}
236};
237*/
238 208
239/* 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
240 * 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
241 * wear whatever they want with no worries. Perhaps having the steep 211 * wear whatever they want with no worries. Perhaps having the steep
242 * curve is good (maybe even steeper), but allowing players to 212 * curve is good (maybe even steeper), but allowing players to
… …
244 * able to use 2-3 of the most powerful items. 214 * able to use 2-3 of the most powerful items.
245 * 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 -
246 * custom objects can use whatever they want. 216 * custom objects can use whatever they want.
247 */ 217 */
248static int enc_to_item_power[21] = { 218static int enc_to_item_power[21] = {
219 0,
249 0, 0, 1, 2, 3, 4, /* 5 */ 220 0, 1, 2, 3, 4, // 5
250 5, 7, 9, 11, 13, /* 10 */ 221 5, 7, 9, 11, 13, // 10
251 15, 18, 21, 24, 27, /* 15 */ 222 15, 18, 21, 24, 27, // 15
252 30, 35, 40, 45, 50 /* 20 */ 223 30, 35, 40, 45, 50 // 20
253}; 224};
254 225
255int 226int
256get_power_from_ench (int ench) 227get_power_from_ench (int ench)
257{ 228{
258 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];
259} 275}
260 276
261/* 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
262 * 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
263 * generation code, and when loading legacy objects. It returns 279 * generation code, and when loading legacy objects. It returns
… …
319 335
320 enc += op->stats.luck; 336 enc += op->stats.luck;
321 337
322 /* Do spell paths now */ 338 /* Do spell paths now */
323 for (i = 1; i < NRSPELLPATHS; i++) 339 for (i = 1; i < NRSPELLPATHS; i++)
324 {
325 if (op->path_attuned & (1 << i)) 340 if (op->path_attuned & (1 << i))
326 enc++; 341 enc++;
327 else if (op->path_denied & (1 << i)) 342 else if (op->path_denied & (1 << i))
328 enc -= 2; 343 enc -= 2;
329 else if (op->path_repelled & (1 << i)) 344 else if (op->path_repelled & (1 << i))
330 enc--; 345 enc--;
331 }
332 346
333 if (op->flag [FLAG_LIFESAVE ]) enc += 5; 347 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
334 if (op->flag [FLAG_REFL_SPELL ]) enc += 3; 348 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
335 if (op->flag [FLAG_REFL_MISSILE]) enc += 2; 349 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
336 if (op->flag [FLAG_XRAYS ]) enc += 2; 350 if (op->flag [FLAG_XRAYS ]) enc += 2;
… …
339 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1; 353 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
340 354
341 return get_power_from_ench (enc); 355 return get_power_from_ench (enc);
342} 356}
343 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
344/* 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
345 * isn't one, returns NULL */ 375 * isn't one, returns NULL */
346const typedata * 376const typedata *
347get_typedata (int itemtype) 377get_typedata (int itemtype)
348{ 378{
349 for (int i = 0; i < item_types_size; i++) 379 return get_typedata_ (itemtype);
350 if (item_types[i].number == itemtype)
351 return &item_types[i];
352
353 return NULL;
354} 380}
355 381
356/* 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
357 * 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
358 * one return NULL */ 384 * one return NULL */
… …
381 * but do put a newline at the end. Useful when dumping to files 407 * but do put a newline at the end. Useful when dumping to files
382 */ 408 */
383const char * 409const char *
384describe_resistance (const object *op, int newline) 410describe_resistance (const object *op, int newline)
385{ 411{
386 static char buf[VERY_BIG_BUF]; 412 static dynbuf_text buf; buf.clear ();
387 char buf1[VERY_BIG_BUF];
388 int tmpvar;
389 413
390 buf[0] = 0; 414 for (int i = 0; i < NROFATTACKS; i++)
391 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
392 {
393 if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1)) 415 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
394 { 416 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
395 if (!newline)
396 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
397 else
398 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
399
400 strcat (buf, buf1);
401 }
402 }
403 417
404 return buf; 418 return buf;
405} 419}
406
407 420
408/* 421/*
409 * query_weight(object) returns a character pointer to a static buffer 422 * query_weight(object) returns a character pointer to a static buffer
410 * containing the text-representation of the weight of the given object. 423 * containing the text-representation of the weight of the given object.
411 * The buffer will be overwritten by the next call to query_weight(). 424 * The buffer will be overwritten by the next call to query_weight().
… …
432/* 445/*
433 * Returns the pointer to a static buffer containing 446 * Returns the pointer to a static buffer containing
434 * the number requested (of the form first, second, third...) 447 * the number requested (of the form first, second, third...)
435 */ 448 */
436const char * 449const char *
437get_levelnumber (int i) 450ordinal (int i)
438{ 451{
439 static char buf[MAX_BUF]; 452 if (i < 0)
440 453 return format ("minus %s", ordinal (-i));
441 if (i > 99)
442 {
443 sprintf (buf, "%d.", i);
444 return buf;
445 }
446 454
447 if (i < 21) 455 if (i < 21)
448 return levelnumbers[i];
449
450 if (!(i % 10))
451 return levelnumbers_10[i / 10];
452
453 strcpy (buf, numbers_10[i / 10]);
454 strcat (buf, levelnumbers[i % 10]);
455 return buf;
456}
457
458/*
459 * get_number(integer) returns the text-representation of the given number
460 * in a static buffer. The buffer might be overwritten at the next
461 * call to get_number().
462 * It is currently only used by the query_name() function.
463 */
464const char *
465get_number (int i)
466{
467 if (i <= 20)
468 return numbers[i]; 456 return ordnumbers[i];
457
458 int digit = i % 10;
459
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)
470 return ordnumbers_10[i / 10];
469 else 471 else
470 { 472 return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
471 static char buf[MAX_BUF];
472
473 sprintf (buf, "%d", i);
474 return buf;
475 }
476} 473}
477 474
478/* 475/*
479 * Returns pointer to static buffer containing ring's or amulet's 476 * Returns pointer to static buffer containing ring's or amulet's
480 * abilities 477 * abilities
… …
486 */ 483 */
487 484
488/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 485/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
489 * from stats.sp - b.t. 486 * from stats.sp - b.t.
490 */ 487 */
491const char * 488static const char *
492ring_desc (const object *op) 489ring_desc (const object *op)
493{ 490{
494 static dynbuf_text buf; buf.clear (); 491 static dynbuf_text buf; buf.clear ();
495 int attr, val, len; 492 int attr, val, len;
496 493
497 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 494 if (op->flag [FLAG_IDENTIFIED])
498 { 495 {
499 for (attr = 0; attr < NUM_STATS; attr++) 496 for (attr = 0; attr < NUM_STATS; attr++)
500 if ((val = op->stats.stat (attr))) 497 if ((val = op->stats.stat (attr)))
501 buf.printf ("(%s%+d)", short_stat_name[attr], val); 498 buf.printf ("(%s%+d)", short_stat_name[attr], val);
502 499
503 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp); 500 if (op->stats.exp) buf.printf ("(speed %+d)", (int)op->stats.exp);
504 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc); 501 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
505 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam); 502 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
506 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac); 503 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
507 504
508 buf << describe_resistance (op, 0); 505 buf << describe_resistance (op, 0);
… …
511 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace); 508 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
512 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);
513 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp); 510 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
514 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck); 511 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
515 512
516 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 513 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
517 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 514 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
518 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 515 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
519 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 516 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
520 517
521 buf.add_paths ("Attuned" , op->path_attuned); 518 buf.add_paths ("Attuned" , op->path_attuned);
522 buf.add_paths ("Repelled", op->path_repelled); 519 buf.add_paths ("Repelled", op->path_repelled);
523 buf.add_paths ("Denied" , op->path_denied); 520 buf.add_paths ("Denied" , op->path_denied);
524 521
… …
550 547
551 static dynbuf_text buf; buf.clear (); 548 static dynbuf_text buf; buf.clear ();
552 549
553 buf << (op->nrof <= 1 ? op->name : op->name_pl); 550 buf << (op->nrof <= 1 ? op->name : op->name_pl);
554 551
555 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 552 if (op->title && op->flag [FLAG_IDENTIFIED])
556 buf << ' ' << op->title; 553 buf << ' ' << op->title;
557 554
558 switch (op->type) 555 switch (op->type)
559 { 556 {
560 case SPELLBOOK: 557 case SPELLBOOK:
561 case SCROLL: 558 case SCROLL:
562 case WAND: 559 case WAND:
563 case ROD: 560 case ROD:
564 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 561 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
565 { 562 {
566 if (!op->title) 563 if (!op->title)
567 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 564 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
568 565
569 if (op->type != SPELLBOOK) 566 if (op->type != SPELLBOOK)
… …
608 buf << " " << s; 605 buf << " " << s;
609 } 606 }
610 break; 607 break;
611 608
612 default: 609 default:
613 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]))
614 buf.printf (" %+d", op->magic); 613 buf.printf (" %+d", op->magic);
615 } 614 }
616 615
617 return buf; 616 return buf;
618} 617}
… …
627 * returned is good forever.) However, it makes printing statements that 626 * returned is good forever.) However, it makes printing statements that
628 * 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.)
629 * 628 *
630 * 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
631 * and short description of the item. 630 * and short description of the item.
631 * It is also used by examine/ex and similar functions.
632 */ 632 */
633const char * 633const char *
634query_name (const object *op) 634query_name (const object *op)
635{ 635{
636 int len = 0; 636 int len = 0;
… …
641 use_buf %= 5; 641 use_buf %= 5;
642 642
643 dynbuf_text &buf = bufs [use_buf]; 643 dynbuf_text &buf = bufs [use_buf];
644 buf.clear (); 644 buf.clear ();
645 645
646#if 0
646 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 647 if ((op->is_armor () || op->is_weapon ()) && op->material)
647 if (materialtype_t *mt = name_to_material (op->materialname))
648 buf << mt->description << ' '; 648 buf << op->material->description << ' ';
649#endif
649 650
650 buf << query_short_name (op); 651 buf << query_short_name (op);
651 652
652 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 653 if (op->flag [FLAG_INV_LOCKED])
653 buf << " *"; 654 buf << " *";
654 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 655 if (op->is_open_container ())
655 buf << " (open)"; 656 buf << " (open)";
656 657
657 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 658 if (op->flag [FLAG_KNOWN_CURSED])
658 { 659 {
659 if (QUERY_FLAG (op, FLAG_DAMNED)) 660 if (op->flag [FLAG_DAMNED])
660 buf << " (damned)"; 661 buf << " (damned)";
661 else if (QUERY_FLAG (op, FLAG_CURSED)) 662 else if (op->flag [FLAG_CURSED])
662 buf << " (cursed)"; 663 buf << " (cursed)";
663 } 664 }
664 665
665 /* 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),
666 * and it isn't identified, print out the fact that 667 * and it isn't identified, print out the fact that
… …
669 * 670 *
670 * 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
671 * 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
672 * abilities, especially for artifact items. 673 * abilities, especially for artifact items.
673 */ 674 */
674 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 675 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
675 buf << " (magic)"; 676 buf << " (magic)";
676 677
677#if 0 678#if 0
678 /* 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
679 * be returned in the name. 680 * be returned in the name.
… …
681 if (op->item_power) 682 if (op->item_power)
682 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);
683 684
684#endif 685#endif
685 686
686 if (QUERY_FLAG (op, FLAG_APPLIED)) 687 if (op->flag [FLAG_APPLIED])
687 { 688 {
688 switch (op->type) 689 switch (op->type)
689 { 690 {
691 case RANGED:
690 case BOW: 692 case BOW:
691 case WAND: 693 case WAND:
692 case ROD: 694 case ROD:
693 case HORN: 695 case HORN:
694 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
695 break;
696 case WEAPON: 696 case WEAPON:
697 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)"); 697 buf << " (applied)";
698 break; 698 break;
699 case ARMOUR: 699 case ARMOUR:
700 case HELMET: 700 case HELMET:
701 case SHIELD: 701 case SHIELD:
702 case RING: 702 case RING:
… …
734 else if (op->stats.food <= 0) 734 else if (op->stats.food <= 0)
735 buf << " (burned out)"; 735 buf << " (burned out)";
736 break; 736 break;
737 } 737 }
738 738
739 if (QUERY_FLAG (op, FLAG_UNPAID)) 739 if (op->flag [FLAG_UNPAID])
740 buf << " (unpaid)"; 740 buf << " (unpaid)";
741 741
742 return buf; 742 return buf;
743} 743}
744 744
… …
751 * and sending to client. 751 * and sending to client.
752 * If plural is set, we generate the plural name of this. 752 * If plural is set, we generate the plural name of this.
753 * 753 *
754 * It is sometimes used to display messages, and usually only used to match stuff, 754 * It is sometimes used to display messages, and usually only used to match stuff,
755 * so maybe this function should be removed. 755 * so maybe this function should be removed.
756 * It is also used for client-side inventory/item descriptions.
756 */ 757 */
757const char * 758const char *
758query_base_name (const object *op, int plural) 759query_base_name (const object *op, int plural)
759{ 760{
760 if ((!plural && !op->name) || (plural && !op->name_pl)) 761 if ((!plural && !op->name) || (plural && !op->name_pl))
761 return "(null)"; 762 return "(null)";
762 763
763 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 764 if (!op->nrof && !op->weight && !op->title && !is_magical (op)
765 && op->type != EXIT)
764 return op->name; /* To speed things up (or make things slower?) */ 766 return op->name; /* To speed things up (or make things slower?) */
765 767
766 static dynbuf_text buf; buf.clear (); 768 static dynbuf_text buf; buf.clear ();
767 769
770#if 0
768 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 771 if ((op->is_armor () || op->is_weapon ()) && op->material)
769 if (materialtype_t *mt = name_to_material (op->materialname))
770 if (op->arch->materialname != mt->name) 772 if (op->arch->material != op->material)
771 buf << mt->description << ' '; 773 buf << op->material->description << ' ';
774#endif
772 775
773 buf << (plural ? op->name_pl : op->name); 776 buf << (plural ? op->name_pl : op->name);
774 777
775 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 778 if (op->title && op->flag [FLAG_IDENTIFIED])
776 buf << ' ' << op->title; 779 buf << ' ' << op->title;
777 780
778 switch (op->type) 781 switch (op->type)
779 { 782 {
780 case SPELLBOOK: 783 case SPELLBOOK:
781 case SCROLL: 784 case SCROLL:
782 case WAND: 785 case WAND:
783 case ROD: 786 case ROD:
784 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 787 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
785 { 788 {
786 if (!op->title) 789 if (!op->title)
787 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 790 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
788 791
789 if (op->type != SPELLBOOK) 792 if (op->type != SPELLBOOK)
… …
803 if (s && *s) 806 if (s && *s)
804 buf << ' ' << s; 807 buf << ' ' << s;
805 } 808 }
806 break; 809 break;
807 810
811 case EXIT:
812 // random map exits "unfortunately" get patched, so this only works before entering
813 if (EXIT_PATH (op) == shstr_random_map_exit)
814 buf << " (random map)";
815 else if (!EXIT_PATH (op))
816 buf << " (closed)";
817 break;
818
808 default: 819 default:
809 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 820 if (op->magic
821 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
822 || op->flag [FLAG_IDENTIFIED]))
810 buf.printf (" %+d", op->magic); 823 buf.printf (" %+d", op->magic);
811 } 824 }
812 825
813 return buf; 826 return buf;
814} 827}
… …
827 /* Note that the resolution this provides for players really isn't 840 /* Note that the resolution this provides for players really isn't
828 * very good. Any player with a speed greater than .67 will 841 * very good. Any player with a speed greater than .67 will
829 * fall into the 'lightning fast movement' category. 842 * fall into the 'lightning fast movement' category.
830 */ 843 */
831 if (op->has_active_speed ()) 844 if (op->has_active_speed ())
832 switch ((int) ((FABS (op->speed)) * 15)) 845 switch ((int)(op->speed * 15.))
833 { 846 {
834 case 0: 847 case 0:
835 buf << "(very slow movement)"; 848 buf << "(very slow movement)";
836 break; 849 break;
837 case 1: 850 case 1:
… …
857 default: 870 default:
858 buf << "(lightning fast movement)"; 871 buf << "(lightning fast movement)";
859 break; 872 break;
860 } 873 }
861 874
862 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)"; 875 if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
863 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)"; 876 if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
864 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)"; 877 if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
865 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)"; 878 if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
866 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)"; 879 if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
867 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)"; 880 if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
868 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)"; 881 if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
869 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)"; 882 if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
870 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)"; 883 if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
871 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)"; 884 if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
872 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)"; 885 if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
873 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)"; 886 if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
874 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)"; 887 if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
875 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)"; 888 if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
876 889
877 if (op->randomitems) 890 if (op->randomitems)
878 { 891 {
879 bool first = 1; 892 bool first = 1;
880 893
… …
907 if (op->stats.luck) 920 if (op->stats.luck)
908 buf.printf ("(luck%+d)", op->stats.luck); 921 buf.printf ("(luck%+d)", op->stats.luck);
909 } 922 }
910 923
911 /* describe attacktypes */ 924 /* describe attacktypes */
912 if (is_dragon_pl (op)) 925 if (op->is_dragon ())
913 { 926 {
914 /* for dragon players display the attacktypes from clawing skill 927 /* for dragon players display the attacktypes from clawing skill
915 * Break apart the for loop - move the comparison checking down - 928 * Break apart the for loop - move the comparison checking down -
916 * this makes it more readable. 929 * this makes it more readable.
917 */ 930 */
… …
962 * item (eg, debug dump or the like) 975 * item (eg, debug dump or the like)
963 */ 976 */
964const char * 977const char *
965describe_item (const object *op, object *owner) 978describe_item (const object *op, object *owner)
966{ 979{
967 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) 980 if (op->flag [FLAG_MONSTER] || op->type == PLAYER)
968 return describe_monster (op); 981 return describe_monster (op);
969 982
970 static dynbuf_text buf; buf.clear (); 983 static dynbuf_text buf; buf.clear ();
971 int identified, i; 984 int identified, i;
972 985
973 /* figure this out once, instead of making multiple calls to need_identify. 986 /* figure this out once, instead of making multiple calls to need_identify.
974 * also makes the code easier to read. 987 * also makes the code easier to read.
975 */ 988 */
976 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED); 989 identified = !op->need_identify () || op->flag [FLAG_IDENTIFIED];
977 if (!identified) 990 if (!identified)
978 buf << "(unidentified)"; 991 buf << "(unidentified)";
979 992
980 switch (op->type) 993 switch (op->type)
981 { 994 {
995 case RANGED:
982 case BOW: 996 case BOW:
983 case ARROW: 997 case ARROW:
984 case WAND: 998 case WAND:
985 case ROD: 999 case ROD:
986 case HORN: 1000 case HORN:
… …
1000 if (op->stats.maxsp > 1000) 1014 if (op->stats.maxsp > 1000)
1001 { /*higher capacity crystals */ 1015 { /*higher capacity crystals */
1002 i = (op->stats.maxsp % 1000) / 100; 1016 i = (op->stats.maxsp % 1000) / 100;
1003 1017
1004 if (i) 1018 if (i)
1005 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);
1006 else 1020 else
1007 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000); 1021 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
1008 } 1022 }
1009 else 1023 else
1010 buf.printf ("(capacity %d). It is ", op->stats.maxsp); 1024 buf.printf ("(capacity %d; it is ", op->stats.maxsp);
1011 1025
1012 i = (op->stats.sp * 10) / op->stats.maxsp; 1026 i = (op->stats.sp * 10) / op->stats.maxsp;
1013 if (op->stats.sp == 0) 1027 if (op->stats.sp == 0)
1014 buf << "empty."; 1028 buf << "empty";
1015 else if (i == 0) 1029 else if (i == 0)
1016 buf << "almost empty."; 1030 buf << "almost empty";
1017 else if (i < 3) 1031 else if (i < 3)
1018 buf << "partially filled."; 1032 buf << "partially filled";
1019 else if (i < 6) 1033 else if (i < 6)
1020 buf << "half full."; 1034 buf << "half full";
1021 else if (i < 9) 1035 else if (i < 9)
1022 buf << "well charged."; 1036 buf << "well charged";
1023 else if (op->stats.sp == op->stats.maxsp) 1037 else if (op->stats.sp == op->stats.maxsp)
1024 buf << "fully charged."; 1038 buf << "fully charged";
1025 else 1039 else
1026 buf << "almost full."; 1040 buf << "almost full";
1041
1042 buf << ')';
1027 break; 1043 break;
1028 1044
1029 case LAMP: 1045 case LAMP:
1030 { 1046 {
1031 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food; 1047 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
… …
1049 break; 1065 break;
1050 1066
1051 case FOOD: 1067 case FOOD:
1052 case FLESH: 1068 case FLESH:
1053 case DRINK: 1069 case DRINK:
1054 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1070 if (identified || op->flag [FLAG_BEEN_APPLIED])
1055 { 1071 {
1056 buf.printf ("(food+%d)", op->stats.food); 1072 buf.printf ("(food+%d)", op->stats.food);
1057 1073
1058 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))
1059 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]); 1075 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1060 1076
1061 if (!QUERY_FLAG (op, FLAG_CURSED)) 1077 if (!op->flag [FLAG_CURSED])
1062 { 1078 {
1063 if (op->stats.hp) buf << "(heals)"; 1079 if (op->stats.hp) buf << "(heals)";
1064 if (op->stats.sp) buf << "(spellpoint regen)"; 1080 if (op->stats.sp) buf << "(spellpoint regen)";
1065 } 1081 }
1066 else 1082 else
… …
1087 } 1103 }
1088 1104
1089 /* Down here, we more further describe equipment type items. 1105 /* Down here, we more further describe equipment type items.
1090 * only describe them if they have been identified or the like. 1106 * only describe them if they have been identified or the like.
1091 */ 1107 */
1092 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1108 if (identified || op->flag [FLAG_BEEN_APPLIED])
1093 { 1109 {
1094 int attr, val;
1095
1096 for (attr = 0; attr < NUM_STATS; attr++) 1110 for (int attr = 0; attr < NUM_STATS; attr++)
1097 if ((val = op->stats.stat (attr))) 1111 if (int val = op->stats.stat (attr))
1098 buf.printf ("(%s%+d)", short_stat_name[attr], val); 1112 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1099 1113
1100 if (op->stats.exp) 1114 if (op->stats.exp)
1101 buf.printf ("(speed %+lld)", (long long) op->stats.exp); 1115 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1102 1116
1103 switch (op->type) 1117 switch (op->type)
1104 { 1118 {
1119 case RANGED:
1105 case BOW: 1120 case BOW:
1106 case ARROW: 1121 case ARROW:
1107 case GIRDLE: 1122 case GIRDLE:
1108 case HELMET: 1123 case HELMET:
1109 case SHIELD: 1124 case SHIELD:
… …
1128 1143
1129 default: 1144 default:
1130 break; 1145 break;
1131 } 1146 }
1132 1147
1133 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)"; 1148 if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1134 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)"; 1149 if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1135 1150
1136 /* levitate was what is was before, so we'll keep it */ 1151 /* levitate was what is was before, so we'll keep it */
1137 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)"; 1152 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1138 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)"; 1153 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1139 if (op->move_type & MOVE_SWIM) buf << "(swim)"; 1154 if (op->move_type & MOVE_SWIM) buf << "(swim)";
… …
1152 { 1167 {
1153 int more_info = 0; 1168 int more_info = 0;
1154 1169
1155 switch (op->type) 1170 switch (op->type)
1156 { 1171 {
1172 case RANGED:
1157 case ROD: /* These use stats.sp for spell selection and stats.food */ 1173 case ROD: /* These use stats.sp for spell selection and stats.food */
1158 case HORN: /* and stats.hp for spell-point regeneration... */ 1174 case HORN: /* and stats.hp for spell-point regeneration... */
1159 case BOW: 1175 case BOW:
1160 case ARROW: 1176 case ARROW:
1161 case WAND: 1177 case WAND:
… …
1201 } 1217 }
1202 1218
1203 if (op->stats.luck) 1219 if (op->stats.luck)
1204 buf.printf ("(luck%+d)", op->stats.luck); 1220 buf.printf ("(luck%+d)", op->stats.luck);
1205 1221
1206 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 1222 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1207 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 1223 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1208 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 1224 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1209 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1225 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1210 1226
1211 if (op->slaying && op->type != FOOD) 1227 if (op->slaying && op->type != FOOD)
1212 buf.printf ("(slay %s)", &op->slaying); 1228 buf.printf ("(slay %s)", &op->slaying);
1213 1229
1214 if (op->type == SKILL_TOOL && op->skill) 1230 if (op->type == SKILL_TOOL && op->skill)
… …
1216 1232
1217 buf.add_abilities ("Attacks", op->attacktype); 1233 buf.add_abilities ("Attacks", op->attacktype);
1218 /* resistance on flesh is only visible for quetzals. If 1234 /* resistance on flesh is only visible for quetzals. If
1219 * non flesh, everyone can see its resistances 1235 * non flesh, everyone can see its resistances
1220 */ 1236 */
1221 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1237 if (op->type != FLESH || (owner && owner->is_dragon ()))
1222 buf << describe_resistance (op, 0); 1238 buf << describe_resistance (op, 0);
1223 1239
1224 buf.add_paths ("Attuned", op->path_attuned); 1240 buf.add_paths ("Attuned", op->path_attuned);
1225 buf.add_paths ("Repelled", op->path_repelled); 1241 buf.add_paths ("Repelled", op->path_repelled);
1226 buf.add_paths ("Denied", op->path_denied); 1242 buf.add_paths ("Denied", op->path_denied);
… …
1231 1247
1232std::string 1248std::string
1233object::describe_item (object *who) 1249object::describe_item (object *who)
1234{ 1250{
1235 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 ());
1236} 1422}
1237 1423
1238void 1424void
1239examine (object *op, object *tmp) 1425examine (object *op, object *tmp)
1240{ 1426{
… …
1252object::query_inventory (object *who, const char *indent) 1438object::query_inventory (object *who, const char *indent)
1253{ 1439{
1254 static dynbuf_text buf; buf.clear (); 1440 static dynbuf_text buf; buf.clear ();
1255 1441
1256 for (object *tmp = inv; tmp; tmp = tmp->below) 1442 for (object *tmp = inv; tmp; tmp = tmp->below)
1257 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1443 if (who && who->flag [FLAG_WIZ])
1258 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 ());
1259 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1445 else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED]))
1260 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 ());
1261 1447
1262 if (buf.size ()) 1448 if (buf.size ())
1263 buf.printf ("%s(total weight: %s)\n", indent, query_weight ()); 1449 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1264 else 1450 else
… …
1277is_magical (const object *op) 1463is_magical (const object *op)
1278{ 1464{
1279 int i; 1465 int i;
1280 1466
1281 /* living creatures are considered non magical */ 1467 /* living creatures are considered non magical */
1282 if (QUERY_FLAG (op, FLAG_ALIVE)) 1468 if (op->flag [FLAG_ALIVE])
1283 return 0; 1469 return 0;
1284 1470
1285 /* 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 */
1286 if (op->title != NULL) 1472 if (op->title != NULL)
1287 return 1; 1473 return 1;
… …
1293 (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))
1294 return 1; 1480 return 1;
1295 1481
1296 /* 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 */
1297 /* Presume any boots that hvae a move_type are special. */ 1483 /* Presume any boots that hvae a move_type are special. */
1298 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)))
1299 return 1; 1485 return 1;
1300 1486
1301 /* Take care of amulet/shield that reflects spells/missiles */ 1487 /* Take care of amulet/shield that reflects spells/missiles */
1302 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]))
1303 return 1; 1489 return 1;
1304 1490
1305 /* Take care of helmet of xrays */ 1491 /* Take care of helmet of xrays */
1306 if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) 1492 if (op->type == HELMET && op->flag [FLAG_XRAYS])
1307 return 1; 1493 return 1;
1308 1494
1309 /* Potions & rods are always magical. Wands/staves are also magical, 1495 /* Potions & rods are always magical. Wands/staves are also magical,
1310 * assuming they still have any charges left. 1496 * assuming they still have any charges left.
1311 */ 1497 */
… …
1340 * be non magical. 1526 * be non magical.
1341 */ 1527 */
1342 return 0; 1528 return 0;
1343} 1529}
1344 1530
1345/* need_identify returns true if the item should be identified. This
1346 * function really should not exist - by default, any item not identified
1347 * should need it.
1348 */
1349
1350int
1351need_identify (const object *op)
1352{
1353 switch (op->type)
1354 {
1355 case RING:
1356 case WAND:
1357 case ROD:
1358 case HORN:
1359 case SCROLL:
1360 case SKILL:
1361 case SKILLSCROLL:
1362 case SPELLBOOK:
1363 case FOOD:
1364 case POTION:
1365 case BOW:
1366 case ARROW:
1367 case WEAPON:
1368 case ARMOUR:
1369 case SHIELD:
1370 case HELMET:
1371 case AMULET:
1372 case BOOTS:
1373 case GLOVES:
1374 case BRACERS:
1375 case GIRDLE:
1376 case CONTAINER:
1377 case DRINK:
1378 case FLESH:
1379 case INORGANIC:
1380 case CLOSE_CON:
1381 case CLOAK:
1382 case GEM:
1383 case POWER_CRYSTAL:
1384 case POISON:
1385 case BOOK:
1386 case SKILL_TOOL:
1387 return 1;
1388 }
1389
1390 /* Try to track down some stuff that may show up here. Thus, the
1391 * archetype file can be updated, and this function removed.
1392 */
1393#if 0
1394 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1395#endif
1396 return 0;
1397}
1398
1399/* 1531/*
1400 * Supposed to fix face-values as well here, but later. 1532 * Supposed to fix face-values as well here, but later.
1401 */ 1533 */
1402void 1534void
1403identify (object *op) 1535identify (object *op)
1404{ 1536{
1405 SET_FLAG (op, FLAG_IDENTIFIED); 1537 op->set_flag (FLAG_IDENTIFIED);
1406 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1538 op->clr_flag (FLAG_KNOWN_MAGICAL);
1407 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1539 op->clr_flag (FLAG_NO_SKILL_IDENT);
1408 1540
1409 /* 1541 /*
1410 * We want autojoining of equal objects: 1542 * We want autojoining of equal objects:
1411 */ 1543 */
1412 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 1544 if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])
1413 SET_FLAG (op, FLAG_KNOWN_CURSED); 1545 op->set_flag (FLAG_KNOWN_CURSED);
1414 1546
1415 if (op->type == POTION) 1547 if (op->type == POTION)
1416 { 1548 {
1417 if (op->inv && op->randomitems) 1549 if (op->inv && op->randomitems)
1418 op->title = op->inv->name; 1550 op->title = op->inv->name;

Diff Legend

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