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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines