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.53 by root, Sun Jan 11 06:08:40 2009 UTC vs.
Revision 1.100 by root, Sat Nov 17 23:40:00 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * 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/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24#include <global.h> 26#include <global.h>
25#include <living.h> 27#include <living.h>
46 * Note that using the term 'human' may not be very accurate, humanoid 48 * Note that using the term 'human' may not be very accurate, humanoid
47 * may be better. 49 * may be better.
48 * Basically, for the use/nonuse, the code does something like: 50 * 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 51 * "This item goes %s\n", with the use/nonuse values filling in the %s
50 */ 52 */
53// see include/object.h
51Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 54Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"}, 55# define def(name, use, nonuse) { # name, KW_body_ ## name, use, nonuse },
53 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"}, 56# include "slotinc.h"
54 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"}, 57# undef def
55 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
56 {KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
57 {KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
58 {KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
59 {KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
60 {KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
61 {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
62 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
63 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
64 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
65 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
66/*{"body_dragon_torso", "your body", "a dragon's body"} */
67};
68
69static char numbers[21][20] = {
70 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
71 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
72 "eighteen", "nineteen", "twenty"
73}; 58};
74 59
75static char numbers_10[10][20] = { 60static char numbers_10[10][20] = {
76 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 61 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
77 "eighty", "ninety" 62 "eighty", "ninety"
78}; 63};
79 64
80static char levelnumbers[21][20] = { 65static char ordnumbers[21][20] = {
81 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", 66 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
82 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", 67 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
83 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", 68 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
84 "nineteen", "twentieth" 69 "nineteenth", "twentieth"
85}; 70};
86 71
87static char levelnumbers_10[11][20] = { 72static char ordnumbers_10[11][20] = {
88 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", 73 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
89 "seventieth", "eightieth", "ninetieth" 74 "seventieth", "eightieth", "ninetieth"
90}; 75};
91 76
92/* The following is a large table of item types, the fields are: 77/* The following is a large table of item types, the fields are:
93 * item number, item name, item name (plural), and two numbers that are the skills 78 * item number, item name, item name (plural), and two numbers that are the skills
94 * used to identify them. Anytime a new item type is added or removed, this list 79 * used to identify them. Anytime a new item type is added or removed, this list
95 * should be altered to reflect that. The defines for the numerical values are in 80 * should be altered to reflect that. The defines for the numerical values are in
96 * define.h 81 * define.h
97 */ 82 */
98static const typedata item_types[] = { 83static const typedata item_types[] = {
99 {PLAYER, "player", "players", 0, 0}, 84 {PLAYER, "player", "players", 0, 0},
100 {ROD, "rod", "rods", SK_THAUMATURGY, 0}, 85 {ROD, "rod", "rods", SK_THAUMATURGY, 0},
101 {TREASURE, "treasure", "treasure", 0, 0}, 86 {TREASURE, "treasure", "treasure", 0, 0},
155 {EXIT, "exit", "exits", 0, 0}, 140 {EXIT, "exit", "exits", 0, 0},
156 {ENCOUNTER, "encounter", "encounters", 0, 0}, 141 {ENCOUNTER, "encounter", "encounters", 0, 0},
157 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, 142 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
158 {SHOP_MAT, "shop mat", "shop mats", 0, 0}, 143 {SHOP_MAT, "shop mat", "shop mats", 0, 0},
159 {RING, "ring", "rings", SK_JEWELER, 0}, 144 {RING, "ring", "rings", SK_JEWELER, 0},
160 {FLOOR, "floor", "floors", 0, 0}, 145// {FLOOR, "floor", "floors", 0, 0},
161 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 146 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
162 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 147 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
163 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 148 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
164 {LIGHTER, "lighter", "lighters", 0, 0}, 149 {LIGHTER, "lighter", "lighters", 0, 0},
165 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 150 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
166 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 151 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
152 {TORCH, "torch", "torches", 0, 0},
167 {LAMP, "lamp", "lamps", 0, 0}, 153 {LAMP, "lamp", "lamps", 0, 0},
168 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 154 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
169 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 155 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
170 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 156 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
171 {SPINNER, "spinner", "spinners", 0, 0}, 157 {SPINNER, "spinner", "spinners", 0, 0},
172 {GATE, "gate", "gates", 0, 0}, 158 {GATE, "gate", "gates", 0, 0},
173 {BUTTON, "button", "buttons", 0, 0}, 159 {BUTTON, "button", "buttons", 0, 0},
174 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 160 {T_HANDLE, "cf handle", "cf handles", 0, 0},
175 {HOLE, "hole", "holes", 0, 0}, 161 {HOLE, "hole", "holes", 0, 0},
176 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 162 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
177 {SIGN, "sign", "signs", 0, 0}, 163 {SIGN, "sign", "signs", 0, 0},
178 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 164 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
179 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 165 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
206 {BUILDER, "item builder", "item builders", 0, 0}, 192 {BUILDER, "item builder", "item builders", 0, 0},
207 {MATERIAL, "building material", "building materials", 0, 0}, 193 {MATERIAL, "building material", "building materials", 0, 0},
208 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 194 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
209}; 195};
210 196
211const int item_types_size = sizeof (item_types) / sizeof (*item_types); 197static 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 198
238/* This curve may be too steep. But the point is that there should 199/* 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 200 * 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 201 * wear whatever they want with no worries. Perhaps having the steep
241 * curve is good (maybe even steeper), but allowing players to 202 * curve is good (maybe even steeper), but allowing players to
243 * able to use 2-3 of the most powerful items. 204 * able to use 2-3 of the most powerful items.
244 * note that this table is only really used for program generated items - 205 * note that this table is only really used for program generated items -
245 * custom objects can use whatever they want. 206 * custom objects can use whatever they want.
246 */ 207 */
247static int enc_to_item_power[21] = { 208static int enc_to_item_power[21] = {
209 0,
248 0, 0, 1, 2, 3, 4, /* 5 */ 210 0, 1, 2, 3, 4, // 5
249 5, 7, 9, 11, 13, /* 10 */ 211 5, 7, 9, 11, 13, // 10
250 15, 18, 21, 24, 27, /* 15 */ 212 15, 18, 21, 24, 27, // 15
251 30, 35, 40, 45, 50 /* 20 */ 213 30, 35, 40, 45, 50 // 20
252}; 214};
253 215
254int 216int
255get_power_from_ench (int ench) 217get_power_from_ench (int ench)
256{ 218{
257 return enc_to_item_power [clamp (ench, 0, 20)]; 219 return enc_to_item_power [clamp (ench, 0, 20)];
220}
221
222static const struct need_identify_types : typeset
223{
224 need_identify_types ()
225 {
226 set (RING);
227 set (WAND);
228 set (ROD);
229 set (HORN);
230 set (SCROLL);
231 set (SKILL);
232 set (SKILLSCROLL);
233 set (SPELLBOOK);
234 set (FOOD);
235 set (POTION);
236 set (BOW);
237 set (ARROW);
238 set (WEAPON);
239 set (ARMOUR);
240 set (SHIELD);
241 set (HELMET);
242 set (AMULET);
243 set (BOOTS);
244 set (GLOVES);
245 set (BRACERS);
246 set (GIRDLE);
247 set (CONTAINER);
248 set (DRINK);
249 set (FLESH);
250 set (INORGANIC);
251 set (CLOSE_CON);
252 set (CLOAK);
253 set (GEM);
254 set (POWER_CRYSTAL);
255 set (POISON);
256 set (BOOK);
257 set (SKILL_TOOL);
258 }
259} need_identify_types;
260
261bool
262object::need_identify () const
263{
264 return need_identify_types [type];
258} 265}
259 266
260/* This takes an object 'op' and figures out what its item_power 267/* This takes an object 'op' and figures out what its item_power
261 * rating should be. This should only really be used by the treasure 268 * rating should be. This should only really be used by the treasure
262 * generation code, and when loading legacy objects. It returns 269 * generation code, and when loading legacy objects. It returns
274 enc += op->stats.stat (i); 281 enc += op->stats.stat (i);
275 282
276 /* This protection logic is pretty flawed. 20% fire resistance 283 /* This protection logic is pretty flawed. 20% fire resistance
277 * is much more valuable than 20% confusion, or 20% slow, or 284 * is much more valuable than 20% confusion, or 20% slow, or
278 * several others. Start at 1 - ignore physical - all that normal 285 * several others. Start at 1 - ignore physical - all that normal
279 * armour shouldn't be counted against 286 * armour shouldn't be counted against
280 */ 287 */
281 tmp = 0; 288 tmp = 0;
282 for (i = 1; i < NROFATTACKS; i++) 289 for (i = 1; i < NROFATTACKS; i++)
283 tmp += op->resist[i]; 290 tmp += op->resist[i];
284 291
318 325
319 enc += op->stats.luck; 326 enc += op->stats.luck;
320 327
321 /* Do spell paths now */ 328 /* Do spell paths now */
322 for (i = 1; i < NRSPELLPATHS; i++) 329 for (i = 1; i < NRSPELLPATHS; i++)
323 {
324 if (op->path_attuned & (1 << i)) 330 if (op->path_attuned & (1 << i))
325 enc++; 331 enc++;
326 else if (op->path_denied & (1 << i)) 332 else if (op->path_denied & (1 << i))
327 enc -= 2; 333 enc -= 2;
328 else if (op->path_repelled & (1 << i)) 334 else if (op->path_repelled & (1 << i))
329 enc--; 335 enc--;
330 }
331 336
332 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 337 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
333 enc += 5; 338 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
334 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 339 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
335 enc += 3; 340 if (op->flag [FLAG_XRAYS ]) enc += 2;
336 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 341 if (op->flag [FLAG_STEALTH ]) enc += 1;
337 enc += 2; 342 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
338 if (QUERY_FLAG (op, FLAG_STEALTH)) 343 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
339 enc += 1;
340 if (QUERY_FLAG (op, FLAG_XRAYS))
341 enc += 2;
342 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
343 enc += 1;
344 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
345 enc += 1;
346 344
347 return get_power_from_ench (enc); 345 return get_power_from_ench (enc);
348} 346}
349 347
348static const struct get_typedata
349{
350 const typedata *data [NUM_TYPES];
351
352 get_typedata ()
353 {
354 for (int i = 0; i < item_types_size; i++)
355 data [item_types[i].number] = &item_types [i];
356 }
357
358 const typedata *operator ()(int itemtype) const
359 {
360 return data [itemtype];
361 }
362} get_typedata_;
363
350/* returns the typedata that has a number equal to itemtype, if there 364/* returns the typedata that has a number equal to itemtype, if there
351 * isn't one, returns NULL */ 365 * isn't one, returns NULL */
352const typedata * 366const typedata *
353get_typedata (int itemtype) 367get_typedata (int itemtype)
354{ 368{
355 int i; 369 return get_typedata_ (itemtype);
356
357 for (i = 0; i < item_types_size; i++)
358 if (item_types[i].number == itemtype)
359 return &item_types[i];
360
361 return NULL;
362} 370}
363 371
364/* returns the typedata that has a name equal to itemtype, if there 372/* returns the typedata that has a name equal to itemtype, if there
365 * isn't one, return the plural name that matches, if there still isn't 373 * isn't one, return the plural name that matches, if there still isn't
366 * one return NULL */ 374 * one return NULL */
367const typedata * 375const typedata *
368get_typedata_by_name (const char *name) 376get_typedata_by_name (const char *name)
369{ 377{
370 int i;
371
372 for (i = 0; i < item_types_size; i++) 378 for (int i = 0; i < item_types_size; i++)
373 if (!strcmp (item_types[i].name, name)) 379 if (!strcmp (item_types[i].name, name))
374 return &item_types[i]; 380 return &item_types[i];
375 381
376 for (i = 0; i < item_types_size; i++) 382 for (int i = 0; i < item_types_size; i++)
377 if (!strcmp (item_types[i].name_pl, name)) 383 if (!strcmp (item_types[i].name_pl, name))
378 { 384 {
379 LOG (llevInfo, 385 LOG (llevInfo,
380 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name); 386 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
381 return &item_types[i]; 387 return &item_types[i];
382 } 388 }
383 389
384 return NULL; 390 return 0;
385} 391}
386 392
387/* describe_resistance generates the visible naming for resistances. 393/* describe_resistance generates the visible naming for resistances.
388 * returns a static array of the description. This can return 394 * returns a static array of the description. This can return
389 * a big buffer. 395 * a big buffer.
391 * but do put a newline at the end. Useful when dumping to files 397 * but do put a newline at the end. Useful when dumping to files
392 */ 398 */
393const char * 399const char *
394describe_resistance (const object *op, int newline) 400describe_resistance (const object *op, int newline)
395{ 401{
396 static char buf[VERY_BIG_BUF]; 402 static dynbuf_text buf; buf.clear ();
397 char buf1[VERY_BIG_BUF];
398 int tmpvar;
399 403
400 buf[0] = 0; 404 for (int i = 0; i < NROFATTACKS; i++)
401 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
402 {
403 if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1)) 405 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
404 { 406 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
405 if (!newline)
406 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
407 else
408 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
409 407
410 strcat (buf, buf1);
411 }
412 }
413 return buf; 408 return buf;
414} 409}
415
416 410
417/* 411/*
418 * query_weight(object) returns a character pointer to a static buffer 412 * query_weight(object) returns a character pointer to a static buffer
419 * containing the text-representation of the weight of the given object. 413 * containing the text-representation of the weight of the given object.
420 * The buffer will be overwritten by the next call to query_weight(). 414 * The buffer will be overwritten by the next call to query_weight().
415 *
416 * Seems to be used only by unimportant stuff. Remove?
421 */ 417 */
422const char * 418const char *
423query_weight (const object *op) 419query_weight (const object *op)
424{ 420{
425 static char buf[10]; 421 static char buf[10];
439/* 435/*
440 * Returns the pointer to a static buffer containing 436 * Returns the pointer to a static buffer containing
441 * the number requested (of the form first, second, third...) 437 * the number requested (of the form first, second, third...)
442 */ 438 */
443const char * 439const char *
444get_levelnumber (int i) 440ordinal (int i)
445{ 441{
446 static char buf[MAX_BUF]; 442 if (i < 0)
447 443 return format ("minus %s", ordinal (-i));
448 if (i > 99)
449 {
450 sprintf (buf, "%d.", i);
451 return buf;
452 }
453 444
454 if (i < 21) 445 if (i < 21)
455 return levelnumbers[i];
456 if (!(i % 10))
457 return levelnumbers_10[i / 10];
458
459 strcpy (buf, numbers_10[i / 10]);
460 strcat (buf, levelnumbers[i % 10]);
461 return buf;
462}
463
464/*
465 * get_number(integer) returns the text-representation of the given number
466 * in a static buffer. The buffer might be overwritten at the next
467 * call to get_number().
468 * It is currently only used by the query_name() function.
469 */
470const char *
471get_number (int i)
472{
473 if (i <= 20)
474 return numbers[i]; 446 return ordnumbers[i];
447
448 int digit = i % 10;
449
450 if (i >= 100)
451 return format (
452 digit == 1 ? "%dst"
453 : digit == 2 ? "%dnd"
454 : digit == 3 ? "%drd"
455 : "%dth",
456 i
457 );
458
459 if (digit == 0)
460 return ordnumbers_10[i / 10];
475 else 461 else
476 { 462 return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
477 static char buf[MAX_BUF];
478
479 sprintf (buf, "%d", i);
480 return buf;
481 }
482} 463}
483 464
484/* 465/*
485 * Returns pointer to static buffer containing ring's or amulet's 466 * Returns pointer to static buffer containing ring's or amulet's
486 * abilities 467 * abilities
492 */ 473 */
493 474
494/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 475/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
495 * from stats.sp - b.t. 476 * from stats.sp - b.t.
496 */ 477 */
497const char * 478static const char *
498ring_desc (const object *op) 479ring_desc (const object *op)
499{ 480{
500 static dynbuf_text buf; buf.clear (); 481 static dynbuf_text buf; buf.clear ();
501 int attr, val, len; 482 int attr, val;
502 483
503 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 484 if (op->flag [FLAG_IDENTIFIED])
504 { 485 {
505 for (attr = 0; attr < NUM_STATS; attr++) 486 for (attr = 0; attr < NUM_STATS; attr++)
506 if ((val = op->stats.stat (attr))) 487 if ((val = op->stats.stat (attr)))
507 buf.printf ("(%s%+d)", short_stat_name[attr], val); 488 buf.printf ("(%s%+d)", short_stat_name[attr], val);
508 489
509 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp); 490 if (op->stats.exp) buf.printf ("(speed %+d)", (int)op->stats.exp);
510 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc); 491 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
511 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam); 492 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
512 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac); 493 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
513 494
514 buf << describe_resistance (op, 0); 495 buf << describe_resistance (op, 0);
517 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace); 498 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
518 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp); 499 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
519 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp); 500 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
520 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck); 501 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
521 502
522 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 503 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
523 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 504 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
524 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 505 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
525 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 506 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
526 507
527 buf.add_paths ("Attuned" , op->path_attuned); 508 buf.add_paths ("Attuned" , op->path_attuned);
528 buf.add_paths ("Repelled", op->path_repelled); 509 buf.add_paths ("Repelled", op->path_repelled);
529 buf.add_paths ("Denied" , op->path_denied); 510 buf.add_paths ("Denied" , op->path_denied);
530 511
534 515
535 return buf; 516 return buf;
536} 517}
537 518
538/* 519/*
539 * query_short_name(object) is similar to query_name, but doesn't 520 * query_short_name(object) is similar to query_name, but doesn't
540 * contain any information about object status (worn/cursed/etc.) 521 * contain any information about object status (worn/cursed/etc.)
522 *
523 * It is sometimes used when printing messages, so should fit well into a sentence.
541 */ 524 */
542const char * 525const char *
543query_short_name (const object *op) 526query_short_name (const object *op)
544{ 527{
545 if (!op->name) 528 if (!op->name)
554 537
555 static dynbuf_text buf; buf.clear (); 538 static dynbuf_text buf; buf.clear ();
556 539
557 buf << (op->nrof <= 1 ? op->name : op->name_pl); 540 buf << (op->nrof <= 1 ? op->name : op->name_pl);
558 541
559 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 542 if (op->title && op->flag [FLAG_IDENTIFIED])
560 buf << ' ' << op->title; 543 buf << ' ' << op->title;
561 544
562 switch (op->type) 545 switch (op->type)
563 { 546 {
564 case SPELLBOOK: 547 case SPELLBOOK:
565 case SCROLL: 548 case SCROLL:
566 case WAND: 549 case WAND:
567 case ROD: 550 case ROD:
568 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 551 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
569 { 552 {
570 if (!op->title) 553 if (!op->title)
571 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 554 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
572 555
573 if (op->type != SPELLBOOK) 556 if (op->type != SPELLBOOK)
612 buf << " " << s; 595 buf << " " << s;
613 } 596 }
614 break; 597 break;
615 598
616 default: 599 default:
617 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 600 if (op->magic
601 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
602 || op->flag [FLAG_IDENTIFIED]))
618 buf.printf (" %+d", op->magic); 603 buf.printf (" %+d", op->magic);
619 } 604 }
620 605
621 return buf; 606 return buf;
622} 607}
629 * you can make several calls to query_name before the bufs start getting 614 * you can make several calls to query_name before the bufs start getting
630 * overwritten. This may be a bad thing (it may be easier to assume the value 615 * overwritten. This may be a bad thing (it may be easier to assume the value
631 * returned is good forever.) However, it makes printing statements that 616 * returned is good forever.) However, it makes printing statements that
632 * use several names much easier (don't need to store them to temp variables.) 617 * use several names much easier (don't need to store them to temp variables.)
633 * 618 *
619 * It is used extensively within messages, so should return only a prose
620 * and short description of the item.
621 * It is also used by examine/ex and similar functions.
634 */ 622 */
635const char * 623const char *
636query_name (const object *op) 624query_name (const object *op)
637{ 625{
638 int len = 0;
639 static dynbuf_text bufs[5]; 626 static dynbuf_text bufs[5];
640 static int use_buf = 0; 627 static int use_buf = 0;
641 628
642 use_buf++; 629 use_buf++;
643 use_buf %= 5; 630 use_buf %= 5;
644 631
645 dynbuf_text &buf = bufs [use_buf]; 632 dynbuf_text &buf = bufs [use_buf];
646 buf.clear (); 633 buf.clear ();
647 634
635#if 0
648 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 636 if ((op->is_armor () || op->is_weapon ()) && op->material)
649 if (materialtype_t *mt = name_to_material (op->materialname))
650 buf << mt->description << ' '; 637 buf << op->material->description << ' ';
638#endif
651 639
652 buf << query_short_name (op); 640 buf << query_short_name (op);
653 641
654 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 642 if (op->flag [FLAG_INV_LOCKED])
655 buf << " *"; 643 buf << " *";
656 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 644 if (op->is_open_container ())
657 buf << " (open)"; 645 buf << " (open)";
658 646
659 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 647 if (op->flag [FLAG_KNOWN_CURSED])
660 { 648 {
661 if (QUERY_FLAG (op, FLAG_DAMNED)) 649 if (op->flag [FLAG_DAMNED])
662 buf << " (damned)"; 650 buf << " (damned)";
663 else if (QUERY_FLAG (op, FLAG_CURSED)) 651 else if (op->flag [FLAG_CURSED])
664 buf << " (cursed)"; 652 buf << " (cursed)";
665 } 653 }
666 654
667 /* Basically, if the object is known magical (detect magic spell on it), 655 /* Basically, if the object is known magical (detect magic spell on it),
668 * and it isn't identified, print out the fact that 656 * and it isn't identified, print out the fact that
671 * 659 *
672 * Changed in V 0.91.4 - still print that the object is magical even 660 * Changed in V 0.91.4 - still print that the object is magical even
673 * if it has been applied. Equipping an item does not tell full 661 * if it has been applied. Equipping an item does not tell full
674 * abilities, especially for artifact items. 662 * abilities, especially for artifact items.
675 */ 663 */
676 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 664 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
677 buf << " (magic)"; 665 buf << " (magic)";
678 666
679#if 0 667#if 0
680 /* item_power will be returned in desribe_item - it shouldn't really 668 /* item_power will be returned in describe_item - it shouldn't really
681 * be returned in the name. 669 * be returned in the name.
682 */ 670 */
683 if (op->item_power) 671 if (op->item_power)
684 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); 672 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
685 673
686#endif 674#endif
687 675
688 if (QUERY_FLAG (op, FLAG_APPLIED)) 676 if (op->flag [FLAG_APPLIED])
689 { 677 {
690 switch (op->type) 678 switch (op->type)
691 { 679 {
680 case RANGED:
692 case BOW: 681 case BOW:
693 case WAND: 682 case WAND:
694 case ROD: 683 case ROD:
695 case HORN: 684 case HORN:
696 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
697 break;
698 case WEAPON: 685 case WEAPON:
699 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)"); 686 buf << " (applied)";
700 break; 687 break;
701 case ARMOUR: 688 case ARMOUR:
702 case HELMET: 689 case HELMET:
703 case SHIELD: 690 case SHIELD:
704 case RING: 691 case RING:
717 default: 704 default:
718 buf << " (applied)"; 705 buf << " (applied)";
719 } 706 }
720 } 707 }
721 708
722 if (QUERY_FLAG (op, FLAG_UNPAID)) 709 switch (op->type)
710 {
711 case LAMP:
712 if (op->glow_radius)
713 buf << " (on)";
714 else if (op->stats.food <= 0)
715 buf << " (empty)";
716 else
717 buf << " (off)";
718 break;
719
720 case TORCH:
721 if (op->glow_radius)
722 buf << " (burning)";
723 else if (op->stats.food <= 0)
724 buf << " (burned out)";
725 break;
726 }
727
728 if (op->flag [FLAG_UNPAID])
723 buf << " (unpaid)"; 729 buf << " (unpaid)";
724 730
725 return buf; 731 return buf;
726} 732}
727 733
731 * of the given object. The buffer will be overwritten at the next 737 * of the given object. The buffer will be overwritten at the next
732 * call to query_base_name(). This is a lot like query_name, but we 738 * call to query_base_name(). This is a lot like query_name, but we
733 * don't include the item count or item status. Used for inventory sorting 739 * don't include the item count or item status. Used for inventory sorting
734 * and sending to client. 740 * and sending to client.
735 * If plural is set, we generate the plural name of this. 741 * If plural is set, we generate the plural name of this.
742 *
743 * It is sometimes used to display messages, and usually only used to match stuff,
744 * so maybe this function should be removed.
745 * It is also used for client-side inventory/item descriptions.
736 */ 746 */
737const char * 747const char *
738query_base_name (const object *op, int plural) 748query_base_name (const object *op, int plural)
739{ 749{
740 if ((!plural && !op->name) || (plural && !op->name_pl)) 750 if ((!plural && !op->name) || (plural && !op->name_pl))
741 return "(null)"; 751 return "(null)";
742 752
743 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 753 if (!op->nrof && !op->weight && !op->title && !is_magical (op)
754 && op->type != EXIT)
744 return op->name; /* To speed things up (or make things slower?) */ 755 return op->name; /* To speed things up (or make things slower?) */
745 756
746 static dynbuf_text buf; buf.clear (); 757 static dynbuf_text buf; buf.clear ();
747 758
759#if 0
748 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 760 if ((op->is_armor () || op->is_weapon ()) && op->material)
749 if (materialtype_t *mt = name_to_material (op->materialname))
750 if (op->arch->materialname != mt->name) 761 if (op->arch->material != op->material)
751 buf << mt->description << ' '; 762 buf << op->material->description << ' ';
763#endif
752 764
753 buf << (plural ? op->name_pl : op->name); 765 buf << (plural ? op->name_pl : op->name);
754 766
755 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 767 if (op->title && op->flag [FLAG_IDENTIFIED])
756 buf << ' ' << op->title; 768 buf << ' ' << op->title;
757 769
758 switch (op->type) 770 switch (op->type)
759 { 771 {
760 case SPELLBOOK: 772 case SPELLBOOK:
761 case SCROLL: 773 case SCROLL:
762 case WAND: 774 case WAND:
763 case ROD: 775 case ROD:
764 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 776 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
765 { 777 {
766 if (!op->title) 778 if (!op->title)
767 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 779 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
768 780
769 if (op->type != SPELLBOOK) 781 if (op->type != SPELLBOOK)
783 if (s && *s) 795 if (s && *s)
784 buf << ' ' << s; 796 buf << ' ' << s;
785 } 797 }
786 break; 798 break;
787 799
800 case EXIT:
801 // random map exits "unfortunately" get patched, so this only works before entering
802 if (EXIT_PATH (op) == shstr_random_map_exit)
803 buf << " (random map)";
804 else if (!EXIT_PATH (op))
805 buf << " (closed)";
806 break;
807
788 default: 808 default:
789 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 809 if (op->magic
810 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
811 || op->flag [FLAG_IDENTIFIED]))
790 buf.printf (" %+d", op->magic); 812 buf.printf (" %+d", op->magic);
791 } 813 }
792 814
793 return buf; 815 return buf;
794} 816}
807 /* Note that the resolution this provides for players really isn't 829 /* Note that the resolution this provides for players really isn't
808 * very good. Any player with a speed greater than .67 will 830 * very good. Any player with a speed greater than .67 will
809 * fall into the 'lightning fast movement' category. 831 * fall into the 'lightning fast movement' category.
810 */ 832 */
811 if (op->has_active_speed ()) 833 if (op->has_active_speed ())
812 switch ((int) ((FABS (op->speed)) * 15)) 834 switch ((int)(op->speed * 15.))
813 { 835 {
814 case 0: 836 case 0:
815 buf << "(very slow movement)"; 837 buf << "(very slow movement)";
816 break; 838 break;
817 case 1: 839 case 1:
837 default: 859 default:
838 buf << "(lightning fast movement)"; 860 buf << "(lightning fast movement)";
839 break; 861 break;
840 } 862 }
841 863
842 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)"; 864 if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
843 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)"; 865 if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
844 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)"; 866 if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
845 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)"; 867 if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
846 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)"; 868 if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
847 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)"; 869 if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
848 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)"; 870 if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
849 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)"; 871 if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
850 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)"; 872 if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
851 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)"; 873 if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
852 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)"; 874 if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
853 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)"; 875 if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
854 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)"; 876 if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
855 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)"; 877 if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
856 878
857 if (op->randomitems) 879 if (op->randomitems)
858 { 880 {
859 bool first = 1; 881 bool first = 1;
860 882
887 if (op->stats.luck) 909 if (op->stats.luck)
888 buf.printf ("(luck%+d)", op->stats.luck); 910 buf.printf ("(luck%+d)", op->stats.luck);
889 } 911 }
890 912
891 /* describe attacktypes */ 913 /* describe attacktypes */
892 if (is_dragon_pl (op)) 914 if (op->is_dragon ())
893 { 915 {
894 /* for dragon players display the attacktypes from clawing skill 916 /* for dragon players display the attacktypes from clawing skill
895 * Break apart the for loop - move the comparison checking down - 917 * Break apart the for loop - move the comparison checking down -
896 * this makes it more readable. 918 * this makes it more readable.
897 */ 919 */
935 * wouldn't need to use the SEE_INVISIBLE flag to know it is 957 * wouldn't need to use the SEE_INVISIBLE flag to know it is
936 * a dragon player examining food. Could have things like 958 * a dragon player examining food. Could have things like
937 * a dwarven axe, in which the full abilities are only known to 959 * a dwarven axe, in which the full abilities are only known to
938 * dwarves, etc. 960 * dwarves, etc.
939 * 961 *
940 * This function is really much more complicated than it should
941 * be, because different objects have different meanings
942 * for the same field (eg, wands use 'food' for charges). This
943 * means these special cases need to be worked out.
944 *
945 * Add 'owner' who is the person examining this object. 962 * Add 'owner' who is the person examining this object.
946 * owner can be null if no one is being associated with this 963 * owner can be null if no one is being associated with this
947 * item (eg, debug dump or the like) 964 * item (eg, debug dump or the like)
948 */ 965 */
949const char * 966const char *
950describe_item (const object *op, object *owner) 967describe_item (const object *op, object *owner)
951{ 968{
952 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) 969 if (op->flag [FLAG_MONSTER] || op->type == PLAYER)
953 return describe_monster (op); 970 return describe_monster (op);
954 971
955 static dynbuf_text buf; buf.clear (); 972 static dynbuf_text buf; buf.clear ();
956 int identified, i; 973 int identified, i;
957 974
958 /* figure this out once, instead of making multiple calls to need_identify. 975 /* figure this out once, instead of making multiple calls to need_identify.
959 * also makes the code easier to read. 976 * also makes the code easier to read.
960 */ 977 */
961 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED); 978 identified = !op->need_identify () || op->flag [FLAG_IDENTIFIED];
962 if (!identified) 979 if (!identified)
963 buf << "(unidentified)"; 980 buf << "(unidentified)";
964 981
965 switch (op->type) 982 switch (op->type)
966 { 983 {
984 case RANGED:
967 case BOW: 985 case BOW:
968 case ARROW: 986 case ARROW:
969 case WAND: 987 case WAND:
970 case ROD: 988 case ROD:
971 case HORN: 989 case HORN:
985 if (op->stats.maxsp > 1000) 1003 if (op->stats.maxsp > 1000)
986 { /*higher capacity crystals */ 1004 { /*higher capacity crystals */
987 i = (op->stats.maxsp % 1000) / 100; 1005 i = (op->stats.maxsp % 1000) / 100;
988 1006
989 if (i) 1007 if (i)
990 buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i); 1008 buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i);
991 else 1009 else
992 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000); 1010 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
993 } 1011 }
994 else 1012 else
995 buf.printf ("(capacity %d). It is ", op->stats.maxsp); 1013 buf.printf ("(capacity %d; it is ", op->stats.maxsp);
996 1014
997 i = (op->stats.sp * 10) / op->stats.maxsp; 1015 i = op->stats.sp * 10 / max (op->stats.maxsp, 1);
998 if (op->stats.sp == 0) 1016
1017 if (op->stats.sp == 0) buf << "empty";
1018 else if (i <= 0) buf << "almost empty";
1019 else if (i <= 2) buf << "partially filled";
1020 else if (i <= 5) buf << "half full";
1021 else if (i <= 8) buf << "well charged";
1022 else if (op->stats.sp < op->stats.maxsp) buf << "almost full";
1023 else buf << "fully charged";
1024
1025 buf << ')';
1026 break;
1027
1028 case LAMP:
1029 {
1030 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
1031 buf << "(fuel: ";
1032 if (percent == 0)
999 buf << "empty."; 1033 buf << "empty";
1000 else if (i == 0) 1034 else if (percent < 10)
1035 buf << "very low";
1036 else if (percent < 25)
1037 buf << "low";
1038 else if (percent < 50)
1001 buf << "almost empty."; 1039 buf << "half empty";
1002 else if (i < 3) 1040 else if (percent < 75)
1003 buf << "partially filled.";
1004 else if (i < 6)
1005 buf << "half full."; 1041 buf << "half full";
1006 else if (i < 9) 1042 else if (percent < 95)
1007 buf << "well charged."; 1043 buf << "well filled";
1008 else if (op->stats.sp == op->stats.maxsp) 1044 else if (percent <= 100)
1009 buf << "fully charged.";
1010 else
1011 buf << "almost full."; 1045 buf << "full";
1046 buf << ")";
1047 }
1012 break; 1048 break;
1013 1049
1014 case FOOD: 1050 case FOOD:
1015 case FLESH: 1051 case FLESH:
1016 case DRINK: 1052 case DRINK:
1017 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1053 if (identified || op->flag [FLAG_BEEN_APPLIED])
1018 { 1054 {
1019 buf.printf ("(food+%d)", op->stats.food); 1055 buf.printf ("(food+%d)", op->stats.food);
1020 1056
1021 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 1057 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1022 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]); 1058 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1023 1059
1024 if (!QUERY_FLAG (op, FLAG_CURSED)) 1060 if (!op->flag [FLAG_CURSED])
1025 { 1061 {
1026 if (op->stats.hp) buf << "(heals)"; 1062 if (op->stats.hp) buf << "(heals)";
1027 if (op->stats.sp) buf << "(spellpoint regen)"; 1063 if (op->stats.sp) buf << "(spellpoint regen)";
1028 } 1064 }
1029 else 1065 else
1050 } 1086 }
1051 1087
1052 /* Down here, we more further describe equipment type items. 1088 /* Down here, we more further describe equipment type items.
1053 * only describe them if they have been identified or the like. 1089 * only describe them if they have been identified or the like.
1054 */ 1090 */
1055 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1091 if (identified || op->flag [FLAG_BEEN_APPLIED])
1056 { 1092 {
1057 int attr, val;
1058
1059 for (attr = 0; attr < NUM_STATS; attr++) 1093 for (int attr = 0; attr < NUM_STATS; attr++)
1060 if ((val = op->stats.stat (attr))) 1094 if (int val = op->stats.stat (attr))
1061 buf.printf ("(%s%+d)", short_stat_name[attr], val); 1095 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1062 1096
1063 if (op->stats.exp) 1097 if (op->stats.exp)
1064 buf.printf ("(speed %+lld)", (long long) op->stats.exp); 1098 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1065 1099
1066 switch (op->type) 1100 switch (op->type)
1067 { 1101 {
1102 case RANGED:
1068 case BOW: 1103 case BOW:
1069 case ARROW: 1104 case ARROW:
1070 case GIRDLE: 1105 case GIRDLE:
1071 case HELMET: 1106 case HELMET:
1072 case SHIELD: 1107 case SHIELD:
1091 1126
1092 default: 1127 default:
1093 break; 1128 break;
1094 } 1129 }
1095 1130
1096 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)"; 1131 if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1097 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)"; 1132 if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1098 1133
1099 /* levitate was what is was before, so we'll keep it */ 1134 /* levitate was what is was before, so we'll keep it */
1100 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)"; 1135 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1101 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)"; 1136 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1102 if (op->move_type & MOVE_SWIM) buf << "(swim)"; 1137 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1115 { 1150 {
1116 int more_info = 0; 1151 int more_info = 0;
1117 1152
1118 switch (op->type) 1153 switch (op->type)
1119 { 1154 {
1155 case RANGED:
1120 case ROD: /* These use stats.sp for spell selection and stats.food */ 1156 case ROD: /* These use stats.sp for spell selection and stats.food */
1121 case HORN: /* and stats.hp for spell-point regeneration... */ 1157 case HORN: /* and stats.hp for spell-point regeneration... */
1122 case BOW: 1158 case BOW:
1123 case ARROW: 1159 case ARROW:
1124 case WAND: 1160 case WAND:
1157 1193
1158 if (more_info) 1194 if (more_info)
1159 { 1195 {
1160 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food); 1196 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
1161 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace); 1197 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1162 if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp); 1198 if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp);
1163 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp); 1199 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1164 } 1200 }
1165 1201
1166 if (op->stats.luck) 1202 if (op->stats.luck)
1167 buf.printf ("(luck%+d)", op->stats.luck); 1203 buf.printf ("(luck%+d)", op->stats.luck);
1168 1204
1169 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 1205 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1170 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 1206 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1171 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 1207 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1172 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1208 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1173 1209
1174 if (op->slaying && op->type != FOOD) 1210 if (op->slaying && op->type != FOOD)
1175 buf.printf ("(slay %s)", &op->slaying); 1211 buf.printf ("(slay %s)", &op->slaying);
1212
1213 if (op->type == SKILL_TOOL && op->skill)
1214 buf.printf ("(%s)", &op->skill);
1176 1215
1177 buf.add_abilities ("Attacks", op->attacktype); 1216 buf.add_abilities ("Attacks", op->attacktype);
1178 /* resistance on flesh is only visible for quetzals. If 1217 /* resistance on flesh is only visible for quetzals. If
1179 * non flesh, everyone can see its resistances 1218 * non flesh, everyone can see its resistances
1180 */ 1219 */
1181 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1220 if (op->type != FLESH || (owner && owner->is_dragon ()))
1182 buf << describe_resistance (op, 0); 1221 buf << describe_resistance (op, 0);
1183 1222
1184 buf.add_paths ("Attuned", op->path_attuned); 1223 buf.add_paths ("Attuned", op->path_attuned);
1185 buf.add_paths ("Repelled", op->path_repelled); 1224 buf.add_paths ("Repelled", op->path_repelled);
1186 buf.add_paths ("Denied", op->path_denied); 1225 buf.add_paths ("Denied", op->path_denied);
1193object::describe_item (object *who) 1232object::describe_item (object *who)
1194{ 1233{
1195 return std::string (::describe_item (this, who)); 1234 return std::string (::describe_item (this, who));
1196} 1235}
1197 1236
1237static void
1238describe_dump_object (dynbuf &buf, object *ob)
1239{
1240 char *txt = dump_object (ob);
1241 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1242 buf << "\n" << txt << "\n";
1243
1244 if (!ob->is_arch ())
1245 describe_dump_object (buf, ob->arch);
1246}
1247
1248std::string
1249object::describe (object *who)
1250{
1251 dynbuf_text buf (1024, 1024);
1252
1253 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1254
1255 if (custom_name)
1256 buf.printf ("You call it %s.\r", &custom_name);
1257
1258 switch (type)
1259 {
1260 case SPELLBOOK:
1261 if (flag [FLAG_IDENTIFIED] && inv)
1262 buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill);
1263 break;
1264
1265 case BOOK:
1266 if (msg)
1267 buf << "Something is written in it.\r";
1268 break;
1269
1270 case CONTAINER:
1271 if (race)
1272 {
1273 if (weight_limit && stats.Str < 100)
1274 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1275 &race, weight_limit / (10.0 * (100 - stats.Str)));
1276 else
1277 buf.printf ("It can hold only %s.\r", &race);
1278 }
1279 else if (weight_limit && stats.Str < 100)
1280 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1281 break;
1282
1283 case WAND:
1284 if (flag [FLAG_IDENTIFIED])
1285 buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
1286 break;
1287 }
1288
1289 if (material != MATERIAL_NULL && !msg)
1290 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1291 << material->description
1292 << ".\r";
1293
1294 if (who)
1295 /* Where to wear this item */
1296 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1297 if (slot[i].info)
1298 {
1299 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1300
1301 if (slot[i].info < -1 && who->slot[i].info)
1302 buf.printf ("(%d)", -slot[i].info);
1303
1304 buf << ".\r";
1305 }
1306
1307 if (weight)
1308 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1309
1310 if (flag [FLAG_STARTEQUIP])
1311 buf << (nrof > 1 ? "They were" : "It was")
1312 << " given by a god and will vanish when dropped.\r";
1313
1314 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1315 {
1316 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1317
1318 if (who->is_in_shop ())
1319 {
1320 if (flag [FLAG_UNPAID])
1321 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1322 else
1323 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1324 }
1325 }
1326
1327 if (flag [FLAG_MONSTER])
1328 buf << describe_monster (who);
1329
1330 /* Is this item buildable? */
1331 if (flag [FLAG_IS_BUILDABLE])
1332 buf << "This is a buildable item.\r";
1333
1334 /* Does the object have a message? Don't show message for all object
1335 * types - especially if the first entry is a match
1336 */
1337 if (msg)
1338 {
1339 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1340 {
1341 if (!need_identify ())
1342 buf << '\r' << msg << '\n';
1343 else if (flag [FLAG_IDENTIFIED])
1344 buf << '\r' << "The object has a story:\r" << msg;
1345 }
1346 }
1347 else if (inv
1348 && inv->msg
1349 && inv->type == SPELL
1350 && flag [FLAG_IDENTIFIED]
1351 && (type == SPELLBOOK || type == ROD || type == WAND
1352 || type == POTION || type == SCROLL))
1353 // for spellbooks and other stuff that contains spells, print the spell message,
1354 // unless the object has a custom message handled above.
1355 buf << '\r' << inv->msg << '\n';
1356
1357 // try to display the duration for some potions and scrolls
1358 // this includes change ability potions and group spells,
1359 // but does not handle protection potions
1360 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1361 && (type == POTION || type == SCROLL))
1362 {
1363 object *spell = inv;
1364
1365 if (spell->subtype == SP_PARTY_SPELL)
1366 spell = spell->other_arch;
1367
1368 if (spell->subtype == SP_CHANGE_ABILITY)
1369 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1370 TICK2TIME (change_ability_duration (spell, this)));
1371 }
1372
1373 // some help text for skill tools
1374 if (type == SKILL_TOOL)
1375 buf << "\nH<This item is a skill tool: as long as you have this item applied "
1376 "you can use the " << &skill << " skill as if you had learned it.>";
1377
1378 // Display a hint about inscribable items [empty books]
1379 // This includes the amount of text they can hold.
1380 if (type == INSCRIBABLE)
1381 {
1382 if (other_arch && other_arch->type == SCROLL)
1383 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1384 else
1385 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1386 weight_limit);
1387 }
1388
1389 buf << '\n';
1390
1391 // the dungeon master additionally gets a complete dump
1392 if (who && who->flag [FLAG_WIZLOOK])
1393 {
1394 buf << "\nT<Object>\n";
1395 describe_dump_object (buf, this);
1396
1397 if (inv)
1398 {
1399 buf << "\nT<Top Inventory>\n";
1400 describe_dump_object (buf, inv);
1401 }
1402 }
1403
1404 return std::string (buf.linearise (), buf.size ());
1405}
1406
1198void 1407void
1199examine (object *op, object *tmp) 1408examine (object *op, object *tmp)
1200{ 1409{
1201 std::string info = tmp->describe (op); 1410 std::string info = tmp->describe (op);
1411
1202 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); 1412 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1203} 1413}
1204 1414
1205/* 1415/*
1206 * inventory prints object's inventory. If inv==NULL then print player's 1416 * inventory prints object's inventory. If inv==NULL then print player's
1207 * inventory. 1417 * inventory.
1208 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ] 1418 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1209 */ 1419 */
1210const char * 1420const char *
1211object::query_inventory (object *who, const char *indent) 1421object::query_inventory (object *who, const char *indent)
1212{ 1422{
1213 static dynbuf_text buf; buf.clear (); 1423 static dynbuf_text buf; buf.clear ();
1214 1424
1215 for (object *tmp = inv; tmp; tmp = tmp->below) 1425 for (object *tmp = inv; tmp; tmp = tmp->below)
1216 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1426 if (who && who->flag [FLAG_WIZ])
1217 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ()); 1427 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1218 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1428 else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED]))
1219 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ()); 1429 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1220 1430
1221 if (buf.size ()) 1431 if (buf.size ())
1222 buf.printf ("%s(total weight: %s)\n", indent, query_weight ()); 1432 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1223 else 1433 else
1236is_magical (const object *op) 1446is_magical (const object *op)
1237{ 1447{
1238 int i; 1448 int i;
1239 1449
1240 /* living creatures are considered non magical */ 1450 /* living creatures are considered non magical */
1241 if (QUERY_FLAG (op, FLAG_ALIVE)) 1451 if (op->flag [FLAG_ALIVE])
1242 return 0; 1452 return 0;
1243 1453
1244 /* This is a test for it being an artifact, as artifacts have titles */ 1454 /* This is a test for it being an artifact, as artifacts have titles */
1245 if (op->title != NULL) 1455 if (op->title != NULL)
1246 return 1; 1456 return 1;
1252 (op->stats.ac || op->stats.food || op->stats.exp || op->stats.dam || op->stats.wc || op->stats.sp || op->stats.hp || op->stats.luck)) 1462 (op->stats.ac || op->stats.food || op->stats.exp || op->stats.dam || op->stats.wc || op->stats.sp || op->stats.hp || op->stats.luck))
1253 return 1; 1463 return 1;
1254 1464
1255 /* Check for stealty, speed, flying, or just plain magic in the boots */ 1465 /* Check for stealty, speed, flying, or just plain magic in the boots */
1256 /* Presume any boots that hvae a move_type are special. */ 1466 /* Presume any boots that hvae a move_type are special. */
1257 if (op->type == BOOTS && ((QUERY_FLAG (op, FLAG_STEALTH) || op->move_type || op->stats.exp))) 1467 if (op->type == BOOTS && ((op->flag [FLAG_STEALTH] || op->move_type || op->stats.exp)))
1258 return 1; 1468 return 1;
1259 1469
1260 /* Take care of amulet/shield that reflects spells/missiles */ 1470 /* Take care of amulet/shield that reflects spells/missiles */
1261 if ((op->type == AMULET || op->type == SHIELD) && (QUERY_FLAG (op, FLAG_REFL_SPELL) || QUERY_FLAG (op, FLAG_REFL_MISSILE))) 1471 if ((op->type == AMULET || op->type == SHIELD) && (op->flag [FLAG_REFL_SPELL] || op->flag [FLAG_REFL_MISSILE]))
1262 return 1; 1472 return 1;
1263 1473
1264 /* Take care of helmet of xrays */ 1474 /* Take care of helmet of xrays */
1265 if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) 1475 if (op->type == HELMET && op->flag [FLAG_XRAYS])
1266 return 1; 1476 return 1;
1267 1477
1268 /* Potions & rods are always magical. Wands/staves are also magical, 1478 /* Potions & rods are always magical. Wands/staves are also magical,
1269 * assuming they still have any charges left. 1479 * assuming they still have any charges left.
1270 */ 1480 */
1299 * be non magical. 1509 * be non magical.
1300 */ 1510 */
1301 return 0; 1511 return 0;
1302} 1512}
1303 1513
1304/* need_identify returns true if the item should be identified. This
1305 * function really should not exist - by default, any item not identified
1306 * should need it.
1307 */
1308
1309int
1310need_identify (const object *op)
1311{
1312 switch (op->type)
1313 {
1314 case RING:
1315 case WAND:
1316 case ROD:
1317 case HORN:
1318 case SCROLL:
1319 case SKILL:
1320 case SKILLSCROLL:
1321 case SPELLBOOK:
1322 case FOOD:
1323 case POTION:
1324 case BOW:
1325 case ARROW:
1326 case WEAPON:
1327 case ARMOUR:
1328 case SHIELD:
1329 case HELMET:
1330 case AMULET:
1331 case BOOTS:
1332 case GLOVES:
1333 case BRACERS:
1334 case GIRDLE:
1335 case CONTAINER:
1336 case DRINK:
1337 case FLESH:
1338 case INORGANIC:
1339 case CLOSE_CON:
1340 case CLOAK:
1341 case GEM:
1342 case POWER_CRYSTAL:
1343 case POISON:
1344 case BOOK:
1345 case SKILL_TOOL:
1346 return 1;
1347 }
1348
1349 /* Try to track down some stuff that may show up here. Thus, the
1350 * archetype file can be updated, and this function removed.
1351 */
1352#if 0
1353 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1354#endif
1355 return 0;
1356}
1357
1358/* 1514/*
1359 * Supposed to fix face-values as well here, but later. 1515 * Supposed to fix face-values as well here, but later.
1360 */ 1516 */
1361void 1517void
1362identify (object *op) 1518identify (object *op)
1363{ 1519{
1364 SET_FLAG (op, FLAG_IDENTIFIED); 1520 op->set_flag (FLAG_IDENTIFIED);
1365 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1521 op->clr_flag (FLAG_KNOWN_MAGICAL);
1366 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1522 op->clr_flag (FLAG_NO_SKILL_IDENT);
1367 1523
1368 /* 1524 /*
1369 * We want autojoining of equal objects: 1525 * We want autojoining of equal objects:
1370 */ 1526 */
1371 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 1527 if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])
1372 SET_FLAG (op, FLAG_KNOWN_CURSED); 1528 op->set_flag (FLAG_KNOWN_CURSED);
1373 1529
1374 if (op->type == POTION) 1530 if (op->type == POTION)
1375 { 1531 {
1376 if (op->inv && op->randomitems) 1532 if (op->inv && op->randomitems)
1377 op->title = op->inv->name; 1533 op->title = op->inv->name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines