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.106 by root, Sat May 19 00:11:12 2007 UTC vs.
Revision 1.150 by root, Tue Apr 22 23:50:24 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <cmath> 24#include <cmath>
26 25
27#include <global.h> 26#include <global.h>
… …
69 68
70 /* If the director has race set, only affect objects with a arch, 69 /* If the director has race set, only affect objects with a arch,
71 * name or race that matches. 70 * name or race that matches.
72 */ 71 */
73 if ((op->race) && 72 if ((op->race) &&
74 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) && 73 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
75 ((!(victim->name && name_flag) || op->race != victim->name)) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
76 ((!(victim->race && race_flag) || op->race != victim->race))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
77 return 1; 76 return 1;
78 77
79 /* If the director has slaying set, only affect objects where none 78 /* If the director has slaying set, only affect objects where none
80 * of arch, name, or race match. 79 * of arch, name, or race match.
81 */ 80 */
82 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) || 81 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
83 ((victim->name && name_flag && op->slaying == victim->name)) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
84 ((victim->race && race_flag && op->slaying == victim->race))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
85 return 1; 84 return 1;
86 85
87 return 0; 86 return 0;
… …
93 * Return value: 1 if money was destroyed, 0 if not. 92 * Return value: 1 if money was destroyed, 0 if not.
94 */ 93 */
95static int 94static int
96apply_id_altar (object *money, object *altar, object *pl) 95apply_id_altar (object *money, object *altar, object *pl)
97{ 96{
98 object *id, *marked; 97 dynbuf_text buf;
99 int success = 0;
100 98
101 if (pl == NULL || pl->type != PLAYER) 99 if (!pl || pl->type != PLAYER)
102 return 0; 100 return 0;
103 101
104 /* Check for MONEY type is a special hack - it prevents 'nothing needs 102 /* Check for MONEY type is a special hack - it prevents 'nothing needs
105 * identifying' from being printed out more than it needs to be. 103 * identifying' from being printed out more than it needs to be.
106 */ 104 */
107 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 105 if (!check_altar_sacrifice (altar, money) || money->type != MONEY)
108 return 0; 106 return 0;
109 107
110 marked = find_marked_object (pl);
111 /* if the player has a marked item, identify that if it needs to be 108 /* if the player has a marked item, identify that if it needs to be
112 * identified. IF it doesn't, then go through the player inventory. 109 * identified. If it doesn't, then go through the player inventory.
113 */ 110 */
111 if (object *marked = find_marked_object (pl))
114 if (marked && !QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 112 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
115 { 113 {
116 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
117 { 115 {
118 identify (marked); 116 identify (marked);
119 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (marked, pl)); 117
118 buf.printf ("You have %s.\n\n", long_desc (marked, pl));
120 if (marked->msg) 119 if (marked->msg)
121 { 120 buf << "The item has a story:\n\n" << marked->msg << "\n\n";
122 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 121
123 new_draw_info (NDI_UNIQUE, 0, pl, marked->msg); 122 return !money;
124 } 123 }
125 return money == NULL;
126 } 124 }
127 }
128 125
129 for (id = pl->inv; id; id = id->below) 126 for (object *id = pl->inv; id; id = id->below)
130 { 127 {
131 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 128 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
132 { 129 {
133 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
134 { 131 {
135 identify (id); 132 identify (id);
136 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (id, pl)); 133
134 buf.printf ("You have %s.\n\n", long_desc (id, pl));
137 if (id->msg) 135 if (id->msg)
138 { 136 buf << "The item has a story:\n\n" << id->msg << "\n\n";
139 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 137
140 new_draw_info (NDI_UNIQUE, 0, pl, id->msg);
141 }
142 success = 1;
143 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
144 if (money == NULL || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
145 break; 140 break;
146 } 141 }
147 else 142 else
148 { 143 {
149 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n"); 144 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n");
150 break; 145 break;
151 } 146 }
152 } 147 }
153 } 148 }
154 if (!success) 149
155 new_draw_info (NDI_UNIQUE, 0, pl, "You have nothing that needs identifying"); 150 if (buf.empty ())
151 pl->failmsg ("You have nothing that needs identifying");
152 else
153 pl->contr->infobox (MSG_CHANNEL ("identify"), buf);
154
156 return money == NULL; 155 return !money;
157} 156}
158 157
159/** 158/**
160 * This checks whether the object has a "on_use_yield" field, and if so generated and drops 159 * This checks whether the object has a "on_use_yield" field, and if so generated and drops
161 * matching item. 160 * matching item.
162 **/ 161 **/
163static void 162void
164handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
165{ 164{
166 const char *yield; 165 const char *yield;
167 166
168 yield = get_ob_key_value (tmp, "on_use_yield"); 167 yield = get_ob_key_value (tmp, "on_use_yield");
168
169 if (yield != NULL) 169 if (yield)
170 { 170 get_archetype (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
171 object *drop = get_archetype (yield);
172
173 if (tmp->env)
174 {
175 drop = insert_ob_in_ob (drop, tmp->env);
176 if (tmp->env->type == PLAYER)
177 esrv_send_item (tmp->env, drop);
178 }
179 else
180 {
181 drop->x = tmp->x;
182 drop->y = tmp->y;
183 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
184 }
185 }
186} 171}
187 172
188/** 173/**
189 * Handles applying a potion. 174 * Handles applying a potion.
190 */ 175 */
… …
196 181
197 floor = GET_MAP_OB (op->map, op->x, op->y); 182 floor = GET_MAP_OB (op->map, op->x, op->y);
198 183
199 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 184 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
200 { 185 {
201 if (op->type == PLAYER)
202 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 186 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
187
203 CLEAR_FLAG (tmp, FLAG_APPLIED); 188 CLEAR_FLAG (tmp, FLAG_APPLIED);
204 return 0; 189 return 0;
205 } 190 }
206 191
207 if (op->type == PLAYER) 192 if (op->type == PLAYER)
… …
218 203
219 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 204 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
220 { 205 {
221 op->drain_stat (); 206 op->drain_stat ();
222 op->update_stats (); 207 op->update_stats ();
223 decrease_ob (tmp); 208 tmp->decrease ();
224 return 1; 209 return 1;
225 } 210 }
226 211
227 if (!(at = archetype::find (ARCH_DEPLETION))) 212 if (!(at = archetype::find (ARCH_DEPLETION)))
228 { 213 {
229 LOG (llevError, "Could not find archetype depletion\n"); 214 LOG (llevError, "Could not find archetype depletion\n");
230 return 0; 215 return 0;
231 } 216 }
217
232 depl = present_arch_in_ob (at, op); 218 depl = present_arch_in_ob (at, op);
233 219
234 if (depl) 220 if (depl)
235 { 221 {
236 for (i = 0; i < NUM_STATS; i++) 222 for (i = 0; i < NUM_STATS; i++)
237 if (depl->stats.stat (i)) 223 if (depl->stats.stat (i))
238 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 224 op->statusmsg (restore_msg[i]);
239 225
240 depl->destroy (); 226 depl->destroy ();
241 op->update_stats (); 227 op->update_stats ();
242 } 228 }
243 else 229 else
244 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 230 op->statusmsg ("Your potion had no effect.");
245 231
246 decrease_ob (tmp); 232 tmp->decrease ();
247 return 1; 233 return 1;
248 } 234 }
249 235
250 /* improvement potion - only for players */ 236 /* improvement potion - only for players */
251 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 237 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
252 { 238 {
253 for (i = 1; i < MIN (11, op->level); i++) 239 for (i = 1; i < MIN (11, op->level); i++)
254 { 240 {
255 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 241 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
256 { 242 {
257 if (op->contr->levhp[i] != 1) 243 if (op->contr->levhp[i] != 1)
258 { 244 {
259 op->contr->levhp[i] = 1; 245 op->contr->levhp[i] = 1;
260 break; 246 break;
261 } 247 }
248
262 if (op->contr->levsp[i] != 1) 249 if (op->contr->levsp[i] != 1)
263 { 250 {
264 op->contr->levsp[i] = 1; 251 op->contr->levsp[i] = 1;
265 break; 252 break;
266 } 253 }
254
267 if (op->contr->levgrace[i] != 1) 255 if (op->contr->levgrace[i] != 1)
268 { 256 {
269 op->contr->levgrace[i] = 1; 257 op->contr->levgrace[i] = 1;
270 break; 258 break;
271 } 259 }
… …
275 if (op->contr->levhp[i] < 9) 263 if (op->contr->levhp[i] < 9)
276 { 264 {
277 op->contr->levhp[i] = 9; 265 op->contr->levhp[i] = 9;
278 break; 266 break;
279 } 267 }
268
280 if (op->contr->levsp[i] < 6) 269 if (op->contr->levsp[i] < 6)
281 { 270 {
282 op->contr->levsp[i] = 6; 271 op->contr->levsp[i] = 6;
283 break; 272 break;
284 } 273 }
274
285 if (op->contr->levgrace[i] < 3) 275 if (op->contr->levgrace[i] < 3)
286 { 276 {
287 op->contr->levgrace[i] = 3; 277 op->contr->levgrace[i] = 3;
288 break; 278 break;
289 } 279 }
… …
297 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 287 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
298 { 288 {
299 if (got_one) 289 if (got_one)
300 { 290 {
301 op->update_stats (); 291 op->update_stats ();
302 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 292 op->statusmsg ("The Gods smile upon you and remake you "
303 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 293 "a little more in their image. "
304 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 294 "You feel a little more perfect.", NDI_GREEN);
305 } 295 }
306 else 296 else
307 new_draw_info (NDI_UNIQUE, 0, op, "The potion had no effect - you are already perfect"); 297 op->statusmsg ("The potion had no effect - you are already perfect.");
308 } 298 }
309 else 299 else
310 { /* cursed potion */ 300 { /* cursed potion */
311 if (got_one) 301 if (got_one)
312 { 302 {
313 op->update_stats (); 303 op->update_stats ();
314 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 304 op->failmsg ("The Gods are angry and punish you.");
315 } 305 }
316 else 306 else
317 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 307 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
318 } 308 }
319 309
320 decrease_ob (tmp); 310 tmp->decrease ();
321 return 1; 311 return 1;
322 } 312 }
323 313
324 314
325 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 315 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
331 { 321 {
332 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 322 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
333 { 323 {
334 object *fball; 324 object *fball;
335 325
336 new_draw_info (NDI_UNIQUE, 0, op, "Yech! Your lungs are on fire!"); 326 op->failmsg ("Yech! Your lungs are on fire!");
327
337 /* Explodes a fireball centered at player */ 328 /* Explodes a fireball centered at player */
338 fball = get_archetype (EXPLODING_FIREBALL); 329 fball = get_archetype (EXPLODING_FIREBALL);
339 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1; 330 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
340 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2; 331 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
341 fball->x = op->x; 332 fball->x = op->x;
… …
343 insert_ob_in_map (fball, op->map, NULL, 0); 334 insert_ob_in_map (fball, op->map, NULL, 0);
344 } 335 }
345 else 336 else
346 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 337 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
347 338
348 decrease_ob (tmp); 339 tmp->decrease ();
340
349 /* if youre dead, no point in doing this... */ 341 /* if youre dead, no point in doing this... */
350 if (!QUERY_FLAG (op, FLAG_REMOVED)) 342 if (!QUERY_FLAG (op, FLAG_REMOVED))
351 op->update_stats (); 343 op->update_stats ();
344
352 return 1; 345 return 1;
353 } 346 }
354 347
355 /* Deal with protection potions */ 348 /* Deal with protection potions */
356 force = NULL; 349 force = NULL;
… …
358 { 351 {
359 if (tmp->resist[i]) 352 if (tmp->resist[i])
360 { 353 {
361 if (!force) 354 if (!force)
362 force = get_archetype (FORCE_NAME); 355 force = get_archetype (FORCE_NAME);
356
363 memcpy (force->resist, tmp->resist, sizeof (tmp->resist)); 357 memcpy (force->resist, tmp->resist, sizeof (tmp->resist));
364 force->type = POTION_EFFECT; 358 force->type = POTION_EFFECT;
365 break; /* Only need to find one protection since we copy entire batch */ 359 break; /* Only need to find one protection since we copy entire batch */
366 } 360 }
367 } 361 }
362
368 /* This is a protection potion */ 363 /* This is a protection potion */
369 if (force) 364 if (force)
370 { 365 {
371 /* cursed items last longer */ 366 /* cursed items last longer */
372 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 367 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
… …
380 force->speed_left = -1; 375 force->speed_left = -1;
381 force = insert_ob_in_ob (force, op); 376 force = insert_ob_in_ob (force, op);
382 CLEAR_FLAG (tmp, FLAG_APPLIED); 377 CLEAR_FLAG (tmp, FLAG_APPLIED);
383 SET_FLAG (force, FLAG_APPLIED); 378 SET_FLAG (force, FLAG_APPLIED);
384 change_abil (op, force); 379 change_abil (op, force);
385 decrease_ob (tmp); 380 tmp->decrease ();
386 return 1; 381 return 1;
387 } 382 }
388 383
389 /* Only thing left are the stat potions */ 384 /* Only thing left are the stat potions */
390 if (op->type == PLAYER) 385 if (op->type == PLAYER)
391 { /* only for players */ 386 { /* only for players */
392 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 387 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0)
393 CLEAR_FLAG (tmp, FLAG_APPLIED); 388 CLEAR_FLAG (tmp, FLAG_APPLIED);
394 else 389 else
395 SET_FLAG (tmp, FLAG_APPLIED); 390 SET_FLAG (tmp, FLAG_APPLIED);
391
396 if (!change_abil (op, tmp)) 392 if (!change_abil (op, tmp))
397 new_draw_info (NDI_UNIQUE, 0, op, "Nothing happened."); 393 op->statusmsg ("Nothing happened.");
398 } 394 }
399 395
400 /* CLEAR_FLAG is so that if the character has other potions 396 /* CLEAR_FLAG is so that if the character has other potions
401 * that were grouped with the one consumed, his 397 * that were grouped with the one consumed, his
402 * stat will not be raised by them. fix_player just clears 398 * stat will not be raised by them. fix_player just clears
403 * up all the stats. 399 * up all the stats.
404 */ 400 */
405 CLEAR_FLAG (tmp, FLAG_APPLIED); 401 CLEAR_FLAG (tmp, FLAG_APPLIED);
406 op->update_stats (); 402 op->update_stats ();
407 decrease_ob (tmp); 403 tmp->decrease ();
408 return 1; 404 return 1;
409} 405}
410 406
411/**************************************************************************** 407/****************************************************************************
412 * Weapon improvement code follows 408 * Weapon improvement code follows
… …
418static int 414static int
419check_item (object *op, const char *item) 415check_item (object *op, const char *item)
420{ 416{
421 int count = 0; 417 int count = 0;
422 418
423 419 if (!item)
424 if (item == NULL)
425 return 0; 420 return 0;
426 421
427 op = op->below; 422 for (op = op->below; op; op = op->below)
428 while (op != NULL)
429 { 423 {
430 if (strcmp (op->arch->name, item) == 0) 424 if (strcmp (op->arch->archname, item) == 0)
431 { 425 {
432 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 426 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
433 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 427 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
434 { 428 {
435 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */ 429 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
436 count++; 430 count++;
437 else 431 else
438 count += op->nrof; 432 count += op->nrof;
439 } 433 }
440 } 434 }
441
442 op = op->below;
443 } 435 }
444 436
445 return count; 437 return count;
446} 438}
447 439
… …
457 object *prev; 449 object *prev;
458 450
459 prev = op; 451 prev = op;
460 op = op->below; 452 op = op->below;
461 453
462 while (op != NULL) 454 while (op)
463 { 455 {
464 if (strcmp (op->arch->name, item) == 0) 456 if (strcmp (op->arch->archname, item) == 0)
465 { 457 {
466 if (op->nrof >= nrof) 458 if (op->nrof >= nrof)
467 { 459 {
468 decrease_ob_nr (op, nrof); 460 op->decrease (nrof);
469 return; 461 return;
470 } 462 }
471 else 463 else
472 { 464 {
473 decrease_ob_nr (op, op->nrof); 465 op->decrease (nrof);
474 nrof -= op->nrof; 466 nrof -= op->nrof;
475 } 467 }
468
476 op = prev; 469 op = prev;
477 } 470 }
471
478 prev = op; 472 prev = op;
479 op = op->below; 473 op = op->below;
480 } 474 }
481} 475}
482 476
… …
488 * we return 1 (true) if the player can use the weapon. 482 * we return 1 (true) if the player can use the weapon.
489 */ 483 */
490static int 484static int
491check_weapon_power (const object *who, int improvs) 485check_weapon_power (const object *who, int improvs)
492{ 486{
493
494/* Old code is below (commented out). Basically, since weapons are the only 487/* Old code is below (commented out). Basically, since weapons are the only
495 * object players really have any control to improve, it's a bit harsh to 488 * object players really have any control to improve, it's a bit harsh to
496 * require high level in some combat skill, so we just use overall level. 489 * require high level in some combat skill, so we just use overall level.
497 */ 490 */
498#if 1 491#if 1
… …
539static int 532static int
540check_sacrifice (object *op, const object *improver) 533check_sacrifice (object *op, const object *improver)
541{ 534{
542 int count = 0; 535 int count = 0;
543 536
544 if (improver->slaying != NULL) 537 if (improver->slaying)
545 { 538 {
546 count = check_item (op, improver->slaying); 539 count = check_item (op, improver->slaying);
547 if (count < 1) 540 if (count < 1)
548 { 541 {
549 char buf[200];
550
551 sprintf (buf, "The gods want more %ss", &improver->slaying); 542 op->failmsg (format ("The gods want more %ss", &improver->slaying));
552 new_draw_info (NDI_UNIQUE, 0, op, buf);
553 return 0; 543 return 0;
554 } 544 }
555 } 545 }
556 else 546 else
557 count = 1; 547 count = 1;
… …
560} 550}
561 551
562/** 552/**
563 * Actually improves the weapon, and tells user. 553 * Actually improves the weapon, and tells user.
564 */ 554 */
565int 555static int
566improve_weapon_stat (object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname) 556improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
567{ 557{
568
569 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
570 *stat += sacrifice_count; 558 stat += sacrifice_count;
571 weapon->last_eat++; 559 weapon->last_eat++;
572 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 560 improver->decrease ();
573 decrease_ob (improver);
574 561
575 /* So it updates the players stats and the window */ 562 /* So it updates the players stats and the window */
576 op->update_stats (); 563 op->update_stats ();
564
565 op->statusmsg (format (
566 "Your sacrifice was accepted.\n"
567 "Weapon's bonus to %s improved by %d.",
568 statname, sacrifice_count
569 ));
570
577 return 1; 571 return 1;
578} 572}
579 573
580/* Types of improvements, hidden in the sp field. */ 574/* Types of improvements, hidden in the sp field. */
581#define IMPROVE_PREPARE 1 575#define IMPROVE_PREPARE 1
582#define IMPROVE_DAMAGE 2 576#define IMPROVE_DAMAGE 2
583#define IMPROVE_WEIGHT 3 577#define IMPROVE_WEIGHT 3
584#define IMPROVE_ENCHANT 4 578#define IMPROVE_ENCHANT 4
585#define IMPROVE_STR 5 579#define IMPROVE_STR 5
586#define IMPROVE_DEX 6 580#define IMPROVE_DEX 6
587#define IMPROVE_CON 7 581#define IMPROVE_CON 7
588#define IMPROVE_WIS 8 582#define IMPROVE_WIS 8
589#define IMPROVE_CHA 9 583#define IMPROVE_CHA 9
590#define IMPROVE_INT 10 584#define IMPROVE_INT 10
591#define IMPROVE_POW 11 585#define IMPROVE_POW 11
592
593 586
594/** 587/**
595 * This does the prepare weapon scroll. 588 * This does the prepare weapon scroll.
596 * Checks for sacrifice, and so on. 589 * Checks for sacrifice, and so on.
597 */ 590 */
598
599int 591int
600prepare_weapon (object *op, object *improver, object *weapon) 592prepare_weapon (object *op, object *improver, object *weapon)
601{ 593{
602 int sacrifice_count, i; 594 int sacrifice_count, i;
603 char buf[MAX_BUF]; 595 char buf[MAX_BUF];
604 596
605 if (weapon->level != 0) 597 if (weapon->level != 0)
606 { 598 {
607 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 599 op->failmsg ("Weapon is already prepared!");
608 return 0; 600 return 0;
609 } 601 }
602
610 for (i = 0; i < NROFATTACKS; i++) 603 for (i = 0; i < NROFATTACKS; i++)
611 if (weapon->resist[i]) 604 if (weapon->resist[i])
612 break; 605 break;
613 606
614 /* If we break out, i will be less than nrofattacks, preventing 607 /* If we break out, i will be less than nrofattacks, preventing
… …
617 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 610 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
618 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 611 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
619 weapon->stats.exp || /* speed */ 612 weapon->stats.exp || /* speed */
620 weapon->stats.ac) /* AC - only taifu's I think */ 613 weapon->stats.ac) /* AC - only taifu's I think */
621 { 614 {
622 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 615 op->failmsg ("You cannot prepare magic weapons. "
616 "H<A weapon is considered magical if it changes regeneration, "
617 "speed or ac.>");
623 return 0; 618 return 0;
624 } 619 }
620
625 sacrifice_count = check_sacrifice (op, improver); 621 sacrifice_count = check_sacrifice (op, improver);
626 if (sacrifice_count <= 0) 622 if (sacrifice_count <= 0)
627 return 0; 623 return 0;
624
628 weapon->level = isqrt (sacrifice_count); 625 weapon->level = isqrt (sacrifice_count);
629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
630 eat_item (op, improver->slaying, sacrifice_count); 626 eat_item (op, improver->slaying, sacrifice_count);
631 627
632 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level); 628 op->statusmsg (format (
629 "Your sacrifice was accepted."
630 "Your *%s may be improved %d times.",
631 &weapon->name, weapon->level
632 ));
633 633
634 sprintf (buf, "%s's %s", &op->name, &weapon->name); 634 sprintf (buf, "%s's %s", &op->name, &weapon->name);
635 weapon->name = weapon->name_pl = buf; 635 weapon->name = weapon->name_pl = buf;
636 weapon->nrof = 0; /* prevents preparing n weapons in the same 636 weapon->nrof = 0; /* prevents preparing n weapons in the same
637 slot at once! */ 637 slot at once! */
638 decrease_ob (improver); 638 improver->decrease ();
639 weapon->last_eat = 0; 639 weapon->last_eat = 0;
640 return 1; 640 return 1;
641} 641}
642
643 642
644/** 643/**
645 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 644 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
646 * This is the new improve weapon code. 645 * This is the new improve weapon code.
647 * Returns 0 if it was not able to work for some reason. 646 * Returns 0 if it was not able to work for some reason.
… …
656improve_weapon (object *op, object *improver, object *weapon) 655improve_weapon (object *op, object *improver, object *weapon)
657{ 656{
658 int sacrifice_count, sacrifice_needed = 0; 657 int sacrifice_count, sacrifice_needed = 0;
659 658
660 if (improver->stats.sp == IMPROVE_PREPARE) 659 if (improver->stats.sp == IMPROVE_PREPARE)
661 {
662 return prepare_weapon (op, improver, weapon); 660 return prepare_weapon (op, improver, weapon);
663 } 661
664 if (weapon->level == 0) 662 if (weapon->level == 0)
665 { 663 {
666 new_draw_info (NDI_UNIQUE, 0, op, "This weapon has not been prepared."); 664 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");
667 return 0; 665 return 0;
668 } 666 }
667
669 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 668 if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
670 { 669 {
671 new_draw_info (NDI_UNIQUE, 0, op, "This weapon cannot be improved any more."); 670 op->failmsg ("This weapon cannot be improved any more.");
672 return 0; 671 return 0;
673 } 672 }
673
674 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 674 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))
675 { 675 {
676 new_draw_info (NDI_UNIQUE, 0, op, "Improving the weapon will make it too"); 676 op->failmsg ("Improving the weapon will make it too "
677 new_draw_info (NDI_UNIQUE, 0, op, "powerful for you to use. Unready it if you"); 677 "powerful for you to use. Unready it if you "
678 new_draw_info (NDI_UNIQUE, 0, op, "really want to improve it."); 678 "really want to improve it.");
679 return 0; 679 return 0;
680 } 680 }
681
681 /* This just increases damage by 5 points, no matter what. No sacrifice 682 /* This just increases damage by 5 points, no matter what. No sacrifice
682 * is needed. Since stats.dam is now a 16 bit value and not 8 bit, 683 * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
683 * don't put any maximum value on damage - the limit is how much the 684 * don't put any maximum value on damage - the limit is how much the
684 * weapon can be improved. 685 * weapon can be improved.
685 */ 686 */
686 if (improver->stats.sp == IMPROVE_DAMAGE) 687 if (improver->stats.sp == IMPROVE_DAMAGE)
687 { 688 {
688 weapon->stats.dam += 5; 689 weapon->stats.dam += 5;
689 weapon->weight += 5000; /* 5 KG's */ 690 weapon->weight += 5000; /* 5 KG's */
690 new_draw_info_format (NDI_UNIQUE, 0, op, "Damage has been increased by 5 to %d", weapon->stats.dam); 691 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
691 weapon->last_eat++; 692 weapon->last_eat++;
692 693
693 weapon->item_power++; 694 weapon->item_power++;
694 decrease_ob (improver); 695 improver->decrease ();
695 return 1; 696 return 1;
696 } 697 }
698
697 if (improver->stats.sp == IMPROVE_WEIGHT) 699 if (improver->stats.sp == IMPROVE_WEIGHT)
698 { 700 {
699 /* Reduce weight by 20% */ 701 /* Reduce weight by 20% */
700 weapon->weight = (weapon->weight * 8) / 10; 702 weapon->weight = (weapon->weight * 8) / 10;
701 if (weapon->weight < 1) 703 if (weapon->weight < 1)
702 weapon->weight = 1; 704 weapon->weight = 1;
705
703 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon weight reduced to %6.1f kg", (float) weapon->weight / 1000.0); 706 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
704 weapon->last_eat++; 707 weapon->last_eat++;
705 weapon->item_power++; 708 weapon->item_power++;
706 decrease_ob (improver); 709 improver->decrease ();
707 return 1; 710 return 1;
708 } 711 }
709 if (improver->stats.sp == IMPROVE_ENCHANT) 712 if (improver->stats.sp == IMPROVE_ENCHANT)
710 { 713 {
711 weapon->magic++; 714 weapon->magic++;
712 weapon->last_eat++; 715 weapon->last_eat++;
713 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon magic increased to %d", weapon->magic); 716 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
714 decrease_ob (improver); 717 improver->decrease ();
715 weapon->item_power++; 718 weapon->item_power++;
716 return 1; 719 return 1;
717 } 720 }
718 721
719 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 722 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
724 sacrifice_needed *= 2; 727 sacrifice_needed *= 2;
725 728
726 sacrifice_count = check_sacrifice (op, improver); 729 sacrifice_count = check_sacrifice (op, improver);
727 if (sacrifice_count < sacrifice_needed) 730 if (sacrifice_count < sacrifice_needed)
728 { 731 {
729 new_draw_info_format (NDI_UNIQUE, 0, op, "You need at least %d %s", sacrifice_needed, &improver->slaying); 732 op->failmsg (format ("You need at least %d %s.", sacrifice_needed, &improver->slaying));
730 return 0; 733 return 0;
731 } 734 }
735
732 eat_item (op, improver->slaying, sacrifice_needed); 736 eat_item (op, improver->slaying, sacrifice_needed);
733 weapon->item_power++; 737 weapon->item_power++;
734 738
735 switch (improver->stats.sp) 739 switch (improver->stats.sp)
736 { 740 {
737 case IMPROVE_STR:
738 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Str), 1, "strength"); 741 case IMPROVE_STR: return improve_weapon_stat (op, improver, weapon, weapon->stats.Str, 1, "strength");
739 case IMPROVE_DEX:
740 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Dex), 1, "dexterity"); 742 case IMPROVE_DEX: return improve_weapon_stat (op, improver, weapon, weapon->stats.Dex, 1, "dexterity");
741 case IMPROVE_CON:
742 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Con), 1, "constitution"); 743 case IMPROVE_CON: return improve_weapon_stat (op, improver, weapon, weapon->stats.Con, 1, "constitution");
743 case IMPROVE_WIS:
744 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Wis), 1, "wisdom"); 744 case IMPROVE_WIS: return improve_weapon_stat (op, improver, weapon, weapon->stats.Wis, 1, "wisdom");
745 case IMPROVE_CHA:
746 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Cha), 1, "charisma"); 745 case IMPROVE_CHA: return improve_weapon_stat (op, improver, weapon, weapon->stats.Cha, 1, "charisma");
747 case IMPROVE_INT:
748 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Int), 1, "intelligence"); 746 case IMPROVE_INT: return improve_weapon_stat (op, improver, weapon, weapon->stats.Int, 1, "intelligence");
749 case IMPROVE_POW:
750 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Pow), 1, "power"); 747 case IMPROVE_POW: return improve_weapon_stat (op, improver, weapon, weapon->stats.Pow, 1, "power");
751 default: 748 default:
752 new_draw_info (NDI_UNIQUE, 0, op, "Unknown improvement type."); 749 op->failmsg ("Unknown improvement type.");
753 } 750 }
751
754 LOG (llevError, "improve_weapon: Got to end of function\n"); 752 LOG (llevError, "improve_weapon: Got to end of function\n");
755 return 0; 753 return 0;
756} 754}
757 755
758/** 756/**
… …
768 if (op->type != PLAYER) 766 if (op->type != PLAYER)
769 return 0; 767 return 0;
770 768
771 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 769 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
772 { 770 {
773 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 771 op->failmsg ("Something blocks the magic of the scroll!");
774 return 0; 772 return 0;
775 } 773 }
776 774
777 otmp = find_marked_object (op); 775 otmp = find_marked_object (op);
778 if (!otmp) 776 if (!otmp)
779 { 777 {
780 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 778 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
781 return 0; 779 return 0;
782 } 780 }
783 781
784 if (otmp->type != WEAPON && otmp->type != BOW) 782 if (otmp->type != WEAPON && otmp->type != BOW)
785 { 783 {
786 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 784 op->failmsg ("Marked item is not a weapon or bow!");
787 return 0; 785 return 0;
788 } 786 }
789 787
790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 788 op->statusmsg ("Applied weapon builder.");
789
791 improve_weapon (op, tmp, otmp); 790 improve_weapon (op, tmp, otmp);
792 esrv_send_item (op, otmp); 791 esrv_send_item (op, otmp);
793 return 1; 792 return 1;
794} 793}
795 794
… …
820{ 819{
821 object *tmp; 820 object *tmp;
822 821
823 if (armour->magic >= settings.armor_max_enchant) 822 if (armour->magic >= settings.armor_max_enchant)
824 { 823 {
825 new_draw_info (NDI_UNIQUE, 0, op, "This armour can not be enchanted any further."); 824 op->failmsg ("This armour can not be enchanted any further!");
826 return 0; 825 return 0;
827 } 826 }
827
828 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 828 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
829 * etc), so take the easy way out and don't worry about it. 829 * etc), so take the easy way out and don't worry about it.
830 * Note - maybe add scrolls which make the random artifact versions (eg, armour 830 * Note - maybe add scrolls which make the random artifact versions (eg, armour
831 * of gnarg and what not?) 831 * of gnarg and what not?)
832 */ 832 */
833 if (armour->title) 833 if (armour->title)
834 { 834 {
835 new_draw_info (NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 835 op->failmsg ("This armour will not accept further enchantment.");
836 return 0; 836 return 0;
837 } 837 }
838 838
839 /* Split objects if needed. Can't insert tmp until the 839 /* Split objects if needed. Can't insert tmp until the
840 * end of this function - otherwise it will just re-merge. 840 * end of this function - otherwise it will just re-merge.
841 */ 841 */
842 if (armour->nrof > 1) 842 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
843 tmp = get_split_ob (armour, armour->nrof - 1);
844 else
845 tmp = NULL;
846 843
847 armour->magic++; 844 armour->magic++;
848 845
849 if (!settings.armor_speed_linear) 846 if (!settings.armor_speed_linear)
850 { 847 {
… …
855 { 852 {
856 base = base - (base * settings.armor_speed_improvement) / 100; 853 base = base - (base * settings.armor_speed_improvement) / 100;
857 pow++; 854 pow++;
858 } 855 }
859 856
860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 857 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
861 } 858 }
862 else 859 else
863 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100; 860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
864 861
865 if (!settings.armor_weight_linear) 862 if (!settings.armor_weight_linear)
866 { 863 {
867 int base = 100; 864 int base = 100;
868 int pow = 0; 865 int pow = 0;
… …
871 { 868 {
872 base = base - (base * settings.armor_weight_reduction) / 100; 869 base = base - (base * settings.armor_weight_reduction) / 100;
873 pow++; 870 pow++;
874 } 871 }
875 872
876 armour->weight = (armour->arch->clone.weight * base) / 100; 873 armour->weight = (armour->arch->weight * base) / 100;
877 } 874 }
878 else 875 else
879 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100; 876 armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
880 877
881 if (armour->weight <= 0) 878 if (armour->weight <= 0)
882 { 879 {
883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 880 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
884 armour->weight = 1; 881 armour->weight = 1;
885 } 882 }
886 883
887 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic); 884 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
888 885
889 if (op->type == PLAYER) 886 if (op->type == PLAYER)
890 { 887 {
891 esrv_send_item (op, armour); 888 esrv_send_item (op, armour);
889
892 if (QUERY_FLAG (armour, FLAG_APPLIED)) 890 if (QUERY_FLAG (armour, FLAG_APPLIED))
893 op->update_stats (); 891 op->update_stats ();
894 } 892 }
895 decrease_ob (improver); 893
894 improver->decrease ();
895
896 if (tmp) 896 if (tmp)
897 { 897 op->insert (tmp);
898 insert_ob_in_ob (tmp, op); 898
899 esrv_send_item (op, tmp);
900 }
901 return 1; 899 return 1;
902} 900}
903
904 901
905/* 902/*
906 * convert_item() returns 1 if anything was converted, 0 if the item was not 903 * convert_item() returns 1 if anything was converted, 0 if the item was not
907 * what the converter wants, -1 if the converter is broken. 904 * what the converter wants, -1 if the converter is broken.
908 */ 905 *
909#define CONV_FROM(xyz) xyz->slaying
910#define CONV_TO(xyz) xyz->other_arch
911#define CONV_NR(xyz) xyz->stats.sp
912#define CONV_NEED(xyz) xyz->stats.food
913
914/* Takes one items and makes another. 906 * Takes one type of items and makes another.
915 * converter is the object that is doing the conversion. 907 * converter is the object that is doing the conversion.
916 * item is the object that triggered the converter - if it is not 908 * item is the object that triggered the converter - if it is not
917 * what the converter wants, this will not do anything. 909 * what the converter wants, this will not do anything.
918 */ 910 */
919int 911static int
920convert_item (object *item, object *converter) 912convert_item (object *item, object *converter)
921{ 913{
922 int nr = 0;
923 uint32 price_in; 914 sint64 nr, price_in;
915
916 if (item->flag [FLAG_UNPAID])
917 return 0;
918
919 shstr conv_from = converter->slaying;
920 archetype *conv_to = converter->other_arch;
921 sint64 need = converter->stats.food;
922 sint64 give = converter->stats.sp;
924 923
925 /* We make some assumptions - we assume if it takes money as it type, 924 /* We make some assumptions - we assume if it takes money as it type,
926 * it wants some amount. We don't make change (ie, if something costs 925 * it wants some amount. We don't make change (ie, if something costs
927 * 3 gp and player drops a platinum, tough luck) 926 * 3 gp and player drops a platinum, tough luck)
928 */ 927 */
929 if (!strcmp (CONV_FROM (converter), "money")) 928 if (conv_from == shstr_money)
930 { 929 {
931 int cost;
932
933 if (item->type != MONEY) 930 if (item->type != MONEY)
934 return 0; 931 return 0;
935 932
936 nr = (item->nrof * item->value) / CONV_NEED (converter); 933 nr = sint64 (item->nrof) * item->value / need;
937 if (!nr) 934 if (!nr)
938 return 0; 935 return 0;
939 cost = nr * CONV_NEED (converter) / item->value; 936
940 /* take into account rounding errors */ 937 converter->play_sound (sound_find ("shop_buy"));
941 if (nr * CONV_NEED (converter) % item->value) 938
942 cost++; 939 sint64 cost = (nr * need + item->value - 1) / item->value;
943 decrease_ob_nr (item, cost); 940
941 item->decrease (cost);
944 942
945 price_in = cost * item->value; 943 price_in = cost * item->value;
946 } 944 }
947 else 945 else
948 { 946 {
949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 947 if (item->type == PLAYER
950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 948 || conv_from != item->arch->archname
949 || (need && need > (uint16) item->nrof))
951 return 0; 950 return 0;
952 951
953 if (CONV_NEED (converter)) 952 converter->play_sound (sound_find ("convert_item"));
953
954 if (need)
954 { 955 {
955 nr = item->nrof / CONV_NEED (converter); 956 nr = sint64 (item->nrof) / need;
956 decrease_ob_nr (item, nr * CONV_NEED (converter)); 957 item->decrease (nr * need);
957 price_in = nr * CONV_NEED (converter) * item->value; 958 price_in = nr * need * item->value;
958 } 959 }
959 else 960 else
960 { 961 {
961 price_in = item->value; 962 price_in = item->value;
962 item->destroy (); 963 item->destroy ();
963 } 964 }
964 } 965 }
965 966
966 if (converter->inv != NULL) 967 if (converter->inv)
967 { 968 {
968 object *ob; 969 object *ob;
969 int i; 970 int i;
970 object *ob_to_copy; 971 object *ob_to_copy;
971 972
972 /* select random object from inventory to copy */ 973 /* select random object from inventory to copy */
973 ob_to_copy = converter->inv; 974 ob_to_copy = converter->inv;
974 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) 975 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
975 {
976 if (rndm (0, i) == 0) 976 if (rndm (0, i) == 0)
977 {
978 ob_to_copy = ob; 977 ob_to_copy = ob;
979 } 978
980 }
981 item = object_create_clone (ob_to_copy); 979 item = object_create_clone (ob_to_copy);
982 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 980 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
983 unflag_inv (item, FLAG_IS_A_TEMPLATE); 981 unflag_inv (item, FLAG_IS_A_TEMPLATE);
984 } 982 }
985 else 983 else
986 { 984 {
987 if (converter->other_arch == NULL) 985 if (!conv_to)
988 { 986 {
989 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 987 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
990 &converter->name, &converter->map->path, converter->x, converter->y); 988 &converter->name, &converter->map->path, converter->x, converter->y);
991 return -1; 989 return -1;
992 } 990 }
993 991
994 item = object_create_arch (converter->other_arch); 992 item = object_create_arch (conv_to);
995 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 993 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
996 } 994 }
997 995
998 if (CONV_NR (converter)) 996 if (give)
999 item->nrof = CONV_NR (converter); 997 item->nrof = give;
998
1000 if (nr) 999 if (nr)
1001 item->nrof *= nr; 1000 item->nrof *= nr;
1001
1002 if (is_in_shop (converter)) 1002 if (is_in_shop (converter))
1003 SET_FLAG (item, FLAG_UNPAID); 1003 SET_FLAG (item, FLAG_UNPAID);
1004 else if (price_in < item->nrof * item->value) 1004 else if (price_in < sint64 (item->nrof) * item->value)
1005 { 1005 {
1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1008
1009 /** 1008 /**
1010 * elmex: we are going to let the game continue, as the mapcreator 1009 * elmex: we are going to let the game continue, as the mapcreator
1011 * probably had something in mind when doing this 1010 * hopefully had something in mind when doing this.
1012 */ 1011 */
1013 } 1012 }
1013
1014 SET_FLAG (item, FLAG_IDENTIFIED);
1014 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1015 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1015 return 1; 1016 return 1;
1016} 1017}
1017 1018
1018/** 1019/**
… …
1035 1036
1036 op->contr->last_used = 0; 1037 op->contr->last_used = 0;
1037 1038
1038 if (sack->env && sack->env != op) 1039 if (sack->env && sack->env != op)
1039 { 1040 {
1040 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first."); 1041 op->failmsg ("You must put it onto the floor or into your inventory first.");
1041 return 1; 1042 return 1;
1042 } 1043 }
1043 1044
1044 // already applied == open on ground, or open in inv, or active in inv 1045 // already applied == open on ground, or open in inv, or active in inv
1045 if (sack->flag [FLAG_APPLIED]) 1046 if (sack->flag [FLAG_APPLIED])
… …
1051 return 1; 1052 return 1;
1052 } 1053 }
1053 else if (!sack->env) 1054 else if (!sack->env)
1054 { 1055 {
1055 // active, but not ours: some other player has opened it 1056 // active, but not ours: some other player has opened it
1056 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1057 op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
1057 return 1; 1058 return 1;
1058 } 1059 }
1059 1060
1060 // fall through to opening it (active in inv) 1061 // fall through to opening it (active in inv)
1061 } 1062 }
… …
1063 { 1064 {
1064 // it is in our env, so activate it, do not open yet 1065 // it is in our env, so activate it, do not open yet
1065 op->close_container (); 1066 op->close_container ();
1066 sack->flag [FLAG_APPLIED] = 1; 1067 sack->flag [FLAG_APPLIED] = 1;
1067 esrv_update_item (UPD_FLAGS, op, sack); 1068 esrv_update_item (UPD_FLAGS, op, sack);
1068 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack)); 1069 op->statusmsg (format ("You ready %s.", query_name (sack)));
1069 return 1; 1070 return 1;
1070 } 1071 }
1071 1072
1072 // it's locked? 1073 // it's locked?
1073 if (sack->slaying) 1074 if (sack->slaying)
1074 { 1075 {
1075 if (object *tmp = find_key (op, op, sack)) 1076 if (object *tmp = find_key (op, op, sack))
1076 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp)); 1077 op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
1077 else 1078 else
1078 { 1079 {
1079 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack)); 1080 op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
1080 return 1; 1081 return 1;
1081 } 1082 }
1082 } 1083 }
1083 1084
1084 op->open_container (sack); 1085 op->open_container (sack);
… …
1103 * with an altar. We call it a Potion - altars are stationary - it 1104 * with an altar. We call it a Potion - altars are stationary - it
1104 * is up to map designers to use them properly. 1105 * is up to map designers to use them properly.
1105 */ 1106 */
1106 if (altar->inv && altar->inv->type == SPELL) 1107 if (altar->inv && altar->inv->type == SPELL)
1107 { 1108 {
1108 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name); 1109 originator->statusmsg (format ("The altar casts %s.", &altar->inv->name));
1109 cast_spell (originator, altar, 0, altar->inv, NULL); 1110 cast_spell (originator, altar, 0, altar->inv, NULL);
1110 /* If it is connected, push the button. Fixes some problems with 1111 /* If it is connected, push the button. Fixes some problems with
1111 * old maps. 1112 * old maps.
1112 */ 1113 */
1113 1114
1114/* push_button (altar);*/ 1115/* push_button (altar);*/
1115 } 1116 }
… …
1139 double opinion; 1140 double opinion;
1140 object *tmp, *next; 1141 object *tmp, *next;
1141 1142
1142 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1143 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1143 1144
1145 bool has_unpaid = false;
1146
1147 // quite inefficient to do this here twice, but the api doesn'T lend itself to
1148 // a quick and small change :(
1149 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1150 if (item->flag [FLAG_UNPAID])
1151 {
1152 has_unpaid = true;
1153 break;
1154 }
1155
1144 if (op->type != PLAYER) 1156 if (op->type != PLAYER)
1145 { 1157 {
1146 /* Remove all the unpaid objects that may be carried here. 1158 /* Remove all the unpaid objects that may be carried here.
1147 * This could be pets or monsters that are somehow in 1159 * This could be pets or monsters that are somehow in
1148 * the shop. 1160 * the shop.
… …
1174 /* unpaid objects, or non living objects, can't transfer by 1186 /* unpaid objects, or non living objects, can't transfer by
1175 * shop mats. Instead, put it on a nearby space. 1187 * shop mats. Instead, put it on a nearby space.
1176 */ 1188 */
1177 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1189 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1178 { 1190 {
1179
1180 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1191 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1181 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1192 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1182 1193
1183 if (i != -1) 1194 if (i != -1)
1184 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1195 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
… …
1193 else if (can_pay (op) && get_payment (op)) 1204 else if (can_pay (op) && get_payment (op))
1194 { 1205 {
1195 /* this is only used for players */ 1206 /* this is only used for players */
1196 rv = teleport (shop_mat, SHOP_MAT, op); 1207 rv = teleport (shop_mat, SHOP_MAT, op);
1197 1208
1209 if (has_unpaid)
1210 op->contr->play_sound (sound_find ("shop_buy"));
1211 else if (is_in_shop (op))
1212 op->contr->play_sound (sound_find ("shop_enter"));
1213 else
1214 op->contr->play_sound (sound_find ("shop_leave"));
1215
1198 if (shop_mat->msg) 1216 if (shop_mat->msg)
1199 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1217 op->statusmsg (shop_mat->msg);
1200 /* This check below is a bit simplistic - generally it should be correct, 1218 /* This check below is a bit simplistic - generally it should be correct,
1201 * but there is never a guarantee that the bottom space on the map is 1219 * but there is never a guarantee that the bottom space on the map is
1202 * actually the shop floor. 1220 * actually the shop floor.
1203 */ 1221 */
1204 else if (!rv && !is_in_shop (op)) 1222 else if (!rv && !is_in_shop (op))
1205 { 1223 {
1206 opinion = shopkeeper_approval (op->map, op); 1224 opinion = shopkeeper_approval (op->map, op);
1207 1225
1208 if (opinion > 0.9) 1226 op->statusmsg (
1209 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1227 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
1210 else if (opinion > 0.75) 1228 : opinion >= 0.75 ? "The shopkeeper waves to you."
1211 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1229 : opinion >= 0.50 ? "The shopkeeper ignores you."
1212 else if (opinion > 0.5) 1230 : "The shopkeeper glares at you with contempt."
1213 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1214 else 1231 );
1215 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1216 } 1232 }
1217 } 1233 }
1218 else 1234 else
1219 { 1235 {
1220 /* if we get here, a player tried to leave a shop but was not able 1236 /* if we get here, a player tried to leave a shop but was not able
1221 * to afford the items he has. We try to move the player so that 1237 * to afford the items he has. We try to move the player so that
1222 * they are not on the mat anymore 1238 * they are not on the mat anymore
1223 */ 1239 */
1224 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1240 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1225 1241
1226 if (i == -1) 1242 if (i == -1)
1227 {
1228 LOG (llevError, "Internal shop-mat problem.\n"); 1243 LOG (llevError, "Internal shop-mat problem.\n");
1229 }
1230 else 1244 else
1231 { 1245 {
1232 op->remove (); 1246 op->remove ();
1233 op->x += freearr_x[i]; 1247 op->x += freearr_x[i];
1234 op->y += freearr_y[i]; 1248 op->y += freearr_y[i];
… …
1245 */ 1259 */
1246static void 1260static void
1247apply_sign (object *op, object *sign, int autoapply) 1261apply_sign (object *op, object *sign, int autoapply)
1248{ 1262{
1249 readable_message_type *msgType; 1263 readable_message_type *msgType;
1250 char newbuf[HUGE_BUF];
1251 1264
1252 if (sign->msg == NULL) 1265 if (!sign->msg)
1253 { 1266 {
1254 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1267 op->statusmsg ("Nothing is written on it.");
1255 return; 1268 return;
1256 } 1269 }
1257 1270
1258 if (sign->stats.food) 1271 if (sign->stats.food)
1259 { 1272 {
1260 if (sign->last_eat >= sign->stats.food) 1273 if (sign->last_eat >= sign->stats.food)
1261 { 1274 {
1262 if (!sign->move_on) 1275 if (!sign->move_on)
1263 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1276 op->statusmsg ("You cannot read it anymore.");
1277
1264 return; 1278 return;
1265 } 1279 }
1266 1280
1267 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1281 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1268 sign->last_eat++; 1282 sign->last_eat++;
… …
1273 * move_on is zero, it needs to be manually applied (doesn't talk 1287 * move_on is zero, it needs to be manually applied (doesn't talk
1274 * to us). 1288 * to us).
1275 */ 1289 */
1276 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1290 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1277 { 1291 {
1278 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1292 op->failmsg ("You are unable to read while blind!");
1279 return; 1293 return;
1280 } 1294 }
1295
1296 if (op->contr)
1297 if (client *ns = op->contr->ns)
1298 {
1299 if (sign->sound)
1300 ns->play_sound (sign->sound);
1301 else if (autoapply)
1302 ns->play_sound (sound_find ("msg_voice"));
1303
1304 if (ns->can_msg)
1305 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
1306 else
1307 {
1281 msgType = get_readable_message_type (sign); 1308 msgType = get_readable_message_type (sign);
1282 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1309 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1283 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1310 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1311 }
1312 }
1284} 1313}
1285 1314
1286/** 1315/**
1287 * 'victim' moves onto 'trap' 1316 * 'victim' moves onto 'trap'
1288 * 'victim' leaves 'trap' 1317 * 'victim' leaves 'trap'
… …
1311 * proper. This code was causing needless crashes. 1340 * proper. This code was causing needless crashes.
1312 */ 1341 */
1313 if (recursion_depth >= 500) 1342 if (recursion_depth >= 500)
1314 { 1343 {
1315 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1344 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1316 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1345 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1317 return; 1346 return;
1318 } 1347 }
1348
1319 recursion_depth++; 1349 recursion_depth++;
1320 if (trap->head) 1350 if (trap->head)
1321 trap = trap->head; 1351 trap = trap->head;
1322 1352
1323 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1353 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1399 1429
1400 if (!trap->value) 1430 if (!trap->value)
1401 { 1431 {
1402 int tot; 1432 int tot;
1403 1433
1404 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1434 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1405 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1435 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1406 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1436 tot += ab->head_ ()->total_weight ();
1407 1437
1408 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1438 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1409 goto leave; 1439 goto leave;
1410 1440
1411 SET_ANIMATION (trap, trap->value); 1441 SET_ANIMATION (trap, trap->value);
… …
1421 1451
1422 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1452 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1423 { 1453 {
1424 if (!sound_was_played) 1454 if (!sound_was_played)
1425 { 1455 {
1426 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1456 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1427 sound_was_played = 1; 1457 sound_was_played = 1;
1428 } 1458 }
1429 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1459
1460 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1430 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1461 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1431 } 1462 }
1432 } 1463 }
1433 goto leave; 1464 goto leave;
1434 } 1465 }
1435 1466
1436
1437 case CONVERTER: 1467 case CONVERTER:
1438 if (convert_item (victim, trap) < 0) 1468 if (convert_item (victim, trap) < 0)
1439 { 1469 {
1440 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1470 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1441 get_archetype ("burnout")->insert_at (trap, trap); 1471 get_archetype ("burnout")->insert_at (trap, trap);
1442 } 1472 }
1443 1473
1444 goto leave; 1474 goto leave;
1445 1475
… …
1466 * Processing will happen if the head runs into the pit 1496 * Processing will happen if the head runs into the pit
1467 */ 1497 */
1468 if (victim->head) 1498 if (victim->head)
1469 goto leave; 1499 goto leave;
1470 1500
1471 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1501 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1472 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n"); 1502 victim->statusmsg ("You fall through the hole!", NDI_RED);
1473 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1503 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1474 goto leave; 1504 goto leave;
1475 1505
1476 case EXIT: 1506 case EXIT:
1477 if (victim->type == PLAYER && EXIT_PATH (trap)) 1507 if (victim->type == PLAYER && EXIT_PATH (trap))
1478 { 1508 {
1479 /* Basically, don't show exits leading to random maps the 1509 /* Basically, don't show exits leading to random maps the
1480 * players output. 1510 * players output.
1481 */ 1511 */
1482 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1512 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1483 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1513 victim->statusmsg (trap->msg, NDI_NAVY);
1484 1514
1515 trap->play_sound (trap->sound);
1485 victim->enter_exit (trap); 1516 victim->enter_exit (trap);
1486 } 1517 }
1487 goto leave; 1518 goto leave;
1488 1519
1489 case ENCOUNTER: 1520 case ENCOUNTER:
… …
1511 goto leave; 1542 goto leave;
1512 1543
1513 case RUNE: 1544 case RUNE:
1514 case TRAP: 1545 case TRAP:
1515 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1546 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1516 {
1517 spring_trap (trap, victim); 1547 spring_trap (trap, victim);
1518 }
1519 goto leave; 1548 goto leave;
1520 1549
1521 default: 1550 default:
1522 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1551 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1523 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1552 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1524 goto leave; 1553 goto leave;
1525 } 1554 }
1526 1555
1527leave: 1556leave:
1528 recursion_depth--; 1557 recursion_depth--;
… …
1537 int lev_diff; 1566 int lev_diff;
1538 object *skill_ob; 1567 object *skill_ob;
1539 1568
1540 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1569 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1541 { 1570 {
1542 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1571 op->failmsg ("You are unable to read while blind!");
1543 return; 1572 return;
1544 } 1573 }
1574
1545 if (tmp->msg == NULL) 1575 if (!tmp->msg)
1546 { 1576 {
1547 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1577 op->failmsg (format ("You open the %s and find it empty.", &tmp->name));
1548 return; 1578 return;
1549 } 1579 }
1550 1580
1551 /* need a literacy skill to read stuff! */ 1581 /* need a literacy skill to read stuff! */
1552 skill_ob = find_skill_by_name (op, tmp->skill); 1582 skill_ob = find_skill_by_name (op, tmp->skill);
1553 if (!skill_ob) 1583 if (!skill_ob)
1554 { 1584 {
1555 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1585 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
1556 return; 1586 return;
1557 } 1587 }
1588
1558 lev_diff = tmp->level - (skill_ob->level + 5); 1589 lev_diff = tmp->level - (skill_ob->level + 5);
1559 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1590 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1560 { 1591 {
1561 if (lev_diff < 2) 1592 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1562 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1593 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1563 else if (lev_diff < 3) 1594 : lev_diff < 5 ? "This book is beyond your comprehension."
1564 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension."); 1595 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1565 else if (lev_diff < 5) 1596 : lev_diff < 15 ? "This book is way beyond your comprehension."
1566 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension."); 1597 : "This book is totally beyond your comprehension.");
1567 else if (lev_diff < 8) 1598 return;
1568 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension."); 1599 }
1569 else if (lev_diff < 15) 1600
1570 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension."); 1601 readable_message_type *msgType = get_readable_message_type (tmp);
1602
1603 if (player *pl = op->contr)
1604 if (client *ns = pl->ns)
1605 if (ns->can_msg)
1606 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1571 else 1607 else
1572 new_draw_info (NDI_UNIQUE, 0, op, "This book is totally beyond your comprehension.");
1573 return;
1574 }
1575
1576 readable_message_type *msgType = get_readable_message_type (tmp);
1577
1578 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1608 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1579 msgType->message_type, msgType->message_subtype, 1609 msgType->message_type, msgType->message_subtype,
1580 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1610 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1581 long_desc (tmp, op), &tmp->msg); 1611 long_desc (tmp, op), &tmp->msg);
1582 1612
1583 /* gain xp from reading */ 1613 /* gain xp from reading */
1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1614 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1585 { /* only if not read before */ 1615 { /* only if not read before */
1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1616 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1588 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1618 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1589 { 1619 {
1590 /*exp_gain *= 2; because they just identified it too */ 1620 /*exp_gain *= 2; because they just identified it too */
1591 SET_FLAG (tmp, FLAG_IDENTIFIED); 1621 SET_FLAG (tmp, FLAG_IDENTIFIED);
1592 1622
1593 /* If in a container, update how it looks */ 1623 if (object *pl = tmp->visible_to ())
1594 if (tmp->env)
1595 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1624 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1596 else
1597 op->contr->ns->floorbox_update ();
1598 } 1625 }
1599 1626
1600 change_exp (op, exp_gain, skill_ob->skill, 0); 1627 change_exp (op, exp_gain, skill_ob->skill, 0);
1601 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1628 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1602 } 1629 }
… …
1607 * op is the person learning the skill, tmp is the skill scroll object 1634 * op is the person learning the skill, tmp is the skill scroll object
1608 */ 1635 */
1609static void 1636static void
1610apply_skillscroll (object *op, object *tmp) 1637apply_skillscroll (object *op, object *tmp)
1611{ 1638{
1612 switch ((int) learn_skill (op, tmp)) 1639 switch (learn_skill (op, tmp))
1613 { 1640 {
1614 case 0: 1641 case 0:
1615 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge "); 1642 op->play_sound (sound_find ("generic_fail"));
1616 new_draw_info_format (NDI_UNIQUE, 0, op, "held within the %s.\n", query_name (tmp)); 1643 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1617 return; 1644 break;
1618 1645
1619 case 1: 1646 case 1:
1620 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1621 decrease_ob (tmp); 1647 tmp->decrease ();
1648 op->play_sound (sound_find ("skill_learn"));
1649 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1622 return; 1650 break;
1623 1651
1624 default: 1652 default:
1653 tmp->decrease ();
1654 op->play_sound (sound_find ("generic_fail"));
1625 new_draw_info_format (NDI_UNIQUE, 0, op, "You fail to learn the knowledge of the %s.\n", query_name (tmp)); 1655 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1626 decrease_ob (tmp);
1627 return; 1656 break;
1628 } 1657 }
1629} 1658}
1630 1659
1631/** 1660/**
1632 * Actually makes op learn spell. 1661 * Actually makes op learn spell.
… …
1652 return; 1681 return;
1653 } 1682 }
1654 return; 1683 return;
1655 } 1684 }
1656 1685
1657 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1686 op->contr->play_sound (sound_find ("learn_spell"));
1687
1658 tmp = spell->clone (); 1688 tmp = spell->clone ();
1659 insert_ob_in_ob (tmp, op); 1689 insert_ob_in_ob (tmp, op);
1660 1690
1661 if (special_prayer) 1691 if (special_prayer)
1662 SET_FLAG (tmp, FLAG_STARTEQUIP); 1692 SET_FLAG (tmp, FLAG_STARTEQUIP);
… …
1681 { 1711 {
1682 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1712 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1683 return; 1713 return;
1684 } 1714 }
1685 1715
1686 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1716 op->failmsg (format ("You lose knowledge of %s.", spell));
1687 player_unready_range_ob (op->contr, spob); 1717 player_unready_range_ob (op->contr, spob);
1688 esrv_remove_spell (op->contr, spob); 1718 esrv_remove_spell (op->contr, spob);
1689 spob->destroy (); 1719 spob->destroy ();
1690} 1720}
1691 1721
… …
1699{ 1729{
1700 object *skop, *spell, *spell_skill; 1730 object *skop, *spell, *spell_skill;
1701 1731
1702 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1732 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1703 { 1733 {
1704 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1734 op->failmsg ("You are unable to read while blind.");
1705 return; 1735 return;
1706 } 1736 }
1707 1737
1708 /* artifact_spellbooks have 'slaying' field point to a spell name, 1738 /* artifact_spellbooks have 'slaying' field point to a spell name,
1709 * instead of having their spell stored in stats.sp. These are 1739 * instead of having their spell stored in stats.sp. These are
1710 * legacy spellbooks 1740 * legacy spellbooks
1711 */ 1741 */
1712
1713 if (tmp->slaying != NULL) 1742 if (tmp->slaying)
1714 { 1743 {
1715 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1744 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1716 if (!spell) 1745 if (!spell)
1717 { 1746 {
1718 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1747 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1719 return; 1748 return;
1720 } 1749 }
1721 else 1750 else
1722 insert_ob_in_ob (spell, tmp); 1751 insert_ob_in_ob (spell, tmp);
1752
1723 tmp->slaying = NULL; 1753 tmp->slaying = 0;
1724 } 1754 }
1725 1755
1726 skop = find_skill_by_name (op, tmp->skill); 1756 skop = find_skill_by_name (op, tmp->skill);
1727 1757
1728 /* need a literacy skill to learn spells. Also, having a literacy level 1758 /* need a literacy skill to learn spells. Also, having a literacy level
1729 * lower than the spell will make learning the spell more difficult */ 1759 * lower than the spell will make learning the spell more difficult */
1730 if (!skop) 1760 if (!skop)
1731 { 1761 {
1732 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1762 op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
1733 return; 1763 return;
1734 } 1764 }
1735 1765
1736 spell = tmp->inv; 1766 spell = tmp->inv;
1737 1767
1738 if (!spell) 1768 if (!spell)
1739 { 1769 {
1740 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1770 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1741 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1771 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1742 return; 1772 return;
1743 } 1773 }
1744 1774
1745 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1775 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1746 { 1776 {
1747 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]"); 1777 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
1748 return; 1778 return;
1749 } 1779 }
1750 1780
1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1781 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1752 1782
1753 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1783 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1754 {
1755 identify (tmp); 1784 identify (tmp);
1756
1757 if (tmp->env)
1758 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1759 else
1760 op->contr->ns->floorbox_update ();
1761 }
1762 1785
1763 /* I removed the check for special_prayer_mark here - it didn't make 1786 /* I removed the check for special_prayer_mark here - it didn't make
1764 * a lot of sense - special prayers are not found in spellbooks, and 1787 * a lot of sense - special prayers are not found in spellbooks, and
1765 * if the player doesn't know the spell, doesn't make a lot of sense that 1788 * if the player doesn't know the spell, doesn't make a lot of sense that
1766 * they would have a special prayer mark. 1789 * they would have a special prayer mark.
1767 */ 1790 */
1768 if (check_spell_known (op, spell->name)) 1791 if (check_spell_known (op, spell->name))
1769 { 1792 {
1770 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1793 op->statusmsg ("You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1771 return; 1794 return;
1772 } 1795 }
1773 1796
1774 if (spell->skill) 1797 if (spell->skill)
1775 { 1798 {
1776 spell_skill = find_skill_by_name (op, spell->skill); 1799 spell_skill = find_skill_by_name (op, spell->skill);
1777 1800
1778 if (!spell_skill) 1801 if (!spell_skill)
1779 { 1802 {
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill); 1803 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
1781 return; 1804 return;
1782 } 1805 }
1783 1806
1784 if (spell_skill->level < spell->level) 1807 if (spell_skill->level < spell->level)
1785 { 1808 {
1786 new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill); 1809 op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
1787 return; 1810 return;
1788 } 1811 }
1789 } 1812 }
1790 1813
1791 /* Logic as follows 1814 /* Logic as follows
… …
1800 * Overall, chances are the same but a player will find having a high 1823 * Overall, chances are the same but a player will find having a high
1801 * literacy rate very useful! -b.t. 1824 * literacy rate very useful! -b.t.
1802 */ 1825 */
1803 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1826 if (QUERY_FLAG (op, FLAG_CONFUSED))
1804 { 1827 {
1805 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!"); 1828 op->failmsg ("In your confused state you flub the wording of the text!");
1806 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1829 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
1807 } 1830 }
1808 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1831 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
1809 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1832 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1810 { 1833 {
1811 1834 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
1812 new_draw_info (NDI_UNIQUE, 0, op, "You succeed in learning the spell!");
1813 do_learn_spell (op, spell, 0); 1835 do_learn_spell (op, spell, 0);
1814 1836
1815 /* xp gain to literacy for spell learning */ 1837 /* xp gain to literacy for spell learning */
1816 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1838 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1817 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1839 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1818 } 1840 }
1819 else 1841 else
1820 { 1842 {
1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1843 op->contr->play_sound (sound_find ("fumble_spell"));
1822 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1844 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1823 } 1845 }
1824 1846
1825 decrease_ob (tmp); 1847 tmp->decrease ();
1826} 1848}
1827 1849
1828/** 1850/**
1829 * Handles applying a spell scroll. 1851 * Handles applying a spell scroll.
1830 */ 1852 */
… …
1833{ 1855{
1834 object *skop; 1856 object *skop;
1835 1857
1836 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1858 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1837 { 1859 {
1838 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1860 op->failmsg ("You are unable to read while blind.");
1839 return; 1861 return;
1840 } 1862 }
1841 1863
1842 if (!tmp->inv || tmp->inv->type != SPELL) 1864 if (!tmp->inv || tmp->inv->type != SPELL)
1843 { 1865 {
1844 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1866 op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
1845 return; 1867 return;
1846 } 1868 }
1847 1869
1848 if (op->type == PLAYER) 1870 if (op->type == PLAYER)
1849 { 1871 {
… …
1855 */ 1877 */
1856 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1878 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1857 1879
1858 if (!skop) 1880 if (!skop)
1859 { 1881 {
1860 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1882 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
1861 return; 1883 return;
1862 } 1884 }
1863 1885
1864 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1886 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1865 change_exp (op, exp_gain, skop->skill, 0); 1887 change_exp (op, exp_gain, skop->skill, 0);
1866 } 1888 }
1867 1889
1868 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1890 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1869 identify (tmp); 1891 identify (tmp);
1870 1892
1871 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1893 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1872 1894
1873 cast_spell (op, tmp, dir, tmp->inv, NULL); 1895 cast_spell (op, tmp, dir, tmp->inv, NULL);
1874 decrease_ob (tmp); 1896 tmp->decrease ();
1875} 1897}
1876 1898
1877/** 1899/**
1878 * Applies a treasure object - by default, chest. op 1900 * Applies a treasure object - by default, chest. op
1879 * is the person doing the applying, tmp is the treasure 1901 * is the person doing the applying, tmp is the treasure
1880 * chest. 1902 * chest.
1881 */ 1903 */
1882static void 1904static void
1883apply_treasure (object *op, object *tmp) 1905apply_treasure (object *op, object *tmp)
1884{ 1906{
1885 /* Nice side effect of new treasure creation method is that the treasure 1907 /* Nice side effect of this treasure creation method is that the treasure
1886 * for the chest is done when the chest is created, and put into the chest 1908 * for the chest is done when the chest is created, and put into the chest
1887 * inventory. So that when the chest burns up, the items still exist. Also 1909 * inventory. So that when the chest burns up, the items still exist. Also
1888 * prevents people fromt moving chests to more difficult maps to get better 1910 * prevents people from moving chests to more difficult maps to get better
1889 * treasure 1911 * treasure
1890 */ 1912 */
1891 object *treas = tmp->inv; 1913 object *treas = tmp->inv;
1892 1914
1893 if (!treas) 1915 if (!treas)
1894 { 1916 {
1895 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1917 op->statusmsg ("The chest was empty.");
1896 decrease_ob (tmp); 1918 tmp->decrease ();
1897 return; 1919 return;
1898 } 1920 }
1899 1921
1900 while (tmp->inv) 1922 while (tmp->inv)
1901 { 1923 {
1902 treas = tmp->inv; 1924 treas = tmp->inv;
1903
1904 treas->remove (); 1925 treas->remove ();
1905 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
1906 1926
1907 treas->x = op->x; 1927 treas->x = op->x;
1908 treas->y = op->y; 1928 treas->y = op->y;
1909 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1929 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
1910 1930
1911 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1931 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
1912 spring_trap (treas, op); 1932 spring_trap (treas, op);
1913 1933
1914 /* If either player or container was destroyed, no need to do 1934 /* If either player or container was destroyed, no need to do
1915 * further processing. I think this should be enclused with 1935 * further processing. I think this should be enclused with
1916 * spring trap above, as I don't think there is otherwise 1936 * spring trap above, as I don't think there is otherwise
1917 * any way for the treasure chest or player to get killed 1937 * any way for the treasure chest or player to get killed.
1918 */ 1938 */
1919 if (op->destroyed () || tmp->destroyed ()) 1939 if (op->destroyed () || tmp->destroyed ())
1920 break; 1940 break;
1921 } 1941 }
1922 1942
1923 if (!tmp->destroyed () && tmp->inv == NULL) 1943 if (!tmp->destroyed () && !tmp->inv)
1924 decrease_ob (tmp); 1944 tmp->decrease ();
1925
1926} 1945}
1927 1946
1928/** 1947/**
1929 * op eats food. 1948 * op eats food.
1930 * If player, takes care of messages and dragon special food. 1949 * If player, takes care of messages and dragon special food.
… …
1945 { 1964 {
1946 /* usual case - no dragon meal: */ 1965 /* usual case - no dragon meal: */
1947 if (op->stats.food + tmp->stats.food > 999) 1966 if (op->stats.food + tmp->stats.food > 999)
1948 { 1967 {
1949 if (tmp->type == FOOD || tmp->type == FLESH) 1968 if (tmp->type == FOOD || tmp->type == FLESH)
1950 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!"); 1969 op->failmsg ("You feel full, but what a waste of food!");
1951 else 1970 else
1952 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!"); 1971 op->statusmsg ("Most of the drink goes down your face not your throat!");
1953 } 1972 }
1973
1974 tmp->play_sound (
1975 tmp->sound
1976 ? tmp->sound
1977 : tmp->type == DRINK
1978 ? sound_find ("eat_drink")
1979 : sound_find ("eat_food")
1980 );
1954 1981
1955 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 1982 if (!QUERY_FLAG (tmp, FLAG_CURSED))
1956 { 1983 {
1957 char buf[MAX_BUF]; 1984 const char *buf;
1958 1985
1959 if (!is_dragon_pl (op)) 1986 if (!is_dragon_pl (op))
1960 { 1987 {
1961 /* eating message for normal players */ 1988 /* eating message for normal players */
1962 if (tmp->type == DRINK) 1989 if (tmp->type == DRINK)
1963 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name); 1990 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
1964 else 1991 else
1965 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good."); 1992 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
1966 } 1993 }
1967 else 1994 else
1968 {
1969 /* eating message for dragon players */ 1995 /* eating message for dragon players */
1970 sprintf (buf, "The %s tasted terrible!", &tmp->name); 1996 buf = format ("The %s tasted terrible!", &tmp->name);
1971 }
1972 1997
1973 new_draw_info (NDI_UNIQUE, 0, op, buf); 1998 op->statusmsg (buf);
1999
1974 capacity_remaining = 999 - op->stats.food; 2000 capacity_remaining = 999 - op->stats.food;
1975 op->stats.food += tmp->stats.food; 2001 op->stats.food += tmp->stats.food;
1976 if (capacity_remaining < tmp->stats.food) 2002 if (capacity_remaining < tmp->stats.food)
1977 op->stats.hp += capacity_remaining / 50; 2003 op->stats.hp += capacity_remaining / 50;
1978 else 2004 else
1979 op->stats.hp += tmp->stats.food / 50; 2005 op->stats.hp += tmp->stats.food / 50;
2006
1980 if (op->stats.hp > op->stats.maxhp) 2007 if (op->stats.hp > op->stats.maxhp)
1981 op->stats.hp = op->stats.maxhp; 2008 op->stats.hp = op->stats.maxhp;
1982 if (op->stats.food > 999) 2009 if (op->stats.food > 999)
1983 op->stats.food = 999; 2010 op->stats.food = 999;
1984 } 2011 }
… …
1986 /* special food hack -b.t. */ 2013 /* special food hack -b.t. */
1987 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2014 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
1988 eat_special_food (op, tmp); 2015 eat_special_food (op, tmp);
1989 } 2016 }
1990 } 2017 }
2018
1991 handle_apply_yield (tmp); 2019 handle_apply_yield (tmp);
1992 decrease_ob (tmp); 2020 tmp->decrease ();
1993} 2021}
1994 2022
1995/** 2023/**
1996 * A dragon is eating some flesh. If the flesh contains resistances, 2024 * A dragon is eating some flesh. If the flesh contains resistances,
1997 * there is a chance for the dragon's skin to get improved. 2025 * there is a chance for the dragon's skin to get improved.
… …
2007{ 2035{
2008 object *skin = NULL; /* pointer to dragon skin force */ 2036 object *skin = NULL; /* pointer to dragon skin force */
2009 object *abil = NULL; /* pointer to dragon ability force */ 2037 object *abil = NULL; /* pointer to dragon ability force */
2010 object *tmp = NULL; /* tmp. object */ 2038 object *tmp = NULL; /* tmp. object */
2011 2039
2012 char buf[MAX_BUF]; /* tmp. string buffer */
2013 double chance; /* improvement-chance of one resistance type */ 2040 double chance; /* improvement-chance of one resistance type */
2014 double totalchance = 1; /* total chance of gaining one resistance */ 2041 double totalchance = 1; /* total chance of gaining one resistance */
2015 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */ 2042 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2016 double mbonus = 0; /* monster bonus */ 2043 double mbonus = 0; /* monster bonus */
2017 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2044 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
… …
2022 if (meal->type != FLESH || !is_dragon_pl (op)) 2049 if (meal->type != FLESH || !is_dragon_pl (op))
2023 return 0; 2050 return 0;
2024 2051
2025 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2052 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2026 from the player's inventory */ 2053 from the player's inventory */
2027 shstr_cmp dragon_ability_force ("dragon_ability_force");
2028 shstr_cmp dragon_skin_force ("dragon_skin_force");
2029
2030 for (tmp = op->inv; tmp; tmp = tmp->below) 2054 for (tmp = op->inv; tmp; tmp = tmp->below)
2031 if (tmp->type == FORCE) 2055 if (tmp->type == FORCE)
2032 if (tmp->arch->name == dragon_skin_force) 2056 if (tmp->arch->archname == shstr_dragon_skin_force)
2033 skin = tmp; 2057 skin = tmp;
2034 else if (tmp->arch->name == dragon_ability_force) 2058 else if (tmp->arch->archname == shstr_dragon_ability_force)
2035 abil = tmp; 2059 abil = tmp;
2036 2060
2037 /* if either skin or ability are missing, this is an old player 2061 /* if either skin or ability are missing, this is an old player
2038 which is not to be considered a dragon -> bail out */ 2062 which is not to be considered a dragon -> bail out */
2039 if (skin == NULL || abil == NULL) 2063 if (skin == NULL || abil == NULL)
… …
2042 /* now start by filling stomache and health, according to food-value */ 2066 /* now start by filling stomache and health, according to food-value */
2043 if ((999 - op->stats.food) < meal->stats.food) 2067 if ((999 - op->stats.food) < meal->stats.food)
2044 op->stats.hp += (999 - op->stats.food) / 50; 2068 op->stats.hp += (999 - op->stats.food) / 50;
2045 else 2069 else
2046 op->stats.hp += meal->stats.food / 50; 2070 op->stats.hp += meal->stats.food / 50;
2071
2047 if (op->stats.hp > op->stats.maxhp) 2072 if (op->stats.hp > op->stats.maxhp)
2048 op->stats.hp = op->stats.maxhp; 2073 op->stats.hp = op->stats.maxhp;
2049 2074
2050 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2075 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2051 2076
… …
2096 } 2121 }
2097 } 2122 }
2098 2123
2099 /* inverse totalchance as until now we have the failure-chance */ 2124 /* inverse totalchance as until now we have the failure-chance */
2100 totalchance = 100 - totalchance * 100; 2125 totalchance = 100 - totalchance * 100;
2126
2101 /* print message according to totalchance */ 2127 /* print message according to totalchance */
2128 const char *buf;
2102 if (totalchance > 50.) 2129 if (totalchance > 50.)
2103 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name); 2130 buf = format ("Hmm! The %s tasted delicious!", &meal->name);
2104 else if (totalchance > 10.) 2131 else if (totalchance > 10.)
2105 sprintf (buf, "The %s tasted very good.", &meal->name); 2132 buf = format ("The %s tasted very good.", &meal->name);
2106 else if (totalchance > 1.) 2133 else if (totalchance > 1.)
2107 sprintf (buf, "The %s tasted good.", &meal->name); 2134 buf = format ("The %s tasted good.", &meal->name);
2108 else if (totalchance > 0.1) 2135 else if (totalchance > 0.1)
2109 sprintf (buf, "The %s tasted bland.", &meal->name); 2136 buf = format ("The %s tasted bland.", &meal->name);
2110 else if (totalchance >= 0.01) 2137 else if (totalchance >= 0.01)
2111 sprintf (buf, "The %s had a boring taste.", &meal->name); 2138 buf = format ("The %s had a boring taste.", &meal->name);
2112 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat)) 2139 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2113 sprintf (buf, "The %s tasted strange.", &meal->name); 2140 buf = format ("The %s tasted strange.", &meal->name);
2114 else 2141 else
2115 sprintf (buf, "The %s had no taste.", &meal->name); 2142 buf = format ("The %s had no taste.", &meal->name);
2116 new_draw_info (NDI_UNIQUE, 0, op, buf); 2143
2144 op->statusmsg (buf);
2117 2145
2118 /* now choose a winner if we have any */ 2146 /* now choose a winner if we have any */
2119 i = -1; 2147 i = -1;
2120 if (winners > 0) 2148 if (winners > 0)
2121 i = atnr_winner[RANDOM () % winners]; 2149 i = atnr_winner[RANDOM () % winners];
… …
2124 { 2152 {
2125 /* resistance increased! */ 2153 /* resistance increased! */
2126 skin->resist[i]++; 2154 skin->resist[i]++;
2127 op->update_stats (); 2155 op->update_stats ();
2128 2156
2129 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2157 op->statusmsg (format ("Your skin is now more resistant to %s!", change_resist_msg[i]));
2130 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2131 } 2158 }
2132 2159
2133 /* if this flesh contains a new ability focus, we mark it 2160 /* if this flesh contains a new ability focus, we mark it
2134 into the ability_force and it will take effect on next level */ 2161 into the ability_force and it will take effect on next level */
2135 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat) 2162 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2136 { 2163 {
2137 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2164 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2138 2165
2139 if (meal->last_eat != abil->stats.exp) 2166 if (meal->last_eat != abil->stats.exp)
2167 op->statusmsg (format (
2168 "Your metabolism prepares to focus on %s!\n"
2169 "The change will happen at level %d.",
2170 change_resist_msg[meal->last_eat],
2171 abil->level + 1
2140 { 2172 ));
2141 sprintf (buf, "Your metabolism prepares to focus on %s!", change_resist_msg[meal->last_eat]);
2142 new_draw_info (NDI_UNIQUE, 0, op, buf);
2143 sprintf (buf, "The change will happen at level %d", abil->level + 1);
2144 new_draw_info (NDI_UNIQUE, 0, op, buf);
2145 }
2146 else 2173 else
2147 { 2174 {
2148 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]); 2175 op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
2149 new_draw_info (NDI_UNIQUE, 0, op, buf);
2150 abil->last_eat = 0; 2176 abil->last_eat = 0;
2151 } 2177 }
2152 } 2178 }
2179
2153 return 1; 2180 return 1;
2154} 2181}
2155 2182
2156/** 2183/**
2157 * Handles applying an improve armor scroll. 2184 * Handles applying an improve armor scroll.
… …
2160static void 2187static void
2161apply_armour_improver (object *op, object *tmp) 2188apply_armour_improver (object *op, object *tmp)
2162{ 2189{
2163 object *armor; 2190 object *armor;
2164 2191
2165 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2192 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2166 { 2193 {
2167 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2194 op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
2168 return; 2195 return;
2169 } 2196 }
2170 2197
2171 armor = find_marked_object (op); 2198 armor = find_marked_object (op);
2172 2199
2173 if (!armor) 2200 if (!armor)
2174 { 2201 {
2175 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2202 op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2176 return; 2203 return;
2177 } 2204 }
2178 2205
2179 if (armor->type != ARMOUR 2206 if (armor->type != ARMOUR
2180 && armor->type != CLOAK 2207 && armor->type != CLOAK
2181 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2208 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2182 { 2209 {
2183 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2210 op->failmsg ("Your marked item is not armour!\n");
2184 return; 2211 return;
2185 } 2212 }
2186 2213
2187 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2214 op->statusmsg ("Applying armour enchantment.");
2188 improve_armour (op, tmp, armor); 2215 improve_armour (op, tmp, armor);
2189} 2216}
2190 2217
2191extern void 2218extern void
2192apply_poison (object *op, object *tmp) 2219apply_poison (object *op, object *tmp)
2193{ 2220{
2194 if (op->type == PLAYER) 2221 if (op->type == PLAYER)
2195 { 2222 {
2196 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2223 op->contr->play_sound (sound_find ("drink_poison"));
2197 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2224 op->failmsg ("Yech! That tasted poisonous!");
2198 strcpy (op->contr->killer, "poisonous booze"); 2225 strcpy (op->contr->killer, "poisonous booze");
2199 } 2226 }
2227
2200 if (tmp->stats.hp > 0) 2228 if (tmp->stats.hp > 0)
2201 { 2229 {
2202 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2230 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2203 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2231 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2204 } 2232 }
2233
2205 op->stats.food -= op->stats.food / 4; 2234 op->stats.food -= op->stats.food / 4;
2206 handle_apply_yield (tmp); 2235 handle_apply_yield (tmp);
2207 decrease_ob (tmp); 2236 tmp->decrease ();
2208} 2237}
2209 2238
2210/** 2239/**
2211 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2240 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2212 * A valid 2 way exit means: 2241 * A valid 2 way exit means:
… …
2227 2256
2228#if 0 //TODO 2257#if 0 //TODO
2229 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2258 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2230 return 0; /* This is a reset town portal */ 2259 return 0; /* This is a reset town portal */
2231#endif 2260#endif
2261
2262 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2232 2263
2233 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2264 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2234 2265
2235 if (exitmap) 2266 if (exitmap)
2236 { 2267 {
… …
2319 2350
2320 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2351 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2321 { 2352 {
2322 if (op->type == PLAYER) 2353 if (op->type == PLAYER)
2323 { 2354 {
2324 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2355 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
2325 return 1; 2356 return 1;
2326 } 2357 }
2327 else 2358 else
2328 return 0; /* monsters just skip unpaid items */ 2359 return 0; /* monsters just skip unpaid items */
2329 } 2360 }
… …
2332 return RESULT_INT (0); 2363 return RESULT_INT (0);
2333 2364
2334 switch (tmp->type) 2365 switch (tmp->type)
2335 { 2366 {
2336 case CF_HANDLE: 2367 case CF_HANDLE:
2337 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2368 op->play_sound (sound_find ("turn_handle"));
2338 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2369 op->statusmsg ("You turn the handle.");
2339 tmp->value = tmp->value ? 0 : 1; 2370 tmp->value = tmp->value ? 0 : 1;
2340 SET_ANIMATION (tmp, tmp->value); 2371 SET_ANIMATION (tmp, tmp->value);
2341 update_object (tmp, UP_OBJ_FACE); 2372 update_object (tmp, UP_OBJ_FACE);
2342 push_button (tmp); 2373 push_button (tmp);
2343 return 1; 2374 return 1;
2344 2375
2345 case TRIGGER: 2376 case TRIGGER:
2346 if (check_trigger (tmp, op)) 2377 if (check_trigger (tmp, op))
2347 { 2378 {
2348 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2379 op->statusmsg ("You turn the handle.");
2349 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2380 op->play_sound (sound_find ("turn_handle"));
2350 } 2381 }
2351 else 2382 else
2352 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2383 op->failmsg ("The handle doesn't move.");
2353 2384
2354 return 1; 2385 return 1;
2355 2386
2356 case EXIT: 2387 case EXIT:
2357 if (op->type != PLAYER) 2388 if (op->type != PLAYER)
2358 return 0; 2389 return 0;
2359 2390
2360 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2391 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2361 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2392 op->failmsg (format ("The %s is closed.", query_name (tmp)));
2362 else 2393 else
2363 { 2394 {
2364 /* Don't display messages for random maps. */ 2395 /* Don't display messages for random maps. */
2365 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2396 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2366 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2397 op->statusmsg (tmp->msg, NDI_NAVY);
2367 2398
2368 op->enter_exit (tmp); 2399 op->enter_exit (tmp);
2369 } 2400 }
2370 2401
2402 return 1;
2403
2404 case INSCRIBABLE:
2405 op->statusmsg (tmp->msg);
2406 // maybe show a spell menu to chose from or something like that
2371 return 1; 2407 return 1;
2372 2408
2373 case SIGN: 2409 case SIGN:
2374 apply_sign (op, tmp, 0); 2410 apply_sign (op, tmp, 0);
2375 return 1; 2411 return 1;
… …
2484 { 2520 {
2485 char buf[MAX_BUF]; 2521 char buf[MAX_BUF];
2486 timeofday_t tod; 2522 timeofday_t tod;
2487 2523
2488 get_tod (&tod); 2524 get_tod (&tod);
2525 op->play_sound (sound_find ("sound_clock"));
2526 op->statusmsg (format (
2489 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2527 "It is %d minute%s past %d o'clock %s",
2490 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2528 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2491 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2529 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2492 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2530 ));
2493 new_draw_info (NDI_UNIQUE, 0, op, buf);
2494 return 1; 2531 return 1;
2495 } 2532 }
2496 else 2533 else
2497 return 0; 2534 return 0;
2498 2535
… …
2537int 2574int
2538player_apply (object *pl, object *op, int aflag, int quiet) 2575player_apply (object *pl, object *op, int aflag, int quiet)
2539{ 2576{
2540 int tmp; 2577 int tmp;
2541 2578
2542 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2579 if (op->env && (pl->move_type & MOVE_FLYING))
2543 { 2580 {
2544 /* player is flying and applying object not in inventory */ 2581 /* player is flying and applying object not in inventory */
2545 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2582 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2546 { 2583 {
2547 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2584 pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
2548 return 0; 2585 return 0;
2549 } 2586 }
2550 } 2587 }
2551 2588
2552 pl->contr->last_used = op; 2589 pl->contr->last_used = op;
2553 2590
2554 tmp = manual_apply (pl, op, aflag); 2591 tmp = manual_apply (pl, op, aflag);
2555 if (!quiet) 2592 if (!quiet)
2556 { 2593 {
2557 if (tmp == 0) 2594 if (tmp == 0)
2558 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2595 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2559 else if (tmp == 2) 2596 else if (tmp == 2)
2560 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2597 pl->failmsg ("You must get it first!\n");
2561 } 2598 }
2599
2562 return tmp; 2600 return tmp;
2563} 2601}
2564 2602
2565/** 2603/**
2566 * player_apply_below attempts to apply the object 'below' the player. 2604 * player_apply_below attempts to apply the object 'below' the player.
… …
2641 { 2679 {
2642 pl->combat_ob = 0; 2680 pl->combat_ob = 0;
2643 who->change_weapon (pl->ranged_ob); 2681 who->change_weapon (pl->ranged_ob);
2644 } 2682 }
2645 2683
2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2684 who->statusmsg (format ("You unwield %s.", query_name (op)));
2647 2685
2648 change_abil (who, op); 2686 change_abil (who, op);
2649 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2687 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2650 break; 2688 break;
2651 2689
2652 case SKILL: 2690 case SKILL:
2653 if (who->contr) 2691 if (who->contr)
2654 { 2692 {
2655 if (!op->invisible) 2693 if (!op->invisible)
2656 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2694 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2657 else 2695 else
2658 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2696 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2659 } 2697 }
2660 2698
2661 change_abil (who, op); 2699 change_abil (who, op);
2662 CLEAR_FLAG (who, FLAG_READY_SKILL); 2700 CLEAR_FLAG (who, FLAG_READY_SKILL);
2663 break; 2701 break;
… …
2670 case GLOVES: 2708 case GLOVES:
2671 case AMULET: 2709 case AMULET:
2672 case GIRDLE: 2710 case GIRDLE:
2673 case BRACERS: 2711 case BRACERS:
2674 case CLOAK: 2712 case CLOAK:
2675 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2713 who->statusmsg (format ("You unwear %s.", query_name (op)));
2676 change_abil (who, op); 2714 change_abil (who, op);
2677 break; 2715 break;
2678 2716
2679 case LAMP: 2717 case LAMP:
2680 { 2718 {
2681 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2719 who->statusmsg (format ("You turn off your %s.", &op->name));
2682 2720
2683 object *tmp2 = arch_to_object (op->other_arch); 2721 object *tmp2 = arch_to_object (op->other_arch);
2684 tmp2->x = op->x; 2722 tmp2->x = op->x;
2685 tmp2->y = op->y; 2723 tmp2->y = op->y;
2686 tmp2->map = op->map; 2724 tmp2->map = op->map;
… …
2690 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2728 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2691 2729
2692 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2730 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2693 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2731 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2694 2732
2733 op->destroy ();
2734 who->insert (tmp2);
2735 who->update_stats ();
2736
2695 if (who->contr) 2737 if (who->contr)
2696 esrv_del_item (who->contr, op->count);
2697
2698 op->destroy ();
2699 insert_ob_in_ob (tmp2, who);
2700 who->update_stats ();
2701
2702 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2703 { 2738 {
2704 if (who->contr) 2739 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2705 { 2740 {
2706 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2741 who->failmsg ("Oops, it feels deadly cold!");
2707 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2742 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2708 } 2743 }
2709 } 2744 }
2710
2711 if (who->contr)
2712 esrv_send_item (who, tmp2);
2713 } 2745 }
2714 2746
2715 return 1; /* otherwise, an attempt to drop causes problems */ 2747 return 1; /* otherwise, an attempt to drop causes problems */
2716 2748
2717 case BOW: 2749 case BOW:
… …
2724 { 2756 {
2725 pl->ranged_ob = 0; 2757 pl->ranged_ob = 0;
2726 who->change_weapon (pl->combat_ob); 2758 who->change_weapon (pl->combat_ob);
2727 } 2759 }
2728 2760
2729 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2761 who->statusmsg (format ("You unready %s.", query_name (op)));
2730 } 2762 }
2731 else 2763 else
2732 { 2764 {
2733 who->change_skill (0); 2765 who->change_skill (0);
2734 2766
… …
2740 2772
2741 break; 2773 break;
2742 2774
2743 case BUILDER: 2775 case BUILDER:
2744 if (who->contr) 2776 if (who->contr)
2745 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2777 who->statusmsg (format ("You unready %s.", query_name (op)));
2746 break; 2778 break;
2747 2779
2748 default: 2780 default:
2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2781 who->statusmsg (format ("You unapply %s.", query_name (op)));
2750 break; 2782 break;
2751 } 2783 }
2752 2784
2785 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2786 if (object *pl = op->visible_to ())
2787 esrv_send_item (pl, op);
2788
2753 who->update_stats (); 2789 who->update_stats ();
2754
2755 if (!(aflags & AP_NO_MERGE))
2756 {
2757 object *tmp = merge_ob (op, 0);
2758
2759 if (who->contr)
2760 {
2761 if (tmp)
2762 { /* it was merged */
2763 esrv_del_item (who->contr, op->count);
2764 op = tmp;
2765 }
2766
2767 esrv_send_item (who, op);
2768 }
2769 }
2770 2790
2771 return 0; 2791 return 0;
2772} 2792}
2773 2793
2774/** 2794/**
… …
2806 * Returns 0 on success, returns 1 if there is some problem. 2826 * Returns 0 on success, returns 1 if there is some problem.
2807 * if aflags is AP_PRINT, we instead print out waht to unapply 2827 * if aflags is AP_PRINT, we instead print out waht to unapply
2808 * instead of doing it. This is a lot less code than having 2828 * instead of doing it. This is a lot less code than having
2809 * another function that does just that. 2829 * another function that does just that.
2810 */ 2830 */
2831
2832#define CANNOT_REMOVE_CURSED \
2833 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2834 "Praying over an altar, scrolls of remove curse/damnation, " \
2835 "priests or even other players might help.>"
2836
2811int 2837int
2812unapply_for_ob (object *who, object *op, int aflags) 2838unapply_for_ob (object *who, object *op, int aflags)
2813{ 2839{
2814 if (op->is_range ()) 2840 if (op->is_range ())
2815 for (object *tmp = who->inv; tmp; tmp = tmp->below) 2841 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2816 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 2842 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2817 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2843 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2818 { 2844 {
2819 if (aflags & AP_PRINT) 2845 if (aflags & AP_PRINT)
2820 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2846 who->failmsg (query_name (tmp));
2821 else 2847 else
2822 unapply_special (who, tmp, aflags); 2848 unapply_special (who, tmp, aflags);
2823 } 2849 }
2824 else 2850 else
2825 { 2851 {
2826 /* In this case, we want to try and remove a cursed item. 2852 /* In this case, we want to try and remove a cursed item.
2827 * While we know it won't work, we want unapply_special to 2853 * While we know it won't work, we want unapply_special to
2828 * at least generate the message. 2854 * at least generate the message.
2829 */ 2855 */
2830 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp)); 2856 who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
2831 return 1; 2857 return 1;
2832 } 2858 }
2833 2859
2834 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 2860 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2835 { 2861 {
… …
2858 2884
2859 /* If we are just printing, we don't care about cursed status */ 2885 /* If we are just printing, we don't care about cursed status */
2860 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2886 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2861 { 2887 {
2862 if (aflags & AP_PRINT) 2888 if (aflags & AP_PRINT)
2863 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2889 who->failmsg (query_name (tmp));
2864 else 2890 else
2865 unapply_special (who, tmp, aflags); 2891 unapply_special (who, tmp, aflags);
2866 } 2892 }
2867 else 2893 else
2868 { 2894 {
2869 /* Cursed item that we can't unequip - tell the player. 2895 /* Cursed item that we can't unequip - tell the player.
2870 * Note this could be annoying if this is just one of a few, 2896 * Note this could be annoying if this is just one of a few,
2871 * so it may not be critical (eg, putting on a ring and you have 2897 * so it may not be critical (eg, putting on a ring and you have
2872 * one cursed ring.) 2898 * one cursed ring.)
2873 */ 2899 */
2874 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2900 who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
2875 } 2901 }
2876 2902
2877 last = tmp->below; 2903 last = tmp->below;
2878 } 2904 }
2879 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2905 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
… …
3032 * 3058 *
3033 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3059 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3034 * 3060 *
3035 * apply_special() doesn't check for unpaid items. 3061 * apply_special() doesn't check for unpaid items.
3036 */ 3062 */
3063
3064#define LACK_ITEM_POWER \
3065 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3066
3037int 3067int
3038apply_special (object *who, object *op, int aflags) 3068apply_special (object *who, object *op, int aflags)
3039{ 3069{
3040 int basic_flag = aflags & AP_BASIC_FLAGS; 3070 int basic_flag = aflags & AP_BASIC_FLAGS;
3041 object *tmp, *tmp2, *skop = NULL; 3071 object *tmp, *tmp2, *skop = NULL;
… …
3056 if (basic_flag == AP_APPLY) 3086 if (basic_flag == AP_APPLY)
3057 return 0; 3087 return 0;
3058 3088
3059 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3089 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3060 { 3090 {
3061 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op)); 3091 who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
3062 return 1; 3092 return 1;
3063 } 3093 }
3064 3094
3065 return unapply_special (who, op, aflags); 3095 return unapply_special (who, op, aflags);
3066 } 3096 }
… …
3082 /* Can't just apply this object. Lets see what not and what to do */ 3112 /* Can't just apply this object. Lets see what not and what to do */
3083 if (int i = can_apply_object (who, op)) 3113 if (int i = can_apply_object (who, op))
3084 { 3114 {
3085 if (i & CAN_APPLY_NEVER) 3115 if (i & CAN_APPLY_NEVER)
3086 { 3116 {
3087 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3117 who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
3088 return 1; 3118 return 1;
3089 } 3119 }
3090 else if (i & CAN_APPLY_RESTRICTION) 3120 else if (i & CAN_APPLY_RESTRICTION)
3091 { 3121 {
3092 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3122 who->failmsg (format (
3123 "You have a prohibition against using a %s. "
3124 "H<Your belief, profession or class prevents you from applying this item.>",
3125 query_name (op)
3126 ));
3093 return 1; 3127 return 1;
3094 } 3128 }
3095 3129
3096 if (who->type != PLAYER) 3130 if (who->type != PLAYER)
3097 { 3131 {
… …
3101 } 3135 }
3102 else 3136 else
3103 { 3137 {
3104 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3138 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3105 { 3139 {
3106 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3140 who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
3107 unapply_for_ob (who, op, AP_PRINT); 3141 unapply_for_ob (who, op, AP_PRINT);
3108 return 1; 3142 return 1;
3109 } 3143 }
3110 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3144 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3111 if (unapply_for_ob (who, op, aflags)) 3145 if (unapply_for_ob (who, op, aflags))
… …
3117 { 3151 {
3118 skop = find_skill_by_name (who, op->skill); 3152 skop = find_skill_by_name (who, op->skill);
3119 3153
3120 if (!skop) 3154 if (!skop)
3121 { 3155 {
3122 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3156 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3123 return 1; 3157 return 1;
3124 } 3158 }
3125 else 3159 else
3126 /* While experience will be credited properly, we want to change the 3160 /* While experience will be credited properly, we want to change the
3127 * skill so that the dam and wc get updated 3161 * skill so that the dam and wc get updated
… …
3131 3165
3132 if (who->type == PLAYER 3166 if (who->type == PLAYER
3133 && op->item_power 3167 && op->item_power
3134 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level) 3168 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3135 { 3169 {
3136 new_draw_info (NDI_UNIQUE, 0, who,
3137 "Equipping that combined with other items would consume your soul! " 3170 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3138 "[use the skills command to check your available item power]");
3139 return 1; 3171 return 1;
3140 } 3172 }
3141 3173
3142 /* Ok. We are now at the state where we can apply the new object. 3174 /* Ok. We are now at the state where we can apply the new object.
3143 * Note that we don't have the checks for can_use_... 3175 * Note that we don't have the checks for can_use_...
3144 * below - that is already taken care of by can_apply_object. 3176 * below - that is already taken care of by can_apply_object.
3145 */ 3177 */
3146 if (op->nrof > 1) 3178 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3147 tmp = get_split_ob (op, op->nrof - 1);
3148 else
3149 tmp = 0;
3150 3179
3151 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3180 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3152 return RESULT_INT (0); 3181 return RESULT_INT (0);
3153 3182
3154 switch (op->type) 3183 switch (op->type)
3155 { 3184 {
3156 case WEAPON: 3185 case WEAPON:
3157 if (!check_weapon_power (who, op->last_eat)) 3186 if (!check_weapon_power (who, op->last_eat))
3158 { 3187 {
3159 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. " 3188 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER);
3160 "It would consume your soul!.");
3161 3189
3162 if (tmp) 3190 if (tmp)
3163 insert_ob_in_ob (tmp, who); 3191 insert_ob_in_ob (tmp, who);
3164 3192
3165 return 1; 3193 return 1;
… …
3169 // i.e. "R" can use Ragnarok's sword. 3197 // i.e. "R" can use Ragnarok's sword.
3170 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3198 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3171 { 3199 {
3172 /* if the weapon does not have the name as the character, can't use it. */ 3200 /* if the weapon does not have the name as the character, can't use it. */
3173 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3201 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3174 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3202 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3175 3203
3176 if (tmp) 3204 if (tmp)
3177 insert_ob_in_ob (tmp, who); 3205 insert_ob_in_ob (tmp, who);
3178 3206
3179 return 1; 3207 return 1;
3180 } 3208 }
3181 3209
3182 if (!skop) 3210 if (!skop)
3183 { 3211 {
3184 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO 3212 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3185 return 1; 3213 return 1;
3186 } 3214 }
3187 3215
3188 SET_FLAG (op, FLAG_APPLIED); 3216 SET_FLAG (op, FLAG_APPLIED);
3189 who->change_skill (skop); 3217 who->change_skill (skop);
3190 3218
3191 if (who->contr) 3219 if (who->contr)
3192 who->change_weapon (who->contr->combat_ob = op); 3220 who->change_weapon (who->contr->combat_ob = op);
3193 3221
3194 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3222 who->statusmsg (format ("You wield %s.", query_name (op)));
3195 3223
3196 SET_FLAG (who, FLAG_READY_WEAPON); 3224 SET_FLAG (who, FLAG_READY_WEAPON);
3197 change_abil (who, op); 3225 change_abil (who, op);
3198 break; 3226 break;
3199 3227
… …
3206 case BRACERS: 3234 case BRACERS:
3207 case CLOAK: 3235 case CLOAK:
3208 case RING: 3236 case RING:
3209 case AMULET: 3237 case AMULET:
3210 SET_FLAG (op, FLAG_APPLIED); 3238 SET_FLAG (op, FLAG_APPLIED);
3211 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3239 who->statusmsg (format ("You wear %s.", query_name (op)));
3212 change_abil (who, op); 3240 change_abil (who, op);
3213 break; 3241 break;
3214 3242
3215 case LAMP: 3243 case LAMP:
3216 if (op->stats.food < 1) 3244 if (op->stats.food < 1)
3217 { 3245 {
3218 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name); 3246 who->failmsg (format (
3247 "Your %s is out of fuel! "
3248 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3249 &op->name
3250 ));
3219 return 1; 3251 return 1;
3220 } 3252 }
3221 3253
3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3254 who->statusmsg (format ("You turn on your %s.", &op->name));
3255
3223 tmp2 = arch_to_object (op->other_arch); 3256 tmp2 = arch_to_object (op->other_arch);
3224 tmp2->stats.food = op->stats.food; 3257 tmp2->stats.food = op->stats.food;
3225 SET_FLAG (tmp2, FLAG_APPLIED); 3258 SET_FLAG (tmp2, FLAG_APPLIED);
3226 3259
3227 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3260 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3228 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3261 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3229 3262
3230 insert_ob_in_ob (tmp2, who); 3263 who->insert (tmp2);
3231 3264
3232 /* Remove the old lantern */ 3265 /* Remove the old lantern */
3233 if (who->type == PLAYER)
3234 esrv_del_item (who->contr, op->count);
3235
3236 op->destroy (); 3266 op->destroy ();
3237 3267
3238 /* insert the portion that was split off */ 3268 /* insert the portion that was split off */
3239 if (tmp) 3269 if (tmp)
3240 { 3270 who->insert (tmp);
3241 insert_ob_in_ob (tmp, who);
3242 if (who->type == PLAYER)
3243 esrv_send_item (who, tmp);
3244 }
3245 3271
3246 who->update_stats (); 3272 who->update_stats ();
3247 3273
3248 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3274 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3249 if (who->type == PLAYER) 3275 if (who->type == PLAYER)
3250 { 3276 {
3251 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3277 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3252 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3278 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3253 } 3279 }
3254
3255 if (who->type == PLAYER)
3256 esrv_send_item (who, tmp2);
3257 3280
3258 return 0; 3281 return 0;
3259 3282
3260 case SKILL_TOOL: 3283 case SKILL_TOOL:
3261 // applying a skill tool also readies the skill 3284 // applying a skill tool also readies the skill
… …
3284 who->change_weapon (pl->combat_ob = item); 3307 who->change_weapon (pl->combat_ob = item);
3285 goto found_weapon; 3308 goto found_weapon;
3286 } 3309 }
3287 } 3310 }
3288 3311
3312 who->failmsg (format (
3289 new_draw_info_format (NDI_UNIQUE, 0, who, "You need to apply a '%s' melee weapon before readying this skill", &op->skill); 3313 "You need to apply a '%s' melee weapon before readying this skill. "
3314 "H<Some skills need an item, in this case a melee weapon, to function.>",
3315 &op->skill
3316 ));
3290 return 1; 3317 return 1;
3291 3318
3292 found_weapon:; 3319 found_weapon:;
3293 } 3320 }
3294 else 3321 else
… …
3304 //TODO: bows should/must all have skill missile weapon right now 3331 //TODO: bows should/must all have skill missile weapon right now
3305 who->change_weapon (pl->ranged_ob = item); 3332 who->change_weapon (pl->ranged_ob = item);
3306 goto found_bow; 3333 goto found_bow;
3307 } 3334 }
3308 3335
3336 who->failmsg (
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill"); 3337 "You need to apply a missile weapon before readying this skill. "
3338 "H<Some skills need an item, in this case a missile weapon, to function.>"
3339 );
3310 return 1; 3340 return 1;
3311 3341
3312 found_bow:; 3342 found_bow:;
3313 } 3343 }
3314 else 3344 else
3315 who->change_weapon (pl->ranged_ob = op); 3345 who->change_weapon (pl->ranged_ob = op);
3316 } 3346 }
3317 3347
3318 if (!op->invisible) 3348 if (!op->invisible)
3319 { 3349 {
3320 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3350 who->statusmsg (format (
3321 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3351 "You ready %s."
3352 "You can now use the skill: %s.",
3353 query_name (op),
3354 &op->skill
3355 ));
3322 } 3356 }
3323 else 3357 else
3324 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3358 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
3325 } 3359 }
3326 else 3360 else
3327 { 3361 {
3328 SET_FLAG (op, FLAG_APPLIED); 3362 SET_FLAG (op, FLAG_APPLIED);
3329 change_abil (who, op); 3363 change_abil (who, op);
… …
3334 break; 3368 break;
3335 3369
3336 case BOW: 3370 case BOW:
3337 if (!check_weapon_power (who, op->last_eat)) 3371 if (!check_weapon_power (who, op->last_eat))
3338 { 3372 {
3339 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3373 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3340 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3341 3374
3342 if (tmp) 3375 if (tmp)
3343 insert_ob_in_ob (tmp, who); 3376 insert_ob_in_ob (tmp, who);
3344 3377
3345 return 1; 3378 return 1;
3346 } 3379 }
3347 3380
3348 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3381 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3349 { 3382 {
3350 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3383 who->failmsg ("The weapon does not recognize you as its owner. "
3384 "H<Its name indicates that it belongs to somebody else.>");
3351 if (tmp) 3385 if (tmp)
3352 insert_ob_in_ob (tmp, who); 3386 insert_ob_in_ob (tmp, who);
3353 3387
3354 return 1; 3388 return 1;
3355 } 3389 }
… …
3360 case HORN: 3394 case HORN:
3361 /* check for skill, alter player status */ 3395 /* check for skill, alter player status */
3362 3396
3363 if (!skop) 3397 if (!skop)
3364 { 3398 {
3365 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO 3399 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3366 return 1; 3400 return 1;
3367 } 3401 }
3368 3402
3369 SET_FLAG (op, FLAG_APPLIED); 3403 SET_FLAG (op, FLAG_APPLIED);
3370 who->change_skill (skop); 3404 who->change_skill (skop);
3371 3405
3372 if (who->contr) 3406 if (who->contr)
3373 { 3407 {
3374 who->contr->ranged_ob = op; 3408 who->contr->ranged_ob = op;
3375 3409
3376 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3410 who->statusmsg (format ("You ready %s.", query_name (op)));
3377 3411
3378 if (op->type == BOW) 3412 if (op->type == BOW)
3379 { 3413 {
3380 who->current_weapon = op; 3414 who->current_weapon = op;
3381 change_abil (who, op); 3415 change_abil (who, op);
3382 new_draw_info_format (NDI_UNIQUE, 0, who,
3383 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3416 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3384 } 3417 }
3385 } 3418 }
3386 else 3419 else
3387 { 3420 {
3388 if (op->type == BOW) 3421 if (op->type == BOW)
… …
3398 { 3431 {
3399 //TODO: wtf does this do? shouldn't this be managed automatically (slots?) 3432 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3400 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER) 3433 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3401 unapply_special (who, who->contr->ranged_ob, 0); 3434 unapply_special (who, who->contr->ranged_ob, 0);
3402 3435
3403 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3436 who->statusmsg (format ("You ready your %s.", query_name (op)));
3404 3437
3405 who->contr->ranged_ob = op; 3438 who->contr->ranged_ob = op;
3406 } 3439 }
3407 break; 3440 break;
3408 3441
3409 default: 3442 default:
3410 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3443 who->statusmsg (format ("You apply %s.", query_name (op)));
3411 } /* end of switch op->type */ 3444 }
3412 3445
3413 SET_FLAG (op, FLAG_APPLIED); 3446 SET_FLAG (op, FLAG_APPLIED);
3414 3447
3415 if (tmp) 3448 if (tmp)
3416 tmp = insert_ob_in_ob (tmp, who); 3449 who->insert (tmp);
3417 3450
3418 who->update_stats (); 3451 who->update_stats ();
3419 3452
3420 /* We exclude spell casting objects. The fire code will set the 3453 /* We exclude spell casting objects. The fire code will set the
3421 * been applied flag when they are used - until that point, 3454 * been applied flag when they are used - until that point,
… …
3423 */ 3456 */
3424 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3457 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3425 SET_FLAG (op, FLAG_BEEN_APPLIED); 3458 SET_FLAG (op, FLAG_BEEN_APPLIED);
3426 3459
3427 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3460 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3428 {
3429 if (who->type == PLAYER) 3461 if (who->type == PLAYER)
3430 { 3462 {
3431 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3463 who->failmsg (
3464 "Oops, it feels deadly cold! "
3465 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3466 );
3432 SET_FLAG (op, FLAG_KNOWN_CURSED); 3467 SET_FLAG (op, FLAG_KNOWN_CURSED);
3433 } 3468 }
3434 }
3435 3469
3436 if (who->type == PLAYER) 3470 if (object *pl = op->visible_to ())
3437 {
3438 /* if multiple objects were applied, update both slots */
3439 if (tmp)
3440 esrv_send_item (who, tmp);
3441
3442 esrv_send_item (who, op); 3471 esrv_send_item (pl, op);
3443 }
3444 3472
3445 return 0; 3473 return 0;
3446} 3474}
3447 3475
3448int 3476int
3449monster_apply_special (object *who, object *op, int aflags) 3477monster_apply_special (object *who, object *op, int aflags)
3450{ 3478{
3451 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3479 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3452 return 1; 3480 return 1;
3481
3453 return apply_special (who, op, aflags); 3482 return apply_special (who, op, aflags);
3454} 3483}
3455 3484
3456/** 3485/**
3457 * Map was just loaded, handle op's initialisation. 3486 * Map was just loaded, handle op's initialisation.
… …
3674 { 3703 {
3675 if (QUERY_FLAG (food, FLAG_CURSED)) 3704 if (QUERY_FLAG (food, FLAG_CURSED))
3676 { 3705 {
3677 assign (who->contr->killer, food->name); 3706 assign (who->contr->killer, food->name);
3678 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3707 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3679 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3708 who->failmsg ("Eck!...that was poisonous!");
3680 } 3709 }
3681 else 3710 else
3682 { 3711 {
3683 if (food->stats.hp > 0) 3712 if (food->stats.hp > 0)
3684 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better."); 3713 who->statusmsg ("You begin to feel better.");
3685 else 3714 else
3686 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3715 who->failmsg ("Eck!...that was poisonous!");
3716
3687 who->stats.hp += food->stats.hp; 3717 who->stats.hp += food->stats.hp;
3688 } 3718 }
3689 } 3719 }
3690 if (food->stats.sp != 0) 3720 if (food->stats.sp != 0)
3691 { 3721 {
3692 if (QUERY_FLAG (food, FLAG_CURSED)) 3722 if (QUERY_FLAG (food, FLAG_CURSED))
3693 { 3723 {
3694 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!"); 3724 who->failmsg ("You are drained of mana!");
3695 who->stats.sp -= food->stats.sp; 3725 who->stats.sp -= food->stats.sp;
3696 if (who->stats.sp < 0) 3726 if (who->stats.sp < 0)
3697 who->stats.sp = 0; 3727 who->stats.sp = 0;
3698 } 3728 }
3699 else 3729 else
3700 { 3730 {
3701 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3731 who->statusmsg ("You feel a rush of magical energy!");
3702 who->stats.sp += food->stats.sp; 3732 who->stats.sp += food->stats.sp;
3703 /* place limit on max sp from food? */ 3733 /* place limit on max sp from food? */
3704 } 3734 }
3705 } 3735 }
3736
3706 who->update_stats (); 3737 who->update_stats ();
3707} 3738}
3708 3739
3709/** 3740/**
3710 * Designed primarily to light torches/lanterns/etc. 3741 * Designed primarily to light torches/lanterns/etc.
… …
3720 item = find_marked_object (who); 3751 item = find_marked_object (who);
3721 if (item) 3752 if (item)
3722 { 3753 {
3723 if (lighter->last_eat && lighter->stats.food) 3754 if (lighter->last_eat && lighter->stats.food)
3724 { /* lighter gets used up */ 3755 { /* lighter gets used up */
3725 /* Split multiple lighters if they're being used up. Otherwise *
3726 * one charge from each would be used up. --DAMN */
3727 if (lighter->nrof > 1)
3728 {
3729 object *oneLighter = lighter->clone (); 3756 object *oneLighter = lighter->split ();
3730
3731 lighter->nrof -= 1;
3732 oneLighter->nrof = 1;
3733 oneLighter->stats.food--; 3757 oneLighter->stats.food--;
3734 esrv_send_item (who, lighter); 3758 who->insert (oneLighter);
3735 oneLighter = insert_ob_in_ob (oneLighter, who);
3736 esrv_send_item (who, oneLighter);
3737 }
3738 else
3739 lighter->stats.food--;
3740 } 3759 }
3741 else if (lighter->last_eat) 3760 else if (lighter->last_eat)
3761 {
3742 { /* no charges left in lighter */ 3762 /* no charges left in lighter */
3743 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3763 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3744 return; 3764 return;
3745 } 3765 }
3746 3766
3747 /* Perhaps we should split what we are trying to light on fire? 3767 /* Perhaps we should split what we are trying to light on fire?
3748 * I can't see many times when you would want to light multiple 3768 * I can't see many times when you would want to light multiple
… …
3754 3774
3755 save_throw_object (item, AT_FIRE, who); 3775 save_throw_object (item, AT_FIRE, who);
3756 3776
3757 if (item->destroyed ()) 3777 if (item->destroyed ())
3758 { 3778 {
3759 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name); 3779 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3760 /* Need to update the player so that the players glow radius 3780 /* Need to update the player so that the players glow radius
3761 * gets changed. 3781 * gets changed.
3762 */ 3782 */
3763 if (is_player_env) 3783 if (is_player_env)
3764 who->update_stats (); 3784 who->update_stats ();
3765 } 3785 }
3766 else 3786 else
3767 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3787 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3768 } 3788 }
3769 else /* nothing to light */ 3789 else
3770 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object."); 3790 who->failmsg ("You need to mark a lightable object.");
3771
3772} 3791}
3773 3792
3774/** 3793/**
3775 * op made some mistake with a scroll, this takes care of punishment. 3794 * op made some mistake with a scroll, this takes care of punishment.
3776 * scroll_failure()- hacked directly from spell_failure 3795 * scroll_failure()- hacked directly from spell_failure
… …
3783 3802
3784 if (failure <= -1 && failure > -15) 3803 if (failure <= -1 && failure > -15)
3785 { /* wonder */ 3804 { /* wonder */
3786 object *tmp; 3805 object *tmp;
3787 3806
3788 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3807 op->failmsg ("Your spell warps!");
3789 tmp = get_archetype (SPELL_WONDER); 3808 tmp = get_archetype (SPELL_WONDER);
3790 cast_wonder (op, op, 0, tmp); 3809 cast_wonder (op, op, 0, tmp);
3791 tmp->destroy (); 3810 tmp->destroy ();
3792 } 3811 }
3793 else if (failure <= -15 && failure > -35) 3812 else if (failure <= -15 && failure > -35)
3794 { /* drain mana */ 3813 { /* drain mana */
3795 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3814 op->failmsg ("Your mana is drained!");
3796 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3815 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3797 if (op->stats.sp < 0) 3816 if (op->stats.sp < 0)
3798 op->stats.sp = 0; 3817 op->stats.sp = 0;
3799 } 3818 }
3800 else if (settings.spell_failure_effects == TRUE) 3819 else if (settings.spell_failure_effects == TRUE)
3801 { 3820 {
3802 if (failure <= -35 && failure > -60) 3821 if (failure <= -35 && failure > -60)
3803 { /* confusion */ 3822 { /* confusion */
3804 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3823 op->failmsg ("The magic recoils on you!");
3805 confuse_player (op, op, power); 3824 confuse_player (op, op, power);
3806 } 3825 }
3807 else if (failure <= -60 && failure > -70) 3826 else if (failure <= -60 && failure > -70)
3808 { /* paralysis */ 3827 { /* paralysis */
3809 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!"); 3828 op->failmsg ("The magic recoils and paralyzes you!");
3810 paralyze_player (op, op, power); 3829 paralyze_player (op, op, power);
3811 } 3830 }
3812 else if (failure <= -70 && failure > -80) 3831 else if (failure <= -70 && failure > -80)
3813 { /* blind */ 3832 { /* blind */
3814 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3833 op->failmsg ("The magic recoils on you!");
3815 blind_player (op, op, power); 3834 blind_player (op, op, power);
3816 } 3835 }
3817 else if (failure <= -80) 3836 else if (failure <= -80)
3818 { /* blast the immediate area */ 3837 { /* blast the immediate area */
3819 object *tmp = get_archetype (LOOSE_MANA); 3838 object *tmp = get_archetype (LOOSE_MANA);
3820 cast_magic_storm (op, tmp, power); 3839 cast_magic_storm (op, tmp, power);
3821 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!"); 3840 op->failmsg ("You unleash uncontrolled mana!");
3822 tmp->destroy (); 3841 tmp->destroy ();
3823 } 3842 }
3824 } 3843 }
3825} 3844}
3826 3845
… …
3846 */ 3865 */
3847 int i, j; 3866 int i, j;
3848 3867
3849 for (i = 0; i < NUM_STATS; i++) 3868 for (i = 0; i < NUM_STATS; i++)
3850 { 3869 {
3851 int race_bonus = pl->arch->clone.stats.stat (i); 3870 int race_bonus = pl->arch->stats.stat (i);
3852 sint8 stat = stats->stat (i) + ns->stat (i); 3871 sint8 stat = stats->stat (i) + ns->stat (i);
3853 3872
3854 if (stat > 20 + race_bonus) 3873 if (stat > 20 + race_bonus)
3855 { 3874 {
3856 excess_stat++; 3875 excess_stat++;
… …
3866 3885
3867 if (i == CHA) 3886 if (i == CHA)
3868 continue; /* exclude cha from this */ 3887 continue; /* exclude cha from this */
3869 3888
3870 int stat = stats->stat (i); 3889 int stat = stats->stat (i);
3871 int race_bonus = pl->arch->clone.stats.stat (i); 3890 int race_bonus = pl->arch->stats.stat (i);
3872 if (stat < 20 + race_bonus) 3891 if (stat < 20 + race_bonus)
3873 { 3892 {
3874 change_attr_value (stats, i, 1); 3893 change_attr_value (stats, i, 1);
3875 excess_stat--; 3894 excess_stat--;
3876 } 3895 }
… …
3933 char got[MAX_BUF]; 3952 char got[MAX_BUF];
3934 int len; 3953 int len;
3935 3954
3936 if (!pl || !transformer) 3955 if (!pl || !transformer)
3937 return; 3956 return;
3957
3938 marked = find_marked_object (pl); 3958 marked = find_marked_object (pl);
3959
3939 if (!marked) 3960 if (!marked)
3940 { 3961 {
3941 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 3962 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
3942 return; 3963 return;
3943 } 3964 }
3965
3944 if (!marked->slaying) 3966 if (!marked->slaying)
3945 { 3967 {
3946 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3968 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3947 return; 3969 return;
3948 } 3970 }
3971
3949 /* check whether they are compatible or not */ 3972 /* check whether they are compatible or not */
3950 find = strstr (marked->slaying, transformer->arch->name); 3973 find = strstr (marked->slaying, transformer->arch->archname);
3951 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 3974 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3952 { 3975 {
3953 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3976 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3954 return; 3977 return;
3955 } 3978 }
3979
3956 find += strlen (transformer->arch->name) + 1; 3980 find += strlen (transformer->arch->archname) + 1;
3957 /* Item can be used, now find how many and what it yields */ 3981 /* Item can be used, now find how many and what it yields */
3958 if (isdigit (*(find))) 3982 if (isdigit (*(find)))
3959 { 3983 {
3960 yield = atoi (find); 3984 yield = atoi (find);
3961 if (yield < 1) 3985 if (yield < 1)
… …
3967 else 3991 else
3968 yield = 1; 3992 yield = 1;
3969 3993
3970 while (isdigit (*find)) 3994 while (isdigit (*find))
3971 find++; 3995 find++;
3996
3972 while (*find == ' ') 3997 while (*find == ' ')
3973 find++; 3998 find++;
3999
3974 memset (got, 0, MAX_BUF); 4000 memset (got, 0, MAX_BUF);
4001
3975 if ((separator = strchr (find, ';')) != NULL) 4002 if ((separator = strchr (find, ';')) != NULL)
3976 {
3977 len = separator - find; 4003 len = separator - find;
3978 }
3979 else 4004 else
3980 {
3981 len = strlen (find); 4005 len = strlen (find);
3982 } 4006
3983 if (len > MAX_BUF - 1) 4007 if (len > MAX_BUF - 1)
3984 len = MAX_BUF - 1; 4008 len = MAX_BUF - 1;
4009
3985 strcpy (got, find); 4010 strcpy (got, find);
3986 got[len] = '\0'; 4011 got[len] = '\0';
3987 4012
3988 /* Now create new item, remove used ones when required. */ 4013 /* Now create new item, remove used ones when required. */
3989 new_item = get_archetype (got); 4014 new_item = get_archetype (got);
3990 if (!new_item) 4015 if (!new_item)
3991 { 4016 {
3992 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0)); 4017 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
3993 return; 4018 return;
3994 } 4019 }
3995 4020
3996 new_item->nrof = yield; 4021 new_item->nrof = yield;
4022
3997 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4023 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
3998 insert_ob_in_ob (new_item, pl); 4024
3999 esrv_send_inventory (pl, pl); 4025 pl->insert (new_item);
4000 /* Eat up one item */ 4026 /* Eat up one item */
4001 decrease_ob_nr (marked, 1); 4027 marked->decrease ();
4028
4002 /* Eat one transformer if needed */ 4029 /* Eat one transformer if needed */
4003 if (transformer->stats.food) 4030 if (transformer->stats.food)
4004 if (--transformer->stats.food == 0) 4031 if (--transformer->stats.food == 0)
4005 decrease_ob_nr (transformer, 1); 4032 transformer->decrease ();
4006} 4033}
4034

Diff Legend

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