ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/item.C
(Generate patch)

Comparing deliantra/server/common/item.C (file contents):
Revision 1.5 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.85 by root, Wed Apr 21 05:40:21 2010 UTC

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

Diff Legend

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