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

Diff Legend

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