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.3 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.4 by root, Sun Sep 10 16:00:23 2006 UTC

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

Diff Legend

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