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.95 by root, Mon May 14 19:08:26 2007 UTC vs.
Revision 1.142 by root, Sun Apr 13 20:21:50 2008 UTC

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

Diff Legend

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