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.113 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.172 by root, Mon Sep 29 10:32:50 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
581#define IMPROVE_DAMAGE 2 572#define IMPROVE_DAMAGE 2
582#define IMPROVE_WEIGHT 3 573#define IMPROVE_WEIGHT 3
583#define IMPROVE_ENCHANT 4 574#define IMPROVE_ENCHANT 4
584#define IMPROVE_STR 5 575#define IMPROVE_STR 5
585#define IMPROVE_DEX 6 576#define IMPROVE_DEX 6
586#define IMPROVE_CON 7 577#define IMPROVE_CON 7
587#define IMPROVE_WIS 8 578#define IMPROVE_WIS 8
588#define IMPROVE_CHA 9 579#define IMPROVE_CHA 9
589#define IMPROVE_INT 10 580#define IMPROVE_INT 10
590#define IMPROVE_POW 11 581#define IMPROVE_POW 11
591
592 582
593/** 583/**
594 * This does the prepare weapon scroll. 584 * This does the prepare weapon scroll.
595 * Checks for sacrifice, and so on. 585 * Checks for sacrifice, and so on.
596 */ 586 */
597
598int 587int
599prepare_weapon (object *op, object *improver, object *weapon) 588prepare_weapon (object *op, object *improver, object *weapon)
600{ 589{
601 int sacrifice_count, i; 590 int sacrifice_count, i;
602 char buf[MAX_BUF]; 591 char buf[MAX_BUF];
603 592
604 if (weapon->level != 0) 593 if (weapon->level != 0)
605 { 594 {
606 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 595 op->failmsg ("Weapon is already prepared!");
607 return 0; 596 return 0;
608 } 597 }
598
609 for (i = 0; i < NROFATTACKS; i++) 599 for (i = 0; i < NROFATTACKS; i++)
610 if (weapon->resist[i]) 600 if (weapon->resist[i])
611 break; 601 break;
612 602
613 /* If we break out, i will be less than nrofattacks, preventing 603 /* If we break out, i will be less than nrofattacks, preventing
… …
616 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 606 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
617 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 607 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
618 weapon->stats.exp || /* speed */ 608 weapon->stats.exp || /* speed */
619 weapon->stats.ac) /* AC - only taifu's I think */ 609 weapon->stats.ac) /* AC - only taifu's I think */
620 { 610 {
621 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.>");
622 return 0; 614 return 0;
623 } 615 }
616
624 sacrifice_count = check_sacrifice (op, improver); 617 sacrifice_count = check_sacrifice (op, improver);
625 if (sacrifice_count <= 0) 618 if (sacrifice_count <= 0)
626 return 0; 619 return 0;
620
627 weapon->level = isqrt (sacrifice_count); 621 weapon->level = isqrt (sacrifice_count);
628 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
629 eat_item (op, improver->slaying, sacrifice_count); 622 eat_item (op, improver->slaying, sacrifice_count);
630 623
631 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 ));
632 629
633 sprintf (buf, "%s's %s", &op->name, &weapon->name); 630 sprintf (buf, "%s's %s", &op->name, &weapon->name);
634 weapon->name = weapon->name_pl = buf; 631 weapon->name = weapon->name_pl = buf;
635 weapon->nrof = 0; /* prevents preparing n weapons in the same 632 weapon->nrof = 0; /* prevents preparing n weapons in the same
636 slot at once! */ 633 slot at once! */
637 decrease_ob (improver); 634 improver->decrease ();
638 weapon->last_eat = 0; 635 weapon->last_eat = 0;
639 return 1; 636 return 1;
640} 637}
641
642 638
643/** 639/**
644 * 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.
645 * This is the new improve weapon code. 641 * This is the new improve weapon code.
646 * 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.
… …
655improve_weapon (object *op, object *improver, object *weapon) 651improve_weapon (object *op, object *improver, object *weapon)
656{ 652{
657 int sacrifice_count, sacrifice_needed = 0; 653 int sacrifice_count, sacrifice_needed = 0;
658 654
659 if (improver->stats.sp == IMPROVE_PREPARE) 655 if (improver->stats.sp == IMPROVE_PREPARE)
660 {
661 return prepare_weapon (op, improver, weapon); 656 return prepare_weapon (op, improver, weapon);
662 } 657
663 if (weapon->level == 0) 658 if (weapon->level == 0)
664 { 659 {
665 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.>");
666 return 0; 661 return 0;
667 } 662 }
663
668 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 664 if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
669 { 665 {
670 new_draw_info (NDI_UNIQUE, 0, op, "This weapon cannot be improved any more."); 666 op->failmsg ("This weapon cannot be improved any more.");
671 return 0; 667 return 0;
672 } 668 }
669
673 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))
674 { 671 {
675 new_draw_info (NDI_UNIQUE, 0, op, "Improving the weapon will make it too"); 672 op->failmsg ("Improving the weapon will make it too "
676 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 "
677 new_draw_info (NDI_UNIQUE, 0, op, "really want to improve it."); 674 "really want to improve it.");
678 return 0; 675 return 0;
679 } 676 }
677
680 /* 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
681 * 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,
682 * 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
683 * weapon can be improved. 681 * weapon can be improved.
684 */ 682 */
685 if (improver->stats.sp == IMPROVE_DAMAGE) 683 if (improver->stats.sp == IMPROVE_DAMAGE)
686 { 684 {
687 weapon->stats.dam += 5; 685 weapon->stats.dam += 5;
688 weapon->weight += 5000; /* 5 KG's */ 686 weapon->weight += 5000; /* 5 KG's */
689 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));
690 weapon->last_eat++; 688 weapon->last_eat++;
691 689
692 weapon->item_power++; 690 weapon->item_power++;
693 decrease_ob (improver); 691 improver->decrease ();
694 return 1; 692 return 1;
695 } 693 }
694
696 if (improver->stats.sp == IMPROVE_WEIGHT) 695 if (improver->stats.sp == IMPROVE_WEIGHT)
697 { 696 {
698 /* Reduce weight by 20% */ 697 /* Reduce weight by 20% */
699 weapon->weight = (weapon->weight * 8) / 10; 698 weapon->weight = (weapon->weight * 8) / 10;
700 if (weapon->weight < 1) 699 if (weapon->weight < 1)
701 weapon->weight = 1; 700 weapon->weight = 1;
701
702 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));
703 weapon->last_eat++; 703 weapon->last_eat++;
704 weapon->item_power++; 704 weapon->item_power++;
705 decrease_ob (improver); 705 improver->decrease ();
706 return 1; 706 return 1;
707 } 707 }
708
708 if (improver->stats.sp == IMPROVE_ENCHANT) 709 if (improver->stats.sp == IMPROVE_ENCHANT)
709 { 710 {
710 weapon->magic++; 711 weapon->magic++;
711 weapon->last_eat++; 712 weapon->last_eat++;
712 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));
713 decrease_ob (improver); 714 improver->decrease ();
714 weapon->item_power++; 715 weapon->item_power++;
715 return 1; 716 return 1;
716 } 717 }
717 718
718 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
723 sacrifice_needed *= 2; 724 sacrifice_needed *= 2;
724 725
725 sacrifice_count = check_sacrifice (op, improver); 726 sacrifice_count = check_sacrifice (op, improver);
726 if (sacrifice_count < sacrifice_needed) 727 if (sacrifice_count < sacrifice_needed)
727 { 728 {
728 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));
729 return 0; 730 return 0;
730 } 731 }
732
731 eat_item (op, improver->slaying, sacrifice_needed); 733 eat_item (op, improver->slaying, sacrifice_needed);
732 weapon->item_power++; 734 weapon->item_power++;
733 735
734 switch (improver->stats.sp) 736 switch (improver->stats.sp)
735 { 737 {
736 case IMPROVE_STR:
737 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");
738 case IMPROVE_DEX:
739 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");
740 case IMPROVE_CON:
741 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");
742 case IMPROVE_WIS:
743 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");
744 case IMPROVE_CHA:
745 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");
746 case IMPROVE_INT:
747 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");
748 case IMPROVE_POW:
749 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");
750 default: 745 default:
751 new_draw_info (NDI_UNIQUE, 0, op, "Unknown improvement type."); 746 op->failmsg ("Unknown improvement type.");
752 } 747 }
748
753 LOG (llevError, "improve_weapon: Got to end of function\n"); 749 LOG (llevError, "improve_weapon: Got to end of function\n");
754 return 0; 750 return 0;
755} 751}
756 752
757/** 753/**
… …
767 if (op->type != PLAYER) 763 if (op->type != PLAYER)
768 return 0; 764 return 0;
769 765
770 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))
771 { 767 {
772 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 768 op->failmsg ("Something blocks the magic of the scroll!");
773 return 0; 769 return 0;
774 } 770 }
775 771
776 otmp = find_marked_object (op); 772 otmp = find_marked_object (op);
773
777 if (!otmp) 774 if (!otmp)
778 { 775 {
779 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.>");
780 return 0; 777 return 0;
781 } 778 }
782 779
783 if (otmp->type != WEAPON && otmp->type != BOW) 780 if (otmp->type != WEAPON && otmp->type != BOW)
784 { 781 {
785 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!");
786 return 0; 783 return 0;
787 } 784 }
788 785
789 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 786 op->statusmsg ("Applied weapon builder.");
787
790 improve_weapon (op, tmp, otmp); 788 improve_weapon (op, tmp, otmp);
791 esrv_send_item (op, otmp); 789 esrv_send_item (op, otmp);
792 return 1; 790 return 1;
793} 791}
794 792
… …
819{ 817{
820 object *tmp; 818 object *tmp;
821 819
822 if (armour->magic >= settings.armor_max_enchant) 820 if (armour->magic >= settings.armor_max_enchant)
823 { 821 {
824 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!");
825 return 0; 823 return 0;
826 } 824 }
825
827 /* 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,
828 * 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.
829 * 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
830 * of gnarg and what not?) 829 * of gnarg and what not?)
831 */ 830 */
832 if (armour->title) 831 if (armour->title)
833 { 832 {
834 new_draw_info (NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 833 op->failmsg ("This armour will not accept further enchantment.");
835 return 0; 834 return 0;
836 } 835 }
837 836
838 /* Split objects if needed. Can't insert tmp until the 837 /* Split objects if needed. Can't insert tmp until the
839 * end of this function - otherwise it will just re-merge. 838 * end of this function - otherwise it will just re-merge.
840 */ 839 */
841 if (armour->nrof > 1) 840 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
842 tmp = get_split_ob (armour, armour->nrof - 1);
843 else
844 tmp = NULL;
845 841
846 armour->magic++; 842 armour->magic++;
847 843
848 if (!settings.armor_speed_linear) 844 if (!settings.armor_speed_linear)
849 { 845 {
… …
886 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);
887 883
888 if (op->type == PLAYER) 884 if (op->type == PLAYER)
889 { 885 {
890 esrv_send_item (op, armour); 886 esrv_send_item (op, armour);
887
891 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
892 op->update_stats (); 889 op->update_stats ();
893 } 890 }
894 decrease_ob (improver); 891
892 improver->decrease ();
893
895 if (tmp) 894 if (tmp)
896 { 895 op->insert (tmp);
897 insert_ob_in_ob (tmp, op); 896
898 esrv_send_item (op, tmp);
899 }
900 return 1; 897 return 1;
901} 898}
902
903 899
904/* 900/*
905 * 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
906 * what the converter wants, -1 if the converter is broken. 902 * what the converter wants, -1 if the converter is broken.
907 */ 903 *
908#define CONV_FROM(xyz) xyz->slaying
909#define CONV_TO(xyz) xyz->other_arch
910#define CONV_NR(xyz) xyz->stats.sp
911#define CONV_NEED(xyz) xyz->stats.food
912
913/* Takes one items and makes another. 904 * Takes one type of items and makes another.
914 * converter is the object that is doing the conversion. 905 * converter is the object that is doing the conversion.
915 * 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
916 * what the converter wants, this will not do anything. 907 * what the converter wants, this will not do anything.
917 */ 908 */
918int 909static int
919convert_item (object *item, object *converter) 910convert_item (object *item, object *converter)
920{ 911{
921 int nr = 0;
922 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;
923 921
924 /* 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,
925 * 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
926 * 3 gp and player drops a platinum, tough luck) 924 * 3 gp and player drops a platinum, tough luck)
927 */ 925 */
928 if (!strcmp (CONV_FROM (converter), "money")) 926 if (conv_from == shstr_money)
929 { 927 {
930 int cost;
931
932 if (item->type != MONEY) 928 if (item->type != MONEY)
933 return 0; 929 return 0;
934 930
935 nr = (item->nrof * item->value) / CONV_NEED (converter); 931 nr = sint64 (item->nrof) * item->value / need;
936 if (!nr) 932 if (!nr)
937 return 0; 933 return 0;
938 cost = nr * CONV_NEED (converter) / item->value; 934
939 /* take into account rounding errors */ 935 converter->play_sound (sound_find ("shop_buy"));
940 if (nr * CONV_NEED (converter) % item->value) 936
941 cost++; 937 sint64 cost = (nr * need + item->value - 1) / item->value;
942 decrease_ob_nr (item, cost); 938
939 item->decrease (cost);
943 940
944 price_in = cost * item->value; 941 price_in = cost * item->value;
945 } 942 }
946 else 943 else
947 { 944 {
948 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 945 if (item->type == PLAYER
949 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 946 || conv_from != item->arch->archname
947 || (need && need > (uint16) item->nrof))
950 return 0; 948 return 0;
951 949
952 if (CONV_NEED (converter)) 950 converter->play_sound (sound_find ("convert_item"));
951
952 if (need)
953 { 953 {
954 nr = item->nrof / CONV_NEED (converter); 954 nr = sint64 (item->nrof) / need;
955 decrease_ob_nr (item, nr * CONV_NEED (converter)); 955 item->decrease (nr * need);
956 price_in = nr * CONV_NEED (converter) * item->value; 956 price_in = nr * need * item->value;
957 } 957 }
958 else 958 else
959 { 959 {
960 price_in = item->value; 960 price_in = item->value;
961 item->destroy (); 961 item->destroy ();
962 } 962 }
963 } 963 }
964 964
965 if (converter->inv != NULL) 965 if (converter->inv)
966 { 966 {
967 object *ob; 967 object *ob;
968 int i; 968 int i;
969 object *ob_to_copy; 969 object *ob_to_copy;
970 970
971 /* select random object from inventory to copy */ 971 /* select random object from inventory to copy */
972 ob_to_copy = converter->inv; 972 ob_to_copy = converter->inv;
973 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++)
974 {
975 if (rndm (0, i) == 0) 974 if (rndm (0, i) == 0)
976 {
977 ob_to_copy = ob; 975 ob_to_copy = ob;
978 } 976
979 } 977 item = ob_to_copy->deep_clone ();
980 item = object_create_clone (ob_to_copy);
981 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
982 unflag_inv (item, FLAG_IS_A_TEMPLATE); 979 unflag_inv (item, FLAG_IS_A_TEMPLATE);
983 } 980 }
984 else 981 else
985 { 982 {
986 if (converter->other_arch == NULL) 983 if (!conv_to)
987 { 984 {
988 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",
989 &converter->name, &converter->map->path, converter->x, converter->y); 986 &converter->name, &converter->map->path, converter->x, converter->y);
990 return -1; 987 return -1;
991 } 988 }
992 989
993 item = object_create_arch (converter->other_arch); 990 item = object_create_arch (conv_to);
994 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
995 } 992 }
996 993
997 if (CONV_NR (converter)) 994 if (give)
998 item->nrof = CONV_NR (converter); 995 item->nrof = give;
996
999 if (nr) 997 if (nr)
1000 item->nrof *= nr; 998 item->nrof *= nr;
999
1001 if (is_in_shop (converter)) 1000 if (is_in_shop (converter))
1002 SET_FLAG (item, FLAG_UNPAID); 1001 SET_FLAG (item, FLAG_UNPAID);
1003 else if (price_in < item->nrof * item->value) 1002 else if (price_in < sint64 (item->nrof) * item->value)
1004 { 1003 {
1005 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1004 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1006 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1005 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1007
1008 /** 1006 /**
1009 * elmex: we are going to let the game continue, as the mapcreator 1007 * elmex: we are going to let the game continue, as the mapcreator
1010 * probably had something in mind when doing this 1008 * hopefully had something in mind when doing this.
1011 */ 1009 */
1012 } 1010 }
1011
1012 // elmex: only identify if we need to, for example so that generated money doesn't
1013 // get an 'identified' flag so easily.
1014 if (need_identify (item))
1015 identify (item);
1016
1013 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1017 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1014 return 1; 1018 return 1;
1015} 1019}
1016 1020
1017/** 1021/**
… …
1034 1038
1035 op->contr->last_used = 0; 1039 op->contr->last_used = 0;
1036 1040
1037 if (sack->env && sack->env != op) 1041 if (sack->env && sack->env != op)
1038 { 1042 {
1039 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first."); 1043 op->failmsg ("You must put it onto the floor or into your inventory first.");
1040 return 1; 1044 return 1;
1041 } 1045 }
1042 1046
1043 // already applied == open on ground, or open in inv, or active in inv 1047 // already applied == open on ground, or open in inv, or active in inv
1044 if (sack->flag [FLAG_APPLIED]) 1048 if (sack->flag [FLAG_APPLIED])
… …
1050 return 1; 1054 return 1;
1051 } 1055 }
1052 else if (!sack->env) 1056 else if (!sack->env)
1053 { 1057 {
1054 // active, but not ours: some other player has opened it 1058 // active, but not ours: some other player has opened it
1055 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1059 op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
1056 return 1; 1060 return 1;
1057 } 1061 }
1058 1062
1059 // fall through to opening it (active in inv) 1063 // fall through to opening it (active in inv)
1060 } 1064 }
… …
1062 { 1066 {
1063 // it is in our env, so activate it, do not open yet 1067 // it is in our env, so activate it, do not open yet
1064 op->close_container (); 1068 op->close_container ();
1065 sack->flag [FLAG_APPLIED] = 1; 1069 sack->flag [FLAG_APPLIED] = 1;
1066 esrv_update_item (UPD_FLAGS, op, sack); 1070 esrv_update_item (UPD_FLAGS, op, sack);
1067 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack)); 1071 op->statusmsg (format ("You ready %s.", query_name (sack)));
1068 return 1; 1072 return 1;
1069 } 1073 }
1070 1074
1071 // it's locked? 1075 // it's locked?
1072 if (sack->slaying) 1076 if (sack->slaying)
1073 { 1077 {
1074 if (object *tmp = find_key (op, op, sack)) 1078 if (object *tmp = find_key (op, op, sack))
1075 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp)); 1079 op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
1076 else 1080 else
1077 { 1081 {
1078 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack)); 1082 op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
1079 return 1; 1083 return 1;
1080 } 1084 }
1081 } 1085 }
1082 1086
1083 op->open_container (sack); 1087 op->open_container (sack);
… …
1102 * with an altar. We call it a Potion - altars are stationary - it 1106 * with an altar. We call it a Potion - altars are stationary - it
1103 * is up to map designers to use them properly. 1107 * is up to map designers to use them properly.
1104 */ 1108 */
1105 if (altar->inv && altar->inv->type == SPELL) 1109 if (altar->inv && altar->inv->type == SPELL)
1106 { 1110 {
1107 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name); 1111 originator->statusmsg (format ("The altar casts %s.", &altar->inv->name));
1108 cast_spell (originator, altar, 0, altar->inv, NULL); 1112 cast_spell (originator, altar, 0, altar->inv, NULL);
1109 /* If it is connected, push the button. Fixes some problems with 1113 /* If it is connected, push the button. Fixes some problems with
1110 * old maps. 1114 * old maps.
1111 */ 1115 */
1112 1116
1113/* push_button (altar);*/ 1117/* push_button (altar);*/
1114 } 1118 }
… …
1138 double opinion; 1142 double opinion;
1139 object *tmp, *next; 1143 object *tmp, *next;
1140 1144
1141 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1145 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1142 1146
1147 bool has_unpaid = false;
1148
1149 // quite inefficient to do this here twice, but the api doesn'T lend itself to
1150 // a quick and small change :(
1151 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1152 if (item->flag [FLAG_UNPAID])
1153 {
1154 has_unpaid = true;
1155 break;
1156 }
1157
1143 if (op->type != PLAYER) 1158 if (op->type != PLAYER)
1144 { 1159 {
1145 /* Remove all the unpaid objects that may be carried here. 1160 /* Remove all the unpaid objects that may be carried here.
1146 * This could be pets or monsters that are somehow in 1161 * This could be pets or monsters that are somehow in
1147 * the shop. 1162 * the shop.
… …
1173 /* unpaid objects, or non living objects, can't transfer by 1188 /* unpaid objects, or non living objects, can't transfer by
1174 * shop mats. Instead, put it on a nearby space. 1189 * shop mats. Instead, put it on a nearby space.
1175 */ 1190 */
1176 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1191 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1177 { 1192 {
1178
1179 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1193 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1180 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1194 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1181 1195
1182 if (i != -1) 1196 if (i != -1)
1183 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1197 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
… …
1192 else if (can_pay (op) && get_payment (op)) 1206 else if (can_pay (op) && get_payment (op))
1193 { 1207 {
1194 /* this is only used for players */ 1208 /* this is only used for players */
1195 rv = teleport (shop_mat, SHOP_MAT, op); 1209 rv = teleport (shop_mat, SHOP_MAT, op);
1196 1210
1211 if (has_unpaid)
1212 op->contr->play_sound (sound_find ("shop_buy"));
1213 else if (is_in_shop (op))
1214 op->contr->play_sound (sound_find ("shop_enter"));
1215 else
1216 op->contr->play_sound (sound_find ("shop_leave"));
1217
1197 if (shop_mat->msg) 1218 if (shop_mat->msg)
1198 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1219 op->statusmsg (shop_mat->msg);
1199 /* This check below is a bit simplistic - generally it should be correct, 1220 /* This check below is a bit simplistic - generally it should be correct,
1200 * but there is never a guarantee that the bottom space on the map is 1221 * but there is never a guarantee that the bottom space on the map is
1201 * actually the shop floor. 1222 * actually the shop floor.
1202 */ 1223 */
1203 else if (!rv && !is_in_shop (op)) 1224 else if (!rv && !is_in_shop (op))
1204 { 1225 {
1205 opinion = shopkeeper_approval (op->map, op); 1226 opinion = shopkeeper_approval (op->map, op);
1206 1227
1207 if (opinion > 0.9) 1228 op->statusmsg (
1208 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1229 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
1209 else if (opinion > 0.75) 1230 : opinion >= 0.75 ? "The shopkeeper waves to you."
1210 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1231 : opinion >= 0.50 ? "The shopkeeper ignores you."
1211 else if (opinion > 0.5) 1232 : "The shopkeeper glares at you with contempt."
1212 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1213 else 1233 );
1214 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1215 } 1234 }
1216 } 1235 }
1217 else 1236 else
1218 { 1237 {
1219 /* if we get here, a player tried to leave a shop but was not able 1238 /* if we get here, a player tried to leave a shop but was not able
1220 * to afford the items he has. We try to move the player so that 1239 * to afford the items he has. We try to move the player so that
1221 * they are not on the mat anymore 1240 * they are not on the mat anymore
1222 */ 1241 */
1223 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1242 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1224 1243
1225 if (i == -1) 1244 if (i == -1)
1226 {
1227 LOG (llevError, "Internal shop-mat problem.\n"); 1245 LOG (llevError, "Internal shop-mat problem.\n");
1228 }
1229 else 1246 else
1230 { 1247 {
1231 op->remove (); 1248 op->remove ();
1232 op->x += freearr_x[i]; 1249 op->x += freearr_x[i];
1233 op->y += freearr_y[i]; 1250 op->y += freearr_y[i];
… …
1243 * Handles applying a sign. 1260 * Handles applying a sign.
1244 */ 1261 */
1245static void 1262static void
1246apply_sign (object *op, object *sign, int autoapply) 1263apply_sign (object *op, object *sign, int autoapply)
1247{ 1264{
1248 readable_message_type *msgType; 1265 if (sign->has_dialogue ())
1249
1250 if (sign->msg == NULL)
1251 { 1266 {
1252 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1267 op->statusmsg (form ("Maybe you should I<talk> to the %s instead?", &sign->name));
1253 return; 1268 return;
1254 } 1269 }
1255 1270
1271 if (!sign->msg)
1272 {
1273 op->statusmsg ("Nothing is written on it.");
1274 return;
1275 }
1276
1256 if (sign->stats.food) 1277 if (sign->stats.food)
1257 { 1278 {
1258 if (sign->last_eat >= sign->stats.food) 1279 if (sign->last_eat >= sign->stats.food)
1259 { 1280 {
1260 if (!sign->move_on) 1281 if (!sign->move_on)
1261 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1282 op->statusmsg ("You cannot read it anymore.");
1283
1262 return; 1284 return;
1263 } 1285 }
1264 1286
1265 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1287 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1266 sign->last_eat++; 1288 sign->last_eat++;
… …
1271 * move_on is zero, it needs to be manually applied (doesn't talk 1293 * move_on is zero, it needs to be manually applied (doesn't talk
1272 * to us). 1294 * to us).
1273 */ 1295 */
1274 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1296 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1275 { 1297 {
1276 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1298 op->failmsg ("You are unable to read while blind!");
1277 return; 1299 return;
1278 } 1300 }
1279 1301
1280 if (op->contr) 1302 if (op->contr)
1281 if (client *ns = op->contr->ns) 1303 if (client *ns = op->contr->ns)
1282 { 1304 {
1283 msgType = get_readable_message_type (sign); 1305 if (sign->sound)
1306 ns->play_sound (sign->sound);
1307 else if (autoapply)
1308 ns->play_sound (sound_find ("msg_voice"));
1284 1309
1285 if (ns->can_msg) 1310 if (ns->can_msg)
1286 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg); 1311 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1287 else 1312 else
1288 { 1313 {
1289 char newbuf[HUGE_BUF]; 1314 readable_message_type *msgType = get_readable_message_type (sign);
1290 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg); 1315 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1291 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1316 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1292 } 1317 }
1293 } 1318 }
1319}
1320
1321static void
1322move_apply_hole (object *trap, object *victim)
1323{
1324 /* Hole not open? */
1325 if (trap->stats.wc > 0)
1326 return;
1327
1328 /* Is this a multipart monster and not the head? If so, return.
1329 * Processing will happen if the head runs into the pit
1330 */
1331 if (victim->head)
1332 return;
1333
1334 // now find all possible locations and randomly pick one
1335 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1336 trap->range >= 3 ? SIZEOFFREE3 + 1
1337 : trap->range >= 2 ? SIZEOFFREE2 + 1
1338 : trap->range >= 1 ? SIZEOFFREE1 + 1
1339 : SIZEOFFREE0 + 1);
1340
1341 if (dir < 0)
1342 return;
1343
1344 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1345 victim->statusmsg ("You fall through the hole!", NDI_RED);
1346
1347 transfer_ob (victim,
1348 EXIT_X (trap) + freearr_x[dir],
1349 EXIT_Y (trap) + freearr_y[dir],
1350 0, victim);
1294} 1351}
1295 1352
1296/** 1353/**
1297 * 'victim' moves onto 'trap' 1354 * 'victim' moves onto 'trap'
1298 * 'victim' leaves 'trap' 1355 * 'victim' leaves 'trap'
… …
1410 1467
1411 if (!trap->value) 1468 if (!trap->value)
1412 { 1469 {
1413 int tot; 1470 int tot;
1414 1471
1415 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1472 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1416 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1473 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1417 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1474 tot += ab->head_ ()->total_weight ();
1418 1475
1419 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1476 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1420 goto leave; 1477 goto leave;
1421 1478
1422 SET_ANIMATION (trap, trap->value); 1479 SET_ANIMATION (trap, trap->value);
… …
1432 1489
1433 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1490 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1434 { 1491 {
1435 if (!sound_was_played) 1492 if (!sound_was_played)
1436 { 1493 {
1437 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1494 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1438 sound_was_played = 1; 1495 sound_was_played = 1;
1439 } 1496 }
1440 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1497
1498 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1441 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1499 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1442 } 1500 }
1443 } 1501 }
1444 goto leave; 1502 goto leave;
1445 } 1503 }
1446 1504
1447
1448 case CONVERTER: 1505 case CONVERTER:
1449 if (convert_item (victim, trap) < 0) 1506 if (convert_item (victim, trap) < 0)
1450 { 1507 {
1451 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1508 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1452 get_archetype ("burnout")->insert_at (trap, trap); 1509 archetype::get (shstr_burnout)->insert_at (trap, trap);
1453 } 1510 }
1454 1511
1455 goto leave; 1512 goto leave;
1456 1513
1457 case TRIGGER_BUTTON: 1514 case TRIGGER_BUTTON:
… …
1467 case CHECK_INV: 1524 case CHECK_INV:
1468 check_inv (victim, trap); 1525 check_inv (victim, trap);
1469 goto leave; 1526 goto leave;
1470 1527
1471 case HOLE: 1528 case HOLE:
1472 /* Hole not open? */ 1529 move_apply_hole (trap, victim);
1473 if (trap->stats.wc > 0)
1474 goto leave;
1475
1476 /* Is this a multipart monster and not the head? If so, return.
1477 * Processing will happen if the head runs into the pit
1478 */
1479 if (victim->head)
1480 goto leave;
1481
1482 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE);
1483 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1484 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1485 goto leave; 1530 goto leave;
1486 1531
1487 case EXIT: 1532 case EXIT:
1488 if (victim->type == PLAYER && EXIT_PATH (trap)) 1533 if (victim->type == PLAYER && EXIT_PATH (trap))
1489 { 1534 {
1490 /* Basically, don't show exits leading to random maps the 1535 /* Basically, don't show exits leading to random maps the
1491 * players output. 1536 * players output.
1492 */ 1537 */
1493 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1538 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1494 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1539 victim->statusmsg (trap->msg, NDI_NAVY);
1495 1540
1541 trap->play_sound (trap->sound);
1496 victim->enter_exit (trap); 1542 victim->enter_exit (trap);
1497 } 1543 }
1498 goto leave; 1544 goto leave;
1499 1545
1500 case ENCOUNTER: 1546 case ENCOUNTER:
… …
1522 goto leave; 1568 goto leave;
1523 1569
1524 case RUNE: 1570 case RUNE:
1525 case TRAP: 1571 case TRAP:
1526 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1572 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1527 {
1528 spring_trap (trap, victim); 1573 spring_trap (trap, victim);
1529 }
1530 goto leave; 1574 goto leave;
1531 1575
1532 default: 1576 default:
1533 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1577 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1534 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type); 1578 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
… …
1548 int lev_diff; 1592 int lev_diff;
1549 object *skill_ob; 1593 object *skill_ob;
1550 1594
1551 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1595 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1552 { 1596 {
1553 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1597 op->failmsg ("You are unable to read while blind!");
1554 return; 1598 return;
1555 } 1599 }
1556 1600
1557 if (!tmp->msg) 1601 if (!tmp->msg)
1558 { 1602 {
1559 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1603 op->failmsg (format ("You open the %s and find it empty.", &tmp->name));
1560 return; 1604 return;
1561 } 1605 }
1562 1606
1563 /* need a literacy skill to read stuff! */ 1607 /* need a literacy skill to read stuff! */
1564 skill_ob = find_skill_by_name (op, tmp->skill); 1608 skill_ob = find_skill_by_name (op, tmp->skill);
1565 if (!skill_ob) 1609 if (!skill_ob)
1566 { 1610 {
1567 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1611 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
1568 return; 1612 return;
1569 } 1613 }
1570 1614
1571 lev_diff = tmp->level - (skill_ob->level + 5); 1615 lev_diff = tmp->level - (skill_ob->level + 5);
1572 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1616 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1573 { 1617 {
1574 if (lev_diff < 2) 1618 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1575 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1619 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1576 else if (lev_diff < 3) 1620 : lev_diff < 5 ? "This book is beyond your comprehension."
1577 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension."); 1621 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1578 else if (lev_diff < 5) 1622 : lev_diff < 15 ? "This book is way beyond your comprehension."
1579 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension."); 1623 : "This book is totally beyond your comprehension.");
1580 else if (lev_diff < 8)
1581 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension.");
1582 else if (lev_diff < 15)
1583 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension.");
1584 else
1585 new_draw_info (NDI_UNIQUE, 0, op, "This book is totally beyond your comprehension.");
1586 return; 1624 return;
1587 } 1625 }
1588 1626
1589 readable_message_type *msgType = get_readable_message_type (tmp); 1627 readable_message_type *msgType = get_readable_message_type (tmp);
1590 1628
1591 if (player *pl = op->contr) 1629 if (player *pl = op->contr)
1592 if (client *ns = pl->ns) 1630 if (client *ns = pl->ns)
1593 if (ns->can_msg) 1631 if (ns->can_msg)
1594 { 1632 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1595 dynbuf_text buf;
1596 buf << long_desc (tmp, op)
1597 << "\n\n"
1598 << tmp->msg
1599 << '\0';
1600 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1601 }
1602 else 1633 else
1603 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1634 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1604 msgType->message_type, msgType->message_subtype, 1635 msgType->message_type, msgType->message_subtype,
1605 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1636 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1606 long_desc (tmp, op), &tmp->msg); 1637 long_desc (tmp, op), &tmp->msg);
… …
1613 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1644 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1614 { 1645 {
1615 /*exp_gain *= 2; because they just identified it too */ 1646 /*exp_gain *= 2; because they just identified it too */
1616 SET_FLAG (tmp, FLAG_IDENTIFIED); 1647 SET_FLAG (tmp, FLAG_IDENTIFIED);
1617 1648
1618 /* If in a container, update how it looks */ 1649 if (object *pl = tmp->visible_to ())
1619 if (tmp->env)
1620 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1650 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1621 else
1622 op->contr->ns->floorbox_update ();
1623 } 1651 }
1624 1652
1625 change_exp (op, exp_gain, skill_ob->skill, 0); 1653 change_exp (op, exp_gain, skill_ob->skill, 0);
1626 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1654 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1627 } 1655 }
… …
1632 * op is the person learning the skill, tmp is the skill scroll object 1660 * op is the person learning the skill, tmp is the skill scroll object
1633 */ 1661 */
1634static void 1662static void
1635apply_skillscroll (object *op, object *tmp) 1663apply_skillscroll (object *op, object *tmp)
1636{ 1664{
1637 switch ((int) learn_skill (op, tmp)) 1665 switch (learn_skill (op, tmp))
1638 { 1666 {
1639 case 0: 1667 case 0:
1640 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge "); 1668 op->play_sound (sound_find ("generic_fail"));
1641 new_draw_info_format (NDI_UNIQUE, 0, op, "held within the %s.\n", query_name (tmp)); 1669 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1642 return; 1670 break;
1643 1671
1644 case 1: 1672 case 1:
1645 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1646 decrease_ob (tmp); 1673 tmp->decrease ();
1674 op->play_sound (sound_find ("skill_learn"));
1675 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1647 return; 1676 break;
1648 1677
1649 default: 1678 default:
1679 tmp->decrease ();
1680 op->play_sound (sound_find ("generic_fail"));
1650 new_draw_info_format (NDI_UNIQUE, 0, op, "You fail to learn the knowledge of the %s.\n", query_name (tmp)); 1681 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1651 decrease_ob (tmp);
1652 return; 1682 break;
1653 } 1683 }
1654} 1684}
1655 1685
1656/** 1686/**
1657 * Actually makes op learn spell. 1687 * Actually makes op learn spell.
… …
1677 return; 1707 return;
1678 } 1708 }
1679 return; 1709 return;
1680 } 1710 }
1681 1711
1682 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1712 op->contr->play_sound (sound_find ("learn_spell"));
1713
1683 tmp = spell->clone (); 1714 tmp = spell->clone ();
1684 insert_ob_in_ob (tmp, op); 1715 insert_ob_in_ob (tmp, op);
1685 1716
1686 if (special_prayer) 1717 if (special_prayer)
1687 SET_FLAG (tmp, FLAG_STARTEQUIP); 1718 SET_FLAG (tmp, FLAG_STARTEQUIP);
… …
1706 { 1737 {
1707 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1738 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1708 return; 1739 return;
1709 } 1740 }
1710 1741
1711 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1742 op->failmsg (format ("You lose knowledge of %s.", spell));
1712 player_unready_range_ob (op->contr, spob); 1743 player_unready_range_ob (op->contr, spob);
1713 esrv_remove_spell (op->contr, spob); 1744 esrv_remove_spell (op->contr, spob);
1714 spob->destroy (); 1745 spob->destroy ();
1715} 1746}
1716 1747
… …
1724{ 1755{
1725 object *skop, *spell, *spell_skill; 1756 object *skop, *spell, *spell_skill;
1726 1757
1727 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1758 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1728 { 1759 {
1729 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1760 op->failmsg ("You are unable to read while blind.");
1730 return; 1761 return;
1731 } 1762 }
1732 1763
1733 /* artifact_spellbooks have 'slaying' field point to a spell name, 1764 /* artifact_spellbooks have 'slaying' field point to a spell name,
1734 * instead of having their spell stored in stats.sp. These are 1765 * instead of having their spell stored in stats.sp. These are
1735 * legacy spellbooks 1766 * legacy spellbooks
1736 */ 1767 */
1737
1738 if (tmp->slaying != NULL) 1768 if (tmp->slaying)
1739 { 1769 {
1740 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1770 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1741 if (!spell) 1771 if (!spell)
1742 { 1772 {
1743 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1773 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1744 return; 1774 return;
1745 } 1775 }
1746 else 1776 else
1747 insert_ob_in_ob (spell, tmp); 1777 insert_ob_in_ob (spell, tmp);
1778
1748 tmp->slaying = NULL; 1779 tmp->slaying = 0;
1749 } 1780 }
1750 1781
1751 skop = find_skill_by_name (op, tmp->skill); 1782 skop = find_skill_by_name (op, tmp->skill);
1752 1783
1753 /* need a literacy skill to learn spells. Also, having a literacy level 1784 /* need a literacy skill to learn spells. Also, having a literacy level
1754 * lower than the spell will make learning the spell more difficult */ 1785 * lower than the spell will make learning the spell more difficult */
1755 if (!skop) 1786 if (!skop)
1756 { 1787 {
1757 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1788 op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
1758 return; 1789 return;
1759 } 1790 }
1760 1791
1761 spell = tmp->inv; 1792 spell = tmp->inv;
1762 1793
1763 if (!spell) 1794 if (!spell)
1764 { 1795 {
1765 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1796 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1766 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1797 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1767 return; 1798 return;
1768 } 1799 }
1769 1800
1770 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1801 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1771 { 1802 {
1772 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]"); 1803 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
1773 return; 1804 return;
1774 } 1805 }
1775 1806
1776 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1807 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1777 1808
1778 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1809 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1779 {
1780 identify (tmp); 1810 identify (tmp);
1781
1782 if (tmp->env)
1783 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1784 else
1785 op->contr->ns->floorbox_update ();
1786 }
1787 1811
1788 /* I removed the check for special_prayer_mark here - it didn't make 1812 /* I removed the check for special_prayer_mark here - it didn't make
1789 * a lot of sense - special prayers are not found in spellbooks, and 1813 * a lot of sense - special prayers are not found in spellbooks, and
1790 * if the player doesn't know the spell, doesn't make a lot of sense that 1814 * if the player doesn't know the spell, doesn't make a lot of sense that
1791 * they would have a special prayer mark. 1815 * they would have a special prayer mark.
1792 */ 1816 */
1793 if (check_spell_known (op, spell->name)) 1817 if (check_spell_known (op, spell->name))
1794 { 1818 {
1795 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1819 op->statusmsg ("You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1796 return; 1820 return;
1797 } 1821 }
1798 1822
1799 if (spell->skill) 1823 if (spell->skill)
1800 { 1824 {
1801 spell_skill = find_skill_by_name (op, spell->skill); 1825 spell_skill = find_skill_by_name (op, spell->skill);
1802 1826
1803 if (!spell_skill) 1827 if (!spell_skill)
1804 { 1828 {
1805 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill); 1829 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
1806 return; 1830 return;
1807 } 1831 }
1808 1832
1809 if (spell_skill->level < spell->level) 1833 if (spell_skill->level < spell->level)
1810 { 1834 {
1811 new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill); 1835 op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
1812 return; 1836 return;
1813 } 1837 }
1814 } 1838 }
1815 1839
1816 /* Logic as follows 1840 /* Logic as follows
… …
1825 * Overall, chances are the same but a player will find having a high 1849 * Overall, chances are the same but a player will find having a high
1826 * literacy rate very useful! -b.t. 1850 * literacy rate very useful! -b.t.
1827 */ 1851 */
1828 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1852 if (QUERY_FLAG (op, FLAG_CONFUSED))
1829 { 1853 {
1830 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!"); 1854 op->failmsg ("In your confused state you flub the wording of the text!");
1831 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1855 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
1832 } 1856 }
1833 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1857 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
1834 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1858 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1835 { 1859 {
1836 1860 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
1837 new_draw_info (NDI_UNIQUE, 0, op, "You succeed in learning the spell!");
1838 do_learn_spell (op, spell, 0); 1861 do_learn_spell (op, spell, 0);
1839 1862
1840 /* xp gain to literacy for spell learning */ 1863 /* xp gain to literacy for spell learning */
1841 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1864 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1842 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1865 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1843 } 1866 }
1844 else 1867 else
1845 { 1868 {
1846 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1869 op->contr->play_sound (sound_find ("fumble_spell"));
1847 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1870 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1848 } 1871 }
1849 1872
1850 decrease_ob (tmp); 1873 tmp->decrease ();
1851} 1874}
1852 1875
1853/** 1876/**
1854 * Handles applying a spell scroll. 1877 * Handles applying a spell scroll.
1855 */ 1878 */
… …
1858{ 1881{
1859 object *skop; 1882 object *skop;
1860 1883
1861 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1884 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1862 { 1885 {
1863 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1886 op->failmsg ("You are unable to read while blind.");
1864 return; 1887 return;
1865 } 1888 }
1866 1889
1867 if (!tmp->inv || tmp->inv->type != SPELL) 1890 if (!tmp->inv || tmp->inv->type != SPELL)
1868 { 1891 {
1869 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1892 op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
1870 return; 1893 return;
1871 } 1894 }
1872 1895
1873 if (op->type == PLAYER) 1896 if (op->type == PLAYER)
1874 { 1897 {
… …
1880 */ 1903 */
1881 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1904 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1882 1905
1883 if (!skop) 1906 if (!skop)
1884 { 1907 {
1885 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1908 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
1886 return; 1909 return;
1887 } 1910 }
1888 1911
1889 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1912 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1890 change_exp (op, exp_gain, skop->skill, 0); 1913 change_exp (op, exp_gain, skop->skill, 0);
1891 } 1914 }
1892 1915
1893 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1916 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1894 identify (tmp); 1917 identify (tmp);
1895 1918
1896 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1919 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1897 1920
1898 cast_spell (op, tmp, dir, tmp->inv, NULL); 1921 cast_spell (op, tmp, dir, tmp->inv, NULL);
1899 decrease_ob (tmp); 1922 tmp->decrease ();
1900} 1923}
1901 1924
1902/** 1925/**
1903 * Applies a treasure object - by default, chest. op 1926 * Applies a treasure object - by default, chest. op
1904 * is the person doing the applying, tmp is the treasure 1927 * is the person doing the applying, tmp is the treasure
1905 * chest. 1928 * chest.
1906 */ 1929 */
1907static void 1930static void
1908apply_treasure (object *op, object *tmp) 1931apply_treasure (object *op, object *tmp)
1909{ 1932{
1910 /* Nice side effect of new treasure creation method is that the treasure 1933 /* Nice side effect of this treasure creation method is that the treasure
1911 * for the chest is done when the chest is created, and put into the chest 1934 * for the chest is done when the chest is created, and put into the chest
1912 * inventory. So that when the chest burns up, the items still exist. Also 1935 * inventory. So that when the chest burns up, the items still exist. Also
1913 * prevents people fromt moving chests to more difficult maps to get better 1936 * prevents people from moving chests to more difficult maps to get better
1914 * treasure 1937 * treasure
1915 */ 1938 */
1916 object *treas = tmp->inv; 1939 object *treas = tmp->inv;
1917 1940
1918 if (!treas) 1941 if (!treas)
1919 { 1942 {
1920 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1943 op->statusmsg ("The chest was empty.");
1921 decrease_ob (tmp); 1944 tmp->decrease ();
1922 return; 1945 return;
1923 } 1946 }
1924 1947
1925 while (tmp->inv) 1948 while (tmp->inv)
1926 { 1949 {
1927 treas = tmp->inv; 1950 treas = tmp->inv;
1928
1929 treas->remove (); 1951 treas->remove ();
1930 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
1931 1952
1932 treas->x = op->x; 1953 treas->x = op->x;
1933 treas->y = op->y; 1954 treas->y = op->y;
1934 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1955 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
1935 1956
1936 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1957 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
1937 spring_trap (treas, op); 1958 spring_trap (treas, op);
1938 1959
1939 /* If either player or container was destroyed, no need to do 1960 /* If either player or container was destroyed, no need to do
1940 * further processing. I think this should be enclused with 1961 * further processing. I think this should be enclused with
1941 * spring trap above, as I don't think there is otherwise 1962 * spring trap above, as I don't think there is otherwise
1942 * any way for the treasure chest or player to get killed 1963 * any way for the treasure chest or player to get killed.
1943 */ 1964 */
1944 if (op->destroyed () || tmp->destroyed ()) 1965 if (op->destroyed () || tmp->destroyed ())
1945 break; 1966 break;
1946 } 1967 }
1947 1968
1948 if (!tmp->destroyed () && tmp->inv == NULL) 1969 if (!tmp->destroyed () && !tmp->inv)
1949 decrease_ob (tmp); 1970 tmp->decrease (true);
1950
1951} 1971}
1952 1972
1953/** 1973/**
1954 * op eats food. 1974 * op eats food.
1955 * If player, takes care of messages and dragon special food. 1975 * If player, takes care of messages and dragon special food.
… …
1970 { 1990 {
1971 /* usual case - no dragon meal: */ 1991 /* usual case - no dragon meal: */
1972 if (op->stats.food + tmp->stats.food > 999) 1992 if (op->stats.food + tmp->stats.food > 999)
1973 { 1993 {
1974 if (tmp->type == FOOD || tmp->type == FLESH) 1994 if (tmp->type == FOOD || tmp->type == FLESH)
1975 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!"); 1995 op->failmsg ("You feel full, but what a waste of food!");
1976 else 1996 else
1977 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!"); 1997 op->statusmsg ("Most of the drink goes down your face not your throat!");
1978 } 1998 }
1999
2000 tmp->play_sound (
2001 tmp->sound
2002 ? tmp->sound
2003 : tmp->type == DRINK
2004 ? sound_find ("eat_drink")
2005 : sound_find ("eat_food")
2006 );
1979 2007
1980 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 2008 if (!QUERY_FLAG (tmp, FLAG_CURSED))
1981 { 2009 {
1982 char buf[MAX_BUF]; 2010 const char *buf;
1983 2011
1984 if (!is_dragon_pl (op)) 2012 if (!is_dragon_pl (op))
1985 { 2013 {
1986 /* eating message for normal players */ 2014 /* eating message for normal players */
1987 if (tmp->type == DRINK) 2015 if (tmp->type == DRINK)
1988 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name); 2016 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
1989 else 2017 else
1990 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good."); 2018 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
1991 } 2019 }
1992 else 2020 else
1993 {
1994 /* eating message for dragon players */ 2021 /* eating message for dragon players */
1995 sprintf (buf, "The %s tasted terrible!", &tmp->name); 2022 buf = format ("The %s tasted terrible!", &tmp->name);
1996 }
1997 2023
1998 new_draw_info (NDI_UNIQUE, 0, op, buf); 2024 op->statusmsg (buf);
2025
1999 capacity_remaining = 999 - op->stats.food; 2026 capacity_remaining = 999 - op->stats.food;
2000 op->stats.food += tmp->stats.food; 2027 op->stats.food += tmp->stats.food;
2001 if (capacity_remaining < tmp->stats.food) 2028 if (capacity_remaining < tmp->stats.food)
2002 op->stats.hp += capacity_remaining / 50; 2029 op->stats.hp += capacity_remaining / 50;
2003 else 2030 else
2004 op->stats.hp += tmp->stats.food / 50; 2031 op->stats.hp += tmp->stats.food / 50;
2032
2005 if (op->stats.hp > op->stats.maxhp) 2033 if (op->stats.hp > op->stats.maxhp)
2006 op->stats.hp = op->stats.maxhp; 2034 op->stats.hp = op->stats.maxhp;
2007 if (op->stats.food > 999) 2035 if (op->stats.food > 999)
2008 op->stats.food = 999; 2036 op->stats.food = 999;
2009 } 2037 }
… …
2011 /* special food hack -b.t. */ 2039 /* special food hack -b.t. */
2012 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2040 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2013 eat_special_food (op, tmp); 2041 eat_special_food (op, tmp);
2014 } 2042 }
2015 } 2043 }
2044
2016 handle_apply_yield (tmp); 2045 handle_apply_yield (tmp);
2017 decrease_ob (tmp); 2046 tmp->decrease ();
2018} 2047}
2019 2048
2020/** 2049/**
2021 * A dragon is eating some flesh. If the flesh contains resistances, 2050 * A dragon is eating some flesh. If the flesh contains resistances,
2022 * there is a chance for the dragon's skin to get improved. 2051 * there is a chance for the dragon's skin to get improved.
… …
2032{ 2061{
2033 object *skin = NULL; /* pointer to dragon skin force */ 2062 object *skin = NULL; /* pointer to dragon skin force */
2034 object *abil = NULL; /* pointer to dragon ability force */ 2063 object *abil = NULL; /* pointer to dragon ability force */
2035 object *tmp = NULL; /* tmp. object */ 2064 object *tmp = NULL; /* tmp. object */
2036 2065
2037 char buf[MAX_BUF]; /* tmp. string buffer */
2038 double chance; /* improvement-chance of one resistance type */ 2066 double chance; /* improvement-chance of one resistance type */
2039 double totalchance = 1; /* total chance of gaining one resistance */ 2067 double totalchance = 1; /* total chance of gaining one resistance */
2040 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */ 2068 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2041 double mbonus = 0; /* monster bonus */ 2069 double mbonus = 0; /* monster bonus */
2042 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2070 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
… …
2064 /* now start by filling stomache and health, according to food-value */ 2092 /* now start by filling stomache and health, according to food-value */
2065 if ((999 - op->stats.food) < meal->stats.food) 2093 if ((999 - op->stats.food) < meal->stats.food)
2066 op->stats.hp += (999 - op->stats.food) / 50; 2094 op->stats.hp += (999 - op->stats.food) / 50;
2067 else 2095 else
2068 op->stats.hp += meal->stats.food / 50; 2096 op->stats.hp += meal->stats.food / 50;
2097
2069 if (op->stats.hp > op->stats.maxhp) 2098 if (op->stats.hp > op->stats.maxhp)
2070 op->stats.hp = op->stats.maxhp; 2099 op->stats.hp = op->stats.maxhp;
2071 2100
2072 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2101 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2073 2102
… …
2118 } 2147 }
2119 } 2148 }
2120 2149
2121 /* inverse totalchance as until now we have the failure-chance */ 2150 /* inverse totalchance as until now we have the failure-chance */
2122 totalchance = 100 - totalchance * 100; 2151 totalchance = 100 - totalchance * 100;
2152
2123 /* print message according to totalchance */ 2153 /* print message according to totalchance */
2154 const char *buf;
2124 if (totalchance > 50.) 2155 if (totalchance > 50.)
2125 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name); 2156 buf = format ("Hmm! The %s tasted delicious!", &meal->name);
2126 else if (totalchance > 10.) 2157 else if (totalchance > 10.)
2127 sprintf (buf, "The %s tasted very good.", &meal->name); 2158 buf = format ("The %s tasted very good.", &meal->name);
2128 else if (totalchance > 1.) 2159 else if (totalchance > 1.)
2129 sprintf (buf, "The %s tasted good.", &meal->name); 2160 buf = format ("The %s tasted good.", &meal->name);
2130 else if (totalchance > 0.1) 2161 else if (totalchance > 0.1)
2131 sprintf (buf, "The %s tasted bland.", &meal->name); 2162 buf = format ("The %s tasted bland.", &meal->name);
2132 else if (totalchance >= 0.01) 2163 else if (totalchance >= 0.01)
2133 sprintf (buf, "The %s had a boring taste.", &meal->name); 2164 buf = format ("The %s had a boring taste.", &meal->name);
2134 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat)) 2165 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2135 sprintf (buf, "The %s tasted strange.", &meal->name); 2166 buf = format ("The %s tasted strange.", &meal->name);
2136 else 2167 else
2137 sprintf (buf, "The %s had no taste.", &meal->name); 2168 buf = format ("The %s had no taste.", &meal->name);
2138 new_draw_info (NDI_UNIQUE, 0, op, buf); 2169
2170 op->statusmsg (buf);
2139 2171
2140 /* now choose a winner if we have any */ 2172 /* now choose a winner if we have any */
2141 i = -1; 2173 i = -1;
2142 if (winners > 0) 2174 if (winners > 0)
2143 i = atnr_winner[RANDOM () % winners]; 2175 i = atnr_winner[RANDOM () % winners];
… …
2146 { 2178 {
2147 /* resistance increased! */ 2179 /* resistance increased! */
2148 skin->resist[i]++; 2180 skin->resist[i]++;
2149 op->update_stats (); 2181 op->update_stats ();
2150 2182
2151 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2183 op->statusmsg (format ("Your skin is now more resistant to %s!", change_resist_msg[i]));
2152 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2153 } 2184 }
2154 2185
2155 /* if this flesh contains a new ability focus, we mark it 2186 /* if this flesh contains a new ability focus, we mark it
2156 into the ability_force and it will take effect on next level */ 2187 into the ability_force and it will take effect on next level */
2157 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat) 2188 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2158 { 2189 {
2159 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2190 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2160 2191
2161 if (meal->last_eat != abil->stats.exp) 2192 if (meal->last_eat != abil->stats.exp)
2193 op->statusmsg (format (
2194 "Your metabolism prepares to focus on %s!\n"
2195 "The change will happen at level %d.",
2196 change_resist_msg[meal->last_eat],
2197 abil->level + 1
2162 { 2198 ));
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 2199 else
2169 { 2200 {
2170 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]); 2201 op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
2171 new_draw_info (NDI_UNIQUE, 0, op, buf);
2172 abil->last_eat = 0; 2202 abil->last_eat = 0;
2173 } 2203 }
2174 } 2204 }
2205
2175 return 1; 2206 return 1;
2176} 2207}
2177 2208
2178/** 2209/**
2179 * Handles applying an improve armor scroll. 2210 * Handles applying an improve armor scroll.
… …
2182static void 2213static void
2183apply_armour_improver (object *op, object *tmp) 2214apply_armour_improver (object *op, object *tmp)
2184{ 2215{
2185 object *armor; 2216 object *armor;
2186 2217
2187 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2218 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2188 { 2219 {
2189 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2220 op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
2190 return; 2221 return;
2191 } 2222 }
2192 2223
2193 armor = find_marked_object (op); 2224 armor = find_marked_object (op);
2194 2225
2195 if (!armor) 2226 if (!armor)
2196 { 2227 {
2197 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2228 op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2198 return; 2229 return;
2199 } 2230 }
2200 2231
2201 if (armor->type != ARMOUR 2232 if (armor->type != ARMOUR
2202 && armor->type != CLOAK 2233 && armor->type != CLOAK
2203 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2234 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2204 { 2235 {
2205 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2236 op->failmsg ("Your marked item is not armour!\n");
2206 return; 2237 return;
2207 } 2238 }
2208 2239
2209 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2240 op->statusmsg ("Applying armour enchantment.");
2210 improve_armour (op, tmp, armor); 2241 improve_armour (op, tmp, armor);
2211} 2242}
2212 2243
2213extern void 2244void
2214apply_poison (object *op, object *tmp) 2245apply_poison (object *op, object *tmp)
2215{ 2246{
2247 // need to do it now when it is still on the map
2248 handle_apply_yield (tmp);
2249
2250 object *poison = tmp->split (1);
2251
2216 if (op->type == PLAYER) 2252 if (op->type == PLAYER)
2217 { 2253 {
2218 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2254 op->contr->play_sound (sound_find ("drink_poison"));
2219 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2255 op->failmsg ("Yech! That tasted poisonous!");
2220 strcpy (op->contr->killer, "poisonous booze"); 2256 op->contr->killer = poison;
2221 } 2257 }
2258
2222 if (tmp->stats.hp > 0) 2259 if (poison->stats.hp > 0)
2223 { 2260 {
2224 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2261 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2225 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2262 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2226 } 2263 }
2264
2227 op->stats.food -= op->stats.food / 4; 2265 op->stats.food -= op->stats.food / 4;
2228 handle_apply_yield (tmp); 2266 poison->destroy ();
2229 decrease_ob (tmp);
2230} 2267}
2231 2268
2232/** 2269/**
2233 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2270 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2234 * A valid 2 way exit means: 2271 * A valid 2 way exit means:
… …
2249 2286
2250#if 0 //TODO 2287#if 0 //TODO
2251 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2288 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2252 return 0; /* This is a reset town portal */ 2289 return 0; /* This is a reset town portal */
2253#endif 2290#endif
2291
2292 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2254 2293
2255 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2294 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2256 2295
2257 if (exitmap) 2296 if (exitmap)
2258 { 2297 {
… …
2334 * them in this function - they are passed to apply_special 2373 * them in this function - they are passed to apply_special
2335 */ 2374 */
2336int 2375int
2337manual_apply (object *op, object *tmp, int aflag) 2376manual_apply (object *op, object *tmp, int aflag)
2338{ 2377{
2339 if (tmp->head)
2340 tmp = tmp->head; 2378 tmp = tmp->head_ ();
2341 2379
2342 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2343 { 2381 {
2344 if (op->type == PLAYER) 2382 if (op->type == PLAYER)
2345 { 2383 {
2346 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2384 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
2347 return 1; 2385 return 1;
2348 } 2386 }
2349 else 2387 else
2350 return 0; /* monsters just skip unpaid items */ 2388 return 0; /* monsters just skip unpaid items */
2351 } 2389 }
… …
2354 return RESULT_INT (0); 2392 return RESULT_INT (0);
2355 2393
2356 switch (tmp->type) 2394 switch (tmp->type)
2357 { 2395 {
2358 case CF_HANDLE: 2396 case CF_HANDLE:
2359 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2397 op->play_sound (sound_find ("turn_handle"));
2360 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2398 op->statusmsg ("You turn the handle.");
2361 tmp->value = tmp->value ? 0 : 1; 2399 tmp->value = tmp->value ? 0 : 1;
2362 SET_ANIMATION (tmp, tmp->value); 2400 SET_ANIMATION (tmp, tmp->value);
2363 update_object (tmp, UP_OBJ_FACE); 2401 update_object (tmp, UP_OBJ_FACE);
2364 push_button (tmp); 2402 push_button (tmp);
2365 return 1; 2403 return 1;
2366 2404
2367 case TRIGGER: 2405 case TRIGGER:
2368 if (check_trigger (tmp, op)) 2406 if (check_trigger (tmp, op))
2369 { 2407 {
2370 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2408 op->statusmsg ("You turn the handle.");
2371 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2409 op->play_sound (sound_find ("turn_handle"));
2372 } 2410 }
2373 else 2411 else
2374 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2412 op->failmsg ("The handle doesn't move.");
2375 2413
2376 return 1; 2414 return 1;
2377 2415
2378 case EXIT: 2416 case EXIT:
2379 if (op->type != PLAYER) 2417 if (op->type != PLAYER)
2380 return 0; 2418 return 0;
2381 2419
2382 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2420 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2383 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2421 op->failmsg (format ("The %s is closed.", query_name (tmp)));
2384 else 2422 else
2385 { 2423 {
2386 /* Don't display messages for random maps. */ 2424 /* Don't display messages for random maps. */
2387 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2425 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2388 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2426 op->statusmsg (tmp->msg, NDI_NAVY);
2389 2427
2390 op->enter_exit (tmp); 2428 op->enter_exit (tmp);
2391 } 2429 }
2392 2430
2431 return 1;
2432
2433 case INSCRIBABLE:
2434 op->statusmsg (tmp->msg);
2435 // maybe show a spell menu to chose from or something like that
2393 return 1; 2436 return 1;
2394 2437
2395 case SIGN: 2438 case SIGN:
2396 apply_sign (op, tmp, 0); 2439 apply_sign (op, tmp, 0);
2397 return 1; 2440 return 1;
… …
2506 { 2549 {
2507 char buf[MAX_BUF]; 2550 char buf[MAX_BUF];
2508 timeofday_t tod; 2551 timeofday_t tod;
2509 2552
2510 get_tod (&tod); 2553 get_tod (&tod);
2554 op->play_sound (sound_find ("sound_clock"));
2555 op->statusmsg (format (
2511 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2556 "It is %d minute%s past %d o'clock %s",
2512 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2557 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2513 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2558 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2514 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2559 ));
2515 new_draw_info (NDI_UNIQUE, 0, op, buf);
2516 return 1; 2560 return 1;
2517 } 2561 }
2518 else 2562 else
2519 return 0; 2563 return 0;
2520 2564
… …
2547 default: 2591 default:
2548 return 0; 2592 return 0;
2549 } 2593 }
2550} 2594}
2551 2595
2552
2553/* quiet suppresses the "don't know how to apply" and "you must get it first" 2596/* quiet suppresses the "don't know how to apply" and "you must get it first"
2554 * messages as needed by player_apply_below(). But there can still be 2597 * messages as needed by player_apply_below(). But there can still be
2555 * "but you are floating high above the ground" messages. 2598 * "but you are floating high above the ground" messages.
2556 * 2599 *
2557 * Same return value as apply() function. 2600 * Same return value as apply() function.
2558 */ 2601 */
2559int 2602int
2560player_apply (object *pl, object *op, int aflag, int quiet) 2603player_apply (object *pl, object *op, int aflag, int quiet)
2561{ 2604{
2562 int tmp;
2563
2564 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2605 if (!op->env && (pl->move_type & MOVE_FLYING))
2565 { 2606 {
2566 /* player is flying and applying object not in inventory */ 2607 /* player is flying and applying object not in inventory */
2567 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2608 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2568 { 2609 {
2569 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2610 pl->failmsg ("But you are floating high above the ground! "
2611 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2612 "or waiting till the levitation effect wears off.>");
2570 return 0; 2613 return 0;
2571 } 2614 }
2572 } 2615 }
2573 2616
2574 pl->contr->last_used = op; 2617 pl->contr->last_used = op;
2575 2618
2576 tmp = manual_apply (pl, op, aflag); 2619 int tmp = manual_apply (pl, op, aflag);
2620
2577 if (!quiet) 2621 if (!quiet)
2578 { 2622 {
2579 if (tmp == 0) 2623 if (tmp == 0)
2580 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2624 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2581 else if (tmp == 2) 2625 else if (tmp == 2)
2582 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2626 pl->failmsg ("You must get it first!\n");
2583 } 2627 }
2628
2584 return tmp; 2629 return tmp;
2585} 2630}
2586 2631
2587/** 2632/**
2588 * player_apply_below attempts to apply the object 'below' the player. 2633 * player_apply_below attempts to apply the object 'below' the player.
… …
2663 { 2708 {
2664 pl->combat_ob = 0; 2709 pl->combat_ob = 0;
2665 who->change_weapon (pl->ranged_ob); 2710 who->change_weapon (pl->ranged_ob);
2666 } 2711 }
2667 2712
2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2713 who->statusmsg (format ("You unwield %s.", query_name (op)));
2669 2714
2670 change_abil (who, op); 2715 change_abil (who, op);
2671 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2716 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2672 break; 2717 break;
2673 2718
2674 case SKILL: 2719 case SKILL:
2675 if (who->contr) 2720 if (who->contr)
2676 { 2721 {
2722 if (IS_COMBAT_SKILL (op->subtype))
2723 who->change_weapon (who->contr->combat_ob = 0);
2724 else if (IS_RANGED_SKILL (op->subtype))
2725 who->change_weapon (who->contr->ranged_ob = 0);
2726
2677 if (!op->invisible) 2727 if (op->invisible)
2678 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2728 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2679 else 2729 else
2680 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2730 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2681 } 2731 }
2682 2732
2683 change_abil (who, op); 2733 change_abil (who, op);
2684 CLEAR_FLAG (who, FLAG_READY_SKILL); 2734 CLEAR_FLAG (who, FLAG_READY_SKILL);
2685 break; 2735 break;
… …
2692 case GLOVES: 2742 case GLOVES:
2693 case AMULET: 2743 case AMULET:
2694 case GIRDLE: 2744 case GIRDLE:
2695 case BRACERS: 2745 case BRACERS:
2696 case CLOAK: 2746 case CLOAK:
2697 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2747 who->statusmsg (format ("You unwear %s.", query_name (op)));
2698 change_abil (who, op); 2748 change_abil (who, op);
2699 break; 2749 break;
2700 2750
2701 case LAMP: 2751 case LAMP:
2702 { 2752 {
2703 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2753 who->statusmsg (format ("You turn off your %s.", &op->name));
2704 2754
2705 object *tmp2 = arch_to_object (op->other_arch); 2755 object *tmp2 = arch_to_object (op->other_arch);
2706 tmp2->x = op->x; 2756 tmp2->x = op->x;
2707 tmp2->y = op->y; 2757 tmp2->y = op->y;
2708 tmp2->map = op->map; 2758 tmp2->map = op->map;
… …
2712 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2762 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2713 2763
2714 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2764 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2715 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2765 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2716 2766
2767 op->destroy ();
2768 who->insert (tmp2);
2769 who->update_stats ();
2770
2717 if (who->contr) 2771 if (who->contr)
2718 esrv_del_item (who->contr, op->count);
2719
2720 op->destroy ();
2721 insert_ob_in_ob (tmp2, who);
2722 who->update_stats ();
2723
2724 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2725 { 2772 {
2726 if (who->contr) 2773 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2727 { 2774 {
2728 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2775 who->failmsg ("Oops, it feels deadly cold!");
2729 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2776 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2730 } 2777 }
2731 } 2778 }
2732
2733 if (who->contr)
2734 esrv_send_item (who, tmp2);
2735 } 2779 }
2736 2780
2737 return 1; /* otherwise, an attempt to drop causes problems */ 2781 return 1; /* otherwise, an attempt to drop causes problems */
2738 2782
2739 case BOW: 2783 case BOW:
… …
2746 { 2790 {
2747 pl->ranged_ob = 0; 2791 pl->ranged_ob = 0;
2748 who->change_weapon (pl->combat_ob); 2792 who->change_weapon (pl->combat_ob);
2749 } 2793 }
2750 2794
2751 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2795 who->statusmsg (format ("You unready %s.", query_name (op)));
2752 } 2796 }
2753 else 2797 else
2754 { 2798 {
2755 who->change_skill (0); 2799 who->change_skill (0);
2756 2800
… …
2762 2806
2763 break; 2807 break;
2764 2808
2765 case BUILDER: 2809 case BUILDER:
2766 if (who->contr) 2810 if (who->contr)
2767 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2811 who->statusmsg (format ("You unready %s.", query_name (op)));
2768 break; 2812 break;
2769 2813
2770 default: 2814 default:
2771 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2815 who->statusmsg (format ("You unapply %s.", query_name (op)));
2772 break; 2816 break;
2773 } 2817 }
2774 2818
2819 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2820 if (object *pl = op->visible_to ())
2821 esrv_send_item (pl, op);
2822
2775 who->update_stats (); 2823 who->update_stats ();
2776
2777 if (!(aflags & AP_NO_MERGE))
2778 {
2779 object *tmp = merge_ob (op, 0);
2780
2781 if (who->contr)
2782 {
2783 if (tmp)
2784 { /* it was merged */
2785 esrv_del_item (who->contr, op->count);
2786 op = tmp;
2787 }
2788
2789 esrv_send_item (who, op);
2790 }
2791 }
2792 2824
2793 return 0; 2825 return 0;
2794} 2826}
2795 2827
2796/** 2828/**
… …
2828 * Returns 0 on success, returns 1 if there is some problem. 2860 * Returns 0 on success, returns 1 if there is some problem.
2829 * if aflags is AP_PRINT, we instead print out waht to unapply 2861 * if aflags is AP_PRINT, we instead print out waht to unapply
2830 * instead of doing it. This is a lot less code than having 2862 * instead of doing it. This is a lot less code than having
2831 * another function that does just that. 2863 * another function that does just that.
2832 */ 2864 */
2865
2866#define CANNOT_REMOVE_CURSED \
2867 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2868 "Praying over an altar, scrolls of remove curse/damnation, " \
2869 "priests or even other players might help.>"
2870
2833int 2871int
2834unapply_for_ob (object *who, object *op, int aflags) 2872unapply_for_ob (object *who, object *op, int aflags)
2835{ 2873{
2836 if (op->is_range ()) 2874 if (op->is_range ())
2837 for (object *tmp = who->inv; tmp; tmp = tmp->below) 2875 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2838 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 2876 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2839 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2877 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2840 { 2878 {
2841 if (aflags & AP_PRINT) 2879 if (aflags & AP_PRINT)
2842 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2880 who->failmsg (query_name (tmp));
2843 else 2881 else
2844 unapply_special (who, tmp, aflags); 2882 unapply_special (who, tmp, aflags);
2845 } 2883 }
2846 else 2884 else
2847 { 2885 {
2848 /* In this case, we want to try and remove a cursed item. 2886 /* In this case, we want to try and remove a cursed item.
2849 * While we know it won't work, we want unapply_special to 2887 * While we know it won't work, we want unapply_special to
2850 * at least generate the message. 2888 * at least generate the message.
2851 */ 2889 */
2852 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp)); 2890 who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
2853 return 1; 2891 return 1;
2854 } 2892 }
2855 2893
2856 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 2894 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2857 { 2895 {
… …
2880 2918
2881 /* If we are just printing, we don't care about cursed status */ 2919 /* If we are just printing, we don't care about cursed status */
2882 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2920 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2883 { 2921 {
2884 if (aflags & AP_PRINT) 2922 if (aflags & AP_PRINT)
2885 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2923 who->failmsg (query_name (tmp));
2886 else 2924 else
2887 unapply_special (who, tmp, aflags); 2925 unapply_special (who, tmp, aflags);
2888 } 2926 }
2889 else 2927 else
2890 { 2928 {
2891 /* Cursed item that we can't unequip - tell the player. 2929 /* Cursed item that we can't unequip - tell the player.
2892 * Note this could be annoying if this is just one of a few, 2930 * Note this could be annoying if this is just one of a few,
2893 * so it may not be critical (eg, putting on a ring and you have 2931 * so it may not be critical (eg, putting on a ring and you have
2894 * one cursed ring.) 2932 * one cursed ring.)
2895 */ 2933 */
2896 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2934 who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
2897 } 2935 }
2898 2936
2899 last = tmp->below; 2937 last = tmp->below;
2900 } 2938 }
2901 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2939 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
… …
3054 * 3092 *
3055 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3093 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3056 * 3094 *
3057 * apply_special() doesn't check for unpaid items. 3095 * apply_special() doesn't check for unpaid items.
3058 */ 3096 */
3097
3098#define LACK_ITEM_POWER \
3099 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3100
3059int 3101int
3060apply_special (object *who, object *op, int aflags) 3102apply_special (object *who, object *op, int aflags)
3061{ 3103{
3062 int basic_flag = aflags & AP_BASIC_FLAGS; 3104 int basic_flag = aflags & AP_BASIC_FLAGS;
3063 object *tmp, *tmp2, *skop = NULL; 3105 object *tmp, *tmp2, *skop = NULL;
… …
3078 if (basic_flag == AP_APPLY) 3120 if (basic_flag == AP_APPLY)
3079 return 0; 3121 return 0;
3080 3122
3081 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3123 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3082 { 3124 {
3083 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op)); 3125 who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
3084 return 1; 3126 return 1;
3085 } 3127 }
3086 3128
3087 return unapply_special (who, op, aflags); 3129 return unapply_special (who, op, aflags);
3088 } 3130 }
3089
3090 if (basic_flag == AP_UNAPPLY) 3131 else if (basic_flag == AP_UNAPPLY)
3091 return 0; 3132 return 0;
3092 3133
3093 // if the item is combat/ranged, wield the relevant slot first 3134 // if the item is combat/ranged, wield the relevant slot first
3094 // to resolve conflicts. 3135 // to resolve conflicts.
3095 if (player *pl = who->contr) 3136 if (player *pl = who->contr)
… …
3104 /* Can't just apply this object. Lets see what not and what to do */ 3145 /* Can't just apply this object. Lets see what not and what to do */
3105 if (int i = can_apply_object (who, op)) 3146 if (int i = can_apply_object (who, op))
3106 { 3147 {
3107 if (i & CAN_APPLY_NEVER) 3148 if (i & CAN_APPLY_NEVER)
3108 { 3149 {
3109 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3150 who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
3110 return 1; 3151 return 1;
3111 } 3152 }
3112 else if (i & CAN_APPLY_RESTRICTION) 3153 else if (i & CAN_APPLY_RESTRICTION)
3113 { 3154 {
3114 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3155 who->failmsg (format (
3156 "You have a prohibition against using a %s. "
3157 "H<Your belief, profession or class prevents you from applying this item.>",
3158 query_name (op)
3159 ));
3115 return 1; 3160 return 1;
3116 } 3161 }
3117 3162
3118 if (who->type != PLAYER) 3163 if (who->type != PLAYER)
3119 { 3164 {
… …
3123 } 3168 }
3124 else 3169 else
3125 { 3170 {
3126 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3171 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3127 { 3172 {
3128 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3173 who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
3129 unapply_for_ob (who, op, AP_PRINT); 3174 unapply_for_ob (who, op, AP_PRINT);
3130 return 1; 3175 return 1;
3131 } 3176 }
3132 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3177 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3133 if (unapply_for_ob (who, op, aflags)) 3178 if (unapply_for_ob (who, op, aflags))
… …
3139 { 3184 {
3140 skop = find_skill_by_name (who, op->skill); 3185 skop = find_skill_by_name (who, op->skill);
3141 3186
3142 if (!skop) 3187 if (!skop)
3143 { 3188 {
3144 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3189 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3145 return 1; 3190 return 1;
3146 } 3191 }
3147 else 3192 else
3148 /* While experience will be credited properly, we want to change the 3193 /* While experience will be credited properly, we want to change the
3149 * skill so that the dam and wc get updated 3194 * skill so that the dam and wc get updated
… …
3153 3198
3154 if (who->type == PLAYER 3199 if (who->type == PLAYER
3155 && op->item_power 3200 && op->item_power
3156 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level) 3201 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3157 { 3202 {
3158 new_draw_info (NDI_UNIQUE, 0, who,
3159 "Equipping that combined with other items would consume your soul! " 3203 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3160 "[use the skills command to check your available item power]");
3161 return 1; 3204 return 1;
3162 } 3205 }
3163 3206
3164 /* Ok. We are now at the state where we can apply the new object. 3207 /* Ok. We are now at the state where we can apply the new object.
3165 * Note that we don't have the checks for can_use_... 3208 * Note that we don't have the checks for can_use_...
3166 * below - that is already taken care of by can_apply_object. 3209 * below - that is already taken care of by can_apply_object.
3167 */ 3210 */
3168 if (op->nrof > 1) 3211 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3169 tmp = get_split_ob (op, op->nrof - 1);
3170 else
3171 tmp = 0;
3172 3212
3173 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3213 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3174 return RESULT_INT (0); 3214 return RESULT_INT (0);
3175 3215
3176 switch (op->type) 3216 switch (op->type)
3177 { 3217 {
3178 case WEAPON: 3218 case WEAPON:
3179 if (!check_weapon_power (who, op->last_eat)) 3219 if (!check_weapon_power (who, op->last_eat))
3180 { 3220 {
3181 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. " 3221 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3182 "It would consume your soul!.");
3183 3222
3184 if (tmp) 3223 if (tmp)
3185 insert_ob_in_ob (tmp, who); 3224 insert_ob_in_ob (tmp, who);
3186 3225
3187 return 1; 3226 return 1;
… …
3191 // i.e. "R" can use Ragnarok's sword. 3230 // i.e. "R" can use Ragnarok's sword.
3192 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3231 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3193 { 3232 {
3194 /* if the weapon does not have the name as the character, can't use it. */ 3233 /* if the weapon does not have the name as the character, can't use it. */
3195 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3234 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3196 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3235 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3197 3236
3198 if (tmp) 3237 if (tmp)
3199 insert_ob_in_ob (tmp, who); 3238 insert_ob_in_ob (tmp, who);
3200 3239
3201 return 1; 3240 return 1;
3202 } 3241 }
3203 3242
3204 if (!skop) 3243 if (!skop)
3205 { 3244 {
3206 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO 3245 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3207 return 1; 3246 return 1;
3208 } 3247 }
3209 3248
3210 SET_FLAG (op, FLAG_APPLIED); 3249 SET_FLAG (op, FLAG_APPLIED);
3211 who->change_skill (skop); 3250 who->change_skill (skop);
3212 3251
3213 if (who->contr) 3252 if (who->contr)
3214 who->change_weapon (who->contr->combat_ob = op); 3253 who->change_weapon (who->contr->combat_ob = op);
3215 3254
3216 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3255 who->statusmsg (format ("You wield %s.", query_name (op)));
3217 3256
3218 SET_FLAG (who, FLAG_READY_WEAPON); 3257 SET_FLAG (who, FLAG_READY_WEAPON);
3219 change_abil (who, op); 3258 change_abil (who, op);
3220 break; 3259 break;
3221 3260
… …
3228 case BRACERS: 3267 case BRACERS:
3229 case CLOAK: 3268 case CLOAK:
3230 case RING: 3269 case RING:
3231 case AMULET: 3270 case AMULET:
3232 SET_FLAG (op, FLAG_APPLIED); 3271 SET_FLAG (op, FLAG_APPLIED);
3233 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3272 who->statusmsg (format ("You wear %s.", query_name (op)));
3234 change_abil (who, op); 3273 change_abil (who, op);
3235 break; 3274 break;
3236 3275
3237 case LAMP: 3276 case LAMP:
3238 if (op->stats.food < 1) 3277 if (op->stats.food < 1)
3239 { 3278 {
3240 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name); 3279 who->failmsg (format (
3280 "Your %s is out of fuel! "
3281 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3282 &op->name
3283 ));
3241 return 1; 3284 return 1;
3242 } 3285 }
3243 3286
3244 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3287 who->statusmsg (format ("You turn on your %s.", &op->name));
3288
3245 tmp2 = arch_to_object (op->other_arch); 3289 tmp2 = arch_to_object (op->other_arch);
3246 tmp2->stats.food = op->stats.food; 3290 tmp2->stats.food = op->stats.food;
3247 SET_FLAG (tmp2, FLAG_APPLIED); 3291 SET_FLAG (tmp2, FLAG_APPLIED);
3248 3292
3249 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3293 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3250 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3294 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3251 3295
3252 insert_ob_in_ob (tmp2, who); 3296 who->insert (tmp2);
3253 3297
3254 /* Remove the old lantern */ 3298 /* Remove the old lantern */
3255 if (who->type == PLAYER)
3256 esrv_del_item (who->contr, op->count);
3257
3258 op->destroy (); 3299 op->destroy ();
3259 3300
3260 /* insert the portion that was split off */ 3301 /* insert the portion that was split off */
3261 if (tmp) 3302 if (tmp)
3262 { 3303 who->insert (tmp);
3263 insert_ob_in_ob (tmp, who);
3264 if (who->type == PLAYER)
3265 esrv_send_item (who, tmp);
3266 }
3267 3304
3268 who->update_stats (); 3305 who->update_stats ();
3269 3306
3270 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3307 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3271 if (who->type == PLAYER) 3308 if (who->type == PLAYER)
3272 { 3309 {
3273 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3310 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3274 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3311 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3275 } 3312 }
3276
3277 if (who->type == PLAYER)
3278 esrv_send_item (who, tmp2);
3279 3313
3280 return 0; 3314 return 0;
3281 3315
3282 case SKILL_TOOL: 3316 case SKILL_TOOL:
3283 // applying a skill tool also readies the skill 3317 // applying a skill tool also readies the skill
… …
3306 who->change_weapon (pl->combat_ob = item); 3340 who->change_weapon (pl->combat_ob = item);
3307 goto found_weapon; 3341 goto found_weapon;
3308 } 3342 }
3309 } 3343 }
3310 3344
3345 who->failmsg (format (
3311 new_draw_info_format (NDI_UNIQUE, 0, who, "You need to apply a '%s' melee weapon before readying this skill", &op->skill); 3346 "You need to apply a '%s' melee weapon before readying this skill. "
3347 "H<Some skills need an item, in this case a melee weapon, to function.>",
3348 &op->skill
3349 ));
3312 return 1; 3350 return 1;
3313 3351
3314 found_weapon:; 3352 found_weapon:;
3315 } 3353 }
3316 else 3354 else
… …
3326 //TODO: bows should/must all have skill missile weapon right now 3364 //TODO: bows should/must all have skill missile weapon right now
3327 who->change_weapon (pl->ranged_ob = item); 3365 who->change_weapon (pl->ranged_ob = item);
3328 goto found_bow; 3366 goto found_bow;
3329 } 3367 }
3330 3368
3369 who->failmsg (
3331 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill"); 3370 "You need to apply a missile weapon before readying this skill. "
3371 "H<Some skills need an item, in this case a missile weapon, to function.>"
3372 );
3332 return 1; 3373 return 1;
3333 3374
3334 found_bow:; 3375 found_bow:;
3335 } 3376 }
3336 else 3377 else
3337 who->change_weapon (pl->ranged_ob = op); 3378 who->change_weapon (pl->ranged_ob = op);
3338 } 3379 }
3339 3380
3340 if (!op->invisible) 3381 if (!op->invisible)
3341 { 3382 {
3342 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3383 who->statusmsg (format (
3343 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3384 "You ready %s."
3385 "You can now use the skill: %s.",
3386 query_name (op),
3387 &op->skill
3388 ));
3344 } 3389 }
3345 else 3390 else
3346 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3391 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
3347 } 3392 }
3348 else 3393 else
3349 { 3394 {
3350 SET_FLAG (op, FLAG_APPLIED); 3395 SET_FLAG (op, FLAG_APPLIED);
3351 change_abil (who, op); 3396 change_abil (who, op);
… …
3356 break; 3401 break;
3357 3402
3358 case BOW: 3403 case BOW:
3359 if (!check_weapon_power (who, op->last_eat)) 3404 if (!check_weapon_power (who, op->last_eat))
3360 { 3405 {
3361 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3406 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3362 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3363 3407
3364 if (tmp) 3408 if (tmp)
3365 insert_ob_in_ob (tmp, who); 3409 insert_ob_in_ob (tmp, who);
3366 3410
3367 return 1; 3411 return 1;
3368 } 3412 }
3369 3413
3370 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3414 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3371 { 3415 {
3372 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3416 who->failmsg ("The weapon does not recognize you as its owner. "
3417 "H<Its name indicates that it belongs to somebody else.>");
3373 if (tmp) 3418 if (tmp)
3374 insert_ob_in_ob (tmp, who); 3419 insert_ob_in_ob (tmp, who);
3375 3420
3376 return 1; 3421 return 1;
3377 } 3422 }
… …
3382 case HORN: 3427 case HORN:
3383 /* check for skill, alter player status */ 3428 /* check for skill, alter player status */
3384 3429
3385 if (!skop) 3430 if (!skop)
3386 { 3431 {
3387 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO 3432 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3388 return 1; 3433 return 1;
3389 } 3434 }
3390 3435
3391 SET_FLAG (op, FLAG_APPLIED); 3436 SET_FLAG (op, FLAG_APPLIED);
3392 who->change_skill (skop); 3437 who->change_skill (skop);
3393 3438
3394 if (who->contr) 3439 if (who->contr)
3395 { 3440 {
3396 who->contr->ranged_ob = op; 3441 who->contr->ranged_ob = op;
3397 3442
3398 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3443 who->statusmsg (format ("You ready %s.", query_name (op)));
3399 3444
3400 if (op->type == BOW) 3445 if (op->type == BOW)
3401 { 3446 {
3402 who->current_weapon = op; 3447 who->current_weapon = op;
3403 change_abil (who, op); 3448 change_abil (who, op);
3404 new_draw_info_format (NDI_UNIQUE, 0, who,
3405 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3449 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3406 } 3450 }
3407 } 3451 }
3408 else 3452 else
3409 { 3453 {
3410 if (op->type == BOW) 3454 if (op->type == BOW)
… …
3420 { 3464 {
3421 //TODO: wtf does this do? shouldn't this be managed automatically (slots?) 3465 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3422 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER) 3466 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3423 unapply_special (who, who->contr->ranged_ob, 0); 3467 unapply_special (who, who->contr->ranged_ob, 0);
3424 3468
3425 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3469 who->statusmsg (format ("You ready your %s.", query_name (op)));
3426 3470
3427 who->contr->ranged_ob = op; 3471 who->contr->ranged_ob = op;
3428 } 3472 }
3429 break; 3473 break;
3430 3474
3431 default: 3475 default:
3432 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3476 who->statusmsg (format ("You apply %s.", query_name (op)));
3433 } /* end of switch op->type */ 3477 }
3434 3478
3435 SET_FLAG (op, FLAG_APPLIED); 3479 SET_FLAG (op, FLAG_APPLIED);
3436 3480
3437 if (tmp) 3481 if (tmp)
3438 tmp = insert_ob_in_ob (tmp, who); 3482 who->insert (tmp);
3439 3483
3440 who->update_stats (); 3484 who->update_stats ();
3441 3485
3442 /* We exclude spell casting objects. The fire code will set the 3486 /* We exclude spell casting objects. The fire code will set the
3443 * been applied flag when they are used - until that point, 3487 * been applied flag when they are used - until that point,
… …
3445 */ 3489 */
3446 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3490 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3447 SET_FLAG (op, FLAG_BEEN_APPLIED); 3491 SET_FLAG (op, FLAG_BEEN_APPLIED);
3448 3492
3449 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3493 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3450 {
3451 if (who->type == PLAYER) 3494 if (who->type == PLAYER)
3452 { 3495 {
3453 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3496 who->failmsg (
3497 "Oops, it feels deadly cold! "
3498 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3499 );
3454 SET_FLAG (op, FLAG_KNOWN_CURSED); 3500 SET_FLAG (op, FLAG_KNOWN_CURSED);
3455 } 3501 }
3456 }
3457 3502
3458 if (who->type == PLAYER) 3503 if (object *pl = op->visible_to ())
3459 {
3460 /* if multiple objects were applied, update both slots */
3461 if (tmp)
3462 esrv_send_item (who, tmp);
3463
3464 esrv_send_item (who, op); 3504 esrv_send_item (pl, op);
3465 }
3466 3505
3467 return 0; 3506 return 0;
3468} 3507}
3469 3508
3470int 3509int
3471monster_apply_special (object *who, object *op, int aflags) 3510monster_apply_special (object *who, object *op, int aflags)
3472{ 3511{
3473 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3512 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3474 return 1; 3513 return 1;
3514
3475 return apply_special (who, op, aflags); 3515 return apply_special (who, op, aflags);
3476} 3516}
3477 3517
3478/** 3518/**
3479 * Map was just loaded, handle op's initialisation. 3519 * Map was just loaded, handle op's initialisation.
… …
3483int 3523int
3484auto_apply (object *op) 3524auto_apply (object *op)
3485{ 3525{
3486 object *tmp = NULL, *tmp2; 3526 object *tmp = NULL, *tmp2;
3487 int i; 3527 int i;
3528
3529 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3488 3530
3489 switch (op->type) 3531 switch (op->type)
3490 { 3532 {
3491 case SHOP_FLOOR: 3533 case SHOP_FLOOR:
3492 if (!op->has_random_items ()) 3534 if (!op->has_random_items ())
… …
3494 3536
3495 do 3537 do
3496 { 3538 {
3497 i = 10; /* let's give it 10 tries */ 3539 i = 10; /* let's give it 10 tries */
3498 while ((tmp = generate_treasure (op->randomitems, 3540 while ((tmp = generate_treasure (op->randomitems,
3499 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3541 op->stats.exp
3542 ? (int) op->stats.exp
3543 : max (op->map->difficulty, 5)))
3544 == NULL && --i);
3545
3500 if (tmp == NULL) 3546 if (tmp == NULL)
3501 return 0; 3547 return 0;
3548
3502 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3549 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3503 { 3550 {
3504 tmp->destroy (); 3551 tmp->destroy ();
3505 tmp = NULL; 3552 tmp = NULL;
3506 } 3553 }
… …
3509 3556
3510 tmp->x = op->x; 3557 tmp->x = op->x;
3511 tmp->y = op->y; 3558 tmp->y = op->y;
3512 SET_FLAG (tmp, FLAG_UNPAID); 3559 SET_FLAG (tmp, FLAG_UNPAID);
3513 insert_ob_in_map (tmp, op->map, NULL, 0); 3560 insert_ob_in_map (tmp, op->map, NULL, 0);
3514 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3515 identify (tmp); 3561 identify (tmp);
3516 break; 3562 break;
3517 3563
3518 case TREASURE: 3564 case TREASURE:
3519 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3565 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3526 /* If we generated an object and put it in this object inventory, 3572 /* If we generated an object and put it in this object inventory,
3527 * move it to the parent object as the current object is about 3573 * move it to the parent object as the current object is about
3528 * to disappear. An example of this item is the random_* stuff 3574 * to disappear. An example of this item is the random_* stuff
3529 * that is put inside other objects. 3575 * that is put inside other objects.
3530 */ 3576 */
3531 for (tmp = op->inv; tmp; tmp = tmp2)
3532 {
3533 tmp2 = tmp->below;
3534 tmp->remove ();
3535
3536 if (op->env) 3577 if (op->env)
3537 insert_ob_in_ob (tmp, op->env); 3578 while (op->inv)
3538 else 3579 op->env->insert (op->inv);
3539 tmp->destroy ();
3540 }
3541 3580
3542 op->destroy (); 3581 op->destroy ();
3543 break; 3582 break;
3544 } 3583 }
3545 return tmp ? 1 : 0; 3584
3585 return !!tmp;
3546} 3586}
3547 3587
3548/** 3588/**
3549 * fix_auto_apply goes through the entire map every time a map 3589 * fix_auto_apply goes through the entire map every time a map
3550 * is loaded or swapped in and performs special actions for 3590 * is loaded or swapped in and performs special actions for
… …
3564 3604
3565 if (tmp->inv) 3605 if (tmp->inv)
3566 { 3606 {
3567 object *invtmp, *invnext; 3607 object *invtmp, *invnext;
3568 3608
3569 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3609 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3570 { 3610 {
3571 invnext = invtmp->below; 3611 invnext = invtmp->below;
3572 3612
3573 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3613 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3574 auto_apply (invtmp); 3614 auto_apply (invtmp);
3575 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3615 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3576 { 3616 {
3577 while ((invtmp->stats.hp--) > 0) 3617 while (invtmp->stats.hp-- > 0)
3578 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3618 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3579 3619
3580 invtmp->randomitems = NULL; 3620 invtmp->randomitems = NULL;
3581 } 3621 }
3582 else if (invtmp && invtmp->arch 3622 else if (invtmp && invtmp->arch
… …
3694 /* check for hp, sp change */ 3734 /* check for hp, sp change */
3695 if (food->stats.hp != 0) 3735 if (food->stats.hp != 0)
3696 { 3736 {
3697 if (QUERY_FLAG (food, FLAG_CURSED)) 3737 if (QUERY_FLAG (food, FLAG_CURSED))
3698 { 3738 {
3699 assign (who->contr->killer, food->name); 3739 who->contr->killer = food;
3700 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3740 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3701 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3741 who->failmsg ("Eck!...that was poisonous!");
3702 } 3742 }
3703 else 3743 else
3704 { 3744 {
3705 if (food->stats.hp > 0) 3745 if (food->stats.hp > 0)
3706 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better."); 3746 who->statusmsg ("You begin to feel better.");
3707 else 3747 else
3708 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3748 who->failmsg ("Eck!...that was poisonous!");
3749
3709 who->stats.hp += food->stats.hp; 3750 who->stats.hp += food->stats.hp;
3710 } 3751 }
3711 } 3752 }
3753
3712 if (food->stats.sp != 0) 3754 if (food->stats.sp != 0)
3713 { 3755 {
3714 if (QUERY_FLAG (food, FLAG_CURSED)) 3756 if (QUERY_FLAG (food, FLAG_CURSED))
3715 { 3757 {
3716 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!"); 3758 who->failmsg ("You are drained of mana!");
3717 who->stats.sp -= food->stats.sp; 3759 who->stats.sp -= food->stats.sp;
3718 if (who->stats.sp < 0) 3760 if (who->stats.sp < 0)
3719 who->stats.sp = 0; 3761 who->stats.sp = 0;
3720 } 3762 }
3721 else 3763 else
3722 { 3764 {
3723 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3765 who->statusmsg ("You feel a rush of magical energy!");
3724 who->stats.sp += food->stats.sp; 3766 who->stats.sp += food->stats.sp;
3725 /* place limit on max sp from food? */ 3767 /* place limit on max sp from food? */
3726 } 3768 }
3727 } 3769 }
3770
3728 who->update_stats (); 3771 who->update_stats ();
3729} 3772}
3730 3773
3731/** 3774/**
3732 * Designed primarily to light torches/lanterns/etc. 3775 * Designed primarily to light torches/lanterns/etc.
… …
3742 item = find_marked_object (who); 3785 item = find_marked_object (who);
3743 if (item) 3786 if (item)
3744 { 3787 {
3745 if (lighter->last_eat && lighter->stats.food) 3788 if (lighter->last_eat && lighter->stats.food)
3746 { /* lighter gets used up */ 3789 { /* lighter gets used up */
3747 /* Split multiple lighters if they're being used up. Otherwise *
3748 * one charge from each would be used up. --DAMN */
3749 if (lighter->nrof > 1)
3750 {
3751 object *oneLighter = lighter->clone (); 3790 object *oneLighter = lighter->split ();
3752
3753 lighter->nrof -= 1;
3754 oneLighter->nrof = 1;
3755 oneLighter->stats.food--; 3791 oneLighter->stats.food--;
3756 esrv_send_item (who, lighter); 3792 who->insert (oneLighter);
3757 oneLighter = insert_ob_in_ob (oneLighter, who);
3758 esrv_send_item (who, oneLighter);
3759 }
3760 else
3761 lighter->stats.food--;
3762 } 3793 }
3763 else if (lighter->last_eat) 3794 else if (lighter->last_eat)
3795 {
3764 { /* no charges left in lighter */ 3796 /* no charges left in lighter */
3765 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3797 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3766 return; 3798 return;
3767 } 3799 }
3768 3800
3769 /* Perhaps we should split what we are trying to light on fire? 3801 /* Perhaps we should split what we are trying to light on fire?
3770 * I can't see many times when you would want to light multiple 3802 * I can't see many times when you would want to light multiple
… …
3776 3808
3777 save_throw_object (item, AT_FIRE, who); 3809 save_throw_object (item, AT_FIRE, who);
3778 3810
3779 if (item->destroyed ()) 3811 if (item->destroyed ())
3780 { 3812 {
3781 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name); 3813 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3782 /* Need to update the player so that the players glow radius 3814 /* Need to update the player so that the players glow radius
3783 * gets changed. 3815 * gets changed.
3784 */ 3816 */
3785 if (is_player_env) 3817 if (is_player_env)
3786 who->update_stats (); 3818 who->update_stats ();
3787 } 3819 }
3788 else 3820 else
3789 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3821 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3790 } 3822 }
3791 else /* nothing to light */ 3823 else
3792 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object."); 3824 who->failmsg ("You need to mark a lightable object.");
3793
3794} 3825}
3795 3826
3796/** 3827/**
3797 * op made some mistake with a scroll, this takes care of punishment. 3828 * op made some mistake with a scroll, this takes care of punishment.
3798 * scroll_failure()- hacked directly from spell_failure 3829 * scroll_failure()- hacked directly from spell_failure
… …
3805 3836
3806 if (failure <= -1 && failure > -15) 3837 if (failure <= -1 && failure > -15)
3807 { /* wonder */ 3838 { /* wonder */
3808 object *tmp; 3839 object *tmp;
3809 3840
3810 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3841 op->failmsg ("Your spell warps!");
3811 tmp = get_archetype (SPELL_WONDER); 3842 tmp = get_archetype (SPELL_WONDER);
3812 cast_wonder (op, op, 0, tmp); 3843 cast_wonder (op, op, 0, tmp);
3813 tmp->destroy (); 3844 tmp->destroy ();
3814 } 3845 }
3815 else if (failure <= -15 && failure > -35) 3846 else if (failure <= -15 && failure > -35)
3816 { /* drain mana */ 3847 { /* drain mana */
3817 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3848 op->failmsg ("Your mana is drained!");
3818 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3849 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3819 if (op->stats.sp < 0) 3850 if (op->stats.sp < 0)
3820 op->stats.sp = 0; 3851 op->stats.sp = 0;
3821 } 3852 }
3822 else if (settings.spell_failure_effects == TRUE) 3853 else if (settings.spell_failure_effects == TRUE)
3823 { 3854 {
3824 if (failure <= -35 && failure > -60) 3855 if (failure <= -35 && failure > -60)
3825 { /* confusion */ 3856 { /* confusion */
3826 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3857 op->failmsg ("The magic recoils on you!");
3827 confuse_player (op, op, power); 3858 confuse_player (op, op, power);
3828 } 3859 }
3829 else if (failure <= -60 && failure > -70) 3860 else if (failure <= -60 && failure > -70)
3830 { /* paralysis */ 3861 { /* paralysis */
3831 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!"); 3862 op->failmsg ("The magic recoils and paralyzes you!");
3832 paralyze_player (op, op, power); 3863 paralyze_player (op, op, power);
3833 } 3864 }
3834 else if (failure <= -70 && failure > -80) 3865 else if (failure <= -70 && failure > -80)
3835 { /* blind */ 3866 { /* blind */
3836 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3867 op->failmsg ("The magic recoils on you!");
3837 blind_player (op, op, power); 3868 blind_player (op, op, power);
3838 } 3869 }
3839 else if (failure <= -80) 3870 else if (failure <= -80)
3840 { /* blast the immediate area */ 3871 { /* blast the immediate area */
3841 object *tmp = get_archetype (LOOSE_MANA); 3872 object *tmp = get_archetype (LOOSE_MANA);
3842 cast_magic_storm (op, tmp, power); 3873 cast_magic_storm (op, tmp, power);
3843 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!"); 3874 op->failmsg ("You unleash uncontrolled mana!");
3844 tmp->destroy (); 3875 tmp->destroy ();
3845 } 3876 }
3846 } 3877 }
3847} 3878}
3848 3879
… …
3913 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3944 if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
3914 flag_change_face = 0; 3945 flag_change_face = 0;
3915 3946
3916 if (flag_change_face) 3947 if (flag_change_face)
3917 { 3948 {
3918 pl->animation_id = GET_ANIM_ID (change);
3919 pl->face = change->face; 3949 pl->face = change->face;
3920 3950 pl->animation_id = change->animation_id;
3921 if (QUERY_FLAG (change, FLAG_ANIMATE)) 3951 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3922 SET_FLAG (pl, FLAG_ANIMATE);
3923 else
3924 CLEAR_FLAG (pl, FLAG_ANIMATE);
3925 } 3952 }
3926 3953
3927 /* check the special case of can't use weapons */ 3954 /* check the special case of can't use weapons */
3928 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 3955 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3929 if (!strcmp (change->name, "monk")) 3956 if (!strcmp (change->name, "monk"))
… …
3955 char got[MAX_BUF]; 3982 char got[MAX_BUF];
3956 int len; 3983 int len;
3957 3984
3958 if (!pl || !transformer) 3985 if (!pl || !transformer)
3959 return; 3986 return;
3987
3960 marked = find_marked_object (pl); 3988 marked = find_marked_object (pl);
3989
3961 if (!marked) 3990 if (!marked)
3962 { 3991 {
3963 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 3992 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
3964 return; 3993 return;
3965 } 3994 }
3995
3966 if (!marked->slaying) 3996 if (!marked->slaying)
3967 { 3997 {
3968 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3998 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3969 return; 3999 return;
3970 } 4000 }
4001
3971 /* check whether they are compatible or not */ 4002 /* check whether they are compatible or not */
3972 find = strstr (marked->slaying, transformer->arch->archname); 4003 find = strstr (marked->slaying, transformer->arch->archname);
3973 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 4004 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3974 { 4005 {
3975 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4006 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3976 return; 4007 return;
3977 } 4008 }
4009
3978 find += strlen (transformer->arch->archname) + 1; 4010 find += strlen (transformer->arch->archname) + 1;
3979 /* Item can be used, now find how many and what it yields */ 4011 /* Item can be used, now find how many and what it yields */
3980 if (isdigit (*(find))) 4012 if (isdigit (*(find)))
3981 { 4013 {
3982 yield = atoi (find); 4014 yield = atoi (find);
… …
3989 else 4021 else
3990 yield = 1; 4022 yield = 1;
3991 4023
3992 while (isdigit (*find)) 4024 while (isdigit (*find))
3993 find++; 4025 find++;
4026
3994 while (*find == ' ') 4027 while (*find == ' ')
3995 find++; 4028 find++;
4029
3996 memset (got, 0, MAX_BUF); 4030 memset (got, 0, MAX_BUF);
4031
3997 if ((separator = strchr (find, ';')) != NULL) 4032 if ((separator = strchr (find, ';')) != NULL)
3998 {
3999 len = separator - find; 4033 len = separator - find;
4000 }
4001 else 4034 else
4002 {
4003 len = strlen (find); 4035 len = strlen (find);
4004 } 4036
4005 if (len > MAX_BUF - 1) 4037 if (len > MAX_BUF - 1)
4006 len = MAX_BUF - 1; 4038 len = MAX_BUF - 1;
4039
4007 strcpy (got, find); 4040 strcpy (got, find);
4008 got[len] = '\0'; 4041 got[len] = '\0';
4009 4042
4010 /* Now create new item, remove used ones when required. */ 4043 /* Now create new item, remove used ones when required. */
4011 new_item = get_archetype (got); 4044 new_item = get_archetype (got);
4012 if (!new_item) 4045 if (!new_item)
4013 { 4046 {
4014 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0)); 4047 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
4015 return; 4048 return;
4016 } 4049 }
4017 4050
4018 new_item->nrof = yield; 4051 new_item->nrof = yield;
4052
4019 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4053 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4020 insert_ob_in_ob (new_item, pl); 4054
4021 esrv_send_inventory (pl, pl); 4055 pl->insert (new_item);
4022 /* Eat up one item */ 4056 /* Eat up one item */
4023 decrease_ob_nr (marked, 1); 4057 marked->decrease ();
4058
4024 /* Eat one transformer if needed */ 4059 /* Eat one transformer if needed */
4025 if (transformer->stats.food) 4060 if (transformer->stats.food)
4026 if (--transformer->stats.food == 0) 4061 if (--transformer->stats.food == 0)
4027 decrease_ob_nr (transformer, 1); 4062 transformer->decrease ();
4028} 4063}
4064

Diff Legend

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