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.5 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.74 by root, Fri Mar 26 01:04:44 2010 UTC

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

Diff Legend

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