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.6 by root, Thu Sep 14 22:33:58 2006 UTC vs.
Revision 1.83 by root, Sun Apr 11 00:34:05 2010 UTC

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

Diff Legend

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