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.49 by root, Fri Apr 25 11:40:34 2008 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 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
46 * Note that using the term 'human' may not be very accurate, humanoid 47 * Note that using the term 'human' may not be very accurate, humanoid
47 * may be better. 48 * may be better.
48 * Basically, for the use/nonuse, the code does something like: 49 * Basically, for the use/nonuse, the code does something like:
49 * "This item goes %s\n", with the use/nonuse values filling in the %s 50 * "This item goes %s\n", with the use/nonuse values filling in the %s
50 */ 51 */
52// see include/object.h
51Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 53Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52 {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"},
53 {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"},
54 {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"},
55 {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"},
64 {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"},
65 {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"},
66/*{"body_dragon_torso", "your body", "a dragon's body"} */ 68/*{"body_dragon_torso", "your body", "a dragon's body"} */
67}; 69};
68 70
69static char numbers[21][20] = {
70 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
71 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
72 "eighteen", "nineteen", "twenty"
73};
74
75static char numbers_10[10][20] = { 71static char numbers_10[10][20] = {
76 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 72 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
77 "eighty", "ninety" 73 "eighty", "ninety"
78}; 74};
79 75
80static char levelnumbers[21][20] = { 76static char ordnumbers[21][20] = {
81 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", 77 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
82 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", 78 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
83 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", 79 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
84 "nineteen", "twentieth" 80 "nineteenth", "twentieth"
85}; 81};
86 82
87static char levelnumbers_10[11][20] = { 83static char ordnumbers_10[11][20] = {
88 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", 84 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
89 "seventieth", "eightieth", "ninetieth" 85 "seventieth", "eightieth", "ninetieth"
90}; 86};
91 87
92/* 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:
155 {EXIT, "exit", "exits", 0, 0}, 151 {EXIT, "exit", "exits", 0, 0},
156 {ENCOUNTER, "encounter", "encounters", 0, 0}, 152 {ENCOUNTER, "encounter", "encounters", 0, 0},
157 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, 153 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
158 {SHOP_MAT, "shop mat", "shop mats", 0, 0}, 154 {SHOP_MAT, "shop mat", "shop mats", 0, 0},
159 {RING, "ring", "rings", SK_JEWELER, 0}, 155 {RING, "ring", "rings", SK_JEWELER, 0},
160 {FLOOR, "floor", "floors", 0, 0}, 156// {FLOOR, "floor", "floors", 0, 0},
161 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 157 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
162 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 158 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
163 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 159 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
164 {LIGHTER, "lighter", "lighters", 0, 0}, 160 {LIGHTER, "lighter", "lighters", 0, 0},
165 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 161 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
169 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 165 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
170 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 166 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
171 {SPINNER, "spinner", "spinners", 0, 0}, 167 {SPINNER, "spinner", "spinners", 0, 0},
172 {GATE, "gate", "gates", 0, 0}, 168 {GATE, "gate", "gates", 0, 0},
173 {BUTTON, "button", "buttons", 0, 0}, 169 {BUTTON, "button", "buttons", 0, 0},
174 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 170 {T_HANDLE, "cf handle", "cf handles", 0, 0},
175 {HOLE, "hole", "holes", 0, 0}, 171 {HOLE, "hole", "holes", 0, 0},
176 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 172 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
177 {SIGN, "sign", "signs", 0, 0}, 173 {SIGN, "sign", "signs", 0, 0},
178 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 174 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
179 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 175 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
206 {BUILDER, "item builder", "item builders", 0, 0}, 202 {BUILDER, "item builder", "item builders", 0, 0},
207 {MATERIAL, "building material", "building materials", 0, 0}, 203 {MATERIAL, "building material", "building materials", 0, 0},
208 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 204 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
209}; 205};
210 206
211const int item_types_size = sizeof (item_types) / sizeof (*item_types); 207static const int item_types_size = array_length (item_types);
212
213materialtype_t *materialt;
214
215/*
216materialtype material[NROFMATERIALS] = {
217 * P M F E C C A D W G P S P T F C D D C C G H B I *
218 * H A I L O O C R E H O L A U E A E E H O O O L N *
219 * Y G R E L N I A A O I O R R A N P A A U D L I T *
220 * S I E C D F D I P S S W A N R C L T O N Y N R *
221 * I C T U N O T O L E E H S T P D N *
222 {"paper", {15,10,17, 9, 5, 7,13, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
223 {"metal", { 2,12, 3,12, 2,10, 7, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
224 {"glass", {14,11, 8, 3,10, 5, 1, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
225 {"leather", { 5,10,10, 3, 3,10,10, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
226 {"wood", {10,11,13, 2, 2,10, 9, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
227 {"organics", { 3,12, 9,11, 3,10, 9, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
228 {"stone", { 2, 5, 2, 2, 2, 2, 1, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
229 {"cloth", {14,11,13, 4, 4, 5,10, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
230 {"adamant", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
231 {"liquid", { 0, 8, 9, 6,17, 0,15, 0,20,15,12,0,0,0,0,11,0,0,0,0,0,0,0,0}},
232 {"soft metal",{ 6,12, 6,14, 2,10, 1, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
233 {"bone", {10, 9, 4, 5, 3,10,10, 0,20,15, 0,0,0,0,0, 2,0,0,0,0,0,0,0,0}},
234 {"ice", {14,11,16, 5, 0, 5, 6, 0,20,15, 0,0,0,0,0, 7,0,0,0,0,0,0,0,0}}
235};
236*/
237 208
238/* This curve may be too steep. But the point is that there should 209/* This curve may be too steep. But the point is that there should
239 * be tough choices - there is no real point to this if everyone can 210 * be tough choices - there is no real point to this if everyone can
240 * wear whatever they want with no worries. Perhaps having the steep 211 * wear whatever they want with no worries. Perhaps having the steep
241 * curve is good (maybe even steeper), but allowing players to 212 * curve is good (maybe even steeper), but allowing players to
243 * able to use 2-3 of the most powerful items. 214 * able to use 2-3 of the most powerful items.
244 * 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 -
245 * custom objects can use whatever they want. 216 * custom objects can use whatever they want.
246 */ 217 */
247static int enc_to_item_power[21] = { 218static int enc_to_item_power[21] = {
219 0,
248 0, 0, 1, 2, 3, 4, /* 5 */ 220 0, 1, 2, 3, 4, // 5
249 5, 7, 9, 11, 13, /* 10 */ 221 5, 7, 9, 11, 13, // 10
250 15, 18, 21, 24, 27, /* 15 */ 222 15, 18, 21, 24, 27, // 15
251 30, 35, 40, 45, 50 /* 20 */ 223 30, 35, 40, 45, 50 // 20
252}; 224};
253 225
254int 226int
255get_power_from_ench (int ench) 227get_power_from_ench (int ench)
256{ 228{
257 if (ench < 0) ench = 0;
258 if (ench > 20) ench = 20;
259
260 return enc_to_item_power[ench]; 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];
261} 275}
262 276
263/* 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
264 * 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
265 * generation code, and when loading legacy objects. It returns 279 * generation code, and when loading legacy objects. It returns
321 335
322 enc += op->stats.luck; 336 enc += op->stats.luck;
323 337
324 /* Do spell paths now */ 338 /* Do spell paths now */
325 for (i = 1; i < NRSPELLPATHS; i++) 339 for (i = 1; i < NRSPELLPATHS; i++)
326 {
327 if (op->path_attuned & (1 << i)) 340 if (op->path_attuned & (1 << i))
328 enc++; 341 enc++;
329 else if (op->path_denied & (1 << i)) 342 else if (op->path_denied & (1 << i))
330 enc -= 2; 343 enc -= 2;
331 else if (op->path_repelled & (1 << i)) 344 else if (op->path_repelled & (1 << i))
332 enc--; 345 enc--;
333 }
334 346
335 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 347 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
336 enc += 5; 348 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
337 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 349 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
338 enc += 3; 350 if (op->flag [FLAG_XRAYS ]) enc += 2;
339 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 351 if (op->flag [FLAG_STEALTH ]) enc += 1;
340 enc += 2; 352 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
341 if (QUERY_FLAG (op, FLAG_STEALTH)) 353 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
342 enc += 1;
343 if (QUERY_FLAG (op, FLAG_XRAYS))
344 enc += 2;
345 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
346 enc += 1;
347 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
348 enc += 1;
349 354
350 return get_power_from_ench (enc); 355 return get_power_from_ench (enc);
351} 356}
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_;
352 373
353/* 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
354 * isn't one, returns NULL */ 375 * isn't one, returns NULL */
355const typedata * 376const typedata *
356get_typedata (int itemtype) 377get_typedata (int itemtype)
357{ 378{
358 int i; 379 return get_typedata_ (itemtype);
359
360 for (i = 0; i < item_types_size; i++)
361 if (item_types[i].number == itemtype)
362 return &item_types[i];
363
364 return NULL;
365} 380}
366 381
367/* 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
368 * 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
369 * one return NULL */ 384 * one return NULL */
370const typedata * 385const typedata *
371get_typedata_by_name (const char *name) 386get_typedata_by_name (const char *name)
372{ 387{
373 int i;
374
375 for (i = 0; i < item_types_size; i++) 388 for (int i = 0; i < item_types_size; i++)
376 if (!strcmp (item_types[i].name, name)) 389 if (!strcmp (item_types[i].name, name))
377 return &item_types[i]; 390 return &item_types[i];
378 391
379 for (i = 0; i < item_types_size; i++) 392 for (int i = 0; i < item_types_size; i++)
380 if (!strcmp (item_types[i].name_pl, name)) 393 if (!strcmp (item_types[i].name_pl, name))
381 { 394 {
382 LOG (llevInfo, 395 LOG (llevInfo,
383 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name); 396 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
384 return &item_types[i]; 397 return &item_types[i];
385 } 398 }
386 399
387 return NULL; 400 return 0;
388} 401}
389 402
390/* describe_resistance generates the visible naming for resistances. 403/* describe_resistance generates the visible naming for resistances.
391 * returns a static array of the description. This can return 404 * returns a static array of the description. This can return
392 * a big buffer. 405 * a big buffer.
394 * 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
395 */ 408 */
396const char * 409const char *
397describe_resistance (const object *op, int newline) 410describe_resistance (const object *op, int newline)
398{ 411{
399 static char buf[VERY_BIG_BUF]; 412 static dynbuf_text buf; buf.clear ();
400 char buf1[VERY_BIG_BUF];
401 int tmpvar;
402 413
403 buf[0] = 0; 414 for (int i = 0; i < NROFATTACKS; i++)
404 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
405 {
406 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))
407 { 416 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
408 if (!newline)
409 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
410 else
411 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
412 417
413 strcat (buf, buf1);
414 }
415 }
416 return buf; 418 return buf;
417} 419}
418
419 420
420/* 421/*
421 * query_weight(object) returns a character pointer to a static buffer 422 * query_weight(object) returns a character pointer to a static buffer
422 * containing the text-representation of the weight of the given object. 423 * containing the text-representation of the weight of the given object.
423 * 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().
425 *
426 * Seems to be used only by unimportant stuff. Remove?
424 */ 427 */
425const char * 428const char *
426query_weight (const object *op) 429query_weight (const object *op)
427{ 430{
428 static char buf[10]; 431 static char buf[10];
442/* 445/*
443 * Returns the pointer to a static buffer containing 446 * Returns the pointer to a static buffer containing
444 * the number requested (of the form first, second, third...) 447 * the number requested (of the form first, second, third...)
445 */ 448 */
446const char * 449const char *
447get_levelnumber (int i) 450ordinal (int i)
448{ 451{
449 static char buf[MAX_BUF]; 452 if (i < 0)
450 453 return format ("minus %s", ordinal (-i));
451 if (i > 99)
452 {
453 sprintf (buf, "%d.", i);
454 return buf;
455 }
456 454
457 if (i < 21) 455 if (i < 21)
458 return levelnumbers[i];
459 if (!(i % 10))
460 return levelnumbers_10[i / 10];
461
462 strcpy (buf, numbers_10[i / 10]);
463 strcat (buf, levelnumbers[i % 10]);
464 return buf;
465}
466
467/*
468 * get_number(integer) returns the text-representation of the given number
469 * in a static buffer. The buffer might be overwritten at the next
470 * call to get_number().
471 * It is currently only used by the query_name() function.
472 */
473const char *
474get_number (int i)
475{
476 if (i <= 20)
477 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];
478 else 471 else
479 { 472 return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
480 static char buf[MAX_BUF];
481
482 sprintf (buf, "%d", i);
483 return buf;
484 }
485} 473}
486 474
487/* 475/*
488 * Returns pointer to static buffer containing ring's or amulet's 476 * Returns pointer to static buffer containing ring's or amulet's
489 * abilities 477 * abilities
495 */ 483 */
496 484
497/* 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
498 * from stats.sp - b.t. 486 * from stats.sp - b.t.
499 */ 487 */
500const char * 488static const char *
501ring_desc (const object *op) 489ring_desc (const object *op)
502{ 490{
503 static dynbuf_text buf; buf.clear (); 491 static dynbuf_text buf; buf.clear ();
504 int attr, val, len; 492 int attr, val, len;
505 493
506 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 494 if (op->flag [FLAG_IDENTIFIED])
507 { 495 {
508 for (attr = 0; attr < NUM_STATS; attr++) 496 for (attr = 0; attr < NUM_STATS; attr++)
509 if ((val = op->stats.stat (attr))) 497 if ((val = op->stats.stat (attr)))
510 buf.printf ("(%s%+d)", short_stat_name[attr], val); 498 buf.printf ("(%s%+d)", short_stat_name[attr], val);
511 499
512 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);
513 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc); 501 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
514 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam); 502 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
515 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac); 503 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
516 504
517 buf << describe_resistance (op, 0); 505 buf << describe_resistance (op, 0);
520 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace); 508 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
521 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);
522 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp); 510 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
523 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck); 511 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
524 512
525 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 513 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
526 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 514 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
527 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 515 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
528 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 516 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
529 517
530 buf.add_paths ("Attuned" , op->path_attuned); 518 buf.add_paths ("Attuned" , op->path_attuned);
531 buf.add_paths ("Repelled", op->path_repelled); 519 buf.add_paths ("Repelled", op->path_repelled);
532 buf.add_paths ("Denied" , op->path_denied); 520 buf.add_paths ("Denied" , op->path_denied);
533 521
539} 527}
540 528
541/* 529/*
542 * query_short_name(object) is similar to query_name, but doesn't 530 * query_short_name(object) is similar to query_name, but doesn't
543 * contain any information about object status (worn/cursed/etc.) 531 * contain any information about object status (worn/cursed/etc.)
532 *
533 * It is sometimes used when printing messages, so should fit well into a sentence.
544 */ 534 */
545const char * 535const char *
546query_short_name (const object *op) 536query_short_name (const object *op)
547{ 537{
548 if (op->name == 0) 538 if (!op->name)
549 return "(null)"; 539 return "(null)";
550 540
551 if (!op->nrof 541 if (!op->nrof
552 && !op->weight 542 && !op->weight
553 && !op->title 543 && !op->title
557 547
558 static dynbuf_text buf; buf.clear (); 548 static dynbuf_text buf; buf.clear ();
559 549
560 buf << (op->nrof <= 1 ? op->name : op->name_pl); 550 buf << (op->nrof <= 1 ? op->name : op->name_pl);
561 551
562 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 552 if (op->title && op->flag [FLAG_IDENTIFIED])
563 buf << ' ' << op->title; 553 buf << ' ' << op->title;
564 554
565 switch (op->type) 555 switch (op->type)
566 { 556 {
567 case SPELLBOOK: 557 case SPELLBOOK:
568 case SCROLL: 558 case SCROLL:
569 case WAND: 559 case WAND:
570 case ROD: 560 case ROD:
571 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 561 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
572 { 562 {
573 if (!op->title) 563 if (!op->title)
574 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 564 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
575 565
576 if (op->type != SPELLBOOK) 566 if (op->type != SPELLBOOK)
577 buf.printf (" (lvl %d)", op->level); 567 buf.printf (" (lvl %d)", op->level);
578 } 568 }
579 break; 569 break;
580 570
581 case ALTAR: 571 case ALTAR:
582 case TRIGGER_ALTAR: 572 case TRIGGER_ALTAR:
583 case IDENTIFY_ALTAR: 573 case IDENTIFY_ALTAR:
584 case CONVERTER: 574 case CONVERTER:
585 if (op->slaying == shstr_money) 575 if (op->slaying == shstr_money)
586 { 576 {
587 bool wrap = !!buf.size (); 577 bool wrap = !!buf.size ();
588 578
589 if (wrap) buf << " ["; 579 if (wrap) buf << " [";
590 580
591 archetype *coin = 0; 581 archetype *coin = 0;
592 582
593 for (char const *const *c = coins; *coins; ++c) 583 for (char const *const *c = coins; *coins; ++c)
594 if ((coin = archetype::find (*c))) 584 if ((coin = archetype::find (*c)))
595 if (op->stats.food % coin->value == 0) 585 if (op->stats.food % coin->value == 0)
596 break; 586 break;
597 587
598 sint32 coins = op->stats.food / coin->value; 588 sint32 coins = op->stats.food / coin->value;
599 589
600 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl); 590 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
601 591
602 if (wrap) buf << ']'; 592 if (wrap) buf << ']';
603 } 593 }
604 break; 594 break;
605 595
606 case SKILL: 596 case SKILL:
607 case AMULET: 597 case AMULET:
608 case RING: 598 case RING:
609 if (!op->title) 599 if (!op->title)
615 buf << " " << s; 605 buf << " " << s;
616 } 606 }
617 break; 607 break;
618 608
619 default: 609 default:
620 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]))
621 buf.printf (" %+d", op->magic); 613 buf.printf (" %+d", op->magic);
622 } 614 }
623 615
624 return buf; 616 return buf;
625} 617}
632 * you can make several calls to query_name before the bufs start getting 624 * you can make several calls to query_name before the bufs start getting
633 * overwritten. This may be a bad thing (it may be easier to assume the value 625 * overwritten. This may be a bad thing (it may be easier to assume the value
634 * returned is good forever.) However, it makes printing statements that 626 * returned is good forever.) However, it makes printing statements that
635 * 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.)
636 * 628 *
629 * It is used extensively within messages, so should return only a prose
630 * and short description of the item.
631 * It is also used by examine/ex and similar functions.
637 */ 632 */
638const char * 633const char *
639query_name (const object *op) 634query_name (const object *op)
640{ 635{
641 int len = 0; 636 int len = 0;
646 use_buf %= 5; 641 use_buf %= 5;
647 642
648 dynbuf_text &buf = bufs [use_buf]; 643 dynbuf_text &buf = bufs [use_buf];
649 buf.clear (); 644 buf.clear ();
650 645
646#if 0
651 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 647 if ((op->is_armor () || op->is_weapon ()) && op->material)
652 if (materialtype_t *mt = name_to_material (op->materialname))
653 buf << mt->description << ' '; 648 buf << op->material->description << ' ';
649#endif
654 650
655 buf << query_short_name (op); 651 buf << query_short_name (op);
656 652
657 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 653 if (op->flag [FLAG_INV_LOCKED])
658 buf << " *"; 654 buf << " *";
659 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 655 if (op->is_open_container ())
660 buf << " (open)"; 656 buf << " (open)";
661 657
662 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 658 if (op->flag [FLAG_KNOWN_CURSED])
663 { 659 {
664 if (QUERY_FLAG (op, FLAG_DAMNED)) 660 if (op->flag [FLAG_DAMNED])
665 buf << " (damned)"; 661 buf << " (damned)";
666 else if (QUERY_FLAG (op, FLAG_CURSED)) 662 else if (op->flag [FLAG_CURSED])
667 buf << " (cursed)"; 663 buf << " (cursed)";
668 } 664 }
669 665
670 /* 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),
671 * and it isn't identified, print out the fact that 667 * and it isn't identified, print out the fact that
674 * 670 *
675 * 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
676 * 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
677 * abilities, especially for artifact items. 673 * abilities, especially for artifact items.
678 */ 674 */
679 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 675 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
680 buf << " (magic)"; 676 buf << " (magic)";
681 677
682#if 0 678#if 0
683 /* item_power will be returned in desribe_item - it shouldn't really 679 /* item_power will be returned in describe_item - it shouldn't really
684 * be returned in the name. 680 * be returned in the name.
685 */ 681 */
686 if (op->item_power) 682 if (op->item_power)
687 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);
688 684
689#endif 685#endif
690 686
691 if (QUERY_FLAG (op, FLAG_APPLIED)) 687 if (op->flag [FLAG_APPLIED])
692 { 688 {
693 switch (op->type) 689 switch (op->type)
694 { 690 {
691 case RANGED:
695 case BOW: 692 case BOW:
696 case WAND: 693 case WAND:
697 case ROD: 694 case ROD:
698 case HORN: 695 case HORN:
699 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
700 break;
701 case WEAPON: 696 case WEAPON:
702 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)"); 697 buf << " (applied)";
703 break; 698 break;
704 case ARMOUR: 699 case ARMOUR:
705 case HELMET: 700 case HELMET:
706 case SHIELD: 701 case SHIELD:
707 case RING: 702 case RING:
720 default: 715 default:
721 buf << " (applied)"; 716 buf << " (applied)";
722 } 717 }
723 } 718 }
724 719
725 if (QUERY_FLAG (op, FLAG_UNPAID)) 720 switch (op->type)
721 {
722 case LAMP:
723 if (op->glow_radius)
724 buf << " (on)";
725 else if (op->stats.food <= 0)
726 buf << " (empty)";
727 else
728 buf << " (off)";
729 break;
730
731 case TORCH:
732 if (op->glow_radius)
733 buf << " (burning)";
734 else if (op->stats.food <= 0)
735 buf << " (burned out)";
736 break;
737 }
738
739 if (op->flag [FLAG_UNPAID])
726 buf << " (unpaid)"; 740 buf << " (unpaid)";
727 741
728 return buf; 742 return buf;
729} 743}
730 744
734 * of the given object. The buffer will be overwritten at the next 748 * of the given object. The buffer will be overwritten at the next
735 * call to query_base_name(). This is a lot like query_name, but we 749 * call to query_base_name(). This is a lot like query_name, but we
736 * don't include the item count or item status. Used for inventory sorting 750 * don't include the item count or item status. Used for inventory sorting
737 * and sending to client. 751 * and sending to client.
738 * If plural is set, we generate the plural name of this. 752 * If plural is set, we generate the plural name of this.
753 *
754 * It is sometimes used to display messages, and usually only used to match stuff,
755 * so maybe this function should be removed.
756 * It is also used for client-side inventory/item descriptions.
739 */ 757 */
740const char * 758const char *
741query_base_name (const object *op, int plural) 759query_base_name (const object *op, int plural)
742{ 760{
743 if ((!plural && !op->name) || (plural && !op->name_pl)) 761 if ((!plural && !op->name) || (plural && !op->name_pl))
744 return "(null)"; 762 return "(null)";
745 763
746 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)
747 return op->name; /* To speed things up (or make things slower?) */ 766 return op->name; /* To speed things up (or make things slower?) */
748 767
749 static dynbuf_text buf; buf.clear (); 768 static dynbuf_text buf; buf.clear ();
750 769
770#if 0
751 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 771 if ((op->is_armor () || op->is_weapon ()) && op->material)
752 if (materialtype_t *mt = name_to_material (op->materialname))
753 if (op->arch->materialname != mt->name) 772 if (op->arch->material != op->material)
754 buf << mt->description << ' '; 773 buf << op->material->description << ' ';
774#endif
755 775
756 buf << (plural ? op->name_pl : op->name); 776 buf << (plural ? op->name_pl : op->name);
757 777
758 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 778 if (op->title && op->flag [FLAG_IDENTIFIED])
759 buf << ' ' << op->title; 779 buf << ' ' << op->title;
760 780
761 switch (op->type) 781 switch (op->type)
762 { 782 {
763 case SPELLBOOK: 783 case SPELLBOOK:
764 case SCROLL: 784 case SCROLL:
765 case WAND: 785 case WAND:
766 case ROD: 786 case ROD:
767 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 787 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
768 { 788 {
769 if (!op->title) 789 if (!op->title)
770 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 790 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
771 791
772 if (op->type != SPELLBOOK) 792 if (op->type != SPELLBOOK)
786 if (s && *s) 806 if (s && *s)
787 buf << ' ' << s; 807 buf << ' ' << s;
788 } 808 }
789 break; 809 break;
790 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
791 default: 819 default:
792 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]))
793 buf.printf (" %+d", op->magic); 823 buf.printf (" %+d", op->magic);
794 } 824 }
795 825
796 return buf; 826 return buf;
797} 827}
810 /* Note that the resolution this provides for players really isn't 840 /* Note that the resolution this provides for players really isn't
811 * very good. Any player with a speed greater than .67 will 841 * very good. Any player with a speed greater than .67 will
812 * fall into the 'lightning fast movement' category. 842 * fall into the 'lightning fast movement' category.
813 */ 843 */
814 if (op->has_active_speed ()) 844 if (op->has_active_speed ())
815 switch ((int) ((FABS (op->speed)) * 15)) 845 switch ((int)(op->speed * 15.))
816 { 846 {
817 case 0: 847 case 0:
818 buf << "(very slow movement"; 848 buf << "(very slow movement)";
819 break; 849 break;
820 case 1: 850 case 1:
821 buf << "(slow movement)"; 851 buf << "(slow movement)";
822 break; 852 break;
823 case 2: 853 case 2:
840 default: 870 default:
841 buf << "(lightning fast movement)"; 871 buf << "(lightning fast movement)";
842 break; 872 break;
843 } 873 }
844 874
845 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)"; 875 if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
846 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)"; 876 if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
847 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)"; 877 if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
848 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)"; 878 if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
849 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)"; 879 if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
850 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)"; 880 if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
851 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)"; 881 if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
852 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)"; 882 if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
853 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)"; 883 if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
854 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)"; 884 if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
855 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)"; 885 if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
856 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)"; 886 if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
857 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)"; 887 if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
858 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)"; 888 if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
859 889
860 if (op->randomitems) 890 if (op->randomitems)
861 { 891 {
862 bool first = 1; 892 bool first = 1;
863 893
890 if (op->stats.luck) 920 if (op->stats.luck)
891 buf.printf ("(luck%+d)", op->stats.luck); 921 buf.printf ("(luck%+d)", op->stats.luck);
892 } 922 }
893 923
894 /* describe attacktypes */ 924 /* describe attacktypes */
895 if (is_dragon_pl (op)) 925 if (op->is_dragon ())
896 { 926 {
897 /* for dragon players display the attacktypes from clawing skill 927 /* for dragon players display the attacktypes from clawing skill
898 * Break apart the for loop - move the comparison checking down - 928 * Break apart the for loop - move the comparison checking down -
899 * this makes it more readable. 929 * this makes it more readable.
900 */ 930 */
938 * wouldn't need to use the SEE_INVISIBLE flag to know it is 968 * wouldn't need to use the SEE_INVISIBLE flag to know it is
939 * a dragon player examining food. Could have things like 969 * a dragon player examining food. Could have things like
940 * a dwarven axe, in which the full abilities are only known to 970 * a dwarven axe, in which the full abilities are only known to
941 * dwarves, etc. 971 * dwarves, etc.
942 * 972 *
943 * This function is really much more complicated than it should
944 * be, because different objects have different meanings
945 * for the same field (eg, wands use 'food' for charges). This
946 * means these special cases need to be worked out.
947 *
948 * Add 'owner' who is the person examining this object. 973 * Add 'owner' who is the person examining this object.
949 * owner can be null if no one is being associated with this 974 * owner can be null if no one is being associated with this
950 * item (eg, debug dump or the like) 975 * item (eg, debug dump or the like)
951 */ 976 */
952const char * 977const char *
953describe_item (const object *op, object *owner) 978describe_item (const object *op, object *owner)
954{ 979{
955 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) 980 if (op->flag [FLAG_MONSTER] || op->type == PLAYER)
956 return describe_monster (op); 981 return describe_monster (op);
957 982
958 static dynbuf_text buf; buf.clear (); 983 static dynbuf_text buf; buf.clear ();
959 int identified, i; 984 int identified, i;
960 985
961 /* 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.
962 * also makes the code easier to read. 987 * also makes the code easier to read.
963 */ 988 */
964 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED); 989 identified = !op->need_identify () || op->flag [FLAG_IDENTIFIED];
965 if (!identified) 990 if (!identified)
966 buf << "(unidentified)"; 991 buf << "(unidentified)";
967 992
968 switch (op->type) 993 switch (op->type)
969 { 994 {
995 case RANGED:
970 case BOW: 996 case BOW:
971 case ARROW: 997 case ARROW:
972 case WAND: 998 case WAND:
973 case ROD: 999 case ROD:
974 case HORN: 1000 case HORN:
988 if (op->stats.maxsp > 1000) 1014 if (op->stats.maxsp > 1000)
989 { /*higher capacity crystals */ 1015 { /*higher capacity crystals */
990 i = (op->stats.maxsp % 1000) / 100; 1016 i = (op->stats.maxsp % 1000) / 100;
991 1017
992 if (i) 1018 if (i)
993 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);
994 else 1020 else
995 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000); 1021 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
996 } 1022 }
997 else 1023 else
998 buf.printf ("(capacity %d). It is ", op->stats.maxsp); 1024 buf.printf ("(capacity %d; it is ", op->stats.maxsp);
999 1025
1000 i = (op->stats.sp * 10) / op->stats.maxsp; 1026 i = (op->stats.sp * 10) / op->stats.maxsp;
1001 if (op->stats.sp == 0) 1027 if (op->stats.sp == 0)
1002 buf << "empty."; 1028 buf << "empty";
1003 else if (i == 0) 1029 else if (i == 0)
1004 buf << "almost empty."; 1030 buf << "almost empty";
1005 else if (i < 3) 1031 else if (i < 3)
1006 buf << "partially filled."; 1032 buf << "partially filled";
1007 else if (i < 6) 1033 else if (i < 6)
1008 buf << "half full."; 1034 buf << "half full";
1009 else if (i < 9) 1035 else if (i < 9)
1010 buf << "well charged."; 1036 buf << "well charged";
1011 else if (op->stats.sp == op->stats.maxsp) 1037 else if (op->stats.sp == op->stats.maxsp)
1012 buf << "fully charged."; 1038 buf << "fully charged";
1013 else 1039 else
1014 buf << "almost full."; 1040 buf << "almost full";
1041
1042 buf << ')';
1043 break;
1044
1045 case LAMP:
1046 {
1047 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
1048 buf << "(fuel: ";
1049 if (percent == 0)
1050 buf << "empty";
1051 else if (percent < 10)
1052 buf << "very low";
1053 else if (percent < 25)
1054 buf << "low";
1055 else if (percent < 50)
1056 buf << "half empty";
1057 else if (percent < 75)
1058 buf << "half full";
1059 else if (percent < 95)
1060 buf << "well filled";
1061 else if (percent <= 100)
1062 buf << "full";
1063 buf << ")";
1064 }
1015 break; 1065 break;
1016 1066
1017 case FOOD: 1067 case FOOD:
1018 case FLESH: 1068 case FLESH:
1019 case DRINK: 1069 case DRINK:
1020 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1070 if (identified || op->flag [FLAG_BEEN_APPLIED])
1021 { 1071 {
1022 buf.printf ("(food+%d)", op->stats.food); 1072 buf.printf ("(food+%d)", op->stats.food);
1023 1073
1024 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))
1025 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]); 1075 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1026 1076
1027 if (!QUERY_FLAG (op, FLAG_CURSED)) 1077 if (!op->flag [FLAG_CURSED])
1028 { 1078 {
1029 if (op->stats.hp) buf << "(heals)"; 1079 if (op->stats.hp) buf << "(heals)";
1030 if (op->stats.sp) buf << "(spellpoint regen)"; 1080 if (op->stats.sp) buf << "(spellpoint regen)";
1031 } 1081 }
1032 else 1082 else
1053 } 1103 }
1054 1104
1055 /* Down here, we more further describe equipment type items. 1105 /* Down here, we more further describe equipment type items.
1056 * only describe them if they have been identified or the like. 1106 * only describe them if they have been identified or the like.
1057 */ 1107 */
1058 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1108 if (identified || op->flag [FLAG_BEEN_APPLIED])
1059 { 1109 {
1060 int attr, val;
1061
1062 for (attr = 0; attr < NUM_STATS; attr++) 1110 for (int attr = 0; attr < NUM_STATS; attr++)
1063 if ((val = op->stats.stat (attr))) 1111 if (int val = op->stats.stat (attr))
1064 buf.printf ("(%s%+d)", short_stat_name[attr], val); 1112 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1065 1113
1066 if (op->stats.exp) 1114 if (op->stats.exp)
1067 buf.printf ("(speed %+lld)", (long long) op->stats.exp); 1115 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1068 1116
1069 switch (op->type) 1117 switch (op->type)
1070 { 1118 {
1119 case RANGED:
1071 case BOW: 1120 case BOW:
1072 case ARROW: 1121 case ARROW:
1073 case GIRDLE: 1122 case GIRDLE:
1074 case HELMET: 1123 case HELMET:
1075 case SHIELD: 1124 case SHIELD:
1094 1143
1095 default: 1144 default:
1096 break; 1145 break;
1097 } 1146 }
1098 1147
1099 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)"; 1148 if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1100 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)"; 1149 if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1101 1150
1102 /* levitate was what is was before, so we'll keep it */ 1151 /* levitate was what is was before, so we'll keep it */
1103 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)"; 1152 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1104 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)"; 1153 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1105 if (op->move_type & MOVE_SWIM) buf << "(swim)"; 1154 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1118 { 1167 {
1119 int more_info = 0; 1168 int more_info = 0;
1120 1169
1121 switch (op->type) 1170 switch (op->type)
1122 { 1171 {
1172 case RANGED:
1123 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 */
1124 case HORN: /* and stats.hp for spell-point regeneration... */ 1174 case HORN: /* and stats.hp for spell-point regeneration... */
1125 case BOW: 1175 case BOW:
1126 case ARROW: 1176 case ARROW:
1127 case WAND: 1177 case WAND:
1167 } 1217 }
1168 1218
1169 if (op->stats.luck) 1219 if (op->stats.luck)
1170 buf.printf ("(luck%+d)", op->stats.luck); 1220 buf.printf ("(luck%+d)", op->stats.luck);
1171 1221
1172 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 1222 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1173 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 1223 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1174 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 1224 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1175 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1225 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1176 1226
1177 if (op->slaying && op->type != FOOD) 1227 if (op->slaying && op->type != FOOD)
1178 buf.printf ("(slay %s)", &op->slaying); 1228 buf.printf ("(slay %s)", &op->slaying);
1229
1230 if (op->type == SKILL_TOOL && op->skill)
1231 buf.printf ("(%s)", &op->skill);
1179 1232
1180 buf.add_abilities ("Attacks", op->attacktype); 1233 buf.add_abilities ("Attacks", op->attacktype);
1181 /* resistance on flesh is only visible for quetzals. If 1234 /* resistance on flesh is only visible for quetzals. If
1182 * non flesh, everyone can see its resistances 1235 * non flesh, everyone can see its resistances
1183 */ 1236 */
1184 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1237 if (op->type != FLESH || (owner && owner->is_dragon ()))
1185 buf << describe_resistance (op, 0); 1238 buf << describe_resistance (op, 0);
1186 1239
1187 buf.add_paths ("Attuned", op->path_attuned); 1240 buf.add_paths ("Attuned", op->path_attuned);
1188 buf.add_paths ("Repelled", op->path_repelled); 1241 buf.add_paths ("Repelled", op->path_repelled);
1189 buf.add_paths ("Denied", op->path_denied); 1242 buf.add_paths ("Denied", op->path_denied);
1196object::describe_item (object *who) 1249object::describe_item (object *who)
1197{ 1250{
1198 return std::string (::describe_item (this, who)); 1251 return std::string (::describe_item (this, who));
1199} 1252}
1200 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 ());
1422}
1423
1201void 1424void
1202examine (object *op, object *tmp) 1425examine (object *op, object *tmp)
1203{ 1426{
1204 std::string info = tmp->describe (op); 1427 std::string info = tmp->describe (op);
1428
1205 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); 1429 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1206} 1430}
1207 1431
1208/* 1432/*
1209 * inventory prints object's inventory. If inv==NULL then print player's 1433 * inventory prints object's inventory. If inv==NULL then print player's
1214object::query_inventory (object *who, const char *indent) 1438object::query_inventory (object *who, const char *indent)
1215{ 1439{
1216 static dynbuf_text buf; buf.clear (); 1440 static dynbuf_text buf; buf.clear ();
1217 1441
1218 for (object *tmp = inv; tmp; tmp = tmp->below) 1442 for (object *tmp = inv; tmp; tmp = tmp->below)
1219 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1443 if (who && who->flag [FLAG_WIZ])
1220 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp)); 1444 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1221 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1445 else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED]))
1222 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp)); 1446 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1223 1447
1224 if (buf.size ()) 1448 if (buf.size ())
1225 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this)); 1449 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1226 else 1450 else
1227 buf.printf ("%s(empty)\n", indent); 1451 buf.printf ("%s(empty)\n", indent);
1228 1452
1229 return buf; 1453 return buf;
1230} 1454}
1239is_magical (const object *op) 1463is_magical (const object *op)
1240{ 1464{
1241 int i; 1465 int i;
1242 1466
1243 /* living creatures are considered non magical */ 1467 /* living creatures are considered non magical */
1244 if (QUERY_FLAG (op, FLAG_ALIVE)) 1468 if (op->flag [FLAG_ALIVE])
1245 return 0; 1469 return 0;
1246 1470
1247 /* 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 */
1248 if (op->title != NULL) 1472 if (op->title != NULL)
1249 return 1; 1473 return 1;
1255 (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))
1256 return 1; 1480 return 1;
1257 1481
1258 /* 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 */
1259 /* Presume any boots that hvae a move_type are special. */ 1483 /* Presume any boots that hvae a move_type are special. */
1260 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)))
1261 return 1; 1485 return 1;
1262 1486
1263 /* Take care of amulet/shield that reflects spells/missiles */ 1487 /* Take care of amulet/shield that reflects spells/missiles */
1264 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]))
1265 return 1; 1489 return 1;
1266 1490
1267 /* Take care of helmet of xrays */ 1491 /* Take care of helmet of xrays */
1268 if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) 1492 if (op->type == HELMET && op->flag [FLAG_XRAYS])
1269 return 1; 1493 return 1;
1270 1494
1271 /* Potions & rods are always magical. Wands/staves are also magical, 1495 /* Potions & rods are always magical. Wands/staves are also magical,
1272 * assuming they still have any charges left. 1496 * assuming they still have any charges left.
1273 */ 1497 */
1302 * be non magical. 1526 * be non magical.
1303 */ 1527 */
1304 return 0; 1528 return 0;
1305} 1529}
1306 1530
1307/* need_identify returns true if the item should be identified. This
1308 * function really should not exist - by default, any item not identified
1309 * should need it.
1310 */
1311
1312int
1313need_identify (const object *op)
1314{
1315 switch (op->type)
1316 {
1317 case RING:
1318 case WAND:
1319 case ROD:
1320 case HORN:
1321 case SCROLL:
1322 case SKILL:
1323 case SKILLSCROLL:
1324 case SPELLBOOK:
1325 case FOOD:
1326 case POTION:
1327 case BOW:
1328 case ARROW:
1329 case WEAPON:
1330 case ARMOUR:
1331 case SHIELD:
1332 case HELMET:
1333 case AMULET:
1334 case BOOTS:
1335 case GLOVES:
1336 case BRACERS:
1337 case GIRDLE:
1338 case CONTAINER:
1339 case DRINK:
1340 case FLESH:
1341 case INORGANIC:
1342 case CLOSE_CON:
1343 case CLOAK:
1344 case GEM:
1345 case POWER_CRYSTAL:
1346 case POISON:
1347 case BOOK:
1348 case SKILL_TOOL:
1349 return 1;
1350 }
1351
1352 /* Try to track down some stuff that may show up here. Thus, the
1353 * archetype file can be updated, and this function removed.
1354 */
1355#if 0
1356 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1357#endif
1358 return 0;
1359}
1360
1361/* 1531/*
1362 * Supposed to fix face-values as well here, but later. 1532 * Supposed to fix face-values as well here, but later.
1363 */ 1533 */
1364void 1534void
1365identify (object *op) 1535identify (object *op)
1366{ 1536{
1367 SET_FLAG (op, FLAG_IDENTIFIED); 1537 op->set_flag (FLAG_IDENTIFIED);
1368 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1538 op->clr_flag (FLAG_KNOWN_MAGICAL);
1369 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1539 op->clr_flag (FLAG_NO_SKILL_IDENT);
1370 1540
1371 /* 1541 /*
1372 * We want autojoining of equal objects: 1542 * We want autojoining of equal objects:
1373 */ 1543 */
1374 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 1544 if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])
1375 SET_FLAG (op, FLAG_KNOWN_CURSED); 1545 op->set_flag (FLAG_KNOWN_CURSED);
1376 1546
1377 if (op->type == POTION) 1547 if (op->type == POTION)
1378 { 1548 {
1379 if (op->inv && op->randomitems) 1549 if (op->inv && op->randomitems)
1380 op->title = op->inv->name; 1550 op->title = op->inv->name;
1386 } 1556 }
1387 1557
1388 /* If the object is on a map, make sure we update its face */ 1558 /* If the object is on a map, make sure we update its face */
1389 if (op->map) 1559 if (op->map)
1390 update_object (op, UP_OBJ_CHANGE); 1560 update_object (op, UP_OBJ_CHANGE);
1561
1391 else if (object *pl = op->visible_to ()) 1562 if (object *pl = op->visible_to ())
1392 /* A lot of the values can change from an update - might as well send 1563 /* A lot of the values can change from an update - might as well send
1393 * it all. 1564 * it all.
1394 */ 1565 */
1395 esrv_send_item (pl, op); 1566 esrv_send_item (pl, op);
1396} 1567}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines