ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

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

Diff Legend

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