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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.76 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.183 by root, Thu Jan 8 04:35:04 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
23
24#include <cmath>
24 25
25#include <global.h> 26#include <global.h>
26#include <living.h> 27#include <living.h>
27#include <spells.h> 28#include <spells.h>
28#include <skills.h> 29#include <skills.h>
… …
30 31
31#include <sproto.h> 32#include <sproto.h>
32 33
33/* Want this regardless of rplay. */ 34/* Want this regardless of rplay. */
34#include <sounds.h> 35#include <sounds.h>
35
36/* need math lib for double-precision and pow() in dragon_eat_flesh() */
37#include <math.h>
38 36
39/** 37/**
40 * Check if op should abort moving victim because of it's race or slaying. 38 * Check if op should abort moving victim because of it's race or slaying.
41 * Returns 1 if it should abort, returns 0 if it should continue. 39 * Returns 1 if it should abort, returns 0 if it should continue.
42 */ 40 */
… …
55 * subtype 5: arch or race 53 * subtype 5: arch or race
56 * subtype 7: all three 54 * subtype 7: all three
57 */ 55 */
58 if (op->subtype) 56 if (op->subtype)
59 { 57 {
60 arch_flag = (op->subtype & 1); 58 arch_flag = op->subtype & 1;
61 name_flag = (op->subtype & 2); 59 name_flag = op->subtype & 2;
62 race_flag = (op->subtype & 4); 60 race_flag = op->subtype & 4;
63 } 61 }
64 else 62 else
65 { 63 {
66 arch_flag = 1; 64 arch_flag = 1;
67 name_flag = 1; 65 name_flag = 1;
… …
70 68
71 /* If the director has race set, only affect objects with a arch, 69 /* If the director has race set, only affect objects with a arch,
72 * name or race that matches. 70 * name or race that matches.
73 */ 71 */
74 if ((op->race) && 72 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) && 73 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
76 ((!(victim->name && name_flag) || op->race != victim->name)) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || op->race != victim->race))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
78 return 1; 76 return 1;
79 77
80 /* If the director has slaying set, only affect objects where none 78 /* If the director has slaying set, only affect objects where none
81 * of arch, name, or race match. 79 * of arch, name, or race match.
82 */ 80 */
83 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) || 81 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
84 ((victim->name && name_flag && op->slaying == victim->name)) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
85 ((victim->race && race_flag && op->slaying == victim->race))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
86 return 1; 84 return 1;
87 85
88 return 0; 86 return 0;
… …
94 * Return value: 1 if money was destroyed, 0 if not. 92 * Return value: 1 if money was destroyed, 0 if not.
95 */ 93 */
96static int 94static int
97apply_id_altar (object *money, object *altar, object *pl) 95apply_id_altar (object *money, object *altar, object *pl)
98{ 96{
99 object *id, *marked; 97 dynbuf_text buf;
100 int success = 0;
101 98
102 if (pl == NULL || pl->type != PLAYER) 99 if (!pl || pl->type != PLAYER)
103 return 0; 100 return 0;
104 101
105 /* Check for MONEY type is a special hack - it prevents 'nothing needs 102 /* Check for MONEY type is a special hack - it prevents 'nothing needs
106 * identifying' from being printed out more than it needs to be. 103 * identifying' from being printed out more than it needs to be.
107 */ 104 */
108 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 105 if (!check_altar_sacrifice (altar, money) || money->type != MONEY)
109 return 0; 106 return 0;
110 107
111 marked = find_marked_object (pl);
112 /* if the player has a marked item, identify that if it needs to be 108 /* if the player has a marked item, identify that if it needs to be
113 * identified. IF it doesn't, then go through the player inventory. 109 * identified. If it doesn't, then go through the player inventory.
114 */ 110 */
111 if (object *marked = find_marked_object (pl))
115 if (marked && !QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 112 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
116 { 113 {
117 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
118 { 115 {
119 identify (marked); 116 identify (marked);
120 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (marked, pl)); 117
118 buf.printf ("You have %s.\r", long_desc (marked, pl));
121 if (marked->msg) 119 if (marked->msg)
122 { 120 buf << "The item has a story:\r" << marked->msg << "\n\n";
123 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 121
124 new_draw_info (NDI_UNIQUE, 0, pl, marked->msg); 122 return !money;
125 } 123 }
126 return money == NULL;
127 } 124 }
128 }
129 125
130 for (id = pl->inv; id; id = id->below) 126 for (object *id = pl->inv; id; id = id->below)
131 { 127 {
132 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 128 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
133 { 129 {
134 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
135 { 131 {
136 identify (id); 132 identify (id);
137 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (id, pl)); 133
134 buf.printf ("You have %s.\r", long_desc (id, pl));
138 if (id->msg) 135 if (id->msg)
139 { 136 buf << "The item has a story:\r" << id->msg << "\n\n";
140 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 137
141 new_draw_info (NDI_UNIQUE, 0, pl, id->msg);
142 }
143 success = 1;
144 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
145 if (money == NULL || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
146 break; 140 break;
147 } 141 }
148 else 142 else
149 { 143 {
150 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n"); 144 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n");
151 break; 145 break;
152 } 146 }
153 } 147 }
154 } 148 }
155 if (!success) 149
156 new_draw_info (NDI_UNIQUE, 0, pl, "You have nothing that needs identifying"); 150 if (buf.empty ())
151 pl->failmsg ("You have nothing that needs identifying");
152 else
153 pl->contr->infobox (MSG_CHANNEL ("identify"), buf);
154
157 return money == NULL; 155 return !money;
158} 156}
159 157
160/** 158/**
161 * This checks whether the object has a "on_use_yield" field, and if so generated and drops 159 * This checks whether the object has a "on_use_yield" field, and if so generated and drops
162 * matching item. 160 * matching item.
163 **/ 161 **/
164static void 162void
165handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
166{ 164{
167 const char *yield; 165 if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
168 166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
169 yield = get_ob_key_value (tmp, "on_use_yield");
170 if (yield != NULL)
171 {
172 object *drop = get_archetype (yield);
173
174 if (tmp->env)
175 {
176 drop = insert_ob_in_ob (drop, tmp->env);
177 if (tmp->env->type == PLAYER)
178 esrv_send_item (tmp->env, drop);
179 }
180 else
181 {
182 drop->x = tmp->x;
183 drop->y = tmp->y;
184 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
185 }
186 }
187} 167}
188 168
189/** 169/**
190 * Handles applying a potion. 170 * Handles applying a potion.
191 */ 171 */
… …
197 177
198 floor = GET_MAP_OB (op->map, op->x, op->y); 178 floor = GET_MAP_OB (op->map, op->x, op->y);
199 179
200 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 180 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
201 { 181 {
202 if (op->type == PLAYER)
203 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 182 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
183
204 CLEAR_FLAG (tmp, FLAG_APPLIED); 184 CLEAR_FLAG (tmp, FLAG_APPLIED);
205 return 0; 185 return 0;
206 } 186 }
207 187
208 if (op->type == PLAYER) 188 if (op->type == PLAYER)
… …
219 199
220 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 200 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
221 { 201 {
222 op->drain_stat (); 202 op->drain_stat ();
223 op->update_stats (); 203 op->update_stats ();
224 decrease_ob (tmp); 204 tmp->decrease ();
225 return 1; 205 return 1;
226 } 206 }
227 207
228 if (!(at = archetype::find (ARCH_DEPLETION))) 208 if (!(at = archetype::find (ARCH_DEPLETION)))
229 { 209 {
230 LOG (llevError, "Could not find archetype depletion\n"); 210 LOG (llevError, "Could not find archetype depletion\n");
231 return 0; 211 return 0;
232 } 212 }
213
233 depl = present_arch_in_ob (at, op); 214 depl = present_arch_in_ob (at, op);
234 215
235 if (depl) 216 if (depl)
236 { 217 {
237 for (i = 0; i < NUM_STATS; i++) 218 for (i = 0; i < NUM_STATS; i++)
238 if (get_attr_value (&depl->stats, i)) 219 if (depl->stats.stat (i))
239 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 220 op->statusmsg (restore_msg[i]);
240 221
241 depl->destroy (); 222 depl->destroy ();
242 op->update_stats (); 223 op->update_stats ();
243 } 224 }
244 else 225 else
245 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 226 op->statusmsg ("Your potion had no effect.");
246 227
247 decrease_ob (tmp); 228 tmp->decrease ();
248 return 1; 229 return 1;
249 } 230 }
250 231
251 /* improvement potion - only for players */ 232 /* improvement potion - only for players */
252 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 233 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
253 { 234 {
254 for (i = 1; i < MIN (11, op->level); i++) 235 for (i = 1; i < MIN (11, op->level); i++)
255 { 236 {
256 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 237 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
257 { 238 {
258 if (op->contr->levhp[i] != 1) 239 if (op->contr->levhp[i] != 1)
259 { 240 {
260 op->contr->levhp[i] = 1; 241 op->contr->levhp[i] = 1;
261 break; 242 break;
262 } 243 }
244
263 if (op->contr->levsp[i] != 1) 245 if (op->contr->levsp[i] != 1)
264 { 246 {
265 op->contr->levsp[i] = 1; 247 op->contr->levsp[i] = 1;
266 break; 248 break;
267 } 249 }
250
268 if (op->contr->levgrace[i] != 1) 251 if (op->contr->levgrace[i] != 1)
269 { 252 {
270 op->contr->levgrace[i] = 1; 253 op->contr->levgrace[i] = 1;
271 break; 254 break;
272 } 255 }
… …
276 if (op->contr->levhp[i] < 9) 259 if (op->contr->levhp[i] < 9)
277 { 260 {
278 op->contr->levhp[i] = 9; 261 op->contr->levhp[i] = 9;
279 break; 262 break;
280 } 263 }
264
281 if (op->contr->levsp[i] < 6) 265 if (op->contr->levsp[i] < 6)
282 { 266 {
283 op->contr->levsp[i] = 6; 267 op->contr->levsp[i] = 6;
284 break; 268 break;
285 } 269 }
270
286 if (op->contr->levgrace[i] < 3) 271 if (op->contr->levgrace[i] < 3)
287 { 272 {
288 op->contr->levgrace[i] = 3; 273 op->contr->levgrace[i] = 3;
289 break; 274 break;
290 } 275 }
… …
298 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 283 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
299 { 284 {
300 if (got_one) 285 if (got_one)
301 { 286 {
302 op->update_stats (); 287 op->update_stats ();
303 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 288 op->statusmsg ("The Gods smile upon you and remake you "
304 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 289 "a little more in their image. "
305 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 290 "You feel a little more perfect.", NDI_GREEN);
306 } 291 }
307 else 292 else
308 new_draw_info (NDI_UNIQUE, 0, op, "The potion had no effect - you are already perfect"); 293 op->statusmsg ("The potion had no effect - you are already perfect.");
309 } 294 }
310 else 295 else
311 { /* cursed potion */ 296 { /* cursed potion */
312 if (got_one) 297 if (got_one)
313 { 298 {
314 op->update_stats (); 299 op->update_stats ();
315 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 300 op->failmsg ("The Gods are angry and punish you.");
316 } 301 }
317 else 302 else
318 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 303 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
319 } 304 }
320 305
321 decrease_ob (tmp); 306 tmp->decrease ();
322 return 1; 307 return 1;
323 } 308 }
324 309
325 310
326 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 311 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
332 { 317 {
333 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
334 { 319 {
335 object *fball; 320 object *fball;
336 321
337 new_draw_info (NDI_UNIQUE, 0, op, "Yech! Your lungs are on fire!"); 322 op->failmsg ("Yech! Your lungs are on fire!");
323
338 /* Explodes a fireball centered at player */ 324 /* Explodes a fireball centered at player */
339 fball = get_archetype (EXPLODING_FIREBALL); 325 fball = get_archetype (EXPLODING_FIREBALL);
340 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1; 326 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
341 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2; 327 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
342 fball->x = op->x; 328 fball->x = op->x;
… …
344 insert_ob_in_map (fball, op->map, NULL, 0); 330 insert_ob_in_map (fball, op->map, NULL, 0);
345 } 331 }
346 else 332 else
347 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 333 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
348 334
349 decrease_ob (tmp); 335 tmp->decrease ();
336
350 /* if youre dead, no point in doing this... */ 337 /* if youre dead, no point in doing this... */
351 if (!QUERY_FLAG (op, FLAG_REMOVED)) 338 if (!QUERY_FLAG (op, FLAG_REMOVED))
352 op->update_stats (); 339 op->update_stats ();
340
353 return 1; 341 return 1;
354 } 342 }
355 343
356 /* Deal with protection potions */ 344 /* Deal with protection potions */
357 force = NULL; 345 force = NULL;
… …
359 { 347 {
360 if (tmp->resist[i]) 348 if (tmp->resist[i])
361 { 349 {
362 if (!force) 350 if (!force)
363 force = get_archetype (FORCE_NAME); 351 force = get_archetype (FORCE_NAME);
352
364 memcpy (force->resist, tmp->resist, sizeof (tmp->resist)); 353 memcpy (force->resist, tmp->resist, sizeof (tmp->resist));
365 force->type = POTION_EFFECT; 354 force->type = POTION_EFFECT;
366 break; /* Only need to find one protection since we copy entire batch */ 355 break; /* Only need to find one protection since we copy entire batch */
367 } 356 }
368 } 357 }
358
369 /* This is a protection potion */ 359 /* This is a protection potion */
370 if (force) 360 if (force)
371 { 361 {
372 /* cursed items last longer */ 362 /* cursed items last longer */
373 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 363 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
… …
375 force->stats.food *= 10; 365 force->stats.food *= 10;
376 for (i = 0; i < NROFATTACKS; i++) 366 for (i = 0; i < NROFATTACKS; i++)
377 if (force->resist[i] > 0) 367 if (force->resist[i] > 0)
378 force->resist[i] = -force->resist[i]; /* prot => vuln */ 368 force->resist[i] = -force->resist[i]; /* prot => vuln */
379 } 369 }
370
380 force->speed_left = -1; 371 force->speed_left = -1;
381 force = insert_ob_in_ob (force, op); 372 force = insert_ob_in_ob (force, op);
382 CLEAR_FLAG (tmp, FLAG_APPLIED); 373 CLEAR_FLAG (tmp, FLAG_APPLIED);
383 SET_FLAG (force, FLAG_APPLIED); 374 SET_FLAG (force, FLAG_APPLIED);
384 change_abil (op, force); 375 change_abil (op, force);
385 decrease_ob (tmp); 376 tmp->decrease ();
386 return 1; 377 return 1;
387 } 378 }
388 379
389 /* Only thing left are the stat potions */ 380 /* Only thing left are the stat potions */
390 if (op->type == PLAYER) 381 if (op->type == PLAYER)
391 { /* only for players */ 382 { /* only for players */
392 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 383 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0)
393 CLEAR_FLAG (tmp, FLAG_APPLIED); 384 CLEAR_FLAG (tmp, FLAG_APPLIED);
394 else 385 else
395 SET_FLAG (tmp, FLAG_APPLIED); 386 SET_FLAG (tmp, FLAG_APPLIED);
387
396 if (!change_abil (op, tmp)) 388 if (!change_abil (op, tmp))
397 new_draw_info (NDI_UNIQUE, 0, op, "Nothing happened."); 389 op->statusmsg ("Nothing happened.");
398 } 390 }
399 391
400 /* CLEAR_FLAG is so that if the character has other potions 392 /* CLEAR_FLAG is so that if the character has other potions
401 * that were grouped with the one consumed, his 393 * that were grouped with the one consumed, his
402 * stat will not be raised by them. fix_player just clears 394 * stat will not be raised by them. fix_player just clears
403 * up all the stats. 395 * up all the stats.
404 */ 396 */
405 CLEAR_FLAG (tmp, FLAG_APPLIED); 397 CLEAR_FLAG (tmp, FLAG_APPLIED);
406 op->update_stats (); 398 op->update_stats ();
407 decrease_ob (tmp); 399 tmp->decrease ();
408 return 1; 400 return 1;
409} 401}
410 402
411/**************************************************************************** 403/****************************************************************************
412 * Weapon improvement code follows 404 * Weapon improvement code follows
… …
414 406
415/** 407/**
416 * This returns the sum of nrof of item (arch name). 408 * This returns the sum of nrof of item (arch name).
417 */ 409 */
418static int 410static int
419check_item (object *op, const char *item) 411check_item (object *op, shstr_cmp item)
420{ 412{
421 int count = 0; 413 int count = 0;
422 414
423 415 if (!item)
424 if (item == NULL)
425 return 0; 416 return 0;
426 417
427 op = op->below; 418 for (op = op->below; op; op = op->below)
428 while (op != NULL) 419 if (op->arch->archname == item)
429 {
430 if (strcmp (op->arch->name, item) == 0)
431 {
432 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 420 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
433 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 421 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
434 {
435 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
436 count++;
437 else
438 count += op->nrof; 422 count += op->number_of ();
439 }
440 }
441
442 op = op->below;
443 }
444 423
445 return count; 424 return count;
446} 425}
447 426
448/** 427/**
… …
450 * op is typically the player, which is only 429 * op is typically the player, which is only
451 * really used to determine what space to look at. 430 * really used to determine what space to look at.
452 * Modified to only eat 'nrof' of objects. 431 * Modified to only eat 'nrof' of objects.
453 */ 432 */
454static void 433static void
455eat_item (object *op, const char *item, uint32 nrof) 434eat_item (object *op, shstr_cmp item, uint32 nrof)
456{ 435{
457 object *prev; 436 object *prev;
458 437
459 prev = op; 438 prev = op;
460 op = op->below; 439 op = op->below;
461 440
462 while (op != NULL) 441 while (op)
463 { 442 {
464 if (strcmp (op->arch->name, item) == 0) 443 if (op->arch->archname == item)
465 { 444 {
466 if (op->nrof >= nrof) 445 if (op->nrof >= nrof)
467 { 446 {
468 decrease_ob_nr (op, nrof); 447 op->decrease (nrof);
469 return; 448 return;
470 } 449 }
471 else 450 else
472 { 451 {
473 decrease_ob_nr (op, op->nrof); 452 op->decrease (nrof);
474 nrof -= op->nrof; 453 nrof -= op->nrof;
475 } 454 }
455
476 op = prev; 456 op = prev;
477 } 457 }
458
478 prev = op; 459 prev = op;
479 op = op->below; 460 op = op->below;
480 } 461 }
481} 462}
482 463
… …
488 * we return 1 (true) if the player can use the weapon. 469 * we return 1 (true) if the player can use the weapon.
489 */ 470 */
490static int 471static int
491check_weapon_power (const object *who, int improvs) 472check_weapon_power (const object *who, int improvs)
492{ 473{
493
494/* Old code is below (commented out). Basically, since weapons are the only 474/* Old code is below (commented out). Basically, since weapons are the only
495 * object players really have any control to improve, it's a bit harsh to 475 * object players really have any control to improve, it's a bit harsh to
496 * require high level in some combat skill, so we just use overall level. 476 * require high level in some combat skill, so we just use overall level.
497 */ 477 */
498#if 1 478#if 1
… …
539static int 519static int
540check_sacrifice (object *op, const object *improver) 520check_sacrifice (object *op, const object *improver)
541{ 521{
542 int count = 0; 522 int count = 0;
543 523
544 if (improver->slaying != NULL) 524 if (improver->slaying)
545 { 525 {
546 count = check_item (op, improver->slaying); 526 count = check_item (op, improver->slaying);
547 if (count < 1) 527 if (count < 1)
548 { 528 {
549 char buf[200];
550
551 sprintf (buf, "The gods want more %ss", &improver->slaying); 529 op->failmsg (format ("The gods want more %ss", &improver->slaying));
552 new_draw_info (NDI_UNIQUE, 0, op, buf);
553 return 0; 530 return 0;
554 } 531 }
555 } 532 }
556 else 533 else
557 count = 1; 534 count = 1;
… …
560} 537}
561 538
562/** 539/**
563 * Actually improves the weapon, and tells user. 540 * Actually improves the weapon, and tells user.
564 */ 541 */
565int 542static int
566improve_weapon_stat (object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname) 543improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
567{ 544{
568
569 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
570 *stat += sacrifice_count; 545 stat += sacrifice_count;
571 weapon->last_eat++; 546 weapon->last_eat++;
572 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 547 improver->decrease ();
573 decrease_ob (improver);
574 548
575 /* So it updates the players stats and the window */ 549 /* So it updates the players stats and the window */
576 op->update_stats (); 550 op->update_stats ();
551
552 op->statusmsg (format (
553 "Your sacrifice was accepted.\n"
554 "Weapon's bonus to %s improved by %d.",
555 statname, sacrifice_count
556 ));
557
577 return 1; 558 return 1;
578} 559}
579 560
580/* Types of improvements, hidden in the sp field. */ 561/* Types of improvements, hidden in the sp field. */
581#define IMPROVE_PREPARE 1 562#define IMPROVE_PREPARE 1
582#define IMPROVE_DAMAGE 2 563#define IMPROVE_DAMAGE 2
583#define IMPROVE_WEIGHT 3 564#define IMPROVE_WEIGHT 3
584#define IMPROVE_ENCHANT 4 565#define IMPROVE_ENCHANT 4
585#define IMPROVE_STR 5 566#define IMPROVE_STR 5
586#define IMPROVE_DEX 6 567#define IMPROVE_DEX 6
587#define IMPROVE_CON 7 568#define IMPROVE_CON 7
588#define IMPROVE_WIS 8 569#define IMPROVE_WIS 8
589#define IMPROVE_CHA 9 570#define IMPROVE_CHA 9
590#define IMPROVE_INT 10 571#define IMPROVE_INT 10
591#define IMPROVE_POW 11 572#define IMPROVE_POW 11
592
593 573
594/** 574/**
595 * This does the prepare weapon scroll. 575 * This does the prepare weapon scroll.
596 * Checks for sacrifice, and so on. 576 * Checks for sacrifice, and so on.
597 */ 577 */
598
599int 578int
600prepare_weapon (object *op, object *improver, object *weapon) 579prepare_weapon (object *op, object *improver, object *weapon)
601{ 580{
602 int sacrifice_count, i; 581 int sacrifice_count, i;
603 char buf[MAX_BUF]; 582 char buf[MAX_BUF];
604 583
605 if (weapon->level != 0) 584 if (weapon->level != 0)
606 { 585 {
607 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 586 op->failmsg ("Weapon is already prepared!");
608 return 0; 587 return 0;
609 } 588 }
589
610 for (i = 0; i < NROFATTACKS; i++) 590 for (i = 0; i < NROFATTACKS; i++)
611 if (weapon->resist[i]) 591 if (weapon->resist[i])
612 break; 592 break;
613 593
614 /* If we break out, i will be less than nrofattacks, preventing 594 /* If we break out, i will be less than nrofattacks, preventing
… …
617 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 597 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
618 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 598 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
619 weapon->stats.exp || /* speed */ 599 weapon->stats.exp || /* speed */
620 weapon->stats.ac) /* AC - only taifu's I think */ 600 weapon->stats.ac) /* AC - only taifu's I think */
621 { 601 {
622 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 602 op->failmsg ("You cannot prepare magic weapons. "
603 "H<A weapon is considered magical if it changes regeneration, "
604 "speed or ac, or has other protections.>");
623 return 0; 605 return 0;
624 } 606 }
607
625 sacrifice_count = check_sacrifice (op, improver); 608 sacrifice_count = check_sacrifice (op, improver);
626 if (sacrifice_count <= 0) 609 if (sacrifice_count <= 0)
627 return 0; 610 return 0;
611
628 weapon->level = isqrt (sacrifice_count); 612 weapon->level = isqrt (sacrifice_count);
629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
630 eat_item (op, improver->slaying, sacrifice_count); 613 eat_item (op, improver->slaying, sacrifice_count);
631 614
632 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level); 615 op->statusmsg (format (
616 "Your sacrifice was accepted."
617 "Your *%s may be improved %d times.",
618 &weapon->name, weapon->level
619 ));
633 620
634 sprintf (buf, "%s's %s", &op->name, &weapon->name); 621 sprintf (buf, "%s's %s", &op->name, &weapon->name);
635 weapon->name = weapon->name_pl = buf; 622 weapon->name = weapon->name_pl = buf;
636 weapon->nrof = 0; /* prevents preparing n weapons in the same 623 weapon->nrof = 0; /* prevents preparing n weapons in the same
637 slot at once! */ 624 slot at once! */
638 decrease_ob (improver); 625 improver->decrease ();
639 weapon->last_eat = 0; 626 weapon->last_eat = 0;
640 return 1; 627 return 1;
641} 628}
642
643 629
644/** 630/**
645 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 631 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
646 * This is the new improve weapon code. 632 * This is the new improve weapon code.
647 * Returns 0 if it was not able to work for some reason. 633 * Returns 0 if it was not able to work for some reason.
… …
656improve_weapon (object *op, object *improver, object *weapon) 642improve_weapon (object *op, object *improver, object *weapon)
657{ 643{
658 int sacrifice_count, sacrifice_needed = 0; 644 int sacrifice_count, sacrifice_needed = 0;
659 645
660 if (improver->stats.sp == IMPROVE_PREPARE) 646 if (improver->stats.sp == IMPROVE_PREPARE)
661 {
662 return prepare_weapon (op, improver, weapon); 647 return prepare_weapon (op, improver, weapon);
663 } 648
664 if (weapon->level == 0) 649 if (weapon->level == 0)
665 { 650 {
666 new_draw_info (NDI_UNIQUE, 0, op, "This weapon has not been prepared."); 651 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");
667 return 0; 652 return 0;
668 } 653 }
654
669 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 655 if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
670 { 656 {
671 new_draw_info (NDI_UNIQUE, 0, op, "This weapon cannot be improved any more."); 657 op->failmsg ("This weapon cannot be improved any more.");
672 return 0; 658 return 0;
673 } 659 }
660
674 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 661 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))
675 { 662 {
676 new_draw_info (NDI_UNIQUE, 0, op, "Improving the weapon will make it too"); 663 op->failmsg ("Improving the weapon will make it too "
677 new_draw_info (NDI_UNIQUE, 0, op, "powerful for you to use. Unready it if you"); 664 "powerful for you to use. Unready it if you "
678 new_draw_info (NDI_UNIQUE, 0, op, "really want to improve it."); 665 "really want to improve it.");
679 return 0; 666 return 0;
680 } 667 }
668
681 /* This just increases damage by 5 points, no matter what. No sacrifice 669 /* This just increases damage by 5 points, no matter what. No sacrifice
682 * is needed. Since stats.dam is now a 16 bit value and not 8 bit, 670 * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
683 * don't put any maximum value on damage - the limit is how much the 671 * don't put any maximum value on damage - the limit is how much the
684 * weapon can be improved. 672 * weapon can be improved.
685 */ 673 */
686 if (improver->stats.sp == IMPROVE_DAMAGE) 674 if (improver->stats.sp == IMPROVE_DAMAGE)
687 { 675 {
688 weapon->stats.dam += 5; 676 weapon->stats.dam += 5;
689 weapon->weight += 5000; /* 5 KG's */ 677 weapon->weight += 5000; /* 5 KG's */
690 new_draw_info_format (NDI_UNIQUE, 0, op, "Damage has been increased by 5 to %d", weapon->stats.dam); 678 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
691 weapon->last_eat++; 679 weapon->last_eat++;
692 680
693 weapon->item_power++; 681 weapon->item_power++;
694 decrease_ob (improver); 682 improver->decrease ();
695 return 1; 683 return 1;
696 } 684 }
685
697 if (improver->stats.sp == IMPROVE_WEIGHT) 686 if (improver->stats.sp == IMPROVE_WEIGHT)
698 { 687 {
699 /* Reduce weight by 20% */ 688 /* Reduce weight by 20% */
700 weapon->weight = (weapon->weight * 8) / 10; 689 weapon->weight = (weapon->weight * 8) / 10;
701 if (weapon->weight < 1) 690 if (weapon->weight < 1)
702 weapon->weight = 1; 691 weapon->weight = 1;
692
703 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon weight reduced to %6.1f kg", (float) weapon->weight / 1000.0); 693 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
704 weapon->last_eat++; 694 weapon->last_eat++;
705 weapon->item_power++; 695 weapon->item_power++;
706 decrease_ob (improver); 696 improver->decrease ();
707 return 1; 697 return 1;
708 } 698 }
699
709 if (improver->stats.sp == IMPROVE_ENCHANT) 700 if (improver->stats.sp == IMPROVE_ENCHANT)
710 { 701 {
711 weapon->magic++; 702 weapon->magic++;
712 weapon->last_eat++; 703 weapon->last_eat++;
713 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon magic increased to %d", weapon->magic); 704 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
714 decrease_ob (improver); 705 improver->decrease ();
715 weapon->item_power++; 706 weapon->item_power++;
716 return 1; 707 return 1;
717 } 708 }
718 709
719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 710 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
724 sacrifice_needed *= 2; 715 sacrifice_needed *= 2;
725 716
726 sacrifice_count = check_sacrifice (op, improver); 717 sacrifice_count = check_sacrifice (op, improver);
727 if (sacrifice_count < sacrifice_needed) 718 if (sacrifice_count < sacrifice_needed)
728 { 719 {
729 new_draw_info_format (NDI_UNIQUE, 0, op, "You need at least %d %s", sacrifice_needed, &improver->slaying); 720 op->failmsg (format ("You need at least %d %s.", sacrifice_needed, &improver->slaying));
730 return 0; 721 return 0;
731 } 722 }
723
732 eat_item (op, improver->slaying, sacrifice_needed); 724 eat_item (op, improver->slaying, sacrifice_needed);
733 weapon->item_power++; 725 weapon->item_power++;
734 726
735 switch (improver->stats.sp) 727 switch (improver->stats.sp)
736 { 728 {
737 case IMPROVE_STR:
738 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Str), 1, "strength"); 729 case IMPROVE_STR: return improve_weapon_stat (op, improver, weapon, weapon->stats.Str, 1, "strength");
739 case IMPROVE_DEX:
740 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Dex), 1, "dexterity"); 730 case IMPROVE_DEX: return improve_weapon_stat (op, improver, weapon, weapon->stats.Dex, 1, "dexterity");
741 case IMPROVE_CON:
742 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Con), 1, "constitution"); 731 case IMPROVE_CON: return improve_weapon_stat (op, improver, weapon, weapon->stats.Con, 1, "constitution");
743 case IMPROVE_WIS:
744 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Wis), 1, "wisdom"); 732 case IMPROVE_WIS: return improve_weapon_stat (op, improver, weapon, weapon->stats.Wis, 1, "wisdom");
745 case IMPROVE_CHA:
746 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Cha), 1, "charisma"); 733 case IMPROVE_CHA: return improve_weapon_stat (op, improver, weapon, weapon->stats.Cha, 1, "charisma");
747 case IMPROVE_INT:
748 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Int), 1, "intelligence"); 734 case IMPROVE_INT: return improve_weapon_stat (op, improver, weapon, weapon->stats.Int, 1, "intelligence");
749 case IMPROVE_POW:
750 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Pow), 1, "power"); 735 case IMPROVE_POW: return improve_weapon_stat (op, improver, weapon, weapon->stats.Pow, 1, "power");
751 default: 736 default:
752 new_draw_info (NDI_UNIQUE, 0, op, "Unknown improvement type."); 737 op->failmsg ("Unknown improvement type.");
753 } 738 }
739
754 LOG (llevError, "improve_weapon: Got to end of function\n"); 740 LOG (llevError, "improve_weapon: Got to end of function\n");
755 return 0; 741 return 0;
756} 742}
757 743
758/** 744/**
… …
765{ 751{
766 object *otmp; 752 object *otmp;
767 753
768 if (op->type != PLAYER) 754 if (op->type != PLAYER)
769 return 0; 755 return 0;
756
770 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 757 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
771 { 758 {
772 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 759 op->failmsg ("Something blocks the magic of the scroll!");
773 return 0; 760 return 0;
774 } 761 }
762
775 otmp = find_marked_object (op); 763 otmp = find_marked_object (op);
764
776 if (!otmp) 765 if (!otmp)
777 { 766 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 767 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
779 return 0; 768 return 0;
780 } 769 }
770
781 if (otmp->type != WEAPON && otmp->type != BOW) 771 if (otmp->type != WEAPON && otmp->type != BOW)
782 { 772 {
783 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 773 op->failmsg ("Marked item is not a weapon or bow!");
784 return 0; 774 return 0;
785 } 775 }
786 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 776
777 op->statusmsg ("Applied weapon builder.");
778
787 improve_weapon (op, tmp, otmp); 779 improve_weapon (op, tmp, otmp);
788 esrv_send_item (op, otmp); 780 esrv_send_item (op, otmp);
789 return 1; 781 return 1;
790} 782}
791 783
… …
816{ 808{
817 object *tmp; 809 object *tmp;
818 810
819 if (armour->magic >= settings.armor_max_enchant) 811 if (armour->magic >= settings.armor_max_enchant)
820 { 812 {
821 new_draw_info (NDI_UNIQUE, 0, op, "This armour can not be enchanted any further."); 813 op->failmsg ("This armour can not be enchanted any further!");
822 return 0; 814 return 0;
823 } 815 }
816
824 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 817 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
825 * etc), so take the easy way out and don't worry about it. 818 * etc), so take the easy way out and don't worry about it.
826 * Note - maybe add scrolls which make the random artifact versions (eg, armour 819 * Note - maybe add scrolls which make the random artifact versions (eg, armour
827 * of gnarg and what not?) 820 * of gnarg and what not?)
828 */ 821 */
829 if (armour->title) 822 if (armour->title)
830 { 823 {
831 new_draw_info (NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 824 op->failmsg ("This armour will not accept further enchantment.");
832 return 0; 825 return 0;
833 } 826 }
834 827
835 /* Split objects if needed. Can't insert tmp until the 828 /* Split objects if needed. Can't insert tmp until the
836 * end of this function - otherwise it will just re-merge. 829 * end of this function - otherwise it will just re-merge.
837 */ 830 */
838 if (armour->nrof > 1) 831 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
839 tmp = get_split_ob (armour, armour->nrof - 1);
840 else
841 tmp = NULL;
842 832
843 armour->magic++; 833 armour->magic++;
844 834
845 if (!settings.armor_speed_linear) 835 if (!settings.armor_speed_linear)
846 { 836 {
… …
851 { 841 {
852 base = base - (base * settings.armor_speed_improvement) / 100; 842 base = base - (base * settings.armor_speed_improvement) / 100;
853 pow++; 843 pow++;
854 } 844 }
855 845
856 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 846 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
857 } 847 }
858 else 848 else
859 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100; 849 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
860 850
861 if (!settings.armor_weight_linear) 851 if (!settings.armor_weight_linear)
862 { 852 {
863 int base = 100; 853 int base = 100;
864 int pow = 0; 854 int pow = 0;
… …
867 { 857 {
868 base = base - (base * settings.armor_weight_reduction) / 100; 858 base = base - (base * settings.armor_weight_reduction) / 100;
869 pow++; 859 pow++;
870 } 860 }
871 861
872 armour->weight = (armour->arch->clone.weight * base) / 100; 862 armour->weight = (armour->arch->weight * base) / 100;
873 } 863 }
874 else 864 else
875 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100; 865 armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
876 866
877 if (armour->weight <= 0) 867 if (armour->weight <= 0)
878 { 868 {
879 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 869 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
880 armour->weight = 1; 870 armour->weight = 1;
881 } 871 }
882 872
883 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic); 873 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
884 874
885 if (op->type == PLAYER) 875 if (op->type == PLAYER)
886 { 876 {
887 esrv_send_item (op, armour); 877 esrv_send_item (op, armour);
878
888 if (QUERY_FLAG (armour, FLAG_APPLIED)) 879 if (QUERY_FLAG (armour, FLAG_APPLIED))
889 op->update_stats (); 880 op->update_stats ();
890 } 881 }
891 decrease_ob (improver); 882
883 improver->decrease ();
884
892 if (tmp) 885 if (tmp)
893 { 886 op->insert (tmp);
894 insert_ob_in_ob (tmp, op); 887
895 esrv_send_item (op, tmp);
896 }
897 return 1; 888 return 1;
898} 889}
899
900 890
901/* 891/*
902 * convert_item() returns 1 if anything was converted, 0 if the item was not 892 * convert_item() returns 1 if anything was converted, 0 if the item was not
903 * what the converter wants, -1 if the converter is broken. 893 * what the converter wants, -1 if the converter is broken.
904 */ 894 *
905#define CONV_FROM(xyz) xyz->slaying
906#define CONV_TO(xyz) xyz->other_arch
907#define CONV_NR(xyz) xyz->stats.sp
908#define CONV_NEED(xyz) xyz->stats.food
909
910/* Takes one items and makes another. 895 * Takes one type of items and makes another.
911 * converter is the object that is doing the conversion. 896 * converter is the object that is doing the conversion.
912 * item is the object that triggered the converter - if it is not 897 * item is the object that triggered the converter - if it is not
913 * what the converter wants, this will not do anything. 898 * what the converter wants, this will not do anything.
914 */ 899 */
915int 900static int
916convert_item (object *item, object *converter) 901convert_item (object *item, object *converter)
917{ 902{
918 int nr = 0;
919 uint32 price_in; 903 sint64 nr, price_in;
904
905 if (item->flag [FLAG_UNPAID])
906 return 0;
907
908 shstr conv_from = converter->slaying;
909 archetype *conv_to = converter->other_arch;
910 sint64 need = converter->stats.food;
911 sint64 give = converter->stats.sp;
920 912
921 /* We make some assumptions - we assume if it takes money as it type, 913 /* We make some assumptions - we assume if it takes money as it type,
922 * it wants some amount. We don't make change (ie, if something costs 914 * it wants some amount. We don't make change (ie, if something costs
923 * 3 gp and player drops a platinum, tough luck) 915 * 3 gp and player drops a platinum, tough luck)
924 */ 916 */
925 if (!strcmp (CONV_FROM (converter), "money")) 917 if (conv_from == shstr_money)
926 { 918 {
927 int cost;
928
929 if (item->type != MONEY) 919 if (item->type != MONEY)
930 return 0; 920 return 0;
931 921
932 nr = (item->nrof * item->value) / CONV_NEED (converter); 922 nr = sint64 (item->nrof) * item->value / need;
933 if (!nr) 923 if (!nr)
934 return 0; 924 return 0;
935 cost = nr * CONV_NEED (converter) / item->value; 925
936 /* take into account rounding errors */ 926 converter->play_sound (sound_find ("shop_buy"));
937 if (nr * CONV_NEED (converter) % item->value) 927
938 cost++; 928 sint64 cost = (nr * need + item->value - 1) / item->value;
939 decrease_ob_nr (item, cost); 929
930 item->decrease (cost);
940 931
941 price_in = cost * item->value; 932 price_in = cost * item->value;
942 } 933 }
943 else 934 else
944 { 935 {
945 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 936 if (item->type == PLAYER
946 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 937 || conv_from != item->arch->archname
938 || (need && need > (uint16) item->nrof))
947 return 0; 939 return 0;
948 940
949 if (CONV_NEED (converter)) 941 converter->play_sound (sound_find ("convert_item"));
942
943 if (need)
950 { 944 {
951 nr = item->nrof / CONV_NEED (converter); 945 nr = sint64 (item->nrof) / need;
952 decrease_ob_nr (item, nr * CONV_NEED (converter)); 946 item->decrease (nr * need);
953 price_in = nr * CONV_NEED (converter) * item->value; 947 price_in = nr * need * item->value;
954 } 948 }
955 else 949 else
956 { 950 {
957 price_in = item->value; 951 price_in = item->value;
958 item->destroy (); 952 item->destroy ();
959 } 953 }
960 } 954 }
961 955
962 if (converter->inv != NULL) 956 if (converter->inv)
963 { 957 {
964 object *ob; 958 object *ob;
965 int i; 959 int i;
966 object *ob_to_copy; 960 object *ob_to_copy;
967 961
968 /* select random object from inventory to copy */ 962 /* select random object from inventory to copy */
969 ob_to_copy = converter->inv; 963 ob_to_copy = converter->inv;
970 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) 964 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
971 {
972 if (rndm (0, i) == 0) 965 if (rndm (0, i) == 0)
973 {
974 ob_to_copy = ob; 966 ob_to_copy = ob;
975 } 967
976 } 968 item = ob_to_copy->deep_clone ();
977 item = object_create_clone (ob_to_copy);
978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 969 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
979 unflag_inv (item, FLAG_IS_A_TEMPLATE); 970 unflag_inv (item, FLAG_IS_A_TEMPLATE);
980 } 971 }
981 else 972 else
982 { 973 {
983 if (converter->other_arch == NULL) 974 if (!conv_to)
984 { 975 {
985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 976 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
986 &converter->name, &converter->map->path, converter->x, converter->y); 977 &converter->name, &converter->map->path, converter->x, converter->y);
987 return -1; 978 return -1;
988 } 979 }
989 980
990 item = object_create_arch (converter->other_arch); 981 item = object_create_arch (conv_to);
991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 982 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
992 } 983 }
993 984
994 if (CONV_NR (converter)) 985 if (give)
995 item->nrof = CONV_NR (converter); 986 item->nrof = give;
987
996 if (nr) 988 if (nr)
997 item->nrof *= nr; 989 item->nrof *= nr;
998 if (is_in_shop (converter)) 990
991 if (converter->flag [FLAG_PRECIOUS])
999 SET_FLAG (item, FLAG_UNPAID); 992 SET_FLAG (item, FLAG_UNPAID);
993
994 if (is_in_shop (converter))
995 {
996 // converters on shop floors don't work anymore, bug lets check for it
997 // and report in case someone still does it.
998 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
999 converter->debug_desc ());
1000 SET_FLAG (item, FLAG_UNPAID);
1001 }
1000 else if (price_in < item->nrof * item->value) 1002 else if (price_in < sint64 (item->nrof) * item->value)
1001 { 1003 {
1002 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1004 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1003 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1005 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1004
1005 /** 1006 /**
1006 * elmex: we are going to let the game continue, as the mapcreator 1007 * elmex: we are going to let the game continue, as the mapcreator
1007 * propably had something in mind when doing this 1008 * hopefully had something in mind when doing this.
1008 */ 1009 */
1009 } 1010 }
1011
1012 // elmex: only identify if we need to, for example so that generated money doesn't
1013 // get an 'identified' flag so easily.
1014 if (need_identify (item))
1015 identify (item);
1016
1010 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1017 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1011 return 1; 1018 return 1;
1012} 1019}
1013 1020
1014/** 1021/**
… …
1031 1038
1032 op->contr->last_used = 0; 1039 op->contr->last_used = 0;
1033 1040
1034 if (sack->env && sack->env != op) 1041 if (sack->env && sack->env != op)
1035 { 1042 {
1036 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first."); 1043 op->failmsg ("You must put it onto the floor or into your inventory first.");
1037 return 1; 1044 return 1;
1038 } 1045 }
1039 1046
1040 // already applied == open on ground, or open in inv, or active in inv 1047 // already applied == open on ground, or open in inv, or active in inv
1041 if (sack->flag [FLAG_APPLIED]) 1048 if (sack->flag [FLAG_APPLIED])
… …
1047 return 1; 1054 return 1;
1048 } 1055 }
1049 else if (!sack->env) 1056 else if (!sack->env)
1050 { 1057 {
1051 // active, but not ours: some other player has opened it 1058 // active, but not ours: some other player has opened it
1052 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1059 op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
1053 return 1; 1060 return 1;
1054 } 1061 }
1055 1062
1056 // fall through to opening it (active in inv) 1063 // fall through to opening it (active in inv)
1057 } 1064 }
… …
1059 { 1066 {
1060 // it is in our env, so activate it, do not open yet 1067 // it is in our env, so activate it, do not open yet
1061 op->close_container (); 1068 op->close_container ();
1062 sack->flag [FLAG_APPLIED] = 1; 1069 sack->flag [FLAG_APPLIED] = 1;
1063 esrv_update_item (UPD_FLAGS, op, sack); 1070 esrv_update_item (UPD_FLAGS, op, sack);
1064 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack)); 1071 op->statusmsg (format ("You ready %s.", query_name (sack)));
1065 return 1; 1072 return 1;
1066 } 1073 }
1067 1074
1068 // it's locked? 1075 // it's locked?
1069 if (sack->slaying) 1076 if (sack->slaying)
1070 { 1077 {
1071 if (object *tmp = find_key (op, op, sack)) 1078 if (object *tmp = find_key (op, op, sack))
1072 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp)); 1079 op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
1073 else 1080 else
1074 { 1081 {
1075 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack)); 1082 op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
1076 return 1; 1083 return 1;
1077 } 1084 }
1078 } 1085 }
1079 1086
1080 op->open_container (sack); 1087 op->open_container (sack);
… …
1099 * with an altar. We call it a Potion - altars are stationary - it 1106 * with an altar. We call it a Potion - altars are stationary - it
1100 * is up to map designers to use them properly. 1107 * is up to map designers to use them properly.
1101 */ 1108 */
1102 if (altar->inv && altar->inv->type == SPELL) 1109 if (altar->inv && altar->inv->type == SPELL)
1103 { 1110 {
1104 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name); 1111 originator->statusmsg (format ("The altar casts %s.", &altar->inv->name));
1105 cast_spell (originator, altar, 0, altar->inv, NULL); 1112 cast_spell (originator, altar, 0, altar->inv, NULL);
1106 /* If it is connected, push the button. Fixes some problems with 1113 /* If it is connected, push the button. Fixes some problems with
1107 * old maps. 1114 * old maps.
1108 */ 1115 */
1109 1116
1110/* push_button (altar);*/ 1117/* push_button (altar);*/
1111 } 1118 }
1112 else 1119 else
1113 { 1120 {
1114 altar->value = 1; /* works only once */ 1121 altar->value = 1; /* works only once */
1115 push_button (altar); 1122 push_button (altar, originator);
1116 } 1123 }
1117 1124
1118 return !sacrifice; 1125 return !sacrifice;
1119 } 1126 }
1120 else 1127 else
… …
1135 double opinion; 1142 double opinion;
1136 object *tmp, *next; 1143 object *tmp, *next;
1137 1144
1138 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1145 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1139 1146
1140 if (op->type != PLAYER) 1147 bool has_unpaid = false;
1148
1149 // quite inefficient to do this here twice, but the api doesn'T lend itself to
1150 // a quick and small change :(
1151 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1152 if (item->flag [FLAG_UNPAID])
1153 {
1154 has_unpaid = true;
1155 break;
1156 }
1157
1158 if (!op->is_player ())
1141 { 1159 {
1142 /* Remove all the unpaid objects that may be carried here. 1160 /* Remove all the unpaid objects that may be carried here.
1143 * This could be pets or monsters that are somehow in 1161 * This could be pets or monsters that are somehow in
1144 * the shop. 1162 * the shop.
1145 */ 1163 */
… …
1149 1167
1150 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1168 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1151 { 1169 {
1152 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1170 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1153 1171
1172 if (i >= 0)
1154 tmp->remove (); 1173 tmp->move (i);
1155
1156 if (i == -1)
1157 i = 0;
1158
1159 tmp->map = op->map;
1160 tmp->x = op->x + freearr_x[i];
1161 tmp->y = op->y + freearr_y[i];
1162 insert_ob_in_map (tmp, op->map, op, 0);
1163 } 1174 }
1164 } 1175 }
1165 1176
1166 /* Don't teleport things like spell effects */ 1177 /* Don't teleport things like spell effects */
1167 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1178 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1170 /* unpaid objects, or non living objects, can't transfer by 1181 /* unpaid objects, or non living objects, can't transfer by
1171 * shop mats. Instead, put it on a nearby space. 1182 * shop mats. Instead, put it on a nearby space.
1172 */ 1183 */
1173 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1184 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1174 { 1185 {
1175
1176 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1186 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1177 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1187 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1178 1188
1179 if (i != -1) 1189 if (i != -1)
1180 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1190 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1181 1191
1182 return 0; 1192 return 0;
1183 } 1193 }
1194
1184 /* Removed code that checked for multipart objects - it appears that 1195 /* Removed code that checked for multipart objects - it appears that
1185 * the teleport function should be able to handle this just fine. 1196 * the teleport function should be able to handle this just fine.
1186 */ 1197 */
1187 rv = teleport (shop_mat, SHOP_MAT, op); 1198 rv = teleport (shop_mat, SHOP_MAT, op);
1188 } 1199 }
1189 else if (can_pay (op) && get_payment (op)) 1200 else if (can_pay (op) && get_payment (op))
1190 { 1201 {
1191 /* this is only used for players */ 1202 /* this is only used for players */
1192 rv = teleport (shop_mat, SHOP_MAT, op); 1203 rv = teleport (shop_mat, SHOP_MAT, op);
1193 1204
1205 if (has_unpaid)
1206 op->contr->play_sound (sound_find ("shop_buy"));
1207 else if (is_in_shop (op))
1208 op->contr->play_sound (sound_find ("shop_enter"));
1209 else
1210 op->contr->play_sound (sound_find ("shop_leave"));
1211
1194 if (shop_mat->msg) 1212 if (shop_mat->msg)
1195 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1213 op->statusmsg (shop_mat->msg);
1196 /* This check below is a bit simplistic - generally it should be correct, 1214 /* This check below is a bit simplistic - generally it should be correct,
1197 * but there is never a guarantee that the bottom space on the map is 1215 * but there is never a guarantee that the bottom space on the map is
1198 * actually the shop floor. 1216 * actually the shop floor.
1199 */ 1217 */
1200 else if (!rv && !is_in_shop (op)) 1218 else if (!rv && !is_in_shop (op))
1201 { 1219 {
1202 opinion = shopkeeper_approval (op->map, op); 1220 opinion = shopkeeper_approval (op->map, op);
1203 1221
1204 if (opinion > 0.9) 1222 op->statusmsg (
1205 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1223 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
1206 else if (opinion > 0.75) 1224 : opinion >= 0.75 ? "The shopkeeper waves to you."
1207 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1225 : opinion >= 0.50 ? "The shopkeeper ignores you."
1208 else if (opinion > 0.5) 1226 : "The shopkeeper glares at you with contempt."
1209 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1210 else 1227 );
1211 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1212 } 1228 }
1213 } 1229 }
1214 else 1230 else
1215 { 1231 {
1216 /* if we get here, a player tried to leave a shop but was not able 1232 /* if we get here, a player tried to leave a shop but was not able
1217 * to afford the items he has. We try to move the player so that 1233 * to afford the items he has. We try to move the player so that
1218 * they are not on the mat anymore 1234 * they are not on the mat anymore
1219 */ 1235 */
1220 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1236 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1221 1237
1222 if (i == -1) 1238 if (i == -1)
1223 {
1224 LOG (llevError, "Internal shop-mat problem.\n"); 1239 LOG (llevError, "Internal shop-mat problem.\n");
1225 }
1226 else 1240 else
1227 { 1241 {
1228 op->remove (); 1242 op->remove ();
1229 op->x += freearr_x[i]; 1243 op->x += freearr_x[i];
1230 op->y += freearr_y[i]; 1244 op->y += freearr_y[i];
… …
1240 * Handles applying a sign. 1254 * Handles applying a sign.
1241 */ 1255 */
1242static void 1256static void
1243apply_sign (object *op, object *sign, int autoapply) 1257apply_sign (object *op, object *sign, int autoapply)
1244{ 1258{
1245 readable_message_type *msgType; 1259 if (!op->is_player())
1246 char newbuf[HUGE_BUF]; 1260 return;
1247 1261
1248 if (sign->msg == NULL) 1262 if (sign->has_dialogue ())
1249 { 1263 {
1250 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1264 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1251 return; 1265 return;
1252 } 1266 }
1253 1267
1268 if (!sign->msg)
1269 {
1270 op->contr->infobox (MSG_CHANNEL ("examine"),
1271 format ("T<%s>\n\n Nothing %sis written on it.",
1272 &sign->name,
1273 sign->name == sign->arch->name ? "" : "else "));
1274 return;
1275 }
1276
1254 if (sign->stats.food) 1277 if (sign->stats.food)
1255 { 1278 {
1256 if (sign->last_eat >= sign->stats.food) 1279 if (sign->last_eat >= sign->stats.food)
1257 { 1280 {
1258 if (!sign->move_on) 1281 if (!sign->move_on)
1259 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1282 op->failmsg ("You cannot read it anymore.");
1283
1260 return; 1284 return;
1261 } 1285 }
1262 1286
1263 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1287 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1264 sign->last_eat++; 1288 sign->last_eat++;
… …
1269 * move_on is zero, it needs to be manually applied (doesn't talk 1293 * move_on is zero, it needs to be manually applied (doesn't talk
1270 * to us). 1294 * to us).
1271 */ 1295 */
1272 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1296 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1273 { 1297 {
1274 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1298 op->failmsg ("You are unable to read while blind!");
1275 return; 1299 return;
1276 } 1300 }
1277 msgType = get_readable_message_type (sign); 1301
1278 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1302 if (op->contr)
1279 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1303 if (client *ns = op->contr->ns)
1304 {
1305 if (sign->sound)
1306 ns->play_sound (sign->sound);
1307 else if (autoapply)
1308 ns->play_sound (sound_find ("msg_voice"));
1309
1310 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1311 }
1312}
1313
1314static void
1315move_apply_hole (object *trap, object *victim)
1316{
1317 /* Hole not open? */
1318 if (trap->stats.wc > 0)
1319 return;
1320
1321 /* Is this a multipart monster and not the head? If so, return.
1322 * Processing will happen if the head runs into the pit
1323 */
1324 if (victim->head)
1325 return;
1326
1327 // now find all possible locations and randomly pick one
1328 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1329 trap->range >= 3 ? SIZEOFFREE3 + 1
1330 : trap->range >= 2 ? SIZEOFFREE2 + 1
1331 : trap->range >= 1 ? SIZEOFFREE1 + 1
1332 : SIZEOFFREE0 + 1);
1333
1334 if (dir < 0)
1335 return;
1336
1337 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1338 victim->statusmsg ("You fall through the hole!", NDI_RED);
1339
1340 transfer_ob (victim,
1341 EXIT_X (trap) + freearr_x[dir],
1342 EXIT_Y (trap) + freearr_y[dir],
1343 0, victim);
1280} 1344}
1281 1345
1282/** 1346/**
1283 * 'victim' moves onto 'trap' 1347 * 'victim' moves onto 'trap'
1284 * 'victim' leaves 'trap' 1348 * 'victim' leaves 'trap'
… …
1307 * proper. This code was causing needless crashes. 1371 * proper. This code was causing needless crashes.
1308 */ 1372 */
1309 if (recursion_depth >= 500) 1373 if (recursion_depth >= 500)
1310 { 1374 {
1311 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1375 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1312 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1376 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1313 return; 1377 return;
1314 } 1378 }
1379
1315 recursion_depth++; 1380 recursion_depth++;
1316 if (trap->head) 1381 if (trap->head)
1317 trap = trap->head; 1382 trap = trap->head;
1318 1383
1319 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1384 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1334 1399
1335 /* Just put in some sanity check. I think there is a bug in the 1400 /* Just put in some sanity check. I think there is a bug in the
1336 * above with some objects have zero speed, and thus the player 1401 * above with some objects have zero speed, and thus the player
1337 * getting permanently paralyzed. 1402 * getting permanently paralyzed.
1338 */ 1403 */
1339 if (victim->speed_left < -50.0) 1404 if (victim->speed_left < -50.f)
1340 victim->speed_left = -50.0; 1405 victim->speed_left = -50.f;
1341 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */ 1406 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1342 } 1407 }
1343 goto leave; 1408 goto leave;
1344 1409
1345 case SPINNER: 1410 case SPINNER:
… …
1358 } 1423 }
1359 goto leave; 1424 goto leave;
1360 1425
1361 case BUTTON: 1426 case BUTTON:
1362 case PEDESTAL: 1427 case PEDESTAL:
1363 update_button (trap); 1428 update_button (trap, originator);
1364 goto leave; 1429 goto leave;
1365 1430
1366 case ALTAR: 1431 case ALTAR:
1367 /* sacrifice victim on trap */ 1432 /* sacrifice victim on trap */
1368 apply_altar (trap, victim, originator); 1433 apply_altar (trap, victim, originator);
… …
1395 1460
1396 if (!trap->value) 1461 if (!trap->value)
1397 { 1462 {
1398 int tot; 1463 int tot;
1399 1464
1400 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1465 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1401 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1466 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1402 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1467 tot += ab->head_ ()->total_weight ();
1403 1468
1404 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1469 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1405 goto leave; 1470 goto leave;
1406 1471
1407 SET_ANIMATION (trap, trap->value); 1472 SET_ANIMATION (trap, trap->value);
… …
1417 1482
1418 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1483 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1419 { 1484 {
1420 if (!sound_was_played) 1485 if (!sound_was_played)
1421 { 1486 {
1422 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1487 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1423 sound_was_played = 1; 1488 sound_was_played = 1;
1424 } 1489 }
1425 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1490
1491 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1426 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1492 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1427 } 1493 }
1428 } 1494 }
1429 goto leave; 1495 goto leave;
1430 } 1496 }
1431 1497
1432
1433 case CONVERTER: 1498 case CONVERTER:
1434 if (convert_item (victim, trap) < 0) 1499 if (convert_item (victim, trap) < 0)
1435 { 1500 {
1436 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1501 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1437 get_archetype ("burnout")->insert_at (trap, trap); 1502 archetype::get (shstr_burnout)->insert_at (trap, trap);
1438 } 1503 }
1439 1504
1440 goto leave; 1505 goto leave;
1441 1506
1442 case TRIGGER_BUTTON: 1507 case TRIGGER_BUTTON:
… …
1452 case CHECK_INV: 1517 case CHECK_INV:
1453 check_inv (victim, trap); 1518 check_inv (victim, trap);
1454 goto leave; 1519 goto leave;
1455 1520
1456 case HOLE: 1521 case HOLE:
1457 /* Hole not open? */ 1522 move_apply_hole (trap, victim);
1458 if (trap->stats.wc > 0)
1459 goto leave;
1460
1461 /* Is this a multipart monster and not the head? If so, return.
1462 * Processing will happen if the head runs into the pit
1463 */
1464 if (victim->head)
1465 goto leave;
1466
1467 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE);
1468 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1469 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1470 goto leave; 1523 goto leave;
1471 1524
1472 case EXIT: 1525 case EXIT:
1473 if (victim->type == PLAYER && EXIT_PATH (trap)) 1526 if (victim->type == PLAYER && EXIT_PATH (trap))
1474 { 1527 {
1475 /* Basically, don't show exits leading to random maps the 1528 /* Basically, don't show exits leading to random maps the
1476 * players output. 1529 * players output.
1477 */ 1530 */
1478 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1531 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1479 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1532 victim->statusmsg (trap->msg, NDI_NAVY);
1480 1533
1534 trap->play_sound (trap->sound);
1481 victim->enter_exit (trap); 1535 victim->enter_exit (trap);
1482 } 1536 }
1483 goto leave; 1537 goto leave;
1484 1538
1485 case ENCOUNTER: 1539 case ENCOUNTER:
… …
1507 goto leave; 1561 goto leave;
1508 1562
1509 case RUNE: 1563 case RUNE:
1510 case TRAP: 1564 case TRAP:
1511 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1565 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1512 {
1513 spring_trap (trap, victim); 1566 spring_trap (trap, victim);
1514 }
1515 goto leave; 1567 goto leave;
1516 1568
1517 default: 1569 default:
1518 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1570 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1519 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1571 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1520 goto leave; 1572 goto leave;
1521 } 1573 }
1522 1574
1523leave: 1575leave:
1524 recursion_depth--; 1576 recursion_depth--;
… …
1533 int lev_diff; 1585 int lev_diff;
1534 object *skill_ob; 1586 object *skill_ob;
1535 1587
1536 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1588 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1537 { 1589 {
1538 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1590 op->failmsg ("You are unable to read while blind!");
1539 return; 1591 return;
1540 } 1592 }
1593
1541 if (tmp->msg == NULL) 1594 if (!tmp->msg)
1542 { 1595 {
1543 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1596 op->failmsg (format ("You open the %s and find it empty.", &tmp->name));
1544 return; 1597 return;
1545 } 1598 }
1546 1599
1547 /* need a literacy skill to read stuff! */ 1600 /* need a literacy skill to read stuff! */
1548 skill_ob = find_skill_by_name (op, tmp->skill); 1601 skill_ob = find_skill_by_name (op, tmp->skill);
1549 if (!skill_ob) 1602 if (!skill_ob)
1550 { 1603 {
1551 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1604 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
1552 return; 1605 return;
1553 } 1606 }
1607
1554 lev_diff = tmp->level - (skill_ob->level + 5); 1608 lev_diff = tmp->level - (skill_ob->level + 5);
1555 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1609 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1556 { 1610 {
1557 if (lev_diff < 2) 1611 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1558 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1612 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1559 else if (lev_diff < 3) 1613 : lev_diff < 5 ? "This book is beyond your comprehension."
1560 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension."); 1614 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1561 else if (lev_diff < 5) 1615 : lev_diff < 15 ? "This book is way beyond your comprehension."
1562 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension."); 1616 : "This book is totally beyond your comprehension.");
1563 else if (lev_diff < 8)
1564 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension.");
1565 else if (lev_diff < 15)
1566 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension.");
1567 else
1568 new_draw_info (NDI_UNIQUE, 0, op, "This book is totally beyond your comprehension.");
1569 return; 1617 return;
1570 } 1618 }
1571 1619
1572 readable_message_type *msgType = get_readable_message_type (tmp); 1620 readable_message_type *msgType = get_readable_message_type (tmp);
1573 1621
1574 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1622 if (player *pl = op->contr)
1575 msgType->message_type, msgType->message_subtype, 1623 if (client *ns = pl->ns)
1576 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1624 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1577 long_desc (tmp, op), &tmp->msg);
1578 1625
1579 /* gain xp from reading */ 1626 /* gain xp from reading */
1580 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1627 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1581 { /* only if not read before */ 1628 { /* only if not read before */
1582 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1629 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1584 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1631 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1585 { 1632 {
1586 /*exp_gain *= 2; because they just identified it too */ 1633 /*exp_gain *= 2; because they just identified it too */
1587 SET_FLAG (tmp, FLAG_IDENTIFIED); 1634 SET_FLAG (tmp, FLAG_IDENTIFIED);
1588 1635
1589 /* If in a container, update how it looks */ 1636 if (object *pl = tmp->visible_to ())
1590 if (tmp->env)
1591 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1637 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1592 else
1593 op->contr->ns->floorbox_update ();
1594 } 1638 }
1595 1639
1596 change_exp (op, exp_gain, skill_ob->skill, 0); 1640 change_exp (op, exp_gain, skill_ob->skill, 0);
1597 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1641 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1598 } 1642 }
… …
1603 * op is the person learning the skill, tmp is the skill scroll object 1647 * op is the person learning the skill, tmp is the skill scroll object
1604 */ 1648 */
1605static void 1649static void
1606apply_skillscroll (object *op, object *tmp) 1650apply_skillscroll (object *op, object *tmp)
1607{ 1651{
1608 switch ((int) learn_skill (op, tmp)) 1652 switch (learn_skill (op, tmp))
1609 { 1653 {
1610 case 0: 1654 case 0:
1611 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge "); 1655 op->play_sound (sound_find ("generic_fail"));
1612 new_draw_info_format (NDI_UNIQUE, 0, op, "held within the %s.\n", query_name (tmp)); 1656 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1613 return; 1657 break;
1614 1658
1615 case 1: 1659 case 1:
1616 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1617 decrease_ob (tmp); 1660 tmp->decrease ();
1661 op->play_sound (sound_find ("skill_learn"));
1662 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1618 return; 1663 break;
1619 1664
1620 default: 1665 default:
1666 tmp->decrease ();
1667 op->play_sound (sound_find ("generic_fail"));
1621 new_draw_info_format (NDI_UNIQUE, 0, op, "You fail to learn the knowledge of the %s.\n", query_name (tmp)); 1668 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1622 decrease_ob (tmp);
1623 return; 1669 break;
1624 } 1670 }
1625} 1671}
1626 1672
1627/** 1673/**
1628 * Actually makes op learn spell. 1674 * Actually makes op learn spell.
… …
1648 return; 1694 return;
1649 } 1695 }
1650 return; 1696 return;
1651 } 1697 }
1652 1698
1653 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1699 op->contr->play_sound (sound_find ("learn_spell"));
1700
1654 tmp = spell->clone (); 1701 tmp = spell->clone ();
1655 insert_ob_in_ob (tmp, op); 1702 insert_ob_in_ob (tmp, op);
1656 1703
1657 if (special_prayer) 1704 if (special_prayer)
1658 SET_FLAG (tmp, FLAG_STARTEQUIP); 1705 SET_FLAG (tmp, FLAG_STARTEQUIP);
… …
1677 { 1724 {
1678 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1725 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1679 return; 1726 return;
1680 } 1727 }
1681 1728
1682 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1729 op->failmsg (format ("You lose knowledge of %s.", spell));
1683 player_unready_range_ob (op->contr, spob); 1730 player_unready_range_ob (op->contr, spob);
1684 esrv_remove_spell (op->contr, spob); 1731 esrv_remove_spell (op->contr, spob);
1685 spob->destroy (); 1732 spob->destroy ();
1686} 1733}
1687 1734
… …
1695{ 1742{
1696 object *skop, *spell, *spell_skill; 1743 object *skop, *spell, *spell_skill;
1697 1744
1698 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1745 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1699 { 1746 {
1700 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1747 op->failmsg ("You are unable to read while blind.");
1701 return; 1748 return;
1702 } 1749 }
1703 1750
1704 /* artifact_spellbooks have 'slaying' field point to a spell name, 1751 /* artifact_spellbooks have 'slaying' field point to a spell name,
1705 * instead of having their spell stored in stats.sp. These are 1752 * instead of having their spell stored in stats.sp. These are
1706 * legacy spellbooks 1753 * legacy spellbooks
1707 */ 1754 */
1708
1709 if (tmp->slaying != NULL) 1755 if (tmp->slaying)
1710 { 1756 {
1711 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1757 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1712 if (!spell) 1758 if (!spell)
1713 { 1759 {
1714 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1760 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1715 return; 1761 return;
1716 } 1762 }
1717 else 1763 else
1718 insert_ob_in_ob (spell, tmp); 1764 insert_ob_in_ob (spell, tmp);
1765
1719 tmp->slaying = NULL; 1766 tmp->slaying = 0;
1720 } 1767 }
1721 1768
1722 skop = find_skill_by_name (op, tmp->skill); 1769 skop = find_skill_by_name (op, tmp->skill);
1723 1770
1724 /* need a literacy skill to learn spells. Also, having a literacy level 1771 /* need a literacy skill to learn spells. Also, having a literacy level
1725 * lower than the spell will make learning the spell more difficult */ 1772 * lower than the spell will make learning the spell more difficult */
1726 if (!skop) 1773 if (!skop)
1727 { 1774 {
1728 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1775 op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
1729 return; 1776 return;
1730 } 1777 }
1731 1778
1732 spell = tmp->inv; 1779 spell = tmp->inv;
1733 1780
1734 if (!spell) 1781 if (!spell)
1735 { 1782 {
1736 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1783 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1737 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1784 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1738 return; 1785 return;
1739 } 1786 }
1740 1787
1741 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1788 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1742 { 1789 {
1743 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]"); 1790 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
1744 return; 1791 return;
1745 } 1792 }
1746 1793
1747 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1794 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1748 1795
1749 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1796 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1750 {
1751 identify (tmp); 1797 identify (tmp);
1752
1753 if (tmp->env)
1754 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1755 else
1756 op->contr->ns->floorbox_update ();
1757 }
1758 1798
1759 /* I removed the check for special_prayer_mark here - it didn't make 1799 /* I removed the check for special_prayer_mark here - it didn't make
1760 * a lot of sense - special prayers are not found in spellbooks, and 1800 * a lot of sense - special prayers are not found in spellbooks, and
1761 * if the player doesn't know the spell, doesn't make a lot of sense that 1801 * if the player doesn't know the spell, doesn't make a lot of sense that
1762 * they would have a special prayer mark. 1802 * they would have a special prayer mark.
1763 */ 1803 */
1764 if (check_spell_known (op, spell->name)) 1804 if (check_spell_known (op, spell->name))
1765 { 1805 {
1766 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1806 op->statusmsg ("You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1767 return; 1807 return;
1768 } 1808 }
1769 1809
1770 if (spell->skill) 1810 if (spell->skill)
1771 { 1811 {
1772 spell_skill = find_skill_by_name (op, spell->skill); 1812 spell_skill = find_skill_by_name (op, spell->skill);
1773 1813
1774 if (!spell_skill) 1814 if (!spell_skill)
1775 { 1815 {
1776 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill); 1816 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
1777 return; 1817 return;
1778 } 1818 }
1779 1819
1780 if (spell_skill->level < spell->level) 1820 if (spell_skill->level < spell->level)
1781 { 1821 {
1782 new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill); 1822 op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
1783 return; 1823 return;
1784 } 1824 }
1785 } 1825 }
1786 1826
1787 /* Logic as follows 1827 /* Logic as follows
… …
1796 * Overall, chances are the same but a player will find having a high 1836 * Overall, chances are the same but a player will find having a high
1797 * literacy rate very useful! -b.t. 1837 * literacy rate very useful! -b.t.
1798 */ 1838 */
1799 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1839 if (QUERY_FLAG (op, FLAG_CONFUSED))
1800 { 1840 {
1801 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!"); 1841 op->failmsg ("In your confused state you flub the wording of the text!");
1802 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1842 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
1803 } 1843 }
1804 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1844 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
1805 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1845 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1806 { 1846 {
1807 1847 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
1808 new_draw_info (NDI_UNIQUE, 0, op, "You succeed in learning the spell!");
1809 do_learn_spell (op, spell, 0); 1848 do_learn_spell (op, spell, 0);
1810 1849
1811 /* xp gain to literacy for spell learning */ 1850 /* xp gain to literacy for spell learning */
1812 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1851 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1813 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1852 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1814 } 1853 }
1815 else 1854 else
1816 { 1855 {
1817 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1856 op->contr->play_sound (sound_find ("fumble_spell"));
1818 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1857 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1819 } 1858 }
1820 1859
1821 decrease_ob (tmp); 1860 tmp->decrease ();
1822} 1861}
1823 1862
1824/** 1863/**
1825 * Handles applying a spell scroll. 1864 * Handles applying a spell scroll.
1826 */ 1865 */
… …
1829{ 1868{
1830 object *skop; 1869 object *skop;
1831 1870
1832 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1871 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1833 { 1872 {
1834 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1873 op->failmsg ("You are unable to read while blind.");
1835 return; 1874 return;
1836 } 1875 }
1837 1876
1838 if (!tmp->inv || tmp->inv->type != SPELL) 1877 if (!tmp->inv || tmp->inv->type != SPELL)
1839 { 1878 {
1840 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1879 op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
1841 return; 1880 return;
1842 } 1881 }
1843 1882
1844 if (op->type == PLAYER) 1883 if (op->type == PLAYER)
1845 { 1884 {
… …
1851 */ 1890 */
1852 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1891 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1853 1892
1854 if (!skop) 1893 if (!skop)
1855 { 1894 {
1856 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1895 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
1857 return; 1896 return;
1858 } 1897 }
1859 1898
1860 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1899 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1861 change_exp (op, exp_gain, skop->skill, 0); 1900 change_exp (op, exp_gain, skop->skill, 0);
1862 } 1901 }
1863 1902
1864 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1903 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1865 identify (tmp); 1904 identify (tmp);
1866 1905
1867 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1906 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1868
1869 1907
1870 cast_spell (op, tmp, dir, tmp->inv, NULL); 1908 cast_spell (op, tmp, dir, tmp->inv, NULL);
1871 decrease_ob (tmp); 1909 tmp->decrease ();
1872} 1910}
1873 1911
1874/** 1912/**
1875 * Applies a treasure object - by default, chest. op 1913 * Applies a treasure object - by default, chest. op
1876 * is the person doing the applying, tmp is the treasure 1914 * is the person doing the applying, tmp is the treasure
1877 * chest. 1915 * chest.
1878 */ 1916 */
1879static void 1917static void
1880apply_treasure (object *op, object *tmp) 1918apply_treasure (object *op, object *tmp)
1881{ 1919{
1882 object *treas;
1883
1884
1885 /* Nice side effect of new treasure creation method is that the treasure 1920 /* Nice side effect of this treasure creation method is that the treasure
1886 * for the chest is done when the chest is created, and put into the chest 1921 * for the chest is done when the chest is created, and put into the chest
1887 * inventory. So that when the chest burns up, the items still exist. Also 1922 * inventory. So that when the chest burns up, the items still exist. Also
1888 * prevents people fromt moving chests to more difficult maps to get better 1923 * prevents people from moving chests to more difficult maps to get better
1889 * treasure 1924 * treasure
1890 */ 1925 */
1891
1892 treas = tmp->inv; 1926 object *treas = tmp->inv;
1893 if (treas == NULL) 1927
1928 if (!treas)
1894 { 1929 {
1895 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1930 op->statusmsg ("The chest was empty.");
1896 decrease_ob (tmp); 1931 tmp->decrease ();
1897 return; 1932 return;
1898 } 1933 }
1934
1899 while (tmp->inv) 1935 while (tmp->inv)
1900 { 1936 {
1901 treas = tmp->inv; 1937 treas = tmp->inv;
1902
1903 treas->remove (); 1938 treas->remove ();
1904 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
1905 1939
1906 treas->x = op->x; 1940 treas->x = op->x;
1907 treas->y = op->y; 1941 treas->y = op->y;
1908 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1942 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
1909 1943
1910 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1944 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
1911 spring_trap (treas, op); 1945 spring_trap (treas, op);
1912 1946
1913 /* If either player or container was destroyed, no need to do 1947 /* If either player or container was destroyed, no need to do
1914 * further processing. I think this should be enclused with 1948 * further processing. I think this should be enclused with
1915 * spring trap above, as I don't think there is otherwise 1949 * spring trap above, as I don't think there is otherwise
1916 * any way for the treasure chest or player to get killed 1950 * any way for the treasure chest or player to get killed.
1917 */ 1951 */
1918 if (op->destroyed () || tmp->destroyed ()) 1952 if (op->destroyed () || tmp->destroyed ())
1919 break; 1953 break;
1920 } 1954 }
1921 1955
1922 if (!tmp->destroyed () && tmp->inv == NULL) 1956 if (!tmp->destroyed () && !tmp->inv)
1923 decrease_ob (tmp); 1957 tmp->decrease (true);
1924
1925} 1958}
1926 1959
1927/** 1960/**
1928 * op eats food. 1961 * op eats food.
1929 * If player, takes care of messages and dragon special food. 1962 * If player, takes care of messages and dragon special food.
… …
1944 { 1977 {
1945 /* usual case - no dragon meal: */ 1978 /* usual case - no dragon meal: */
1946 if (op->stats.food + tmp->stats.food > 999) 1979 if (op->stats.food + tmp->stats.food > 999)
1947 { 1980 {
1948 if (tmp->type == FOOD || tmp->type == FLESH) 1981 if (tmp->type == FOOD || tmp->type == FLESH)
1949 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!"); 1982 op->failmsg ("You feel full, but what a waste of food!");
1950 else 1983 else
1951 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!"); 1984 op->statusmsg ("Most of the drink goes down your face not your throat!");
1952 } 1985 }
1986
1987 tmp->play_sound (
1988 tmp->sound
1989 ? tmp->sound
1990 : tmp->type == DRINK
1991 ? sound_find ("eat_drink")
1992 : sound_find ("eat_food")
1993 );
1953 1994
1954 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 1995 if (!QUERY_FLAG (tmp, FLAG_CURSED))
1955 { 1996 {
1956 char buf[MAX_BUF]; 1997 const char *buf;
1957 1998
1958 if (!is_dragon_pl (op)) 1999 if (!is_dragon_pl (op))
1959 { 2000 {
1960 /* eating message for normal players */ 2001 /* eating message for normal players */
1961 if (tmp->type == DRINK) 2002 if (tmp->type == DRINK)
1962 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name); 2003 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
1963 else 2004 else
1964 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good."); 2005 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
1965 } 2006 }
1966 else 2007 else
1967 {
1968 /* eating message for dragon players */ 2008 /* eating message for dragon players */
1969 sprintf (buf, "The %s tasted terrible!", &tmp->name); 2009 buf = format ("The %s tasted terrible!", &tmp->name);
1970 }
1971 2010
1972 new_draw_info (NDI_UNIQUE, 0, op, buf); 2011 op->statusmsg (buf);
2012
1973 capacity_remaining = 999 - op->stats.food; 2013 capacity_remaining = 999 - op->stats.food;
1974 op->stats.food += tmp->stats.food; 2014 op->stats.food += tmp->stats.food;
1975 if (capacity_remaining < tmp->stats.food) 2015 if (capacity_remaining < tmp->stats.food)
1976 op->stats.hp += capacity_remaining / 50; 2016 op->stats.hp += capacity_remaining / 50;
1977 else 2017 else
1978 op->stats.hp += tmp->stats.food / 50; 2018 op->stats.hp += tmp->stats.food / 50;
2019
1979 if (op->stats.hp > op->stats.maxhp) 2020 if (op->stats.hp > op->stats.maxhp)
1980 op->stats.hp = op->stats.maxhp; 2021 op->stats.hp = op->stats.maxhp;
1981 if (op->stats.food > 999) 2022 if (op->stats.food > 999)
1982 op->stats.food = 999; 2023 op->stats.food = 999;
1983 } 2024 }
… …
1985 /* special food hack -b.t. */ 2026 /* special food hack -b.t. */
1986 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2027 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
1987 eat_special_food (op, tmp); 2028 eat_special_food (op, tmp);
1988 } 2029 }
1989 } 2030 }
2031
1990 handle_apply_yield (tmp); 2032 handle_apply_yield (tmp);
1991 decrease_ob (tmp); 2033 tmp->decrease ();
1992} 2034}
1993 2035
1994/** 2036/**
1995 * A dragon is eating some flesh. If the flesh contains resistances, 2037 * A dragon is eating some flesh. If the flesh contains resistances,
1996 * there is a chance for the dragon's skin to get improved. 2038 * there is a chance for the dragon's skin to get improved.
… …
2006{ 2048{
2007 object *skin = NULL; /* pointer to dragon skin force */ 2049 object *skin = NULL; /* pointer to dragon skin force */
2008 object *abil = NULL; /* pointer to dragon ability force */ 2050 object *abil = NULL; /* pointer to dragon ability force */
2009 object *tmp = NULL; /* tmp. object */ 2051 object *tmp = NULL; /* tmp. object */
2010 2052
2011 char buf[MAX_BUF]; /* tmp. string buffer */
2012 double chance; /* improvement-chance of one resistance type */ 2053 double chance; /* improvement-chance of one resistance type */
2013 double totalchance = 1; /* total chance of gaining one resistance */ 2054 double totalchance = 1; /* total chance of gaining one resistance */
2014 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */ 2055 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2015 double mbonus = 0; /* monster bonus */ 2056 double mbonus = 0; /* monster bonus */
2016 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2057 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
… …
2021 if (meal->type != FLESH || !is_dragon_pl (op)) 2062 if (meal->type != FLESH || !is_dragon_pl (op))
2022 return 0; 2063 return 0;
2023 2064
2024 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2065 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2025 from the player's inventory */ 2066 from the player's inventory */
2026 shstr_cmp dragon_ability_force ("dragon_ability_force");
2027 shstr_cmp dragon_skin_force ("dragon_skin_force");
2028
2029 for (tmp = op->inv; tmp; tmp = tmp->below) 2067 for (tmp = op->inv; tmp; tmp = tmp->below)
2030 if (tmp->type == FORCE) 2068 if (tmp->type == FORCE)
2031 if (tmp->arch->name == dragon_skin_force) 2069 if (tmp->arch->archname == shstr_dragon_skin_force)
2032 skin = tmp; 2070 skin = tmp;
2033 else if (tmp->arch->name == dragon_ability_force) 2071 else if (tmp->arch->archname == shstr_dragon_ability_force)
2034 abil = tmp; 2072 abil = tmp;
2035 2073
2036 /* if either skin or ability are missing, this is an old player 2074 /* if either skin or ability are missing, this is an old player
2037 which is not to be considered a dragon -> bail out */ 2075 which is not to be considered a dragon -> bail out */
2038 if (skin == NULL || abil == NULL) 2076 if (skin == NULL || abil == NULL)
… …
2041 /* now start by filling stomache and health, according to food-value */ 2079 /* now start by filling stomache and health, according to food-value */
2042 if ((999 - op->stats.food) < meal->stats.food) 2080 if ((999 - op->stats.food) < meal->stats.food)
2043 op->stats.hp += (999 - op->stats.food) / 50; 2081 op->stats.hp += (999 - op->stats.food) / 50;
2044 else 2082 else
2045 op->stats.hp += meal->stats.food / 50; 2083 op->stats.hp += meal->stats.food / 50;
2084
2046 if (op->stats.hp > op->stats.maxhp) 2085 if (op->stats.hp > op->stats.maxhp)
2047 op->stats.hp = op->stats.maxhp; 2086 op->stats.hp = op->stats.maxhp;
2048 2087
2049 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2088 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2050 2089
… …
2095 } 2134 }
2096 } 2135 }
2097 2136
2098 /* inverse totalchance as until now we have the failure-chance */ 2137 /* inverse totalchance as until now we have the failure-chance */
2099 totalchance = 100 - totalchance * 100; 2138 totalchance = 100 - totalchance * 100;
2139
2100 /* print message according to totalchance */ 2140 /* print message according to totalchance */
2141 const char *buf;
2101 if (totalchance > 50.) 2142 if (totalchance > 50.)
2102 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name); 2143 buf = format ("Hmm! The %s tasted delicious!", &meal->name);
2103 else if (totalchance > 10.) 2144 else if (totalchance > 10.)
2104 sprintf (buf, "The %s tasted very good.", &meal->name); 2145 buf = format ("The %s tasted very good.", &meal->name);
2105 else if (totalchance > 1.) 2146 else if (totalchance > 1.)
2106 sprintf (buf, "The %s tasted good.", &meal->name); 2147 buf = format ("The %s tasted good.", &meal->name);
2107 else if (totalchance > 0.1) 2148 else if (totalchance > 0.1)
2108 sprintf (buf, "The %s tasted bland.", &meal->name); 2149 buf = format ("The %s tasted bland.", &meal->name);
2109 else if (totalchance >= 0.01) 2150 else if (totalchance >= 0.01)
2110 sprintf (buf, "The %s had a boring taste.", &meal->name); 2151 buf = format ("The %s had a boring taste.", &meal->name);
2111 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat)) 2152 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2112 sprintf (buf, "The %s tasted strange.", &meal->name); 2153 buf = format ("The %s tasted strange.", &meal->name);
2113 else 2154 else
2114 sprintf (buf, "The %s had no taste.", &meal->name); 2155 buf = format ("The %s had no taste.", &meal->name);
2115 new_draw_info (NDI_UNIQUE, 0, op, buf); 2156
2157 op->statusmsg (buf);
2116 2158
2117 /* now choose a winner if we have any */ 2159 /* now choose a winner if we have any */
2118 i = -1; 2160 i = -1;
2119 if (winners > 0) 2161 if (winners > 0)
2120 i = atnr_winner[RANDOM () % winners]; 2162 i = atnr_winner [rndm (winners)];
2121 2163
2122 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2164 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2123 { 2165 {
2124 /* resistance increased! */ 2166 /* resistance increased! */
2125 skin->resist[i]++; 2167 skin->resist[i]++;
2126 op->update_stats (); 2168 op->update_stats ();
2127 2169
2128 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2170 op->statusmsg (format ("Your skin is now more resistant to %s!", change_resist_msg[i]));
2129 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2130 } 2171 }
2131 2172
2132 /* if this flesh contains a new ability focus, we mark it 2173 /* if this flesh contains a new ability focus, we mark it
2133 into the ability_force and it will take effect on next level */ 2174 into the ability_force and it will take effect on next level */
2134 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat) 2175 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2135 { 2176 {
2136 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2177 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2137 2178
2138 if (meal->last_eat != abil->stats.exp) 2179 if (meal->last_eat != abil->stats.exp)
2180 op->statusmsg (format (
2181 "Your metabolism prepares to focus on %s!\n"
2182 "The change will happen at level %d.",
2183 change_resist_msg[meal->last_eat],
2184 abil->level + 1
2139 { 2185 ));
2140 sprintf (buf, "Your metabolism prepares to focus on %s!", change_resist_msg[meal->last_eat]);
2141 new_draw_info (NDI_UNIQUE, 0, op, buf);
2142 sprintf (buf, "The change will happen at level %d", abil->level + 1);
2143 new_draw_info (NDI_UNIQUE, 0, op, buf);
2144 }
2145 else 2186 else
2146 { 2187 {
2147 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]); 2188 op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
2148 new_draw_info (NDI_UNIQUE, 0, op, buf);
2149 abil->last_eat = 0; 2189 abil->last_eat = 0;
2150 } 2190 }
2151 } 2191 }
2192
2152 return 1; 2193 return 1;
2153} 2194}
2154 2195
2155/** 2196/**
2156 * Handles applying an improve armor scroll. 2197 * Handles applying an improve armor scroll.
… …
2159static void 2200static void
2160apply_armour_improver (object *op, object *tmp) 2201apply_armour_improver (object *op, object *tmp)
2161{ 2202{
2162 object *armor; 2203 object *armor;
2163 2204
2164 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2205 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2165 { 2206 {
2166 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2207 op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
2167 return; 2208 return;
2168 } 2209 }
2169 2210
2170 armor = find_marked_object (op); 2211 armor = find_marked_object (op);
2171 2212
2172 if (!armor) 2213 if (!armor)
2173 { 2214 {
2174 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2215 op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2175 return; 2216 return;
2176 } 2217 }
2177 2218
2178 if (armor->type != ARMOUR 2219 if (armor->type != ARMOUR
2179 && armor->type != CLOAK 2220 && armor->type != CLOAK
2180 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2221 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2181 { 2222 {
2182 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2223 op->failmsg ("Your marked item is not armour!\n");
2183 return; 2224 return;
2184 } 2225 }
2185 2226
2186 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2227 op->statusmsg ("Applying armour enchantment.");
2187 improve_armour (op, tmp, armor); 2228 improve_armour (op, tmp, armor);
2188} 2229}
2189 2230
2190extern void 2231void
2191apply_poison (object *op, object *tmp) 2232apply_poison (object *op, object *tmp)
2192{ 2233{
2234 // need to do it now when it is still on the map
2235 handle_apply_yield (tmp);
2236
2237 object *poison = tmp->split (1);
2238
2193 if (op->type == PLAYER) 2239 if (op->type == PLAYER)
2194 { 2240 {
2195 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2241 op->contr->play_sound (sound_find ("drink_poison"));
2196 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2242 op->failmsg ("Yech! That tasted poisonous!");
2197 strcpy (op->contr->killer, "poisonous booze"); 2243 op->contr->killer = poison;
2198 } 2244 }
2245
2199 if (tmp->stats.hp > 0) 2246 if (poison->stats.hp > 0)
2200 { 2247 {
2201 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2248 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2202 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2249 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2203 } 2250 }
2251
2204 op->stats.food -= op->stats.food / 4; 2252 op->stats.food -= op->stats.food / 4;
2205 handle_apply_yield (tmp); 2253 poison->destroy ();
2206 decrease_ob (tmp);
2207} 2254}
2208 2255
2209/** 2256/**
2210 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2257 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2211 * A valid 2 way exit means: 2258 * A valid 2 way exit means:
… …
2227#if 0 //TODO 2274#if 0 //TODO
2228 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2275 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2229 return 0; /* This is a reset town portal */ 2276 return 0; /* This is a reset town portal */
2230#endif 2277#endif
2231 2278
2279 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2280
2232 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2281 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2233 2282
2234 if (exitmap) 2283 if (exitmap)
2235 { 2284 {
2236 exitmap->load_sync (); 2285 exitmap->load_sync ();
… …
2291 } 2340 }
2292 } 2341 }
2293 2342
2294 return 0; 2343 return 0;
2295} 2344}
2296
2297 2345
2298/** 2346/**
2299 * Main apply handler. 2347 * Main apply handler.
2300 * 2348 *
2301 * Checks for unpaid items before applying. 2349 * Checks for unpaid items before applying.
… …
2309 * being applied. 2357 * being applied.
2310 * 2358 *
2311 * aflag is special (always apply/unapply) flags. Nothing is done with 2359 * aflag is special (always apply/unapply) flags. Nothing is done with
2312 * them in this function - they are passed to apply_special 2360 * them in this function - they are passed to apply_special
2313 */ 2361 */
2314
2315int 2362int
2316manual_apply (object *op, object *tmp, int aflag) 2363manual_apply (object *op, object *tmp, int aflag)
2317{ 2364{
2318 if (tmp->head)
2319 tmp = tmp->head; 2365 tmp = tmp->head_ ();
2320 2366
2321 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2367 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2322 { 2368 {
2323 if (op->type == PLAYER) 2369 if (op->type == PLAYER)
2324 { 2370 {
2325 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2371 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
2326 return 1; 2372 return 1;
2327 } 2373 }
2328 else 2374 else
2329 return 0; /* monsters just skip unpaid items */ 2375 return 0; /* monsters just skip unpaid items */
2330 } 2376 }
… …
2333 return RESULT_INT (0); 2379 return RESULT_INT (0);
2334 2380
2335 switch (tmp->type) 2381 switch (tmp->type)
2336 { 2382 {
2337 case CF_HANDLE: 2383 case CF_HANDLE:
2338 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2384 op->play_sound (sound_find ("turn_handle"));
2339 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2385 op->statusmsg ("You turn the handle.");
2340 tmp->value = tmp->value ? 0 : 1; 2386 tmp->value = tmp->value ? 0 : 1;
2341 SET_ANIMATION (tmp, tmp->value); 2387 SET_ANIMATION (tmp, tmp->value);
2342 update_object (tmp, UP_OBJ_FACE); 2388 update_object (tmp, UP_OBJ_FACE);
2343 push_button (tmp); 2389 push_button (tmp, op);
2344 return 1; 2390 return 1;
2345 2391
2346 case TRIGGER: 2392 case TRIGGER:
2347 if (check_trigger (tmp, op)) 2393 if (check_trigger (tmp, op))
2348 { 2394 {
2349 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2395 op->statusmsg ("You turn the handle.");
2350 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2396 op->play_sound (sound_find ("turn_handle"));
2351 } 2397 }
2352 else 2398 else
2353 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2399 op->failmsg ("The handle doesn't move.");
2354 2400
2355 return 1; 2401 return 1;
2356 2402
2357 case EXIT: 2403 case EXIT:
2358 if (op->type != PLAYER) 2404 if (op->type != PLAYER)
2359 return 0; 2405 return 0;
2360 2406
2361 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2407 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2362 { 2408 op->failmsg (format ("The %s is closed.", query_name (tmp)));
2363 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2364 }
2365 else 2409 else
2366 { 2410 {
2367 /* Don't display messages for random maps. */ 2411 /* Don't display messages for random maps. */
2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2412 if (tmp->msg && !EXIT_PATH (tmp).starts_with ("/!"))
2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2413 op->statusmsg (tmp->msg, NDI_NAVY);
2370 2414
2371 op->enter_exit (tmp); 2415 op->enter_exit (tmp);
2372 } 2416 }
2417
2418 return 1;
2419
2420 case INSCRIBABLE:
2421 op->statusmsg (tmp->msg);
2422 // maybe show a spell menu to chose from or something like that
2373 return 1; 2423 return 1;
2374 2424
2375 case SIGN: 2425 case SIGN:
2376 apply_sign (op, tmp, 0); 2426 apply_sign (op, tmp, 0);
2377 return 1; 2427 return 1;
… …
2381 { 2431 {
2382 apply_book (op, tmp); 2432 apply_book (op, tmp);
2383 return 1; 2433 return 1;
2384 } 2434 }
2385 else 2435 else
2386 {
2387 return 0; 2436 return 0;
2388 }
2389 2437
2390 case SKILLSCROLL: 2438 case SKILLSCROLL:
2391 if (op->type == PLAYER) 2439 if (op->type == PLAYER)
2392 { 2440 {
2393 apply_skillscroll (op, tmp); 2441 apply_skillscroll (op, tmp);
2394 return 1; 2442 return 1;
2395 } 2443 }
2444 else
2396 return 0; 2445 return 0;
2397 2446
2398 case SPELLBOOK: 2447 case SPELLBOOK:
2399 if (op->type == PLAYER) 2448 if (op->type == PLAYER)
2400 { 2449 {
2401 apply_spellbook (op, tmp); 2450 apply_spellbook (op, tmp);
2402 return 1; 2451 return 1;
2403 } 2452 }
2453 else
2404 return 0; 2454 return 0;
2405 2455
2406 case SCROLL: 2456 case SCROLL:
2407 apply_scroll (op, tmp, 0); 2457 apply_scroll (op, tmp, 0);
2408 return 1; 2458 return 1;
2409 2459
2410 case POTION: 2460 case POTION:
2411 (void) apply_potion (op, tmp); 2461 apply_potion (op, tmp);
2412 return 1; 2462 return 1;
2413 2463
2414 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2464 /* Eneq(@csd.uu.se): Handle apply on containers. */
2415 //TODO: remove, as it is unsed? 2465 //TODO: remove, as it is unsed?
2416 case CLOSE_CON: 2466 case CLOSE_CON:
… …
2449 case LAMP: 2499 case LAMP:
2450 case BUILDER: 2500 case BUILDER:
2451 case SKILL_TOOL: 2501 case SKILL_TOOL:
2452 if (tmp->env != op) 2502 if (tmp->env != op)
2453 return 2; /* not in inventory */ 2503 return 2; /* not in inventory */
2504
2454 (void) apply_special (op, tmp, aflag); 2505 apply_special (op, tmp, aflag);
2455 return 1; 2506 return 1;
2456 2507
2457 case DRINK: 2508 case DRINK:
2458 case FOOD: 2509 case FOOD:
2459 case FLESH: 2510 case FLESH:
… …
2475 } 2526 }
2476 else 2527 else
2477 return 0; 2528 return 0;
2478 2529
2479 case WEAPON_IMPROVER: 2530 case WEAPON_IMPROVER:
2480 (void) check_improve_weapon (op, tmp); 2531 check_improve_weapon (op, tmp);
2481 return 1; 2532 return 1;
2482 2533
2483 case CLOCK: 2534 case CLOCK:
2484 if (op->type == PLAYER) 2535 if (op->type == PLAYER)
2485 { 2536 {
2486 char buf[MAX_BUF]; 2537 char buf[MAX_BUF];
2487 timeofday_t tod; 2538 timeofday_t tod;
2488 2539
2489 get_tod (&tod); 2540 get_tod (&tod);
2541 op->play_sound (sound_find ("sound_clock"));
2542 op->statusmsg (format (
2490 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2543 "It is %d minute%s past %d o'clock %s",
2491 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2544 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2492 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2545 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2493 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2546 ));
2494 new_draw_info (NDI_UNIQUE, 0, op, buf);
2495 return 1; 2547 return 1;
2496 } 2548 }
2497 else 2549 else
2498 {
2499 return 0; 2550 return 0;
2500 }
2501 2551
2502 case MENU: 2552 case MENU:
2503 if (op->type == PLAYER) 2553 if (op->type == PLAYER)
2504 { 2554 {
2505 shop_listing (tmp, op); 2555 shop_listing (tmp, op);
2506 return 1; 2556 return 1;
2507 } 2557 }
2508 else 2558 else
2509 {
2510 return 0; 2559 return 0;
2511 }
2512 2560
2513 case POWER_CRYSTAL: 2561 case POWER_CRYSTAL:
2514 apply_power_crystal (op, tmp); /* see egoitem.c */ 2562 apply_power_crystal (op, tmp); /* see egoitem.c */
2515 return 1; 2563 return 1;
2516 2564
… …
2519 { 2567 {
2520 apply_lighter (op, tmp); 2568 apply_lighter (op, tmp);
2521 return 1; 2569 return 1;
2522 } 2570 }
2523 else 2571 else
2524 {
2525 return 0; 2572 return 0;
2526 }
2527 2573
2528 case ITEM_TRANSFORMER: 2574 case ITEM_TRANSFORMER:
2529 apply_item_transformer (op, tmp); 2575 apply_item_transformer (op, tmp);
2530 return 1; 2576 return 1;
2531 2577
2532 default: 2578 default:
2533 return 0; 2579 return 0;
2534 } 2580 }
2535} 2581}
2536
2537 2582
2538/* quiet suppresses the "don't know how to apply" and "you must get it first" 2583/* quiet suppresses the "don't know how to apply" and "you must get it first"
2539 * messages as needed by player_apply_below(). But there can still be 2584 * messages as needed by player_apply_below(). But there can still be
2540 * "but you are floating high above the ground" messages. 2585 * "but you are floating high above the ground" messages.
2541 * 2586 *
2542 * Same return value as apply() function. 2587 * Same return value as apply() function.
2543 */ 2588 */
2544int 2589int
2545player_apply (object *pl, object *op, int aflag, int quiet) 2590player_apply (object *pl, object *op, int aflag, int quiet)
2546{ 2591{
2547 int tmp;
2548
2549 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2592 if (!op->env && (pl->move_type & MOVE_FLYING))
2550 { 2593 {
2551 /* player is flying and applying object not in inventory */ 2594 /* player is flying and applying object not in inventory */
2552 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2595 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2553 { 2596 {
2554 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2597 pl->failmsg ("But you are floating high above the ground! "
2598 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2599 "or waiting till the levitation effect wears off.>");
2555 return 0; 2600 return 0;
2556 } 2601 }
2557 } 2602 }
2558 2603
2559 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2560 * applied.
2561 */
2562 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2563 {
2564 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2565 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2566 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2567 op->destroy ();
2568 return 1;
2569 }
2570
2571 pl->contr->last_used = op; 2604 pl->contr->last_used = op;
2572 2605
2573 tmp = manual_apply (pl, op, aflag); 2606 int tmp = manual_apply (pl, op, aflag);
2607
2574 if (!quiet) 2608 if (!quiet)
2575 { 2609 {
2576 if (tmp == 0) 2610 if (tmp == 0)
2577 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2611 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2578 else if (tmp == 2) 2612 else if (tmp == 2)
2579 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2613 pl->failmsg ("You must get it first!\n");
2580 } 2614 }
2615
2581 return tmp; 2616 return tmp;
2582} 2617}
2583 2618
2584/** 2619/**
2585 * player_apply_below attempts to apply the object 'below' the player. 2620 * player_apply_below attempts to apply the object 'below' the player.
2586 * If the player has an open container, we use that for below, otherwise 2621 * If the player has an open container, we use that for below, otherwise
2587 * we use the ground. 2622 * we use the ground.
2588 */ 2623 */
2589
2590void 2624void
2591player_apply_below (object *pl) 2625player_apply_below (object *pl)
2592{ 2626{
2593 int floors = 0; 2627 int floors = 0;
2594 2628
… …
2613 * person moving on it, also activate. Added code to make it 2647 * person moving on it, also activate. Added code to make it
2614 * so that at least one of players movement types be that which 2648 * so that at least one of players movement types be that which
2615 * the item needs. 2649 * the item needs.
2616 */ 2650 */
2617 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2651 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2618 {
2619 if (player_apply (pl, tmp, 0, 1) == 1) 2652 if (player_apply (pl, tmp, 0, 1) == 1)
2620 return; 2653 return;
2621 } 2654
2622 if (floors >= 2) 2655 if (floors >= 2)
2623 return; /* process at most two floor objects */ 2656 return; /* process at most two floor objects */
2624 } 2657 }
2625} 2658}
2626 2659
… …
2631 * to keep the size of apply_special to a more managable size. 2664 * to keep the size of apply_special to a more managable size.
2632 */ 2665 */
2633static int 2666static int
2634unapply_special (object *who, object *op, int aflags) 2667unapply_special (object *who, object *op, int aflags)
2635{ 2668{
2636 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2669 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2670 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2637 return RESULT_INT (0); 2671 return RESULT_INT (0);
2638 2672
2639 object *tmp2;
2640
2641 CLEAR_FLAG (op, FLAG_APPLIED); 2673 CLEAR_FLAG (op, FLAG_APPLIED);
2642 2674
2643 switch (op->type) 2675 switch (op->type)
2644 { 2676 {
2677 case SKILL_TOOL:
2678 // unapplying a skill tool should also unapply the skill it governs
2679 // but this is hard, as it shouldn't do so when the skill can
2680 // be used for other reasons
2681 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2682 if (tmp->skill == op->skill
2683 && tmp->type == SKILL
2684 && tmp->flag [FLAG_APPLIED]
2685 && !tmp->flag [FLAG_CAN_USE_SKILL])
2686 unapply_special (who, tmp, 0);
2687
2688 change_abil (who, op);
2689 break;
2690
2645 case WEAPON: 2691 case WEAPON:
2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2692 if (player *pl = who->contr)
2693 if (op == pl->combat_ob)
2694 {
2695 pl->combat_ob = 0;
2696 who->change_weapon (pl->ranged_ob);
2697 }
2647 2698
2699 who->statusmsg (format ("You unwield %s.", query_name (op)));
2700
2648 (void) change_abil (who, op); 2701 change_abil (who, op);
2649 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2650 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2702 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2651 clear_skill (who);
2652 break; 2703 break;
2653 2704
2654 case SKILL: /* allows objects to impart skills */
2655 case SKILL_TOOL: 2705 case SKILL:
2656 if (op != who->chosen_skill) 2706 if (who->contr)
2657 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2658
2659 if (who->type == PLAYER)
2660 { 2707 {
2661 if (who->contr->ranged_ob == op) 2708 if (IS_COMBAT_SKILL (op->subtype))
2662 { 2709 who->change_weapon (who->contr->combat_ob = 0);
2663 who->contr->ranged_skill = 0; 2710 else if (IS_RANGED_SKILL (op->subtype))
2664 who->contr->ranged_ob = 0; 2711 who->change_weapon (who->contr->ranged_ob = 0);
2665 }
2666 2712
2667 if (!op->invisible) 2713 if (op->invisible)
2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2714 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2669 else 2715 else
2670 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2716 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2671 } 2717 }
2672 2718
2673 change_abil (who, op); 2719 change_abil (who, op);
2674 who->chosen_skill = 0;
2675 CLEAR_FLAG (who, FLAG_READY_SKILL); 2720 CLEAR_FLAG (who, FLAG_READY_SKILL);
2676 break; 2721 break;
2677 2722
2678 case ARMOUR: 2723 case ARMOUR:
2679 case HELMET: 2724 case HELMET:
… …
2683 case GLOVES: 2728 case GLOVES:
2684 case AMULET: 2729 case AMULET:
2685 case GIRDLE: 2730 case GIRDLE:
2686 case BRACERS: 2731 case BRACERS:
2687 case CLOAK: 2732 case CLOAK:
2688 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2733 who->statusmsg (format ("You unwear %s.", query_name (op)));
2689 (void) change_abil (who, op); 2734 change_abil (who, op);
2690 break; 2735 break;
2736
2691 case LAMP: 2737 case LAMP:
2692 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2738 {
2739 who->statusmsg (format ("You turn off your %s.", &op->name));
2740
2693 tmp2 = arch_to_object (op->other_arch); 2741 object *tmp2 = arch_to_object (op->other_arch);
2694 tmp2->x = op->x; 2742 tmp2->x = op->x;
2695 tmp2->y = op->y; 2743 tmp2->y = op->y;
2696 tmp2->map = op->map; 2744 tmp2->map = op->map;
2697 tmp2->below = op->below; 2745 tmp2->below = op->below;
2698 tmp2->above = op->above; 2746 tmp2->above = op->above;
2699 tmp2->stats.food = op->stats.food; 2747 tmp2->stats.food = op->stats.food;
2700 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2748 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2701 2749
2702 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2750 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2703 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2751 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2704 2752
2705 if (who->type == PLAYER)
2706 esrv_del_item (who->contr, op->count);
2707
2708 op->destroy (); 2753 op->destroy ();
2709 insert_ob_in_ob (tmp2, who); 2754 who->insert (tmp2);
2710 who->update_stats (); 2755 who->update_stats ();
2756
2757 if (who->contr)
2711 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2758 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2712 {
2713 if (who->type == PLAYER)
2714 { 2759 {
2715 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2760 who->failmsg ("Oops, it feels deadly cold!");
2716 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2761 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2717 } 2762 }
2718 } 2763 }
2719 if (who->type == PLAYER) 2764
2720 esrv_send_item (who, tmp2);
2721 return 1; /* otherwise, an attempt to drop causes problems */ 2765 return 1; /* otherwise, an attempt to drop causes problems */
2722 break;
2723 2766
2724 case BOW: 2767 case BOW:
2725 case WAND: 2768 case WAND:
2726 case ROD: 2769 case ROD:
2727 case HORN: 2770 case HORN:
2728 clear_skill (who); 2771 if (player *pl = who->contr)
2729 if (who->type == PLAYER)
2730 { 2772 {
2731 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2773 if (op == pl->ranged_ob)
2774 {
2775 pl->ranged_ob = 0;
2776 who->change_weapon (pl->combat_ob);
2777 }
2732 2778
2733 who->contr->ranged_skill = 0; 2779 who->statusmsg (format ("You unready %s.", query_name (op)));
2734 who->contr->ranged_ob = 0;
2735 } 2780 }
2736 else 2781 else
2737 { 2782 {
2783 who->change_skill (0);
2784
2738 if (op->type == BOW) 2785 if (op->type == BOW)
2739 CLEAR_FLAG (who, FLAG_READY_BOW); 2786 CLEAR_FLAG (who, FLAG_READY_BOW);
2740 else 2787 else
2741 CLEAR_FLAG (who, FLAG_READY_RANGE); 2788 CLEAR_FLAG (who, FLAG_READY_RANGE);
2742 } 2789 }
2743 2790
2744 break; 2791 break;
2745 2792
2746 case BUILDER: 2793 case BUILDER:
2747 if (who->type == PLAYER) 2794 if (who->contr)
2748 { 2795 who->statusmsg (format ("You unready %s.", query_name (op)));
2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2750
2751 who->contr->ranged_skill = 0;
2752 who->contr->ranged_ob = 0;
2753 }
2754 break; 2796 break;
2755 2797
2756 default: 2798 default:
2757 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2799 who->statusmsg (format ("You unapply %s.", query_name (op)));
2758 break; 2800 break;
2759 } 2801 }
2760 2802
2803 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2804 if (object *pl = op->visible_to ())
2805 esrv_send_item (pl, op);
2806
2761 who->update_stats (); 2807 who->update_stats ();
2762 2808
2763 if (!(aflags & AP_NO_MERGE))
2764 {
2765 object *tmp;
2766
2767 tmp = merge_ob (op, NULL);
2768 if (who->type == PLAYER)
2769 {
2770 if (tmp)
2771 { /* it was merged */
2772 esrv_del_item (who->contr, op->count);
2773 op = tmp;
2774 }
2775
2776 esrv_send_item (who, op);
2777 }
2778 }
2779 return 0; 2809 return 0;
2780} 2810}
2781 2811
2782/** 2812/**
2783 * Returns the object that is using location 'loc'. 2813 * Returns the object that is using location 'loc'.
2784 * Note that 'start' is the first object to start examing - we 2814 * Note that 'start' is the first object to start examing - we
2785 * then go through the below of this. In this way, you can do 2815 * then go through the below of this. In this way, you can do
2786 * something like: 2816 * something like:
2787 * tmp = get_item_from_body_location(who->inv, 1); 2817 * tmp = get_next_item_from_body_location(who->inv, 1);
2788 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2818 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
2789 * to find the second object that may use this location, etc. 2819 * to find the second object that may use this location, etc.
2790 * Returns NULL if no match is found. 2820 * Returns NULL if no match is found.
2791 * loc is the index into the array we are looking for a match. 2821 * loc is the index into the array we are looking for a match.
2792 * don't return invisible objects unless they are skill objects 2822 * don't return invisible objects unless they are skill objects
2793 * invisible other objects that use 2823 * invisible other objects that use
2794 * up body locations can be used as restrictions. 2824 * up body locations can be used as restrictions.
2795 */ 2825 */
2796object * 2826static object *
2797get_item_from_body_location (object *start, int loc) 2827get_next_item_from_body_location (int loc, object *start)
2798{ 2828{
2799 object *tmp;
2800
2801 if (!start)
2802 return NULL;
2803
2804 for (tmp = start; tmp; tmp = tmp->below) 2829 for (object *tmp = start; tmp; tmp = tmp->below)
2805 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2830 if (tmp->flag [FLAG_APPLIED]
2831 && tmp->slot[loc].info
2832 && (!tmp->invisible || tmp->type == SKILL))
2806 return tmp; 2833 return tmp;
2807 2834
2808 return NULL; 2835 return 0;
2809} 2836}
2810
2811
2812 2837
2813/** 2838/**
2814 * 'op' wants to apply an object, but can't because of other equipment. 2839 * 'op' wants to apply an object, but can't because of other equipment.
2815 * This should only be called when it is known 2840 * This should only be called when it is known
2816 * that there are objects to unapply. This makes pretty heavy 2841 * that there are objects to unapply. This makes pretty heavy
… …
2819 * Returns 0 on success, returns 1 if there is some problem. 2844 * Returns 0 on success, returns 1 if there is some problem.
2820 * if aflags is AP_PRINT, we instead print out waht to unapply 2845 * if aflags is AP_PRINT, we instead print out waht to unapply
2821 * instead of doing it. This is a lot less code than having 2846 * instead of doing it. This is a lot less code than having
2822 * another function that does just that. 2847 * another function that does just that.
2823 */ 2848 */
2849
2850#define CANNOT_REMOVE_CURSED \
2851 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2852 "Praying over an altar, scrolls of remove curse/damnation, " \
2853 "priests or even other players might help.>"
2854
2824int 2855int
2825unapply_for_ob (object *who, object *op, int aflags) 2856unapply_for_ob (object *who, object *op, int aflags)
2826{ 2857{
2827 int i; 2858 if (op->is_range ())
2828 object *tmp = NULL, *last;
2829
2830 /* If we are applying a shield or weapon, unapply any equipped shield
2831 * or weapons first - only allowed to use one weapon/shield at a time.
2832 */
2833 if (op->type == WEAPON || op->type == SHIELD)
2834 {
2835 for (tmp = who->inv; tmp; tmp = tmp->below) 2859 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2836 {
2837 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2860 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2838 {
2839 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2861 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2840 { 2862 {
2841 if (aflags & AP_PRINT) 2863 if (aflags & AP_PRINT)
2842 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2864 who->failmsg (query_name (tmp));
2843 else 2865 else
2844 unapply_special (who, tmp, aflags); 2866 unapply_special (who, tmp, aflags);
2845 } 2867 }
2846 else 2868 else
2847 { 2869 {
2848 /* In this case, we want to try and remove a cursed item. 2870 /* In this case, we want to try and remove a cursed item.
2849 * While we know it won't work, we want unapply_special to 2871 * While we know it won't work, we want unapply_special to
2850 * at least generate the message. 2872 * at least generate the message.
2851 */ 2873 */
2852 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2874 who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
2853 return 1; 2875 return 1;
2854 }
2855
2856 } 2876 }
2857 }
2858 }
2859 2877
2860 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2878 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2861 { 2879 {
2862 /* this used up a slot that we need to free */ 2880 /* this used up a slot that we need to free */
2863 if (op->body_info[i]) 2881 if (op->slot[i].info)
2864 { 2882 {
2865 last = who->inv; 2883 object *last = who->inv;
2866 2884
2867 /* We do a while loop - may need to remove several items in order 2885 /* We do a while loop - may need to remove several items in order
2868 * to free up enough slots. 2886 * to free up enough slots.
2869 */ 2887 */
2870 while ((who->body_used[i] + op->body_info[i]) < 0) 2888 while ((who->slot[i].used + op->slot[i].info) < 0)
2871 { 2889 {
2872 tmp = get_item_from_body_location (last, i); 2890 object *tmp = get_next_item_from_body_location (i, last);
2891
2873 if (!tmp) 2892 if (!tmp)
2874 { 2893 {
2875#if 0 2894#if 0
2876 /* Not a bug - we'll get this if the player has cursed items 2895 /* Not a bug - we'll get this if the player has cursed items
2877 * equipped. 2896 * equipped.
2878 */ 2897 */
2879 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2898 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
2880#endif 2899#endif
2881 return 1; 2900 return 1;
2882 } 2901 }
2902
2883 /* If we are just printing, we don't care about cursed status */ 2903 /* If we are just printing, we don't care about cursed status */
2884 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2904 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2885 { 2905 {
2886 if (aflags & AP_PRINT) 2906 if (aflags & AP_PRINT)
2887 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2907 who->failmsg (query_name (tmp));
2888 else 2908 else
2889 unapply_special (who, tmp, aflags); 2909 unapply_special (who, tmp, aflags);
2890 } 2910 }
2891 else 2911 else
2892 { 2912 {
2893 /* Cursed item that we can't unequip - tell the player. 2913 /* Cursed item that we can't unequip - tell the player.
2894 * Note this could be annoying if this is just one of a few, 2914 * Note this could be annoying if this is just one of a few,
2895 * so it may not be critical (eg, putting on a ring and you have 2915 * so it may not be critical (eg, putting on a ring and you have
2896 * one cursed ring.) 2916 * one cursed ring.)
2897 */ 2917 */
2898 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2918 who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
2899 } 2919 }
2920
2900 last = tmp->below; 2921 last = tmp->below;
2901 } 2922 }
2902 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2923 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
2903 * return in the !tmp would have kicked in. 2924 * return in the !tmp would have kicked in.
2904 */ 2925 */
2905 } /* if op is using this body location */ 2926 } /* if op is using this body location */
2906 } /* for body lcoations */ 2927 } /* for body lcoations */
2928
2907 return 0; 2929 return 0;
2908} 2930}
2909 2931
2910/** 2932/**
2911 * Checks to see if 'who' can apply object 'op'. 2933 * Checks to see if 'who' can apply object 'op'.
2912 * Returns 0 if apply can be done without anything special. 2934 * Returns 0 if apply can be done without anything special.
2913 * Otherwise returns a bitmask - potentially several of these may be 2935 * Otherwise returns a bitmask - potentially several of these may be
2914 * set, but largely depends on circumstance - in the future, processing 2936 * set, but largely depends on circumstance - in the future, processing
2915 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2937 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
2916 * is set, do we really are what the other flags may be?) 2938 * is set, do we really care what the other flags may be?)
2917 * 2939 *
2918 * See include/define.h for detailed description of the meaning of 2940 * See include/define.h for detailed description of the meaning of
2919 * these return values. 2941 * these return values.
2920 */ 2942 */
2921int 2943int
2922can_apply_object (object *who, object *op) 2944can_apply_object (object *who, object *op)
2923{ 2945{
2924 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2946 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
2925 return RESULT_INT (0); 2947 return RESULT_INT (0);
2926 2948
2927 int i, retval = 0; 2949 int retval = 0;
2928 object *tmp = NULL, *ws = NULL; 2950 object *tmp = 0, *ws = 0;
2929 2951
2930 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2952 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2931 * 2 weapons, but we don't want to let them do that. So if they are
2932 * trying to equip a weapon or shield, see if they already have one
2933 * in place and store that way.
2934 */
2935 if (op->type == WEAPON || op->type == SHIELD)
2936 { 2953 {
2937 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2954 if (op->slot[i].info)
2938 { 2955 {
2939 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2956 /* Item uses more slots than we have */
2957 if (who->slot[i].info + op->slot [i].info < 0)
2940 { 2958 {
2941 retval = CAN_APPLY_UNAPPLY;
2942 ws = tmp;
2943 }
2944 }
2945 }
2946
2947 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
2948 {
2949 if (op->body_info[i])
2950 {
2951 /* Item uses more slots than we have */
2952 if (FABS (op->body_info[i]) > who->body_info[i])
2953 {
2954 /* Could return now for efficiently - rest of info below isn' 2959 /* Could return now for efficiency - rest of info below isn't
2955 * really needed. 2960 * really needed.
2956 */ 2961 */
2957 retval |= CAN_APPLY_NEVER; 2962 retval |= CAN_APPLY_NEVER;
2958 } 2963 }
2959 else if ((who->body_used[i] + op->body_info[i]) < 0) 2964 else if (who->slot[i].used + op->slot[i].info < 0)
2960 { 2965 {
2961 /* in this case, equipping this would use more free spots than 2966 /* in this case, equipping this would use more free spots than
2962 * we have. 2967 * we have.
2963 */ 2968 */
2964 object *tmp1;
2965
2966 2969
2967 /* if we have an applied weapon/shield, and unapply it would free 2970 /* if we have an applied weapon/shield, and unapply it would free
2968 * enough slots to equip the new item, then just set this can 2971 * enough slots to equip the new item, then just set "can
2969 * continue. We don't care about the logic below - if you have 2972 * apply unapply". We don't care about the logic below - if you have a
2970 * shield equipped and try to equip another shield, there is only 2973 * shield equipped and try to equip another shield, there is only
2971 * one choice. However, the check for the number of body locations 2974 * one choice. However, the check for the number of body locations
2972 * does take into the account cases where what is being applied 2975 * does take into the account cases where what is being applied
2973 * may be two handed for example. 2976 * may be two handed for example.
2974 */ 2977 */
2975 if (ws) 2978 if (ws)
2976 { 2979 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
2977 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
2978 { 2980 {
2979 retval |= CAN_APPLY_UNAPPLY; 2981 retval |= CAN_APPLY_UNAPPLY;
2980 continue; 2982 continue;
2981 } 2983 }
2982 }
2983 2984
2984 tmp1 = get_item_from_body_location (who->inv, i); 2985 object *tmp1 = get_next_item_from_body_location (i, who->inv);
2985 if (!tmp1) 2986 if (!tmp1)
2986 { 2987 {
2987#if 0 2988#if 0
2988 /* This is sort of an error, but happens a lot when old players 2989 /* This is sort of an error, but happens a lot when old players
2989 * join in with more stuff equipped than they are now allowed. 2990 * join in with more stuff equipped than they are now allowed.
… …
2997 /* need to unapply something. However, if this something 2998 /* need to unapply something. However, if this something
2998 * is different than we had found before, it means they need 2999 * is different than we had found before, it means they need
2999 * to apply multiple objects 3000 * to apply multiple objects
3000 */ 3001 */
3001 retval |= CAN_APPLY_UNAPPLY; 3002 retval |= CAN_APPLY_UNAPPLY;
3003
3002 if (!tmp) 3004 if (!tmp)
3003 tmp = tmp1; 3005 tmp = tmp1;
3004 else if (tmp != tmp1) 3006 else if (tmp != tmp1)
3005 {
3006 retval |= CAN_APPLY_UNAPPLY_MULT; 3007 retval |= CAN_APPLY_UNAPPLY_MULT;
3007 } 3008
3008 /* This object isn't using up all the slots, so there must 3009 /* This object isn't using up all the slots, so there must
3009 * be another. If so, and it the new item doesn't need all 3010 * be another. If so, and it the new item doesn't need all
3010 * the slots, the player then has a choice. 3011 * the slots, the player then has a choice.
3011 */ 3012 */
3012 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 3013 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
3014 && abs (op->slot[i].info) < who->slot[i].info)
3013 retval |= CAN_APPLY_UNAPPLY_CHOICE; 3015 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3014 3016
3015 /* Does unequippint 'tmp1' free up enough slots for this to be 3017 /* Does unequippint 'tmp1' free up enough slots for this to be
3016 * equipped? If not, there must be something else to unapply. 3018 * equipped? If not, there must be something else to unapply.
3017 */ 3019 */
3018 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3020 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3019 retval |= CAN_APPLY_UNAPPLY_MULT; 3021 retval |= CAN_APPLY_UNAPPLY_MULT;
3020
3021 } 3022 }
3022 } /* if not enough free slots */ 3023 } /* if not enough free slots */
3023 } /* if this object uses location i */ 3024 } /* if this object uses location i */
3024 } /* for i -> num_body_locations loop */ 3025 } /* for i -> num_body_locations loop */
3025 3026
… …
3038 3039
3039 if (who->type != PLAYER) 3040 if (who->type != PLAYER)
3040 { 3041 {
3041 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3042 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3042 retval |= CAN_APPLY_RESTRICTION; 3043 retval |= CAN_APPLY_RESTRICTION;
3044
3043 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3045 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3044 retval |= CAN_APPLY_RESTRICTION; 3046 retval |= CAN_APPLY_RESTRICTION;
3047
3045 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3048 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3046 retval |= CAN_APPLY_RESTRICTION; 3049 retval |= CAN_APPLY_RESTRICTION;
3050
3047 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3051 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3048 retval |= CAN_APPLY_RESTRICTION; 3052 retval |= CAN_APPLY_RESTRICTION;
3049 } 3053 }
3050 3054
3051 return retval; 3055 return retval;
… …
3066 * AP_UNAPPLY=always unapply). 3070 * AP_UNAPPLY=always unapply).
3067 * 3071 *
3068 * Optional flags: 3072 * Optional flags:
3069 * AP_NO_MERGE: don't merge an unapplied object with other objects 3073 * AP_NO_MERGE: don't merge an unapplied object with other objects
3070 * AP_IGNORE_CURSE: unapply cursed items 3074 * AP_IGNORE_CURSE: unapply cursed items
3075 * AP_NO_READY: do not ready skills when applying skill tools
3071 * 3076 *
3072 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3077 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3073 * 3078 *
3074 * apply_special() doesn't check for unpaid items. 3079 * apply_special() doesn't check for unpaid items.
3075 */ 3080 */
3081
3082#define LACK_ITEM_POWER \
3083 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3084
3076int 3085int
3077apply_special (object *who, object *op, int aflags) 3086apply_special (object *who, object *op, int aflags)
3078{ 3087{
3079 int basic_flag = aflags & AP_BASIC_FLAGS; 3088 int basic_flag = aflags & AP_BASIC_FLAGS;
3080 object *tmp, *tmp2, *skop = NULL; 3089 object *tmp, *tmp2, *skop = NULL;
3081 int i;
3082 3090
3083 if (who == NULL) 3091 if (who == NULL)
3084 { 3092 {
3085 LOG (llevError, "apply_special() from object without environment.\n"); 3093 LOG (llevError, "apply_special() from object without environment.\n");
3086 return 1; 3094 return 1;
… …
3096 if (basic_flag == AP_APPLY) 3104 if (basic_flag == AP_APPLY)
3097 return 0; 3105 return 0;
3098 3106
3099 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3107 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3100 { 3108 {
3101 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3109 who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
3102 return 1; 3110 return 1;
3103 } 3111 }
3112
3104 return unapply_special (who, op, aflags); 3113 return unapply_special (who, op, aflags);
3105 } 3114 }
3106
3107 if (basic_flag == AP_UNAPPLY) 3115 else if (basic_flag == AP_UNAPPLY)
3108 return 0; 3116 return 0;
3109 3117
3110 i = can_apply_object (who, op); 3118 // if the item is combat/ranged, wield the relevant slot first
3119 // to resolve conflicts.
3120 if (player *pl = who->contr)
3121 switch (op->slottype ())
3122 {
3123 case slot_combat: who->change_weapon (pl->combat_ob); break;
3124 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3125 }
3126
3127 splay (op);
3111 3128
3112 /* Can't just apply this object. Lets see what not and what to do */ 3129 /* Can't just apply this object. Lets see what not and what to do */
3113 if (i) 3130 if (int i = can_apply_object (who, op))
3114 { 3131 {
3115 if (i & CAN_APPLY_NEVER) 3132 if (i & CAN_APPLY_NEVER)
3116 { 3133 {
3117 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3134 who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
3118 return 1; 3135 return 1;
3119 } 3136 }
3120 else if (i & CAN_APPLY_RESTRICTION) 3137 else if (i & CAN_APPLY_RESTRICTION)
3121 { 3138 {
3122 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3139 who->failmsg (format (
3140 "You have a prohibition against using a %s. "
3141 "H<Your belief, profession or class prevents you from applying this item.>",
3142 query_name (op)
3143 ));
3123 return 1; 3144 return 1;
3124 } 3145 }
3146
3125 if (who->type != PLAYER) 3147 if (who->type != PLAYER)
3126 { 3148 {
3127 /* Some error, so don't try to equip something more */ 3149 /* Some error, so don't try to equip something more */
3128 if (unapply_for_ob (who, op, aflags)) 3150 if (unapply_for_ob (who, op, aflags))
3129 return 1; 3151 return 1;
3130 } 3152 }
3131 else 3153 else
3132 { 3154 {
3133 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3155 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3134 { 3156 {
3135 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3157 who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
3136 unapply_for_ob (who, op, AP_PRINT); 3158 unapply_for_ob (who, op, AP_PRINT);
3137 return 1; 3159 return 1;
3138 } 3160 }
3139 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3161 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3140 {
3141 i = unapply_for_ob (who, op, aflags); 3162 if (unapply_for_ob (who, op, aflags))
3142 if (i)
3143 return 1; 3163 return 1;
3144 }
3145 } 3164 }
3146 } 3165 }
3147 3166
3148 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3167 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3149 { 3168 {
3150 skop = find_skill_by_name (who, op->skill); 3169 skop = find_skill_by_name (who, op->skill);
3170
3151 if (!skop) 3171 if (!skop)
3152 { 3172 {
3153 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3173 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3154 return 1; 3174 return 1;
3155 } 3175 }
3156 else 3176 else
3157 /* While experience will be credited properly, we want to change the 3177 /* While experience will be credited properly, we want to change the
3158 * skill so that the dam and wc get updated 3178 * skill so that the dam and wc get updated
3159 */ 3179 */
3160 change_skill (who, skop, 0); 3180 who->change_skill (skop);
3161 }
3162
3163 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3164 { 3181 }
3165 new_draw_info (NDI_UNIQUE, 0, who, 3182
3183 if (who->type == PLAYER
3184 && op->item_power
3185 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3186 {
3166 "Equipping that combined with other items would consume your soul! " 3187 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3167 "[use the skills command to check your available item power]");
3168 return 1; 3188 return 1;
3169 } 3189 }
3170
3171 3190
3172 /* Ok. We are now at the state where we can apply the new object. 3191 /* Ok. We are now at the state where we can apply the new object.
3173 * Note that we don't have the checks for can_use_... 3192 * Note that we don't have the checks for can_use_...
3174 * below - that is already taken care of by can_apply_object. 3193 * below - that is already taken care of by can_apply_object.
3175 */ 3194 */
3176 3195 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3177 if (op->nrof > 1)
3178 tmp = get_split_ob (op, op->nrof - 1);
3179 else
3180 tmp = NULL;
3181 3196
3182 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3197 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3183 return RESULT_INT (0); 3198 return RESULT_INT (0);
3184 3199
3185 switch (op->type) 3200 switch (op->type)
3186 { 3201 {
3187 case WEAPON: 3202 case WEAPON:
3188 if (!check_weapon_power (who, op->last_eat)) 3203 if (!check_weapon_power (who, op->last_eat))
3189 { 3204 {
3190 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3205 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3191 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3206
3192 if (tmp != NULL) 3207 if (tmp)
3193 (void) insert_ob_in_ob (tmp, who); 3208 insert_ob_in_ob (tmp, who);
3209
3194 return 1; 3210 return 1;
3195 } 3211 }
3196 3212
3197 //TODO: this obviously fails for players using a shiorter prefix 3213 //TODO: this obviously fails for players using a shorter prefix
3198 // i.e. "R" can use Ragnarok's swors. 3214 // i.e. "R" can use Ragnarok's sword.
3199 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3215 if (op->level && !op->name.starts_with (who->name))
3200 { 3216 {
3201 /* if the weapon does not have the name as the character, can't use it. */ 3217 /* if the weapon does not have the name as the character, can't use it. */
3202 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3218 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3203 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3219 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3204 3220
3205 if (tmp) 3221 if (tmp)
3206 insert_ob_in_ob (tmp, who); 3222 insert_ob_in_ob (tmp, who);
3207 3223
3208 return 1; 3224 return 1;
3209 } 3225 }
3210 3226
3227 if (!skop)
3228 {
3229 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3230 return 1;
3231 }
3232
3211 SET_FLAG (op, FLAG_APPLIED); 3233 SET_FLAG (op, FLAG_APPLIED);
3212
3213 if (skop)
3214 change_skill (who, skop, 1); 3234 who->change_skill (skop);
3215 3235
3216 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3236 if (who->contr)
3237 who->change_weapon (who->contr->combat_ob = op);
3238
3239 who->statusmsg (format ("You wield %s.", query_name (op)));
3240
3217 SET_FLAG (who, FLAG_READY_WEAPON); 3241 SET_FLAG (who, FLAG_READY_WEAPON);
3218
3219 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3220
3221 change_abil (who, op); 3242 change_abil (who, op);
3222 break; 3243 break;
3223 3244
3224 case ARMOUR: 3245 case ARMOUR:
3225 case HELMET: 3246 case HELMET:
… …
3230 case BRACERS: 3251 case BRACERS:
3231 case CLOAK: 3252 case CLOAK:
3232 case RING: 3253 case RING:
3233 case AMULET: 3254 case AMULET:
3234 SET_FLAG (op, FLAG_APPLIED); 3255 SET_FLAG (op, FLAG_APPLIED);
3235 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3256 who->statusmsg (format ("You wear %s.", query_name (op)));
3236 change_abil (who, op); 3257 change_abil (who, op);
3237 break; 3258 break;
3238 3259
3239 case LAMP: 3260 case LAMP:
3240 if (op->stats.food < 1) 3261 if (op->stats.food < 1)
3241 { 3262 {
3242 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3263 who->failmsg (format (
3264 "Your %s is out of fuel! "
3265 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3266 &op->name
3267 ));
3243 return 1; 3268 return 1;
3244 } 3269 }
3245 3270
3246 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3271 who->statusmsg (format ("You turn on your %s.", &op->name));
3272
3247 tmp2 = arch_to_object (op->other_arch); 3273 tmp2 = arch_to_object (op->other_arch);
3248 tmp2->stats.food = op->stats.food; 3274 tmp2->stats.food = op->stats.food;
3249 SET_FLAG (tmp2, FLAG_APPLIED); 3275 SET_FLAG (tmp2, FLAG_APPLIED);
3250 3276
3251 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3277 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3252 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3278 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3253 3279
3254 insert_ob_in_ob (tmp2, who); 3280 who->insert (tmp2);
3255 3281
3256 /* Remove the old lantern */ 3282 /* Remove the old lantern */
3257 if (who->type == PLAYER)
3258 esrv_del_item (who->contr, op->count);
3259
3260 op->destroy (); 3283 op->destroy ();
3261 3284
3262 /* insert the portion that was split off */ 3285 /* insert the portion that was split off */
3263 if (tmp) 3286 if (tmp)
3287 who->insert (tmp);
3288
3289 who->update_stats ();
3290
3291 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3292 if (who->type == PLAYER)
3293 {
3294 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright (hrhrhr) idea to apply this cursed or damned item.>");
3295 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3296 }
3297
3298 return 0;
3299
3300 case SKILL_TOOL:
3301 // applying a skill tool also readies the skill
3302 SET_FLAG (op, FLAG_APPLIED);
3303
3304 if (!(aflags & AP_NO_READY))
3264 { 3305 {
3265 insert_ob_in_ob (tmp, who); 3306 skop = find_skill_by_name (who, op->skill);
3266 if (who->type == PLAYER) 3307 if (!skop->flag [FLAG_APPLIED])
3267 esrv_send_item (who, tmp); 3308 apply_special (who, skop, AP_APPLY);
3268 } 3309 }
3310 break;
3269 3311
3270 who->update_stats (); 3312 case SKILL:
3271 3313 if (player *pl = who->contr)
3272 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3273 { 3314 {
3274 if (who->type == PLAYER) 3315 if (IS_COMBAT_SKILL (op->subtype))
3275 { 3316 {
3276 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3317 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3277 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3318 {
3319 for (object *item = who->inv; item; item = item->below)
3320 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3321 {
3322 if (item->skill == op->skill)
3323 {
3324 who->change_weapon (pl->combat_ob = item);
3325 goto found_weapon;
3326 }
3327 }
3328
3329 who->failmsg (format (
3330 "You need to apply a '%s' melee weapon before readying this skill. "
3331 "H<Some skills need an item, in this case a melee weapon, to function.>",
3332 &op->skill
3333 ));
3334 return 1;
3335
3336 found_weapon:;
3337 }
3338 else
3339 who->change_weapon (pl->combat_ob = op);
3278 } 3340 }
3279 } 3341 else if (IS_RANGED_SKILL (op->subtype))
3280
3281 if (who->type == PLAYER)
3282 esrv_send_item (who, tmp2);
3283
3284 return 0;
3285
3286 /* this part is needed for skill-tools */
3287 case SKILL:
3288 case SKILL_TOOL:
3289 if (who->chosen_skill)
3290 { 3342 {
3291 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3343 if (skill_flags [op->subtype] & SF_NEED_BOW)
3344 {
3345 for (object *item = who->inv; item; item = item->below)
3346 if (item->type == BOW && item->flag [FLAG_APPLIED])
3347 {
3348 //TODO: bows should/must all have skill missile weapon right now
3349 who->change_weapon (pl->ranged_ob = item);
3350 goto found_bow;
3351 }
3352
3353 who->failmsg (
3354 "You need to apply a missile weapon before readying this skill. "
3355 "H<Some skills need an item, in this case a missile weapon, to function.>"
3356 );
3292 return 1; 3357 return 1;
3358
3359 found_bow:;
3360 }
3361 else
3362 who->change_weapon (pl->ranged_ob = op);
3293 } 3363 }
3294
3295 if (who->type == PLAYER)
3296 {
3297 who->contr->ranged_skill = who;
3298 who->contr->ranged_ob = op;
3299 3364
3300 if (!op->invisible) 3365 if (!op->invisible)
3301 { 3366 {
3302 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3367 who->statusmsg (format (
3303 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3368 "You ready %s."
3369 "You can now use the skill: %s.",
3370 query_name (op),
3371 &op->skill
3372 ));
3304 } 3373 }
3305 else 3374 else
3306 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3375 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
3307 } 3376 }
3308 3377 else
3378 {
3309 SET_FLAG (op, FLAG_APPLIED); 3379 SET_FLAG (op, FLAG_APPLIED);
3310 change_abil (who, op); 3380 change_abil (who, op);
3311 who->chosen_skill = op; 3381 who->chosen_skill = op;
3312 SET_FLAG (who, FLAG_READY_SKILL); 3382 SET_FLAG (who, FLAG_READY_SKILL);
3383 }
3384
3313 break; 3385 break;
3314 3386
3315 case BOW: 3387 case BOW:
3316 if (!check_weapon_power (who, op->last_eat)) 3388 if (!check_weapon_power (who, op->last_eat))
3317 { 3389 {
3318 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3390 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3319 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3320 3391
3321 if (tmp) 3392 if (tmp)
3322 insert_ob_in_ob (tmp, who); 3393 insert_ob_in_ob (tmp, who);
3323 3394
3324 return 1; 3395 return 1;
3325 } 3396 }
3326 3397
3327 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3398 if (op->level && !op->name.starts_with (who->name))
3328 { 3399 {
3329 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3400 who->failmsg ("The weapon does not recognize you as its owner. "
3401 "H<Its name indicates that it belongs to somebody else.>");
3330 if (tmp != NULL) 3402 if (tmp)
3331 insert_ob_in_ob (tmp, who); 3403 insert_ob_in_ob (tmp, who);
3332 3404
3333 return 1; 3405 return 1;
3334 } 3406 }
3335 3407
3336 /*FALLTHROUGH*/ 3408 /*FALLTHROUGH*/
3337 case WAND: 3409 case WAND:
3338 case ROD: 3410 case ROD:
3339 case HORN: 3411 case HORN:
3340 /* check for skill, alter player status */ 3412 /* check for skill, alter player status */
3413
3414 if (!skop)
3415 {
3416 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3417 return 1;
3418 }
3419
3341 SET_FLAG (op, FLAG_APPLIED); 3420 SET_FLAG (op, FLAG_APPLIED);
3342 if (skop)
3343 change_skill (who, skop, 0); 3421 who->change_skill (skop);
3344 3422
3345 if (who->type == PLAYER) 3423 if (who->contr)
3346 { 3424 {
3347 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3425 who->contr->ranged_ob = op;
3426
3427 who->statusmsg (format ("You ready %s.", query_name (op)));
3348 3428
3349 if (op->type == BOW) 3429 if (op->type == BOW)
3350 { 3430 {
3431 who->current_weapon = op;
3351 change_abil (who, op); 3432 change_abil (who, op);
3352 new_draw_info_format (NDI_UNIQUE, 0, who,
3353 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3433 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3354 } 3434 }
3355
3356 who->contr->ranged_skill = find_skill_by_name (who, op->skill);//TODO
3357 who->contr->ranged_ob = op;
3358 } 3435 }
3359 else 3436 else
3360 { 3437 {
3361 if (op->type == BOW) 3438 if (op->type == BOW)
3362 SET_FLAG (who, FLAG_READY_BOW); 3439 SET_FLAG (who, FLAG_READY_BOW);
… …
3367 break; 3444 break;
3368 3445
3369 case BUILDER: 3446 case BUILDER:
3370 if (who->type == PLAYER) 3447 if (who->type == PLAYER)
3371 { 3448 {
3449 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3372 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER) 3450 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3373 unapply_special (who, who->contr->ranged_ob, 0); 3451 unapply_special (who, who->contr->ranged_ob, 0);
3374 3452
3375 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3453 who->statusmsg (format ("You ready your %s.", query_name (op)));
3376 3454
3377 who->contr->ranged_skill = who;
3378 who->contr->ranged_ob = op; 3455 who->contr->ranged_ob = op;
3379 } 3456 }
3380 break; 3457 break;
3381 3458
3382 default: 3459 default:
3383 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3460 who->statusmsg (format ("You apply %s.", query_name (op)));
3384 } /* end of switch op->type */ 3461 }
3385 3462
3386 SET_FLAG (op, FLAG_APPLIED); 3463 SET_FLAG (op, FLAG_APPLIED);
3387 3464
3388 if (tmp != NULL) 3465 if (tmp)
3389 tmp = insert_ob_in_ob (tmp, who); 3466 who->insert (tmp);
3390 3467
3391 who->update_stats (); 3468 who->update_stats ();
3392 3469
3393 /* We exclude spell casting objects. The fire code will set the 3470 /* We exclude spell casting objects. The fire code will set the
3394 * been applied flag when they are used - until that point, 3471 * been applied flag when they are used - until that point,
… …
3396 */ 3473 */
3397 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3474 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3398 SET_FLAG (op, FLAG_BEEN_APPLIED); 3475 SET_FLAG (op, FLAG_BEEN_APPLIED);
3399 3476
3400 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3477 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3401 {
3402 if (who->type == PLAYER) 3478 if (who->type == PLAYER)
3403 { 3479 {
3404 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3480 who->failmsg (
3481 "Oops, it feels deadly cold! "
3482 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3483 );
3405 SET_FLAG (op, FLAG_KNOWN_CURSED); 3484 SET_FLAG (op, FLAG_KNOWN_CURSED);
3406 } 3485 }
3407 }
3408 3486
3409 if (who->type == PLAYER) 3487 if (object *pl = op->visible_to ())
3410 {
3411 /* if multiple objects were applied, update both slots */
3412 if (tmp)
3413 esrv_send_item (who, tmp);
3414
3415 esrv_send_item (who, op); 3488 esrv_send_item (pl, op);
3416 }
3417 3489
3418 return 0; 3490 return 0;
3419} 3491}
3420 3492
3421int 3493int
3422monster_apply_special (object *who, object *op, int aflags) 3494monster_apply_special (object *who, object *op, int aflags)
3423{ 3495{
3424 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3496 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3425 return 1; 3497 return 1;
3498
3426 return apply_special (who, op, aflags); 3499 return apply_special (who, op, aflags);
3427} 3500}
3428 3501
3429/** 3502/**
3430 * Map was just loaded, handle op's initialisation. 3503 * Map was just loaded, handle op's initialisation.
… …
3434int 3507int
3435auto_apply (object *op) 3508auto_apply (object *op)
3436{ 3509{
3437 object *tmp = NULL, *tmp2; 3510 object *tmp = NULL, *tmp2;
3438 int i; 3511 int i;
3512
3513 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3439 3514
3440 switch (op->type) 3515 switch (op->type)
3441 { 3516 {
3442 case SHOP_FLOOR: 3517 case SHOP_FLOOR:
3443 if (!op->has_random_items ()) 3518 if (!op->has_random_items ())
… …
3445 3520
3446 do 3521 do
3447 { 3522 {
3448 i = 10; /* let's give it 10 tries */ 3523 i = 10; /* let's give it 10 tries */
3449 while ((tmp = generate_treasure (op->randomitems, 3524 while ((tmp = generate_treasure (op->randomitems,
3450 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3525 op->stats.exp
3526 ? (int) op->stats.exp
3527 : max (op->map->difficulty, 5)))
3528 == NULL && --i);
3529
3451 if (tmp == NULL) 3530 if (tmp == NULL)
3452 return 0; 3531 return 0;
3532
3453 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3533 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3454 { 3534 {
3455 tmp->destroy (); 3535 tmp->destroy ();
3456 tmp = NULL; 3536 tmp = NULL;
3457 } 3537 }
… …
3460 3540
3461 tmp->x = op->x; 3541 tmp->x = op->x;
3462 tmp->y = op->y; 3542 tmp->y = op->y;
3463 SET_FLAG (tmp, FLAG_UNPAID); 3543 SET_FLAG (tmp, FLAG_UNPAID);
3464 insert_ob_in_map (tmp, op->map, NULL, 0); 3544 insert_ob_in_map (tmp, op->map, NULL, 0);
3465 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3466 identify (tmp); 3545 identify (tmp);
3467 break; 3546 break;
3468 3547
3469 case TREASURE: 3548 case TREASURE:
3470 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3549 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3477 /* If we generated an object and put it in this object inventory, 3556 /* If we generated an object and put it in this object inventory,
3478 * move it to the parent object as the current object is about 3557 * move it to the parent object as the current object is about
3479 * to disappear. An example of this item is the random_* stuff 3558 * to disappear. An example of this item is the random_* stuff
3480 * that is put inside other objects. 3559 * that is put inside other objects.
3481 */ 3560 */
3482 for (tmp = op->inv; tmp; tmp = tmp2)
3483 {
3484 tmp2 = tmp->below;
3485 tmp->remove ();
3486
3487 if (op->env) 3561 if (op->env)
3488 insert_ob_in_ob (tmp, op->env); 3562 while (op->inv)
3489 else 3563 op->env->insert (op->inv);
3490 tmp->destroy ();
3491 }
3492 3564
3493 op->destroy (); 3565 op->destroy ();
3494 break; 3566 break;
3495 } 3567 }
3496 return tmp ? 1 : 0; 3568
3569 return !!tmp;
3497} 3570}
3498 3571
3499/** 3572/**
3500 * fix_auto_apply goes through the entire map every time a map 3573 * fix_auto_apply goes through the entire map every time a map
3501 * is loaded or swapped in and performs special actions for 3574 * is loaded or swapped in and performs special actions for
… …
3515 3588
3516 if (tmp->inv) 3589 if (tmp->inv)
3517 { 3590 {
3518 object *invtmp, *invnext; 3591 object *invtmp, *invnext;
3519 3592
3520 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3593 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3521 { 3594 {
3522 invnext = invtmp->below; 3595 invnext = invtmp->below;
3523 3596
3524 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3597 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3525 auto_apply (invtmp); 3598 auto_apply (invtmp);
3526 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3599 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3527 { 3600 {
3528 while ((invtmp->stats.hp--) > 0) 3601 while (invtmp->stats.hp-- > 0)
3529 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3602 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3530 3603
3531 invtmp->randomitems = NULL; 3604 invtmp->randomitems = NULL;
3532 } 3605 }
3533 else if (invtmp && invtmp->arch 3606 else if (invtmp && invtmp->arch
… …
3583 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3656 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3584 { 3657 {
3585 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0); 3658 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3586 tmp->randomitems = NULL; 3659 tmp->randomitems = NULL;
3587 } 3660 }
3661
3588 // close all containers 3662 // close all containers
3589 else if (tmp->type == CONTAINER) 3663 else if (tmp->type == CONTAINER)
3590 tmp->flag [FLAG_APPLIED] = 0; 3664 tmp->flag [FLAG_APPLIED] = 0;
3591 3665
3592 tmp = above; 3666 tmp = above;
… …
3602 * Handles player eating food that temporarily changes status (resistances, stats). 3676 * Handles player eating food that temporarily changes status (resistances, stats).
3603 * This used to call cast_change_attr(), but 3677 * This used to call cast_change_attr(), but
3604 * that doesn't work with the new spell code. Since we know what 3678 * that doesn't work with the new spell code. Since we know what
3605 * the food changes, just grab a force and use that instead. 3679 * the food changes, just grab a force and use that instead.
3606 */ 3680 */
3607
3608void 3681void
3609eat_special_food (object *who, object *food) 3682eat_special_food (object *who, object *food)
3610{ 3683{
3611 object *force; 3684 object *force;
3612 int i, did_one = 0; 3685 int i, did_one = 0;
3613 sint8 k;
3614 3686
3615 force = get_archetype (FORCE_NAME); 3687 force = get_archetype (FORCE_NAME);
3616 3688
3617 for (i = 0; i < NUM_STATS; i++) 3689 for (i = 0; i < NUM_STATS; i++)
3618 { 3690 if (sint8 k = food->stats.stat (i))
3619 k = get_attr_value (&food->stats, i);
3620 if (k)
3621 { 3691 {
3622 set_attr_value (&force->stats, i, k); 3692 force->stats.stat (i) = k;
3623 did_one = 1; 3693 did_one = 1;
3624 } 3694 }
3625 }
3626 3695
3627 /* check if we can protect the eater */ 3696 /* check if we can protect the eater */
3628 for (i = 0; i < NROFATTACKS; i++) 3697 for (i = 0; i < NROFATTACKS; i++)
3629 { 3698 {
3630 if (food->resist[i] > 0) 3699 if (food->resist[i] > 0)
… …
3649 /* check for hp, sp change */ 3718 /* check for hp, sp change */
3650 if (food->stats.hp != 0) 3719 if (food->stats.hp != 0)
3651 { 3720 {
3652 if (QUERY_FLAG (food, FLAG_CURSED)) 3721 if (QUERY_FLAG (food, FLAG_CURSED))
3653 { 3722 {
3654 assign (who->contr->killer, food->name); 3723 who->contr->killer = food;
3655 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3724 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3656 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3725 who->failmsg ("Eck!...that was poisonous!");
3657 } 3726 }
3658 else 3727 else
3659 { 3728 {
3660 if (food->stats.hp > 0) 3729 if (food->stats.hp > 0)
3661 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better."); 3730 who->statusmsg ("You begin to feel better.");
3662 else 3731 else
3663 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3732 who->failmsg ("Eck!...that was poisonous!");
3733
3664 who->stats.hp += food->stats.hp; 3734 who->stats.hp += food->stats.hp;
3665 } 3735 }
3666 } 3736 }
3737
3667 if (food->stats.sp != 0) 3738 if (food->stats.sp != 0)
3668 { 3739 {
3669 if (QUERY_FLAG (food, FLAG_CURSED)) 3740 if (QUERY_FLAG (food, FLAG_CURSED))
3670 { 3741 {
3671 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!"); 3742 who->failmsg ("You are drained of mana!");
3672 who->stats.sp -= food->stats.sp; 3743 who->stats.sp -= food->stats.sp;
3673 if (who->stats.sp < 0) 3744 if (who->stats.sp < 0)
3674 who->stats.sp = 0; 3745 who->stats.sp = 0;
3675 } 3746 }
3676 else 3747 else
3677 { 3748 {
3678 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3749 who->statusmsg ("You feel a rush of magical energy!");
3679 who->stats.sp += food->stats.sp; 3750 who->stats.sp += food->stats.sp;
3680 /* place limit on max sp from food? */ 3751 /* place limit on max sp from food? */
3681 } 3752 }
3682 } 3753 }
3754
3683 who->update_stats (); 3755 who->update_stats ();
3684} 3756}
3685 3757
3686/** 3758/**
3687 * Designed primarily to light torches/lanterns/etc. 3759 * Designed primarily to light torches/lanterns/etc.
… …
3697 item = find_marked_object (who); 3769 item = find_marked_object (who);
3698 if (item) 3770 if (item)
3699 { 3771 {
3700 if (lighter->last_eat && lighter->stats.food) 3772 if (lighter->last_eat && lighter->stats.food)
3701 { /* lighter gets used up */ 3773 { /* lighter gets used up */
3702 /* Split multiple lighters if they're being used up. Otherwise *
3703 * one charge from each would be used up. --DAMN */
3704 if (lighter->nrof > 1)
3705 {
3706 object *oneLighter = lighter->clone (); 3774 object *oneLighter = lighter->split ();
3707
3708 lighter->nrof -= 1;
3709 oneLighter->nrof = 1;
3710 oneLighter->stats.food--; 3775 oneLighter->stats.food--;
3711 esrv_send_item (who, lighter); 3776 who->insert (oneLighter);
3712 oneLighter = insert_ob_in_ob (oneLighter, who);
3713 esrv_send_item (who, oneLighter);
3714 }
3715 else
3716 lighter->stats.food--;
3717 } 3777 }
3718 else if (lighter->last_eat) 3778 else if (lighter->last_eat)
3779 {
3719 { /* no charges left in lighter */ 3780 /* no charges left in lighter */
3720 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3781 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3721 return; 3782 return;
3722 } 3783 }
3723 3784
3724 /* Perhaps we should split what we are trying to light on fire? 3785 /* Perhaps we should split what we are trying to light on fire?
3725 * I can't see many times when you would want to light multiple 3786 * I can't see many times when you would want to light multiple
… …
3731 3792
3732 save_throw_object (item, AT_FIRE, who); 3793 save_throw_object (item, AT_FIRE, who);
3733 3794
3734 if (item->destroyed ()) 3795 if (item->destroyed ())
3735 { 3796 {
3736 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name); 3797 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3737 /* Need to update the player so that the players glow radius 3798 /* Need to update the player so that the players glow radius
3738 * gets changed. 3799 * gets changed.
3739 */ 3800 */
3740 if (is_player_env) 3801 if (is_player_env)
3741 who->update_stats (); 3802 who->update_stats ();
3742 } 3803 }
3743 else 3804 else
3744 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3805 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3745 } 3806 }
3746 else /* nothing to light */ 3807 else
3747 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object."); 3808 who->failmsg ("You need to mark a lightable object.");
3748
3749} 3809}
3750 3810
3751/** 3811/**
3752 * op made some mistake with a scroll, this takes care of punishment. 3812 * op made some mistake with a scroll, this takes care of punishment.
3753 * scroll_failure()- hacked directly from spell_failure 3813 * scroll_failure()- hacked directly from spell_failure
… …
3760 3820
3761 if (failure <= -1 && failure > -15) 3821 if (failure <= -1 && failure > -15)
3762 { /* wonder */ 3822 { /* wonder */
3763 object *tmp; 3823 object *tmp;
3764 3824
3765 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3825 op->failmsg ("Your spell warps!");
3766 tmp = get_archetype (SPELL_WONDER); 3826 tmp = get_archetype (SPELL_WONDER);
3767 cast_wonder (op, op, 0, tmp); 3827 cast_wonder (op, op, 0, tmp);
3768 tmp->destroy (); 3828 tmp->destroy ();
3769 } 3829 }
3770 else if (failure <= -15 && failure > -35) 3830 else if (failure <= -15 && failure > -35)
3771 { /* drain mana */ 3831 { /* drain mana */
3772 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3832 op->failmsg ("Your mana is drained!");
3773 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3833 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3774 if (op->stats.sp < 0) 3834 if (op->stats.sp < 0)
3775 op->stats.sp = 0; 3835 op->stats.sp = 0;
3776 } 3836 }
3777 else if (settings.spell_failure_effects == TRUE) 3837 else if (settings.spell_failure_effects == TRUE)
3778 { 3838 {
3779 if (failure <= -35 && failure > -60) 3839 if (failure <= -35 && failure > -60)
3780 { /* confusion */ 3840 { /* confusion */
3781 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3841 op->failmsg ("The magic recoils on you!");
3782 confuse_player (op, op, power); 3842 confuse_player (op, op, power);
3783 } 3843 }
3784 else if (failure <= -60 && failure > -70) 3844 else if (failure <= -60 && failure > -70)
3785 { /* paralysis */ 3845 { /* paralysis */
3786 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!"); 3846 op->failmsg ("The magic recoils and paralyzes you!");
3787 paralyze_player (op, op, power); 3847 paralyze_player (op, op, power);
3788 } 3848 }
3789 else if (failure <= -70 && failure > -80) 3849 else if (failure <= -70 && failure > -80)
3790 { /* blind */ 3850 { /* blind */
3791 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3851 op->failmsg ("The magic recoils on you!");
3792 blind_player (op, op, power); 3852 blind_player (op, op, power);
3793 } 3853 }
3794 else if (failure <= -80) 3854 else if (failure <= -80)
3795 { /* blast the immediate area */ 3855 { /* blast the immediate area */
3796 object *tmp;
3797
3798 tmp = get_archetype (LOOSE_MANA); 3856 object *tmp = get_archetype (LOOSE_MANA);
3799 cast_magic_storm (op, tmp, power); 3857 cast_magic_storm (op, tmp, power);
3800 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3858 op->failmsg ("You unleash uncontrolled mana!");
3801 tmp->destroy (); 3859 tmp->destroy ();
3802 } 3860 }
3803 } 3861 }
3804} 3862}
3805 3863
… …
3825 */ 3883 */
3826 int i, j; 3884 int i, j;
3827 3885
3828 for (i = 0; i < NUM_STATS; i++) 3886 for (i = 0; i < NUM_STATS; i++)
3829 { 3887 {
3830 sint8 stat = get_attr_value (stats, i); 3888 int race_bonus = pl->arch->stats.stat (i);
3831 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3889 sint8 stat = stats->stat (i) + ns->stat (i);
3832 3890
3833 stat += get_attr_value (ns, i);
3834 if (stat > 20 + race_bonus) 3891 if (stat > 20 + race_bonus)
3835 { 3892 {
3836 excess_stat++; 3893 excess_stat++;
3837 stat = 20 + race_bonus; 3894 stat = 20 + race_bonus;
3838 } 3895 }
3839 set_attr_value (stats, i, stat); 3896
3897 stats->stat (i) = stat;
3840 } 3898 }
3841 3899
3842 for (j = 0; excess_stat > 0 && j < 100; j++) 3900 for (j = 0; excess_stat > 0 && j < 100; j++)
3843 { /* try 100 times to assign excess stats */ 3901 { /* try 100 times to assign excess stats */
3844 int i = rndm (0, 6); 3902 int i = rndm (0, 6);
3845 int stat = get_attr_value (stats, i);
3846 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
3847 3903
3848 if (i == CHA) 3904 if (i == CHA)
3849 continue; /* exclude cha from this */ 3905 continue; /* exclude cha from this */
3906
3907 int stat = stats->stat (i);
3908 int race_bonus = pl->arch->stats.stat (i);
3850 if (stat < 20 + race_bonus) 3909 if (stat < 20 + race_bonus)
3851 { 3910 {
3852 change_attr_value (stats, i, 1); 3911 change_attr_value (stats, i, 1);
3853 excess_stat--; 3912 excess_stat--;
3854 } 3913 }
3855 } 3914 }
3856 3915
3857 /* insert the randomitems from the change's treasurelist into 3916 /* insert the randomitems from the change's treasurelist into
3858 * the player ref: player.c 3917 * the player ref: player.c
3859 */ 3918 */
3860 if (change->randomitems != NULL) 3919 if (change->randomitems)
3861 give_initial_items (pl, change->randomitems); 3920 give_initial_items (pl, change->randomitems);
3862
3863 3921
3864 /* set up the face, for some races. */ 3922 /* set up the face, for some races. */
3865 3923
3866 /* first, look for the force object banning 3924 /* first, look for the force object banning
3867 * changing the face. Certain races never change face with class. 3925 * changing the face. Certain races never change face with class.
3868 */ 3926 */
3869 for (walk = pl->inv; walk != NULL; walk = walk->below) 3927 for (walk = pl->inv; walk; walk = walk->below)
3870 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3928 if (walk->name == shstr_NOCLASSFACECHANGE)
3871 flag_change_face = 0; 3929 flag_change_face = 0;
3872 3930
3873 if (flag_change_face) 3931 if (flag_change_face)
3874 { 3932 {
3875 pl->animation_id = GET_ANIM_ID (change);
3876 pl->face = change->face; 3933 pl->face = change->face;
3877 3934 pl->animation_id = change->animation_id;
3878 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3935 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3879 SET_FLAG (pl, FLAG_ANIMATE);
3880 else
3881 CLEAR_FLAG (pl, FLAG_ANIMATE);
3882 } 3936 }
3883 3937
3884 /* check the special case of can't use weapons */ 3938 /* check the special case of can't use weapons */
3885 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3939 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3886 if (!strcmp (change->name, "monk")) 3940 if (change->name == shstr_monk)
3887 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 3941 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3888 3942
3889 break; 3943 break;
3890 } 3944 }
3891 } 3945 }
… …
3912 char got[MAX_BUF]; 3966 char got[MAX_BUF];
3913 int len; 3967 int len;
3914 3968
3915 if (!pl || !transformer) 3969 if (!pl || !transformer)
3916 return; 3970 return;
3971
3917 marked = find_marked_object (pl); 3972 marked = find_marked_object (pl);
3973
3918 if (!marked) 3974 if (!marked)
3919 { 3975 {
3920 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 3976 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
3921 return; 3977 return;
3922 } 3978 }
3979
3923 if (!marked->slaying) 3980 if (!marked->slaying)
3924 { 3981 {
3925 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3982 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3926 return; 3983 return;
3927 } 3984 }
3985
3928 /* check whether they are compatible or not */ 3986 /* check whether they are compatible or not */
3929 find = strstr (marked->slaying, transformer->arch->name); 3987 find = strstr (&marked->slaying, transformer->arch->archname);
3930 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 3988 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3931 { 3989 {
3932 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3990 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3933 return; 3991 return;
3934 } 3992 }
3993
3935 find += strlen (transformer->arch->name) + 1; 3994 find += strlen (transformer->arch->archname) + 1;
3936 /* Item can be used, now find how many and what it yields */ 3995 /* Item can be used, now find how many and what it yields */
3937 if (isdigit (*(find))) 3996 if (isdigit (*(find)))
3938 { 3997 {
3939 yield = atoi (find); 3998 yield = atoi (find);
3940 if (yield < 1) 3999 if (yield < 1)
… …
3946 else 4005 else
3947 yield = 1; 4006 yield = 1;
3948 4007
3949 while (isdigit (*find)) 4008 while (isdigit (*find))
3950 find++; 4009 find++;
4010
3951 while (*find == ' ') 4011 while (*find == ' ')
3952 find++; 4012 find++;
4013
3953 memset (got, 0, MAX_BUF); 4014 memset (got, 0, MAX_BUF);
4015
3954 if ((separator = strchr (find, ';')) != NULL) 4016 if ((separator = strchr (find, ';')) != NULL)
3955 {
3956 len = separator - find; 4017 len = separator - find;
3957 }
3958 else 4018 else
3959 {
3960 len = strlen (find); 4019 len = strlen (find);
3961 } 4020
3962 if (len > MAX_BUF - 1) 4021 if (len > MAX_BUF - 1)
3963 len = MAX_BUF - 1; 4022 len = MAX_BUF - 1;
4023
3964 strcpy (got, find); 4024 strcpy (got, find);
3965 got[len] = '\0'; 4025 got[len] = '\0';
3966 4026
3967 /* Now create new item, remove used ones when required. */ 4027 /* Now create new item, remove used ones when required. */
3968 new_item = get_archetype (got); 4028 new_item = get_archetype (got);
3969 if (!new_item) 4029 if (!new_item)
3970 { 4030 {
3971 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0)); 4031 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
3972 return; 4032 return;
3973 } 4033 }
3974 4034
3975 new_item->nrof = yield; 4035 new_item->nrof = yield;
4036
3976 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4037 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
3977 insert_ob_in_ob (new_item, pl); 4038
3978 esrv_send_inventory (pl, pl); 4039 pl->insert (new_item);
3979 /* Eat up one item */ 4040 /* Eat up one item */
3980 decrease_ob_nr (marked, 1); 4041 marked->decrease ();
4042
3981 /* Eat one transformer if needed */ 4043 /* Eat one transformer if needed */
3982 if (transformer->stats.food) 4044 if (transformer->stats.food)
3983 if (--transformer->stats.food == 0) 4045 if (--transformer->stats.food == 0)
3984 decrease_ob_nr (transformer, 1); 4046 transformer->decrease ();
3985} 4047}
4048

Diff Legend

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