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.13 by elmex, Wed Dec 20 13:07:12 2006 UTC vs.
Revision 1.88 by root, Wed May 12 20:40:50 2010 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <funcpoint.h>
26#include <living.h> 26#include <living.h>
27#include <spells.h> 27#include <spells.h>
28
29const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 };
28 30
29/* the ordering of this is actually doesn't make a difference 31/* the ordering of this is actually doesn't make a difference
30 * However, for ease of use, new entries should go at the end 32 * However, for ease of use, new entries should go at the end
31 * so those people that debug the code that get used to something 33 * so those people that debug the code that get used to something
32 * being in the location 4 don't get confused. 34 * being in the location 4 don't get confused.
… …
45 * 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
46 * may be better. 48 * may be better.
47 * Basically, for the use/nonuse, the code does something like: 49 * Basically, for the use/nonuse, the code does something like:
48 * "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
49 */ 51 */
52// see include/object.h
50Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 53Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
51 {"body_range", "in your range slot", "in a human's range slot"}, 54 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
52 {"body_arm", "on your arm", "on a human's arm"}, 55 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
53 {"body_torso", "on your body", "on a human's torso"}, 56 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
54 {"body_head", "on your head", "on a human's head"}, 57 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
55 {"body_neck", "around your neck", "around a humans neck"}, 58 {KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
56 {"body_skill", "in your skill slot", "in a human's skill slot"}, 59 {KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
57 {"body_finger", "on your finger", "on a human's finger"} , 60 {KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
61 {KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
62 {KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
58 {"body_shoulder", "around your shoulders", "around a human's shoulders"}, 63 {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
59 {"body_foot", "on your feet", "on a human's feet"}, 64 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
60 {"body_hand", "on your hands", "on a human's hands"}, 65 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
61 {"body_wrist", "around your wrists", "around a human's wrist"}, 66 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
62 {"body_waist", "around your waist", "around a human's waist"}, 67 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
63/*{"body_dragon_torso", "your body", "a dragon's body"} */ 68/*{"body_dragon_torso", "your body", "a dragon's body"} */
64};
65
66static char numbers[21][20] = {
67 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
68 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
69 "eighteen", "nineteen", "twenty"
70}; 69};
71 70
72static char numbers_10[10][20] = { 71static char numbers_10[10][20] = {
73 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 72 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
74 "eighty", "ninety" 73 "eighty", "ninety"
75}; 74};
76 75
77static char levelnumbers[21][20] = { 76static char ordnumbers[21][20] = {
78 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", 77 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
79 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", 78 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
80 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", 79 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
81 "nineteen", "twentieth" 80 "nineteenth", "twentieth"
82}; 81};
83 82
84static char levelnumbers_10[11][20] = { 83static char ordnumbers_10[11][20] = {
85 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", 84 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
86 "seventieth", "eightieth", "ninetieth" 85 "seventieth", "eightieth", "ninetieth"
87}; 86};
88 87
89/* 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:
… …
152 {EXIT, "exit", "exits", 0, 0}, 151 {EXIT, "exit", "exits", 0, 0},
153 {ENCOUNTER, "encounter", "encounters", 0, 0}, 152 {ENCOUNTER, "encounter", "encounters", 0, 0},
154 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, 153 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
155 {SHOP_MAT, "shop mat", "shop mats", 0, 0}, 154 {SHOP_MAT, "shop mat", "shop mats", 0, 0},
156 {RING, "ring", "rings", SK_JEWELER, 0}, 155 {RING, "ring", "rings", SK_JEWELER, 0},
157 {FLOOR, "floor", "floors", 0, 0}, 156// {FLOOR, "floor", "floors", 0, 0},
158 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 157 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
159 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 158 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
160 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 159 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
161 {LIGHTER, "lighter", "lighters", 0, 0}, 160 {LIGHTER, "lighter", "lighters", 0, 0},
162 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 161 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
163 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 162 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
164 {LAMP, "lamp", "lamps", 0, 0}, 163 {LAMP, "lamp", "lamps", 0, 0},
165 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 164 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
166 {TOOL, "tool", "tools", 0, 0},
167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 165 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
168 {BUILDFAC, "building facility", "building facilities", 0, 0},
169 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 166 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
170 {SPINNER, "spinner", "spinners", 0, 0}, 167 {SPINNER, "spinner", "spinners", 0, 0},
171 {GATE, "gate", "gates", 0, 0}, 168 {GATE, "gate", "gates", 0, 0},
172 {BUTTON, "button", "buttons", 0, 0}, 169 {BUTTON, "button", "buttons", 0, 0},
173 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 170 {T_HANDLE, "cf handle", "cf handles", 0, 0},
174 {HOLE, "hole", "holes", 0, 0}, 171 {HOLE, "hole", "holes", 0, 0},
175 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 172 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
176 {SIGN, "sign", "signs", 0, 0}, 173 {SIGN, "sign", "signs", 0, 0},
177 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 174 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
178 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 175 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
… …
180 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0}, 177 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0},
181 {CONVERTER, "converter", "converters", 0, 0}, 178 {CONVERTER, "converter", "converters", 0, 0},
182 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0}, 179 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0},
183 {POISONING, "poisoning", "poisonings", 0, 0}, 180 {POISONING, "poisoning", "poisonings", 0, 0},
184 {SAVEBED, "savebed", "savebeds", 0, 0}, 181 {SAVEBED, "savebed", "savebeds", 0, 0},
185 {POISONCLOUD, "poison cloud", "poison clouds", 0, 0},
186 {FIREHOLES, "fireholes", "fireholes", 0, 0},
187 {WAND, "wand", "wands", SK_THAUMATURGY, 0}, 182 {WAND, "wand", "wands", SK_THAUMATURGY, 0},
188 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0}, 183 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0},
189 {DIRECTOR, "director", "directors", 0, 0}, 184 {DIRECTOR, "director", "directors", 0, 0},
190 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0}, 185 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},
191 {FORCE, "force", "forces", 0, 0}, 186 {FORCE, "force", "forces", 0, 0},
… …
207 {BUILDER, "item builder", "item builders", 0, 0}, 202 {BUILDER, "item builder", "item builders", 0, 0},
208 {MATERIAL, "building material", "building materials", 0, 0}, 203 {MATERIAL, "building material", "building materials", 0, 0},
209 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 204 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
210}; 205};
211 206
212const int item_types_size = sizeof (item_types) / sizeof (*item_types); 207static const int item_types_size = array_length (item_types);
213
214materialtype_t *materialt;
215
216/*
217materialtype material[NROFMATERIALS] = {
218 * P M F E C C A D W G P S P T F C D D C C G H B I *
219 * H A I L O O C R E H O L A U E A E E H O O O L N *
220 * Y G R E L N I A A O I O R R A N P A A U D L I T *
221 * S I E C D F D I P S S W A N R C L T O N Y N R *
222 * I C T U N O T O L E E H S T P D N *
223 {"paper", {15,10,17, 9, 5, 7,13, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
224 {"metal", { 2,12, 3,12, 2,10, 7, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
225 {"glass", {14,11, 8, 3,10, 5, 1, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
226 {"leather", { 5,10,10, 3, 3,10,10, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
227 {"wood", {10,11,13, 2, 2,10, 9, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
228 {"organics", { 3,12, 9,11, 3,10, 9, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
229 {"stone", { 2, 5, 2, 2, 2, 2, 1, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
230 {"cloth", {14,11,13, 4, 4, 5,10, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
231 {"adamant", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
232 {"liquid", { 0, 8, 9, 6,17, 0,15, 0,20,15,12,0,0,0,0,11,0,0,0,0,0,0,0,0}},
233 {"soft metal",{ 6,12, 6,14, 2,10, 1, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
234 {"bone", {10, 9, 4, 5, 3,10,10, 0,20,15, 0,0,0,0,0, 2,0,0,0,0,0,0,0,0}},
235 {"ice", {14,11,16, 5, 0, 5, 6, 0,20,15, 0,0,0,0,0, 7,0,0,0,0,0,0,0,0}}
236};
237*/
238 208
239/* This curve may be too steep. But the point is that there should 209/* This curve may be too steep. But the point is that there should
240 * be tough choices - there is no real point to this if everyone can 210 * be tough choices - there is no real point to this if everyone can
241 * wear whatever they want with no worries. Perhaps having the steep 211 * wear whatever they want with no worries. Perhaps having the steep
242 * curve is good (maybe even steeper), but allowing players to 212 * curve is good (maybe even steeper), but allowing players to
… …
244 * able to use 2-3 of the most powerful items. 214 * able to use 2-3 of the most powerful items.
245 * note that this table is only really used for program generated items - 215 * note that this table is only really used for program generated items -
246 * custom objects can use whatever they want. 216 * custom objects can use whatever they want.
247 */ 217 */
248static int enc_to_item_power[21] = { 218static int enc_to_item_power[21] = {
219 0,
249 0, 0, 1, 2, 3, 4, /* 5 */ 220 0, 1, 2, 3, 4, // 5
250 5, 7, 9, 11, 13, /* 10 */ 221 5, 7, 9, 11, 13, // 10
251 15, 18, 21, 24, 27, /* 15 */ 222 15, 18, 21, 24, 27, // 15
252 30, 35, 40, 45, 50 /* 20 */ 223 30, 35, 40, 45, 50 // 20
253}; 224};
254 225
255int 226int
256get_power_from_ench (int ench) 227get_power_from_ench (int ench)
257{ 228{
258 if (ench < 0)
259 ench = 0;
260 if (ench > 20)
261 ench = 20;
262 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];
263} 275}
264 276
265/* 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
266 * 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
267 * generation code, and when loading legacy objects. It returns 279 * generation code, and when loading legacy objects. It returns
… …
274{ 286{
275 int i, tmp, enc; 287 int i, tmp, enc;
276 288
277 enc = 0; 289 enc = 0;
278 for (i = 0; i < NUM_STATS; i++) 290 for (i = 0; i < NUM_STATS; i++)
279 enc += get_attr_value (&op->stats, i); 291 enc += op->stats.stat (i);
280 292
281 /* This protection logic is pretty flawed. 20% fire resistance 293 /* This protection logic is pretty flawed. 20% fire resistance
282 * is much more valuable than 20% confusion, or 20% slow, or 294 * is much more valuable than 20% confusion, or 20% slow, or
283 * several others. Start at 1 - ignore physical - all that normal 295 * several others. Start at 1 - ignore physical - all that normal
284 * armour shouldn't be counted against 296 * armour shouldn't be counted against
… …
301 if (op->type == WEAPON) 313 if (op->type == WEAPON)
302 { 314 {
303 for (i = 1; i < NROFATTACKS; i++) 315 for (i = 1; i < NROFATTACKS; i++)
304 if (op->attacktype & (1 << i)) 316 if (op->attacktype & (1 << i))
305 enc++; 317 enc++;
318
306 if (op->slaying) 319 if (op->slaying)
307 enc += 2; /* What it slays is probably more relevent */ 320 enc += 2; /* What it slays is probably more relevent */
308 } 321 }
322
309 /* Items the player can equip */ 323 /* Items the player can equip */
310 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) || 324 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
311 (op->type == SHIELD) || (op->type == RING) || 325 (op->type == SHIELD) || (op->type == RING) ||
312 (op->type == BOOTS) || (op->type == GLOVES) || 326 (op->type == BOOTS) || (op->type == GLOVES) ||
313 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 327 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
… …
316 enc += op->stats.hp; /* hp regen */ 330 enc += op->stats.hp; /* hp regen */
317 enc += op->stats.sp; /* mana regen */ 331 enc += op->stats.sp; /* mana regen */
318 enc += op->stats.grace; /* grace regen */ 332 enc += op->stats.grace; /* grace regen */
319 enc += op->stats.exp; /* speed bonus */ 333 enc += op->stats.exp; /* speed bonus */
320 } 334 }
335
321 enc += op->stats.luck; 336 enc += op->stats.luck;
322 337
323 /* Do spell paths now */ 338 /* Do spell paths now */
324 for (i = 1; i < NRSPELLPATHS; i++) 339 for (i = 1; i < NRSPELLPATHS; i++)
325 {
326 if (op->path_attuned & (1 << i)) 340 if (op->path_attuned & (1 << i))
327 enc++; 341 enc++;
328 else if (op->path_denied & (1 << i)) 342 else if (op->path_denied & (1 << i))
329 enc -= 2; 343 enc -= 2;
330 else if (op->path_repelled & (1 << i)) 344 else if (op->path_repelled & (1 << i))
331 enc--; 345 enc--;
332 }
333 346
334 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 347 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
335 enc += 5; 348 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
336 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 349 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
337 enc += 3; 350 if (op->flag [FLAG_XRAYS ]) enc += 2;
338 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 351 if (op->flag [FLAG_STEALTH ]) enc += 1;
339 enc += 2; 352 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
340 if (QUERY_FLAG (op, FLAG_STEALTH)) 353 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
341 enc += 1;
342 if (QUERY_FLAG (op, FLAG_XRAYS))
343 enc += 2;
344 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
345 enc += 1;
346 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
347 enc += 1;
348 354
349 return get_power_from_ench (enc); 355 return get_power_from_ench (enc);
350
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 */
355
356const typedata * 376const typedata *
357get_typedata (int itemtype) 377get_typedata (int itemtype)
358{ 378{
359 int i; 379 return get_typedata_ (itemtype);
360
361 for (i = 0; i < item_types_size; i++)
362 if (item_types[i].number == itemtype)
363 return &item_types[i];
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 */
370
371const typedata * 385const typedata *
372get_typedata_by_name (const char *name) 386get_typedata_by_name (const char *name)
373{ 387{
374 int i;
375
376 for (i = 0; i < item_types_size; i++) 388 for (int i = 0; i < item_types_size; i++)
377 if (!strcmp (item_types[i].name, name)) 389 if (!strcmp (item_types[i].name, name))
378 return &item_types[i]; 390 return &item_types[i];
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 preffered\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 }
399
386 return NULL; 400 return 0;
387} 401}
388 402
389/* describe_resistance generates the visible naming for resistances. 403/* describe_resistance generates the visible naming for resistances.
390 * returns a static array of the description. This can return 404 * returns a static array of the description. This can return
391 * a big buffer. 405 * a big buffer.
392 * if newline is true, we don't put parens around the description 406 * if newline is true, we don't put parens around the description
393 * 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
394 */ 408 */
395char * 409const char *
396describe_resistance (const object *op, int newline) 410describe_resistance (const object *op, int newline)
397{ 411{
398 static char buf[VERY_BIG_BUF]; 412 static dynbuf_text buf; buf.clear ();
399 char buf1[VERY_BIG_BUF];
400 int tmpvar;
401 413
402 buf[0] = 0; 414 for (int i = 0; i < NROFATTACKS; i++)
403 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
404 {
405 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))
406 { 416 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
407 if (!newline)
408 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
409 else
410 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
411 417
412 strcat (buf, buf1);
413 }
414 }
415 return buf; 418 return buf;
416} 419}
417
418 420
419/* 421/*
420 * query_weight(object) returns a character pointer to a static buffer 422 * query_weight(object) returns a character pointer to a static buffer
421 * containing the text-representation of the weight of the given object. 423 * containing the text-representation of the weight of the given object.
422 * 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().
423 */ 425 *
424 426 * Seems to be used only by unimportant stuff. Remove?
425char * 427 */
428const char *
426query_weight (const object *op) 429query_weight (const object *op)
427{ 430{
428 static char buf[10]; 431 static char buf[10];
429 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 432 sint32 i = op->total_weight ();
430 433
431 if (op->weight < 0) 434 if (op->weight < 0)
432 return " "; 435 return " ";
436
433 if (i % 1000) 437 if (i % 1000)
434 sprintf (buf, "%6.1f", i / 1000.0); 438 sprintf (buf, "%6.1f", i / 1000.0);
435 else 439 else
436 sprintf (buf, "%4d ", i / 1000); 440 sprintf (buf, "%4d ", i / 1000);
441
437 return buf; 442 return buf;
438} 443}
439 444
440/* 445/*
441 * Returns the pointer to a static buffer containing 446 * Returns the pointer to a static buffer containing
442 * the number requested (of the form first, second, third...) 447 * the number requested (of the form first, second, third...)
443 */ 448 */
444 449const char *
445char * 450ordinal (int i)
446get_levelnumber (int i)
447{ 451{
448 static char buf[MAX_BUF]; 452 if (i < 0)
453 return format ("minus %s", ordinal (-i));
449 454
450 if (i > 99)
451 {
452 sprintf (buf, "%d.", i);
453 return buf;
454 }
455 if (i < 21) 455 if (i < 21)
456 return levelnumbers[i];
457 if (!(i % 10))
458 return levelnumbers_10[i / 10];
459 strcpy (buf, numbers_10[i / 10]);
460 strcat (buf, levelnumbers[i % 10]);
461 return buf;
462}
463
464
465/*
466 * get_number(integer) returns the text-representation of the given number
467 * in a static buffer. The buffer might be overwritten at the next
468 * call to get_number().
469 * It is currently only used by the query_name() function.
470 */
471
472char *
473get_number (int i)
474{
475 if (i <= 20)
476 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];
477 else 471 else
478 { 472 return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
479 static char buf[MAX_BUF];
480
481 sprintf (buf, "%d", i);
482 return buf;
483 }
484} 473}
485 474
486/* 475/*
487 * Returns pointer to static buffer containing ring's or amulet's 476 * Returns pointer to static buffer containing ring's or amulet's
488 * abilities 477 * abilities
… …
494 */ 483 */
495 484
496/* 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
497 * from stats.sp - b.t. 486 * from stats.sp - b.t.
498 */ 487 */
499char * 488static const char *
500ring_desc (const object *op) 489ring_desc (const object *op)
501{ 490{
502 static char buf[VERY_BIG_BUF]; 491 static dynbuf_text buf; buf.clear ();
503 int attr, val, len; 492 int attr, val, len;
504 493
505 buf[0] = 0; 494 if (op->flag [FLAG_IDENTIFIED])
506 495 {
507 if (!QUERY_FLAG (op, FLAG_IDENTIFIED))
508 return buf;
509
510 for (attr = 0; attr < NUM_STATS; attr++) 496 for (attr = 0; attr < NUM_STATS; attr++)
511 { 497 if ((val = op->stats.stat (attr)))
512 if ((val = get_attr_value (&(op->stats), attr)) != 0)
513 {
514 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 498 buf.printf ("(%s%+d)", short_stat_name[attr], val);
515 }
516 }
517 if (op->stats.exp)
518 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
519 if (op->stats.wc)
520 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
521 if (op->stats.dam)
522 sprintf (buf + strlen (buf), "(dam%+d)", op->stats.dam);
523 if (op->stats.ac)
524 sprintf (buf + strlen (buf), "(ac%+d)", op->stats.ac);
525 499
500 if (op->stats.exp) buf.printf ("(speed %+d)", (int)op->stats.exp);
501 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
502 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
503 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
504
526 strcat (buf, describe_resistance (op, 0)); 505 buf << describe_resistance (op, 0);
527 506
528 if (op->stats.food != 0) 507 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
529 sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food); 508 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
530 /* else if (op->stats.food < 0) 509 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
531 sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */ 510 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
532 if (op->stats.grace) 511 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
533 sprintf (buf + strlen (buf), "(grace%+d)", op->stats.grace);
534 if (op->stats.sp && op->type != SKILL)
535 sprintf (buf + strlen (buf), "(magic%+d)", op->stats.sp);
536 if (op->stats.hp)
537 sprintf (buf + strlen (buf), "(regeneration%+d)", op->stats.hp);
538 if (op->stats.luck)
539 sprintf (buf + strlen (buf), "(luck%+d)", op->stats.luck);
540 if (QUERY_FLAG (op, FLAG_LIFESAVE))
541 strcat (buf, "(lifesaving)");
542 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
543 strcat (buf, "(reflect spells)");
544 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
545 strcat (buf, "(reflect missiles)");
546 if (QUERY_FLAG (op, FLAG_STEALTH))
547 strcat (buf, "(stealth)");
548 /* Shorten some of the names, so they appear better in the windows */
549 len = strlen (buf);
550 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
551 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
552 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
553 512
554 /* if(op->item_power) 513 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
555 sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power); 514 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
556 */ 515 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
557 if (buf[0] == 0 && op->type != SKILL) 516 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
558 strcpy (buf, "of adornment");
559 517
518 buf.add_paths ("Attuned" , op->path_attuned);
519 buf.add_paths ("Repelled", op->path_repelled);
520 buf.add_paths ("Denied" , op->path_denied);
521
522 if (buf.empty ())
523 buf << "of adornment";
524 }
560 525
561 return buf; 526 return buf;
562} 527}
563 528
564/* 529/*
565 * 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
566 * 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.
567 */ 534 */
568const char * 535const char *
569query_short_name (const object *op) 536query_short_name (const object *op)
570{ 537{
571 static char buf[HUGE_BUF];
572 char buf2[HUGE_BUF];
573 int len = 0;
574
575 if (op->name == NULL) 538 if (!op->name)
576 return "(null)"; 539 return "(null)";
577 540
578 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 541 if (!op->nrof
542 && !op->weight
543 && !op->title
544 && !is_magical (op)
545 && op->slaying != shstr_money)
579 return op->name; /* To speed things up (or make things slower?) */ 546 return op->name; /* To speed things up (or make things slower?) */
580 547
581 if (op->nrof <= 1) 548 static dynbuf_text buf; buf.clear ();
582 safe_strcat (buf, op->name, &len, HUGE_BUF);
583 else
584 safe_strcat (buf, op->name_pl, &len, HUGE_BUF);
585 549
550 buf << (op->nrof <= 1 ? op->name : op->name_pl);
551
586 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 552 if (op->title && op->flag [FLAG_IDENTIFIED])
587 { 553 buf << ' ' << op->title;
588 safe_strcat (buf, " ", &len, HUGE_BUF);
589 safe_strcat (buf, op->title, &len, HUGE_BUF);
590 }
591 554
592 switch (op->type) 555 switch (op->type)
593 { 556 {
594 case SPELLBOOK: 557 case SPELLBOOK:
595 case SCROLL: 558 case SCROLL:
596 case WAND: 559 case WAND:
597 case ROD: 560 case ROD:
598 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 561 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
599 { 562 {
600 if (!op->title) 563 if (!op->title)
601 { 564 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
602 safe_strcat (buf, " of ", &len, HUGE_BUF); 565
603 if (op->inv)
604 safe_strcat (buf, op->inv->name, &len, HUGE_BUF);
605 else
606 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
607 }
608 if (op->type != SPELLBOOK) 566 if (op->type != SPELLBOOK)
609 {
610 sprintf (buf2, " (lvl %d)", op->level); 567 buf.printf (" (lvl %d)", op->level);
611 safe_strcat (buf, buf2, &len, HUGE_BUF);
612 }
613 } 568 }
614 break; 569 break;
615 570
571 case ALTAR:
572 case TRIGGER_ALTAR:
573 case IDENTIFY_ALTAR:
574 case CONVERTER:
575 if (op->slaying == shstr_money)
576 {
577 bool wrap = !!buf.size ();
578
579 if (wrap) buf << " [";
580
581 archetype *coin = 0;
582
583 for (char const *const *c = coins; *coins; ++c)
584 if ((coin = archetype::find (*c)))
585 if (op->stats.food % coin->value == 0)
586 break;
587
588 sint32 coins = op->stats.food / coin->value;
589
590 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
591
592 if (wrap) buf << ']';
593 }
594 break;
595
616 case SKILL: 596 case SKILL:
617 case AMULET: 597 case AMULET:
618 case RING: 598 case RING:
619 if (!op->title) 599 if (!op->title)
620 { 600 {
621 /* If ring has a title, full description isn't so useful */ 601 /* If ring has a title, full description isn't so useful */
622 char *s = ring_desc (op); 602 const char *s = ring_desc (op);
623 603
624 if (s[0]) 604 if (s && *s)
625 { 605 buf << " " << s;
626 safe_strcat (buf, " ", &len, HUGE_BUF);
627 safe_strcat (buf, s, &len, HUGE_BUF);
628 }
629 } 606 }
630 break; 607 break;
608
631 default: 609 default:
632 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 610 if (op->magic
633 { 611 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
612 || op->flag [FLAG_IDENTIFIED]))
634 sprintf (buf2, " %+d", op->magic); 613 buf.printf (" %+d", op->magic);
635 safe_strcat (buf, buf2, &len, HUGE_BUF);
636 }
637 } 614 }
615
638 return buf; 616 return buf;
639} 617}
640 618
641/* 619/*
642 * query_name(object) returns a character pointer pointing to a static 620 * query_name(object) returns a character pointer pointing to a static
… …
646 * 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
647 * 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
648 * returned is good forever.) However, it makes printing statements that 626 * returned is good forever.) However, it makes printing statements that
649 * 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.)
650 * 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.
651 */ 632 */
652char * 633const char *
653query_name (const object *op) 634query_name (const object *op)
654{ 635{
655 static char buf[5][HUGE_BUF]; 636 int len = 0;
637 static dynbuf_text bufs[5];
656 static int use_buf = 0; 638 static int use_buf = 0;
657 int len = 0;
658
659#ifdef NEW_MATERIAL_CODE
660 materialtype_t *mt;
661#endif
662 639
663 use_buf++; 640 use_buf++;
664 use_buf %= 5; 641 use_buf %= 5;
665 642
666#ifdef NEW_MATERIAL_CODE 643 dynbuf_text &buf = bufs [use_buf];
644 buf.clear ();
645
646#if 0
667 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 647 if ((op->is_armor () || op->is_weapon ()) && op->material)
668 { 648 buf << op->material->description << ' ';
669 mt = name_to_material (op->materialname);
670 if (mt)
671 {
672 safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
673 safe_strcat (buf[use_buf], " ", &len, HUGE_BUF);
674 }
675 }
676#endif 649#endif
677 650
678 safe_strcat (buf[use_buf], query_short_name (op), &len, HUGE_BUF); 651 buf << query_short_name (op);
679 652
680 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 653 if (op->flag [FLAG_INV_LOCKED])
681 safe_strcat (buf[use_buf], " *", &len, HUGE_BUF); 654 buf << " *";
682 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 655 if (op->is_open_container ())
683 safe_strcat (buf[use_buf], " (open)", &len, HUGE_BUF); 656 buf << " (open)";
684 657
685 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 658 if (op->flag [FLAG_KNOWN_CURSED])
686 {
687 if (QUERY_FLAG (op, FLAG_DAMNED))
688 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
689 else if (QUERY_FLAG (op, FLAG_CURSED))
690 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
691 } 659 {
660 if (op->flag [FLAG_DAMNED])
661 buf << " (damned)";
662 else if (op->flag [FLAG_CURSED])
663 buf << " (cursed)";
664 }
665
692 /* 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),
693 * and it isn't identified, print out the fact that 667 * and it isn't identified, print out the fact that
694 * it is magical. Assume that the detect magical spell will only set 668 * it is magical. Assume that the detect magical spell will only set
695 * KNOWN_MAGICAL if the item actually is magical. 669 * KNOWN_MAGICAL if the item actually is magical.
696 * 670 *
697 * 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
698 * 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
699 * abilities, especially for artifact items. 673 * abilities, especially for artifact items.
700 */ 674 */
701 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 675 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
702 safe_strcat (buf[use_buf], " (magic)", &len, HUGE_BUF); 676 buf << " (magic)";
703 677
704#if 0 678#if 0
705 /* 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
706 * be returned in the name. 680 * be returned in the name.
707 */ 681 */
708 if (op->item_power) 682 if (op->item_power)
709 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);
710 684
711#endif 685#endif
712 686
713 if (QUERY_FLAG (op, FLAG_APPLIED)) 687 if (op->flag [FLAG_APPLIED])
714 { 688 {
715 switch (op->type) 689 switch (op->type)
716 { 690 {
717 case BOW: 691 case BOW:
718 case WAND: 692 case WAND:
719 case ROD: 693 case ROD:
720 case HORN: 694 case HORN:
721 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 695 buf << " (applied)";
722 break; 696 break;
723 case WEAPON: 697 case WEAPON:
724 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 698 buf << " (applied)";
725 break; 699 break;
726 case ARMOUR: 700 case ARMOUR:
727 case HELMET: 701 case HELMET:
728 case SHIELD: 702 case SHIELD:
729 case RING: 703 case RING:
730 case BOOTS: 704 case BOOTS:
731 case GLOVES: 705 case GLOVES:
732 case AMULET: 706 case AMULET:
733 case GIRDLE: 707 case GIRDLE:
734 case BRACERS: 708 case BRACERS:
735 case CLOAK: 709 case CLOAK:
736 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 710 buf << " (worn)";
737 break; 711 break;
738 case CONTAINER: 712 case CONTAINER:
739 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 713 buf << " (active)";
740 break; 714 break;
741 case SKILL: 715 case SKILL:
742 default: 716 default:
743 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 717 buf << " (applied)";
744 } 718 }
745 } 719 }
746 if (QUERY_FLAG (op, FLAG_UNPAID))
747 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
748 720
749 return buf[use_buf]; 721 switch (op->type)
722 {
723 case LAMP:
724 if (op->glow_radius)
725 buf << " (on)";
726 else if (op->stats.food <= 0)
727 buf << " (empty)";
728 else
729 buf << " (off)";
730 break;
731
732 case TORCH:
733 if (op->glow_radius)
734 buf << " (burning)";
735 else if (op->stats.food <= 0)
736 buf << " (burned out)";
737 break;
738 }
739
740 if (op->flag [FLAG_UNPAID])
741 buf << " (unpaid)";
742
743 return buf;
750} 744}
751 745
752/* 746/*
753 * query_base_name(object) returns a character pointer pointing to a static 747 * query_base_name(object) returns a character pointer pointing to a static
754 * buffer which contains a verbose textual representation of the name 748 * buffer which contains a verbose textual representation of the name
755 * of the given object. The buffer will be overwritten at the next 749 * of the given object. The buffer will be overwritten at the next
756 * call to query_base_name(). This is a lot like query_name, but we 750 * call to query_base_name(). This is a lot like query_name, but we
757 * don't include the item count or item status. Used for inventory sorting 751 * don't include the item count or item status. Used for inventory sorting
758 * and sending to client. 752 * and sending to client.
759 * If plural is set, we generate the plural name of this. 753 * If plural is set, we generate the plural name of this.
754 *
755 * It is sometimes used to display messages, and usually only used to match stuff,
756 * so maybe this function should be removed.
757 * It is also used for client-side inventory/item descriptions.
760 */ 758 */
761const char * 759const char *
762query_base_name (const object *op, int plural) 760query_base_name (const object *op, int plural)
763{ 761{
764 static char buf[MAX_BUF], buf2[MAX_BUF];
765 int len;
766 materialtype_t *mt;
767
768 if ((!plural && !op->name) || (plural && !op->name_pl)) 762 if ((!plural && !op->name) || (plural && !op->name_pl))
769 return "(null)"; 763 return "(null)";
770 764
771 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 765 if (!op->nrof && !op->weight && !op->title && !is_magical (op)
766 && op->type != EXIT)
772 return op->name; /* To speed things up (or make things slower?) */ 767 return op->name; /* To speed things up (or make things slower?) */
773 768
769 static dynbuf_text buf; buf.clear ();
770
771#if 0
774 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 772 if ((op->is_armor () || op->is_weapon ()) && op->material)
775 mt = name_to_material (op->materialname); 773 if (op->arch->material != op->material)
776 774 buf << op->material->description << ' ';
777#ifdef NEW_MATERIAL_CODE
778 if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
779 op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
780 {
781 strcpy (buf, mt->description);
782 len = strlen (buf);
783 safe_strcat (buf, " ", &len, MAX_BUF);
784 if (!plural)
785 safe_strcat (buf, op->name, &len, MAX_BUF);
786 else
787 safe_strcat (buf, op->name_pl, &len, MAX_BUF);
788 }
789 else
790 {
791#endif 775#endif
792 if (!plural)
793 strcpy (buf, op->name);
794 else
795 strcpy (buf, op->name_pl);
796 len = strlen (buf);
797#ifdef NEW_MATERIAL_CODE
798 }
799#endif
800 776
777 buf << (plural ? op->name_pl : op->name);
778
801 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 779 if (op->title && op->flag [FLAG_IDENTIFIED])
802 { 780 buf << ' ' << op->title;
803 safe_strcat (buf, " ", &len, MAX_BUF);
804 safe_strcat (buf, op->title, &len, MAX_BUF);
805 }
806 781
807 switch (op->type) 782 switch (op->type)
808 { 783 {
809 case SPELLBOOK: 784 case SPELLBOOK:
810 case SCROLL: 785 case SCROLL:
811 case WAND: 786 case WAND:
812 case ROD: 787 case ROD:
813 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 788 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
814 { 789 {
815 if (!op->title) 790 if (!op->title)
816 { 791 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
817 safe_strcat (buf, " of ", &len, MAX_BUF); 792
818 if (op->inv)
819 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
820 else
821 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
822 }
823 if (op->type != SPELLBOOK) 793 if (op->type != SPELLBOOK)
824 {
825 sprintf (buf2, " (lvl %d)", op->level); 794 buf.printf (" (lvl %d)", op->level);
826 safe_strcat (buf, buf2, &len, MAX_BUF);
827 }
828 } 795 }
829 break; 796 break;
830 797
831 798
832 case SKILL: 799 case SKILL:
833 case AMULET: 800 case AMULET:
834 case RING: 801 case RING:
835 if (!op->title) 802 if (!op->title)
836 { 803 {
837 /* If ring has a title, full description isn't so useful */ 804 /* If ring has a title, full description isn't so useful */
838 char *s = ring_desc (op); 805 const char *s = ring_desc (op);
839 806
840 if (s[0]) 807 if (s && *s)
841 { 808 buf << ' ' << s;
842 safe_strcat (buf, " ", &len, MAX_BUF);
843 safe_strcat (buf, s, &len, MAX_BUF);
844 }
845 } 809 }
846 break; 810 break;
811
812 case EXIT:
813 // random map exits "unfortunately" get patched, so this only works before entering
814 if (EXIT_PATH (op) == shstr_random_map_exit)
815 buf << " (random map)";
816 else if (!EXIT_PATH (op))
817 buf << " (closed)";
818 break;
819
847 default: 820 default:
848 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 821 if (op->magic
849 { 822 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
850 sprintf (buf + strlen (buf), " %+d", op->magic); 823 || op->flag [FLAG_IDENTIFIED]))
851 } 824 buf.printf (" %+d", op->magic);
852 } 825 }
826
853 return buf; 827 return buf;
854} 828}
855 829
856/* Break this off from describe_item - that function was way 830/* Break this off from describe_item - that function was way
857 * too long, making it difficult to read. This function deals 831 * too long, making it difficult to read. This function deals
858 * with describing the monsters & players abilities. It should only 832 * with describing the monsters & players abilities. It should only
859 * be called with monster & player objects. Returns a description 833 * be called with monster & player objects. Returns a description
860 * in a static buffer. 834 * in a static buffer.
861 */ 835 */
862
863static char * 836static const char *
864describe_monster (const object *op) 837describe_monster (const object *op)
865{ 838{
866 char buf[MAX_BUF]; 839 static dynbuf_text buf; buf.clear ();
867 static char retbuf[VERY_BIG_BUF];
868 int i;
869
870 retbuf[0] = '\0';
871 840
872 /* Note that the resolution this provides for players really isn't 841 /* Note that the resolution this provides for players really isn't
873 * very good. Any player with a speed greater than .67 will 842 * very good. Any player with a speed greater than .67 will
874 * fall into the 'lightning fast movement' category. 843 * fall into the 'lightning fast movement' category.
875 */ 844 */
876 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 845 if (op->has_active_speed ())
877 { 846 switch ((int)(op->speed * 15.))
878 switch ((int) ((FABS (op->speed)) * 15))
879 { 847 {
880 case 0: 848 case 0:
881 strcat (retbuf, "(very slow movement)"); 849 buf << "(very slow movement)";
882 break; 850 break;
883 case 1: 851 case 1:
884 strcat (retbuf, "(slow movement)"); 852 buf << "(slow movement)";
885 break; 853 break;
886 case 2: 854 case 2:
887 strcat (retbuf, "(normal movement)"); 855 buf << "(normal movement)";
888 break; 856 break;
889 case 3: 857 case 3:
890 case 4: 858 case 4:
891 strcat (retbuf, "(fast movement)"); 859 buf << "(fast movement)";
892 break; 860 break;
893 case 5: 861 case 5:
894 case 6: 862 case 6:
895 strcat (retbuf, "(very fast movement)"); 863 buf << "(very fast movement)";
896 break; 864 break;
897 case 7: 865 case 7:
898 case 8: 866 case 8:
899 case 9: 867 case 9:
900 case 10: 868 case 10:
901 strcat (retbuf, "(extremely fast movement)"); 869 buf << "(extremely fast movement)";
902 break; 870 break;
903 default: 871 default:
904 strcat (retbuf, "(lightning fast movement)"); 872 buf << "(lightning fast movement)";
905 break; 873 break;
906 } 874 }
907 } 875
908 if (QUERY_FLAG (op, FLAG_UNDEAD)) 876 if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
909 strcat (retbuf, "(undead)"); 877 if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
910 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) 878 if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
911 strcat (retbuf, "(see invisible)"); 879 if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
912 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) 880 if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
913 strcat (retbuf, "(wield weapon)"); 881 if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
914 if (QUERY_FLAG (op, FLAG_USE_BOW)) 882 if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
915 strcat (retbuf, "(archer)"); 883 if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
916 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) 884 if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
917 strcat (retbuf, "(wear armour)"); 885 if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
918 if (QUERY_FLAG (op, FLAG_USE_RING)) 886 if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
919 strcat (retbuf, "(wear ring)"); 887 if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
920 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) 888 if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
921 strcat (retbuf, "(read scroll)"); 889 if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
922 if (QUERY_FLAG (op, FLAG_USE_RANGE)) 890
923 strcat (retbuf, "(fires wand/rod/horn)");
924 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL))
925 strcat (retbuf, "(skill user)");
926 if (QUERY_FLAG (op, FLAG_CAST_SPELL))
927 strcat (retbuf, "(spellcaster)");
928 if (QUERY_FLAG (op, FLAG_FRIENDLY))
929 strcat (retbuf, "(friendly)");
930 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
931 strcat (retbuf, "(unaggressive)");
932 if (QUERY_FLAG (op, FLAG_HITBACK))
933 strcat (retbuf, "(hitback)");
934 if (QUERY_FLAG (op, FLAG_STEALTH))
935 strcat (retbuf, "(stealthy)");
936 if (op->randomitems != NULL) 891 if (op->randomitems)
937 { 892 {
938 treasure *t;
939 int first = 1; 893 bool first = 1;
940 894
941 for (t = op->randomitems->items; t != NULL; t = t->next) 895 for (treasure *t = op->randomitems->items; t; t = t->next)
942 if (t->item && (t->item->clone.type == SPELL)) 896 if (t->item && t->item->type == SPELL)
943 { 897 {
944 if (first) 898 if (first)
945 { 899 buf << "(Spell abilities:)";
900
946 first = 0; 901 first = 0;
947 strcat (retbuf, "(Spell abilities:)"); 902
948 } 903 buf << '(' << t->item->object::name << ')';
949 strcat (retbuf, "(");
950 strcat (retbuf, t->item->clone.name);
951 strcat (retbuf, ")");
952 } 904 }
953 } 905 }
906
954 if (op->type == PLAYER) 907 if (op->type == PLAYER)
955 { 908 {
956 if (op->contr->digestion) 909 if (op->contr->digestion)
957 {
958 if (op->contr->digestion != 0)
959 sprintf (buf, "(sustenance%+d)", op->contr->digestion); 910 buf.printf ("(sustenance%+d)", op->contr->digestion);
960 strcat (retbuf, buf); 911
961 }
962 if (op->contr->gen_grace) 912 if (op->contr->gen_grace)
963 {
964 sprintf (buf, "(grace%+d)", op->contr->gen_grace); 913 buf.printf ("(grace%+d)", op->contr->gen_grace);
965 strcat (retbuf, buf); 914
966 }
967 if (op->contr->gen_sp) 915 if (op->contr->gen_sp)
968 {
969 sprintf (buf, "(magic%+d)", op->contr->gen_sp); 916 buf.printf ("(magic%+d)", op->contr->gen_sp);
970 strcat (retbuf, buf); 917
971 }
972 if (op->contr->gen_hp) 918 if (op->contr->gen_hp)
973 {
974 sprintf (buf, "(regeneration%+d)", op->contr->gen_hp); 919 buf.printf ("(regeneration%+d)", op->contr->gen_hp);
975 strcat (retbuf, buf); 920
976 }
977 if (op->stats.luck) 921 if (op->stats.luck)
978 {
979 sprintf (buf, "(luck%+d)", op->stats.luck); 922 buf.printf ("(luck%+d)", op->stats.luck);
980 strcat (retbuf, buf);
981 }
982 } 923 }
983 924
984 /* describe attacktypes */ 925 /* describe attacktypes */
985 if (is_dragon_pl (op)) 926 if (op->is_dragon ())
986 { 927 {
987 /* for dragon players display the attacktypes from clawing skill 928 /* for dragon players display the attacktypes from clawing skill
988 * Break apart the for loop - move the comparison checking down - 929 * Break apart the for loop - move the comparison checking down -
989 * this makes it more readable. 930 * this makes it more readable.
990 */ 931 */
991 object *tmp; 932 object *tmp;
992 933
993 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 934 for (tmp = op->inv; tmp; tmp = tmp->below)
994 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 935 if (tmp->type == SKILL && tmp->name == shstr_clawing)
995 break; 936 break;
996 937
997 if (tmp && tmp->attacktype != 0) 938 if (tmp && tmp->attacktype)
998 { 939 buf.add_abilities ("Claws", tmp->attacktype);
999 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws");
1000 }
1001 else 940 else
1002 { 941 buf.add_abilities ("Attacks", op->attacktype);
1003 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1004 }
1005 } 942 }
1006 else 943 else
1007 { 944 buf.add_abilities ("Attacks", op->attacktype);
1008 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 945
1009 } 946 buf.add_paths ("Attuned" , op->path_attuned);
1010 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 947 buf.add_paths ("Repelled", op->path_repelled);
1011 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 948 buf.add_paths ("Denied" , op->path_denied);
1012 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 949
1013 for (i = 0; i < NROFATTACKS; i++) 950 for (int i = 0; i < NROFATTACKS; i++)
1014 {
1015 if (op->resist[i]) 951 if (op->resist[i])
1016 {
1017 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 952 buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1018 strcat (retbuf, buf); 953
1019 }
1020 }
1021 return retbuf; 954 return buf;
1022} 955}
1023
1024 956
1025/* 957/*
1026 * Returns a pointer to a static buffer which contains a 958 * Returns a pointer to a static buffer which contains a
1027 * description of the given object. 959 * description of the given object.
1028 * If it is a monster, lots of information about its abilities 960 * If it is a monster, lots of information about its abilities
… …
1037 * wouldn't need to use the SEE_INVISIBLE flag to know it is 969 * wouldn't need to use the SEE_INVISIBLE flag to know it is
1038 * a dragon player examining food. Could have things like 970 * a dragon player examining food. Could have things like
1039 * a dwarven axe, in which the full abilities are only known to 971 * a dwarven axe, in which the full abilities are only known to
1040 * dwarves, etc. 972 * dwarves, etc.
1041 * 973 *
1042 * This function is really much more complicated than it should
1043 * be, because different objects have different meanings
1044 * for the same field (eg, wands use 'food' for charges). This
1045 * means these special cases need to be worked out.
1046 *
1047 * Add 'owner' who is the person examining this object. 974 * Add 'owner' who is the person examining this object.
1048 * owner can be null if no one is being associated with this 975 * owner can be null if no one is being associated with this
1049 * item (eg, debug dump or the like) 976 * item (eg, debug dump or the like)
1050 */ 977 */
1051 978const char *
1052char *
1053describe_item (const object *op, object *owner) 979describe_item (const object *op, object *owner)
1054{ 980{
1055 char buf[MAX_BUF]; 981 if (op->flag [FLAG_MONSTER] || op->type == PLAYER)
1056 static char retbuf[VERY_BIG_BUF]; 982 return describe_monster (op);
983
984 static dynbuf_text buf; buf.clear ();
1057 int identified, i; 985 int identified, i;
1058 986
1059 retbuf[0] = '\0';
1060 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1061 {
1062 return describe_monster (op);
1063 }
1064 /* figure this out once, instead of making multiple calls to need_identify. 987 /* figure this out once, instead of making multiple calls to need_identify.
1065 * also makes the code easier to read. 988 * also makes the code easier to read.
1066 */ 989 */
1067 if (!need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED)) 990 identified = !op->need_identify () || op->flag [FLAG_IDENTIFIED];
1068 identified = 1; 991 if (!identified)
1069 else 992 buf << "(unidentified)";
1070 { 993
1071 strcpy (retbuf, "(unidentified)");
1072 identified = 0;
1073 }
1074 switch (op->type) 994 switch (op->type)
1075 { 995 {
1076 case BOW: 996 case BOW:
1077 case ARROW: 997 case ARROW:
1078 case WAND: 998 case WAND:
1079 case ROD: 999 case ROD:
1080 case HORN: 1000 case HORN:
1081 case WEAPON: 1001 case WEAPON:
1082 case ARMOUR: 1002 case ARMOUR:
1083 case HELMET: 1003 case HELMET:
1084 case SHIELD: 1004 case SHIELD:
1085 case BOOTS: 1005 case BOOTS:
1086 case GLOVES: 1006 case GLOVES:
1087 case GIRDLE: 1007 case GIRDLE:
1088 case BRACERS: 1008 case BRACERS:
1089 case CLOAK: 1009 case CLOAK:
1090 case SKILL_TOOL: 1010 case SKILL_TOOL:
1091 break; /* We have more information to do below this switch */ 1011 break; /* We have more information to do below this switch */
1092 1012
1093 case POWER_CRYSTAL: 1013 case POWER_CRYSTAL:
1094 if (op->stats.maxsp > 1000) 1014 if (op->stats.maxsp > 1000)
1095 { /*higher capacity crystals */ 1015 { /*higher capacity crystals */
1096 i = (op->stats.maxsp % 100) / 10; 1016 i = (op->stats.maxsp % 1000) / 100;
1017
1097 if (i) 1018 if (i)
1098 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 100, i); 1019 buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i);
1099 else 1020 else
1100 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 100); 1021 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
1101 } 1022 }
1102 else 1023 else
1103 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 1024 buf.printf ("(capacity %d; it is ", op->stats.maxsp);
1104 strcat (retbuf, buf); 1025
1105 i = (op->stats.sp * 10) / op->stats.maxsp; 1026 i = (op->stats.sp * 10) / op->stats.maxsp;
1106 if (op->stats.sp == 0) 1027 if (op->stats.sp == 0)
1107 strcat (retbuf, "empty."); 1028 buf << "empty";
1108 else if (i == 0) 1029 else if (i == 0)
1109 strcat (retbuf, "almost empty."); 1030 buf << "almost empty";
1110 else if (i < 3) 1031 else if (i < 3)
1111 strcat (retbuf, "partially filled."); 1032 buf << "partially filled";
1112 else if (i < 6) 1033 else if (i < 6)
1113 strcat (retbuf, "half full."); 1034 buf << "half full";
1114 else if (i < 9) 1035 else if (i < 9)
1115 strcat (retbuf, "well charged."); 1036 buf << "well charged";
1116 else if (op->stats.sp == op->stats.maxsp) 1037 else if (op->stats.sp == op->stats.maxsp)
1117 strcat (retbuf, "fully charged."); 1038 buf << "fully charged";
1118 else 1039 else
1119 strcat (retbuf, "almost full."); 1040 buf << "almost full";
1041
1042 buf << ')';
1120 break; 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 }
1065 break;
1066
1121 case FOOD: 1067 case FOOD:
1122 case FLESH: 1068 case FLESH:
1123 case DRINK: 1069 case DRINK:
1124 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1070 if (identified || op->flag [FLAG_BEEN_APPLIED])
1125 { 1071 {
1126 sprintf (buf, "(food+%d)", op->stats.food); 1072 buf.printf ("(food+%d)", op->stats.food);
1127 strcat (retbuf, buf);
1128 1073
1129 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))
1075 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1076
1077 if (!op->flag [FLAG_CURSED])
1130 { 1078 {
1131 sprintf (buf, "(%s metabolism)", change_resist_msg[op->last_eat]); 1079 if (op->stats.hp) buf << "(heals)";
1132 strcat (retbuf, buf); 1080 if (op->stats.sp) buf << "(spellpoint regen)";
1133 } 1081 }
1134
1135 if (!QUERY_FLAG (op, FLAG_CURSED))
1136 {
1137 if (op->stats.hp)
1138 strcat (retbuf, "(heals)");
1139 if (op->stats.sp)
1140 strcat (retbuf, "(spellpoint regen)");
1141 }
1142 else 1082 else
1143 { 1083 {
1144 if (op->stats.hp) 1084 if (op->stats.hp) buf << "(damages)";
1145 strcat (retbuf, "(damages)");
1146 if (op->stats.sp)
1147 strcat (retbuf, "(spellpoint depletion)"); 1085 if (op->stats.sp) buf << "(spellpoint depletion)";
1148 } 1086 }
1149 } 1087 }
1150 break; 1088 break;
1151 1089
1152
1153 case SKILL: 1090 case SKILL:
1154 case RING: 1091 case RING:
1155 case AMULET: 1092 case AMULET:
1156 if (op->item_power) 1093 if (op->item_power)
1157 {
1158 sprintf (buf, "(item_power %+d)", op->item_power); 1094 buf.printf ("(item_power %+d)", op->item_power);
1159 strcat (retbuf, buf); 1095
1160 }
1161 if (op->title) 1096 if (op->title)
1162 strcat (retbuf, ring_desc (op)); 1097 buf << ring_desc (op);
1098
1163 return retbuf; 1099 return buf;
1164 1100
1165 default: 1101 default:
1166 return retbuf; 1102 return buf;
1167 } 1103 }
1168 1104
1169 /* Down here, we more further describe equipment type items. 1105 /* Down here, we more further describe equipment type items.
1170 * only describe them if they have been identified or the like. 1106 * only describe them if they have been identified or the like.
1171 */ 1107 */
1172 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1108 if (identified || op->flag [FLAG_BEEN_APPLIED])
1173 { 1109 {
1174 int attr, val; 1110 int attr, val;
1175 1111
1176 for (attr = 0; attr < NUM_STATS; attr++) 1112 for (attr = 0; attr < NUM_STATS; attr++)
1177 { 1113 if ((val = op->stats.stat (attr)))
1178 if ((val = get_attr_value (&(op->stats), attr)) != 0)
1179 {
1180 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1114 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1181 strcat (retbuf, buf);
1182 }
1183 }
1184 1115
1185 if (op->stats.exp) 1116 if (op->stats.exp)
1186 {
1187 sprintf (buf, "(speed %+lld)", (long long) op->stats.exp); 1117 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1188 strcat (retbuf, buf);
1189 }
1190
1191 1118
1192 switch (op->type) 1119 switch (op->type)
1193 { 1120 {
1194 case BOW: 1121 case BOW:
1195 case ARROW: 1122 case ARROW:
1196 case GIRDLE: 1123 case GIRDLE:
1197 case HELMET: 1124 case HELMET:
1198 case SHIELD: 1125 case SHIELD:
1199 case BOOTS: 1126 case BOOTS:
1200 case GLOVES: 1127 case GLOVES:
1201 case WEAPON: 1128 case WEAPON:
1202 case SKILL: 1129 case SKILL:
1203 case RING: 1130 case RING:
1204 case AMULET: 1131 case AMULET:
1205 case ARMOUR: 1132 case ARMOUR:
1206 case BRACERS: 1133 case BRACERS:
1207 case FORCE: 1134 case FORCE:
1208 case CLOAK: 1135 case CLOAK:
1209 if (op->stats.wc) 1136 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1210 { 1137 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1211 sprintf (buf, "(wc%+d)", op->stats.wc); 1138 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1212 strcat (retbuf, buf); 1139
1213 }
1214 if (op->stats.dam)
1215 {
1216 sprintf (buf, "(dam%+d)", op->stats.dam);
1217 strcat (retbuf, buf);
1218 }
1219 if (op->stats.ac)
1220 {
1221 sprintf (buf, "(ac%+d)", op->stats.ac);
1222 strcat (retbuf, buf);
1223 }
1224 if ((op->type == WEAPON || op->type == BOW) && op->level > 0) 1140 if ((op->type == WEAPON || op->type == BOW) && op->level > 0)
1225 {
1226 sprintf (buf, "(improved %d/%d)", op->last_eat, op->level); 1141 buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1227 strcat (retbuf, buf); 1142
1228 }
1229 break; 1143 break;
1230 1144
1231 default: 1145 default:
1232 break; 1146 break;
1233 } 1147 }
1234 if (QUERY_FLAG (op, FLAG_XRAYS)) 1148
1235 strcat (retbuf, "(xray-vision)"); 1149 if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1236 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 1150 if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1237 strcat (retbuf, "(infravision)");
1238 1151
1239 /* levitate was what is was before, so we'll keep it */ 1152 /* levitate was what is was before, so we'll keep it */
1240 if (op->move_type & MOVE_FLY_LOW) 1153 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1241 strcat (retbuf, "(levitate)");
1242
1243 if (op->move_type & MOVE_FLY_HIGH) 1154 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1244 strcat (retbuf, "(fly)");
1245
1246 if (op->move_type & MOVE_SWIM) 1155 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1247 strcat (retbuf, "(swim)");
1248 1156
1249 /* walking is presumed as 'normal', so doesn't need mentioning */ 1157 /* walking is presumed as 'normal', so doesn't need mentioning */
1250 1158
1251 if (op->item_power) 1159 if (op->item_power)
1252 {
1253 sprintf (buf, "(item_power %+d)", op->item_power); 1160 buf.printf ("(item_power %+d)", op->item_power);
1254 strcat (retbuf, buf);
1255 }
1256 } /* End if identified or applied */ 1161 } /* End if identified or applied */
1257 1162
1258 /* This blocks only deals with fully identified object. 1163 /* This blocks only deals with fully identified object.
1259 * it is intentional that this is not an 'else' from a above - 1164 * it is intentional that this is not an 'else' from a above -
1260 * in this way, information is added. 1165 * in this way, information is added.
… …
1263 { 1168 {
1264 int more_info = 0; 1169 int more_info = 0;
1265 1170
1266 switch (op->type) 1171 switch (op->type)
1267 { 1172 {
1268 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 */
1269 case HORN: /* and stats.hp for spell-point regeneration... */ 1174 case HORN: /* and stats.hp for spell-point regeneration... */
1270 case BOW: 1175 case BOW:
1271 case ARROW: 1176 case ARROW:
1272 case WAND: 1177 case WAND:
1273 case FOOD: 1178 case FOOD:
1274 case FLESH: 1179 case FLESH:
1275 case DRINK: 1180 case DRINK:
1276 more_info = 0; 1181 more_info = 0;
1277 break; 1182 break;
1278 1183
1279 /* Armor type objects */ 1184 /* Armor type objects */
1280 case ARMOUR: 1185 case ARMOUR:
1281 case HELMET: 1186 case HELMET:
1282 case SHIELD: 1187 case SHIELD:
1283 case BOOTS: 1188 case BOOTS:
1284 case GLOVES: 1189 case GLOVES:
1285 case GIRDLE: 1190 case GIRDLE:
1286 case BRACERS: 1191 case BRACERS:
1287 case CLOAK: 1192 case CLOAK:
1288 if (ARMOUR_SPEED (op)) 1193 if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1289 { 1194 if (ARMOUR_SPELLS (op)) buf.printf ("(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1290 sprintf (buf, "(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1291 strcat (retbuf, buf);
1292 }
1293 if (ARMOUR_SPELLS (op))
1294 {
1295 sprintf (buf, "(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1296 strcat (retbuf, buf);
1297 }
1298 more_info = 1; 1195 more_info = 1;
1299 break; 1196 break;
1300 1197
1301 case WEAPON: 1198 case WEAPON:
1302 /* Calculate it the same way fix_player does so the results 1199 /* Calculate it the same way fix_player does so the results
1303 * make sense. 1200 * make sense.
1304 */ 1201 */
1305 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2; 1202 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1306 if (i < 0) 1203 if (i < 0)
1307 i = 0; 1204 i = 0;
1308 1205
1309 sprintf (buf, "(weapon speed %d)", i); 1206 buf.printf ("(weapon speed %d)", i);
1310 strcat (retbuf, buf);
1311 more_info = 1; 1207 more_info = 1;
1312 break; 1208 break;
1313
1314 } 1209 }
1210
1315 if (more_info) 1211 if (more_info)
1316 { 1212 {
1317 if (op->stats.food)
1318 {
1319 if (op->stats.food != 0)
1320 sprintf (buf, "(sustenance%+d)", op->stats.food); 1213 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
1321 strcat (retbuf, buf);
1322 }
1323 if (op->stats.grace)
1324 {
1325 sprintf (buf, "(grace%+d)", op->stats.grace); 1214 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1326 strcat (retbuf, buf); 1215 if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp);
1327 }
1328 if (op->stats.sp)
1329 {
1330 sprintf (buf, "(magic%+d)", op->stats.sp);
1331 strcat (retbuf, buf);
1332 }
1333 if (op->stats.hp)
1334 {
1335 sprintf (buf, "(regeneration%+d)", op->stats.hp); 1216 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1336 strcat (retbuf, buf);
1337 }
1338 } 1217 }
1339 1218
1340 if (op->stats.luck) 1219 if (op->stats.luck)
1341 {
1342 sprintf (buf, "(luck%+d)", op->stats.luck); 1220 buf.printf ("(luck%+d)", op->stats.luck);
1343 strcat (retbuf, buf); 1221
1344 } 1222 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1345 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 1223 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1346 strcat (retbuf, "(lifesaving)"); 1224 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1347 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 1225 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1348 strcat (retbuf, "(reflect spells)"); 1226
1349 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
1350 strcat (retbuf, "(reflect missiles)");
1351 if (QUERY_FLAG (op, FLAG_STEALTH))
1352 strcat (retbuf, "(stealth)");
1353 if (op->slaying != NULL && op->type != FOOD) 1227 if (op->slaying && op->type != FOOD)
1354 {
1355 sprintf (buf, "(slay %s)", &op->slaying); 1228 buf.printf ("(slay %s)", &op->slaying);
1356 strcat (retbuf, buf); 1229
1357 } 1230 if (op->type == SKILL_TOOL && op->skill)
1358 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1231 buf.printf ("(%s)", &op->skill);
1232
1233 buf.add_abilities ("Attacks", op->attacktype);
1359 /* resistance on flesh is only visible for quetzals. If 1234 /* resistance on flesh is only visible for quetzals. If
1360 * non flesh, everyone can see its resistances 1235 * non flesh, everyone can see its resistances
1361 */ 1236 */
1362 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1237 if (op->type != FLESH || (owner && owner->is_dragon ()))
1363 strcat (retbuf, describe_resistance (op, 0)); 1238 buf << describe_resistance (op, 0);
1364 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1365 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1366 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1367 }
1368 1239
1240 buf.add_paths ("Attuned", op->path_attuned);
1241 buf.add_paths ("Repelled", op->path_repelled);
1242 buf.add_paths ("Denied", op->path_denied);
1243 }
1244
1369 return retbuf; 1245 return buf;
1246}
1247
1248std::string
1249object::describe_item (object *who)
1250{
1251 return std::string (::describe_item (this, who));
1252}
1253
1254static void
1255describe_dump_object (dynbuf &buf, object *ob)
1256{
1257 char *txt = dump_object (ob);
1258 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1259 buf << "\n" << txt << "\n";
1260
1261 if (!ob->is_arch ())
1262 describe_dump_object (buf, ob->arch);
1263}
1264
1265std::string
1266object::describe (object *who)
1267{
1268 dynbuf_text buf (1024, 1024);
1269
1270 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1271
1272 if (custom_name)
1273 buf.printf ("You call it %s.\r", &custom_name);
1274
1275 switch (type)
1276 {
1277 case SPELLBOOK:
1278 if (flag [FLAG_IDENTIFIED] && inv)
1279 buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill);
1280 break;
1281
1282 case BOOK:
1283 if (msg)
1284 buf << "Something is written in it.\r";
1285 break;
1286
1287 case CONTAINER:
1288 if (race)
1289 {
1290 if (weight_limit && stats.Str < 100)
1291 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1292 &race, weight_limit / (10.0 * (100 - stats.Str)));
1293 else
1294 buf.printf ("It can hold only %s.\r", &race);
1295 }
1296 else if (weight_limit && stats.Str < 100)
1297 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1298 break;
1299
1300 case WAND:
1301 if (flag [FLAG_IDENTIFIED])
1302 buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
1303 break;
1304 }
1305
1306 if (material != MATERIAL_NULL && !msg)
1307 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1308 << material->description
1309 << ".\r";
1310
1311 if (who)
1312 /* Where to wear this item */
1313 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1314 if (slot[i].info)
1315 {
1316 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1317
1318 if (slot[i].info < -1 && who->slot[i].info)
1319 buf.printf ("(%d)", -slot[i].info);
1320
1321 buf << ".\r";
1322 }
1323
1324 if (weight)
1325 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1326
1327 if (flag [FLAG_STARTEQUIP])
1328 buf << (nrof > 1 ? "They were" : "It was")
1329 << " given by a god and will vanish when dropped.\r";
1330
1331 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1332 {
1333 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1334
1335 if (who->is_in_shop ())
1336 {
1337 if (flag [FLAG_UNPAID])
1338 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1339 else
1340 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1341 }
1342 }
1343
1344 if (flag [FLAG_MONSTER])
1345 buf << describe_monster (who);
1346
1347 /* Is this item buildable? */
1348 if (flag [FLAG_IS_BUILDABLE])
1349 buf << "This is a buildable item.\r";
1350
1351 /* Does the object have a message? Don't show message for all object
1352 * types - especially if the first entry is a match
1353 */
1354 if (msg)
1355 {
1356 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1357 {
1358 if (!need_identify ())
1359 buf << '\r' << msg << '\n';
1360 else if (flag [FLAG_IDENTIFIED])
1361 buf << '\r' << "The object has a story:\r" << msg;
1362 }
1363 }
1364 else if (inv
1365 && inv->msg
1366 && inv->type == SPELL
1367 && flag [FLAG_IDENTIFIED]
1368 && (type == SPELLBOOK || type == ROD || type == WAND
1369 || type == ROD || type == POTION || type == SCROLL))
1370 // for spellbooks and other stuff that contains spells, print the spell message,
1371 // unless the object has a custom message handled above.
1372 buf << '\r' << inv->msg << '\n';
1373
1374 // try to display the duration for some potions and scrolls
1375 // this includes change ability potions and group spells,
1376 // but does not handle protection potions
1377 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1378 && (type == POTION || type == SCROLL))
1379 {
1380 object *spell = inv;
1381
1382 if (spell->subtype == SP_PARTY_SPELL)
1383 spell = spell->other_arch;
1384
1385 if (spell->subtype == SP_CHANGE_ABILITY)
1386 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1387 TICK2TIME (change_ability_duration (spell, this)));
1388 }
1389
1390 // some help text for skill tools
1391 if (type == SKILL_TOOL)
1392 buf << "\nH<This item is a skill tool: as long as you have this item applied "
1393 "you can use the " << &skill << " skill as if you had learned it.>";
1394
1395 // Display a hint about inscribable items [empty books]
1396 // This includes the amount of text they can hold.
1397 if (type == INSCRIBABLE)
1398 {
1399 if (other_arch && other_arch->type == SCROLL)
1400 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1401 else
1402 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1403 weight_limit);
1404 }
1405
1406 buf << '\n';
1407
1408 // the dungeon master additionally gets a complete dump
1409 if (who && who->flag [FLAG_WIZLOOK])
1410 {
1411 buf << "\nT<Object>\n";
1412 describe_dump_object (buf, this);
1413
1414 if (inv)
1415 {
1416 buf << "\nT<Top Inventory>\n";
1417 describe_dump_object (buf, inv);
1418 }
1419 }
1420
1421 return std::string (buf.linearise (), buf.size ());
1422}
1423
1424void
1425examine (object *op, object *tmp)
1426{
1427 std::string info = tmp->describe (op);
1428
1429 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1430}
1431
1432/*
1433 * inventory prints object's inventory. If inv==NULL then print player's
1434 * inventory.
1435 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1436 */
1437const char *
1438object::query_inventory (object *who, const char *indent)
1439{
1440 static dynbuf_text buf; buf.clear ();
1441
1442 for (object *tmp = inv; tmp; tmp = tmp->below)
1443 if (who && who->flag [FLAG_WIZ])
1444 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1445 else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED]))
1446 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1447
1448 if (buf.size ())
1449 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1450 else
1451 buf.printf ("%s(empty)\n", indent);
1452
1453 return buf;
1370} 1454}
1371 1455
1372/* Return true if the item is magical. A magical item is one that 1456/* Return true if the item is magical. A magical item is one that
1373 * increases/decreases any abilities, provides a resistance, 1457 * increases/decreases any abilities, provides a resistance,
1374 * has a generic magical bonus, or is an artifact. 1458 * has a generic magical bonus, or is an artifact.
1375 * This function is used by detect_magic to determine if an item 1459 * This function is used by detect_magic to determine if an item
1376 * should be marked as magical. 1460 * should be marked as magical.
1377 */ 1461 */
1378
1379int 1462int
1380is_magical (const object *op) 1463is_magical (const object *op)
1381{ 1464{
1382 int i; 1465 int i;
1383 1466
1384 /* living creatures are considered non magical */ 1467 /* living creatures are considered non magical */
1385 if (QUERY_FLAG (op, FLAG_ALIVE)) 1468 if (op->flag [FLAG_ALIVE])
1386 return 0; 1469 return 0;
1387 1470
1388 /* 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 */
1389 if (op->title != NULL) 1472 if (op->title != NULL)
1390 return 1; 1473 return 1;
… …
1396 (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))
1397 return 1; 1480 return 1;
1398 1481
1399 /* 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 */
1400 /* Presume any boots that hvae a move_type are special. */ 1483 /* Presume any boots that hvae a move_type are special. */
1401 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)))
1402 return 1; 1485 return 1;
1403 1486
1404 /* Take care of amulet/shield that reflects spells/missiles */ 1487 /* Take care of amulet/shield that reflects spells/missiles */
1405 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]))
1406 return 1; 1489 return 1;
1407 1490
1408 /* Take care of helmet of xrays */ 1491 /* Take care of helmet of xrays */
1409 if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) 1492 if (op->type == HELMET && op->flag [FLAG_XRAYS])
1410 return 1; 1493 return 1;
1411 1494
1412 /* Potions & rods are always magical. Wands/staves are also magical, 1495 /* Potions & rods are always magical. Wands/staves are also magical,
1413 * assuming they still have any charges left. 1496 * assuming they still have any charges left.
1414 */ 1497 */
… …
1434 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE) 1517 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE)
1435 return 1; 1518 return 1;
1436 1519
1437 /* Check to see if it increases/decreases any stats */ 1520 /* Check to see if it increases/decreases any stats */
1438 for (i = 0; i < NUM_STATS; i++) 1521 for (i = 0; i < NUM_STATS; i++)
1439 if (get_attr_value (&(op->stats), i) != 0) 1522 if (op->stats.stat (i))
1440 return 1; 1523 return 1;
1441 1524
1442 /* If it doesn't fall into any of the above categories, must 1525 /* If it doesn't fall into any of the above categories, must
1443 * be non magical. 1526 * be non magical.
1444 */ 1527 */
1445 return 0; 1528 return 0;
1446} 1529}
1447 1530
1448/* need_identify returns true if the item should be identified. This
1449 * function really should not exist - by default, any item not identified
1450 * should need it.
1451 */
1452
1453int
1454need_identify (const object *op)
1455{
1456 switch (op->type)
1457 {
1458 case RING:
1459 case WAND:
1460 case ROD:
1461 case HORN:
1462 case SCROLL:
1463 case SKILL:
1464 case SKILLSCROLL:
1465 case SPELLBOOK:
1466 case FOOD:
1467 case POTION:
1468 case BOW:
1469 case ARROW:
1470 case WEAPON:
1471 case ARMOUR:
1472 case SHIELD:
1473 case HELMET:
1474 case AMULET:
1475 case BOOTS:
1476 case GLOVES:
1477 case BRACERS:
1478 case GIRDLE:
1479 case CONTAINER:
1480 case DRINK:
1481 case FLESH:
1482 case INORGANIC:
1483 case CLOSE_CON:
1484 case CLOAK:
1485 case GEM:
1486 case POWER_CRYSTAL:
1487 case POISON:
1488 case BOOK:
1489 case SKILL_TOOL:
1490 return 1;
1491 }
1492 /* Try to track down some stuff that may show up here. Thus, the
1493 * archetype file can be updated, and this function removed.
1494 */
1495#if 0
1496 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1497#endif
1498 return 0;
1499}
1500
1501/* 1531/*
1502 * Supposed to fix face-values as well here, but later. 1532 * Supposed to fix face-values as well here, but later.
1503 */ 1533 */
1504void 1534void
1505identify (object *op) 1535identify (object *op)
1506{ 1536{
1507 object *pl; 1537 op->set_flag (FLAG_IDENTIFIED);
1508 1538 op->clr_flag (FLAG_KNOWN_MAGICAL);
1509 SET_FLAG (op, FLAG_IDENTIFIED); 1539 op->clr_flag (FLAG_NO_SKILL_IDENT);
1510 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
1511 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
1512 1540
1513 /* 1541 /*
1514 * We want autojoining of equal objects: 1542 * We want autojoining of equal objects:
1515 */ 1543 */
1516 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 1544 if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])
1517 SET_FLAG (op, FLAG_KNOWN_CURSED); 1545 op->set_flag (FLAG_KNOWN_CURSED);
1518 1546
1519 if (op->type == POTION) 1547 if (op->type == POTION)
1520 { 1548 {
1521 if (op->inv && op->randomitems) 1549 if (op->inv && op->randomitems)
1522 op->title = op->inv->name; 1550 op->title = op->inv->name;
1523 else if (op->arch) 1551 else if (op->arch)
1524 { 1552 {
1525 op->name = op->arch->clone.name; 1553 op->name = op->arch->object::name;
1526 op->name_pl = op->arch->clone.name_pl; 1554 op->name_pl = op->arch->object::name_pl;
1527 } 1555 }
1528 } 1556 }
1529 1557
1530 /* 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 */
1531 if (op->map) 1559 if (op->map)
1532 update_object (op, UP_OBJ_FACE); 1560 update_object (op, UP_OBJ_CHANGE);
1533 else 1561
1534 { 1562 if (object *pl = op->visible_to ())
1535 pl = op->in_player ();
1536 if (pl)
1537 /* 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
1538 * it all. 1564 * it all.
1539 */ 1565 */
1540 esrv_send_item (pl, op); 1566 esrv_send_item (pl, op);
1541 }
1542} 1567}
1543 1568

Diff Legend

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