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.105 by root, Fri May 18 12:50:42 2007 UTC vs.
Revision 1.145 by root, Mon Apr 21 07:01:40 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)
… …
218 217
219 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 218 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
220 { 219 {
221 op->drain_stat (); 220 op->drain_stat ();
222 op->update_stats (); 221 op->update_stats ();
223 decrease_ob (tmp); 222 tmp->decrease ();
224 return 1; 223 return 1;
225 } 224 }
226 225
227 if (!(at = archetype::find (ARCH_DEPLETION))) 226 if (!(at = archetype::find (ARCH_DEPLETION)))
228 { 227 {
… …
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 tmp->decrease ();
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 tmp->decrease ();
321 return 1; 324 return 1;
322 } 325 }
323 326
324 327
325 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 328 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
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;
… …
343 insert_ob_in_map (fball, op->map, NULL, 0); 347 insert_ob_in_map (fball, op->map, NULL, 0);
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 tmp->decrease ();
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))
… …
380 force->speed_left = -1; 388 force->speed_left = -1;
381 force = insert_ob_in_ob (force, op); 389 force = insert_ob_in_ob (force, op);
382 CLEAR_FLAG (tmp, FLAG_APPLIED); 390 CLEAR_FLAG (tmp, FLAG_APPLIED);
383 SET_FLAG (force, FLAG_APPLIED); 391 SET_FLAG (force, FLAG_APPLIED);
384 change_abil (op, force); 392 change_abil (op, force);
385 decrease_ob (tmp); 393 tmp->decrease ();
386 return 1; 394 return 1;
387 } 395 }
388 396
389 /* Only thing left are the stat potions */ 397 /* Only thing left are the stat potions */
390 if (op->type == PLAYER) 398 if (op->type == PLAYER)
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
403 * up all the stats. 412 * up all the stats.
404 */ 413 */
405 CLEAR_FLAG (tmp, FLAG_APPLIED); 414 CLEAR_FLAG (tmp, FLAG_APPLIED);
406 op->update_stats (); 415 op->update_stats ();
407 decrease_ob (tmp); 416 op->decrease ();
408 return 1; 417 return 1;
409} 418}
410 419
411/**************************************************************************** 420/****************************************************************************
412 * Weapon improvement code follows 421 * Weapon improvement code follows
… …
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 op->decrease (nrof);
469 return; 474 return;
470 } 475 }
471 else 476 else
472 { 477 {
473 decrease_ob_nr (op, op->nrof); 478 op->decrease (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 improver->decrease ();
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! */
638 decrease_ob (improver); 651 improver->decrease ();
639 weapon->last_eat = 0; 652 weapon->last_eat = 0;
640 return 1; 653 return 1;
641} 654}
642 655
643 656
… …
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 improver->decrease ();
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 improver->decrease ();
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 improver->decrease ();
715 weapon->item_power++; 732 weapon->item_power++;
716 return 1; 733 return 1;
717 } 734 }
718 735
719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 736 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
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 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
843 tmp = get_split_ob (armour, armour->nrof - 1);
844 else
845 tmp = NULL;
846 857
847 armour->magic++; 858 armour->magic++;
848 859
849 if (!settings.armor_speed_linear) 860 if (!settings.armor_speed_linear)
850 { 861 {
… …
855 { 866 {
856 base = base - (base * settings.armor_speed_improvement) / 100; 867 base = base - (base * settings.armor_speed_improvement) / 100;
857 pow++; 868 pow++;
858 } 869 }
859 870
860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 871 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
861 } 872 }
862 else 873 else
863 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100; 874 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
864 875
865 if (!settings.armor_weight_linear) 876 if (!settings.armor_weight_linear)
866 { 877 {
867 int base = 100; 878 int base = 100;
868 int pow = 0; 879 int pow = 0;
… …
871 { 882 {
872 base = base - (base * settings.armor_weight_reduction) / 100; 883 base = base - (base * settings.armor_weight_reduction) / 100;
873 pow++; 884 pow++;
874 } 885 }
875 886
876 armour->weight = (armour->arch->clone.weight * base) / 100; 887 armour->weight = (armour->arch->weight * base) / 100;
877 } 888 }
878 else 889 else
879 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100; 890 armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
880 891
881 if (armour->weight <= 0) 892 if (armour->weight <= 0)
882 { 893 {
883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 894 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
884 armour->weight = 1; 895 armour->weight = 1;
885 } 896 }
886 897
887 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic); 898 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
888 899
889 if (op->type == PLAYER) 900 if (op->type == PLAYER)
890 { 901 {
891 esrv_send_item (op, armour); 902 esrv_send_item (op, armour);
892 if (QUERY_FLAG (armour, FLAG_APPLIED)) 903 if (QUERY_FLAG (armour, FLAG_APPLIED))
893 op->update_stats (); 904 op->update_stats ();
894 } 905 }
895 decrease_ob (improver); 906
907 improver->decrease ();
908
896 if (tmp) 909 if (tmp)
897 { 910 {
898 insert_ob_in_ob (tmp, op); 911 insert_ob_in_ob (tmp, op);
899 esrv_send_item (op, tmp); 912 esrv_send_item (op, tmp);
900 } 913 }
914
901 return 1; 915 return 1;
902} 916}
903
904 917
905/* 918/*
906 * convert_item() returns 1 if anything was converted, 0 if the item was not 919 * 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. 920 * what the converter wants, -1 if the converter is broken.
908 */ 921 *
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. 922 * Takes one type of items and makes another.
915 * converter is the object that is doing the conversion. 923 * converter is the object that is doing the conversion.
916 * item is the object that triggered the converter - if it is not 924 * item is the object that triggered the converter - if it is not
917 * what the converter wants, this will not do anything. 925 * what the converter wants, this will not do anything.
918 */ 926 */
919int 927static int
920convert_item (object *item, object *converter) 928convert_item (object *item, object *converter)
921{ 929{
922 int nr = 0;
923 uint32 price_in; 930 sint64 nr, price_in;
931
932 if (item->flag [FLAG_UNPAID])
933 return 0;
934
935 shstr conv_from = converter->slaying;
936 archetype *conv_to = converter->other_arch;
937 sint64 need = converter->stats.food;
938 sint64 give = converter->stats.sp;
924 939
925 /* We make some assumptions - we assume if it takes money as it type, 940 /* 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 941 * it wants some amount. We don't make change (ie, if something costs
927 * 3 gp and player drops a platinum, tough luck) 942 * 3 gp and player drops a platinum, tough luck)
928 */ 943 */
929 if (!strcmp (CONV_FROM (converter), "money")) 944 if (conv_from == shstr_money)
930 { 945 {
931 int cost;
932
933 if (item->type != MONEY) 946 if (item->type != MONEY)
934 return 0; 947 return 0;
935 948
936 nr = (item->nrof * item->value) / CONV_NEED (converter); 949 nr = sint64 (item->nrof) * item->value / need;
937 if (!nr) 950 if (!nr)
938 return 0; 951 return 0;
939 cost = nr * CONV_NEED (converter) / item->value; 952
940 /* take into account rounding errors */ 953 converter->play_sound (sound_find ("shop_buy"));
941 if (nr * CONV_NEED (converter) % item->value) 954
942 cost++; 955 sint64 cost = (nr * need + item->value - 1) / item->value;
943 decrease_ob_nr (item, cost); 956
957 item->decrease (cost);
944 958
945 price_in = cost * item->value; 959 price_in = cost * item->value;
946 } 960 }
947 else 961 else
948 { 962 {
949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 963 if (item->type == PLAYER
950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 964 || conv_from != item->arch->archname
965 || (need && need > (uint16) item->nrof))
951 return 0; 966 return 0;
952 967
953 if (CONV_NEED (converter)) 968 converter->play_sound (sound_find ("convert_item"));
969
970 if (need)
954 { 971 {
955 nr = item->nrof / CONV_NEED (converter); 972 nr = sint64 (item->nrof) / need;
956 decrease_ob_nr (item, nr * CONV_NEED (converter)); 973 item->decrease (nr * need);
957 price_in = nr * CONV_NEED (converter) * item->value; 974 price_in = nr * need * item->value;
958 } 975 }
959 else 976 else
960 { 977 {
961 price_in = item->value; 978 price_in = item->value;
962 item->destroy (); 979 item->destroy ();
963 } 980 }
964 } 981 }
965 982
966 if (converter->inv != NULL) 983 if (converter->inv)
967 { 984 {
968 object *ob; 985 object *ob;
969 int i; 986 int i;
970 object *ob_to_copy; 987 object *ob_to_copy;
971 988
972 /* select random object from inventory to copy */ 989 /* select random object from inventory to copy */
973 ob_to_copy = converter->inv; 990 ob_to_copy = converter->inv;
974 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) 991 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
975 {
976 if (rndm (0, i) == 0) 992 if (rndm (0, i) == 0)
977 {
978 ob_to_copy = ob; 993 ob_to_copy = ob;
979 } 994
980 }
981 item = object_create_clone (ob_to_copy); 995 item = object_create_clone (ob_to_copy);
982 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 996 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
983 unflag_inv (item, FLAG_IS_A_TEMPLATE); 997 unflag_inv (item, FLAG_IS_A_TEMPLATE);
984 } 998 }
985 else 999 else
986 { 1000 {
987 if (converter->other_arch == NULL) 1001 if (!conv_to)
988 { 1002 {
989 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 1003 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); 1004 &converter->name, &converter->map->path, converter->x, converter->y);
991 return -1; 1005 return -1;
992 } 1006 }
993 1007
994 item = object_create_arch (converter->other_arch); 1008 item = object_create_arch (conv_to);
995 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 1009 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
996 } 1010 }
997 1011
998 if (CONV_NR (converter)) 1012 if (give)
999 item->nrof = CONV_NR (converter); 1013 item->nrof = give;
1014
1000 if (nr) 1015 if (nr)
1001 item->nrof *= nr; 1016 item->nrof *= nr;
1017
1002 if (is_in_shop (converter)) 1018 if (is_in_shop (converter))
1003 SET_FLAG (item, FLAG_UNPAID); 1019 SET_FLAG (item, FLAG_UNPAID);
1004 else if (price_in < item->nrof * item->value) 1020 else if (price_in < sint64 (item->nrof) * item->value)
1005 { 1021 {
1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1022 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); 1023 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1008
1009 /** 1024 /**
1010 * elmex: we are going to let the game continue, as the mapcreator 1025 * elmex: we are going to let the game continue, as the mapcreator
1011 * propably had something in mind when doing this 1026 * hopefully had something in mind when doing this.
1012 */ 1027 */
1013 } 1028 }
1029
1030 SET_FLAG (item, FLAG_IDENTIFIED);
1014 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1031 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1015 return 1; 1032 return 1;
1016} 1033}
1017 1034
1018/** 1035/**
… …
1035 1052
1036 op->contr->last_used = 0; 1053 op->contr->last_used = 0;
1037 1054
1038 if (sack->env && sack->env != op) 1055 if (sack->env && sack->env != op)
1039 { 1056 {
1040 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first."); 1057 op->failmsg ("You must put it onto the floor or into your inventory first.");
1041 return 1; 1058 return 1;
1042 } 1059 }
1043 1060
1044 // already applied == open on ground, or open in inv, or active in inv 1061 // already applied == open on ground, or open in inv, or active in inv
1045 if (sack->flag [FLAG_APPLIED]) 1062 if (sack->flag [FLAG_APPLIED])
… …
1051 return 1; 1068 return 1;
1052 } 1069 }
1053 else if (!sack->env) 1070 else if (!sack->env)
1054 { 1071 {
1055 // active, but not ours: some other player has opened it 1072 // 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)); 1073 op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
1057 return 1; 1074 return 1;
1058 } 1075 }
1059 1076
1060 // fall through to opening it (active in inv) 1077 // fall through to opening it (active in inv)
1061 } 1078 }
… …
1063 { 1080 {
1064 // it is in our env, so activate it, do not open yet 1081 // it is in our env, so activate it, do not open yet
1065 op->close_container (); 1082 op->close_container ();
1066 sack->flag [FLAG_APPLIED] = 1; 1083 sack->flag [FLAG_APPLIED] = 1;
1067 esrv_update_item (UPD_FLAGS, op, sack); 1084 esrv_update_item (UPD_FLAGS, op, sack);
1068 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack)); 1085 op->statusmsg (format ("You ready %s.", query_name (sack)));
1069 return 1; 1086 return 1;
1070 } 1087 }
1071 1088
1072 // it's locked? 1089 // it's locked?
1073 if (sack->slaying) 1090 if (sack->slaying)
1074 { 1091 {
1075 if (object *tmp = find_key (op, op, sack)) 1092 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)); 1093 op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
1077 else 1094 else
1078 { 1095 {
1079 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack)); 1096 op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
1080 return 1; 1097 return 1;
1081 } 1098 }
1082 } 1099 }
1083 1100
1084 op->open_container (sack); 1101 op->open_container (sack);
… …
1103 * with an altar. We call it a Potion - altars are stationary - it 1120 * with an altar. We call it a Potion - altars are stationary - it
1104 * is up to map designers to use them properly. 1121 * is up to map designers to use them properly.
1105 */ 1122 */
1106 if (altar->inv && altar->inv->type == SPELL) 1123 if (altar->inv && altar->inv->type == SPELL)
1107 { 1124 {
1108 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name); 1125 originator->statusmsg (format ("The altar casts %s.", &altar->inv->name));
1109 cast_spell (originator, altar, 0, altar->inv, NULL); 1126 cast_spell (originator, altar, 0, altar->inv, NULL);
1110 /* If it is connected, push the button. Fixes some problems with 1127 /* If it is connected, push the button. Fixes some problems with
1111 * old maps. 1128 * old maps.
1112 */ 1129 */
1113 1130
1114/* push_button (altar);*/ 1131/* push_button (altar);*/
1115 } 1132 }
… …
1139 double opinion; 1156 double opinion;
1140 object *tmp, *next; 1157 object *tmp, *next;
1141 1158
1142 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1159 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1143 1160
1161 bool has_unpaid = false;
1162
1163 // quite inefficient to do this here twice, but the api doesn'T lend itself to
1164 // a quick and small change :(
1165 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1166 if (item->flag [FLAG_UNPAID])
1167 {
1168 has_unpaid = true;
1169 break;
1170 }
1171
1144 if (op->type != PLAYER) 1172 if (op->type != PLAYER)
1145 { 1173 {
1146 /* Remove all the unpaid objects that may be carried here. 1174 /* Remove all the unpaid objects that may be carried here.
1147 * This could be pets or monsters that are somehow in 1175 * This could be pets or monsters that are somehow in
1148 * the shop. 1176 * the shop.
… …
1174 /* unpaid objects, or non living objects, can't transfer by 1202 /* unpaid objects, or non living objects, can't transfer by
1175 * shop mats. Instead, put it on a nearby space. 1203 * shop mats. Instead, put it on a nearby space.
1176 */ 1204 */
1177 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1205 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1178 { 1206 {
1179
1180 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1207 /* 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); 1208 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1182 1209
1183 if (i != -1) 1210 if (i != -1)
1184 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1211 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)) 1220 else if (can_pay (op) && get_payment (op))
1194 { 1221 {
1195 /* this is only used for players */ 1222 /* this is only used for players */
1196 rv = teleport (shop_mat, SHOP_MAT, op); 1223 rv = teleport (shop_mat, SHOP_MAT, op);
1197 1224
1225 if (has_unpaid)
1226 op->contr->play_sound (sound_find ("shop_buy"));
1227 else if (is_in_shop (op))
1228 op->contr->play_sound (sound_find ("shop_enter"));
1229 else
1230 op->contr->play_sound (sound_find ("shop_leave"));
1231
1198 if (shop_mat->msg) 1232 if (shop_mat->msg)
1199 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1233 op->statusmsg (shop_mat->msg);
1200 /* This check below is a bit simplistic - generally it should be correct, 1234 /* 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 1235 * but there is never a guarantee that the bottom space on the map is
1202 * actually the shop floor. 1236 * actually the shop floor.
1203 */ 1237 */
1204 else if (!rv && !is_in_shop (op)) 1238 else if (!rv && !is_in_shop (op))
1205 { 1239 {
1206 opinion = shopkeeper_approval (op->map, op); 1240 opinion = shopkeeper_approval (op->map, op);
1207 1241
1208 if (opinion > 0.9) 1242 op->statusmsg (
1209 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1243 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
1210 else if (opinion > 0.75) 1244 : opinion >= 0.75 ? "The shopkeeper waves to you."
1211 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1245 : opinion >= 0.50 ? "The shopkeeper ignores you."
1212 else if (opinion > 0.5) 1246 : "The shopkeeper glares at you with contempt."
1213 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1214 else 1247 );
1215 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1216 } 1248 }
1217 } 1249 }
1218 else 1250 else
1219 { 1251 {
1220 /* if we get here, a player tried to leave a shop but was not able 1252 /* 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 1253 * to afford the items he has. We try to move the player so that
1222 * they are not on the mat anymore 1254 * they are not on the mat anymore
1223 */ 1255 */
1224 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1256 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1225 1257
1226 if (i == -1) 1258 if (i == -1)
1227 {
1228 LOG (llevError, "Internal shop-mat problem.\n"); 1259 LOG (llevError, "Internal shop-mat problem.\n");
1229 }
1230 else 1260 else
1231 { 1261 {
1232 op->remove (); 1262 op->remove ();
1233 op->x += freearr_x[i]; 1263 op->x += freearr_x[i];
1234 op->y += freearr_y[i]; 1264 op->y += freearr_y[i];
… …
1245 */ 1275 */
1246static void 1276static void
1247apply_sign (object *op, object *sign, int autoapply) 1277apply_sign (object *op, object *sign, int autoapply)
1248{ 1278{
1249 readable_message_type *msgType; 1279 readable_message_type *msgType;
1250 char newbuf[HUGE_BUF];
1251 1280
1252 if (sign->msg == NULL) 1281 if (!sign->msg)
1253 { 1282 {
1254 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1283 op->statusmsg ("Nothing is written on it.");
1255 return; 1284 return;
1256 } 1285 }
1257 1286
1258 if (sign->stats.food) 1287 if (sign->stats.food)
1259 { 1288 {
1260 if (sign->last_eat >= sign->stats.food) 1289 if (sign->last_eat >= sign->stats.food)
1261 { 1290 {
1262 if (!sign->move_on) 1291 if (!sign->move_on)
1263 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1292 op->statusmsg ("You cannot read it anymore.");
1293
1264 return; 1294 return;
1265 } 1295 }
1266 1296
1267 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1297 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1268 sign->last_eat++; 1298 sign->last_eat++;
… …
1273 * move_on is zero, it needs to be manually applied (doesn't talk 1303 * move_on is zero, it needs to be manually applied (doesn't talk
1274 * to us). 1304 * to us).
1275 */ 1305 */
1276 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1306 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1277 { 1307 {
1278 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1308 op->failmsg ("You are unable to read while blind!");
1279 return; 1309 return;
1280 } 1310 }
1311
1312 if (op->contr)
1313 if (client *ns = op->contr->ns)
1314 {
1315 if (sign->sound)
1316 ns->play_sound (sign->sound);
1317 else if (autoapply)
1318 ns->play_sound (sound_find ("msg_voice"));
1319
1320 if (ns->can_msg)
1321 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
1322 else
1323 {
1281 msgType = get_readable_message_type (sign); 1324 msgType = get_readable_message_type (sign);
1282 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1325 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); 1326 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1327 }
1328 }
1284} 1329}
1285 1330
1286/** 1331/**
1287 * 'victim' moves onto 'trap' 1332 * 'victim' moves onto 'trap'
1288 * 'victim' leaves 'trap' 1333 * 'victim' leaves 'trap'
… …
1311 * proper. This code was causing needless crashes. 1356 * proper. This code was causing needless crashes.
1312 */ 1357 */
1313 if (recursion_depth >= 500) 1358 if (recursion_depth >= 500)
1314 { 1359 {
1315 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1360 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); 1361 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1317 return; 1362 return;
1318 } 1363 }
1364
1319 recursion_depth++; 1365 recursion_depth++;
1320 if (trap->head) 1366 if (trap->head)
1321 trap = trap->head; 1367 trap = trap->head;
1322 1368
1323 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1369 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1399 1445
1400 if (!trap->value) 1446 if (!trap->value)
1401 { 1447 {
1402 int tot; 1448 int tot;
1403 1449
1404 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1450 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1405 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1451 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1406 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1452 tot += ab->head_ ()->total_weight ();
1407 1453
1408 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1454 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1409 goto leave; 1455 goto leave;
1410 1456
1411 SET_ANIMATION (trap, trap->value); 1457 SET_ANIMATION (trap, trap->value);
… …
1421 1467
1422 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1468 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1423 { 1469 {
1424 if (!sound_was_played) 1470 if (!sound_was_played)
1425 { 1471 {
1426 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1472 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1427 sound_was_played = 1; 1473 sound_was_played = 1;
1428 } 1474 }
1429 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1475
1476 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1430 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1477 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1431 } 1478 }
1432 } 1479 }
1433 goto leave; 1480 goto leave;
1434 } 1481 }
1435 1482
1436
1437 case CONVERTER: 1483 case CONVERTER:
1438 if (convert_item (victim, trap) < 0) 1484 if (convert_item (victim, trap) < 0)
1439 { 1485 {
1440 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1486 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1441 get_archetype ("burnout")->insert_at (trap, trap); 1487 get_archetype ("burnout")->insert_at (trap, trap);
1442 } 1488 }
1443 1489
1444 goto leave; 1490 goto leave;
1445 1491
… …
1466 * Processing will happen if the head runs into the pit 1512 * Processing will happen if the head runs into the pit
1467 */ 1513 */
1468 if (victim->head) 1514 if (victim->head)
1469 goto leave; 1515 goto leave;
1470 1516
1471 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1517 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"); 1518 victim->statusmsg ("You fall through the hole!", NDI_RED);
1473 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1519 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1474 goto leave; 1520 goto leave;
1475 1521
1476 case EXIT: 1522 case EXIT:
1477 if (victim->type == PLAYER && EXIT_PATH (trap)) 1523 if (victim->type == PLAYER && EXIT_PATH (trap))
1478 { 1524 {
1479 /* Basically, don't show exits leading to random maps the 1525 /* Basically, don't show exits leading to random maps the
1480 * players output. 1526 * players output.
1481 */ 1527 */
1482 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1528 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1483 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1529 victim->statusmsg (trap->msg, NDI_NAVY);
1484 1530
1531 trap->play_sound (trap->sound);
1485 victim->enter_exit (trap); 1532 victim->enter_exit (trap);
1486 } 1533 }
1487 goto leave; 1534 goto leave;
1488 1535
1489 case ENCOUNTER: 1536 case ENCOUNTER:
… …
1511 goto leave; 1558 goto leave;
1512 1559
1513 case RUNE: 1560 case RUNE:
1514 case TRAP: 1561 case TRAP:
1515 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1562 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1516 {
1517 spring_trap (trap, victim); 1563 spring_trap (trap, victim);
1518 }
1519 goto leave; 1564 goto leave;
1520 1565
1521 default: 1566 default:
1522 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1567 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); 1568 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1524 goto leave; 1569 goto leave;
1525 } 1570 }
1526 1571
1527leave: 1572leave:
1528 recursion_depth--; 1573 recursion_depth--;
… …
1537 int lev_diff; 1582 int lev_diff;
1538 object *skill_ob; 1583 object *skill_ob;
1539 1584
1540 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1585 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1541 { 1586 {
1542 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1587 op->failmsg ("You are unable to read while blind!");
1543 return; 1588 return;
1544 } 1589 }
1590
1545 if (tmp->msg == NULL) 1591 if (!tmp->msg)
1546 { 1592 {
1547 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1593 op->failmsg (format ("You open the %s and find it empty.", &tmp->name));
1548 return; 1594 return;
1549 } 1595 }
1550 1596
1551 /* need a literacy skill to read stuff! */ 1597 /* need a literacy skill to read stuff! */
1552 skill_ob = find_skill_by_name (op, tmp->skill); 1598 skill_ob = find_skill_by_name (op, tmp->skill);
1553 if (!skill_ob) 1599 if (!skill_ob)
1554 { 1600 {
1555 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1601 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
1556 return; 1602 return;
1557 } 1603 }
1604
1558 lev_diff = tmp->level - (skill_ob->level + 5); 1605 lev_diff = tmp->level - (skill_ob->level + 5);
1559 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1606 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1560 { 1607 {
1561 if (lev_diff < 2) 1608 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."); 1609 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1563 else if (lev_diff < 3) 1610 : lev_diff < 5 ? "This book is beyond your comprehension."
1564 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension."); 1611 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1565 else if (lev_diff < 5) 1612 : lev_diff < 15 ? "This book is way beyond your comprehension."
1566 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension."); 1613 : "This book is totally beyond your comprehension.");
1567 else if (lev_diff < 8) 1614 return;
1568 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension."); 1615 }
1569 else if (lev_diff < 15) 1616
1570 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension."); 1617 readable_message_type *msgType = get_readable_message_type (tmp);
1618
1619 if (player *pl = op->contr)
1620 if (client *ns = pl->ns)
1621 if (ns->can_msg)
1622 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1571 else 1623 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, 1624 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1579 msgType->message_type, msgType->message_subtype, 1625 msgType->message_type, msgType->message_subtype,
1580 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1626 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1581 long_desc (tmp, op), &tmp->msg); 1627 long_desc (tmp, op), &tmp->msg);
1582 1628
1583 /* gain xp from reading */ 1629 /* gain xp from reading */
1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1630 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1585 { /* only if not read before */ 1631 { /* only if not read before */
1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1632 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1607 * op is the person learning the skill, tmp is the skill scroll object 1653 * op is the person learning the skill, tmp is the skill scroll object
1608 */ 1654 */
1609static void 1655static void
1610apply_skillscroll (object *op, object *tmp) 1656apply_skillscroll (object *op, object *tmp)
1611{ 1657{
1612 switch ((int) learn_skill (op, tmp)) 1658 switch (learn_skill (op, tmp))
1613 { 1659 {
1614 case 0: 1660 case 0:
1615 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge "); 1661 op->play_sound (sound_find ("generic_fail"));
1616 new_draw_info_format (NDI_UNIQUE, 0, op, "held within the %s.\n", query_name (tmp)); 1662 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1617 return; 1663 break;
1618 1664
1619 case 1: 1665 case 1:
1620 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1621 decrease_ob (tmp); 1666 tmp->decrease ();
1667 op->play_sound (sound_find ("skill_learn"));
1668 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1622 return; 1669 break;
1623 1670
1624 default: 1671 default:
1672 tmp->decrease ();
1673 op->play_sound (sound_find ("generic_fail"));
1625 new_draw_info_format (NDI_UNIQUE, 0, op, "You fail to learn the knowledge of the %s.\n", query_name (tmp)); 1674 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1626 decrease_ob (tmp);
1627 return; 1675 break;
1628 } 1676 }
1629} 1677}
1630 1678
1631/** 1679/**
1632 * Actually makes op learn spell. 1680 * Actually makes op learn spell.
… …
1652 return; 1700 return;
1653 } 1701 }
1654 return; 1702 return;
1655 } 1703 }
1656 1704
1657 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1705 op->contr->play_sound (sound_find ("learn_spell"));
1706
1658 tmp = spell->clone (); 1707 tmp = spell->clone ();
1659 insert_ob_in_ob (tmp, op); 1708 insert_ob_in_ob (tmp, op);
1660 1709
1661 if (special_prayer) 1710 if (special_prayer)
1662 SET_FLAG (tmp, FLAG_STARTEQUIP); 1711 SET_FLAG (tmp, FLAG_STARTEQUIP);
… …
1681 { 1730 {
1682 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1731 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1683 return; 1732 return;
1684 } 1733 }
1685 1734
1686 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1735 op->failmsg (format ("You lose knowledge of %s.", spell));
1687 player_unready_range_ob (op->contr, spob); 1736 player_unready_range_ob (op->contr, spob);
1688 esrv_remove_spell (op->contr, spob); 1737 esrv_remove_spell (op->contr, spob);
1689 spob->destroy (); 1738 spob->destroy ();
1690} 1739}
1691 1740
… …
1699{ 1748{
1700 object *skop, *spell, *spell_skill; 1749 object *skop, *spell, *spell_skill;
1701 1750
1702 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1751 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1703 { 1752 {
1704 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1753 op->failmsg ("You are unable to read while blind.");
1705 return; 1754 return;
1706 } 1755 }
1707 1756
1708 /* artifact_spellbooks have 'slaying' field point to a spell name, 1757 /* artifact_spellbooks have 'slaying' field point to a spell name,
1709 * instead of having their spell stored in stats.sp. These are 1758 * instead of having their spell stored in stats.sp. These are
1710 * legacy spellbooks 1759 * legacy spellbooks
1711 */ 1760 */
1712
1713 if (tmp->slaying != NULL) 1761 if (tmp->slaying)
1714 { 1762 {
1715 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1763 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1716 if (!spell) 1764 if (!spell)
1717 { 1765 {
1718 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1766 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1719 return; 1767 return;
1720 } 1768 }
1721 else 1769 else
1722 insert_ob_in_ob (spell, tmp); 1770 insert_ob_in_ob (spell, tmp);
1771
1723 tmp->slaying = NULL; 1772 tmp->slaying = 0;
1724 } 1773 }
1725 1774
1726 skop = find_skill_by_name (op, tmp->skill); 1775 skop = find_skill_by_name (op, tmp->skill);
1727 1776
1728 /* need a literacy skill to learn spells. Also, having a literacy level 1777 /* need a literacy skill to learn spells. Also, having a literacy level
1729 * lower than the spell will make learning the spell more difficult */ 1778 * lower than the spell will make learning the spell more difficult */
1730 if (!skop) 1779 if (!skop)
1731 { 1780 {
1732 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1781 op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
1733 return; 1782 return;
1734 } 1783 }
1735 1784
1736 spell = tmp->inv; 1785 spell = tmp->inv;
1737 1786
1738 if (!spell) 1787 if (!spell)
1739 { 1788 {
1740 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1789 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."); 1790 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1742 return; 1791 return;
1743 } 1792 }
1744 1793
1745 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1794 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1746 { 1795 {
1747 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]"); 1796 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
1748 return; 1797 return;
1749 } 1798 }
1750 1799
1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1800 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1752 1801
1753 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1802 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1754 { 1803 {
1755 identify (tmp); 1804 identify (tmp);
1756 1805
… …
1765 * if the player doesn't know the spell, doesn't make a lot of sense that 1814 * if the player doesn't know the spell, doesn't make a lot of sense that
1766 * they would have a special prayer mark. 1815 * they would have a special prayer mark.
1767 */ 1816 */
1768 if (check_spell_known (op, spell->name)) 1817 if (check_spell_known (op, spell->name))
1769 { 1818 {
1770 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1819 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; 1820 return;
1772 } 1821 }
1773 1822
1774 if (spell->skill) 1823 if (spell->skill)
1775 { 1824 {
1776 spell_skill = find_skill_by_name (op, spell->skill); 1825 spell_skill = find_skill_by_name (op, spell->skill);
1777 1826
1778 if (!spell_skill) 1827 if (!spell_skill)
1779 { 1828 {
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill); 1829 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
1781 return; 1830 return;
1782 } 1831 }
1783 1832
1784 if (spell_skill->level < spell->level) 1833 if (spell_skill->level < spell->level)
1785 { 1834 {
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); 1835 op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
1787 return; 1836 return;
1788 } 1837 }
1789 } 1838 }
1790 1839
1791 /* Logic as follows 1840 /* Logic as follows
… …
1800 * Overall, chances are the same but a player will find having a high 1849 * Overall, chances are the same but a player will find having a high
1801 * literacy rate very useful! -b.t. 1850 * literacy rate very useful! -b.t.
1802 */ 1851 */
1803 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1852 if (QUERY_FLAG (op, FLAG_CONFUSED))
1804 { 1853 {
1805 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!"); 1854 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)); 1855 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
1807 } 1856 }
1808 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1857 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]) 1858 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1810 { 1859 {
1811 1860 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); 1861 do_learn_spell (op, spell, 0);
1814 1862
1815 /* xp gain to literacy for spell learning */ 1863 /* xp gain to literacy for spell learning */
1816 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1864 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1817 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1865 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1818 } 1866 }
1819 else 1867 else
1820 { 1868 {
1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1869 op->contr->play_sound (sound_find ("fumble_spell"));
1822 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1870 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 } 1871 }
1824 1872
1825 decrease_ob (tmp); 1873 tmp->decrease ();
1826} 1874}
1827 1875
1828/** 1876/**
1829 * Handles applying a spell scroll. 1877 * Handles applying a spell scroll.
1830 */ 1878 */
… …
1833{ 1881{
1834 object *skop; 1882 object *skop;
1835 1883
1836 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1884 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1837 { 1885 {
1838 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1886 op->failmsg ("You are unable to read while blind.");
1839 return; 1887 return;
1840 } 1888 }
1841 1889
1842 if (!tmp->inv || tmp->inv->type != SPELL) 1890 if (!tmp->inv || tmp->inv->type != SPELL)
1843 { 1891 {
1844 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1892 op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
1845 return; 1893 return;
1846 } 1894 }
1847 1895
1848 if (op->type == PLAYER) 1896 if (op->type == PLAYER)
1849 { 1897 {
… …
1855 */ 1903 */
1856 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1904 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1857 1905
1858 if (!skop) 1906 if (!skop)
1859 { 1907 {
1860 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1908 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
1861 return; 1909 return;
1862 } 1910 }
1863 1911
1864 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1912 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1865 change_exp (op, exp_gain, skop->skill, 0); 1913 change_exp (op, exp_gain, skop->skill, 0);
1866 } 1914 }
1867 1915
1868 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1916 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1869 identify (tmp); 1917 identify (tmp);
1870 1918
1871 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1919 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1872 1920
1873 cast_spell (op, tmp, dir, tmp->inv, NULL); 1921 cast_spell (op, tmp, dir, tmp->inv, NULL);
1874 decrease_ob (tmp); 1922 tmp->decrease ();
1875} 1923}
1876 1924
1877/** 1925/**
1878 * Applies a treasure object - by default, chest. op 1926 * Applies a treasure object - by default, chest. op
1879 * is the person doing the applying, tmp is the treasure 1927 * is the person doing the applying, tmp is the treasure
1880 * chest. 1928 * chest.
1881 */ 1929 */
1882static void 1930static void
1883apply_treasure (object *op, object *tmp) 1931apply_treasure (object *op, object *tmp)
1884{ 1932{
1885 /* Nice side effect of new treasure creation method is that the treasure 1933 /* Nice side effect of this treasure creation method is that the treasure
1886 * for the chest is done when the chest is created, and put into the chest 1934 * for the chest is done when the chest is created, and put into the chest
1887 * inventory. So that when the chest burns up, the items still exist. Also 1935 * inventory. So that when the chest burns up, the items still exist. Also
1888 * prevents people fromt moving chests to more difficult maps to get better 1936 * prevents people from moving chests to more difficult maps to get better
1889 * treasure 1937 * treasure
1890 */ 1938 */
1891 object *treas = tmp->inv; 1939 object *treas = tmp->inv;
1892 1940
1893 if (!treas) 1941 if (!treas)
1894 { 1942 {
1895 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1943 op->statusmsg ("The chest was empty.");
1896 decrease_ob (tmp); 1944 tmp->decrease ();
1897 return; 1945 return;
1898 } 1946 }
1899 1947
1900 while (tmp->inv) 1948 while (tmp->inv)
1901 { 1949 {
1902 treas = tmp->inv; 1950 treas = tmp->inv;
1903
1904 treas->remove (); 1951 treas->remove ();
1905 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
1906 1952
1907 treas->x = op->x; 1953 treas->x = op->x;
1908 treas->y = op->y; 1954 treas->y = op->y;
1909 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1955 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
1910 1956
1911 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1957 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
1912 spring_trap (treas, op); 1958 spring_trap (treas, op);
1913 1959
1914 /* If either player or container was destroyed, no need to do 1960 /* If either player or container was destroyed, no need to do
1915 * further processing. I think this should be enclused with 1961 * further processing. I think this should be enclused with
1916 * spring trap above, as I don't think there is otherwise 1962 * spring trap above, as I don't think there is otherwise
1917 * any way for the treasure chest or player to get killed 1963 * any way for the treasure chest or player to get killed.
1918 */ 1964 */
1919 if (op->destroyed () || tmp->destroyed ()) 1965 if (op->destroyed () || tmp->destroyed ())
1920 break; 1966 break;
1921 } 1967 }
1922 1968
1923 if (!tmp->destroyed () && tmp->inv == NULL) 1969 if (!tmp->destroyed () && !tmp->inv)
1924 decrease_ob (tmp); 1970 tmp->decrease ();
1925
1926} 1971}
1927 1972
1928/** 1973/**
1929 * op eats food. 1974 * op eats food.
1930 * If player, takes care of messages and dragon special food. 1975 * If player, takes care of messages and dragon special food.
… …
1945 { 1990 {
1946 /* usual case - no dragon meal: */ 1991 /* usual case - no dragon meal: */
1947 if (op->stats.food + tmp->stats.food > 999) 1992 if (op->stats.food + tmp->stats.food > 999)
1948 { 1993 {
1949 if (tmp->type == FOOD || tmp->type == FLESH) 1994 if (tmp->type == FOOD || tmp->type == FLESH)
1950 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!"); 1995 op->failmsg ("You feel full, but what a waste of food!");
1951 else 1996 else
1952 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!"); 1997 op->statusmsg ("Most of the drink goes down your face not your throat!");
1953 } 1998 }
1999
2000 tmp->play_sound (
2001 tmp->sound
2002 ? tmp->sound
2003 : tmp->type == DRINK
2004 ? sound_find ("eat_drink")
2005 : sound_find ("eat_food")
2006 );
1954 2007
1955 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 2008 if (!QUERY_FLAG (tmp, FLAG_CURSED))
1956 { 2009 {
1957 char buf[MAX_BUF]; 2010 const char *buf;
1958 2011
1959 if (!is_dragon_pl (op)) 2012 if (!is_dragon_pl (op))
1960 { 2013 {
1961 /* eating message for normal players */ 2014 /* eating message for normal players */
1962 if (tmp->type == DRINK) 2015 if (tmp->type == DRINK)
1963 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name); 2016 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
1964 else 2017 else
1965 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good."); 2018 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
1966 } 2019 }
1967 else 2020 else
1968 {
1969 /* eating message for dragon players */ 2021 /* eating message for dragon players */
1970 sprintf (buf, "The %s tasted terrible!", &tmp->name); 2022 buf = format ("The %s tasted terrible!", &tmp->name);
1971 }
1972 2023
1973 new_draw_info (NDI_UNIQUE, 0, op, buf); 2024 op->statusmsg (buf);
2025
1974 capacity_remaining = 999 - op->stats.food; 2026 capacity_remaining = 999 - op->stats.food;
1975 op->stats.food += tmp->stats.food; 2027 op->stats.food += tmp->stats.food;
1976 if (capacity_remaining < tmp->stats.food) 2028 if (capacity_remaining < tmp->stats.food)
1977 op->stats.hp += capacity_remaining / 50; 2029 op->stats.hp += capacity_remaining / 50;
1978 else 2030 else
1979 op->stats.hp += tmp->stats.food / 50; 2031 op->stats.hp += tmp->stats.food / 50;
2032
1980 if (op->stats.hp > op->stats.maxhp) 2033 if (op->stats.hp > op->stats.maxhp)
1981 op->stats.hp = op->stats.maxhp; 2034 op->stats.hp = op->stats.maxhp;
1982 if (op->stats.food > 999) 2035 if (op->stats.food > 999)
1983 op->stats.food = 999; 2036 op->stats.food = 999;
1984 } 2037 }
… …
1986 /* special food hack -b.t. */ 2039 /* special food hack -b.t. */
1987 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2040 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
1988 eat_special_food (op, tmp); 2041 eat_special_food (op, tmp);
1989 } 2042 }
1990 } 2043 }
2044
1991 handle_apply_yield (tmp); 2045 handle_apply_yield (tmp);
1992 decrease_ob (tmp); 2046 tmp->decrease ();
1993} 2047}
1994 2048
1995/** 2049/**
1996 * A dragon is eating some flesh. If the flesh contains resistances, 2050 * A dragon is eating some flesh. If the flesh contains resistances,
1997 * there is a chance for the dragon's skin to get improved. 2051 * there is a chance for the dragon's skin to get improved.
… …
2007{ 2061{
2008 object *skin = NULL; /* pointer to dragon skin force */ 2062 object *skin = NULL; /* pointer to dragon skin force */
2009 object *abil = NULL; /* pointer to dragon ability force */ 2063 object *abil = NULL; /* pointer to dragon ability force */
2010 object *tmp = NULL; /* tmp. object */ 2064 object *tmp = NULL; /* tmp. object */
2011 2065
2012 char buf[MAX_BUF]; /* tmp. string buffer */
2013 double chance; /* improvement-chance of one resistance type */ 2066 double chance; /* improvement-chance of one resistance type */
2014 double totalchance = 1; /* total chance of gaining one resistance */ 2067 double totalchance = 1; /* total chance of gaining one resistance */
2015 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */ 2068 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2016 double mbonus = 0; /* monster bonus */ 2069 double mbonus = 0; /* monster bonus */
2017 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2070 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
… …
2022 if (meal->type != FLESH || !is_dragon_pl (op)) 2075 if (meal->type != FLESH || !is_dragon_pl (op))
2023 return 0; 2076 return 0;
2024 2077
2025 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2078 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2026 from the player's inventory */ 2079 from the player's inventory */
2027 shstr_cmp dragon_ability_force ("dragon_ability_force");
2028 shstr_cmp dragon_skin_force ("dragon_skin_force");
2029
2030 for (tmp = op->inv; tmp; tmp = tmp->below) 2080 for (tmp = op->inv; tmp; tmp = tmp->below)
2031 if (tmp->type == FORCE) 2081 if (tmp->type == FORCE)
2032 if (tmp->arch->name == dragon_skin_force) 2082 if (tmp->arch->archname == shstr_dragon_skin_force)
2033 skin = tmp; 2083 skin = tmp;
2034 else if (tmp->arch->name == dragon_ability_force) 2084 else if (tmp->arch->archname == shstr_dragon_ability_force)
2035 abil = tmp; 2085 abil = tmp;
2036 2086
2037 /* if either skin or ability are missing, this is an old player 2087 /* if either skin or ability are missing, this is an old player
2038 which is not to be considered a dragon -> bail out */ 2088 which is not to be considered a dragon -> bail out */
2039 if (skin == NULL || abil == NULL) 2089 if (skin == NULL || abil == NULL)
… …
2042 /* now start by filling stomache and health, according to food-value */ 2092 /* now start by filling stomache and health, according to food-value */
2043 if ((999 - op->stats.food) < meal->stats.food) 2093 if ((999 - op->stats.food) < meal->stats.food)
2044 op->stats.hp += (999 - op->stats.food) / 50; 2094 op->stats.hp += (999 - op->stats.food) / 50;
2045 else 2095 else
2046 op->stats.hp += meal->stats.food / 50; 2096 op->stats.hp += meal->stats.food / 50;
2097
2047 if (op->stats.hp > op->stats.maxhp) 2098 if (op->stats.hp > op->stats.maxhp)
2048 op->stats.hp = op->stats.maxhp; 2099 op->stats.hp = op->stats.maxhp;
2049 2100
2050 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2101 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2051 2102
… …
2096 } 2147 }
2097 } 2148 }
2098 2149
2099 /* inverse totalchance as until now we have the failure-chance */ 2150 /* inverse totalchance as until now we have the failure-chance */
2100 totalchance = 100 - totalchance * 100; 2151 totalchance = 100 - totalchance * 100;
2152
2101 /* print message according to totalchance */ 2153 /* print message according to totalchance */
2154 const char *buf;
2102 if (totalchance > 50.) 2155 if (totalchance > 50.)
2103 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name); 2156 buf = format ("Hmm! The %s tasted delicious!", &meal->name);
2104 else if (totalchance > 10.) 2157 else if (totalchance > 10.)
2105 sprintf (buf, "The %s tasted very good.", &meal->name); 2158 buf = format ("The %s tasted very good.", &meal->name);
2106 else if (totalchance > 1.) 2159 else if (totalchance > 1.)
2107 sprintf (buf, "The %s tasted good.", &meal->name); 2160 buf = format ("The %s tasted good.", &meal->name);
2108 else if (totalchance > 0.1) 2161 else if (totalchance > 0.1)
2109 sprintf (buf, "The %s tasted bland.", &meal->name); 2162 buf = format ("The %s tasted bland.", &meal->name);
2110 else if (totalchance >= 0.01) 2163 else if (totalchance >= 0.01)
2111 sprintf (buf, "The %s had a boring taste.", &meal->name); 2164 buf = format ("The %s had a boring taste.", &meal->name);
2112 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat)) 2165 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2113 sprintf (buf, "The %s tasted strange.", &meal->name); 2166 buf = format ("The %s tasted strange.", &meal->name);
2114 else 2167 else
2115 sprintf (buf, "The %s had no taste.", &meal->name); 2168 buf = format ("The %s had no taste.", &meal->name);
2116 new_draw_info (NDI_UNIQUE, 0, op, buf); 2169
2170 op->statusmsg (buf);
2117 2171
2118 /* now choose a winner if we have any */ 2172 /* now choose a winner if we have any */
2119 i = -1; 2173 i = -1;
2120 if (winners > 0) 2174 if (winners > 0)
2121 i = atnr_winner[RANDOM () % winners]; 2175 i = atnr_winner[RANDOM () % winners];
… …
2124 { 2178 {
2125 /* resistance increased! */ 2179 /* resistance increased! */
2126 skin->resist[i]++; 2180 skin->resist[i]++;
2127 op->update_stats (); 2181 op->update_stats ();
2128 2182
2129 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2183 op->statusmsg (format ("Your skin is now more resistant to %s!", change_resist_msg[i]));
2130 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2131 } 2184 }
2132 2185
2133 /* if this flesh contains a new ability focus, we mark it 2186 /* if this flesh contains a new ability focus, we mark it
2134 into the ability_force and it will take effect on next level */ 2187 into the ability_force and it will take effect on next level */
2135 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat) 2188 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2136 { 2189 {
2137 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2190 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2138 2191
2139 if (meal->last_eat != abil->stats.exp) 2192 if (meal->last_eat != abil->stats.exp)
2193 op->statusmsg (format (
2194 "Your metabolism prepares to focus on %s!\n"
2195 "The change will happen at level %d.",
2196 change_resist_msg[meal->last_eat],
2197 abil->level + 1
2140 { 2198 ));
2141 sprintf (buf, "Your metabolism prepares to focus on %s!", change_resist_msg[meal->last_eat]);
2142 new_draw_info (NDI_UNIQUE, 0, op, buf);
2143 sprintf (buf, "The change will happen at level %d", abil->level + 1);
2144 new_draw_info (NDI_UNIQUE, 0, op, buf);
2145 }
2146 else 2199 else
2147 { 2200 {
2148 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]); 2201 op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
2149 new_draw_info (NDI_UNIQUE, 0, op, buf);
2150 abil->last_eat = 0; 2202 abil->last_eat = 0;
2151 } 2203 }
2152 } 2204 }
2205
2153 return 1; 2206 return 1;
2154} 2207}
2155 2208
2156/** 2209/**
2157 * Handles applying an improve armor scroll. 2210 * Handles applying an improve armor scroll.
… …
2160static void 2213static void
2161apply_armour_improver (object *op, object *tmp) 2214apply_armour_improver (object *op, object *tmp)
2162{ 2215{
2163 object *armor; 2216 object *armor;
2164 2217
2165 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2218 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2166 { 2219 {
2167 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2220 op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
2168 return; 2221 return;
2169 } 2222 }
2170 2223
2171 armor = find_marked_object (op); 2224 armor = find_marked_object (op);
2172 2225
2173 if (!armor) 2226 if (!armor)
2174 { 2227 {
2175 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2228 op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2176 return; 2229 return;
2177 } 2230 }
2178 2231
2179 if (armor->type != ARMOUR 2232 if (armor->type != ARMOUR
2180 && armor->type != CLOAK 2233 && armor->type != CLOAK
2181 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2234 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2182 { 2235 {
2183 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2236 op->failmsg ("Your marked item is not armour!\n");
2184 return; 2237 return;
2185 } 2238 }
2186 2239
2187 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2240 op->statusmsg ("Applying armour enchantment.");
2188 improve_armour (op, tmp, armor); 2241 improve_armour (op, tmp, armor);
2189} 2242}
2190 2243
2191extern void 2244extern void
2192apply_poison (object *op, object *tmp) 2245apply_poison (object *op, object *tmp)
2193{ 2246{
2194 if (op->type == PLAYER) 2247 if (op->type == PLAYER)
2195 { 2248 {
2196 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2249 op->contr->play_sound (sound_find ("drink_poison"));
2197 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2250 op->failmsg ("Yech! That tasted poisonous!");
2198 strcpy (op->contr->killer, "poisonous booze"); 2251 strcpy (op->contr->killer, "poisonous booze");
2199 } 2252 }
2253
2200 if (tmp->stats.hp > 0) 2254 if (tmp->stats.hp > 0)
2201 { 2255 {
2202 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2256 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2203 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2257 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2204 } 2258 }
2259
2205 op->stats.food -= op->stats.food / 4; 2260 op->stats.food -= op->stats.food / 4;
2206 handle_apply_yield (tmp); 2261 handle_apply_yield (tmp);
2207 decrease_ob (tmp); 2262 tmp->decrease ();
2208} 2263}
2209 2264
2210/** 2265/**
2211 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2266 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2212 * A valid 2 way exit means: 2267 * A valid 2 way exit means:
… …
2227 2282
2228#if 0 //TODO 2283#if 0 //TODO
2229 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2284 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2230 return 0; /* This is a reset town portal */ 2285 return 0; /* This is a reset town portal */
2231#endif 2286#endif
2287
2288 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2232 2289
2233 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2290 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2234 2291
2235 if (exitmap) 2292 if (exitmap)
2236 { 2293 {
… …
2319 2376
2320 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2377 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2321 { 2378 {
2322 if (op->type == PLAYER) 2379 if (op->type == PLAYER)
2323 { 2380 {
2324 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2381 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
2325 return 1; 2382 return 1;
2326 } 2383 }
2327 else 2384 else
2328 return 0; /* monsters just skip unpaid items */ 2385 return 0; /* monsters just skip unpaid items */
2329 } 2386 }
… …
2332 return RESULT_INT (0); 2389 return RESULT_INT (0);
2333 2390
2334 switch (tmp->type) 2391 switch (tmp->type)
2335 { 2392 {
2336 case CF_HANDLE: 2393 case CF_HANDLE:
2337 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2394 op->play_sound (sound_find ("turn_handle"));
2338 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2395 op->statusmsg ("You turn the handle.");
2339 tmp->value = tmp->value ? 0 : 1; 2396 tmp->value = tmp->value ? 0 : 1;
2340 SET_ANIMATION (tmp, tmp->value); 2397 SET_ANIMATION (tmp, tmp->value);
2341 update_object (tmp, UP_OBJ_FACE); 2398 update_object (tmp, UP_OBJ_FACE);
2342 push_button (tmp); 2399 push_button (tmp);
2343 return 1; 2400 return 1;
2344 2401
2345 case TRIGGER: 2402 case TRIGGER:
2346 if (check_trigger (tmp, op)) 2403 if (check_trigger (tmp, op))
2347 { 2404 {
2348 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2405 op->statusmsg ("You turn the handle.");
2349 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2406 op->play_sound (sound_find ("turn_handle"));
2350 } 2407 }
2351 else 2408 else
2352 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2409 op->failmsg ("The handle doesn't move.");
2353 2410
2354 return 1; 2411 return 1;
2355 2412
2356 case EXIT: 2413 case EXIT:
2357 if (op->type != PLAYER) 2414 if (op->type != PLAYER)
2358 return 0; 2415 return 0;
2359 2416
2360 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2417 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2361 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2418 op->failmsg (format ("The %s is closed.", query_name (tmp)));
2362 else 2419 else
2363 { 2420 {
2364 /* Don't display messages for random maps. */ 2421 /* Don't display messages for random maps. */
2365 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2422 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2366 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2423 op->statusmsg (tmp->msg, NDI_NAVY);
2367 2424
2368 op->enter_exit (tmp); 2425 op->enter_exit (tmp);
2369 } 2426 }
2370 2427
2428 return 1;
2429
2430 case INSCRIBABLE:
2431 op->statusmsg (tmp->msg);
2432 // maybe show a spell menu to chose from or something like that
2371 return 1; 2433 return 1;
2372 2434
2373 case SIGN: 2435 case SIGN:
2374 apply_sign (op, tmp, 0); 2436 apply_sign (op, tmp, 0);
2375 return 1; 2437 return 1;
… …
2484 { 2546 {
2485 char buf[MAX_BUF]; 2547 char buf[MAX_BUF];
2486 timeofday_t tod; 2548 timeofday_t tod;
2487 2549
2488 get_tod (&tod); 2550 get_tod (&tod);
2551 op->play_sound (sound_find ("sound_clock"));
2552 op->statusmsg (format (
2489 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2553 "It is %d minute%s past %d o'clock %s",
2490 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2554 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2491 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2555 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2492 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2556 ));
2493 new_draw_info (NDI_UNIQUE, 0, op, buf);
2494 return 1; 2557 return 1;
2495 } 2558 }
2496 else 2559 else
2497 return 0; 2560 return 0;
2498 2561
… …
2537int 2600int
2538player_apply (object *pl, object *op, int aflag, int quiet) 2601player_apply (object *pl, object *op, int aflag, int quiet)
2539{ 2602{
2540 int tmp; 2603 int tmp;
2541 2604
2542 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2605 if (op->env && (pl->move_type & MOVE_FLYING))
2543 { 2606 {
2544 /* player is flying and applying object not in inventory */ 2607 /* player is flying and applying object not in inventory */
2545 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2608 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2546 { 2609 {
2547 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2610 pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
2548 return 0; 2611 return 0;
2549 } 2612 }
2550 } 2613 }
2551 2614
2552 pl->contr->last_used = op; 2615 pl->contr->last_used = op;
2553 2616
2554 tmp = manual_apply (pl, op, aflag); 2617 tmp = manual_apply (pl, op, aflag);
2555 if (!quiet) 2618 if (!quiet)
2556 { 2619 {
2557 if (tmp == 0) 2620 if (tmp == 0)
2558 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2621 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2559 else if (tmp == 2) 2622 else if (tmp == 2)
2560 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2623 pl->failmsg ("You must get it first!\n");
2561 } 2624 }
2625
2562 return tmp; 2626 return tmp;
2563} 2627}
2564 2628
2565/** 2629/**
2566 * player_apply_below attempts to apply the object 'below' the player. 2630 * player_apply_below attempts to apply the object 'below' the player.
… …
2641 { 2705 {
2642 pl->combat_ob = 0; 2706 pl->combat_ob = 0;
2643 who->change_weapon (pl->ranged_ob); 2707 who->change_weapon (pl->ranged_ob);
2644 } 2708 }
2645 2709
2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2710 who->statusmsg (format ("You unwield %s.", query_name (op)));
2647 2711
2648 change_abil (who, op); 2712 change_abil (who, op);
2649 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2713 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2650 break; 2714 break;
2651 2715
2652 case SKILL: 2716 case SKILL:
2653 if (who->contr) 2717 if (who->contr)
2654 { 2718 {
2655 if (!op->invisible) 2719 if (!op->invisible)
2656 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2720 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2657 else 2721 else
2658 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2722 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2659 } 2723 }
2660 2724
2661 change_abil (who, op); 2725 change_abil (who, op);
2662 CLEAR_FLAG (who, FLAG_READY_SKILL); 2726 CLEAR_FLAG (who, FLAG_READY_SKILL);
2663 break; 2727 break;
… …
2670 case GLOVES: 2734 case GLOVES:
2671 case AMULET: 2735 case AMULET:
2672 case GIRDLE: 2736 case GIRDLE:
2673 case BRACERS: 2737 case BRACERS:
2674 case CLOAK: 2738 case CLOAK:
2675 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2739 who->statusmsg (format ("You unwear %s.", query_name (op)));
2676 change_abil (who, op); 2740 change_abil (who, op);
2677 break; 2741 break;
2678 2742
2679 case LAMP: 2743 case LAMP:
2680 { 2744 {
2681 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2745 who->statusmsg (format ("You turn off your %s.", &op->name));
2682 2746
2683 object *tmp2 = arch_to_object (op->other_arch); 2747 object *tmp2 = arch_to_object (op->other_arch);
2684 tmp2->x = op->x; 2748 tmp2->x = op->x;
2685 tmp2->y = op->y; 2749 tmp2->y = op->y;
2686 tmp2->map = op->map; 2750 tmp2->map = op->map;
… …
2701 2765
2702 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2766 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2703 { 2767 {
2704 if (who->contr) 2768 if (who->contr)
2705 { 2769 {
2706 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2770 who->failmsg ("Oops, it feels deadly cold!");
2707 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2771 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2708 } 2772 }
2709 } 2773 }
2710 2774
2711 if (who->contr) 2775 if (who->contr)
… …
2724 { 2788 {
2725 pl->ranged_ob = 0; 2789 pl->ranged_ob = 0;
2726 who->change_weapon (pl->combat_ob); 2790 who->change_weapon (pl->combat_ob);
2727 } 2791 }
2728 2792
2729 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2793 who->statusmsg (format ("You unready %s.", query_name (op)));
2730 } 2794 }
2731 else 2795 else
2732 { 2796 {
2733 who->change_skill (0); 2797 who->change_skill (0);
2734 2798
… …
2740 2804
2741 break; 2805 break;
2742 2806
2743 case BUILDER: 2807 case BUILDER:
2744 if (who->contr) 2808 if (who->contr)
2745 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2809 who->statusmsg (format ("You unready %s.", query_name (op)));
2746 break; 2810 break;
2747 2811
2748 default: 2812 default:
2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2813 who->statusmsg (format ("You unapply %s.", query_name (op)));
2750 break; 2814 break;
2751 } 2815 }
2752 2816
2753 who->update_stats (); 2817 who->update_stats ();
2754 2818
… …
2806 * Returns 0 on success, returns 1 if there is some problem. 2870 * Returns 0 on success, returns 1 if there is some problem.
2807 * if aflags is AP_PRINT, we instead print out waht to unapply 2871 * if aflags is AP_PRINT, we instead print out waht to unapply
2808 * instead of doing it. This is a lot less code than having 2872 * instead of doing it. This is a lot less code than having
2809 * another function that does just that. 2873 * another function that does just that.
2810 */ 2874 */
2875
2876#define CANNOT_REMOVE_CURSED \
2877 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2878 "Praying over an altar, scrolls of remove curse/damnation, " \
2879 "priests or even other players might help.>"
2880
2811int 2881int
2812unapply_for_ob (object *who, object *op, int aflags) 2882unapply_for_ob (object *who, object *op, int aflags)
2813{ 2883{
2814 if (op->is_range ()) 2884 if (op->is_range ())
2815 for (object *tmp = who->inv; tmp; tmp = tmp->below) 2885 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2816 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 2886 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2817 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2887 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2818 { 2888 {
2819 if (aflags & AP_PRINT) 2889 if (aflags & AP_PRINT)
2820 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2890 who->failmsg (query_name (tmp));
2821 else 2891 else
2822 unapply_special (who, tmp, aflags); 2892 unapply_special (who, tmp, aflags);
2823 } 2893 }
2824 else 2894 else
2825 { 2895 {
2826 /* In this case, we want to try and remove a cursed item. 2896 /* In this case, we want to try and remove a cursed item.
2827 * While we know it won't work, we want unapply_special to 2897 * While we know it won't work, we want unapply_special to
2828 * at least generate the message. 2898 * at least generate the message.
2829 */ 2899 */
2830 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp)); 2900 who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
2831 return 1; 2901 return 1;
2832 } 2902 }
2833 2903
2834 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 2904 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2835 { 2905 {
… …
2858 2928
2859 /* If we are just printing, we don't care about cursed status */ 2929 /* If we are just printing, we don't care about cursed status */
2860 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2930 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2861 { 2931 {
2862 if (aflags & AP_PRINT) 2932 if (aflags & AP_PRINT)
2863 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2933 who->failmsg (query_name (tmp));
2864 else 2934 else
2865 unapply_special (who, tmp, aflags); 2935 unapply_special (who, tmp, aflags);
2866 } 2936 }
2867 else 2937 else
2868 { 2938 {
2869 /* Cursed item that we can't unequip - tell the player. 2939 /* Cursed item that we can't unequip - tell the player.
2870 * Note this could be annoying if this is just one of a few, 2940 * Note this could be annoying if this is just one of a few,
2871 * so it may not be critical (eg, putting on a ring and you have 2941 * so it may not be critical (eg, putting on a ring and you have
2872 * one cursed ring.) 2942 * one cursed ring.)
2873 */ 2943 */
2874 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2944 who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
2875 } 2945 }
2876 2946
2877 last = tmp->below; 2947 last = tmp->below;
2878 } 2948 }
2879 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2949 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
… …
3032 * 3102 *
3033 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3103 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3034 * 3104 *
3035 * apply_special() doesn't check for unpaid items. 3105 * apply_special() doesn't check for unpaid items.
3036 */ 3106 */
3107
3108#define LACK_ITEM_POWER \
3109 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3110
3037int 3111int
3038apply_special (object *who, object *op, int aflags) 3112apply_special (object *who, object *op, int aflags)
3039{ 3113{
3040 int basic_flag = aflags & AP_BASIC_FLAGS; 3114 int basic_flag = aflags & AP_BASIC_FLAGS;
3041 object *tmp, *tmp2, *skop = NULL; 3115 object *tmp, *tmp2, *skop = NULL;
… …
3056 if (basic_flag == AP_APPLY) 3130 if (basic_flag == AP_APPLY)
3057 return 0; 3131 return 0;
3058 3132
3059 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3133 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3060 { 3134 {
3061 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op)); 3135 who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
3062 return 1; 3136 return 1;
3063 } 3137 }
3064 3138
3065 return unapply_special (who, op, aflags); 3139 return unapply_special (who, op, aflags);
3066 } 3140 }
… …
3082 /* Can't just apply this object. Lets see what not and what to do */ 3156 /* Can't just apply this object. Lets see what not and what to do */
3083 if (int i = can_apply_object (who, op)) 3157 if (int i = can_apply_object (who, op))
3084 { 3158 {
3085 if (i & CAN_APPLY_NEVER) 3159 if (i & CAN_APPLY_NEVER)
3086 { 3160 {
3087 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3161 who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
3088 return 1; 3162 return 1;
3089 } 3163 }
3090 else if (i & CAN_APPLY_RESTRICTION) 3164 else if (i & CAN_APPLY_RESTRICTION)
3091 { 3165 {
3092 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3166 who->failmsg (format (
3167 "You have a prohibition against using a %s. "
3168 "H<Your belief, profession or class prevents you from applying this item.>",
3169 query_name (op)
3170 ));
3093 return 1; 3171 return 1;
3094 } 3172 }
3095 3173
3096 if (who->type != PLAYER) 3174 if (who->type != PLAYER)
3097 { 3175 {
… …
3101 } 3179 }
3102 else 3180 else
3103 { 3181 {
3104 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3182 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3105 { 3183 {
3106 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3184 who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
3107 unapply_for_ob (who, op, AP_PRINT); 3185 unapply_for_ob (who, op, AP_PRINT);
3108 return 1; 3186 return 1;
3109 } 3187 }
3110 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3188 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3111 if (unapply_for_ob (who, op, aflags)) 3189 if (unapply_for_ob (who, op, aflags))
… …
3117 { 3195 {
3118 skop = find_skill_by_name (who, op->skill); 3196 skop = find_skill_by_name (who, op->skill);
3119 3197
3120 if (!skop) 3198 if (!skop)
3121 { 3199 {
3122 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3200 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3123 return 1; 3201 return 1;
3124 } 3202 }
3125 else 3203 else
3126 /* While experience will be credited properly, we want to change the 3204 /* While experience will be credited properly, we want to change the
3127 * skill so that the dam and wc get updated 3205 * skill so that the dam and wc get updated
… …
3131 3209
3132 if (who->type == PLAYER 3210 if (who->type == PLAYER
3133 && op->item_power 3211 && op->item_power
3134 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level) 3212 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3135 { 3213 {
3136 new_draw_info (NDI_UNIQUE, 0, who,
3137 "Equipping that combined with other items would consume your soul! " 3214 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3138 "[use the skills command to check your available item power]");
3139 return 1; 3215 return 1;
3140 } 3216 }
3141 3217
3142 /* Ok. We are now at the state where we can apply the new object. 3218 /* Ok. We are now at the state where we can apply the new object.
3143 * Note that we don't have the checks for can_use_... 3219 * Note that we don't have the checks for can_use_...
3144 * below - that is already taken care of by can_apply_object. 3220 * below - that is already taken care of by can_apply_object.
3145 */ 3221 */
3146 if (op->nrof > 1) 3222 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3147 tmp = get_split_ob (op, op->nrof - 1);
3148 else
3149 tmp = 0;
3150 3223
3151 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3224 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3152 return RESULT_INT (0); 3225 return RESULT_INT (0);
3153 3226
3154 switch (op->type) 3227 switch (op->type)
3155 { 3228 {
3156 case WEAPON: 3229 case WEAPON:
3157 if (!check_weapon_power (who, op->last_eat)) 3230 if (!check_weapon_power (who, op->last_eat))
3158 { 3231 {
3159 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. " 3232 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER);
3160 "It would consume your soul!.");
3161 3233
3162 if (tmp) 3234 if (tmp)
3163 insert_ob_in_ob (tmp, who); 3235 insert_ob_in_ob (tmp, who);
3164 3236
3165 return 1; 3237 return 1;
… …
3169 // i.e. "R" can use Ragnarok's sword. 3241 // i.e. "R" can use Ragnarok's sword.
3170 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3242 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3171 { 3243 {
3172 /* if the weapon does not have the name as the character, can't use it. */ 3244 /* if the weapon does not have the name as the character, can't use it. */
3173 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3245 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3174 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3246 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3175 3247
3176 if (tmp) 3248 if (tmp)
3177 insert_ob_in_ob (tmp, who); 3249 insert_ob_in_ob (tmp, who);
3178 3250
3179 return 1; 3251 return 1;
3180 } 3252 }
3181 3253
3182 if (!skop) 3254 if (!skop)
3183 { 3255 {
3184 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO 3256 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3185 return 1; 3257 return 1;
3186 } 3258 }
3187 3259
3188 SET_FLAG (op, FLAG_APPLIED); 3260 SET_FLAG (op, FLAG_APPLIED);
3189 who->change_skill (skop); 3261 who->change_skill (skop);
3190 3262
3191 if (who->contr) 3263 if (who->contr)
3192 who->change_weapon (who->contr->combat_ob = op); 3264 who->change_weapon (who->contr->combat_ob = op);
3193 3265
3194 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3266 who->statusmsg (format ("You wield %s.", query_name (op)));
3195 3267
3196 SET_FLAG (who, FLAG_READY_WEAPON); 3268 SET_FLAG (who, FLAG_READY_WEAPON);
3197 change_abil (who, op); 3269 change_abil (who, op);
3198 break; 3270 break;
3199 3271
… …
3206 case BRACERS: 3278 case BRACERS:
3207 case CLOAK: 3279 case CLOAK:
3208 case RING: 3280 case RING:
3209 case AMULET: 3281 case AMULET:
3210 SET_FLAG (op, FLAG_APPLIED); 3282 SET_FLAG (op, FLAG_APPLIED);
3211 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3283 who->statusmsg (format ("You wear %s.", query_name (op)));
3212 change_abil (who, op); 3284 change_abil (who, op);
3213 break; 3285 break;
3214 3286
3215 case LAMP: 3287 case LAMP:
3216 if (op->stats.food < 1) 3288 if (op->stats.food < 1)
3217 { 3289 {
3218 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name); 3290 who->failmsg (format (
3291 "Your %s is out of fuel! "
3292 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3293 &op->name
3294 ));
3219 return 1; 3295 return 1;
3220 } 3296 }
3221 3297
3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3298 who->statusmsg (format ("You turn on your %s.", &op->name));
3299
3223 tmp2 = arch_to_object (op->other_arch); 3300 tmp2 = arch_to_object (op->other_arch);
3224 tmp2->stats.food = op->stats.food; 3301 tmp2->stats.food = op->stats.food;
3225 SET_FLAG (tmp2, FLAG_APPLIED); 3302 SET_FLAG (tmp2, FLAG_APPLIED);
3226 3303
3227 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3304 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
… …
3246 who->update_stats (); 3323 who->update_stats ();
3247 3324
3248 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3325 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3249 if (who->type == PLAYER) 3326 if (who->type == PLAYER)
3250 { 3327 {
3251 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3328 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3252 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3329 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3253 } 3330 }
3254 3331
3255 if (who->type == PLAYER) 3332 if (who->type == PLAYER)
3256 esrv_send_item (who, tmp2); 3333 esrv_send_item (who, tmp2);
… …
3284 who->change_weapon (pl->combat_ob = item); 3361 who->change_weapon (pl->combat_ob = item);
3285 goto found_weapon; 3362 goto found_weapon;
3286 } 3363 }
3287 } 3364 }
3288 3365
3366 who->failmsg (format (
3289 new_draw_info_format (NDI_UNIQUE, 0, who, "You need to apply a '%s' melee weapon before readying this skill", &op->skill); 3367 "You need to apply a '%s' melee weapon before readying this skill. "
3368 "H<Some skills need an item, in this case a melee weapon, to function.>",
3369 &op->skill
3370 ));
3290 return 1; 3371 return 1;
3291 3372
3292 found_weapon:; 3373 found_weapon:;
3293 } 3374 }
3294 else 3375 else
… …
3304 //TODO: bows should/must all have skill missile weapon right now 3385 //TODO: bows should/must all have skill missile weapon right now
3305 who->change_weapon (pl->ranged_ob = item); 3386 who->change_weapon (pl->ranged_ob = item);
3306 goto found_bow; 3387 goto found_bow;
3307 } 3388 }
3308 3389
3390 who->failmsg (
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill"); 3391 "You need to apply a missile weapon before readying this skill. "
3392 "H<Some skills need an item, in this case a missile weapon, to function.>"
3393 );
3310 return 1; 3394 return 1;
3311 3395
3312 found_bow:; 3396 found_bow:;
3313 } 3397 }
3314 else 3398 else
3315 who->change_weapon (pl->ranged_ob = op); 3399 who->change_weapon (pl->ranged_ob = op);
3316 } 3400 }
3317 3401
3318 if (!op->invisible) 3402 if (!op->invisible)
3319 { 3403 {
3320 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3404 who->statusmsg (format (
3321 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3405 "You ready %s."
3406 "You can now use the skill: %s.",
3407 query_name (op),
3408 &op->skill
3409 ));
3322 } 3410 }
3323 else 3411 else
3324 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3412 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
3325 } 3413 }
3326 else 3414 else
3327 { 3415 {
3328 SET_FLAG (op, FLAG_APPLIED); 3416 SET_FLAG (op, FLAG_APPLIED);
3329 change_abil (who, op); 3417 change_abil (who, op);
… …
3334 break; 3422 break;
3335 3423
3336 case BOW: 3424 case BOW:
3337 if (!check_weapon_power (who, op->last_eat)) 3425 if (!check_weapon_power (who, op->last_eat))
3338 { 3426 {
3339 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3427 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3340 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3341 3428
3342 if (tmp) 3429 if (tmp)
3343 insert_ob_in_ob (tmp, who); 3430 insert_ob_in_ob (tmp, who);
3344 3431
3345 return 1; 3432 return 1;
3346 } 3433 }
3347 3434
3348 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3435 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3349 { 3436 {
3350 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3437 who->failmsg ("The weapon does not recognize you as its owner. "
3438 "H<Its name indicates that it belongs to somebody else.>");
3351 if (tmp) 3439 if (tmp)
3352 insert_ob_in_ob (tmp, who); 3440 insert_ob_in_ob (tmp, who);
3353 3441
3354 return 1; 3442 return 1;
3355 } 3443 }
… …
3360 case HORN: 3448 case HORN:
3361 /* check for skill, alter player status */ 3449 /* check for skill, alter player status */
3362 3450
3363 if (!skop) 3451 if (!skop)
3364 { 3452 {
3365 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO 3453 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3366 return 1; 3454 return 1;
3367 } 3455 }
3368 3456
3369 SET_FLAG (op, FLAG_APPLIED); 3457 SET_FLAG (op, FLAG_APPLIED);
3370 who->change_skill (skop); 3458 who->change_skill (skop);
3371 3459
3372 if (who->contr) 3460 if (who->contr)
3373 { 3461 {
3374 who->contr->ranged_ob = op; 3462 who->contr->ranged_ob = op;
3375 3463
3376 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3464 who->statusmsg (format ("You ready %s.", query_name (op)));
3377 3465
3378 if (op->type == BOW) 3466 if (op->type == BOW)
3379 { 3467 {
3380 who->current_weapon = op; 3468 who->current_weapon = op;
3381 change_abil (who, op); 3469 change_abil (who, op);
3382 new_draw_info_format (NDI_UNIQUE, 0, who,
3383 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3470 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3384 } 3471 }
3385 } 3472 }
3386 else 3473 else
3387 { 3474 {
3388 if (op->type == BOW) 3475 if (op->type == BOW)
… …
3398 { 3485 {
3399 //TODO: wtf does this do? shouldn't this be managed automatically (slots?) 3486 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3400 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER) 3487 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3401 unapply_special (who, who->contr->ranged_ob, 0); 3488 unapply_special (who, who->contr->ranged_ob, 0);
3402 3489
3403 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3490 who->statusmsg (format ("You ready your %s.", query_name (op)));
3404 3491
3405 who->contr->ranged_ob = op; 3492 who->contr->ranged_ob = op;
3406 } 3493 }
3407 break; 3494 break;
3408 3495
3409 default: 3496 default:
3410 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3497 who->statusmsg (format ("You apply %s.", query_name (op)));
3411 } /* end of switch op->type */ 3498 }
3412 3499
3413 SET_FLAG (op, FLAG_APPLIED); 3500 SET_FLAG (op, FLAG_APPLIED);
3414 3501
3415 if (tmp) 3502 if (tmp)
3416 tmp = insert_ob_in_ob (tmp, who); 3503 tmp = insert_ob_in_ob (tmp, who);
… …
3423 */ 3510 */
3424 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3511 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3425 SET_FLAG (op, FLAG_BEEN_APPLIED); 3512 SET_FLAG (op, FLAG_BEEN_APPLIED);
3426 3513
3427 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3514 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3428 {
3429 if (who->type == PLAYER) 3515 if (who->type == PLAYER)
3430 { 3516 {
3431 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3517 who->failmsg (
3518 "Oops, it feels deadly cold! "
3519 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3520 );
3432 SET_FLAG (op, FLAG_KNOWN_CURSED); 3521 SET_FLAG (op, FLAG_KNOWN_CURSED);
3433 } 3522 }
3434 }
3435 3523
3436 if (who->type == PLAYER) 3524 if (who->type == PLAYER)
3437 { 3525 {
3438 /* if multiple objects were applied, update both slots */ 3526 /* if multiple objects were applied, update both slots */
3439 if (tmp) 3527 if (tmp)
… …
3448int 3536int
3449monster_apply_special (object *who, object *op, int aflags) 3537monster_apply_special (object *who, object *op, int aflags)
3450{ 3538{
3451 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3539 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3452 return 1; 3540 return 1;
3541
3453 return apply_special (who, op, aflags); 3542 return apply_special (who, op, aflags);
3454} 3543}
3455 3544
3456/** 3545/**
3457 * Map was just loaded, handle op's initialisation. 3546 * Map was just loaded, handle op's initialisation.
… …
3674 { 3763 {
3675 if (QUERY_FLAG (food, FLAG_CURSED)) 3764 if (QUERY_FLAG (food, FLAG_CURSED))
3676 { 3765 {
3677 assign (who->contr->killer, food->name); 3766 assign (who->contr->killer, food->name);
3678 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3767 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3679 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3768 who->failmsg ("Eck!...that was poisonous!");
3680 } 3769 }
3681 else 3770 else
3682 { 3771 {
3683 if (food->stats.hp > 0) 3772 if (food->stats.hp > 0)
3684 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better."); 3773 who->statusmsg ("You begin to feel better.");
3685 else 3774 else
3686 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3775 who->failmsg ("Eck!...that was poisonous!");
3776
3687 who->stats.hp += food->stats.hp; 3777 who->stats.hp += food->stats.hp;
3688 } 3778 }
3689 } 3779 }
3690 if (food->stats.sp != 0) 3780 if (food->stats.sp != 0)
3691 { 3781 {
3692 if (QUERY_FLAG (food, FLAG_CURSED)) 3782 if (QUERY_FLAG (food, FLAG_CURSED))
3693 { 3783 {
3694 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!"); 3784 who->failmsg ("You are drained of mana!");
3695 who->stats.sp -= food->stats.sp; 3785 who->stats.sp -= food->stats.sp;
3696 if (who->stats.sp < 0) 3786 if (who->stats.sp < 0)
3697 who->stats.sp = 0; 3787 who->stats.sp = 0;
3698 } 3788 }
3699 else 3789 else
3700 { 3790 {
3701 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3791 who->statusmsg ("You feel a rush of magical energy!");
3702 who->stats.sp += food->stats.sp; 3792 who->stats.sp += food->stats.sp;
3703 /* place limit on max sp from food? */ 3793 /* place limit on max sp from food? */
3704 } 3794 }
3705 } 3795 }
3796
3706 who->update_stats (); 3797 who->update_stats ();
3707} 3798}
3708 3799
3709/** 3800/**
3710 * Designed primarily to light torches/lanterns/etc. 3801 * Designed primarily to light torches/lanterns/etc.
… …
3737 } 3828 }
3738 else 3829 else
3739 lighter->stats.food--; 3830 lighter->stats.food--;
3740 } 3831 }
3741 else if (lighter->last_eat) 3832 else if (lighter->last_eat)
3833 {
3742 { /* no charges left in lighter */ 3834 /* no charges left in lighter */
3743 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3835 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3744 return; 3836 return;
3745 } 3837 }
3746 3838
3747 /* Perhaps we should split what we are trying to light on fire? 3839 /* Perhaps we should split what we are trying to light on fire?
3748 * I can't see many times when you would want to light multiple 3840 * I can't see many times when you would want to light multiple
… …
3754 3846
3755 save_throw_object (item, AT_FIRE, who); 3847 save_throw_object (item, AT_FIRE, who);
3756 3848
3757 if (item->destroyed ()) 3849 if (item->destroyed ())
3758 { 3850 {
3759 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name); 3851 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3760 /* Need to update the player so that the players glow radius 3852 /* Need to update the player so that the players glow radius
3761 * gets changed. 3853 * gets changed.
3762 */ 3854 */
3763 if (is_player_env) 3855 if (is_player_env)
3764 who->update_stats (); 3856 who->update_stats ();
3765 } 3857 }
3766 else 3858 else
3767 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3859 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3768 } 3860 }
3769 else /* nothing to light */ 3861 else
3770 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object."); 3862 who->failmsg ("You need to mark a lightable object.");
3771
3772} 3863}
3773 3864
3774/** 3865/**
3775 * op made some mistake with a scroll, this takes care of punishment. 3866 * op made some mistake with a scroll, this takes care of punishment.
3776 * scroll_failure()- hacked directly from spell_failure 3867 * scroll_failure()- hacked directly from spell_failure
… …
3783 3874
3784 if (failure <= -1 && failure > -15) 3875 if (failure <= -1 && failure > -15)
3785 { /* wonder */ 3876 { /* wonder */
3786 object *tmp; 3877 object *tmp;
3787 3878
3788 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3879 op->failmsg ("Your spell warps!");
3789 tmp = get_archetype (SPELL_WONDER); 3880 tmp = get_archetype (SPELL_WONDER);
3790 cast_wonder (op, op, 0, tmp); 3881 cast_wonder (op, op, 0, tmp);
3791 tmp->destroy (); 3882 tmp->destroy ();
3792 } 3883 }
3793 else if (failure <= -15 && failure > -35) 3884 else if (failure <= -15 && failure > -35)
3794 { /* drain mana */ 3885 { /* drain mana */
3795 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3886 op->failmsg ("Your mana is drained!");
3796 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3887 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3797 if (op->stats.sp < 0) 3888 if (op->stats.sp < 0)
3798 op->stats.sp = 0; 3889 op->stats.sp = 0;
3799 } 3890 }
3800 else if (settings.spell_failure_effects == TRUE) 3891 else if (settings.spell_failure_effects == TRUE)
3801 { 3892 {
3802 if (failure <= -35 && failure > -60) 3893 if (failure <= -35 && failure > -60)
3803 { /* confusion */ 3894 { /* confusion */
3804 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3895 op->failmsg ("The magic recoils on you!");
3805 confuse_player (op, op, power); 3896 confuse_player (op, op, power);
3806 } 3897 }
3807 else if (failure <= -60 && failure > -70) 3898 else if (failure <= -60 && failure > -70)
3808 { /* paralysis */ 3899 { /* paralysis */
3809 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!"); 3900 op->failmsg ("The magic recoils and paralyzes you!");
3810 paralyze_player (op, op, power); 3901 paralyze_player (op, op, power);
3811 } 3902 }
3812 else if (failure <= -70 && failure > -80) 3903 else if (failure <= -70 && failure > -80)
3813 { /* blind */ 3904 { /* blind */
3814 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3905 op->failmsg ("The magic recoils on you!");
3815 blind_player (op, op, power); 3906 blind_player (op, op, power);
3816 } 3907 }
3817 else if (failure <= -80) 3908 else if (failure <= -80)
3818 { /* blast the immediate area */ 3909 { /* blast the immediate area */
3819 object *tmp = get_archetype (LOOSE_MANA); 3910 object *tmp = get_archetype (LOOSE_MANA);
3820 cast_magic_storm (op, tmp, power); 3911 cast_magic_storm (op, tmp, power);
3821 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!"); 3912 op->failmsg ("You unleash uncontrolled mana!");
3822 tmp->destroy (); 3913 tmp->destroy ();
3823 } 3914 }
3824 } 3915 }
3825} 3916}
3826 3917
… …
3846 */ 3937 */
3847 int i, j; 3938 int i, j;
3848 3939
3849 for (i = 0; i < NUM_STATS; i++) 3940 for (i = 0; i < NUM_STATS; i++)
3850 { 3941 {
3851 int race_bonus = pl->arch->clone.stats.stat (i); 3942 int race_bonus = pl->arch->stats.stat (i);
3852 sint8 stat = stats->stat (i) + ns->stat (i); 3943 sint8 stat = stats->stat (i) + ns->stat (i);
3853 3944
3854 if (stat > 20 + race_bonus) 3945 if (stat > 20 + race_bonus)
3855 { 3946 {
3856 excess_stat++; 3947 excess_stat++;
… …
3866 3957
3867 if (i == CHA) 3958 if (i == CHA)
3868 continue; /* exclude cha from this */ 3959 continue; /* exclude cha from this */
3869 3960
3870 int stat = stats->stat (i); 3961 int stat = stats->stat (i);
3871 int race_bonus = pl->arch->clone.stats.stat (i); 3962 int race_bonus = pl->arch->stats.stat (i);
3872 if (stat < 20 + race_bonus) 3963 if (stat < 20 + race_bonus)
3873 { 3964 {
3874 change_attr_value (stats, i, 1); 3965 change_attr_value (stats, i, 1);
3875 excess_stat--; 3966 excess_stat--;
3876 } 3967 }
… …
3933 char got[MAX_BUF]; 4024 char got[MAX_BUF];
3934 int len; 4025 int len;
3935 4026
3936 if (!pl || !transformer) 4027 if (!pl || !transformer)
3937 return; 4028 return;
4029
3938 marked = find_marked_object (pl); 4030 marked = find_marked_object (pl);
4031
3939 if (!marked) 4032 if (!marked)
3940 { 4033 {
3941 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 4034 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
3942 return; 4035 return;
3943 } 4036 }
4037
3944 if (!marked->slaying) 4038 if (!marked->slaying)
3945 { 4039 {
3946 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4040 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3947 return; 4041 return;
3948 } 4042 }
4043
3949 /* check whether they are compatible or not */ 4044 /* check whether they are compatible or not */
3950 find = strstr (marked->slaying, transformer->arch->name); 4045 find = strstr (marked->slaying, transformer->arch->archname);
3951 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 4046 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3952 { 4047 {
3953 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4048 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3954 return; 4049 return;
3955 } 4050 }
4051
3956 find += strlen (transformer->arch->name) + 1; 4052 find += strlen (transformer->arch->archname) + 1;
3957 /* Item can be used, now find how many and what it yields */ 4053 /* Item can be used, now find how many and what it yields */
3958 if (isdigit (*(find))) 4054 if (isdigit (*(find)))
3959 { 4055 {
3960 yield = atoi (find); 4056 yield = atoi (find);
3961 if (yield < 1) 4057 if (yield < 1)
… …
3967 else 4063 else
3968 yield = 1; 4064 yield = 1;
3969 4065
3970 while (isdigit (*find)) 4066 while (isdigit (*find))
3971 find++; 4067 find++;
4068
3972 while (*find == ' ') 4069 while (*find == ' ')
3973 find++; 4070 find++;
4071
3974 memset (got, 0, MAX_BUF); 4072 memset (got, 0, MAX_BUF);
4073
3975 if ((separator = strchr (find, ';')) != NULL) 4074 if ((separator = strchr (find, ';')) != NULL)
3976 {
3977 len = separator - find; 4075 len = separator - find;
3978 }
3979 else 4076 else
3980 {
3981 len = strlen (find); 4077 len = strlen (find);
3982 } 4078
3983 if (len > MAX_BUF - 1) 4079 if (len > MAX_BUF - 1)
3984 len = MAX_BUF - 1; 4080 len = MAX_BUF - 1;
4081
3985 strcpy (got, find); 4082 strcpy (got, find);
3986 got[len] = '\0'; 4083 got[len] = '\0';
3987 4084
3988 /* Now create new item, remove used ones when required. */ 4085 /* Now create new item, remove used ones when required. */
3989 new_item = get_archetype (got); 4086 new_item = get_archetype (got);
3990 if (!new_item) 4087 if (!new_item)
3991 { 4088 {
3992 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0)); 4089 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
3993 return; 4090 return;
3994 } 4091 }
3995 4092
3996 new_item->nrof = yield; 4093 new_item->nrof = yield;
4094
3997 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4095 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4096
3998 insert_ob_in_ob (new_item, pl); 4097 insert_ob_in_ob (new_item, pl);
3999 esrv_send_inventory (pl, pl); 4098 esrv_send_inventory (pl, pl);
4000 /* Eat up one item */ 4099 /* Eat up one item */
4001 decrease_ob_nr (marked, 1); 4100 marked->decrease ();
4101
4002 /* Eat one transformer if needed */ 4102 /* Eat one transformer if needed */
4003 if (transformer->stats.food) 4103 if (transformer->stats.food)
4004 if (--transformer->stats.food == 0) 4104 if (--transformer->stats.food == 0)
4005 decrease_ob_nr (transformer, 1); 4105 transformer->decrease ();
4006} 4106}
4107

Diff Legend

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