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.114 by root, Tue Jul 10 06:44:31 2007 UTC vs.
Revision 1.178 by root, Sun Dec 28 15:28:47 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * 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>
22 */ 22 */
23 23
24#include <cmath> 24#include <cmath>
25 25
26#include <global.h> 26#include <global.h>
… …
53 * subtype 5: arch or race 53 * subtype 5: arch or race
54 * subtype 7: all three 54 * subtype 7: all three
55 */ 55 */
56 if (op->subtype) 56 if (op->subtype)
57 { 57 {
58 arch_flag = (op->subtype & 1); 58 arch_flag = op->subtype & 1;
59 name_flag = (op->subtype & 2); 59 name_flag = op->subtype & 2;
60 race_flag = (op->subtype & 4); 60 race_flag = op->subtype & 4;
61 } 61 }
62 else 62 else
63 { 63 {
64 arch_flag = 1; 64 arch_flag = 1;
65 name_flag = 1; 65 name_flag = 1;
… …
92 * Return value: 1 if money was destroyed, 0 if not. 92 * Return value: 1 if money was destroyed, 0 if not.
93 */ 93 */
94static int 94static int
95apply_id_altar (object *money, object *altar, object *pl) 95apply_id_altar (object *money, object *altar, object *pl)
96{ 96{
97 object *id, *marked; 97 dynbuf_text buf;
98 int success = 0;
99 98
100 if (pl == NULL || pl->type != PLAYER) 99 if (!pl || pl->type != PLAYER)
101 return 0; 100 return 0;
102 101
103 /* 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
104 * identifying' from being printed out more than it needs to be. 103 * identifying' from being printed out more than it needs to be.
105 */ 104 */
106 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 105 if (!check_altar_sacrifice (altar, money) || money->type != MONEY)
107 return 0; 106 return 0;
108 107
109 marked = find_marked_object (pl);
110 /* 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
111 * identified. IF it doesn't, then go through the player inventory. 109 * identified. If it doesn't, then go through the player inventory.
112 */ 110 */
111 if (object *marked = find_marked_object (pl))
113 if (marked && !QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 112 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
114 { 113 {
115 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
116 { 115 {
117 identify (marked); 116 identify (marked);
118 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (marked, pl)); 117
118 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 119 if (marked->msg)
120 { 120 buf << "The item has a story:\r" << marked->msg << "\n\n";
121 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 121
122 new_draw_info (NDI_UNIQUE, 0, pl, marked->msg); 122 return !money;
123 } 123 }
124 return money == NULL;
125 } 124 }
126 }
127 125
128 for (id = pl->inv; id; id = id->below) 126 for (object *id = pl->inv; id; id = id->below)
129 { 127 {
130 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 128 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
131 { 129 {
132 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
133 { 131 {
134 identify (id); 132 identify (id);
135 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (id, pl)); 133
134 buf.printf ("You have %s.\r", long_desc (id, pl));
136 if (id->msg) 135 if (id->msg)
137 { 136 buf << "The item has a story:\r" << id->msg << "\n\n";
138 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 137
139 new_draw_info (NDI_UNIQUE, 0, pl, id->msg);
140 }
141 success = 1;
142 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
143 if (money == NULL || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
144 break; 140 break;
145 } 141 }
146 else 142 else
147 { 143 {
148 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");
149 break; 145 break;
150 } 146 }
151 } 147 }
152 } 148 }
153 if (!success) 149
154 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
155 return money == NULL; 155 return !money;
156} 156}
157 157
158/** 158/**
159 * 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
160 * matching item. 160 * matching item.
161 **/ 161 **/
162static void 162void
163handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
164{ 164{
165 const char *yield; 165 if (shstr yield = tmp->kv (shstr_on_use_yield))
166 166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167 yield = get_ob_key_value (tmp, "on_use_yield");
168 if (yield != NULL)
169 {
170 object *drop = get_archetype (yield);
171
172 if (tmp->env)
173 {
174 drop = insert_ob_in_ob (drop, tmp->env);
175 if (tmp->env->type == PLAYER)
176 esrv_send_item (tmp->env, drop);
177 }
178 else
179 {
180 drop->x = tmp->x;
181 drop->y = tmp->y;
182 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
183 }
184 }
185} 167}
186 168
187/** 169/**
188 * Handles applying a potion. 170 * Handles applying a potion.
189 */ 171 */
… …
195 177
196 floor = GET_MAP_OB (op->map, op->x, op->y); 178 floor = GET_MAP_OB (op->map, op->x, op->y);
197 179
198 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 180 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
199 { 181 {
200 if (op->type == PLAYER)
201 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 182 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
183
202 CLEAR_FLAG (tmp, FLAG_APPLIED); 184 CLEAR_FLAG (tmp, FLAG_APPLIED);
203 return 0; 185 return 0;
204 } 186 }
205 187
206 if (op->type == PLAYER) 188 if (op->type == PLAYER)
… …
217 199
218 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 200 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
219 { 201 {
220 op->drain_stat (); 202 op->drain_stat ();
221 op->update_stats (); 203 op->update_stats ();
222 decrease_ob (tmp); 204 tmp->decrease ();
223 return 1; 205 return 1;
224 } 206 }
225 207
226 if (!(at = archetype::find (ARCH_DEPLETION))) 208 if (!(at = archetype::find (ARCH_DEPLETION)))
227 { 209 {
228 LOG (llevError, "Could not find archetype depletion\n"); 210 LOG (llevError, "Could not find archetype depletion\n");
229 return 0; 211 return 0;
230 } 212 }
213
231 depl = present_arch_in_ob (at, op); 214 depl = present_arch_in_ob (at, op);
232 215
233 if (depl) 216 if (depl)
234 { 217 {
235 for (i = 0; i < NUM_STATS; i++) 218 for (i = 0; i < NUM_STATS; i++)
236 if (depl->stats.stat (i)) 219 if (depl->stats.stat (i))
237 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 220 op->statusmsg (restore_msg[i]);
238 221
239 depl->destroy (); 222 depl->destroy ();
240 op->update_stats (); 223 op->update_stats ();
241 } 224 }
242 else 225 else
243 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 226 op->statusmsg ("Your potion had no effect.");
244 227
245 decrease_ob (tmp); 228 tmp->decrease ();
246 return 1; 229 return 1;
247 } 230 }
248 231
249 /* improvement potion - only for players */ 232 /* improvement potion - only for players */
250 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 233 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
251 { 234 {
252 for (i = 1; i < MIN (11, op->level); i++) 235 for (i = 1; i < MIN (11, op->level); i++)
253 { 236 {
254 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 237 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
255 { 238 {
256 if (op->contr->levhp[i] != 1) 239 if (op->contr->levhp[i] != 1)
257 { 240 {
258 op->contr->levhp[i] = 1; 241 op->contr->levhp[i] = 1;
259 break; 242 break;
260 } 243 }
244
261 if (op->contr->levsp[i] != 1) 245 if (op->contr->levsp[i] != 1)
262 { 246 {
263 op->contr->levsp[i] = 1; 247 op->contr->levsp[i] = 1;
264 break; 248 break;
265 } 249 }
250
266 if (op->contr->levgrace[i] != 1) 251 if (op->contr->levgrace[i] != 1)
267 { 252 {
268 op->contr->levgrace[i] = 1; 253 op->contr->levgrace[i] = 1;
269 break; 254 break;
270 } 255 }
… …
274 if (op->contr->levhp[i] < 9) 259 if (op->contr->levhp[i] < 9)
275 { 260 {
276 op->contr->levhp[i] = 9; 261 op->contr->levhp[i] = 9;
277 break; 262 break;
278 } 263 }
264
279 if (op->contr->levsp[i] < 6) 265 if (op->contr->levsp[i] < 6)
280 { 266 {
281 op->contr->levsp[i] = 6; 267 op->contr->levsp[i] = 6;
282 break; 268 break;
283 } 269 }
270
284 if (op->contr->levgrace[i] < 3) 271 if (op->contr->levgrace[i] < 3)
285 { 272 {
286 op->contr->levgrace[i] = 3; 273 op->contr->levgrace[i] = 3;
287 break; 274 break;
288 } 275 }
… …
296 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 283 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
297 { 284 {
298 if (got_one) 285 if (got_one)
299 { 286 {
300 op->update_stats (); 287 op->update_stats ();
301 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 288 op->statusmsg ("The Gods smile upon you and remake you "
302 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 289 "a little more in their image. "
303 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 290 "You feel a little more perfect.", NDI_GREEN);
304 } 291 }
305 else 292 else
306 new_draw_info (NDI_UNIQUE, 0, op, "The potion had no effect - you are already perfect"); 293 op->statusmsg ("The potion had no effect - you are already perfect.");
307 } 294 }
308 else 295 else
309 { /* cursed potion */ 296 { /* cursed potion */
310 if (got_one) 297 if (got_one)
311 { 298 {
312 op->update_stats (); 299 op->update_stats ();
313 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 300 op->failmsg ("The Gods are angry and punish you.");
314 } 301 }
315 else 302 else
316 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 303 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
317 } 304 }
318 305
319 decrease_ob (tmp); 306 tmp->decrease ();
320 return 1; 307 return 1;
321 } 308 }
322 309
323 310
324 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 311 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
330 { 317 {
331 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
332 { 319 {
333 object *fball; 320 object *fball;
334 321
335 new_draw_info (NDI_UNIQUE, 0, op, "Yech! Your lungs are on fire!"); 322 op->failmsg ("Yech! Your lungs are on fire!");
323
336 /* Explodes a fireball centered at player */ 324 /* Explodes a fireball centered at player */
337 fball = get_archetype (EXPLODING_FIREBALL); 325 fball = get_archetype (EXPLODING_FIREBALL);
338 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1; 326 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
339 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2; 327 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
340 fball->x = op->x; 328 fball->x = op->x;
… …
342 insert_ob_in_map (fball, op->map, NULL, 0); 330 insert_ob_in_map (fball, op->map, NULL, 0);
343 } 331 }
344 else 332 else
345 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 333 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
346 334
347 decrease_ob (tmp); 335 tmp->decrease ();
336
348 /* if youre dead, no point in doing this... */ 337 /* if youre dead, no point in doing this... */
349 if (!QUERY_FLAG (op, FLAG_REMOVED)) 338 if (!QUERY_FLAG (op, FLAG_REMOVED))
350 op->update_stats (); 339 op->update_stats ();
340
351 return 1; 341 return 1;
352 } 342 }
353 343
354 /* Deal with protection potions */ 344 /* Deal with protection potions */
355 force = NULL; 345 force = NULL;
… …
357 { 347 {
358 if (tmp->resist[i]) 348 if (tmp->resist[i])
359 { 349 {
360 if (!force) 350 if (!force)
361 force = get_archetype (FORCE_NAME); 351 force = get_archetype (FORCE_NAME);
352
362 memcpy (force->resist, tmp->resist, sizeof (tmp->resist)); 353 memcpy (force->resist, tmp->resist, sizeof (tmp->resist));
363 force->type = POTION_EFFECT; 354 force->type = POTION_EFFECT;
364 break; /* Only need to find one protection since we copy entire batch */ 355 break; /* Only need to find one protection since we copy entire batch */
365 } 356 }
366 } 357 }
358
367 /* This is a protection potion */ 359 /* This is a protection potion */
368 if (force) 360 if (force)
369 { 361 {
370 /* cursed items last longer */ 362 /* cursed items last longer */
371 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 363 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
… …
379 force->speed_left = -1; 371 force->speed_left = -1;
380 force = insert_ob_in_ob (force, op); 372 force = insert_ob_in_ob (force, op);
381 CLEAR_FLAG (tmp, FLAG_APPLIED); 373 CLEAR_FLAG (tmp, FLAG_APPLIED);
382 SET_FLAG (force, FLAG_APPLIED); 374 SET_FLAG (force, FLAG_APPLIED);
383 change_abil (op, force); 375 change_abil (op, force);
384 decrease_ob (tmp); 376 tmp->decrease ();
385 return 1; 377 return 1;
386 } 378 }
387 379
388 /* Only thing left are the stat potions */ 380 /* Only thing left are the stat potions */
389 if (op->type == PLAYER) 381 if (op->type == PLAYER)
390 { /* only for players */ 382 { /* only for players */
391 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 383 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0)
392 CLEAR_FLAG (tmp, FLAG_APPLIED); 384 CLEAR_FLAG (tmp, FLAG_APPLIED);
393 else 385 else
394 SET_FLAG (tmp, FLAG_APPLIED); 386 SET_FLAG (tmp, FLAG_APPLIED);
387
395 if (!change_abil (op, tmp)) 388 if (!change_abil (op, tmp))
396 new_draw_info (NDI_UNIQUE, 0, op, "Nothing happened."); 389 op->statusmsg ("Nothing happened.");
397 } 390 }
398 391
399 /* CLEAR_FLAG is so that if the character has other potions 392 /* CLEAR_FLAG is so that if the character has other potions
400 * that were grouped with the one consumed, his 393 * that were grouped with the one consumed, his
401 * stat will not be raised by them. fix_player just clears 394 * stat will not be raised by them. fix_player just clears
402 * up all the stats. 395 * up all the stats.
403 */ 396 */
404 CLEAR_FLAG (tmp, FLAG_APPLIED); 397 CLEAR_FLAG (tmp, FLAG_APPLIED);
405 op->update_stats (); 398 op->update_stats ();
406 decrease_ob (tmp); 399 tmp->decrease ();
407 return 1; 400 return 1;
408} 401}
409 402
410/**************************************************************************** 403/****************************************************************************
411 * Weapon improvement code follows 404 * Weapon improvement code follows
… …
417static int 410static int
418check_item (object *op, const char *item) 411check_item (object *op, const char *item)
419{ 412{
420 int count = 0; 413 int count = 0;
421 414
422 415 if (!item)
423 if (item == NULL)
424 return 0; 416 return 0;
425 417
426 op = op->below; 418 for (op = op->below; op; op = op->below)
427 while (op != NULL)
428 { 419 {
429 if (strcmp (op->arch->archname, item) == 0) 420 if (strcmp (op->arch->archname, item) == 0)
430 { 421 {
431 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 422 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
432 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 423 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
… …
435 count++; 426 count++;
436 else 427 else
437 count += op->nrof; 428 count += op->nrof;
438 } 429 }
439 } 430 }
440
441 op = op->below;
442 } 431 }
443 432
444 return count; 433 return count;
445} 434}
446 435
… …
456 object *prev; 445 object *prev;
457 446
458 prev = op; 447 prev = op;
459 op = op->below; 448 op = op->below;
460 449
461 while (op != NULL) 450 while (op)
462 { 451 {
463 if (strcmp (op->arch->archname, item) == 0) 452 if (strcmp (op->arch->archname, item) == 0)
464 { 453 {
465 if (op->nrof >= nrof) 454 if (op->nrof >= nrof)
466 { 455 {
467 decrease_ob_nr (op, nrof); 456 op->decrease (nrof);
468 return; 457 return;
469 } 458 }
470 else 459 else
471 { 460 {
472 decrease_ob_nr (op, op->nrof); 461 op->decrease (nrof);
473 nrof -= op->nrof; 462 nrof -= op->nrof;
474 } 463 }
464
475 op = prev; 465 op = prev;
476 } 466 }
467
477 prev = op; 468 prev = op;
478 op = op->below; 469 op = op->below;
479 } 470 }
480} 471}
481 472
… …
487 * we return 1 (true) if the player can use the weapon. 478 * we return 1 (true) if the player can use the weapon.
488 */ 479 */
489static int 480static int
490check_weapon_power (const object *who, int improvs) 481check_weapon_power (const object *who, int improvs)
491{ 482{
492
493/* Old code is below (commented out). Basically, since weapons are the only 483/* Old code is below (commented out). Basically, since weapons are the only
494 * object players really have any control to improve, it's a bit harsh to 484 * object players really have any control to improve, it's a bit harsh to
495 * require high level in some combat skill, so we just use overall level. 485 * require high level in some combat skill, so we just use overall level.
496 */ 486 */
497#if 1 487#if 1
… …
538static int 528static int
539check_sacrifice (object *op, const object *improver) 529check_sacrifice (object *op, const object *improver)
540{ 530{
541 int count = 0; 531 int count = 0;
542 532
543 if (improver->slaying != NULL) 533 if (improver->slaying)
544 { 534 {
545 count = check_item (op, improver->slaying); 535 count = check_item (op, improver->slaying);
546 if (count < 1) 536 if (count < 1)
547 { 537 {
548 char buf[200];
549
550 sprintf (buf, "The gods want more %ss", &improver->slaying); 538 op->failmsg (format ("The gods want more %ss", &improver->slaying));
551 new_draw_info (NDI_UNIQUE, 0, op, buf);
552 return 0; 539 return 0;
553 } 540 }
554 } 541 }
555 else 542 else
556 count = 1; 543 count = 1;
… …
559} 546}
560 547
561/** 548/**
562 * Actually improves the weapon, and tells user. 549 * Actually improves the weapon, and tells user.
563 */ 550 */
564int 551static int
565improve_weapon_stat (object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname) 552improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
566{ 553{
567
568 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
569 *stat += sacrifice_count; 554 stat += sacrifice_count;
570 weapon->last_eat++; 555 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 556 improver->decrease ();
572 decrease_ob (improver);
573 557
574 /* So it updates the players stats and the window */ 558 /* So it updates the players stats and the window */
575 op->update_stats (); 559 op->update_stats ();
560
561 op->statusmsg (format (
562 "Your sacrifice was accepted.\n"
563 "Weapon's bonus to %s improved by %d.",
564 statname, sacrifice_count
565 ));
566
576 return 1; 567 return 1;
577} 568}
578 569
579/* Types of improvements, hidden in the sp field. */ 570/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 571#define IMPROVE_PREPARE 1
… …
591 582
592/** 583/**
593 * This does the prepare weapon scroll. 584 * This does the prepare weapon scroll.
594 * Checks for sacrifice, and so on. 585 * Checks for sacrifice, and so on.
595 */ 586 */
596
597int 587int
598prepare_weapon (object *op, object *improver, object *weapon) 588prepare_weapon (object *op, object *improver, object *weapon)
599{ 589{
600 int sacrifice_count, i; 590 int sacrifice_count, i;
601 char buf[MAX_BUF]; 591 char buf[MAX_BUF];
602 592
603 if (weapon->level != 0) 593 if (weapon->level != 0)
604 { 594 {
605 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 595 op->failmsg ("Weapon is already prepared!");
606 return 0; 596 return 0;
607 } 597 }
598
608 for (i = 0; i < NROFATTACKS; i++) 599 for (i = 0; i < NROFATTACKS; i++)
609 if (weapon->resist[i]) 600 if (weapon->resist[i])
610 break; 601 break;
611 602
612 /* If we break out, i will be less than nrofattacks, preventing 603 /* If we break out, i will be less than nrofattacks, preventing
… …
615 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 606 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
616 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 607 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
617 weapon->stats.exp || /* speed */ 608 weapon->stats.exp || /* speed */
618 weapon->stats.ac) /* AC - only taifu's I think */ 609 weapon->stats.ac) /* AC - only taifu's I think */
619 { 610 {
620 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 611 op->failmsg ("You cannot prepare magic weapons. "
612 "H<A weapon is considered magical if it changes regeneration, "
613 "speed or ac, or has other protections.>");
621 return 0; 614 return 0;
622 } 615 }
616
623 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
624 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
625 return 0; 619 return 0;
620
626 weapon->level = isqrt (sacrifice_count); 621 weapon->level = isqrt (sacrifice_count);
627 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
628 eat_item (op, improver->slaying, sacrifice_count); 622 eat_item (op, improver->slaying, sacrifice_count);
629 623
630 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level); 624 op->statusmsg (format (
625 "Your sacrifice was accepted."
626 "Your *%s may be improved %d times.",
627 &weapon->name, weapon->level
628 ));
631 629
632 sprintf (buf, "%s's %s", &op->name, &weapon->name); 630 sprintf (buf, "%s's %s", &op->name, &weapon->name);
633 weapon->name = weapon->name_pl = buf; 631 weapon->name = weapon->name_pl = buf;
634 weapon->nrof = 0; /* prevents preparing n weapons in the same 632 weapon->nrof = 0; /* prevents preparing n weapons in the same
635 slot at once! */ 633 slot at once! */
636 decrease_ob (improver); 634 improver->decrease ();
637 weapon->last_eat = 0; 635 weapon->last_eat = 0;
638 return 1; 636 return 1;
639} 637}
640
641 638
642/** 639/**
643 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 640 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
644 * This is the new improve weapon code. 641 * This is the new improve weapon code.
645 * Returns 0 if it was not able to work for some reason. 642 * Returns 0 if it was not able to work for some reason.
… …
654improve_weapon (object *op, object *improver, object *weapon) 651improve_weapon (object *op, object *improver, object *weapon)
655{ 652{
656 int sacrifice_count, sacrifice_needed = 0; 653 int sacrifice_count, sacrifice_needed = 0;
657 654
658 if (improver->stats.sp == IMPROVE_PREPARE) 655 if (improver->stats.sp == IMPROVE_PREPARE)
659 {
660 return prepare_weapon (op, improver, weapon); 656 return prepare_weapon (op, improver, weapon);
661 } 657
662 if (weapon->level == 0) 658 if (weapon->level == 0)
663 { 659 {
664 new_draw_info (NDI_UNIQUE, 0, op, "This weapon has not been prepared."); 660 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");
665 return 0; 661 return 0;
666 } 662 }
663
667 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 664 if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
668 { 665 {
669 new_draw_info (NDI_UNIQUE, 0, op, "This weapon cannot be improved any more."); 666 op->failmsg ("This weapon cannot be improved any more.");
670 return 0; 667 return 0;
671 } 668 }
669
672 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 670 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))
673 { 671 {
674 new_draw_info (NDI_UNIQUE, 0, op, "Improving the weapon will make it too"); 672 op->failmsg ("Improving the weapon will make it too "
675 new_draw_info (NDI_UNIQUE, 0, op, "powerful for you to use. Unready it if you"); 673 "powerful for you to use. Unready it if you "
676 new_draw_info (NDI_UNIQUE, 0, op, "really want to improve it."); 674 "really want to improve it.");
677 return 0; 675 return 0;
678 } 676 }
677
679 /* This just increases damage by 5 points, no matter what. No sacrifice 678 /* This just increases damage by 5 points, no matter what. No sacrifice
680 * is needed. Since stats.dam is now a 16 bit value and not 8 bit, 679 * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
681 * don't put any maximum value on damage - the limit is how much the 680 * don't put any maximum value on damage - the limit is how much the
682 * weapon can be improved. 681 * weapon can be improved.
683 */ 682 */
684 if (improver->stats.sp == IMPROVE_DAMAGE) 683 if (improver->stats.sp == IMPROVE_DAMAGE)
685 { 684 {
686 weapon->stats.dam += 5; 685 weapon->stats.dam += 5;
687 weapon->weight += 5000; /* 5 KG's */ 686 weapon->weight += 5000; /* 5 KG's */
688 new_draw_info_format (NDI_UNIQUE, 0, op, "Damage has been increased by 5 to %d", weapon->stats.dam); 687 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
689 weapon->last_eat++; 688 weapon->last_eat++;
690 689
691 weapon->item_power++; 690 weapon->item_power++;
692 decrease_ob (improver); 691 improver->decrease ();
693 return 1; 692 return 1;
694 } 693 }
694
695 if (improver->stats.sp == IMPROVE_WEIGHT) 695 if (improver->stats.sp == IMPROVE_WEIGHT)
696 { 696 {
697 /* Reduce weight by 20% */ 697 /* Reduce weight by 20% */
698 weapon->weight = (weapon->weight * 8) / 10; 698 weapon->weight = (weapon->weight * 8) / 10;
699 if (weapon->weight < 1) 699 if (weapon->weight < 1)
700 weapon->weight = 1; 700 weapon->weight = 1;
701
701 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon weight reduced to %6.1f kg", (float) weapon->weight / 1000.0); 702 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
702 weapon->last_eat++; 703 weapon->last_eat++;
703 weapon->item_power++; 704 weapon->item_power++;
704 decrease_ob (improver); 705 improver->decrease ();
705 return 1; 706 return 1;
706 } 707 }
708
707 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
708 { 710 {
709 weapon->magic++; 711 weapon->magic++;
710 weapon->last_eat++; 712 weapon->last_eat++;
711 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon magic increased to %d", weapon->magic); 713 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
712 decrease_ob (improver); 714 improver->decrease ();
713 weapon->item_power++; 715 weapon->item_power++;
714 return 1; 716 return 1;
715 } 717 }
716 718
717 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
722 sacrifice_needed *= 2; 724 sacrifice_needed *= 2;
723 725
724 sacrifice_count = check_sacrifice (op, improver); 726 sacrifice_count = check_sacrifice (op, improver);
725 if (sacrifice_count < sacrifice_needed) 727 if (sacrifice_count < sacrifice_needed)
726 { 728 {
727 new_draw_info_format (NDI_UNIQUE, 0, op, "You need at least %d %s", sacrifice_needed, &improver->slaying); 729 op->failmsg (format ("You need at least %d %s.", sacrifice_needed, &improver->slaying));
728 return 0; 730 return 0;
729 } 731 }
732
730 eat_item (op, improver->slaying, sacrifice_needed); 733 eat_item (op, improver->slaying, sacrifice_needed);
731 weapon->item_power++; 734 weapon->item_power++;
732 735
733 switch (improver->stats.sp) 736 switch (improver->stats.sp)
734 { 737 {
735 case IMPROVE_STR:
736 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Str), 1, "strength"); 738 case IMPROVE_STR: return improve_weapon_stat (op, improver, weapon, weapon->stats.Str, 1, "strength");
737 case IMPROVE_DEX:
738 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Dex), 1, "dexterity"); 739 case IMPROVE_DEX: return improve_weapon_stat (op, improver, weapon, weapon->stats.Dex, 1, "dexterity");
739 case IMPROVE_CON:
740 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Con), 1, "constitution"); 740 case IMPROVE_CON: return improve_weapon_stat (op, improver, weapon, weapon->stats.Con, 1, "constitution");
741 case IMPROVE_WIS:
742 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Wis), 1, "wisdom"); 741 case IMPROVE_WIS: return improve_weapon_stat (op, improver, weapon, weapon->stats.Wis, 1, "wisdom");
743 case IMPROVE_CHA:
744 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Cha), 1, "charisma"); 742 case IMPROVE_CHA: return improve_weapon_stat (op, improver, weapon, weapon->stats.Cha, 1, "charisma");
745 case IMPROVE_INT:
746 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Int), 1, "intelligence"); 743 case IMPROVE_INT: return improve_weapon_stat (op, improver, weapon, weapon->stats.Int, 1, "intelligence");
747 case IMPROVE_POW:
748 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Pow), 1, "power"); 744 case IMPROVE_POW: return improve_weapon_stat (op, improver, weapon, weapon->stats.Pow, 1, "power");
749 default: 745 default:
750 new_draw_info (NDI_UNIQUE, 0, op, "Unknown improvement type."); 746 op->failmsg ("Unknown improvement type.");
751 } 747 }
748
752 LOG (llevError, "improve_weapon: Got to end of function\n"); 749 LOG (llevError, "improve_weapon: Got to end of function\n");
753 return 0; 750 return 0;
754} 751}
755 752
756/** 753/**
… …
766 if (op->type != PLAYER) 763 if (op->type != PLAYER)
767 return 0; 764 return 0;
768 765
769 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 766 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
770 { 767 {
771 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 768 op->failmsg ("Something blocks the magic of the scroll!");
772 return 0; 769 return 0;
773 } 770 }
774 771
775 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
776 if (!otmp) 774 if (!otmp)
777 { 775 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 776 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
779 return 0; 777 return 0;
780 } 778 }
781 779
782 if (otmp->type != WEAPON && otmp->type != BOW) 780 if (otmp->type != WEAPON && otmp->type != BOW)
783 { 781 {
784 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 782 op->failmsg ("Marked item is not a weapon or bow!");
785 return 0; 783 return 0;
786 } 784 }
787 785
788 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 786 op->statusmsg ("Applied weapon builder.");
787
789 improve_weapon (op, tmp, otmp); 788 improve_weapon (op, tmp, otmp);
790 esrv_send_item (op, otmp); 789 esrv_send_item (op, otmp);
791 return 1; 790 return 1;
792} 791}
793 792
… …
818{ 817{
819 object *tmp; 818 object *tmp;
820 819
821 if (armour->magic >= settings.armor_max_enchant) 820 if (armour->magic >= settings.armor_max_enchant)
822 { 821 {
823 new_draw_info (NDI_UNIQUE, 0, op, "This armour can not be enchanted any further."); 822 op->failmsg ("This armour can not be enchanted any further!");
824 return 0; 823 return 0;
825 } 824 }
825
826 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 826 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
827 * etc), so take the easy way out and don't worry about it. 827 * etc), so take the easy way out and don't worry about it.
828 * Note - maybe add scrolls which make the random artifact versions (eg, armour 828 * Note - maybe add scrolls which make the random artifact versions (eg, armour
829 * of gnarg and what not?) 829 * of gnarg and what not?)
830 */ 830 */
831 if (armour->title) 831 if (armour->title)
832 { 832 {
833 new_draw_info (NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 833 op->failmsg ("This armour will not accept further enchantment.");
834 return 0; 834 return 0;
835 } 835 }
836 836
837 /* Split objects if needed. Can't insert tmp until the 837 /* Split objects if needed. Can't insert tmp until the
838 * end of this function - otherwise it will just re-merge. 838 * end of this function - otherwise it will just re-merge.
839 */ 839 */
840 if (armour->nrof > 1) 840 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
841 tmp = get_split_ob (armour, armour->nrof - 1);
842 else
843 tmp = NULL;
844 841
845 armour->magic++; 842 armour->magic++;
846 843
847 if (!settings.armor_speed_linear) 844 if (!settings.armor_speed_linear)
848 { 845 {
… …
885 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 882 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
886 883
887 if (op->type == PLAYER) 884 if (op->type == PLAYER)
888 { 885 {
889 esrv_send_item (op, armour); 886 esrv_send_item (op, armour);
887
890 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
891 op->update_stats (); 889 op->update_stats ();
892 } 890 }
893 decrease_ob (improver); 891
892 improver->decrease ();
893
894 if (tmp) 894 if (tmp)
895 { 895 op->insert (tmp);
896 insert_ob_in_ob (tmp, op); 896
897 esrv_send_item (op, tmp);
898 }
899 return 1; 897 return 1;
900} 898}
901
902 899
903/* 900/*
904 * convert_item() returns 1 if anything was converted, 0 if the item was not 901 * convert_item() returns 1 if anything was converted, 0 if the item was not
905 * what the converter wants, -1 if the converter is broken. 902 * what the converter wants, -1 if the converter is broken.
906 */ 903 *
907#define CONV_FROM(xyz) xyz->slaying
908#define CONV_TO(xyz) xyz->other_arch
909#define CONV_NR(xyz) xyz->stats.sp
910#define CONV_NEED(xyz) xyz->stats.food
911
912/* Takes one items and makes another. 904 * Takes one type of items and makes another.
913 * converter is the object that is doing the conversion. 905 * converter is the object that is doing the conversion.
914 * item is the object that triggered the converter - if it is not 906 * item is the object that triggered the converter - if it is not
915 * what the converter wants, this will not do anything. 907 * what the converter wants, this will not do anything.
916 */ 908 */
917int 909static int
918convert_item (object *item, object *converter) 910convert_item (object *item, object *converter)
919{ 911{
920 int nr = 0;
921 uint32 price_in; 912 sint64 nr, price_in;
913
914 if (item->flag [FLAG_UNPAID])
915 return 0;
916
917 shstr conv_from = converter->slaying;
918 archetype *conv_to = converter->other_arch;
919 sint64 need = converter->stats.food;
920 sint64 give = converter->stats.sp;
922 921
923 /* We make some assumptions - we assume if it takes money as it type, 922 /* We make some assumptions - we assume if it takes money as it type,
924 * it wants some amount. We don't make change (ie, if something costs 923 * it wants some amount. We don't make change (ie, if something costs
925 * 3 gp and player drops a platinum, tough luck) 924 * 3 gp and player drops a platinum, tough luck)
926 */ 925 */
927 if (!strcmp (CONV_FROM (converter), "money")) 926 if (conv_from == shstr_money)
928 { 927 {
929 int cost;
930
931 if (item->type != MONEY) 928 if (item->type != MONEY)
932 return 0; 929 return 0;
933 930
934 nr = (item->nrof * item->value) / CONV_NEED (converter); 931 nr = sint64 (item->nrof) * item->value / need;
935 if (!nr) 932 if (!nr)
936 return 0; 933 return 0;
937 cost = nr * CONV_NEED (converter) / item->value; 934
938 /* take into account rounding errors */ 935 converter->play_sound (sound_find ("shop_buy"));
939 if (nr * CONV_NEED (converter) % item->value) 936
940 cost++; 937 sint64 cost = (nr * need + item->value - 1) / item->value;
941 decrease_ob_nr (item, cost); 938
939 item->decrease (cost);
942 940
943 price_in = cost * item->value; 941 price_in = cost * item->value;
944 } 942 }
945 else 943 else
946 { 944 {
947 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 945 if (item->type == PLAYER
948 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 946 || conv_from != item->arch->archname
947 || (need && need > (uint16) item->nrof))
949 return 0; 948 return 0;
950 949
951 if (CONV_NEED (converter)) 950 converter->play_sound (sound_find ("convert_item"));
951
952 if (need)
952 { 953 {
953 nr = item->nrof / CONV_NEED (converter); 954 nr = sint64 (item->nrof) / need;
954 decrease_ob_nr (item, nr * CONV_NEED (converter)); 955 item->decrease (nr * need);
955 price_in = nr * CONV_NEED (converter) * item->value; 956 price_in = nr * need * item->value;
956 } 957 }
957 else 958 else
958 { 959 {
959 price_in = item->value; 960 price_in = item->value;
960 item->destroy (); 961 item->destroy ();
961 } 962 }
962 } 963 }
963 964
964 if (converter->inv != NULL) 965 if (converter->inv)
965 { 966 {
966 object *ob; 967 object *ob;
967 int i; 968 int i;
968 object *ob_to_copy; 969 object *ob_to_copy;
969 970
970 /* select random object from inventory to copy */ 971 /* select random object from inventory to copy */
971 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
972 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) 973 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
973 {
974 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
975 {
976 ob_to_copy = ob; 975 ob_to_copy = ob;
977 } 976
978 } 977 item = ob_to_copy->deep_clone ();
979 item = object_create_clone (ob_to_copy);
980 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
981 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
982 } 980 }
983 else 981 else
984 { 982 {
985 if (converter->other_arch == NULL) 983 if (!conv_to)
986 { 984 {
987 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
988 &converter->name, &converter->map->path, converter->x, converter->y); 986 &converter->name, &converter->map->path, converter->x, converter->y);
989 return -1; 987 return -1;
990 } 988 }
991 989
992 item = object_create_arch (converter->other_arch); 990 item = object_create_arch (conv_to);
993 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
994 } 992 }
995 993
996 if (CONV_NR (converter)) 994 if (give)
997 item->nrof = CONV_NR (converter); 995 item->nrof = give;
996
998 if (nr) 997 if (nr)
999 item->nrof *= nr; 998 item->nrof *= nr;
1000 if (is_in_shop (converter)) 999
1000 if (converter->flag [FLAG_PRECIOUS])
1001 SET_FLAG (item, FLAG_UNPAID); 1001 SET_FLAG (item, FLAG_UNPAID);
1002
1003 if (is_in_shop (converter))
1004 {
1005 // converters on shop floors don't work anymore, bug lets check for it
1006 // and report in case someone still does it.
1007 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
1008 converter->debug_desc ());
1009 SET_FLAG (item, FLAG_UNPAID);
1010 }
1002 else if (price_in < item->nrof * item->value) 1011 else if (price_in < sint64 (item->nrof) * item->value)
1003 { 1012 {
1004 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1013 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1005 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1014 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1006
1007 /** 1015 /**
1008 * elmex: we are going to let the game continue, as the mapcreator 1016 * elmex: we are going to let the game continue, as the mapcreator
1009 * probably had something in mind when doing this 1017 * hopefully had something in mind when doing this.
1010 */ 1018 */
1011 } 1019 }
1020
1021 // elmex: only identify if we need to, for example so that generated money doesn't
1022 // get an 'identified' flag so easily.
1023 if (need_identify (item))
1024 identify (item);
1025
1012 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1026 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1013 return 1; 1027 return 1;
1014} 1028}
1015 1029
1016/** 1030/**
… …
1033 1047
1034 op->contr->last_used = 0; 1048 op->contr->last_used = 0;
1035 1049
1036 if (sack->env && sack->env != op) 1050 if (sack->env && sack->env != op)
1037 { 1051 {
1038 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first."); 1052 op->failmsg ("You must put it onto the floor or into your inventory first.");
1039 return 1; 1053 return 1;
1040 } 1054 }
1041 1055
1042 // already applied == open on ground, or open in inv, or active in inv 1056 // already applied == open on ground, or open in inv, or active in inv
1043 if (sack->flag [FLAG_APPLIED]) 1057 if (sack->flag [FLAG_APPLIED])
… …
1049 return 1; 1063 return 1;
1050 } 1064 }
1051 else if (!sack->env) 1065 else if (!sack->env)
1052 { 1066 {
1053 // active, but not ours: some other player has opened it 1067 // active, but not ours: some other player has opened it
1054 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1068 op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
1055 return 1; 1069 return 1;
1056 } 1070 }
1057 1071
1058 // fall through to opening it (active in inv) 1072 // fall through to opening it (active in inv)
1059 } 1073 }
… …
1061 { 1075 {
1062 // it is in our env, so activate it, do not open yet 1076 // it is in our env, so activate it, do not open yet
1063 op->close_container (); 1077 op->close_container ();
1064 sack->flag [FLAG_APPLIED] = 1; 1078 sack->flag [FLAG_APPLIED] = 1;
1065 esrv_update_item (UPD_FLAGS, op, sack); 1079 esrv_update_item (UPD_FLAGS, op, sack);
1066 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack)); 1080 op->statusmsg (format ("You ready %s.", query_name (sack)));
1067 return 1; 1081 return 1;
1068 } 1082 }
1069 1083
1070 // it's locked? 1084 // it's locked?
1071 if (sack->slaying) 1085 if (sack->slaying)
1072 { 1086 {
1073 if (object *tmp = find_key (op, op, sack)) 1087 if (object *tmp = find_key (op, op, sack))
1074 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp)); 1088 op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
1075 else 1089 else
1076 { 1090 {
1077 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack)); 1091 op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
1078 return 1; 1092 return 1;
1079 } 1093 }
1080 } 1094 }
1081 1095
1082 op->open_container (sack); 1096 op->open_container (sack);
… …
1101 * with an altar. We call it a Potion - altars are stationary - it 1115 * with an altar. We call it a Potion - altars are stationary - it
1102 * is up to map designers to use them properly. 1116 * is up to map designers to use them properly.
1103 */ 1117 */
1104 if (altar->inv && altar->inv->type == SPELL) 1118 if (altar->inv && altar->inv->type == SPELL)
1105 { 1119 {
1106 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name); 1120 originator->statusmsg (format ("The altar casts %s.", &altar->inv->name));
1107 cast_spell (originator, altar, 0, altar->inv, NULL); 1121 cast_spell (originator, altar, 0, altar->inv, NULL);
1108 /* If it is connected, push the button. Fixes some problems with 1122 /* If it is connected, push the button. Fixes some problems with
1109 * old maps. 1123 * old maps.
1110 */ 1124 */
1111 1125
1112/* push_button (altar);*/ 1126/* push_button (altar);*/
1113 } 1127 }
… …
1137 double opinion; 1151 double opinion;
1138 object *tmp, *next; 1152 object *tmp, *next;
1139 1153
1140 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1154 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1141 1155
1142 if (op->type != PLAYER) 1156 bool has_unpaid = false;
1157
1158 // quite inefficient to do this here twice, but the api doesn'T lend itself to
1159 // a quick and small change :(
1160 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1161 if (item->flag [FLAG_UNPAID])
1162 {
1163 has_unpaid = true;
1164 break;
1165 }
1166
1167 if (!op->is_player ())
1143 { 1168 {
1144 /* Remove all the unpaid objects that may be carried here. 1169 /* Remove all the unpaid objects that may be carried here.
1145 * This could be pets or monsters that are somehow in 1170 * This could be pets or monsters that are somehow in
1146 * the shop. 1171 * the shop.
1147 */ 1172 */
… …
1151 1176
1152 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1177 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1153 { 1178 {
1154 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1179 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1155 1180
1181 if (i >= 0)
1156 tmp->remove (); 1182 tmp->move (i);
1157
1158 if (i == -1)
1159 i = 0;
1160
1161 tmp->map = op->map;
1162 tmp->x = op->x + freearr_x[i];
1163 tmp->y = op->y + freearr_y[i];
1164 insert_ob_in_map (tmp, op->map, op, 0);
1165 } 1183 }
1166 } 1184 }
1167 1185
1168 /* Don't teleport things like spell effects */ 1186 /* Don't teleport things like spell effects */
1169 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1187 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1172 /* unpaid objects, or non living objects, can't transfer by 1190 /* unpaid objects, or non living objects, can't transfer by
1173 * shop mats. Instead, put it on a nearby space. 1191 * shop mats. Instead, put it on a nearby space.
1174 */ 1192 */
1175 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1193 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1176 { 1194 {
1177
1178 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1195 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1179 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1196 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1180 1197
1181 if (i != -1) 1198 if (i != -1)
1182 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1199 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1183 1200
1184 return 0; 1201 return 0;
1185 } 1202 }
1203
1186 /* Removed code that checked for multipart objects - it appears that 1204 /* Removed code that checked for multipart objects - it appears that
1187 * the teleport function should be able to handle this just fine. 1205 * the teleport function should be able to handle this just fine.
1188 */ 1206 */
1189 rv = teleport (shop_mat, SHOP_MAT, op); 1207 rv = teleport (shop_mat, SHOP_MAT, op);
1190 } 1208 }
1191 else if (can_pay (op) && get_payment (op)) 1209 else if (can_pay (op) && get_payment (op))
1192 { 1210 {
1193 /* this is only used for players */ 1211 /* this is only used for players */
1194 rv = teleport (shop_mat, SHOP_MAT, op); 1212 rv = teleport (shop_mat, SHOP_MAT, op);
1195 1213
1214 if (has_unpaid)
1215 op->contr->play_sound (sound_find ("shop_buy"));
1216 else if (is_in_shop (op))
1217 op->contr->play_sound (sound_find ("shop_enter"));
1218 else
1219 op->contr->play_sound (sound_find ("shop_leave"));
1220
1196 if (shop_mat->msg) 1221 if (shop_mat->msg)
1197 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1222 op->statusmsg (shop_mat->msg);
1198 /* This check below is a bit simplistic - generally it should be correct, 1223 /* This check below is a bit simplistic - generally it should be correct,
1199 * but there is never a guarantee that the bottom space on the map is 1224 * but there is never a guarantee that the bottom space on the map is
1200 * actually the shop floor. 1225 * actually the shop floor.
1201 */ 1226 */
1202 else if (!rv && !is_in_shop (op)) 1227 else if (!rv && !is_in_shop (op))
1203 { 1228 {
1204 opinion = shopkeeper_approval (op->map, op); 1229 opinion = shopkeeper_approval (op->map, op);
1205 1230
1206 if (opinion > 0.9) 1231 op->statusmsg (
1207 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1232 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
1208 else if (opinion > 0.75) 1233 : opinion >= 0.75 ? "The shopkeeper waves to you."
1209 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1234 : opinion >= 0.50 ? "The shopkeeper ignores you."
1210 else if (opinion > 0.5) 1235 : "The shopkeeper glares at you with contempt."
1211 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1212 else 1236 );
1213 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1214 } 1237 }
1215 } 1238 }
1216 else 1239 else
1217 { 1240 {
1218 /* if we get here, a player tried to leave a shop but was not able 1241 /* if we get here, a player tried to leave a shop but was not able
1219 * to afford the items he has. We try to move the player so that 1242 * to afford the items he has. We try to move the player so that
1220 * they are not on the mat anymore 1243 * they are not on the mat anymore
1221 */ 1244 */
1222 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1245 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1223 1246
1224 if (i == -1) 1247 if (i == -1)
1225 {
1226 LOG (llevError, "Internal shop-mat problem.\n"); 1248 LOG (llevError, "Internal shop-mat problem.\n");
1227 }
1228 else 1249 else
1229 { 1250 {
1230 op->remove (); 1251 op->remove ();
1231 op->x += freearr_x[i]; 1252 op->x += freearr_x[i];
1232 op->y += freearr_y[i]; 1253 op->y += freearr_y[i];
… …
1242 * Handles applying a sign. 1263 * Handles applying a sign.
1243 */ 1264 */
1244static void 1265static void
1245apply_sign (object *op, object *sign, int autoapply) 1266apply_sign (object *op, object *sign, int autoapply)
1246{ 1267{
1247 readable_message_type *msgType; 1268 if (sign->has_dialogue ())
1248
1249 if (sign->msg == NULL)
1250 { 1269 {
1251 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1270 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1252 return; 1271 return;
1253 } 1272 }
1254 1273
1274 if (!sign->msg)
1275 {
1276 op->contr->infobox (MSG_CHANNEL ("examine"),
1277 format ("T<%s>\n\n Nothing %sis written on it.",
1278 &sign->name,
1279 sign->name == sign->arch->name ? "" : "else "));
1280 return;
1281 }
1282
1255 if (sign->stats.food) 1283 if (sign->stats.food)
1256 { 1284 {
1257 if (sign->last_eat >= sign->stats.food) 1285 if (sign->last_eat >= sign->stats.food)
1258 { 1286 {
1259 if (!sign->move_on) 1287 if (!sign->move_on)
1260 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1288 op->failmsg ("You cannot read it anymore.");
1289
1261 return; 1290 return;
1262 } 1291 }
1263 1292
1264 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1293 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1265 sign->last_eat++; 1294 sign->last_eat++;
… …
1270 * move_on is zero, it needs to be manually applied (doesn't talk 1299 * move_on is zero, it needs to be manually applied (doesn't talk
1271 * to us). 1300 * to us).
1272 */ 1301 */
1273 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1302 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1274 { 1303 {
1275 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1304 op->failmsg ("You are unable to read while blind!");
1276 return; 1305 return;
1277 } 1306 }
1278 1307
1279 if (op->contr) 1308 if (op->contr)
1280 if (client *ns = op->contr->ns) 1309 if (client *ns = op->contr->ns)
1281 { 1310 {
1282 msgType = get_readable_message_type (sign); 1311 if (sign->sound)
1312 ns->play_sound (sign->sound);
1313 else if (autoapply)
1314 ns->play_sound (sound_find ("msg_voice"));
1283 1315
1284 if (ns->can_msg) 1316 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1285 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg);
1286 else
1287 {
1288 char newbuf[HUGE_BUF];
1289 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1290 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1291 }
1292 } 1317 }
1318}
1319
1320static void
1321move_apply_hole (object *trap, object *victim)
1322{
1323 /* Hole not open? */
1324 if (trap->stats.wc > 0)
1325 return;
1326
1327 /* Is this a multipart monster and not the head? If so, return.
1328 * Processing will happen if the head runs into the pit
1329 */
1330 if (victim->head)
1331 return;
1332
1333 // now find all possible locations and randomly pick one
1334 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1335 trap->range >= 3 ? SIZEOFFREE3 + 1
1336 : trap->range >= 2 ? SIZEOFFREE2 + 1
1337 : trap->range >= 1 ? SIZEOFFREE1 + 1
1338 : SIZEOFFREE0 + 1);
1339
1340 if (dir < 0)
1341 return;
1342
1343 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1344 victim->statusmsg ("You fall through the hole!", NDI_RED);
1345
1346 transfer_ob (victim,
1347 EXIT_X (trap) + freearr_x[dir],
1348 EXIT_Y (trap) + freearr_y[dir],
1349 0, victim);
1293} 1350}
1294 1351
1295/** 1352/**
1296 * 'victim' moves onto 'trap' 1353 * 'victim' moves onto 'trap'
1297 * 'victim' leaves 'trap' 1354 * 'victim' leaves 'trap'
… …
1409 1466
1410 if (!trap->value) 1467 if (!trap->value)
1411 { 1468 {
1412 int tot; 1469 int tot;
1413 1470
1414 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1471 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1415 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1472 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1416 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1473 tot += ab->head_ ()->total_weight ();
1417 1474
1418 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1475 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1419 goto leave; 1476 goto leave;
1420 1477
1421 SET_ANIMATION (trap, trap->value); 1478 SET_ANIMATION (trap, trap->value);
… …
1431 1488
1432 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1489 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1433 { 1490 {
1434 if (!sound_was_played) 1491 if (!sound_was_played)
1435 { 1492 {
1436 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1493 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1437 sound_was_played = 1; 1494 sound_was_played = 1;
1438 } 1495 }
1439 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1496
1497 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1440 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1498 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1441 } 1499 }
1442 } 1500 }
1443 goto leave; 1501 goto leave;
1444 } 1502 }
1445 1503
1446
1447 case CONVERTER: 1504 case CONVERTER:
1448 if (convert_item (victim, trap) < 0) 1505 if (convert_item (victim, trap) < 0)
1449 { 1506 {
1450 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1507 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1451 get_archetype ("burnout")->insert_at (trap, trap); 1508 archetype::get (shstr_burnout)->insert_at (trap, trap);
1452 } 1509 }
1453 1510
1454 goto leave; 1511 goto leave;
1455 1512
1456 case TRIGGER_BUTTON: 1513 case TRIGGER_BUTTON:
… …
1466 case CHECK_INV: 1523 case CHECK_INV:
1467 check_inv (victim, trap); 1524 check_inv (victim, trap);
1468 goto leave; 1525 goto leave;
1469 1526
1470 case HOLE: 1527 case HOLE:
1471 /* Hole not open? */ 1528 move_apply_hole (trap, victim);
1472 if (trap->stats.wc > 0)
1473 goto leave;
1474
1475 /* Is this a multipart monster and not the head? If so, return.
1476 * Processing will happen if the head runs into the pit
1477 */
1478 if (victim->head)
1479 goto leave;
1480
1481 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE);
1482 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1483 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1484 goto leave; 1529 goto leave;
1485 1530
1486 case EXIT: 1531 case EXIT:
1487 if (victim->type == PLAYER && EXIT_PATH (trap)) 1532 if (victim->type == PLAYER && EXIT_PATH (trap))
1488 { 1533 {
1489 /* Basically, don't show exits leading to random maps the 1534 /* Basically, don't show exits leading to random maps the
1490 * players output. 1535 * players output.
1491 */ 1536 */
1492 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1537 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1493 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1538 victim->statusmsg (trap->msg, NDI_NAVY);
1494 1539
1540 trap->play_sound (trap->sound);
1495 victim->enter_exit (trap); 1541 victim->enter_exit (trap);
1496 } 1542 }
1497 goto leave; 1543 goto leave;
1498 1544
1499 case ENCOUNTER: 1545 case ENCOUNTER:
… …
1521 goto leave; 1567 goto leave;
1522 1568
1523 case RUNE: 1569 case RUNE:
1524 case TRAP: 1570 case TRAP:
1525 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1571 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1526 {
1527 spring_trap (trap, victim); 1572 spring_trap (trap, victim);
1528 }
1529 goto leave; 1573 goto leave;
1530 1574
1531 default: 1575 default:
1532 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1576 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1533 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type); 1577 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
… …
1547 int lev_diff; 1591 int lev_diff;
1548 object *skill_ob; 1592 object *skill_ob;
1549 1593
1550 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1594 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1551 { 1595 {
1552 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1596 op->failmsg ("You are unable to read while blind!");
1553 return; 1597 return;
1554 } 1598 }
1555 1599
1556 if (!tmp->msg) 1600 if (!tmp->msg)
1557 { 1601 {
1558 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1602 op->failmsg (format ("You open the %s and find it empty.", &tmp->name));
1559 return; 1603 return;
1560 } 1604 }
1561 1605
1562 /* need a literacy skill to read stuff! */ 1606 /* need a literacy skill to read stuff! */
1563 skill_ob = find_skill_by_name (op, tmp->skill); 1607 skill_ob = find_skill_by_name (op, tmp->skill);
1564 if (!skill_ob) 1608 if (!skill_ob)
1565 { 1609 {
1566 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the skill to read this>"); 1610 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
1567 return; 1611 return;
1568 } 1612 }
1569 1613
1570 lev_diff = tmp->level - (skill_ob->level + 5); 1614 lev_diff = tmp->level - (skill_ob->level + 5);
1571 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1615 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1572 { 1616 {
1573 if (lev_diff < 2) 1617 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1574 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1618 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1575 else if (lev_diff < 3) 1619 : lev_diff < 5 ? "This book is beyond your comprehension."
1576 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension."); 1620 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1577 else if (lev_diff < 5) 1621 : lev_diff < 15 ? "This book is way beyond your comprehension."
1578 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension."); 1622 : "This book is totally beyond your comprehension.");
1579 else if (lev_diff < 8)
1580 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension.");
1581 else if (lev_diff < 15)
1582 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension.");
1583 else
1584 new_draw_info (NDI_UNIQUE, 0, op, "This book is totally beyond your comprehension.");
1585 return; 1623 return;
1586 } 1624 }
1587 1625
1588 readable_message_type *msgType = get_readable_message_type (tmp); 1626 readable_message_type *msgType = get_readable_message_type (tmp);
1589 1627
1590 if (player *pl = op->contr) 1628 if (player *pl = op->contr)
1591 if (client *ns = pl->ns) 1629 if (client *ns = pl->ns)
1592 if (ns->can_msg) 1630 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1593 {
1594 dynbuf_text buf;
1595 buf << long_desc (tmp, op)
1596 << "\n\n"
1597 << tmp->msg
1598 << '\0';
1599 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1600 }
1601 else
1602 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1603 msgType->message_type, msgType->message_subtype,
1604 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1605 long_desc (tmp, op), &tmp->msg);
1606 1631
1607 /* gain xp from reading */ 1632 /* gain xp from reading */
1608 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1633 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1609 { /* only if not read before */ 1634 { /* only if not read before */
1610 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1635 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1612 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1637 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1613 { 1638 {
1614 /*exp_gain *= 2; because they just identified it too */ 1639 /*exp_gain *= 2; because they just identified it too */
1615 SET_FLAG (tmp, FLAG_IDENTIFIED); 1640 SET_FLAG (tmp, FLAG_IDENTIFIED);
1616 1641
1617 /* If in a container, update how it looks */ 1642 if (object *pl = tmp->visible_to ())
1618 if (tmp->env)
1619 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1643 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1620 else
1621 op->contr->ns->floorbox_update ();
1622 } 1644 }
1623 1645
1624 change_exp (op, exp_gain, skill_ob->skill, 0); 1646 change_exp (op, exp_gain, skill_ob->skill, 0);
1625 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1647 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1626 } 1648 }
… …
1631 * 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
1632 */ 1654 */
1633static void 1655static void
1634apply_skillscroll (object *op, object *tmp) 1656apply_skillscroll (object *op, object *tmp)
1635{ 1657{
1636 switch ((int) learn_skill (op, tmp)) 1658 switch (learn_skill (op, tmp))
1637 { 1659 {
1638 case 0: 1660 case 0:
1639 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge "); 1661 op->play_sound (sound_find ("generic_fail"));
1640 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)));
1641 return; 1663 break;
1642 1664
1643 case 1: 1665 case 1:
1644 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1645 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));
1646 return; 1669 break;
1647 1670
1648 default: 1671 default:
1672 tmp->decrease ();
1673 op->play_sound (sound_find ("generic_fail"));
1649 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)));
1650 decrease_ob (tmp);
1651 return; 1675 break;
1652 } 1676 }
1653} 1677}
1654 1678
1655/** 1679/**
1656 * Actually makes op learn spell. 1680 * Actually makes op learn spell.
… …
1676 return; 1700 return;
1677 } 1701 }
1678 return; 1702 return;
1679 } 1703 }
1680 1704
1681 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1705 op->contr->play_sound (sound_find ("learn_spell"));
1706
1682 tmp = spell->clone (); 1707 tmp = spell->clone ();
1683 insert_ob_in_ob (tmp, op); 1708 insert_ob_in_ob (tmp, op);
1684 1709
1685 if (special_prayer) 1710 if (special_prayer)
1686 SET_FLAG (tmp, FLAG_STARTEQUIP); 1711 SET_FLAG (tmp, FLAG_STARTEQUIP);
… …
1705 { 1730 {
1706 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1731 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1707 return; 1732 return;
1708 } 1733 }
1709 1734
1710 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));
1711 player_unready_range_ob (op->contr, spob); 1736 player_unready_range_ob (op->contr, spob);
1712 esrv_remove_spell (op->contr, spob); 1737 esrv_remove_spell (op->contr, spob);
1713 spob->destroy (); 1738 spob->destroy ();
1714} 1739}
1715 1740
… …
1723{ 1748{
1724 object *skop, *spell, *spell_skill; 1749 object *skop, *spell, *spell_skill;
1725 1750
1726 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1751 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1727 { 1752 {
1728 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1753 op->failmsg ("You are unable to read while blind.");
1729 return; 1754 return;
1730 } 1755 }
1731 1756
1732 /* artifact_spellbooks have 'slaying' field point to a spell name, 1757 /* artifact_spellbooks have 'slaying' field point to a spell name,
1733 * instead of having their spell stored in stats.sp. These are 1758 * instead of having their spell stored in stats.sp. These are
… …
1736 if (tmp->slaying) 1761 if (tmp->slaying)
1737 { 1762 {
1738 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1763 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1739 if (!spell) 1764 if (!spell)
1740 { 1765 {
1741 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));
1742 return; 1767 return;
1743 } 1768 }
1744 else 1769 else
1745 insert_ob_in_ob (spell, tmp); 1770 insert_ob_in_ob (spell, tmp);
1746 1771
… …
1751 1776
1752 /* 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
1753 * lower than the spell will make learning the spell more difficult */ 1778 * lower than the spell will make learning the spell more difficult */
1754 if (!skop) 1779 if (!skop)
1755 { 1780 {
1756 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails. H<You lack the literacy skill.>"); 1781 op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
1757 return; 1782 return;
1758 } 1783 }
1759 1784
1760 spell = tmp->inv; 1785 spell = tmp->inv;
1761 1786
1762 if (!spell) 1787 if (!spell)
1763 { 1788 {
1764 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);
1765 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense. This is a bug, please report!"); 1790 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1766 return; 1791 return;
1767 } 1792 }
1768 1793
1769 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1794 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1770 { 1795 {
1771 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<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));
1772 return; 1797 return;
1773 } 1798 }
1774 1799
1775 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));
1776 1801
1777 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1802 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1778 {
1779 identify (tmp); 1803 identify (tmp);
1780
1781 if (tmp->env)
1782 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1783 else
1784 op->contr->ns->floorbox_update ();
1785 }
1786 1804
1787 /* I removed the check for special_prayer_mark here - it didn't make 1805 /* I removed the check for special_prayer_mark here - it didn't make
1788 * a lot of sense - special prayers are not found in spellbooks, and 1806 * a lot of sense - special prayers are not found in spellbooks, and
1789 * if the player doesn't know the spell, doesn't make a lot of sense that 1807 * if the player doesn't know the spell, doesn't make a lot of sense that
1790 * they would have a special prayer mark. 1808 * they would have a special prayer mark.
1791 */ 1809 */
1792 if (check_spell_known (op, spell->name)) 1810 if (check_spell_known (op, spell->name))
1793 { 1811 {
1794 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell. H<It makes no sense to leanr spells twice, and would only waste the spellbook.>\n"); 1812 op->statusmsg ("You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1795 return; 1813 return;
1796 } 1814 }
1797 1815
1798 if (spell->skill) 1816 if (spell->skill)
1799 { 1817 {
1800 spell_skill = find_skill_by_name (op, spell->skill); 1818 spell_skill = find_skill_by_name (op, spell->skill);
1801 1819
1802 if (!spell_skill) 1820 if (!spell_skill)
1803 { 1821 {
1804 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill); 1822 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
1805 return; 1823 return;
1806 } 1824 }
1807 1825
1808 if (spell_skill->level < spell->level) 1826 if (spell_skill->level < spell->level)
1809 { 1827 {
1810 new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill); 1828 op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
1811 return; 1829 return;
1812 } 1830 }
1813 } 1831 }
1814 1832
1815 /* Logic as follows 1833 /* Logic as follows
… …
1824 * Overall, chances are the same but a player will find having a high 1842 * Overall, chances are the same but a player will find having a high
1825 * literacy rate very useful! -b.t. 1843 * literacy rate very useful! -b.t.
1826 */ 1844 */
1827 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1845 if (QUERY_FLAG (op, FLAG_CONFUSED))
1828 { 1846 {
1829 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!"); 1847 op->failmsg ("In your confused state you flub the wording of the text!");
1830 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1848 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
1831 } 1849 }
1832 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1850 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
1833 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1851 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1834 { 1852 {
1835 1853 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
1836 new_draw_info (NDI_UNIQUE, 0, op, "You succeed in learning the spell!");
1837 do_learn_spell (op, spell, 0); 1854 do_learn_spell (op, spell, 0);
1838 1855
1839 /* xp gain to literacy for spell learning */ 1856 /* xp gain to literacy for spell learning */
1840 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1857 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1841 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1858 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1842 } 1859 }
1843 else 1860 else
1844 { 1861 {
1845 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1862 op->contr->play_sound (sound_find ("fumble_spell"));
1846 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n"); 1863 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1847 } 1864 }
1848 1865
1849 decrease_ob (tmp); 1866 tmp->decrease ();
1850} 1867}
1851 1868
1852/** 1869/**
1853 * Handles applying a spell scroll. 1870 * Handles applying a spell scroll.
1854 */ 1871 */
… …
1857{ 1874{
1858 object *skop; 1875 object *skop;
1859 1876
1860 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1877 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1861 { 1878 {
1862 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1879 op->failmsg ("You are unable to read while blind.");
1863 return; 1880 return;
1864 } 1881 }
1865 1882
1866 if (!tmp->inv || tmp->inv->type != SPELL) 1883 if (!tmp->inv || tmp->inv->type != SPELL)
1867 { 1884 {
1868 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense! H<...and never will make sense.>"); 1885 op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
1869 return; 1886 return;
1870 } 1887 }
1871 1888
1872 if (op->type == PLAYER) 1889 if (op->type == PLAYER)
1873 { 1890 {
… …
1879 */ 1896 */
1880 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1897 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1881 1898
1882 if (!skop) 1899 if (!skop)
1883 { 1900 {
1884 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the literacy skill.>"); 1901 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
1885 return; 1902 return;
1886 } 1903 }
1887 1904
1888 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1905 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1889 change_exp (op, exp_gain, skop->skill, 0); 1906 change_exp (op, exp_gain, skop->skill, 0);
1890 } 1907 }
1891 1908
1892 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1909 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1893 identify (tmp); 1910 identify (tmp);
1894 1911
1895 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1912 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1896 1913
1897 cast_spell (op, tmp, dir, tmp->inv, NULL); 1914 cast_spell (op, tmp, dir, tmp->inv, NULL);
1898 decrease_ob (tmp); 1915 tmp->decrease ();
1899} 1916}
1900 1917
1901/** 1918/**
1902 * Applies a treasure object - by default, chest. op 1919 * Applies a treasure object - by default, chest. op
1903 * is the person doing the applying, tmp is the treasure 1920 * is the person doing the applying, tmp is the treasure
1904 * chest. 1921 * chest.
1905 */ 1922 */
1906static void 1923static void
1907apply_treasure (object *op, object *tmp) 1924apply_treasure (object *op, object *tmp)
1908{ 1925{
1909 /* Nice side effect of new treasure creation method is that the treasure 1926 /* Nice side effect of this treasure creation method is that the treasure
1910 * for the chest is done when the chest is created, and put into the chest 1927 * for the chest is done when the chest is created, and put into the chest
1911 * inventory. So that when the chest burns up, the items still exist. Also 1928 * inventory. So that when the chest burns up, the items still exist. Also
1912 * prevents people fromt moving chests to more difficult maps to get better 1929 * prevents people from moving chests to more difficult maps to get better
1913 * treasure 1930 * treasure
1914 */ 1931 */
1915 object *treas = tmp->inv; 1932 object *treas = tmp->inv;
1916 1933
1917 if (!treas) 1934 if (!treas)
1918 { 1935 {
1919 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1936 op->statusmsg ("The chest was empty.");
1920 decrease_ob (tmp); 1937 tmp->decrease ();
1921 return; 1938 return;
1922 } 1939 }
1923 1940
1924 while (tmp->inv) 1941 while (tmp->inv)
1925 { 1942 {
1926 treas = tmp->inv; 1943 treas = tmp->inv;
1927
1928 treas->remove (); 1944 treas->remove ();
1929 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
1930 1945
1931 treas->x = op->x; 1946 treas->x = op->x;
1932 treas->y = op->y; 1947 treas->y = op->y;
1933 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1948 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
1934 1949
1935 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1950 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
1936 spring_trap (treas, op); 1951 spring_trap (treas, op);
1937 1952
1938 /* If either player or container was destroyed, no need to do 1953 /* If either player or container was destroyed, no need to do
1939 * further processing. I think this should be enclused with 1954 * further processing. I think this should be enclused with
1940 * spring trap above, as I don't think there is otherwise 1955 * spring trap above, as I don't think there is otherwise
1941 * any way for the treasure chest or player to get killed 1956 * any way for the treasure chest or player to get killed.
1942 */ 1957 */
1943 if (op->destroyed () || tmp->destroyed ()) 1958 if (op->destroyed () || tmp->destroyed ())
1944 break; 1959 break;
1945 } 1960 }
1946 1961
1947 if (!tmp->destroyed () && tmp->inv == NULL) 1962 if (!tmp->destroyed () && !tmp->inv)
1948 decrease_ob (tmp); 1963 tmp->decrease (true);
1949
1950} 1964}
1951 1965
1952/** 1966/**
1953 * op eats food. 1967 * op eats food.
1954 * If player, takes care of messages and dragon special food. 1968 * If player, takes care of messages and dragon special food.
… …
1969 { 1983 {
1970 /* usual case - no dragon meal: */ 1984 /* usual case - no dragon meal: */
1971 if (op->stats.food + tmp->stats.food > 999) 1985 if (op->stats.food + tmp->stats.food > 999)
1972 { 1986 {
1973 if (tmp->type == FOOD || tmp->type == FLESH) 1987 if (tmp->type == FOOD || tmp->type == FLESH)
1974 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!"); 1988 op->failmsg ("You feel full, but what a waste of food!");
1975 else 1989 else
1976 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!"); 1990 op->statusmsg ("Most of the drink goes down your face not your throat!");
1977 } 1991 }
1992
1993 tmp->play_sound (
1994 tmp->sound
1995 ? tmp->sound
1996 : tmp->type == DRINK
1997 ? sound_find ("eat_drink")
1998 : sound_find ("eat_food")
1999 );
1978 2000
1979 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 2001 if (!QUERY_FLAG (tmp, FLAG_CURSED))
1980 { 2002 {
1981 char buf[MAX_BUF]; 2003 const char *buf;
1982 2004
1983 if (!is_dragon_pl (op)) 2005 if (!is_dragon_pl (op))
1984 { 2006 {
1985 /* eating message for normal players */ 2007 /* eating message for normal players */
1986 if (tmp->type == DRINK) 2008 if (tmp->type == DRINK)
1987 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name); 2009 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
1988 else 2010 else
1989 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good."); 2011 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
1990 } 2012 }
1991 else 2013 else
1992 {
1993 /* eating message for dragon players */ 2014 /* eating message for dragon players */
1994 sprintf (buf, "The %s tasted terrible!", &tmp->name); 2015 buf = format ("The %s tasted terrible!", &tmp->name);
1995 }
1996 2016
1997 new_draw_info (NDI_UNIQUE, 0, op, buf); 2017 op->statusmsg (buf);
2018
1998 capacity_remaining = 999 - op->stats.food; 2019 capacity_remaining = 999 - op->stats.food;
1999 op->stats.food += tmp->stats.food; 2020 op->stats.food += tmp->stats.food;
2000 if (capacity_remaining < tmp->stats.food) 2021 if (capacity_remaining < tmp->stats.food)
2001 op->stats.hp += capacity_remaining / 50; 2022 op->stats.hp += capacity_remaining / 50;
2002 else 2023 else
2003 op->stats.hp += tmp->stats.food / 50; 2024 op->stats.hp += tmp->stats.food / 50;
2025
2004 if (op->stats.hp > op->stats.maxhp) 2026 if (op->stats.hp > op->stats.maxhp)
2005 op->stats.hp = op->stats.maxhp; 2027 op->stats.hp = op->stats.maxhp;
2006 if (op->stats.food > 999) 2028 if (op->stats.food > 999)
2007 op->stats.food = 999; 2029 op->stats.food = 999;
2008 } 2030 }
… …
2012 eat_special_food (op, tmp); 2034 eat_special_food (op, tmp);
2013 } 2035 }
2014 } 2036 }
2015 2037
2016 handle_apply_yield (tmp); 2038 handle_apply_yield (tmp);
2017 decrease_ob (tmp); 2039 tmp->decrease ();
2018} 2040}
2019 2041
2020/** 2042/**
2021 * A dragon is eating some flesh. If the flesh contains resistances, 2043 * A dragon is eating some flesh. If the flesh contains resistances,
2022 * there is a chance for the dragon's skin to get improved. 2044 * there is a chance for the dragon's skin to get improved.
… …
2032{ 2054{
2033 object *skin = NULL; /* pointer to dragon skin force */ 2055 object *skin = NULL; /* pointer to dragon skin force */
2034 object *abil = NULL; /* pointer to dragon ability force */ 2056 object *abil = NULL; /* pointer to dragon ability force */
2035 object *tmp = NULL; /* tmp. object */ 2057 object *tmp = NULL; /* tmp. object */
2036 2058
2037 char buf[MAX_BUF]; /* tmp. string buffer */
2038 double chance; /* improvement-chance of one resistance type */ 2059 double chance; /* improvement-chance of one resistance type */
2039 double totalchance = 1; /* total chance of gaining one resistance */ 2060 double totalchance = 1; /* total chance of gaining one resistance */
2040 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */ 2061 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2041 double mbonus = 0; /* monster bonus */ 2062 double mbonus = 0; /* monster bonus */
2042 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2063 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
… …
2064 /* now start by filling stomache and health, according to food-value */ 2085 /* now start by filling stomache and health, according to food-value */
2065 if ((999 - op->stats.food) < meal->stats.food) 2086 if ((999 - op->stats.food) < meal->stats.food)
2066 op->stats.hp += (999 - op->stats.food) / 50; 2087 op->stats.hp += (999 - op->stats.food) / 50;
2067 else 2088 else
2068 op->stats.hp += meal->stats.food / 50; 2089 op->stats.hp += meal->stats.food / 50;
2090
2069 if (op->stats.hp > op->stats.maxhp) 2091 if (op->stats.hp > op->stats.maxhp)
2070 op->stats.hp = op->stats.maxhp; 2092 op->stats.hp = op->stats.maxhp;
2071 2093
2072 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2094 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2073 2095
… …
2118 } 2140 }
2119 } 2141 }
2120 2142
2121 /* inverse totalchance as until now we have the failure-chance */ 2143 /* inverse totalchance as until now we have the failure-chance */
2122 totalchance = 100 - totalchance * 100; 2144 totalchance = 100 - totalchance * 100;
2145
2123 /* print message according to totalchance */ 2146 /* print message according to totalchance */
2147 const char *buf;
2124 if (totalchance > 50.) 2148 if (totalchance > 50.)
2125 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name); 2149 buf = format ("Hmm! The %s tasted delicious!", &meal->name);
2126 else if (totalchance > 10.) 2150 else if (totalchance > 10.)
2127 sprintf (buf, "The %s tasted very good.", &meal->name); 2151 buf = format ("The %s tasted very good.", &meal->name);
2128 else if (totalchance > 1.) 2152 else if (totalchance > 1.)
2129 sprintf (buf, "The %s tasted good.", &meal->name); 2153 buf = format ("The %s tasted good.", &meal->name);
2130 else if (totalchance > 0.1) 2154 else if (totalchance > 0.1)
2131 sprintf (buf, "The %s tasted bland.", &meal->name); 2155 buf = format ("The %s tasted bland.", &meal->name);
2132 else if (totalchance >= 0.01) 2156 else if (totalchance >= 0.01)
2133 sprintf (buf, "The %s had a boring taste.", &meal->name); 2157 buf = format ("The %s had a boring taste.", &meal->name);
2134 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat)) 2158 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2135 sprintf (buf, "The %s tasted strange.", &meal->name); 2159 buf = format ("The %s tasted strange.", &meal->name);
2136 else 2160 else
2137 sprintf (buf, "The %s had no taste.", &meal->name); 2161 buf = format ("The %s had no taste.", &meal->name);
2138 new_draw_info (NDI_UNIQUE, 0, op, buf); 2162
2163 op->statusmsg (buf);
2139 2164
2140 /* now choose a winner if we have any */ 2165 /* now choose a winner if we have any */
2141 i = -1; 2166 i = -1;
2142 if (winners > 0) 2167 if (winners > 0)
2143 i = atnr_winner[RANDOM () % winners]; 2168 i = atnr_winner [rndm (winners)];
2144 2169
2145 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2170 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2146 { 2171 {
2147 /* resistance increased! */ 2172 /* resistance increased! */
2148 skin->resist[i]++; 2173 skin->resist[i]++;
2149 op->update_stats (); 2174 op->update_stats ();
2150 2175
2151 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2176 op->statusmsg (format ("Your skin is now more resistant to %s!", change_resist_msg[i]));
2152 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2153 } 2177 }
2154 2178
2155 /* if this flesh contains a new ability focus, we mark it 2179 /* if this flesh contains a new ability focus, we mark it
2156 into the ability_force and it will take effect on next level */ 2180 into the ability_force and it will take effect on next level */
2157 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat) 2181 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2158 { 2182 {
2159 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2183 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2160 2184
2161 if (meal->last_eat != abil->stats.exp) 2185 if (meal->last_eat != abil->stats.exp)
2186 op->statusmsg (format (
2187 "Your metabolism prepares to focus on %s!\n"
2188 "The change will happen at level %d.",
2189 change_resist_msg[meal->last_eat],
2190 abil->level + 1
2162 { 2191 ));
2163 sprintf (buf, "Your metabolism prepares to focus on %s!", change_resist_msg[meal->last_eat]);
2164 new_draw_info (NDI_UNIQUE, 0, op, buf);
2165 sprintf (buf, "The change will happen at level %d", abil->level + 1);
2166 new_draw_info (NDI_UNIQUE, 0, op, buf);
2167 }
2168 else 2192 else
2169 { 2193 {
2170 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]); 2194 op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
2171 new_draw_info (NDI_UNIQUE, 0, op, buf);
2172 abil->last_eat = 0; 2195 abil->last_eat = 0;
2173 } 2196 }
2174 } 2197 }
2198
2175 return 1; 2199 return 1;
2176} 2200}
2177 2201
2178/** 2202/**
2179 * Handles applying an improve armor scroll. 2203 * Handles applying an improve armor scroll.
… …
2184{ 2208{
2185 object *armor; 2209 object *armor;
2186 2210
2187 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC)) 2211 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2188 { 2212 {
2189 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll. H<The area prevents magic effects.>"); 2213 op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
2190 return; 2214 return;
2191 } 2215 }
2192 2216
2193 armor = find_marked_object (op); 2217 armor = find_marked_object (op);
2194 2218
2195 if (!armor) 2219 if (!armor)
2196 { 2220 {
2197 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object. Use the right mouse button popup or the mark command to do this."); 2221 op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2198 return; 2222 return;
2199 } 2223 }
2200 2224
2201 if (armor->type != ARMOUR 2225 if (armor->type != ARMOUR
2202 && armor->type != CLOAK 2226 && armor->type != CLOAK
2203 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2227 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2204 { 2228 {
2205 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2229 op->failmsg ("Your marked item is not armour!\n");
2206 return; 2230 return;
2207 } 2231 }
2208 2232
2209 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2233 op->statusmsg ("Applying armour enchantment.");
2210 improve_armour (op, tmp, armor); 2234 improve_armour (op, tmp, armor);
2211} 2235}
2212 2236
2213extern void 2237void
2214apply_poison (object *op, object *tmp) 2238apply_poison (object *op, object *tmp)
2215{ 2239{
2240 // need to do it now when it is still on the map
2241 handle_apply_yield (tmp);
2242
2243 object *poison = tmp->split (1);
2244
2216 if (op->type == PLAYER) 2245 if (op->type == PLAYER)
2217 { 2246 {
2218 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2247 op->contr->play_sound (sound_find ("drink_poison"));
2219 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2248 op->failmsg ("Yech! That tasted poisonous!");
2220 strcpy (op->contr->killer, "poisonous booze"); 2249 op->contr->killer = poison;
2221 } 2250 }
2222 2251
2223 if (tmp->stats.hp > 0) 2252 if (poison->stats.hp > 0)
2224 { 2253 {
2225 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2254 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2226 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2255 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2227 } 2256 }
2228 2257
2229 op->stats.food -= op->stats.food / 4; 2258 op->stats.food -= op->stats.food / 4;
2230 handle_apply_yield (tmp); 2259 poison->destroy ();
2231 decrease_ob (tmp);
2232} 2260}
2233 2261
2234/** 2262/**
2235 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2263 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2236 * A valid 2 way exit means: 2264 * A valid 2 way exit means:
… …
2251 2279
2252#if 0 //TODO 2280#if 0 //TODO
2253 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2281 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2254 return 0; /* This is a reset town portal */ 2282 return 0; /* This is a reset town portal */
2255#endif 2283#endif
2284
2285 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2256 2286
2257 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2287 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2258 2288
2259 if (exitmap) 2289 if (exitmap)
2260 { 2290 {
… …
2336 * them in this function - they are passed to apply_special 2366 * them in this function - they are passed to apply_special
2337 */ 2367 */
2338int 2368int
2339manual_apply (object *op, object *tmp, int aflag) 2369manual_apply (object *op, object *tmp, int aflag)
2340{ 2370{
2341 if (tmp->head)
2342 tmp = tmp->head; 2371 tmp = tmp->head_ ();
2343 2372
2344 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2373 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2345 { 2374 {
2346 if (op->type == PLAYER) 2375 if (op->type == PLAYER)
2347 { 2376 {
2348 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first. H<You cannot use items marked as unpaid.>"); 2377 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
2349 return 1; 2378 return 1;
2350 } 2379 }
2351 else 2380 else
2352 return 0; /* monsters just skip unpaid items */ 2381 return 0; /* monsters just skip unpaid items */
2353 } 2382 }
… …
2356 return RESULT_INT (0); 2385 return RESULT_INT (0);
2357 2386
2358 switch (tmp->type) 2387 switch (tmp->type)
2359 { 2388 {
2360 case CF_HANDLE: 2389 case CF_HANDLE:
2361 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2390 op->play_sound (sound_find ("turn_handle"));
2362 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2391 op->statusmsg ("You turn the handle.");
2363 tmp->value = tmp->value ? 0 : 1; 2392 tmp->value = tmp->value ? 0 : 1;
2364 SET_ANIMATION (tmp, tmp->value); 2393 SET_ANIMATION (tmp, tmp->value);
2365 update_object (tmp, UP_OBJ_FACE); 2394 update_object (tmp, UP_OBJ_FACE);
2366 push_button (tmp); 2395 push_button (tmp);
2367 return 1; 2396 return 1;
2368 2397
2369 case TRIGGER: 2398 case TRIGGER:
2370 if (check_trigger (tmp, op)) 2399 if (check_trigger (tmp, op))
2371 { 2400 {
2372 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2401 op->statusmsg ("You turn the handle.");
2373 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2402 op->play_sound (sound_find ("turn_handle"));
2374 } 2403 }
2375 else 2404 else
2376 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2405 op->failmsg ("The handle doesn't move.");
2377 2406
2378 return 1; 2407 return 1;
2379 2408
2380 case EXIT: 2409 case EXIT:
2381 if (op->type != PLAYER) 2410 if (op->type != PLAYER)
2382 return 0; 2411 return 0;
2383 2412
2384 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2413 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2385 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2414 op->failmsg (format ("The %s is closed.", query_name (tmp)));
2386 else 2415 else
2387 { 2416 {
2388 /* Don't display messages for random maps. */ 2417 /* Don't display messages for random maps. */
2389 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2418 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2390 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2419 op->statusmsg (tmp->msg, NDI_NAVY);
2391 2420
2392 op->enter_exit (tmp); 2421 op->enter_exit (tmp);
2393 } 2422 }
2394 2423
2424 return 1;
2425
2426 case INSCRIBABLE:
2427 op->statusmsg (tmp->msg);
2428 // maybe show a spell menu to chose from or something like that
2395 return 1; 2429 return 1;
2396 2430
2397 case SIGN: 2431 case SIGN:
2398 apply_sign (op, tmp, 0); 2432 apply_sign (op, tmp, 0);
2399 return 1; 2433 return 1;
… …
2508 { 2542 {
2509 char buf[MAX_BUF]; 2543 char buf[MAX_BUF];
2510 timeofday_t tod; 2544 timeofday_t tod;
2511 2545
2512 get_tod (&tod); 2546 get_tod (&tod);
2547 op->play_sound (sound_find ("sound_clock"));
2548 op->statusmsg (format (
2513 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2549 "It is %d minute%s past %d o'clock %s",
2514 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2550 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2515 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2551 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2516 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2552 ));
2517 new_draw_info (NDI_UNIQUE, 0, op, buf);
2518 return 1; 2553 return 1;
2519 } 2554 }
2520 else 2555 else
2521 return 0; 2556 return 0;
2522 2557
… …
2549 default: 2584 default:
2550 return 0; 2585 return 0;
2551 } 2586 }
2552} 2587}
2553 2588
2554
2555/* quiet suppresses the "don't know how to apply" and "you must get it first" 2589/* quiet suppresses the "don't know how to apply" and "you must get it first"
2556 * messages as needed by player_apply_below(). But there can still be 2590 * messages as needed by player_apply_below(). But there can still be
2557 * "but you are floating high above the ground" messages. 2591 * "but you are floating high above the ground" messages.
2558 * 2592 *
2559 * Same return value as apply() function. 2593 * Same return value as apply() function.
2560 */ 2594 */
2561int 2595int
2562player_apply (object *pl, object *op, int aflag, int quiet) 2596player_apply (object *pl, object *op, int aflag, int quiet)
2563{ 2597{
2564 int tmp;
2565
2566 if (op->env && (pl->move_type & MOVE_FLYING)) 2598 if (!op->env && (pl->move_type & MOVE_FLYING))
2567 { 2599 {
2568 /* player is flying and applying object not in inventory */ 2600 /* player is flying and applying object not in inventory */
2569 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2601 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2570 { 2602 {
2571 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2603 pl->failmsg ("But you are floating high above the ground! "
2604 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2605 "or waiting till the levitation effect wears off.>");
2572 return 0; 2606 return 0;
2573 } 2607 }
2574 } 2608 }
2575 2609
2576 pl->contr->last_used = op; 2610 pl->contr->last_used = op;
2577 2611
2578 tmp = manual_apply (pl, op, aflag); 2612 int tmp = manual_apply (pl, op, aflag);
2613
2579 if (!quiet) 2614 if (!quiet)
2580 { 2615 {
2581 if (tmp == 0) 2616 if (tmp == 0)
2582 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2617 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2583 else if (tmp == 2) 2618 else if (tmp == 2)
2584 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2619 pl->failmsg ("You must get it first!\n");
2585 } 2620 }
2586 2621
2587 return tmp; 2622 return tmp;
2588} 2623}
2589 2624
… …
2618 * person moving on it, also activate. Added code to make it 2653 * person moving on it, also activate. Added code to make it
2619 * so that at least one of players movement types be that which 2654 * so that at least one of players movement types be that which
2620 * the item needs. 2655 * the item needs.
2621 */ 2656 */
2622 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2657 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2623 {
2624 if (player_apply (pl, tmp, 0, 1) == 1) 2658 if (player_apply (pl, tmp, 0, 1) == 1)
2625 return; 2659 return;
2626 } 2660
2627 if (floors >= 2) 2661 if (floors >= 2)
2628 return; /* process at most two floor objects */ 2662 return; /* process at most two floor objects */
2629 } 2663 }
2630} 2664}
2631 2665
… …
2666 { 2700 {
2667 pl->combat_ob = 0; 2701 pl->combat_ob = 0;
2668 who->change_weapon (pl->ranged_ob); 2702 who->change_weapon (pl->ranged_ob);
2669 } 2703 }
2670 2704
2671 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2705 who->statusmsg (format ("You unwield %s.", query_name (op)));
2672 2706
2673 change_abil (who, op); 2707 change_abil (who, op);
2674 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2708 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2675 break; 2709 break;
2676 2710
2677 case SKILL: 2711 case SKILL:
2678 if (who->contr) 2712 if (who->contr)
2679 { 2713 {
2714 if (IS_COMBAT_SKILL (op->subtype))
2715 who->change_weapon (who->contr->combat_ob = 0);
2716 else if (IS_RANGED_SKILL (op->subtype))
2717 who->change_weapon (who->contr->ranged_ob = 0);
2718
2680 if (!op->invisible) 2719 if (op->invisible)
2681 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2720 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2682 else 2721 else
2683 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2722 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2684 } 2723 }
2685 2724
2686 change_abil (who, op); 2725 change_abil (who, op);
2687 CLEAR_FLAG (who, FLAG_READY_SKILL); 2726 CLEAR_FLAG (who, FLAG_READY_SKILL);
2688 break; 2727 break;
… …
2695 case GLOVES: 2734 case GLOVES:
2696 case AMULET: 2735 case AMULET:
2697 case GIRDLE: 2736 case GIRDLE:
2698 case BRACERS: 2737 case BRACERS:
2699 case CLOAK: 2738 case CLOAK:
2700 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2739 who->statusmsg (format ("You unwear %s.", query_name (op)));
2701 change_abil (who, op); 2740 change_abil (who, op);
2702 break; 2741 break;
2703 2742
2704 case LAMP: 2743 case LAMP:
2705 { 2744 {
2706 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));
2707 2746
2708 object *tmp2 = arch_to_object (op->other_arch); 2747 object *tmp2 = arch_to_object (op->other_arch);
2709 tmp2->x = op->x; 2748 tmp2->x = op->x;
2710 tmp2->y = op->y; 2749 tmp2->y = op->y;
2711 tmp2->map = op->map; 2750 tmp2->map = op->map;
… …
2715 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2754 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2716 2755
2717 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2756 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2718 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2757 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2719 2758
2759 op->destroy ();
2760 who->insert (tmp2);
2761 who->update_stats ();
2762
2720 if (who->contr) 2763 if (who->contr)
2721 esrv_del_item (who->contr, op->count);
2722
2723 op->destroy ();
2724 insert_ob_in_ob (tmp2, who);
2725 who->update_stats ();
2726
2727 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2728 {
2729 if (who->contr)
2730 { 2765 {
2731 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2766 who->failmsg ("Oops, it feels deadly cold!");
2732 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2767 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2733 } 2768 }
2734 }
2735
2736 if (who->contr)
2737 esrv_send_item (who, tmp2);
2738 } 2769 }
2739 2770
2740 return 1; /* otherwise, an attempt to drop causes problems */ 2771 return 1; /* otherwise, an attempt to drop causes problems */
2741 2772
2742 case BOW: 2773 case BOW:
… …
2749 { 2780 {
2750 pl->ranged_ob = 0; 2781 pl->ranged_ob = 0;
2751 who->change_weapon (pl->combat_ob); 2782 who->change_weapon (pl->combat_ob);
2752 } 2783 }
2753 2784
2754 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2785 who->statusmsg (format ("You unready %s.", query_name (op)));
2755 } 2786 }
2756 else 2787 else
2757 { 2788 {
2758 who->change_skill (0); 2789 who->change_skill (0);
2759 2790
… …
2765 2796
2766 break; 2797 break;
2767 2798
2768 case BUILDER: 2799 case BUILDER:
2769 if (who->contr) 2800 if (who->contr)
2770 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2801 who->statusmsg (format ("You unready %s.", query_name (op)));
2771 break; 2802 break;
2772 2803
2773 default: 2804 default:
2774 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2805 who->statusmsg (format ("You unapply %s.", query_name (op)));
2775 break; 2806 break;
2776 } 2807 }
2777 2808
2809 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2810 if (object *pl = op->visible_to ())
2811 esrv_send_item (pl, op);
2812
2778 who->update_stats (); 2813 who->update_stats ();
2779
2780 if (!(aflags & AP_NO_MERGE))
2781 {
2782 object *tmp = merge_ob (op, 0);
2783
2784 if (who->contr)
2785 {
2786 if (tmp)
2787 { /* it was merged */
2788 esrv_del_item (who->contr, op->count);
2789 op = tmp;
2790 }
2791
2792 esrv_send_item (who, op);
2793 }
2794 }
2795 2814
2796 return 0; 2815 return 0;
2797} 2816}
2798 2817
2799/** 2818/**
… …
2846 for (object *tmp = who->inv; tmp; tmp = tmp->below) 2865 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2847 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 2866 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2848 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2867 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2849 { 2868 {
2850 if (aflags & AP_PRINT) 2869 if (aflags & AP_PRINT)
2851 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2870 who->failmsg (query_name (tmp));
2852 else 2871 else
2853 unapply_special (who, tmp, aflags); 2872 unapply_special (who, tmp, aflags);
2854 } 2873 }
2855 else 2874 else
2856 { 2875 {
2857 /* In this case, we want to try and remove a cursed item. 2876 /* In this case, we want to try and remove a cursed item.
2858 * While we know it won't work, we want unapply_special to 2877 * While we know it won't work, we want unapply_special to
2859 * at least generate the message. 2878 * at least generate the message.
2860 */ 2879 */
2861 new_draw_info_format (NDI_UNIQUE, 0, who, 2880 who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
2862 "No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED,
2863 query_name (tmp));
2864 return 1; 2881 return 1;
2865 } 2882 }
2866 2883
2867 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 2884 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2868 { 2885 {
… …
2891 2908
2892 /* If we are just printing, we don't care about cursed status */ 2909 /* If we are just printing, we don't care about cursed status */
2893 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2910 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2894 { 2911 {
2895 if (aflags & AP_PRINT) 2912 if (aflags & AP_PRINT)
2896 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2913 who->failmsg (query_name (tmp));
2897 else 2914 else
2898 unapply_special (who, tmp, aflags); 2915 unapply_special (who, tmp, aflags);
2899 } 2916 }
2900 else 2917 else
2901 { 2918 {
2902 /* Cursed item that we can't unequip - tell the player. 2919 /* Cursed item that we can't unequip - tell the player.
2903 * Note this could be annoying if this is just one of a few, 2920 * Note this could be annoying if this is just one of a few,
2904 * so it may not be critical (eg, putting on a ring and you have 2921 * so it may not be critical (eg, putting on a ring and you have
2905 * one cursed ring.) 2922 * one cursed ring.)
2906 */ 2923 */
2907 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)); 2924 who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
2908 } 2925 }
2909 2926
2910 last = tmp->below; 2927 last = tmp->below;
2911 } 2928 }
2912 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2929 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
… …
3093 if (basic_flag == AP_APPLY) 3110 if (basic_flag == AP_APPLY)
3094 return 0; 3111 return 0;
3095 3112
3096 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3113 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3097 { 3114 {
3098 new_draw_info_format (NDI_UNIQUE, 0, who, 3115 who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
3099 "No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED,
3100 query_name (op));
3101 return 1; 3116 return 1;
3102 } 3117 }
3103 3118
3104 return unapply_special (who, op, aflags); 3119 return unapply_special (who, op, aflags);
3105 } 3120 }
3106
3107 if (basic_flag == AP_UNAPPLY) 3121 else if (basic_flag == AP_UNAPPLY)
3108 return 0; 3122 return 0;
3109 3123
3110 // if the item is combat/ranged, wield the relevant slot first 3124 // if the item is combat/ranged, wield the relevant slot first
3111 // to resolve conflicts. 3125 // to resolve conflicts.
3112 if (player *pl = who->contr) 3126 if (player *pl = who->contr)
… …
3121 /* Can't just apply this object. Lets see what not and what to do */ 3135 /* Can't just apply this object. Lets see what not and what to do */
3122 if (int i = can_apply_object (who, op)) 3136 if (int i = can_apply_object (who, op))
3123 { 3137 {
3124 if (i & CAN_APPLY_NEVER) 3138 if (i & CAN_APPLY_NEVER)
3125 { 3139 {
3126 new_draw_info_format (NDI_UNIQUE, 0, who, 3140 who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
3127 "You don't have the body to use a %s. H<You can never apply this item.>",
3128 query_name (op));
3129 return 1; 3141 return 1;
3130 } 3142 }
3131 else if (i & CAN_APPLY_RESTRICTION) 3143 else if (i & CAN_APPLY_RESTRICTION)
3132 { 3144 {
3133 new_draw_info_format (NDI_UNIQUE, 0, who, 3145 who->failmsg (format (
3134 "You have a prohibition against using a %s. " 3146 "You have a prohibition against using a %s. "
3135 "H<Your belief, profession or class prevents you from applying this item.>", 3147 "H<Your belief, profession or class prevents you from applying this item.>",
3136 query_name (op)); 3148 query_name (op)
3149 ));
3137 return 1; 3150 return 1;
3138 } 3151 }
3139 3152
3140 if (who->type != PLAYER) 3153 if (who->type != PLAYER)
3141 { 3154 {
… …
3145 } 3158 }
3146 else 3159 else
3147 { 3160 {
3148 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3161 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3149 { 3162 {
3150 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3163 who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
3151 unapply_for_ob (who, op, AP_PRINT); 3164 unapply_for_ob (who, op, AP_PRINT);
3152 return 1; 3165 return 1;
3153 } 3166 }
3154 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3167 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3155 if (unapply_for_ob (who, op, aflags)) 3168 if (unapply_for_ob (who, op, aflags))
… …
3161 { 3174 {
3162 skop = find_skill_by_name (who, op->skill); 3175 skop = find_skill_by_name (who, op->skill);
3163 3176
3164 if (!skop) 3177 if (!skop)
3165 { 3178 {
3166 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3179 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3167 return 1; 3180 return 1;
3168 } 3181 }
3169 else 3182 else
3170 /* While experience will be credited properly, we want to change the 3183 /* While experience will be credited properly, we want to change the
3171 * skill so that the dam and wc get updated 3184 * skill so that the dam and wc get updated
… …
3175 3188
3176 if (who->type == PLAYER 3189 if (who->type == PLAYER
3177 && op->item_power 3190 && op->item_power
3178 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level) 3191 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3179 { 3192 {
3180 new_draw_info (NDI_UNIQUE, 0, who,
3181 "Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3193 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3182 return 1; 3194 return 1;
3183 } 3195 }
3184 3196
3185 /* Ok. We are now at the state where we can apply the new object. 3197 /* Ok. We are now at the state where we can apply the new object.
3186 * Note that we don't have the checks for can_use_... 3198 * Note that we don't have the checks for can_use_...
3187 * below - that is already taken care of by can_apply_object. 3199 * below - that is already taken care of by can_apply_object.
3188 */ 3200 */
3189 if (op->nrof > 1) 3201 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3190 tmp = get_split_ob (op, op->nrof - 1);
3191 else
3192 tmp = 0;
3193 3202
3194 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3203 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3195 return RESULT_INT (0); 3204 return RESULT_INT (0);
3196 3205
3197 switch (op->type) 3206 switch (op->type)
3198 { 3207 {
3199 case WEAPON: 3208 case WEAPON:
3200 if (!check_weapon_power (who, op->last_eat)) 3209 if (!check_weapon_power (who, op->last_eat))
3201 { 3210 {
3202 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. " 3211 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3203 "It would consume your soul!." LACK_ITEM_POWER);
3204 3212
3205 if (tmp) 3213 if (tmp)
3206 insert_ob_in_ob (tmp, who); 3214 insert_ob_in_ob (tmp, who);
3207 3215
3208 return 1; 3216 return 1;
… …
3212 // i.e. "R" can use Ragnarok's sword. 3220 // i.e. "R" can use Ragnarok's sword.
3213 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3221 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3214 { 3222 {
3215 /* if the weapon does not have the name as the character, can't use it. */ 3223 /* if the weapon does not have the name as the character, can't use it. */
3216 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3224 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3217 new_draw_info (NDI_UNIQUE, 0, who, 3225 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3218 "The weapon does not recognize you as its owner. "
3219 "H<Its name indicates that it belongs to somebody else.>");
3220 3226
3221 if (tmp) 3227 if (tmp)
3222 insert_ob_in_ob (tmp, who); 3228 insert_ob_in_ob (tmp, who);
3223 3229
3224 return 1; 3230 return 1;
3225 } 3231 }
3226 3232
3227 if (!skop) 3233 if (!skop)
3228 { 3234 {
3229 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO 3235 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3230 return 1; 3236 return 1;
3231 } 3237 }
3232 3238
3233 SET_FLAG (op, FLAG_APPLIED); 3239 SET_FLAG (op, FLAG_APPLIED);
3234 who->change_skill (skop); 3240 who->change_skill (skop);
3235 3241
3236 if (who->contr) 3242 if (who->contr)
3237 who->change_weapon (who->contr->combat_ob = op); 3243 who->change_weapon (who->contr->combat_ob = op);
3238 3244
3239 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3245 who->statusmsg (format ("You wield %s.", query_name (op)));
3240 3246
3241 SET_FLAG (who, FLAG_READY_WEAPON); 3247 SET_FLAG (who, FLAG_READY_WEAPON);
3242 change_abil (who, op); 3248 change_abil (who, op);
3243 break; 3249 break;
3244 3250
… …
3251 case BRACERS: 3257 case BRACERS:
3252 case CLOAK: 3258 case CLOAK:
3253 case RING: 3259 case RING:
3254 case AMULET: 3260 case AMULET:
3255 SET_FLAG (op, FLAG_APPLIED); 3261 SET_FLAG (op, FLAG_APPLIED);
3256 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3262 who->statusmsg (format ("You wear %s.", query_name (op)));
3257 change_abil (who, op); 3263 change_abil (who, op);
3258 break; 3264 break;
3259 3265
3260 case LAMP: 3266 case LAMP:
3261 if (op->stats.food < 1) 3267 if (op->stats.food < 1)
3262 { 3268 {
3263 new_draw_info_format (NDI_UNIQUE, 0, who, 3269 who->failmsg (format (
3264 "Your %s is out of fuel! " 3270 "Your %s is out of fuel! "
3265 "H<Lamps and similar items need fuel. They cannot be refilled.>", &op->name); 3271 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3272 &op->name
3273 ));
3266 return 1; 3274 return 1;
3267 } 3275 }
3268 3276
3269 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3277 who->statusmsg (format ("You turn on your %s.", &op->name));
3278
3270 tmp2 = arch_to_object (op->other_arch); 3279 tmp2 = arch_to_object (op->other_arch);
3271 tmp2->stats.food = op->stats.food; 3280 tmp2->stats.food = op->stats.food;
3272 SET_FLAG (tmp2, FLAG_APPLIED); 3281 SET_FLAG (tmp2, FLAG_APPLIED);
3273 3282
3274 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3283 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3275 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3284 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3276 3285
3277 insert_ob_in_ob (tmp2, who); 3286 who->insert (tmp2);
3278 3287
3279 /* Remove the old lantern */ 3288 /* Remove the old lantern */
3280 if (who->type == PLAYER)
3281 esrv_del_item (who->contr, op->count);
3282
3283 op->destroy (); 3289 op->destroy ();
3284 3290
3285 /* insert the portion that was split off */ 3291 /* insert the portion that was split off */
3286 if (tmp) 3292 if (tmp)
3287 { 3293 who->insert (tmp);
3288 insert_ob_in_ob (tmp, who);
3289 if (who->type == PLAYER)
3290 esrv_send_item (who, tmp);
3291 }
3292 3294
3293 who->update_stats (); 3295 who->update_stats ();
3294 3296
3295 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3297 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3296 if (who->type == PLAYER) 3298 if (who->type == PLAYER)
3297 { 3299 {
3298 new_draw_info (NDI_UNIQUE, 0, who, 3300 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright (hrhrhr) idea to apply this cursed or damned item.>");
3299 "Oops, it feels deadly cold! "
3300 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3301 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3301 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3302 } 3302 }
3303
3304 if (who->type == PLAYER)
3305 esrv_send_item (who, tmp2);
3306 3303
3307 return 0; 3304 return 0;
3308 3305
3309 case SKILL_TOOL: 3306 case SKILL_TOOL:
3310 // applying a skill tool also readies the skill 3307 // applying a skill tool also readies the skill
… …
3333 who->change_weapon (pl->combat_ob = item); 3330 who->change_weapon (pl->combat_ob = item);
3334 goto found_weapon; 3331 goto found_weapon;
3335 } 3332 }
3336 } 3333 }
3337 3334
3338 new_draw_info_format (NDI_UNIQUE, 0, who, 3335 who->failmsg (format (
3339 "You need to apply a '%s' melee weapon before readying this skill. " 3336 "You need to apply a '%s' melee weapon before readying this skill. "
3340 "H<Some skills need an item, in this case a melee weapon, to function.>", 3337 "H<Some skills need an item, in this case a melee weapon, to function.>",
3341 &op->skill); 3338 &op->skill
3339 ));
3342 return 1; 3340 return 1;
3343 3341
3344 found_weapon:; 3342 found_weapon:;
3345 } 3343 }
3346 else 3344 else
… …
3356 //TODO: bows should/must all have skill missile weapon right now 3354 //TODO: bows should/must all have skill missile weapon right now
3357 who->change_weapon (pl->ranged_ob = item); 3355 who->change_weapon (pl->ranged_ob = item);
3358 goto found_bow; 3356 goto found_bow;
3359 } 3357 }
3360 3358
3361 new_draw_info (NDI_UNIQUE, 0, who, 3359 who->failmsg (
3362 "You need to apply a missile weapon before readying this skill. " 3360 "You need to apply a missile weapon before readying this skill. "
3363 "H<Some skills need an item, in this case a missile weapon, to function.>"); 3361 "H<Some skills need an item, in this case a missile weapon, to function.>"
3362 );
3364 return 1; 3363 return 1;
3365 3364
3366 found_bow:; 3365 found_bow:;
3367 } 3366 }
3368 else 3367 else
3369 who->change_weapon (pl->ranged_ob = op); 3368 who->change_weapon (pl->ranged_ob = op);
3370 } 3369 }
3371 3370
3372 if (!op->invisible) 3371 if (!op->invisible)
3373 { 3372 {
3374 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3373 who->statusmsg (format (
3375 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3374 "You ready %s."
3375 "You can now use the skill: %s.",
3376 query_name (op),
3377 &op->skill
3378 ));
3376 } 3379 }
3377 else 3380 else
3378 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3381 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
3379 } 3382 }
3380 else 3383 else
3381 { 3384 {
3382 SET_FLAG (op, FLAG_APPLIED); 3385 SET_FLAG (op, FLAG_APPLIED);
3383 change_abil (who, op); 3386 change_abil (who, op);
… …
3388 break; 3391 break;
3389 3392
3390 case BOW: 3393 case BOW:
3391 if (!check_weapon_power (who, op->last_eat)) 3394 if (!check_weapon_power (who, op->last_eat))
3392 { 3395 {
3393 new_draw_info (NDI_UNIQUE, 0, who,
3394 "That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER); 3396 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3395 3397
3396 if (tmp) 3398 if (tmp)
3397 insert_ob_in_ob (tmp, who); 3399 insert_ob_in_ob (tmp, who);
3398 3400
3399 return 1; 3401 return 1;
3400 } 3402 }
3401 3403
3402 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3404 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3403 { 3405 {
3404 new_draw_info (NDI_UNIQUE, 0, who,
3405 "The weapon does not recognize you as its owner. " 3406 who->failmsg ("The weapon does not recognize you as its owner. "
3406 "H<Its name indicates that it belongs to somebody else.>"); 3407 "H<Its name indicates that it belongs to somebody else.>");
3407 if (tmp) 3408 if (tmp)
3408 insert_ob_in_ob (tmp, who); 3409 insert_ob_in_ob (tmp, who);
3409 3410
3410 return 1; 3411 return 1;
… …
3416 case HORN: 3417 case HORN:
3417 /* check for skill, alter player status */ 3418 /* check for skill, alter player status */
3418 3419
3419 if (!skop) 3420 if (!skop)
3420 { 3421 {
3421 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO 3422 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3422 return 1; 3423 return 1;
3423 } 3424 }
3424 3425
3425 SET_FLAG (op, FLAG_APPLIED); 3426 SET_FLAG (op, FLAG_APPLIED);
3426 who->change_skill (skop); 3427 who->change_skill (skop);
3427 3428
3428 if (who->contr) 3429 if (who->contr)
3429 { 3430 {
3430 who->contr->ranged_ob = op; 3431 who->contr->ranged_ob = op;
3431 3432
3432 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3433 who->statusmsg (format ("You ready %s.", query_name (op)));
3433 3434
3434 if (op->type == BOW) 3435 if (op->type == BOW)
3435 { 3436 {
3436 who->current_weapon = op; 3437 who->current_weapon = op;
3437 change_abil (who, op); 3438 change_abil (who, op);
3438 new_draw_info_format (NDI_UNIQUE, 0, who,
3439 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3439 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3440 } 3440 }
3441 } 3441 }
3442 else 3442 else
3443 { 3443 {
3444 if (op->type == BOW) 3444 if (op->type == BOW)
… …
3454 { 3454 {
3455 //TODO: wtf does this do? shouldn't this be managed automatically (slots?) 3455 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3456 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER) 3456 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3457 unapply_special (who, who->contr->ranged_ob, 0); 3457 unapply_special (who, who->contr->ranged_ob, 0);
3458 3458
3459 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3459 who->statusmsg (format ("You ready your %s.", query_name (op)));
3460 3460
3461 who->contr->ranged_ob = op; 3461 who->contr->ranged_ob = op;
3462 } 3462 }
3463 break; 3463 break;
3464 3464
3465 default: 3465 default:
3466 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3466 who->statusmsg (format ("You apply %s.", query_name (op)));
3467 } /* end of switch op->type */ 3467 }
3468 3468
3469 SET_FLAG (op, FLAG_APPLIED); 3469 SET_FLAG (op, FLAG_APPLIED);
3470 3470
3471 if (tmp) 3471 if (tmp)
3472 tmp = insert_ob_in_ob (tmp, who); 3472 who->insert (tmp);
3473 3473
3474 who->update_stats (); 3474 who->update_stats ();
3475 3475
3476 /* We exclude spell casting objects. The fire code will set the 3476 /* We exclude spell casting objects. The fire code will set the
3477 * been applied flag when they are used - until that point, 3477 * been applied flag when they are used - until that point,
… …
3481 SET_FLAG (op, FLAG_BEEN_APPLIED); 3481 SET_FLAG (op, FLAG_BEEN_APPLIED);
3482 3482
3483 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3483 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3484 if (who->type == PLAYER) 3484 if (who->type == PLAYER)
3485 { 3485 {
3486 new_draw_info (NDI_UNIQUE, 0, who, 3486 who->failmsg (
3487 "Oops, it feels deadly cold! " 3487 "Oops, it feels deadly cold! "
3488 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); 3488 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3489 );
3489 SET_FLAG (op, FLAG_KNOWN_CURSED); 3490 SET_FLAG (op, FLAG_KNOWN_CURSED);
3490 } 3491 }
3491 3492
3492 if (who->type == PLAYER) 3493 if (object *pl = op->visible_to ())
3493 {
3494 /* if multiple objects were applied, update both slots */
3495 if (tmp)
3496 esrv_send_item (who, tmp);
3497
3498 esrv_send_item (who, op); 3494 esrv_send_item (pl, op);
3499 }
3500 3495
3501 return 0; 3496 return 0;
3502} 3497}
3503 3498
3504int 3499int
… …
3518int 3513int
3519auto_apply (object *op) 3514auto_apply (object *op)
3520{ 3515{
3521 object *tmp = NULL, *tmp2; 3516 object *tmp = NULL, *tmp2;
3522 int i; 3517 int i;
3518
3519 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3523 3520
3524 switch (op->type) 3521 switch (op->type)
3525 { 3522 {
3526 case SHOP_FLOOR: 3523 case SHOP_FLOOR:
3527 if (!op->has_random_items ()) 3524 if (!op->has_random_items ())
… …
3529 3526
3530 do 3527 do
3531 { 3528 {
3532 i = 10; /* let's give it 10 tries */ 3529 i = 10; /* let's give it 10 tries */
3533 while ((tmp = generate_treasure (op->randomitems, 3530 while ((tmp = generate_treasure (op->randomitems,
3534 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3531 op->stats.exp
3532 ? (int) op->stats.exp
3533 : max (op->map->difficulty, 5)))
3534 == NULL && --i);
3535
3535 if (tmp == NULL) 3536 if (tmp == NULL)
3536 return 0; 3537 return 0;
3538
3537 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3539 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3538 { 3540 {
3539 tmp->destroy (); 3541 tmp->destroy ();
3540 tmp = NULL; 3542 tmp = NULL;
3541 } 3543 }
… …
3544 3546
3545 tmp->x = op->x; 3547 tmp->x = op->x;
3546 tmp->y = op->y; 3548 tmp->y = op->y;
3547 SET_FLAG (tmp, FLAG_UNPAID); 3549 SET_FLAG (tmp, FLAG_UNPAID);
3548 insert_ob_in_map (tmp, op->map, NULL, 0); 3550 insert_ob_in_map (tmp, op->map, NULL, 0);
3549 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3550 identify (tmp); 3551 identify (tmp);
3551 break; 3552 break;
3552 3553
3553 case TREASURE: 3554 case TREASURE:
3554 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3555 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3561 /* If we generated an object and put it in this object inventory, 3562 /* If we generated an object and put it in this object inventory,
3562 * move it to the parent object as the current object is about 3563 * move it to the parent object as the current object is about
3563 * to disappear. An example of this item is the random_* stuff 3564 * to disappear. An example of this item is the random_* stuff
3564 * that is put inside other objects. 3565 * that is put inside other objects.
3565 */ 3566 */
3566 for (tmp = op->inv; tmp; tmp = tmp2)
3567 {
3568 tmp2 = tmp->below;
3569 tmp->remove ();
3570
3571 if (op->env) 3567 if (op->env)
3572 insert_ob_in_ob (tmp, op->env); 3568 while (op->inv)
3573 else 3569 op->env->insert (op->inv);
3574 tmp->destroy ();
3575 }
3576 3570
3577 op->destroy (); 3571 op->destroy ();
3578 break; 3572 break;
3579 } 3573 }
3580 return tmp ? 1 : 0; 3574
3575 return !!tmp;
3581} 3576}
3582 3577
3583/** 3578/**
3584 * fix_auto_apply goes through the entire map every time a map 3579 * fix_auto_apply goes through the entire map every time a map
3585 * is loaded or swapped in and performs special actions for 3580 * is loaded or swapped in and performs special actions for
… …
3599 3594
3600 if (tmp->inv) 3595 if (tmp->inv)
3601 { 3596 {
3602 object *invtmp, *invnext; 3597 object *invtmp, *invnext;
3603 3598
3604 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3599 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3605 { 3600 {
3606 invnext = invtmp->below; 3601 invnext = invtmp->below;
3607 3602
3608 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3603 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3609 auto_apply (invtmp); 3604 auto_apply (invtmp);
3610 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3605 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3611 { 3606 {
3612 while ((invtmp->stats.hp--) > 0) 3607 while (invtmp->stats.hp-- > 0)
3613 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3608 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3614 3609
3615 invtmp->randomitems = NULL; 3610 invtmp->randomitems = NULL;
3616 } 3611 }
3617 else if (invtmp && invtmp->arch 3612 else if (invtmp && invtmp->arch
… …
3729 /* check for hp, sp change */ 3724 /* check for hp, sp change */
3730 if (food->stats.hp != 0) 3725 if (food->stats.hp != 0)
3731 { 3726 {
3732 if (QUERY_FLAG (food, FLAG_CURSED)) 3727 if (QUERY_FLAG (food, FLAG_CURSED))
3733 { 3728 {
3734 assign (who->contr->killer, food->name); 3729 who->contr->killer = food;
3735 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3730 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3736 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3731 who->failmsg ("Eck!...that was poisonous!");
3737 } 3732 }
3738 else 3733 else
3739 { 3734 {
3740 if (food->stats.hp > 0) 3735 if (food->stats.hp > 0)
3741 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better."); 3736 who->statusmsg ("You begin to feel better.");
3742 else 3737 else
3743 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3738 who->failmsg ("Eck!...that was poisonous!");
3739
3744 who->stats.hp += food->stats.hp; 3740 who->stats.hp += food->stats.hp;
3745 } 3741 }
3746 } 3742 }
3743
3747 if (food->stats.sp != 0) 3744 if (food->stats.sp != 0)
3748 { 3745 {
3749 if (QUERY_FLAG (food, FLAG_CURSED)) 3746 if (QUERY_FLAG (food, FLAG_CURSED))
3750 { 3747 {
3751 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!"); 3748 who->failmsg ("You are drained of mana!");
3752 who->stats.sp -= food->stats.sp; 3749 who->stats.sp -= food->stats.sp;
3753 if (who->stats.sp < 0) 3750 if (who->stats.sp < 0)
3754 who->stats.sp = 0; 3751 who->stats.sp = 0;
3755 } 3752 }
3756 else 3753 else
3757 { 3754 {
3758 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3755 who->statusmsg ("You feel a rush of magical energy!");
3759 who->stats.sp += food->stats.sp; 3756 who->stats.sp += food->stats.sp;
3760 /* place limit on max sp from food? */ 3757 /* place limit on max sp from food? */
3761 } 3758 }
3762 } 3759 }
3760
3763 who->update_stats (); 3761 who->update_stats ();
3764} 3762}
3765 3763
3766/** 3764/**
3767 * Designed primarily to light torches/lanterns/etc. 3765 * Designed primarily to light torches/lanterns/etc.
… …
3777 item = find_marked_object (who); 3775 item = find_marked_object (who);
3778 if (item) 3776 if (item)
3779 { 3777 {
3780 if (lighter->last_eat && lighter->stats.food) 3778 if (lighter->last_eat && lighter->stats.food)
3781 { /* lighter gets used up */ 3779 { /* lighter gets used up */
3782 /* Split multiple lighters if they're being used up. Otherwise *
3783 * one charge from each would be used up. --DAMN */
3784 if (lighter->nrof > 1)
3785 {
3786 object *oneLighter = lighter->clone (); 3780 object *oneLighter = lighter->split ();
3787
3788 lighter->nrof -= 1;
3789 oneLighter->nrof = 1;
3790 oneLighter->stats.food--; 3781 oneLighter->stats.food--;
3791 esrv_send_item (who, lighter); 3782 who->insert (oneLighter);
3792 oneLighter = insert_ob_in_ob (oneLighter, who);
3793 esrv_send_item (who, oneLighter);
3794 }
3795 else
3796 lighter->stats.food--;
3797 } 3783 }
3798 else if (lighter->last_eat) 3784 else if (lighter->last_eat)
3785 {
3799 { /* no charges left in lighter */ 3786 /* no charges left in lighter */
3800 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3787 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3801 return; 3788 return;
3802 } 3789 }
3803 3790
3804 /* Perhaps we should split what we are trying to light on fire? 3791 /* Perhaps we should split what we are trying to light on fire?
3805 * I can't see many times when you would want to light multiple 3792 * I can't see many times when you would want to light multiple
… …
3811 3798
3812 save_throw_object (item, AT_FIRE, who); 3799 save_throw_object (item, AT_FIRE, who);
3813 3800
3814 if (item->destroyed ()) 3801 if (item->destroyed ())
3815 { 3802 {
3816 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name); 3803 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3817 /* Need to update the player so that the players glow radius 3804 /* Need to update the player so that the players glow radius
3818 * gets changed. 3805 * gets changed.
3819 */ 3806 */
3820 if (is_player_env) 3807 if (is_player_env)
3821 who->update_stats (); 3808 who->update_stats ();
3822 } 3809 }
3823 else 3810 else
3824 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3811 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3825 } 3812 }
3826 else /* nothing to light */ 3813 else
3827 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object."); 3814 who->failmsg ("You need to mark a lightable object.");
3828
3829} 3815}
3830 3816
3831/** 3817/**
3832 * op made some mistake with a scroll, this takes care of punishment. 3818 * op made some mistake with a scroll, this takes care of punishment.
3833 * scroll_failure()- hacked directly from spell_failure 3819 * scroll_failure()- hacked directly from spell_failure
… …
3840 3826
3841 if (failure <= -1 && failure > -15) 3827 if (failure <= -1 && failure > -15)
3842 { /* wonder */ 3828 { /* wonder */
3843 object *tmp; 3829 object *tmp;
3844 3830
3845 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!"); 3831 op->failmsg ("Your spell warps!");
3846 tmp = get_archetype (SPELL_WONDER); 3832 tmp = get_archetype (SPELL_WONDER);
3847 cast_wonder (op, op, 0, tmp); 3833 cast_wonder (op, op, 0, tmp);
3848 tmp->destroy (); 3834 tmp->destroy ();
3849 } 3835 }
3850 else if (failure <= -15 && failure > -35) 3836 else if (failure <= -15 && failure > -35)
3851 { /* drain mana */ 3837 { /* drain mana */
3852 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3838 op->failmsg ("Your mana is drained!");
3853 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3839 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3854 if (op->stats.sp < 0) 3840 if (op->stats.sp < 0)
3855 op->stats.sp = 0; 3841 op->stats.sp = 0;
3856 } 3842 }
3857 else if (settings.spell_failure_effects == TRUE) 3843 else if (settings.spell_failure_effects == TRUE)
3858 { 3844 {
3859 if (failure <= -35 && failure > -60) 3845 if (failure <= -35 && failure > -60)
3860 { /* confusion */ 3846 { /* confusion */
3861 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3847 op->failmsg ("The magic recoils on you!");
3862 confuse_player (op, op, power); 3848 confuse_player (op, op, power);
3863 } 3849 }
3864 else if (failure <= -60 && failure > -70) 3850 else if (failure <= -60 && failure > -70)
3865 { /* paralysis */ 3851 { /* paralysis */
3866 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!"); 3852 op->failmsg ("The magic recoils and paralyzes you!");
3867 paralyze_player (op, op, power); 3853 paralyze_player (op, op, power);
3868 } 3854 }
3869 else if (failure <= -70 && failure > -80) 3855 else if (failure <= -70 && failure > -80)
3870 { /* blind */ 3856 { /* blind */
3871 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3857 op->failmsg ("The magic recoils on you!");
3872 blind_player (op, op, power); 3858 blind_player (op, op, power);
3873 } 3859 }
3874 else if (failure <= -80) 3860 else if (failure <= -80)
3875 { /* blast the immediate area */ 3861 { /* blast the immediate area */
3876 object *tmp = get_archetype (LOOSE_MANA); 3862 object *tmp = get_archetype (LOOSE_MANA);
3877 cast_magic_storm (op, tmp, power); 3863 cast_magic_storm (op, tmp, power);
3878 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!"); 3864 op->failmsg ("You unleash uncontrolled mana!");
3879 tmp->destroy (); 3865 tmp->destroy ();
3880 } 3866 }
3881 } 3867 }
3882} 3868}
3883 3869
… …
3948 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3934 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3949 flag_change_face = 0; 3935 flag_change_face = 0;
3950 3936
3951 if (flag_change_face) 3937 if (flag_change_face)
3952 { 3938 {
3953 pl->animation_id = GET_ANIM_ID (change);
3954 pl->face = change->face; 3939 pl->face = change->face;
3955 3940 pl->animation_id = change->animation_id;
3956 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3941 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3957 SET_FLAG (pl, FLAG_ANIMATE);
3958 else
3959 CLEAR_FLAG (pl, FLAG_ANIMATE);
3960 } 3942 }
3961 3943
3962 /* check the special case of can't use weapons */ 3944 /* check the special case of can't use weapons */
3963 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3945 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3964 if (!strcmp (change->name, "monk")) 3946 if (!strcmp (change->name, "monk"))
… …
3995 3977
3996 marked = find_marked_object (pl); 3978 marked = find_marked_object (pl);
3997 3979
3998 if (!marked) 3980 if (!marked)
3999 { 3981 {
4000 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 3982 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
4001 return; 3983 return;
4002 } 3984 }
4003 3985
4004 if (!marked->slaying) 3986 if (!marked->slaying)
4005 { 3987 {
4006 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3988 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4007 return; 3989 return;
4008 } 3990 }
4009 3991
4010 /* check whether they are compatible or not */ 3992 /* check whether they are compatible or not */
4011 find = strstr (marked->slaying, transformer->arch->archname); 3993 find = strstr (marked->slaying, transformer->arch->archname);
4012 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 3994 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4013 { 3995 {
4014 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3996 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4015 return; 3997 return;
4016 } 3998 }
4017 3999
4018 find += strlen (transformer->arch->archname) + 1; 4000 find += strlen (transformer->arch->archname) + 1;
4019 /* Item can be used, now find how many and what it yields */ 4001 /* Item can be used, now find how many and what it yields */
… …
4029 else 4011 else
4030 yield = 1; 4012 yield = 1;
4031 4013
4032 while (isdigit (*find)) 4014 while (isdigit (*find))
4033 find++; 4015 find++;
4016
4034 while (*find == ' ') 4017 while (*find == ' ')
4035 find++; 4018 find++;
4036 4019
4037 memset (got, 0, MAX_BUF); 4020 memset (got, 0, MAX_BUF);
4038 4021
… …
4049 4032
4050 /* Now create new item, remove used ones when required. */ 4033 /* Now create new item, remove used ones when required. */
4051 new_item = get_archetype (got); 4034 new_item = get_archetype (got);
4052 if (!new_item) 4035 if (!new_item)
4053 { 4036 {
4054 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0)); 4037 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
4055 return; 4038 return;
4056 } 4039 }
4057 4040
4058 new_item->nrof = yield; 4041 new_item->nrof = yield;
4042
4059 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4043 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4060 insert_ob_in_ob (new_item, pl); 4044
4061 esrv_send_inventory (pl, pl); 4045 pl->insert (new_item);
4062 /* Eat up one item */ 4046 /* Eat up one item */
4063 decrease_ob_nr (marked, 1); 4047 marked->decrease ();
4064 4048
4065 /* Eat one transformer if needed */ 4049 /* Eat one transformer if needed */
4066 if (transformer->stats.food) 4050 if (transformer->stats.food)
4067 if (--transformer->stats.food == 0) 4051 if (--transformer->stats.food == 0)
4068 decrease_ob_nr (transformer, 1); 4052 transformer->decrease ();
4069} 4053}
4054

Diff Legend

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