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.38 by root, Tue Dec 12 22:37:05 2006 UTC vs.
Revision 1.127 by root, Fri Aug 17 21:18:01 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23
24#include <cmath>
23 25
24#include <global.h> 26#include <global.h>
25#include <living.h> 27#include <living.h>
26#include <spells.h> 28#include <spells.h>
27#include <skills.h> 29#include <skills.h>
28#include <tod.h> 30#include <tod.h>
29 31
30#ifndef __CEXTRACT__
31# include <sproto.h> 32#include <sproto.h>
32#endif
33 33
34/* Want this regardless of rplay. */ 34/* Want this regardless of rplay. */
35#include <sounds.h> 35#include <sounds.h>
36
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */
38#include <math.h>
39 36
40/** 37/**
41 * Check if op should abort moving victim because of it's race or slaying. 38 * Check if op should abort moving victim because of it's race or slaying.
42 * Returns 1 if it should abort, returns 0 if it should continue. 39 * Returns 1 if it should abort, returns 0 if it should continue.
43 */ 40 */
… …
66 { 63 {
67 arch_flag = 1; 64 arch_flag = 1;
68 name_flag = 1; 65 name_flag = 1;
69 race_flag = 1; 66 race_flag = 1;
70 } 67 }
68
71 /* 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,
72 * name or race that matches. 70 * name or race that matches.
73 */ 71 */
74 if ((op->race) && 72 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 73 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
76 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
78 {
79 return 1; 76 return 1;
80 } 77
81 /* If the director has slaying set, only affect objects where none 78 /* If the director has slaying set, only affect objects where none
82 * of arch, name, or race match. 79 * of arch, name, or race match.
83 */ 80 */
84 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 81 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
85 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
86 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
87 {
88 return 1; 84 return 1;
89 } 85
90 return 0; 86 return 0;
91} 87}
92 88
93/** 89/**
94 * This handles a player dropping money on an altar to identify stuff. 90 * This handles a player dropping money on an altar to identify stuff.
… …
96 * Return value: 1 if money was destroyed, 0 if not. 92 * Return value: 1 if money was destroyed, 0 if not.
97 */ 93 */
98static int 94static int
99apply_id_altar (object *money, object *altar, object *pl) 95apply_id_altar (object *money, object *altar, object *pl)
100{ 96{
101 object *id, *marked; 97 dynbuf_text buf;
102 int success = 0;
103 98
104 if (pl == NULL || pl->type != PLAYER) 99 if (!pl || pl->type != PLAYER)
105 return 0; 100 return 0;
106 101
107 /* 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
108 * identifying' from being printed out more than it needs to be. 103 * identifying' from being printed out more than it needs to be.
109 */ 104 */
110 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 105 if (!check_altar_sacrifice (altar, money) || money->type != MONEY)
111 return 0; 106 return 0;
112 107
113 marked = find_marked_object (pl);
114 /* 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
115 * identified. IF it doesn't, then go through the player inventory. 109 * identified. If it doesn't, then go through the player inventory.
116 */ 110 */
111 if (object *marked = find_marked_object (pl))
117 if (marked && !QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 112 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
118 { 113 {
119 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
120 { 115 {
121 identify (marked); 116 identify (marked);
122 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (marked, pl)); 117
118 buf.printf ("You have %s.", long_desc (marked, pl));
123 if (marked->msg) 119 if (marked->msg)
124 { 120 buf << "The item has a story:\n" << marked->msg;
125 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 121
126 new_draw_info (NDI_UNIQUE, 0, pl, marked->msg); 122 return !money;
127 } 123 }
128 return money == NULL;
129 } 124 }
130 }
131 125
132 for (id = pl->inv; id; id = id->below) 126 for (object *id = pl->inv; id; id = id->below)
133 { 127 {
134 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 128 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
135 { 129 {
136 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
137 { 131 {
138 identify (id); 132 identify (id);
139 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (id, pl)); 133
134 buf.printf ("You have %s.", long_desc (id, pl));
140 if (id->msg) 135 if (id->msg)
141 { 136 buf << "The item has a story:\n" << id->msg;
142 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 137
143 new_draw_info (NDI_UNIQUE, 0, pl, id->msg);
144 }
145 success = 1;
146 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
147 if (money == NULL || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
148 break; 140 break;
149 } 141 }
150 else 142 else
151 { 143 {
152 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");
153 break; 145 break;
154 } 146 }
155 } 147 }
156 } 148 }
157 if (!success) 149
158 new_draw_info (NDI_UNIQUE, 0, pl, "You have nothing that needs identifying"); 150 if (buf.empty ())
151 buf << ("You have nothing that needs identifying");
152
153 pl->contr->infobox ("Identify", buf);
154
159 return money == NULL; 155 return !money;
160} 156}
161 157
162/** 158/**
163 * 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
164 * matching item. 160 * matching item.
165 **/ 161 **/
166static void 162void
167handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
168{ 164{
169 const char *yield; 165 const char *yield;
170 166
171 yield = get_ob_key_value (tmp, "on_use_yield"); 167 yield = get_ob_key_value (tmp, "on_use_yield");
… …
195apply_potion (object *op, object *tmp) 191apply_potion (object *op, object *tmp)
196{ 192{
197 int got_one = 0, i; 193 int got_one = 0, i;
198 object *force = 0, *floor = 0; 194 object *force = 0, *floor = 0;
199 195
200 floor = get_map_ob (op->map, op->x, op->y); 196 floor = GET_MAP_OB (op->map, op->x, op->y);
201 197
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 198 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 199 {
204 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 200 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
201
206 CLEAR_FLAG (tmp, FLAG_APPLIED); 202 CLEAR_FLAG (tmp, FLAG_APPLIED);
207 return 0; 203 return 0;
208 } 204 }
209 205
210 if (op->type == PLAYER) 206 if (op->type == PLAYER)
… …
219 object *depl; 215 object *depl;
220 archetype *at; 216 archetype *at;
221 217
222 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 218 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
223 { 219 {
224 drain_stat (op); 220 op->drain_stat ();
225 fix_player (op); 221 op->update_stats ();
226 decrease_ob (tmp); 222 decrease_ob (tmp);
227 return 1; 223 return 1;
228 } 224 }
229 225
230 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 226 if (!(at = archetype::find (ARCH_DEPLETION)))
231 { 227 {
232 LOG (llevError, "Could not find archetype depletion\n"); 228 LOG (llevError, "Could not find archetype depletion\n");
233 return 0; 229 return 0;
234 } 230 }
235 depl = present_arch_in_ob (at, op); 231 depl = present_arch_in_ob (at, op);
236 232
237 if (depl != NULL) 233 if (depl)
238 { 234 {
239 for (i = 0; i < NUM_STATS; i++) 235 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 236 if (depl->stats.stat (i))
241 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 237 op->statusmsg (restore_msg[i]);
242 238
243 depl->destroy (); 239 depl->destroy ();
244 fix_player (op); 240 op->update_stats ();
245 } 241 }
246 else 242 else
247 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 243 op->statusmsg ("Your potion had no effect.");
248 244
249 decrease_ob (tmp); 245 decrease_ob (tmp);
250 return 1; 246 return 1;
251 } 247 }
252 248
253 /* improvement potion - only for players */ 249 /* improvement potion - only for players */
254 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 250 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
255 { 251 {
256 for (i = 1; i < MIN (11, op->level); i++) 252 for (i = 1; i < MIN (11, op->level); i++)
257 { 253 {
258 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 254 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
259 { 255 {
260 if (op->contr->levhp[i] != 1) 256 if (op->contr->levhp[i] != 1)
261 { 257 {
262 op->contr->levhp[i] = 1; 258 op->contr->levhp[i] = 1;
263 break; 259 break;
264 } 260 }
261
265 if (op->contr->levsp[i] != 1) 262 if (op->contr->levsp[i] != 1)
266 { 263 {
267 op->contr->levsp[i] = 1; 264 op->contr->levsp[i] = 1;
268 break; 265 break;
269 } 266 }
267
270 if (op->contr->levgrace[i] != 1) 268 if (op->contr->levgrace[i] != 1)
271 { 269 {
272 op->contr->levgrace[i] = 1; 270 op->contr->levgrace[i] = 1;
273 break; 271 break;
274 } 272 }
… …
278 if (op->contr->levhp[i] < 9) 276 if (op->contr->levhp[i] < 9)
279 { 277 {
280 op->contr->levhp[i] = 9; 278 op->contr->levhp[i] = 9;
281 break; 279 break;
282 } 280 }
281
283 if (op->contr->levsp[i] < 6) 282 if (op->contr->levsp[i] < 6)
284 { 283 {
285 op->contr->levsp[i] = 6; 284 op->contr->levsp[i] = 6;
286 break; 285 break;
287 } 286 }
287
288 if (op->contr->levgrace[i] < 3) 288 if (op->contr->levgrace[i] < 3)
289 { 289 {
290 op->contr->levgrace[i] = 3; 290 op->contr->levgrace[i] = 3;
291 break; 291 break;
292 } 292 }
… …
299 299
300 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 300 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
301 { 301 {
302 if (got_one) 302 if (got_one)
303 { 303 {
304 fix_player (op); 304 op->update_stats ();
305 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 305 op->statusmsg ("The Gods smile upon you and remake you "
306 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 306 "a little more in their image. "
307 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 307 "You feel a little more perfect.", NDI_GREEN);
308 } 308 }
309 else 309 else
310 new_draw_info (NDI_UNIQUE, 0, op, "The potion had no effect - you are already perfect"); 310 op->statusmsg ("The potion had no effect - you are already perfect.");
311 } 311 }
312 else 312 else
313 { /* cursed potion */ 313 { /* cursed potion */
314 if (got_one) 314 if (got_one)
315 { 315 {
316 fix_player (op); 316 op->update_stats ();
317 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 317 op->failmsg ("The Gods are angry and punish you.");
318 } 318 }
319 else 319 else
320 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 320 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
321 } 321 }
322 322
323 decrease_ob (tmp); 323 decrease_ob (tmp);
324 return 1; 324 return 1;
325 } 325 }
… …
334 { 334 {
335 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 335 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
336 { 336 {
337 object *fball; 337 object *fball;
338 338
339 new_draw_info (NDI_UNIQUE, 0, op, "Yech! Your lungs are on fire!"); 339 op->failmsg ("Yech! Your lungs are on fire!");
340
340 /* Explodes a fireball centered at player */ 341 /* Explodes a fireball centered at player */
341 fball = get_archetype (EXPLODING_FIREBALL); 342 fball = get_archetype (EXPLODING_FIREBALL);
342 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1; 343 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
343 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2; 344 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
344 fball->x = op->x; 345 fball->x = op->x;
… …
347 } 348 }
348 else 349 else
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 350 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 351
351 decrease_ob (tmp); 352 decrease_ob (tmp);
353
352 /* if youre dead, no point in doing this... */ 354 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 355 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 356 op->update_stats ();
357
355 return 1; 358 return 1;
356 } 359 }
357 360
358 /* Deal with protection potions */ 361 /* Deal with protection potions */
359 force = NULL; 362 force = NULL;
… …
361 { 364 {
362 if (tmp->resist[i]) 365 if (tmp->resist[i])
363 { 366 {
364 if (!force) 367 if (!force)
365 force = get_archetype (FORCE_NAME); 368 force = get_archetype (FORCE_NAME);
369
366 memcpy (force->resist, tmp->resist, sizeof (tmp->resist)); 370 memcpy (force->resist, tmp->resist, sizeof (tmp->resist));
367 force->type = POTION_EFFECT; 371 force->type = POTION_EFFECT;
368 break; /* Only need to find one protection since we copy entire batch */ 372 break; /* Only need to find one protection since we copy entire batch */
369 } 373 }
370 } 374 }
375
371 /* This is a protection potion */ 376 /* This is a protection potion */
372 if (force) 377 if (force)
373 { 378 {
374 /* cursed items last longer */ 379 /* cursed items last longer */
375 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 380 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
… …
377 force->stats.food *= 10; 382 force->stats.food *= 10;
378 for (i = 0; i < NROFATTACKS; i++) 383 for (i = 0; i < NROFATTACKS; i++)
379 if (force->resist[i] > 0) 384 if (force->resist[i] > 0)
380 force->resist[i] = -force->resist[i]; /* prot => vuln */ 385 force->resist[i] = -force->resist[i]; /* prot => vuln */
381 } 386 }
387
382 force->speed_left = -1; 388 force->speed_left = -1;
383 force = insert_ob_in_ob (force, op); 389 force = insert_ob_in_ob (force, op);
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 390 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 SET_FLAG (force, FLAG_APPLIED); 391 SET_FLAG (force, FLAG_APPLIED);
386 change_abil (op, force); 392 change_abil (op, force);
… …
393 { /* only for players */ 399 { /* only for players */
394 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 400 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0)
395 CLEAR_FLAG (tmp, FLAG_APPLIED); 401 CLEAR_FLAG (tmp, FLAG_APPLIED);
396 else 402 else
397 SET_FLAG (tmp, FLAG_APPLIED); 403 SET_FLAG (tmp, FLAG_APPLIED);
404
398 if (!change_abil (op, tmp)) 405 if (!change_abil (op, tmp))
399 new_draw_info (NDI_UNIQUE, 0, op, "Nothing happened."); 406 op->statusmsg ("Nothing happened.");
400 } 407 }
401 408
402 /* CLEAR_FLAG is so that if the character has other potions 409 /* CLEAR_FLAG is so that if the character has other potions
403 * that were grouped with the one consumed, his 410 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 411 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 412 * up all the stats.
406 */ 413 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 414 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 415 op->update_stats ();
409 decrease_ob (tmp); 416 decrease_ob (tmp);
410 return 1; 417 return 1;
411} 418}
412 419
413/**************************************************************************** 420/****************************************************************************
… …
420static int 427static int
421check_item (object *op, const char *item) 428check_item (object *op, const char *item)
422{ 429{
423 int count = 0; 430 int count = 0;
424 431
425 432 if (!item)
426 if (item == NULL)
427 return 0; 433 return 0;
428 op = op->below; 434
429 while (op != NULL) 435 for (op = op->below; op; op = op->below)
430 { 436 {
431 if (strcmp (op->arch->name, item) == 0) 437 if (strcmp (op->arch->archname, item) == 0)
432 { 438 {
433 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 439 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
434 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 440 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
435 { 441 {
436 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */ 442 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
437 count++; 443 count++;
438 else 444 else
439 count += op->nrof; 445 count += op->nrof;
440 } 446 }
441 } 447 }
442 op = op->below;
443 } 448 }
449
444 return count; 450 return count;
445} 451}
446 452
447/** 453/**
448 * This removes 'nrof' of what item->slaying says to remove. 454 * This removes 'nrof' of what item->slaying says to remove.
… …
456 object *prev; 462 object *prev;
457 463
458 prev = op; 464 prev = op;
459 op = op->below; 465 op = op->below;
460 466
461 while (op != NULL) 467 while (op)
462 { 468 {
463 if (strcmp (op->arch->name, item) == 0) 469 if (strcmp (op->arch->archname, item) == 0)
464 { 470 {
465 if (op->nrof >= nrof) 471 if (op->nrof >= nrof)
466 { 472 {
467 decrease_ob_nr (op, nrof); 473 decrease_ob_nr (op, nrof);
468 return; 474 return;
… …
470 else 476 else
471 { 477 {
472 decrease_ob_nr (op, op->nrof); 478 decrease_ob_nr (op, op->nrof);
473 nrof -= op->nrof; 479 nrof -= op->nrof;
474 } 480 }
481
475 op = prev; 482 op = prev;
476 } 483 }
484
477 prev = op; 485 prev = op;
478 op = op->below; 486 op = op->below;
479 } 487 }
480} 488}
481 489
… …
487 * we return 1 (true) if the player can use the weapon. 495 * we return 1 (true) if the player can use the weapon.
488 */ 496 */
489static int 497static int
490check_weapon_power (const object *who, int improvs) 498check_weapon_power (const object *who, int improvs)
491{ 499{
492
493/* Old code is below (commented out). Basically, since weapons are the only 500/* Old code is below (commented out). Basically, since weapons are the only
494 * object players really have any control to improve, it's a bit harsh to 501 * object players really have any control to improve, it's a bit harsh to
495 * require high level in some combat skill, so we just use overall level. 502 * require high level in some combat skill, so we just use overall level.
496 */ 503 */
497#if 1 504#if 1
… …
538static int 545static int
539check_sacrifice (object *op, const object *improver) 546check_sacrifice (object *op, const object *improver)
540{ 547{
541 int count = 0; 548 int count = 0;
542 549
543 if (improver->slaying != NULL) 550 if (improver->slaying)
544 { 551 {
545 count = check_item (op, improver->slaying); 552 count = check_item (op, improver->slaying);
546 if (count < 1) 553 if (count < 1)
547 { 554 {
548 char buf[200];
549
550 sprintf (buf, "The gods want more %ss", &improver->slaying); 555 op->failmsg (format ("The gods want more %ss", &improver->slaying));
551 new_draw_info (NDI_UNIQUE, 0, op, buf);
552 return 0; 556 return 0;
553 } 557 }
554 } 558 }
555 else 559 else
556 count = 1; 560 count = 1;
… …
559} 563}
560 564
561/** 565/**
562 * Actually improves the weapon, and tells user. 566 * Actually improves the weapon, and tells user.
563 */ 567 */
564int 568static int
565improve_weapon_stat (object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname) 569improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
566{ 570{
567
568 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
569 *stat += sacrifice_count; 571 stat += sacrifice_count;
570 weapon->last_eat++; 572 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count);
572 decrease_ob (improver); 573 decrease_ob (improver);
573 574
574 /* So it updates the players stats and the window */ 575 /* So it updates the players stats and the window */
575 fix_player (op); 576 op->update_stats ();
577
578 op->statusmsg (format (
579 "Your sacrifice was accepted.\n"
580 "Weapon's bonus to %s improved by %d.",
581 statname, sacrifice_count
582 ));
583
576 return 1; 584 return 1;
577} 585}
578 586
579/* Types of improvements, hidden in the sp field. */ 587/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 588#define IMPROVE_PREPARE 1
581#define IMPROVE_DAMAGE 2 589#define IMPROVE_DAMAGE 2
582#define IMPROVE_WEIGHT 3 590#define IMPROVE_WEIGHT 3
583#define IMPROVE_ENCHANT 4 591#define IMPROVE_ENCHANT 4
584#define IMPROVE_STR 5 592#define IMPROVE_STR 5
585#define IMPROVE_DEX 6 593#define IMPROVE_DEX 6
586#define IMPROVE_CON 7 594#define IMPROVE_CON 7
587#define IMPROVE_WIS 8 595#define IMPROVE_WIS 8
588#define IMPROVE_CHA 9 596#define IMPROVE_CHA 9
589#define IMPROVE_INT 10 597#define IMPROVE_INT 10
590#define IMPROVE_POW 11 598#define IMPROVE_POW 11
591
592 599
593/** 600/**
594 * This does the prepare weapon scroll. 601 * This does the prepare weapon scroll.
595 * Checks for sacrifice, and so on. 602 * Checks for sacrifice, and so on.
596 */ 603 */
597
598int 604int
599prepare_weapon (object *op, object *improver, object *weapon) 605prepare_weapon (object *op, object *improver, object *weapon)
600{ 606{
601 int sacrifice_count, i; 607 int sacrifice_count, i;
602 char buf[MAX_BUF]; 608 char buf[MAX_BUF];
603 609
604 if (weapon->level != 0) 610 if (weapon->level != 0)
605 { 611 {
606 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 612 op->failmsg ("Weapon is already prepared!");
607 return 0; 613 return 0;
608 } 614 }
615
609 for (i = 0; i < NROFATTACKS; i++) 616 for (i = 0; i < NROFATTACKS; i++)
610 if (weapon->resist[i]) 617 if (weapon->resist[i])
611 break; 618 break;
612 619
613 /* If we break out, i will be less than nrofattacks, preventing 620 /* If we break out, i will be less than nrofattacks, preventing
… …
616 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 623 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
617 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 624 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
618 weapon->stats.exp || /* speed */ 625 weapon->stats.exp || /* speed */
619 weapon->stats.ac) /* AC - only taifu's I think */ 626 weapon->stats.ac) /* AC - only taifu's I think */
620 { 627 {
621 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 628 op->failmsg ("You cannot prepare magic weapons.");
622 return 0; 629 return 0;
623 } 630 }
631
624 sacrifice_count = check_sacrifice (op, improver); 632 sacrifice_count = check_sacrifice (op, improver);
625 if (sacrifice_count <= 0) 633 if (sacrifice_count <= 0)
626 return 0; 634 return 0;
635
627 weapon->level = isqrt (sacrifice_count); 636 weapon->level = isqrt (sacrifice_count);
628 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
629 eat_item (op, improver->slaying, sacrifice_count); 637 eat_item (op, improver->slaying, sacrifice_count);
630 638
631 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level); 639 op->statusmsg (format (
640 "Your sacrifice was accepted."
641 "Your *%s may be improved %d times.",
642 &weapon->name, weapon->level
643 ));
632 644
633 sprintf (buf, "%s's %s", &op->name, &weapon->name); 645 sprintf (buf, "%s's %s", &op->name, &weapon->name);
634 weapon->name = weapon->name_pl = buf; 646 weapon->name = weapon->name_pl = buf;
635 weapon->nrof = 0; /* prevents preparing n weapons in the same 647 weapon->nrof = 0; /* prevents preparing n weapons in the same
636 slot at once! */ 648 slot at once! */
… …
655improve_weapon (object *op, object *improver, object *weapon) 667improve_weapon (object *op, object *improver, object *weapon)
656{ 668{
657 int sacrifice_count, sacrifice_needed = 0; 669 int sacrifice_count, sacrifice_needed = 0;
658 670
659 if (improver->stats.sp == IMPROVE_PREPARE) 671 if (improver->stats.sp == IMPROVE_PREPARE)
660 {
661 return prepare_weapon (op, improver, weapon); 672 return prepare_weapon (op, improver, weapon);
662 } 673
663 if (weapon->level == 0) 674 if (weapon->level == 0)
664 { 675 {
665 new_draw_info (NDI_UNIQUE, 0, op, "This weapon has not been prepared."); 676 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");
666 return 0; 677 return 0;
667 } 678 }
679
668 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 680 if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
669 { 681 {
670 new_draw_info (NDI_UNIQUE, 0, op, "This weapon cannot be improved any more."); 682 op->failmsg ("This weapon cannot be improved any more.");
671 return 0; 683 return 0;
672 } 684 }
685
673 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 686 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))
674 { 687 {
675 new_draw_info (NDI_UNIQUE, 0, op, "Improving the weapon will make it too"); 688 op->failmsg ("Improving the weapon will make it too "
676 new_draw_info (NDI_UNIQUE, 0, op, "powerful for you to use. Unready it if you"); 689 "powerful for you to use. Unready it if you "
677 new_draw_info (NDI_UNIQUE, 0, op, "really want to improve it."); 690 "really want to improve it.");
678 return 0; 691 return 0;
679 } 692 }
693
680 /* This just increases damage by 5 points, no matter what. No sacrifice 694 /* This just increases damage by 5 points, no matter what. No sacrifice
681 * is needed. Since stats.dam is now a 16 bit value and not 8 bit, 695 * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
682 * don't put any maximum value on damage - the limit is how much the 696 * don't put any maximum value on damage - the limit is how much the
683 * weapon can be improved. 697 * weapon can be improved.
684 */ 698 */
685 if (improver->stats.sp == IMPROVE_DAMAGE) 699 if (improver->stats.sp == IMPROVE_DAMAGE)
686 { 700 {
687 weapon->stats.dam += 5; 701 weapon->stats.dam += 5;
688 weapon->weight += 5000; /* 5 KG's */ 702 weapon->weight += 5000; /* 5 KG's */
689 new_draw_info_format (NDI_UNIQUE, 0, op, "Damage has been increased by 5 to %d", weapon->stats.dam); 703 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
690 weapon->last_eat++; 704 weapon->last_eat++;
691 705
692 weapon->item_power++; 706 weapon->item_power++;
693 decrease_ob (improver); 707 decrease_ob (improver);
694 return 1; 708 return 1;
695 } 709 }
710
696 if (improver->stats.sp == IMPROVE_WEIGHT) 711 if (improver->stats.sp == IMPROVE_WEIGHT)
697 { 712 {
698 /* Reduce weight by 20% */ 713 /* Reduce weight by 20% */
699 weapon->weight = (weapon->weight * 8) / 10; 714 weapon->weight = (weapon->weight * 8) / 10;
700 if (weapon->weight < 1) 715 if (weapon->weight < 1)
701 weapon->weight = 1; 716 weapon->weight = 1;
717
702 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon weight reduced to %6.1f kg", (float) weapon->weight / 1000.0); 718 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
703 weapon->last_eat++; 719 weapon->last_eat++;
704 weapon->item_power++; 720 weapon->item_power++;
705 decrease_ob (improver); 721 decrease_ob (improver);
706 return 1; 722 return 1;
707 } 723 }
708 if (improver->stats.sp == IMPROVE_ENCHANT) 724 if (improver->stats.sp == IMPROVE_ENCHANT)
709 { 725 {
710 weapon->magic++; 726 weapon->magic++;
711 weapon->last_eat++; 727 weapon->last_eat++;
712 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon magic increased to %d", weapon->magic); 728 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
713 decrease_ob (improver); 729 decrease_ob (improver);
714 weapon->item_power++; 730 weapon->item_power++;
715 return 1; 731 return 1;
716 } 732 }
717 733
… …
723 sacrifice_needed *= 2; 739 sacrifice_needed *= 2;
724 740
725 sacrifice_count = check_sacrifice (op, improver); 741 sacrifice_count = check_sacrifice (op, improver);
726 if (sacrifice_count < sacrifice_needed) 742 if (sacrifice_count < sacrifice_needed)
727 { 743 {
728 new_draw_info_format (NDI_UNIQUE, 0, op, "You need at least %d %s", sacrifice_needed, &improver->slaying); 744 op->failmsg (format ("You need at least %d %s.", sacrifice_needed, &improver->slaying));
729 return 0; 745 return 0;
730 } 746 }
747
731 eat_item (op, improver->slaying, sacrifice_needed); 748 eat_item (op, improver->slaying, sacrifice_needed);
732 weapon->item_power++; 749 weapon->item_power++;
733 750
734 switch (improver->stats.sp) 751 switch (improver->stats.sp)
735 { 752 {
736 case IMPROVE_STR:
737 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Str), 1, "strength"); 753 case IMPROVE_STR: return improve_weapon_stat (op, improver, weapon, weapon->stats.Str, 1, "strength");
738 case IMPROVE_DEX:
739 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Dex), 1, "dexterity"); 754 case IMPROVE_DEX: return improve_weapon_stat (op, improver, weapon, weapon->stats.Dex, 1, "dexterity");
740 case IMPROVE_CON:
741 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Con), 1, "constitution"); 755 case IMPROVE_CON: return improve_weapon_stat (op, improver, weapon, weapon->stats.Con, 1, "constitution");
742 case IMPROVE_WIS:
743 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Wis), 1, "wisdom"); 756 case IMPROVE_WIS: return improve_weapon_stat (op, improver, weapon, weapon->stats.Wis, 1, "wisdom");
744 case IMPROVE_CHA:
745 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Cha), 1, "charisma"); 757 case IMPROVE_CHA: return improve_weapon_stat (op, improver, weapon, weapon->stats.Cha, 1, "charisma");
746 case IMPROVE_INT:
747 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Int), 1, "intelligence"); 758 case IMPROVE_INT: return improve_weapon_stat (op, improver, weapon, weapon->stats.Int, 1, "intelligence");
748 case IMPROVE_POW:
749 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Pow), 1, "power"); 759 case IMPROVE_POW: return improve_weapon_stat (op, improver, weapon, weapon->stats.Pow, 1, "power");
750 default: 760 default:
751 new_draw_info (NDI_UNIQUE, 0, op, "Unknown improvement type."); 761 op->failmsg ("Unknown improvement type.");
752 } 762 }
763
753 LOG (llevError, "improve_weapon: Got to end of function\n"); 764 LOG (llevError, "improve_weapon: Got to end of function\n");
754 return 0; 765 return 0;
755} 766}
756 767
757/** 768/**
… …
764{ 775{
765 object *otmp; 776 object *otmp;
766 777
767 if (op->type != PLAYER) 778 if (op->type != PLAYER)
768 return 0; 779 return 0;
780
769 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 781 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
770 { 782 {
771 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 783 op->failmsg ("Something blocks the magic of the scroll!");
772 return 0; 784 return 0;
773 } 785 }
786
774 otmp = find_marked_object (op); 787 otmp = find_marked_object (op);
775 if (!otmp) 788 if (!otmp)
776 { 789 {
777 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 790 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
778 return 0; 791 return 0;
779 } 792 }
793
780 if (otmp->type != WEAPON && otmp->type != BOW) 794 if (otmp->type != WEAPON && otmp->type != BOW)
781 { 795 {
782 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 796 op->failmsg ("Marked item is not a weapon or bow!");
783 return 0; 797 return 0;
784 } 798 }
785 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 799
800 op->statusmsg ("Applied weapon builder.");
801
786 improve_weapon (op, tmp, otmp); 802 improve_weapon (op, tmp, otmp);
787 esrv_send_item (op, otmp); 803 esrv_send_item (op, otmp);
788 return 1; 804 return 1;
789} 805}
790 806
… …
815{ 831{
816 object *tmp; 832 object *tmp;
817 833
818 if (armour->magic >= settings.armor_max_enchant) 834 if (armour->magic >= settings.armor_max_enchant)
819 { 835 {
820 new_draw_info (NDI_UNIQUE, 0, op, "This armour can not be enchanted any further."); 836 op->failmsg ("This armour can not be enchanted any further!");
821 return 0; 837 return 0;
822 } 838 }
823 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 839 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
824 * etc), so take the easy way out and don't worry about it. 840 * etc), so take the easy way out and don't worry about it.
825 * Note - maybe add scrolls which make the random artifact versions (eg, armour 841 * Note - maybe add scrolls which make the random artifact versions (eg, armour
826 * of gnarg and what not?) 842 * of gnarg and what not?)
827 */ 843 */
828 if (armour->title) 844 if (armour->title)
829 { 845 {
830 new_draw_info (NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 846 op->failmsg ("This armour will not accept further enchantment.");
831 return 0; 847 return 0;
832 } 848 }
833 849
834 /* Split objects if needed. Can't insert tmp until the 850 /* Split objects if needed. Can't insert tmp until the
835 * end of this function - otherwise it will just re-merge. 851 * end of this function - otherwise it will just re-merge.
… …
850 { 866 {
851 base = base - (base * settings.armor_speed_improvement) / 100; 867 base = base - (base * settings.armor_speed_improvement) / 100;
852 pow++; 868 pow++;
853 } 869 }
854 870
855 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 871 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
856 } 872 }
857 else 873 else
858 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100; 874 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
859 875
860 if (!settings.armor_weight_linear) 876 if (!settings.armor_weight_linear)
861 { 877 {
862 int base = 100; 878 int base = 100;
863 int pow = 0; 879 int pow = 0;
… …
866 { 882 {
867 base = base - (base * settings.armor_weight_reduction) / 100; 883 base = base - (base * settings.armor_weight_reduction) / 100;
868 pow++; 884 pow++;
869 } 885 }
870 886
871 armour->weight = (armour->arch->clone.weight * base) / 100; 887 armour->weight = (armour->arch->weight * base) / 100;
872 } 888 }
873 else 889 else
874 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100; 890 armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
875 891
876 if (armour->weight <= 0) 892 if (armour->weight <= 0)
877 { 893 {
878 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 894 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
879 armour->weight = 1; 895 armour->weight = 1;
880 } 896 }
881 897
882 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic); 898 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
883 899
884 if (op->type == PLAYER) 900 if (op->type == PLAYER)
885 { 901 {
886 esrv_send_item (op, armour); 902 esrv_send_item (op, armour);
887 if (QUERY_FLAG (armour, FLAG_APPLIED)) 903 if (QUERY_FLAG (armour, FLAG_APPLIED))
888 fix_player (op); 904 op->update_stats ();
889 } 905 }
906
890 decrease_ob (improver); 907 decrease_ob (improver);
908
891 if (tmp) 909 if (tmp)
892 { 910 {
893 insert_ob_in_ob (tmp, op); 911 insert_ob_in_ob (tmp, op);
894 esrv_send_item (op, tmp); 912 esrv_send_item (op, tmp);
895 } 913 }
914
896 return 1; 915 return 1;
897} 916}
898
899 917
900/* 918/*
901 * convert_item() returns 1 if anything was converted, 0 if the item was not 919 * convert_item() returns 1 if anything was converted, 0 if the item was not
902 * what the converter wants, -1 if the converter is broken. 920 * what the converter wants, -1 if the converter is broken.
903 */ 921 */
… …
919 937
920 /* We make some assumptions - we assume if it takes money as it type, 938 /* We make some assumptions - we assume if it takes money as it type,
921 * it wants some amount. We don't make change (ie, if something costs 939 * it wants some amount. We don't make change (ie, if something costs
922 * 3 gp and player drops a platinum, tough luck) 940 * 3 gp and player drops a platinum, tough luck)
923 */ 941 */
924 if (!strcmp (CONV_FROM (converter), "money")) 942 if (CONV_FROM (converter) == shstr_money)
925 { 943 {
926 int cost;
927
928 if (item->type != MONEY) 944 if (item->type != MONEY)
929 return 0; 945 return 0;
930 946
931 nr = (item->nrof * item->value) / CONV_NEED (converter); 947 nr = (item->nrof * item->value) / CONV_NEED (converter);
932 if (!nr) 948 if (!nr)
933 return 0; 949 return 0;
950
951 converter->play_sound (sound_find ("shop_buy"));
952
934 cost = nr * CONV_NEED (converter) / item->value; 953 int cost = nr * CONV_NEED (converter) / item->value;
935 /* take into account rounding errors */ 954 /* take into account rounding errors */
936 if (nr * CONV_NEED (converter) % item->value) 955 if (nr * CONV_NEED (converter) % item->value)
937 cost++; 956 cost++;
957
938 decrease_ob_nr (item, cost); 958 decrease_ob_nr (item, cost);
939 959
940 price_in = cost * item->value; 960 price_in = cost * item->value;
941 } 961 }
942 else 962 else
943 { 963 {
944 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 964 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
945 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 965 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
946 return 0; 966 return 0;
967
968 converter->play_sound (sound_find ("convert_item"));
947 969
948 if (CONV_NEED (converter)) 970 if (CONV_NEED (converter))
949 { 971 {
950 nr = item->nrof / CONV_NEED (converter); 972 nr = item->nrof / CONV_NEED (converter);
951 decrease_ob_nr (item, nr * CONV_NEED (converter)); 973 decrease_ob_nr (item, nr * CONV_NEED (converter));
… …
956 price_in = item->value; 978 price_in = item->value;
957 item->destroy (); 979 item->destroy ();
958 } 980 }
959 } 981 }
960 982
961 if (converter->inv != NULL) 983 if (converter->inv)
962 { 984 {
963 object *ob; 985 object *ob;
964 int i; 986 int i;
965 object *ob_to_copy; 987 object *ob_to_copy;
966 988
967 /* select random object from inventory to copy */ 989 /* select random object from inventory to copy */
968 ob_to_copy = converter->inv; 990 ob_to_copy = converter->inv;
969 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) 991 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
970 {
971 if (rndm (0, i) == 0) 992 if (rndm (0, i) == 0)
972 {
973 ob_to_copy = ob; 993 ob_to_copy = ob;
974 } 994
975 }
976 item = object_create_clone (ob_to_copy); 995 item = object_create_clone (ob_to_copy);
977 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 996 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
978 unflag_inv (item, FLAG_IS_A_TEMPLATE); 997 unflag_inv (item, FLAG_IS_A_TEMPLATE);
979 } 998 }
980 else 999 else
981 { 1000 {
982 if (converter->other_arch == NULL) 1001 if (converter->other_arch == NULL)
983 { 1002 {
984 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 1003 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
985 &converter->name, converter->map->path, converter->x, converter->y); 1004 &converter->name, &converter->map->path, converter->x, converter->y);
986 return -1; 1005 return -1;
987 } 1006 }
988 1007
989 item = object_create_arch (converter->other_arch); 1008 item = object_create_arch (converter->other_arch);
990 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 1009 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
991 } 1010 }
992 1011
993 if (CONV_NR (converter)) 1012 if (CONV_NR (converter))
994 item->nrof = CONV_NR (converter); 1013 item->nrof = CONV_NR (converter);
1014
995 if (nr) 1015 if (nr)
996 item->nrof *= nr; 1016 item->nrof *= nr;
1017
997 if (is_in_shop (converter)) 1018 if (is_in_shop (converter))
998 SET_FLAG (item, FLAG_UNPAID); 1019 SET_FLAG (item, FLAG_UNPAID);
999 else if (price_in < item->nrof * item->value) 1020 else if (price_in < item->nrof * item->value)
1000 { 1021 {
1001 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1022 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1002 &converter->name, converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1023 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1003
1004 /** 1024 /**
1005 * elmex: we are going to let the game continue, as the mapcreator 1025 * elmex: we are going to let the game continue, as the mapcreator
1006 * propably had something in mind when doing this 1026 * hopefully had something in mind when doing this.
1007 */ 1027 */
1008 } 1028 }
1029
1030 SET_FLAG (item, FLAG_IDENTIFIED);
1009 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1031 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1010 return 1; 1032 return 1;
1011} 1033}
1012 1034
1013/** 1035/**
1014 * Handle apply on containers. 1036 * Handle apply on containers.
1015 * By Eneq(@csd.uu.se). 1037 * By Eneq(@csd.uu.se).
1016 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1038 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1017 * added the alchemical cauldron to the code -b.t. 1039 * added the alchemical cauldron to the code -b.t.
1018 */ 1040 */
1019
1020int 1041int
1021apply_container (object *op, object *sack) 1042apply_container (object *op, object *sack)
1022{ 1043{
1023 char buf[MAX_BUF]; 1044 if (op->type != PLAYER || !op->contr->ns)
1024 object *tmp;
1025
1026 if (op->type != PLAYER)
1027 return 0; /* This might change */ 1045 return 0; /* This might change */
1028 1046
1029 if (sack == NULL || sack->type != CONTAINER) 1047 if (!sack || sack->type != CONTAINER)
1030 { 1048 {
1031 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1049 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1032 return 0; 1050 return 0;
1033 } 1051 }
1034 op->contr->last_used = NULL; 1052
1035 op->contr->last_used_id = 0; 1053 op->contr->last_used = 0;
1036 1054
1037 if (sack->env != op) 1055 if (sack->env && sack->env != op)
1056 {
1057 op->failmsg ("You must put it onto the floor or into your inventory first.");
1058 return 1;
1038 { 1059 }
1039 if (sack->other_arch == NULL || sack->env != NULL) 1060
1061 // already applied == open on ground, or open in inv, or active in inv
1062 if (sack->flag [FLAG_APPLIED])
1063 {
1064 if (op->container == sack)
1040 { 1065 {
1041 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1066 // open on ground or inv, so close
1067 op->close_container ();
1042 return 1; 1068 return 1;
1043 } 1069 }
1044 /* It's on the ground, the problems begin */ 1070 else if (!sack->env)
1045 if (op->container != sack)
1046 {
1047 /* it's closed OR some player has opened it */
1048 if (QUERY_FLAG (sack, FLAG_APPLIED))
1049 {
1050 for (tmp = get_map_ob (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above);
1051 if (tmp)
1052 {
1053 /* some other player have opened it */
1054 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1055 return 1;
1056 }
1057 }
1058 } 1071 {
1059 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1072 // active, but not ours: some other player has opened it
1073 op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
1074 return 1;
1060 { 1075 }
1061 if (op->container == NULL)
1062 {
1063 tmp = arch_to_object (sack->other_arch);
1064 /* not good, but insert_ob_in_ob() is too smart */
1065 CLEAR_FLAG (tmp, FLAG_REMOVED);
1066 tmp->x = tmp->y = 0;
1067 tmp->map = NULL;
1068 tmp->env = sack;
1069 if (sack->inv)
1070 sack->inv->above = tmp;
1071 tmp->below = sack->inv;
1072 tmp->above = NULL;
1073 sack->inv = tmp;
1074 sack->move_off = MOVE_ALL; /* trying force closing it */
1075 }
1076 else
1077 {
1078 sack->move_off = 0;
1079 tmp = sack->inv;
1080 1076
1081 if (tmp && tmp->type == CLOSE_CON) 1077 // fall through to opening it (active in inv)
1082 tmp->destroy ();
1083 }
1084 }
1085 }
1086
1087 if (QUERY_FLAG (sack, FLAG_APPLIED))
1088 { 1078 }
1079 else if (sack->env)
1080 {
1081 // it is in our env, so activate it, do not open yet
1089 if (op->container) 1082 op->close_container ();
1090 { 1083 sack->flag [FLAG_APPLIED] = 1;
1091 if (op->container != sack) 1084 esrv_update_item (UPD_FLAGS, op, sack);
1092 { 1085 op->statusmsg (format ("You ready %s.", query_name (sack)));
1093 tmp = op->container; 1086 return 1;
1094 apply_container (op, tmp); 1087 }
1095 sprintf (buf, "You close %s and open ", query_name (tmp)); 1088
1096 op->container = sack; 1089 // it's locked?
1097 strcat (buf, query_name (sack)); 1090 if (sack->slaying)
1098 strcat (buf, "."); 1091 {
1099 } 1092 if (object *tmp = find_key (op, op, sack))
1100 else 1093 op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
1101 {
1102 CLEAR_FLAG (sack, FLAG_APPLIED);
1103 op->container = NULL;
1104 sprintf (buf, "You close %s.", query_name (sack));
1105 }
1106 }
1107 else 1094 else
1108 { 1095 {
1109 CLEAR_FLAG (sack, FLAG_APPLIED);
1110 sprintf (buf, "You open %s.", query_name (sack));
1111 SET_FLAG (sack, FLAG_APPLIED);
1112 op->container = sack;
1113 }
1114 }
1115 else
1116 { /* not applied */
1117 if (sack->slaying)
1118 { /* it's locked */
1119 tmp = find_key (op, op, sack);
1120 if (tmp)
1121 {
1122 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1123 SET_FLAG (sack, FLAG_APPLIED);
1124 if (sack->env == NULL)
1125 { /* if it's on ground,open it also */
1126 new_draw_info (NDI_UNIQUE, 0, op, buf);
1127 apply_container (op, sack);
1128 return 1;
1129 }
1130 }
1131 else
1132 {
1133 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1096 op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
1134 }
1135 }
1136 else
1137 {
1138 sprintf (buf, "You readied %s.", query_name (sack));
1139 SET_FLAG (sack, FLAG_APPLIED);
1140 if (sack->env == NULL)
1141 { /* if it's on ground,open it also */
1142 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 apply_container (op, sack);
1144 return 1; 1097 return 1;
1145 } 1098 }
1146 }
1147 } 1099 }
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1100
1149 if (op->contr) 1101 op->open_container (sack);
1150 op->contr->socket.update_look = 1; 1102
1151 return 1; 1103 return 1;
1152} 1104}
1153
1154/**
1155 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1156 * the player has in their inventory, eg, sacks, luggages, etc.
1157 *
1158 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1159 * This version is for client/server mode.
1160 * op is the player, sack is the container the player is opening or closing.
1161 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1162 *
1163 * Reminder - there are three states for any container - closed (non applied),
1164 * applied (not open, but objects that match get tossed into it), and open
1165 * (applied flag set, and op->container points to the open container)
1166 */
1167
1168int
1169esrv_apply_container (object *op, object *sack)
1170{
1171 object *tmp = op->container;
1172
1173 if (op->type != PLAYER)
1174 return 0; /* This might change */
1175
1176 if (sack == NULL || sack->type != CONTAINER)
1177 {
1178 LOG (llevError, "esrv_apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1179 return 0;
1180 }
1181
1182 /* If we have a currently open container, then it needs to be closed in all cases
1183 * if we are opening this one up. We then fall through if appropriate for
1184 * openening the new container.
1185 */
1186
1187 if (op->container && QUERY_FLAG (sack, FLAG_APPLIED))
1188 {
1189 if (op->container->env != op)
1190 { /* if container is on the ground */
1191 op->container->move_off = 0;
1192 }
1193
1194 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1195 return 1;
1196
1197 new_draw_info_format (NDI_UNIQUE, 0, op, "You close %s.", query_name (op->container));
1198 CLEAR_FLAG (op->container, FLAG_APPLIED);
1199 op->container = NULL;
1200 esrv_update_item (UPD_FLAGS, op, tmp);
1201 if (tmp == sack)
1202 return 1;
1203 }
1204
1205
1206 /* If the player is trying to open it (which he must be doing if we got here),
1207 * and it is locked, check to see if player has the equipment to open it.
1208 */
1209
1210 if (sack->slaying)
1211 { /* it's locked */
1212 tmp = find_key (op, op, sack);
1213 if (tmp)
1214 {
1215 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1216 }
1217 else
1218 {
1219 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1220 return 0;
1221 }
1222 }
1223
1224 /* By the time we get here, we have made sure any other container has been closed and
1225 * if this is a locked container, the player they key to open it.
1226 */
1227
1228 /* There are really two cases - the sack is either on the ground, or the sack is
1229 * part of the players inventory. If on the ground, we assume that the player is
1230 * opening it, since if it was being closed, that would have been taken care of above.
1231 */
1232
1233
1234 if (sack->env != op)
1235 {
1236 /* Hypothetical case - the player is trying to open a sack that belong to someone
1237 * else. This normally should not happen, but a misbehaving client/player could
1238 * try to do it, so lets handle it gracefully.
1239 */
1240 if (sack->env)
1241 {
1242 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't open %s", query_name (sack));
1243 return 0;
1244 }
1245 /* set these so when the player walks off, we can unapply the sack */
1246 sack->move_off = MOVE_ALL; /* trying force closing it */
1247
1248 CLEAR_FLAG (sack, FLAG_APPLIED);
1249 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1250 SET_FLAG (sack, FLAG_APPLIED);
1251 op->container = sack;
1252 esrv_update_item (UPD_FLAGS, op, sack);
1253 esrv_send_inventory (op, sack);
1254
1255 }
1256 else
1257 { /* sack is in players inventory */
1258 if (QUERY_FLAG (sack, FLAG_APPLIED))
1259 { /* readied sack becoming open */
1260 CLEAR_FLAG (sack, FLAG_APPLIED);
1261 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1262 SET_FLAG (sack, FLAG_APPLIED);
1263 op->container = sack;
1264 esrv_update_item (UPD_FLAGS, op, sack);
1265 esrv_send_inventory (op, sack);
1266 }
1267 else
1268 {
1269 CLEAR_FLAG (sack, FLAG_APPLIED);
1270 new_draw_info_format (NDI_UNIQUE, 0, op, "You readied %s.", query_name (sack));
1271 SET_FLAG (sack, FLAG_APPLIED);
1272 esrv_update_item (UPD_FLAGS, op, sack);
1273 }
1274 }
1275 return 1;
1276}
1277
1278 1105
1279/** 1106/**
1280 * Handles dropping things on altar. 1107 * Handles dropping things on altar.
1281 * Returns true if sacrifice was accepted. 1108 * Returns true if sacrifice was accepted.
1282 */ 1109 */
… …
1293 * with an altar. We call it a Potion - altars are stationary - it 1120 * with an altar. We call it a Potion - altars are stationary - it
1294 * is up to map designers to use them properly. 1121 * is up to map designers to use them properly.
1295 */ 1122 */
1296 if (altar->inv && altar->inv->type == SPELL) 1123 if (altar->inv && altar->inv->type == SPELL)
1297 { 1124 {
1298 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name); 1125 originator->statusmsg (format ("The altar casts %s.", &altar->inv->name));
1299 cast_spell (originator, altar, 0, altar->inv, NULL); 1126 cast_spell (originator, altar, 0, altar->inv, NULL);
1300 /* If it is connected, push the button. Fixes some problems with 1127 /* If it is connected, push the button. Fixes some problems with
1301 * old maps. 1128 * old maps.
1302 */ 1129 */
1303 1130
1304/* push_button (altar);*/ 1131/* push_button (altar);*/
1305 } 1132 }
… …
1329 double opinion; 1156 double opinion;
1330 object *tmp, *next; 1157 object *tmp, *next;
1331 1158
1332 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1159 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1333 1160
1161 bool has_unpaid = false;
1162
1163 // quite inefficient to do this here twice, but the api doesn'T lend itself to
1164 // a quick and small change :(
1165 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1166 if (item->flag [FLAG_UNPAID])
1167 {
1168 has_unpaid = true;
1169 break;
1170 }
1171
1334 if (op->type != PLAYER) 1172 if (op->type != PLAYER)
1335 { 1173 {
1336 /* Remove all the unpaid objects that may be carried here. 1174 /* Remove all the unpaid objects that may be carried here.
1337 * This could be pets or monsters that are somehow in 1175 * This could be pets or monsters that are somehow in
1338 * the shop. 1176 * the shop.
… …
1364 /* unpaid objects, or non living objects, can't transfer by 1202 /* unpaid objects, or non living objects, can't transfer by
1365 * shop mats. Instead, put it on a nearby space. 1203 * shop mats. Instead, put it on a nearby space.
1366 */ 1204 */
1367 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1205 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1368 { 1206 {
1369
1370 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1207 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1371 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1208 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1372 1209
1373 if (i != -1) 1210 if (i != -1)
1374 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1211 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
… …
1383 else if (can_pay (op) && get_payment (op)) 1220 else if (can_pay (op) && get_payment (op))
1384 { 1221 {
1385 /* this is only used for players */ 1222 /* this is only used for players */
1386 rv = teleport (shop_mat, SHOP_MAT, op); 1223 rv = teleport (shop_mat, SHOP_MAT, op);
1387 1224
1225 if (has_unpaid)
1226 op->contr->play_sound (sound_find ("shop_buy"));
1227 else if (is_in_shop (op))
1228 op->contr->play_sound (sound_find ("shop_enter"));
1229 else
1230 op->contr->play_sound (sound_find ("shop_leave"));
1231
1388 if (shop_mat->msg) 1232 if (shop_mat->msg)
1389 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1233 op->statusmsg (shop_mat->msg);
1390 /* This check below is a bit simplistic - generally it should be correct, 1234 /* This check below is a bit simplistic - generally it should be correct,
1391 * but there is never a guarantee that the bottom space on the map is 1235 * but there is never a guarantee that the bottom space on the map is
1392 * actually the shop floor. 1236 * actually the shop floor.
1393 */ 1237 */
1394 else if (!rv && !is_in_shop (op)) 1238 else if (!rv && !is_in_shop (op))
1395 { 1239 {
1396 opinion = shopkeeper_approval (op->map, op); 1240 opinion = shopkeeper_approval (op->map, op);
1397 1241
1398 if (opinion > 0.9) 1242 op->statusmsg (
1399 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1243 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
1400 else if (opinion > 0.75) 1244 : opinion >= 0.75 ? "The shopkeeper waves to you."
1401 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1245 : opinion >= 0.50 ? "The shopkeeper ignores you."
1402 else if (opinion > 0.5) 1246 : "The shopkeeper glares at you with contempt."
1403 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1404 else 1247 );
1405 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1406 } 1248 }
1407 } 1249 }
1408 else 1250 else
1409 { 1251 {
1410 /* if we get here, a player tried to leave a shop but was not able 1252 /* if we get here, a player tried to leave a shop but was not able
1411 * to afford the items he has. We try to move the player so that 1253 * to afford the items he has. We try to move the player so that
1412 * they are not on the mat anymore 1254 * they are not on the mat anymore
1413 */ 1255 */
1414 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1256 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1415 1257
1416 if (i == -1) 1258 if (i == -1)
1417 {
1418 LOG (llevError, "Internal shop-mat problem.\n"); 1259 LOG (llevError, "Internal shop-mat problem.\n");
1419 }
1420 else 1260 else
1421 { 1261 {
1422 op->remove (); 1262 op->remove ();
1423 op->x += freearr_x[i]; 1263 op->x += freearr_x[i];
1424 op->y += freearr_y[i]; 1264 op->y += freearr_y[i];
… …
1435 */ 1275 */
1436static void 1276static void
1437apply_sign (object *op, object *sign, int autoapply) 1277apply_sign (object *op, object *sign, int autoapply)
1438{ 1278{
1439 readable_message_type *msgType; 1279 readable_message_type *msgType;
1440 char newbuf[HUGE_BUF];
1441 1280
1442 if (sign->msg == NULL) 1281 if (!sign->msg)
1443 { 1282 {
1444 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1283 op->statusmsg ("Nothing is written on it.");
1445 return; 1284 return;
1446 } 1285 }
1447 1286
1448 if (sign->stats.food) 1287 if (sign->stats.food)
1449 { 1288 {
1450 if (sign->last_eat >= sign->stats.food) 1289 if (sign->last_eat >= sign->stats.food)
1451 { 1290 {
1452 if (!sign->move_on) 1291 if (!sign->move_on)
1453 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1292 op->statusmsg ("You cannot read it anymore.");
1293
1454 return; 1294 return;
1455 } 1295 }
1456 1296
1457 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1297 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1458 sign->last_eat++; 1298 sign->last_eat++;
… …
1463 * move_on is zero, it needs to be manually applied (doesn't talk 1303 * move_on is zero, it needs to be manually applied (doesn't talk
1464 * to us). 1304 * to us).
1465 */ 1305 */
1466 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1306 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1467 { 1307 {
1468 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1308 op->failmsg ("You are unable to read while blind!");
1469 return; 1309 return;
1470 } 1310 }
1311
1312 if (op->contr)
1313 if (client *ns = op->contr->ns)
1314 {
1315 ns->play_sound (sign->sound);
1471 msgType = get_readable_message_type (sign); 1316 msgType = get_readable_message_type (sign);
1317
1318 if (ns->can_msg)
1319 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg);
1320 else
1321 {
1322 char newbuf[HUGE_BUF];
1472 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1323 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1473 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1324 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1325 }
1326 }
1474} 1327}
1475 1328
1476/** 1329/**
1477 * 'victim' moves onto 'trap' 1330 * 'victim' moves onto 'trap'
1478 * 'victim' leaves 'trap' 1331 * 'victim' leaves 'trap'
… …
1501 * proper. This code was causing needless crashes. 1354 * proper. This code was causing needless crashes.
1502 */ 1355 */
1503 if (recursion_depth >= 500) 1356 if (recursion_depth >= 500)
1504 { 1357 {
1505 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1358 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1506 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1359 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1507 return; 1360 return;
1508 } 1361 }
1362
1509 recursion_depth++; 1363 recursion_depth++;
1510 if (trap->head) 1364 if (trap->head)
1511 trap = trap->head; 1365 trap = trap->head;
1512 1366
1513 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1367 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1528 1382
1529 /* Just put in some sanity check. I think there is a bug in the 1383 /* Just put in some sanity check. I think there is a bug in the
1530 * above with some objects have zero speed, and thus the player 1384 * above with some objects have zero speed, and thus the player
1531 * getting permanently paralyzed. 1385 * getting permanently paralyzed.
1532 */ 1386 */
1533 if (victim->speed_left < -50.0) 1387 if (victim->speed_left < -50.f)
1534 victim->speed_left = -50.0; 1388 victim->speed_left = -50.f;
1535 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */ 1389 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1536 } 1390 }
1537 goto leave; 1391 goto leave;
1538 1392
1539 case SPINNER: 1393 case SPINNER:
… …
1611 1465
1612 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1466 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1613 { 1467 {
1614 if (!sound_was_played) 1468 if (!sound_was_played)
1615 { 1469 {
1616 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1470 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1617 sound_was_played = 1; 1471 sound_was_played = 1;
1618 } 1472 }
1619 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1473
1474 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1620 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1475 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1621 } 1476 }
1622 } 1477 }
1623 goto leave; 1478 goto leave;
1624 } 1479 }
1625 1480
1626
1627 case CONVERTER: 1481 case CONVERTER:
1628 if (convert_item (victim, trap) < 0) 1482 if (convert_item (victim, trap) < 0)
1629 { 1483 {
1630 object *op; 1484 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1631 1485 get_archetype ("burnout")->insert_at (trap, trap);
1632 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1633
1634 op = get_archetype ("burnout");
1635 if (op != NULL)
1636 {
1637 op->x = trap->x;
1638 op->y = trap->y;
1639 insert_ob_in_map (op, trap->map, trap, 0);
1640 }
1641 } 1486 }
1487
1642 goto leave; 1488 goto leave;
1643 1489
1644 case TRIGGER_BUTTON: 1490 case TRIGGER_BUTTON:
1645 case TRIGGER_PEDESTAL: 1491 case TRIGGER_PEDESTAL:
1646 case TRIGGER_ALTAR: 1492 case TRIGGER_ALTAR:
… …
1664 * Processing will happen if the head runs into the pit 1510 * Processing will happen if the head runs into the pit
1665 */ 1511 */
1666 if (victim->head) 1512 if (victim->head)
1667 goto leave; 1513 goto leave;
1668 1514
1669 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1515 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1670 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n"); 1516 victim->statusmsg ("You fall through the hole!", NDI_RED);
1671 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1517 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1672 goto leave; 1518 goto leave;
1673 1519
1674 case EXIT: 1520 case EXIT:
1675 if (victim->type == PLAYER && EXIT_PATH (trap)) 1521 if (victim->type == PLAYER && EXIT_PATH (trap))
1676 { 1522 {
1677 /* Basically, don't show exits leading to random maps the 1523 /* Basically, don't show exits leading to random maps the
1678 * players output. 1524 * players output.
1679 */ 1525 */
1680 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1526 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1681 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1527 victim->statusmsg (trap->msg, NDI_NAVY);
1528
1682 enter_exit (victim, trap); 1529 victim->enter_exit (trap);
1683 } 1530 }
1684 goto leave; 1531 goto leave;
1685 1532
1686 case ENCOUNTER: 1533 case ENCOUNTER:
1687 /* may be some leftovers on this */ 1534 /* may be some leftovers on this */
… …
1702 1549
1703 apply_sign (victim, trap, 1); 1550 apply_sign (victim, trap, 1);
1704 goto leave; 1551 goto leave;
1705 1552
1706 case CONTAINER: 1553 case CONTAINER:
1707 if (victim->type == PLAYER)
1708 (void) esrv_apply_container (victim, trap);
1709 else
1710 (void) apply_container (victim, trap); 1554 apply_container (victim, trap);
1711 goto leave; 1555 goto leave;
1712 1556
1713 case RUNE: 1557 case RUNE:
1714 case TRAP: 1558 case TRAP:
1715 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1559 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1716 {
1717 spring_trap (trap, victim); 1560 spring_trap (trap, victim);
1718 }
1719 goto leave; 1561 goto leave;
1720 1562
1721 default: 1563 default:
1722 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1564 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1723 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1565 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1724 goto leave; 1566 goto leave;
1725 } 1567 }
1726 1568
1727leave: 1569leave:
1728 recursion_depth--; 1570 recursion_depth--;
… …
1737 int lev_diff; 1579 int lev_diff;
1738 object *skill_ob; 1580 object *skill_ob;
1739 1581
1740 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1582 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1741 { 1583 {
1742 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1584 op->failmsg ("You are unable to read while blind!");
1743 return; 1585 return;
1744 } 1586 }
1587
1745 if (tmp->msg == NULL) 1588 if (!tmp->msg)
1746 { 1589 {
1747 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1590 op->failmsg (format ("You open the %s and find it empty.", &tmp->name));
1748 return; 1591 return;
1749 } 1592 }
1750 1593
1751 /* need a literacy skill to read stuff! */ 1594 /* need a literacy skill to read stuff! */
1752 skill_ob = find_skill_by_name (op, tmp->skill); 1595 skill_ob = find_skill_by_name (op, tmp->skill);
1753 if (!skill_ob) 1596 if (!skill_ob)
1754 { 1597 {
1755 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1598 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
1756 return; 1599 return;
1757 } 1600 }
1601
1758 lev_diff = tmp->level - (skill_ob->level + 5); 1602 lev_diff = tmp->level - (skill_ob->level + 5);
1759 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1603 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1760 { 1604 {
1761 if (lev_diff < 2) 1605 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1762 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1606 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1763 else if (lev_diff < 3) 1607 : lev_diff < 5 ? "This book is beyond your comprehension."
1764 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension."); 1608 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1765 else if (lev_diff < 5) 1609 : lev_diff < 15 ? "This book is way beyond your comprehension."
1766 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension."); 1610 : "This book is totally beyond your comprehension.");
1767 else if (lev_diff < 8) 1611 return;
1768 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension."); 1612 }
1769 else if (lev_diff < 15) 1613
1770 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension."); 1614 readable_message_type *msgType = get_readable_message_type (tmp);
1615
1616 if (player *pl = op->contr)
1617 if (client *ns = pl->ns)
1618 if (ns->can_msg)
1619 {
1620 dynbuf_text buf;
1621 buf << long_desc (tmp, op)
1622 << "\n\n"
1623 << tmp->msg
1624 << '\0';
1625 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1626 }
1771 else 1627 else
1772 new_draw_info (NDI_UNIQUE, 0, op, "This book is totally beyond your comprehension.");
1773 return;
1774 }
1775
1776 readable_message_type *msgType = get_readable_message_type (tmp);
1777
1778 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1628 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1779 msgType->message_type, msgType->message_subtype, 1629 msgType->message_type, msgType->message_subtype,
1780 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1630 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1631 long_desc (tmp, op), &tmp->msg);
1781 1632
1782 /* gain xp from reading */ 1633 /* gain xp from reading */
1783 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1634 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1784 { /* only if not read before */ 1635 { /* only if not read before */
1785 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1636 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
1786 1637
1787 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1638 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1788 { 1639 {
1789 /*exp_gain *= 2; because they just identified it too */ 1640 /*exp_gain *= 2; because they just identified it too */
1790 SET_FLAG (tmp, FLAG_IDENTIFIED); 1641 SET_FLAG (tmp, FLAG_IDENTIFIED);
1642
1791 /* If in a container, update how it looks */ 1643 /* If in a container, update how it looks */
1792 if (tmp->env) 1644 if (tmp->env)
1793 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1645 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1794 else 1646 else
1795 op->contr->socket.update_look = 1; 1647 op->contr->ns->floorbox_update ();
1796 } 1648 }
1649
1797 change_exp (op, exp_gain, skill_ob->skill, 0); 1650 change_exp (op, exp_gain, skill_ob->skill, 0);
1798 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1651 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1799 } 1652 }
1800} 1653}
1801 1654
… …
1804 * op is the person learning the skill, tmp is the skill scroll object 1657 * op is the person learning the skill, tmp is the skill scroll object
1805 */ 1658 */
1806static void 1659static void
1807apply_skillscroll (object *op, object *tmp) 1660apply_skillscroll (object *op, object *tmp)
1808{ 1661{
1809 switch ((int) learn_skill (op, tmp)) 1662 switch (learn_skill (op, tmp))
1810 { 1663 {
1811 case 0: 1664 case 0:
1812 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge "); 1665 op->play_sound (sound_find ("generic_fail"));
1813 new_draw_info_format (NDI_UNIQUE, 0, op, "held within the %s.\n", query_name (tmp)); 1666 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1814 return; 1667 break;
1815 1668
1816 case 1: 1669 case 1:
1817 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1818 decrease_ob (tmp); 1670 decrease_ob (tmp);
1671 op->play_sound (sound_find ("skill_learn"));
1672 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1819 return; 1673 break;
1820 1674
1821 default: 1675 default:
1822 new_draw_info_format (NDI_UNIQUE, 0, op, "You fail to learn the knowledge of the %s.\n", query_name (tmp));
1823 decrease_ob (tmp); 1676 decrease_ob (tmp);
1677 op->play_sound (sound_find ("generic_fail"));
1678 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1824 return; 1679 break;
1825 } 1680 }
1826} 1681}
1827 1682
1828/** 1683/**
1829 * Actually makes op learn spell. 1684 * Actually makes op learn spell.
… …
1849 return; 1704 return;
1850 } 1705 }
1851 return; 1706 return;
1852 } 1707 }
1853 1708
1854 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1709 op->contr->play_sound (sound_find ("learn_spell"));
1855 tmp = object::create (); 1710
1856 spell->copy_to (tmp); 1711 tmp = spell->clone ();
1857 insert_ob_in_ob (tmp, op); 1712 insert_ob_in_ob (tmp, op);
1858 1713
1859 if (special_prayer) 1714 if (special_prayer)
1860 {
1861 SET_FLAG (tmp, FLAG_STARTEQUIP); 1715 SET_FLAG (tmp, FLAG_STARTEQUIP);
1862 }
1863 1716
1864 esrv_add_spells (op->contr, tmp); 1717 esrv_add_spells (op->contr, tmp);
1865} 1718}
1866 1719
1867/** 1720/**
… …
1881 { 1734 {
1882 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1735 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1883 return; 1736 return;
1884 } 1737 }
1885 1738
1886 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1739 op->failmsg (format ("You lose knowledge of %s.", spell));
1887 player_unready_range_ob (op->contr, spob); 1740 player_unready_range_ob (op->contr, spob);
1888 esrv_remove_spell (op->contr, spob); 1741 esrv_remove_spell (op->contr, spob);
1889 spob->destroy (); 1742 spob->destroy ();
1890} 1743}
1891 1744
… …
1899{ 1752{
1900 object *skop, *spell, *spell_skill; 1753 object *skop, *spell, *spell_skill;
1901 1754
1902 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1755 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1903 { 1756 {
1904 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1757 op->failmsg ("You are unable to read while blind.");
1905 return; 1758 return;
1906 } 1759 }
1907 1760
1908 /* artifact_spellbooks have 'slaying' field point to a spell name, 1761 /* artifact_spellbooks have 'slaying' field point to a spell name,
1909 * instead of having their spell stored in stats.sp. These are 1762 * instead of having their spell stored in stats.sp. These are
1910 * legacy spellbooks 1763 * legacy spellbooks
1911 */ 1764 */
1912
1913 if (tmp->slaying != NULL) 1765 if (tmp->slaying)
1914 { 1766 {
1915 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1767 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1916 if (!spell) 1768 if (!spell)
1917 { 1769 {
1918 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1770 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1919 return; 1771 return;
1920 } 1772 }
1921 else 1773 else
1922 insert_ob_in_ob (spell, tmp); 1774 insert_ob_in_ob (spell, tmp);
1775
1923 tmp->slaying = NULL; 1776 tmp->slaying = 0;
1924 } 1777 }
1925 1778
1926 skop = find_skill_by_name (op, tmp->skill); 1779 skop = find_skill_by_name (op, tmp->skill);
1927 1780
1928 /* need a literacy skill to learn spells. Also, having a literacy level 1781 /* need a literacy skill to learn spells. Also, having a literacy level
1929 * lower than the spell will make learning the spell more difficult */ 1782 * lower than the spell will make learning the spell more difficult */
1930 if (!skop) 1783 if (!skop)
1931 { 1784 {
1932 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1785 op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
1933 return; 1786 return;
1934 } 1787 }
1935 1788
1936 spell = tmp->inv; 1789 spell = tmp->inv;
1937 1790
1938 if (!spell) 1791 if (!spell)
1939 { 1792 {
1940 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1793 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1941 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1794 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1942 return; 1795 return;
1943 } 1796 }
1944 1797
1945 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1798 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1946 { 1799 {
1947 new_draw_info (NDI_UNIQUE, 0, op, "It is too hard to read at your level: You are unable to decipher the strange symbols."); 1800 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
1948 return; 1801 return;
1949 } 1802 }
1950 1803
1951 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1804 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1952 1805
1953 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1806 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1954 { 1807 {
1955 identify (tmp); 1808 identify (tmp);
1809
1956 if (tmp->env) 1810 if (tmp->env)
1957 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1811 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1958 else 1812 else
1959 op->contr->socket.update_look = 1; 1813 op->contr->ns->floorbox_update ();
1960 } 1814 }
1961 1815
1962 /* I removed the check for special_prayer_mark here - it didn't make 1816 /* I removed the check for special_prayer_mark here - it didn't make
1963 * a lot of sense - special prayers are not found in spellbooks, and 1817 * a lot of sense - special prayers are not found in spellbooks, and
1964 * if the player doesn't know the spell, doesn't make a lot of sense that 1818 * if the player doesn't know the spell, doesn't make a lot of sense that
1965 * they would have a special prayer mark. 1819 * they would have a special prayer mark.
1966 */ 1820 */
1967 if (check_spell_known (op, spell->name)) 1821 if (check_spell_known (op, spell->name))
1968 { 1822 {
1969 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1823 op->statusmsg ("You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1970 return; 1824 return;
1971 } 1825 }
1972 1826
1973 if (spell->skill) 1827 if (spell->skill)
1974 { 1828 {
1975 spell_skill = find_skill_by_name (op, spell->skill); 1829 spell_skill = find_skill_by_name (op, spell->skill);
1976 1830
1977 if (!spell_skill) 1831 if (!spell_skill)
1978 { 1832 {
1979 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1833 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
1980 return; 1834 return;
1981 } 1835 }
1982 1836
1983 if (spell_skill->level < spell->level) 1837 if (spell_skill->level < spell->level)
1984 { 1838 {
1985 new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill); 1839 op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
1986 return; 1840 return;
1987 } 1841 }
1988 } 1842 }
1989 1843
1990 /* Logic as follows 1844 /* Logic as follows
… …
1999 * Overall, chances are the same but a player will find having a high 1853 * Overall, chances are the same but a player will find having a high
2000 * literacy rate very useful! -b.t. 1854 * literacy rate very useful! -b.t.
2001 */ 1855 */
2002 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1856 if (QUERY_FLAG (op, FLAG_CONFUSED))
2003 { 1857 {
2004 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!"); 1858 op->failmsg ("In your confused state you flub the wording of the text!");
2005 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1859 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
2006 } 1860 }
2007 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1861 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
2008 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1862 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
2009 { 1863 {
2010 1864 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
2011 new_draw_info (NDI_UNIQUE, 0, op, "You succeed in learning the spell!");
2012 do_learn_spell (op, spell, 0); 1865 do_learn_spell (op, spell, 0);
2013 1866
2014 /* xp gain to literacy for spell learning */ 1867 /* xp gain to literacy for spell learning */
2015 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1868 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
2016 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1869 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
2017 } 1870 }
2018 else 1871 else
2019 { 1872 {
2020 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1873 op->contr->play_sound (sound_find ("fumble_spell"));
2021 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1874 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
2022 } 1875 }
1876
2023 decrease_ob (tmp); 1877 decrease_ob (tmp);
2024} 1878}
2025 1879
2026/** 1880/**
2027 * Handles applying a spell scroll. 1881 * Handles applying a spell scroll.
… …
2031{ 1885{
2032 object *skop; 1886 object *skop;
2033 1887
2034 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1888 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
2035 { 1889 {
2036 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1890 op->failmsg ("You are unable to read while blind.");
2037 return; 1891 return;
2038 } 1892 }
2039 1893
2040 if (!tmp->inv || tmp->inv->type != SPELL) 1894 if (!tmp->inv || tmp->inv->type != SPELL)
2041 { 1895 {
2042 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1896 op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
2043 return; 1897 return;
2044 } 1898 }
2045 1899
2046 if (op->type == PLAYER) 1900 if (op->type == PLAYER)
2047 { 1901 {
… …
2053 */ 1907 */
2054 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1908 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
2055 1909
2056 if (!skop) 1910 if (!skop)
2057 { 1911 {
2058 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1912 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
2059 return; 1913 return;
2060 } 1914 }
2061 1915
2062 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1916 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
2063 change_exp (op, exp_gain, skop->skill, 0); 1917 change_exp (op, exp_gain, skop->skill, 0);
2064 } 1918 }
2065 1919
2066 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1920 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2067 identify (tmp); 1921 identify (tmp);
2068 1922
2069 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1923 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
2070
2071 1924
2072 cast_spell (op, tmp, dir, tmp->inv, NULL); 1925 cast_spell (op, tmp, dir, tmp->inv, NULL);
2073 decrease_ob (tmp); 1926 decrease_ob (tmp);
2074} 1927}
2075 1928
… …
2079 * chest. 1932 * chest.
2080 */ 1933 */
2081static void 1934static void
2082apply_treasure (object *op, object *tmp) 1935apply_treasure (object *op, object *tmp)
2083{ 1936{
2084 object *treas;
2085
2086
2087 /* Nice side effect of new treasure creation method is that the treasure 1937 /* Nice side effect of this treasure creation method is that the treasure
2088 * for the chest is done when the chest is created, and put into the chest 1938 * for the chest is done when the chest is created, and put into the chest
2089 * inventory. So that when the chest burns up, the items still exist. Also 1939 * inventory. So that when the chest burns up, the items still exist. Also
2090 * prevents people fromt moving chests to more difficult maps to get better 1940 * prevents people from moving chests to more difficult maps to get better
2091 * treasure 1941 * treasure
2092 */ 1942 */
2093
2094 treas = tmp->inv; 1943 object *treas = tmp->inv;
2095 if (treas == NULL) 1944
1945 if (!treas)
2096 { 1946 {
2097 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1947 op->statusmsg ("The chest was empty.");
2098 decrease_ob (tmp); 1948 decrease_ob (tmp);
2099 return; 1949 return;
2100 } 1950 }
1951
2101 while (tmp->inv) 1952 while (tmp->inv)
2102 { 1953 {
2103 treas = tmp->inv; 1954 treas = tmp->inv;
2104
2105 treas->remove (); 1955 treas->remove ();
2106 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
2107 1956
2108 treas->x = op->x; 1957 treas->x = op->x;
2109 treas->y = op->y; 1958 treas->y = op->y;
2110 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1959 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
2111 1960
2112 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1961 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
2113 spring_trap (treas, op); 1962 spring_trap (treas, op);
2114 1963
2115 /* If either player or container was destroyed, no need to do 1964 /* If either player or container was destroyed, no need to do
2116 * further processing. I think this should be enclused with 1965 * further processing. I think this should be enclused with
2117 * spring trap above, as I don't think there is otherwise 1966 * spring trap above, as I don't think there is otherwise
2118 * any way for the treasure chest or player to get killed 1967 * any way for the treasure chest or player to get killed.
2119 */ 1968 */
2120 if (op->destroyed () || tmp->destroyed ()) 1969 if (op->destroyed () || tmp->destroyed ())
2121 break; 1970 break;
2122 } 1971 }
2123 1972
2124 if (!tmp->destroyed () && tmp->inv == NULL) 1973 if (!tmp->destroyed () && !tmp->inv)
2125 decrease_ob (tmp); 1974 decrease_ob (tmp);
2126
2127} 1975}
2128 1976
2129/** 1977/**
2130 * op eats food. 1978 * op eats food.
2131 * If player, takes care of messages and dragon special food. 1979 * If player, takes care of messages and dragon special food.
… …
2146 { 1994 {
2147 /* usual case - no dragon meal: */ 1995 /* usual case - no dragon meal: */
2148 if (op->stats.food + tmp->stats.food > 999) 1996 if (op->stats.food + tmp->stats.food > 999)
2149 { 1997 {
2150 if (tmp->type == FOOD || tmp->type == FLESH) 1998 if (tmp->type == FOOD || tmp->type == FLESH)
2151 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!"); 1999 op->failmsg ("You feel full, but what a waste of food!");
2152 else 2000 else
2153 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!"); 2001 op->statusmsg ("Most of the drink goes down your face not your throat!");
2154 } 2002 }
2155 2003
2156 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 2004 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2157 { 2005 {
2158 char buf[MAX_BUF]; 2006 const char *buf;
2159 2007
2160 if (!is_dragon_pl (op)) 2008 if (!is_dragon_pl (op))
2161 { 2009 {
2162 /* eating message for normal players */ 2010 /* eating message for normal players */
2163 if (tmp->type == DRINK) 2011 if (tmp->type == DRINK)
2164 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name); 2012 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2165 else 2013 else
2166 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good."); 2014 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2167 } 2015 }
2168 else 2016 else
2169 {
2170 /* eating message for dragon players */ 2017 /* eating message for dragon players */
2171 sprintf (buf, "The %s tasted terrible!", &tmp->name); 2018 buf = format ("The %s tasted terrible!", &tmp->name);
2172 }
2173 2019
2174 new_draw_info (NDI_UNIQUE, 0, op, buf); 2020 op->statusmsg (buf);
2021
2175 capacity_remaining = 999 - op->stats.food; 2022 capacity_remaining = 999 - op->stats.food;
2176 op->stats.food += tmp->stats.food; 2023 op->stats.food += tmp->stats.food;
2177 if (capacity_remaining < tmp->stats.food) 2024 if (capacity_remaining < tmp->stats.food)
2178 op->stats.hp += capacity_remaining / 50; 2025 op->stats.hp += capacity_remaining / 50;
2179 else 2026 else
2180 op->stats.hp += tmp->stats.food / 50; 2027 op->stats.hp += tmp->stats.food / 50;
2028
2181 if (op->stats.hp > op->stats.maxhp) 2029 if (op->stats.hp > op->stats.maxhp)
2182 op->stats.hp = op->stats.maxhp; 2030 op->stats.hp = op->stats.maxhp;
2183 if (op->stats.food > 999) 2031 if (op->stats.food > 999)
2184 op->stats.food = 999; 2032 op->stats.food = 999;
2185 } 2033 }
… …
2187 /* special food hack -b.t. */ 2035 /* special food hack -b.t. */
2188 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2036 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2189 eat_special_food (op, tmp); 2037 eat_special_food (op, tmp);
2190 } 2038 }
2191 } 2039 }
2040
2192 handle_apply_yield (tmp); 2041 handle_apply_yield (tmp);
2193 decrease_ob (tmp); 2042 decrease_ob (tmp);
2194} 2043}
2195 2044
2196/** 2045/**
… …
2208{ 2057{
2209 object *skin = NULL; /* pointer to dragon skin force */ 2058 object *skin = NULL; /* pointer to dragon skin force */
2210 object *abil = NULL; /* pointer to dragon ability force */ 2059 object *abil = NULL; /* pointer to dragon ability force */
2211 object *tmp = NULL; /* tmp. object */ 2060 object *tmp = NULL; /* tmp. object */
2212 2061
2213 char buf[MAX_BUF]; /* tmp. string buffer */
2214 double chance; /* improvement-chance of one resistance type */ 2062 double chance; /* improvement-chance of one resistance type */
2215 double totalchance = 1; /* total chance of gaining one resistance */ 2063 double totalchance = 1; /* total chance of gaining one resistance */
2216 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */ 2064 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2217 double mbonus = 0; /* monster bonus */ 2065 double mbonus = 0; /* monster bonus */
2218 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2066 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
… …
2223 if (meal->type != FLESH || !is_dragon_pl (op)) 2071 if (meal->type != FLESH || !is_dragon_pl (op))
2224 return 0; 2072 return 0;
2225 2073
2226 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2074 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2227 from the player's inventory */ 2075 from the player's inventory */
2228 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2076 for (tmp = op->inv; tmp; tmp = tmp->below)
2229 {
2230 if (tmp->type == FORCE) 2077 if (tmp->type == FORCE)
2231 { 2078 if (tmp->arch->archname == shstr_dragon_skin_force)
2232 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0)
2233 skin = tmp; 2079 skin = tmp;
2234 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2080 else if (tmp->arch->archname == shstr_dragon_ability_force)
2235 abil = tmp; 2081 abil = tmp;
2236 }
2237 }
2238 2082
2239 /* if either skin or ability are missing, this is an old player 2083 /* if either skin or ability are missing, this is an old player
2240 which is not to be considered a dragon -> bail out */ 2084 which is not to be considered a dragon -> bail out */
2241 if (skin == NULL || abil == NULL) 2085 if (skin == NULL || abil == NULL)
2242 return 0; 2086 return 0;
… …
2244 /* now start by filling stomache and health, according to food-value */ 2088 /* now start by filling stomache and health, according to food-value */
2245 if ((999 - op->stats.food) < meal->stats.food) 2089 if ((999 - op->stats.food) < meal->stats.food)
2246 op->stats.hp += (999 - op->stats.food) / 50; 2090 op->stats.hp += (999 - op->stats.food) / 50;
2247 else 2091 else
2248 op->stats.hp += meal->stats.food / 50; 2092 op->stats.hp += meal->stats.food / 50;
2093
2249 if (op->stats.hp > op->stats.maxhp) 2094 if (op->stats.hp > op->stats.maxhp)
2250 op->stats.hp = op->stats.maxhp; 2095 op->stats.hp = op->stats.maxhp;
2251 2096
2252 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2097 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2253 2098
… …
2283 /* doubled chance for resistance of ability-focus */ 2128 /* doubled chance for resistance of ability-focus */
2284 if (i == abil->stats.exp) 2129 if (i == abil->stats.exp)
2285 chance = MIN (100., chance * 2.); 2130 chance = MIN (100., chance * 2.);
2286 2131
2287 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2132 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2288 if (RANDOM () % 10000 < (int) (chance * 100)) 2133 if (rndm (10000) < (unsigned int) (chance * 100))
2289 { 2134 {
2290 atnr_winner[winners] = i; 2135 atnr_winner[winners] = i;
2291 winners++; 2136 winners++;
2292 } 2137 }
2293 2138
… …
2298 } 2143 }
2299 } 2144 }
2300 2145
2301 /* inverse totalchance as until now we have the failure-chance */ 2146 /* inverse totalchance as until now we have the failure-chance */
2302 totalchance = 100 - totalchance * 100; 2147 totalchance = 100 - totalchance * 100;
2148
2303 /* print message according to totalchance */ 2149 /* print message according to totalchance */
2150 const char *buf;
2304 if (totalchance > 50.) 2151 if (totalchance > 50.)
2305 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name); 2152 buf = format ("Hmm! The %s tasted delicious!", &meal->name);
2306 else if (totalchance > 10.) 2153 else if (totalchance > 10.)
2307 sprintf (buf, "The %s tasted very good.", &meal->name); 2154 buf = format ("The %s tasted very good.", &meal->name);
2308 else if (totalchance > 1.) 2155 else if (totalchance > 1.)
2309 sprintf (buf, "The %s tasted good.", &meal->name); 2156 buf = format ("The %s tasted good.", &meal->name);
2310 else if (totalchance > 0.1) 2157 else if (totalchance > 0.1)
2311 sprintf (buf, "The %s tasted bland.", &meal->name); 2158 buf = format ("The %s tasted bland.", &meal->name);
2312 else if (totalchance >= 0.01) 2159 else if (totalchance >= 0.01)
2313 sprintf (buf, "The %s had a boring taste.", &meal->name); 2160 buf = format ("The %s had a boring taste.", &meal->name);
2314 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat)) 2161 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2315 sprintf (buf, "The %s tasted strange.", &meal->name); 2162 buf = format ("The %s tasted strange.", &meal->name);
2316 else 2163 else
2317 sprintf (buf, "The %s had no taste.", &meal->name); 2164 buf = format ("The %s had no taste.", &meal->name);
2318 new_draw_info (NDI_UNIQUE, 0, op, buf); 2165
2166 op->statusmsg (buf);
2319 2167
2320 /* now choose a winner if we have any */ 2168 /* now choose a winner if we have any */
2321 i = -1; 2169 i = -1;
2322 if (winners > 0) 2170 if (winners > 0)
2323 i = atnr_winner[RANDOM () % winners]; 2171 i = atnr_winner[RANDOM () % winners];
2324 2172
2325 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2173 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2326 { 2174 {
2327 /* resistance increased! */ 2175 /* resistance increased! */
2328 skin->resist[i]++; 2176 skin->resist[i]++;
2329 fix_player (op); 2177 op->update_stats ();
2330 2178
2331 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2179 op->statusmsg (format ("Your skin is now more resistant to %s!", change_resist_msg[i]));
2332 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2333 } 2180 }
2334 2181
2335 /* if this flesh contains a new ability focus, we mark it 2182 /* if this flesh contains a new ability focus, we mark it
2336 into the ability_force and it will take effect on next level */ 2183 into the ability_force and it will take effect on next level */
2337 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat) 2184 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2338 { 2185 {
2339 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2186 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2340 2187
2341 if (meal->last_eat != abil->stats.exp) 2188 if (meal->last_eat != abil->stats.exp)
2189 op->statusmsg (format (
2190 "Your metabolism prepares to focus on %s!\n"
2191 "The change will happen at level %d.",
2192 change_resist_msg[meal->last_eat],
2193 abil->level + 1
2342 { 2194 ));
2343 sprintf (buf, "Your metabolism prepares to focus on %s!", change_resist_msg[meal->last_eat]);
2344 new_draw_info (NDI_UNIQUE, 0, op, buf);
2345 sprintf (buf, "The change will happen at level %d", abil->level + 1);
2346 new_draw_info (NDI_UNIQUE, 0, op, buf);
2347 }
2348 else 2195 else
2349 { 2196 {
2350 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]); 2197 op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
2351 new_draw_info (NDI_UNIQUE, 0, op, buf);
2352 abil->last_eat = 0; 2198 abil->last_eat = 0;
2353 } 2199 }
2354 } 2200 }
2201
2355 return 1; 2202 return 1;
2356}
2357
2358static void
2359apply_savebed (object *pl)
2360{
2361#ifndef COZY_SERVER
2362 if (!pl->contr->name_changed || !pl->stats.exp)
2363 {
2364 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
2365 return;
2366 }
2367#endif
2368 INVOKE_PLAYER (LOGOUT, pl->contr);
2369 /* Need to call terminate_all_pets() before we remove the player ob */
2370 terminate_all_pets (pl);
2371 pl->remove ();
2372 pl->direction = 0;
2373 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
2374
2375 /* update respawn position */
2376 strcpy (pl->contr->savebed_map, pl->map->path);
2377 pl->contr->bed_x = pl->x;
2378 pl->contr->bed_y = pl->y;
2379
2380 strcpy (pl->contr->killer, "left");
2381 check_score (pl); /* Always check score */
2382 (void) save_player (pl, 0);
2383 pl->map->players--;
2384#if MAP_MAXTIMEOUT
2385 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
2386#endif
2387 play_again (pl);
2388 pl->speed = 0;
2389 update_ob_speed (pl);
2390} 2203}
2391 2204
2392/** 2205/**
2393 * Handles applying an improve armor scroll. 2206 * Handles applying an improve armor scroll.
2394 * Does some sanity checks, then calls improve_armour. 2207 * Does some sanity checks, then calls improve_armour.
… …
2396static void 2209static void
2397apply_armour_improver (object *op, object *tmp) 2210apply_armour_improver (object *op, object *tmp)
2398{ 2211{
2399 object *armor; 2212 object *armor;
2400 2213
2401 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2214 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2402 { 2215 {
2403 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2216 op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
2404 return; 2217 return;
2405 } 2218 }
2219
2406 armor = find_marked_object (op); 2220 armor = find_marked_object (op);
2221
2407 if (!armor) 2222 if (!armor)
2408 { 2223 {
2409 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2224 op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2410 return; 2225 return;
2411 } 2226 }
2227
2412 if (armor->type != ARMOUR 2228 if (armor->type != ARMOUR
2413 && armor->type != CLOAK 2229 && armor->type != CLOAK
2414 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2230 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2415 { 2231 {
2416 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2232 op->failmsg ("Your marked item is not armour!\n");
2417 return; 2233 return;
2418 } 2234 }
2419 2235
2420 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2236 op->statusmsg ("Applying armour enchantment.");
2421 improve_armour (op, tmp, armor); 2237 improve_armour (op, tmp, armor);
2422} 2238}
2423
2424 2239
2425extern void 2240extern void
2426apply_poison (object *op, object *tmp) 2241apply_poison (object *op, object *tmp)
2427{ 2242{
2428 if (op->type == PLAYER) 2243 if (op->type == PLAYER)
2429 { 2244 {
2430 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2245 op->contr->play_sound (sound_find ("drink_poison"));
2431 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2246 op->failmsg ("Yech! That tasted poisonous!");
2432 strcpy (op->contr->killer, "poisonous booze"); 2247 strcpy (op->contr->killer, "poisonous booze");
2433 } 2248 }
2249
2434 if (tmp->stats.hp > 0) 2250 if (tmp->stats.hp > 0)
2435 { 2251 {
2436 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2252 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2437 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2253 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2438 } 2254 }
2255
2439 op->stats.food -= op->stats.food / 4; 2256 op->stats.food -= op->stats.food / 4;
2440 handle_apply_yield (tmp); 2257 handle_apply_yield (tmp);
2441 decrease_ob (tmp); 2258 decrease_ob (tmp);
2442} 2259}
2443 2260
2444/** 2261/**
2445 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2262 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2446 * A valid 2 way exit means: 2263 * A valid 2 way exit means:
2447 * -You can come back (there is another exit at the other side) 2264 * -You can come back (there is another exit at the other side)
2448 * -You are 2265 * -You are
2449 * ° the owner of the exit 2266 * ° the owner of the exit
2450 * ° or in the same party as the owner 2267 * ° or in the same party as the owner
2451 * 2268 *
2452 * Note: a owner in a 2 way exit is saved as the owner's name 2269 * Note: a owner in a 2 way exit is saved as the owner's name
2453 * in the field exit->name cause the field exit->owner doesn't 2270 * in the field exit->name cause the field exit->owner doesn't
2454 * survive in the swapping (in fact the whole exit doesn't survive). 2271 * survive in the swapping (in fact the whole exit doesn't survive).
2455 */ 2272 */
2456int 2273int
2457is_legal_2ways_exit (object *op, object *exit) 2274is_legal_2ways_exit (object *op, object *exit)
2458{ 2275{
2459 object *tmp;
2460 object *exit_owner;
2461 player *pp;
2462 maptile *exitmap;
2463
2464 if (exit->stats.exp != 1) 2276 if (exit->stats.exp != 1)
2465 return 1; /*This is not a 2 way, so it is legal */ 2277 return 1; /*This is not a 2 way, so it is legal */
2278
2279#if 0 //TODO
2466 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2280 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2467 return 0; /* This is a reset town portal */ 2281 return 0; /* This is a reset town portal */
2468 /* To know if an exit has a correspondant, we look at 2282#endif
2469 * all the exits in destination and try to find one with same path as 2283
2470 * the current exit's position */ 2284 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2471 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2285
2472 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2473 else
2474 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2475 if (exitmap) 2286 if (exitmap)
2476 { 2287 {
2288 exitmap->load_sync ();
2289
2477 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2290 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2291
2478 if (!tmp) 2292 if (!tmp)
2479 return 0; 2293 return 0;
2480 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2294
2295 for (; tmp; tmp = tmp->above)
2481 { 2296 {
2482 if (tmp->type != EXIT) 2297 if (tmp->type != EXIT)
2483 continue; /*Not an exit */ 2298 continue; /*Not an exit */
2299
2484 if (!EXIT_PATH (tmp)) 2300 if (!EXIT_PATH (tmp))
2485 continue; /*Not a valid exit */ 2301 continue; /*Not a valid exit */
2302
2486 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2303 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2487 continue; /*Not in the same place */ 2304 continue; /*Not in the same place */
2305
2488 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2306 if (exit->map->path != EXIT_PATH (tmp))
2489 continue; /*Not in the same map */ 2307 continue; /*Not in the same map */
2490 2308
2491 /* From here we have found the exit is valid. However we do 2309 /* From here we have found the exit is valid. However we do
2492 * here the check of the exit owner. It is important for the 2310 * here the check of the exit owner. It is important for the
2493 * town portals to prevent strangers from visiting your appartments 2311 * town portals to prevent strangers from visiting your appartments
2494 */ 2312 */
2495 if (!exit->race) 2313 if (!exit->race)
2496 return 1; /*No owner, free for all! */ 2314 return 1; /*No owner, free for all! */
2315
2497 exit_owner = NULL; 2316 object *exit_owner = 0;
2498 for (pp = first_player; pp; pp = pp->next) 2317
2318 for_all_players (pp)
2499 { 2319 {
2500 if (!pp->ob) 2320 if (!pp->ob)
2501 continue; 2321 continue;
2322
2502 if (pp->ob->name != exit->race) 2323 if (pp->ob->name != exit->race)
2503 continue; 2324 continue;
2325
2504 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2326 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2505 break; 2327 break;
2506 } 2328 }
2329
2507 if (!exit_owner) 2330 if (!exit_owner)
2508 return 0; /* No more owner */ 2331 return 0; /* No more owner */
2332
2509 if (exit_owner->contr == op->contr) 2333 if (exit_owner->contr == op->contr)
2510 return 1; /*It is your exit */ 2334 return 1; /*It is your exit */
2335
2511 if (exit_owner && /*There is a owner */ 2336 if (exit_owner && /*There is a owner */
2512 (op->contr) && /*A player tries to pass */ 2337 (op->contr) && /*A player tries to pass */
2513 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2338 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2514 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2339 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2515 return 0; 2340 return 0;
2341
2516 return 1; 2342 return 1;
2517 } 2343 }
2518 } 2344 }
2345
2519 return 0; 2346 return 0;
2520} 2347}
2521
2522 2348
2523/** 2349/**
2524 * Main apply handler. 2350 * Main apply handler.
2525 * 2351 *
2526 * Checks for unpaid items before applying. 2352 * Checks for unpaid items before applying.
… …
2534 * being applied. 2360 * being applied.
2535 * 2361 *
2536 * aflag is special (always apply/unapply) flags. Nothing is done with 2362 * aflag is special (always apply/unapply) flags. Nothing is done with
2537 * them in this function - they are passed to apply_special 2363 * them in this function - they are passed to apply_special
2538 */ 2364 */
2539
2540int 2365int
2541manual_apply (object *op, object *tmp, int aflag) 2366manual_apply (object *op, object *tmp, int aflag)
2542{ 2367{
2543 if (tmp->head) 2368 if (tmp->head)
2544 tmp = tmp->head; 2369 tmp = tmp->head;
2545 2370
2546 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2371 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2547 { 2372 {
2548 if (op->type == PLAYER) 2373 if (op->type == PLAYER)
2549 { 2374 {
2550 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2375 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
2551 return 1; 2376 return 1;
2552 } 2377 }
2553 else 2378 else
2554 {
2555 return 0; /* monsters just skip unpaid items */ 2379 return 0; /* monsters just skip unpaid items */
2556 }
2557 } 2380 }
2558 2381
2559 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2382 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2560 return RESULT_INT (0); 2383 return RESULT_INT (0);
2561 2384
2562 switch (tmp->type) 2385 switch (tmp->type)
2563 { 2386 {
2564
2565 case CF_HANDLE: 2387 case CF_HANDLE:
2566 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2388 op->play_sound (sound_find ("turn_handle"));
2567 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2389 op->statusmsg ("You turn the handle.");
2568 tmp->value = tmp->value ? 0 : 1; 2390 tmp->value = tmp->value ? 0 : 1;
2569 SET_ANIMATION (tmp, tmp->value); 2391 SET_ANIMATION (tmp, tmp->value);
2570 update_object (tmp, UP_OBJ_FACE); 2392 update_object (tmp, UP_OBJ_FACE);
2571 push_button (tmp); 2393 push_button (tmp);
2572 return 1; 2394 return 1;
2573 2395
2574 case TRIGGER: 2396 case TRIGGER:
2575 if (check_trigger (tmp, op)) 2397 if (check_trigger (tmp, op))
2576 { 2398 {
2577 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2399 op->statusmsg ("You turn the handle.");
2578 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2400 op->play_sound (sound_find ("turn_handle"));
2579 } 2401 }
2580 else 2402 else
2581 { 2403 op->failmsg ("The handle doesn't move.");
2582 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2404
2583 }
2584 return 1; 2405 return 1;
2585 2406
2586 case EXIT: 2407 case EXIT:
2587 if (op->type != PLAYER) 2408 if (op->type != PLAYER)
2588 return 0; 2409 return 0;
2410
2589 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2411 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2590 { 2412 op->failmsg (format ("The %s is closed.", query_name (tmp)));
2591 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2592 }
2593 else 2413 else
2594 { 2414 {
2595 /* Don't display messages for random maps. */ 2415 /* Don't display messages for random maps. */
2596 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2416 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2597 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2417 op->statusmsg (tmp->msg, NDI_NAVY);
2418
2598 enter_exit (op, tmp); 2419 op->enter_exit (tmp);
2599 } 2420 }
2421
2422 return 1;
2423
2424 case INSCRIBABLE:
2425 op->statusmsg (tmp->msg);
2426 // maybe show a spell menu to chose from or something like that
2600 return 1; 2427 return 1;
2601 2428
2602 case SIGN: 2429 case SIGN:
2603 apply_sign (op, tmp, 0); 2430 apply_sign (op, tmp, 0);
2604 return 1; 2431 return 1;
… …
2608 { 2435 {
2609 apply_book (op, tmp); 2436 apply_book (op, tmp);
2610 return 1; 2437 return 1;
2611 } 2438 }
2612 else 2439 else
2613 {
2614 return 0; 2440 return 0;
2615 }
2616 2441
2617 case SKILLSCROLL: 2442 case SKILLSCROLL:
2618 if (op->type == PLAYER) 2443 if (op->type == PLAYER)
2619 { 2444 {
2620 apply_skillscroll (op, tmp); 2445 apply_skillscroll (op, tmp);
2621 return 1; 2446 return 1;
2622 } 2447 }
2448 else
2623 return 0; 2449 return 0;
2624 2450
2625 case SPELLBOOK: 2451 case SPELLBOOK:
2626 if (op->type == PLAYER) 2452 if (op->type == PLAYER)
2627 { 2453 {
2628 apply_spellbook (op, tmp); 2454 apply_spellbook (op, tmp);
2629 return 1; 2455 return 1;
2630 } 2456 }
2457 else
2631 return 0; 2458 return 0;
2632 2459
2633 case SCROLL: 2460 case SCROLL:
2634 apply_scroll (op, tmp, 0); 2461 apply_scroll (op, tmp, 0);
2635 return 1; 2462 return 1;
2636 2463
2637 case POTION: 2464 case POTION:
2638 (void) apply_potion (op, tmp); 2465 apply_potion (op, tmp);
2639 return 1; 2466 return 1;
2640 2467
2641 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2468 /* Eneq(@csd.uu.se): Handle apply on containers. */
2469 //TODO: remove, as it is unsed?
2642 case CLOSE_CON: 2470 case CLOSE_CON:
2643 if (op->type == PLAYER)
2644 (void) esrv_apply_container (op, tmp->env);
2645 else
2646 (void) apply_container (op, tmp->env); 2471 apply_container (op, tmp->env);
2647 return 1; 2472 return 1;
2648 2473
2649 case CONTAINER: 2474 case CONTAINER:
2650 if (op->type == PLAYER)
2651 (void) esrv_apply_container (op, tmp);
2652 else
2653 (void) apply_container (op, tmp); 2475 apply_container (op, tmp);
2654 return 1; 2476 return 1;
2655 2477
2656 case TREASURE: 2478 case TREASURE:
2657 if (op->type == PLAYER) 2479 if (op->type == PLAYER)
2658 { 2480 {
2659 apply_treasure (op, tmp); 2481 apply_treasure (op, tmp);
2660 return 1; 2482 return 1;
2661 } 2483 }
2662 else 2484 else
2663 {
2664 return 0; 2485 return 0;
2665 }
2666 2486
2667 case WEAPON: 2487 case WEAPON:
2668 case ARMOUR: 2488 case ARMOUR:
2669 case BOOTS: 2489 case BOOTS:
2670 case GLOVES: 2490 case GLOVES:
… …
2683 case LAMP: 2503 case LAMP:
2684 case BUILDER: 2504 case BUILDER:
2685 case SKILL_TOOL: 2505 case SKILL_TOOL:
2686 if (tmp->env != op) 2506 if (tmp->env != op)
2687 return 2; /* not in inventory */ 2507 return 2; /* not in inventory */
2508
2688 (void) apply_special (op, tmp, aflag); 2509 apply_special (op, tmp, aflag);
2689 return 1; 2510 return 1;
2690 2511
2691 case DRINK: 2512 case DRINK:
2692 case FOOD: 2513 case FOOD:
2693 case FLESH: 2514 case FLESH:
… …
2697 case POISON: 2518 case POISON:
2698 apply_poison (op, tmp); 2519 apply_poison (op, tmp);
2699 return 1; 2520 return 1;
2700 2521
2701 case SAVEBED: 2522 case SAVEBED:
2702 if (op->type == PLAYER)
2703 {
2704 apply_savebed (op);
2705 return 1; 2523 return 1;
2706 }
2707 else
2708 {
2709 return 0;
2710 }
2711 2524
2712 case ARMOUR_IMPROVER: 2525 case ARMOUR_IMPROVER:
2713 if (op->type == PLAYER) 2526 if (op->type == PLAYER)
2714 { 2527 {
2715 apply_armour_improver (op, tmp); 2528 apply_armour_improver (op, tmp);
2716 return 1; 2529 return 1;
2717 } 2530 }
2718 else 2531 else
2719 {
2720 return 0; 2532 return 0;
2721 }
2722 2533
2723 case WEAPON_IMPROVER: 2534 case WEAPON_IMPROVER:
2724 (void) check_improve_weapon (op, tmp); 2535 check_improve_weapon (op, tmp);
2725 return 1; 2536 return 1;
2726 2537
2727 case CLOCK: 2538 case CLOCK:
2728 if (op->type == PLAYER) 2539 if (op->type == PLAYER)
2729 { 2540 {
2730 char buf[MAX_BUF]; 2541 char buf[MAX_BUF];
2731 timeofday_t tod; 2542 timeofday_t tod;
2732 2543
2733 get_tod (&tod); 2544 get_tod (&tod);
2545 op->play_sound (sound_find ("sound_clock"));
2546 op->statusmsg (format (
2734 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2547 "It is %d minute%s past %d o'clock %s",
2735 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2548 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2736 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2549 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2737 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2550 ));
2738 new_draw_info (NDI_UNIQUE, 0, op, buf);
2739 return 1; 2551 return 1;
2740 } 2552 }
2741 else 2553 else
2742 {
2743 return 0; 2554 return 0;
2744 }
2745 2555
2746 case MENU: 2556 case MENU:
2747 if (op->type == PLAYER) 2557 if (op->type == PLAYER)
2748 { 2558 {
2749 shop_listing (op); 2559 shop_listing (tmp, op);
2750 return 1; 2560 return 1;
2751 } 2561 }
2752 else 2562 else
2753 {
2754 return 0; 2563 return 0;
2755 }
2756 2564
2757 case POWER_CRYSTAL: 2565 case POWER_CRYSTAL:
2758 apply_power_crystal (op, tmp); /* see egoitem.c */ 2566 apply_power_crystal (op, tmp); /* see egoitem.c */
2759 return 1; 2567 return 1;
2760 2568
… …
2763 { 2571 {
2764 apply_lighter (op, tmp); 2572 apply_lighter (op, tmp);
2765 return 1; 2573 return 1;
2766 } 2574 }
2767 else 2575 else
2768 {
2769 return 0; 2576 return 0;
2770 }
2771 2577
2772 case ITEM_TRANSFORMER: 2578 case ITEM_TRANSFORMER:
2773 apply_item_transformer (op, tmp); 2579 apply_item_transformer (op, tmp);
2774 return 1; 2580 return 1;
2775 2581
… …
2788int 2594int
2789player_apply (object *pl, object *op, int aflag, int quiet) 2595player_apply (object *pl, object *op, int aflag, int quiet)
2790{ 2596{
2791 int tmp; 2597 int tmp;
2792 2598
2793 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2599 if (op->env && (pl->move_type & MOVE_FLYING))
2794 { 2600 {
2795 /* player is flying and applying object not in inventory */ 2601 /* player is flying and applying object not in inventory */
2796 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2602 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2797 { 2603 {
2798 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2604 op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
2799 return 0; 2605 return 0;
2800 } 2606 }
2801 } 2607 }
2802 2608
2803 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2804 * applied.
2805 */
2806 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2807 {
2808 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2809 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2810 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2811 op->destroy ();
2812 return 1;
2813 }
2814
2815 pl->contr->last_used = op; 2609 pl->contr->last_used = op;
2816 pl->contr->last_used_id = op->count;
2817 2610
2818 tmp = manual_apply (pl, op, aflag); 2611 tmp = manual_apply (pl, op, aflag);
2819 if (!quiet) 2612 if (!quiet)
2820 { 2613 {
2821 if (tmp == 0) 2614 if (tmp == 0)
2822 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2615 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2823 else if (tmp == 2) 2616 else if (tmp == 2)
2824 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2617 op->failmsg ("You must get it first!\n");
2825 } 2618 }
2619
2826 return tmp; 2620 return tmp;
2827} 2621}
2828 2622
2829/** 2623/**
2830 * player_apply_below attempts to apply the object 'below' the player. 2624 * player_apply_below attempts to apply the object 'below' the player.
2831 * If the player has an open container, we use that for below, otherwise 2625 * If the player has an open container, we use that for below, otherwise
2832 * we use the ground. 2626 * we use the ground.
2833 */ 2627 */
2834
2835void 2628void
2836player_apply_below (object *pl) 2629player_apply_below (object *pl)
2837{ 2630{
2838 object *tmp, *next;
2839 int floors; 2631 int floors = 0;
2840 2632
2841 /* If using a container, set the starting item to be the top 2633 /* If using a container, set the starting item to be the top
2842 * item in the container. Otherwise, use the map. 2634 * item in the container. Otherwise, use the map.
2843 */
2844 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2845
2846 /* This is perhaps more complicated. However, I want to make sure that 2635 * This is perhaps more complicated. However, I want to make sure that
2847 * we don't use a corrupt pointer for the next object, so we get the 2636 * we don't use a corrupt pointer for the next object, so we get the
2848 * next object in the stack before applying. This is can only be a 2637 * next object in the stack before applying. This is can only be a
2849 * problem if player_apply() has a bug in that it uses the object but does 2638 * problem if player_apply() has a bug in that it uses the object but does
2850 * not return a proper value. 2639 * not return a proper value.
2851 */ 2640 */
2852 for (floors = 0; tmp != NULL; tmp = next) 2641 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2853 { 2642 {
2854 next = tmp->below; 2643 next = tmp->below;
2644
2855 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2645 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2856 floors++; 2646 floors++;
2857 else if (floors > 0) 2647 else if (floors > 0)
2858 return; /* process only floor objects after first floor object */ 2648 return; /* process only floor objects after first floor object */
2859 2649
… …
2879 * to keep the size of apply_special to a more managable size. 2669 * to keep the size of apply_special to a more managable size.
2880 */ 2670 */
2881static int 2671static int
2882unapply_special (object *who, object *op, int aflags) 2672unapply_special (object *who, object *op, int aflags)
2883{ 2673{
2884 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2674 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2675 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2885 return RESULT_INT (0); 2676 return RESULT_INT (0);
2886 2677
2887 object *tmp2;
2888
2889 CLEAR_FLAG (op, FLAG_APPLIED); 2678 CLEAR_FLAG (op, FLAG_APPLIED);
2679
2890 switch (op->type) 2680 switch (op->type)
2891 { 2681 {
2682 case SKILL_TOOL:
2683 // unapplying a skill tool should also unapply the skill it governs
2684 // but this is hard, as it shouldn't do so when the skill can
2685 // be used for other reasons
2686 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2687 if (tmp->skill == op->skill
2688 && tmp->type == SKILL
2689 && tmp->flag [FLAG_APPLIED]
2690 && !tmp->flag [FLAG_CAN_USE_SKILL])
2691 unapply_special (who, tmp, 0);
2692
2693 change_abil (who, op);
2694 break;
2695
2892 case WEAPON: 2696 case WEAPON:
2893 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2697 if (player *pl = who->contr)
2698 if (op == pl->combat_ob)
2699 {
2700 pl->combat_ob = 0;
2701 who->change_weapon (pl->ranged_ob);
2702 }
2894 2703
2704 who->statusmsg (format ("You unwield %s.", query_name (op)));
2705
2895 (void) change_abil (who, op); 2706 change_abil (who, op);
2896 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2897 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2707 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2898 clear_skill (who);
2899 break; 2708 break;
2900 2709
2901 case SKILL: /* allows objects to impart skills */
2902 case SKILL_TOOL: 2710 case SKILL:
2903 if (op != who->chosen_skill) 2711 if (who->contr)
2904 { 2712 {
2905 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2713 if (!op->invisible)
2714 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2715 else
2716 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2906 } 2717 }
2907 if (who->type == PLAYER) 2718
2908 {
2909 if (who->contr->shoottype == range_skill)
2910 who->contr->shoottype = range_none;
2911 if (!op->invisible)
2912 {
2913 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2914 }
2915 else
2916 {
2917 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2918 }
2919 }
2920 (void) change_abil (who, op); 2719 change_abil (who, op);
2921 who->chosen_skill = NULL;
2922 CLEAR_FLAG (who, FLAG_READY_SKILL); 2720 CLEAR_FLAG (who, FLAG_READY_SKILL);
2923 break; 2721 break;
2924 2722
2925 case ARMOUR: 2723 case ARMOUR:
2926 case HELMET: 2724 case HELMET:
… …
2930 case GLOVES: 2728 case GLOVES:
2931 case AMULET: 2729 case AMULET:
2932 case GIRDLE: 2730 case GIRDLE:
2933 case BRACERS: 2731 case BRACERS:
2934 case CLOAK: 2732 case CLOAK:
2935 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2733 who->statusmsg (format ("You unwear %s.", query_name (op)));
2936 (void) change_abil (who, op); 2734 change_abil (who, op);
2937 break; 2735 break;
2736
2938 case LAMP: 2737 case LAMP:
2939 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2738 {
2739 who->statusmsg (format ("You turn off your %s.", &op->name));
2740
2940 tmp2 = arch_to_object (op->other_arch); 2741 object *tmp2 = arch_to_object (op->other_arch);
2941 tmp2->x = op->x; 2742 tmp2->x = op->x;
2942 tmp2->y = op->y; 2743 tmp2->y = op->y;
2943 tmp2->map = op->map; 2744 tmp2->map = op->map;
2944 tmp2->below = op->below; 2745 tmp2->below = op->below;
2945 tmp2->above = op->above; 2746 tmp2->above = op->above;
2946 tmp2->stats.food = op->stats.food; 2747 tmp2->stats.food = op->stats.food;
2947 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2748 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2948 2749
2949 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2750 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2950 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2751 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2951 2752
2952 if (who->type == PLAYER) 2753 if (who->contr)
2953 esrv_del_item (who->contr, op->count); 2754 esrv_del_item (who->contr, op->count);
2954 2755
2955 op->destroy (); 2756 op->destroy ();
2956 insert_ob_in_ob (tmp2, who); 2757 insert_ob_in_ob (tmp2, who);
2957 fix_player (who); 2758 who->update_stats ();
2759
2958 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2760 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2959 { 2761 {
2960 if (who->type == PLAYER) 2762 if (who->contr)
2961 { 2763 {
2962 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2764 who->failmsg ("Oops, it feels deadly cold!");
2963 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2765 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2964 } 2766 }
2965 } 2767 }
2966 if (who->type == PLAYER) 2768
2769 if (who->contr)
2967 esrv_send_item (who, tmp2); 2770 esrv_send_item (who, tmp2);
2771 }
2772
2968 return 1; /* otherwise, an attempt to drop causes problems */ 2773 return 1; /* otherwise, an attempt to drop causes problems */
2969 break; 2774
2970 case BOW: 2775 case BOW:
2971 case WAND: 2776 case WAND:
2972 case ROD: 2777 case ROD:
2973 case HORN: 2778 case HORN:
2974 clear_skill (who); 2779 if (player *pl = who->contr)
2975 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2976 if (who->type == PLAYER)
2977 { 2780 {
2978 who->contr->shoottype = range_none; 2781 if (op == pl->ranged_ob)
2782 {
2783 pl->ranged_ob = 0;
2784 who->change_weapon (pl->combat_ob);
2785 }
2786
2787 who->statusmsg (format ("You unready %s.", query_name (op)));
2979 } 2788 }
2980 else 2789 else
2981 { 2790 {
2791 who->change_skill (0);
2792
2982 if (op->type == BOW) 2793 if (op->type == BOW)
2983 CLEAR_FLAG (who, FLAG_READY_BOW); 2794 CLEAR_FLAG (who, FLAG_READY_BOW);
2984 else 2795 else
2985 CLEAR_FLAG (who, FLAG_READY_RANGE); 2796 CLEAR_FLAG (who, FLAG_READY_RANGE);
2986 } 2797 }
2798
2987 break; 2799 break;
2988 2800
2989 case BUILDER: 2801 case BUILDER:
2990 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2802 if (who->contr)
2991 who->contr->shoottype = range_none; 2803 who->statusmsg (format ("You unready %s.", query_name (op)));
2992 who->contr->ranges[range_builder] = NULL;
2993 break; 2804 break;
2994 2805
2995 default: 2806 default:
2996 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2807 who->statusmsg (format ("You unapply %s.", query_name (op)));
2997 break; 2808 break;
2998 } 2809 }
2999 2810
3000 fix_player (who); 2811 who->update_stats ();
3001 2812
3002 if (!(aflags & AP_NO_MERGE)) 2813 if (!(aflags & AP_NO_MERGE))
3003 { 2814 {
3004 object *tmp;
3005
3006 tmp = merge_ob (op, NULL); 2815 object *tmp = merge_ob (op, 0);
3007 if (who->type == PLAYER) 2816
2817 if (who->contr)
3008 { 2818 {
3009 if (tmp) 2819 if (tmp)
3010 { /* it was merged */ 2820 { /* it was merged */
3011 esrv_del_item (who->contr, op->count); 2821 esrv_del_item (who->contr, op->count);
3012 op = tmp; 2822 op = tmp;
3013 } 2823 }
3014 2824
3015 esrv_send_item (who, op); 2825 esrv_send_item (who, op);
3016 } 2826 }
3017 } 2827 }
2828
3018 return 0; 2829 return 0;
3019} 2830}
3020 2831
3021/** 2832/**
3022 * Returns the object that is using location 'loc'. 2833 * Returns the object that is using location 'loc'.
3023 * Note that 'start' is the first object to start examing - we 2834 * Note that 'start' is the first object to start examing - we
3024 * then go through the below of this. In this way, you can do 2835 * then go through the below of this. In this way, you can do
3025 * something like: 2836 * something like:
3026 * tmp = get_item_from_body_location(who->inv, 1); 2837 * tmp = get_next_item_from_body_location(who->inv, 1);
3027 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2838 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
3028 * to find the second object that may use this location, etc. 2839 * to find the second object that may use this location, etc.
3029 * Returns NULL if no match is found. 2840 * Returns NULL if no match is found.
3030 * loc is the index into the array we are looking for a match. 2841 * loc is the index into the array we are looking for a match.
3031 * don't return invisible objects unless they are skill objects 2842 * don't return invisible objects unless they are skill objects
3032 * invisible other objects that use 2843 * invisible other objects that use
3033 * up body locations can be used as restrictions. 2844 * up body locations can be used as restrictions.
3034 */ 2845 */
3035object * 2846static object *
3036get_item_from_body_location (object *start, int loc) 2847get_next_item_from_body_location (int loc, object *start)
3037{ 2848{
3038 object *tmp;
3039
3040 if (!start)
3041 return NULL;
3042
3043 for (tmp = start; tmp; tmp = tmp->below) 2849 for (object *tmp = start; tmp; tmp = tmp->below)
3044 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2850 if (tmp->flag [FLAG_APPLIED]
2851 && tmp->slot[loc].info
2852 && (!tmp->invisible || tmp->type == SKILL))
3045 return tmp; 2853 return tmp;
3046 2854
3047 return NULL; 2855 return 0;
3048} 2856}
3049
3050
3051 2857
3052/** 2858/**
3053 * 'op' wants to apply an object, but can't because of other equipment. 2859 * 'op' wants to apply an object, but can't because of other equipment.
3054 * This should only be called when it is known 2860 * This should only be called when it is known
3055 * that there are objects to unapply. This makes pretty heavy 2861 * that there are objects to unapply. This makes pretty heavy
… …
3058 * Returns 0 on success, returns 1 if there is some problem. 2864 * Returns 0 on success, returns 1 if there is some problem.
3059 * if aflags is AP_PRINT, we instead print out waht to unapply 2865 * if aflags is AP_PRINT, we instead print out waht to unapply
3060 * instead of doing it. This is a lot less code than having 2866 * instead of doing it. This is a lot less code than having
3061 * another function that does just that. 2867 * another function that does just that.
3062 */ 2868 */
2869
2870#define CANNOT_REMOVE_CURSED \
2871 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2872 "Praying over an altar, scrolls of remove curse/damnation, " \
2873 "priests or even other players might help.>"
2874
3063int 2875int
3064unapply_for_ob (object *who, object *op, int aflags) 2876unapply_for_ob (object *who, object *op, int aflags)
3065{ 2877{
3066 int i; 2878 if (op->is_range ())
3067 object *tmp = NULL, *last;
3068
3069 /* If we are applying a shield or weapon, unapply any equipped shield
3070 * or weapons first - only allowed to use one weapon/shield at a time.
3071 */
3072 if (op->type == WEAPON || op->type == SHIELD)
3073 {
3074 for (tmp = who->inv; tmp; tmp = tmp->below) 2879 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3075 {
3076 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2880 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3077 {
3078 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2881 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3079 { 2882 {
3080 if (aflags & AP_PRINT) 2883 if (aflags & AP_PRINT)
3081 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2884 who->failmsg (query_name (tmp));
3082 else 2885 else
3083 unapply_special (who, tmp, aflags); 2886 unapply_special (who, tmp, aflags);
3084 } 2887 }
3085 else 2888 else
3086 { 2889 {
3087 /* In this case, we want to try and remove a cursed item. 2890 /* In this case, we want to try and remove a cursed item.
3088 * While we know it won't work, we want unapply_special to 2891 * While we know it won't work, we want unapply_special to
3089 * at least generate the message. 2892 * at least generate the message.
3090 */ 2893 */
3091 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2894 who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
3092 return 1; 2895 return 1;
3093 }
3094
3095 } 2896 }
3096 }
3097 }
3098 2897
3099 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2898 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3100 { 2899 {
3101 /* this used up a slot that we need to free */ 2900 /* this used up a slot that we need to free */
3102 if (op->body_info[i]) 2901 if (op->slot[i].info)
3103 { 2902 {
3104 last = who->inv; 2903 object *last = who->inv;
3105 2904
3106 /* We do a while loop - may need to remove several items in order 2905 /* We do a while loop - may need to remove several items in order
3107 * to free up enough slots. 2906 * to free up enough slots.
3108 */ 2907 */
3109 while ((who->body_used[i] + op->body_info[i]) < 0) 2908 while ((who->slot[i].used + op->slot[i].info) < 0)
3110 { 2909 {
3111 tmp = get_item_from_body_location (last, i); 2910 object *tmp = get_next_item_from_body_location (i, last);
2911
3112 if (!tmp) 2912 if (!tmp)
3113 { 2913 {
3114#if 0 2914#if 0
3115 /* Not a bug - we'll get this if the player has cursed items 2915 /* Not a bug - we'll get this if the player has cursed items
3116 * equipped. 2916 * equipped.
3117 */ 2917 */
3118 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2918 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3119#endif 2919#endif
3120 return 1; 2920 return 1;
3121 } 2921 }
2922
3122 /* If we are just printing, we don't care about cursed status */ 2923 /* If we are just printing, we don't care about cursed status */
3123 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2924 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3124 { 2925 {
3125 if (aflags & AP_PRINT) 2926 if (aflags & AP_PRINT)
3126 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2927 who->failmsg (query_name (tmp));
3127 else 2928 else
3128 unapply_special (who, tmp, aflags); 2929 unapply_special (who, tmp, aflags);
3129 } 2930 }
3130 else 2931 else
3131 { 2932 {
3132 /* Cursed item that we can't unequip - tell the player. 2933 /* Cursed item that we can't unequip - tell the player.
3133 * Note this could be annoying if this is just one of a few, 2934 * Note this could be annoying if this is just one of a few,
3134 * so it may not be critical (eg, putting on a ring and you have 2935 * so it may not be critical (eg, putting on a ring and you have
3135 * one cursed ring.) 2936 * one cursed ring.)
3136 */ 2937 */
3137 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2938 who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
3138 } 2939 }
2940
3139 last = tmp->below; 2941 last = tmp->below;
3140 } 2942 }
3141 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2943 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3142 * return in the !tmp would have kicked in. 2944 * return in the !tmp would have kicked in.
3143 */ 2945 */
3144 } /* if op is using this body location */ 2946 } /* if op is using this body location */
3145 } /* for body lcoations */ 2947 } /* for body lcoations */
2948
3146 return 0; 2949 return 0;
3147} 2950}
3148 2951
3149/** 2952/**
3150 * Checks to see if 'who' can apply object 'op'. 2953 * Checks to see if 'who' can apply object 'op'.
3151 * Returns 0 if apply can be done without anything special. 2954 * Returns 0 if apply can be done without anything special.
3152 * Otherwise returns a bitmask - potentially several of these may be 2955 * Otherwise returns a bitmask - potentially several of these may be
3153 * set, but largely depends on circumstance - in the future, processing 2956 * set, but largely depends on circumstance - in the future, processing
3154 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2957 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3155 * is set, do we really are what the other flags may be?) 2958 * is set, do we really care what the other flags may be?)
3156 * 2959 *
3157 * See include/define.h for detailed description of the meaning of 2960 * See include/define.h for detailed description of the meaning of
3158 * these return values. 2961 * these return values.
3159 */ 2962 */
3160int 2963int
3161can_apply_object (object *who, object *op) 2964can_apply_object (object *who, object *op)
3162{ 2965{
3163 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2966 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3164 return RESULT_INT (0); 2967 return RESULT_INT (0);
3165 2968
3166 int i, retval = 0; 2969 int retval = 0;
3167 object *tmp = NULL, *ws = NULL; 2970 object *tmp = 0, *ws = 0;
3168 2971
3169 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2972 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3170 * 2 weapons, but we don't want to let them do that. So if they are
3171 * trying to equip a weapon or shield, see if they already have one
3172 * in place and store that way.
3173 */
3174 if (op->type == WEAPON || op->type == SHIELD)
3175 { 2973 {
3176 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2974 if (op->slot[i].info)
3177 { 2975 {
3178 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2976 /* Item uses more slots than we have */
2977 if (who->slot[i].info + op->slot [i].info < 0)
3179 { 2978 {
3180 retval = CAN_APPLY_UNAPPLY;
3181 ws = tmp;
3182 }
3183 }
3184 }
3185
3186
3187 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3188 {
3189 if (op->body_info[i])
3190 {
3191 /* Item uses more slots than we have */
3192 if (FABS (op->body_info[i]) > who->body_info[i])
3193 {
3194 /* Could return now for efficiently - rest of info below isn' 2979 /* Could return now for efficiency - rest of info below isn't
3195 * really needed. 2980 * really needed.
3196 */ 2981 */
3197 retval |= CAN_APPLY_NEVER; 2982 retval |= CAN_APPLY_NEVER;
3198 } 2983 }
3199 else if ((who->body_used[i] + op->body_info[i]) < 0) 2984 else if (who->slot[i].used + op->slot[i].info < 0)
3200 { 2985 {
3201 /* in this case, equipping this would use more free spots than 2986 /* in this case, equipping this would use more free spots than
3202 * we have. 2987 * we have.
3203 */ 2988 */
3204 object *tmp1;
3205
3206 2989
3207 /* if we have an applied weapon/shield, and unapply it would free 2990 /* if we have an applied weapon/shield, and unapply it would free
3208 * enough slots to equip the new item, then just set this can 2991 * enough slots to equip the new item, then just set "can
3209 * continue. We don't care about the logic below - if you have 2992 * apply unapply". We don't care about the logic below - if you have a
3210 * shield equipped and try to equip another shield, there is only 2993 * shield equipped and try to equip another shield, there is only
3211 * one choice. However, the check for the number of body locations 2994 * one choice. However, the check for the number of body locations
3212 * does take into the account cases where what is being applied 2995 * does take into the account cases where what is being applied
3213 * may be two handed for example. 2996 * may be two handed for example.
3214 */ 2997 */
3215 if (ws) 2998 if (ws)
3216 { 2999 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3217 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
3218 { 3000 {
3219 retval |= CAN_APPLY_UNAPPLY; 3001 retval |= CAN_APPLY_UNAPPLY;
3220 continue; 3002 continue;
3221 } 3003 }
3222 }
3223 3004
3224 tmp1 = get_item_from_body_location (who->inv, i); 3005 object *tmp1 = get_next_item_from_body_location (i, who->inv);
3225 if (!tmp1) 3006 if (!tmp1)
3226 { 3007 {
3227#if 0 3008#if 0
3228 /* This is sort of an error, but happens a lot when old players 3009 /* This is sort of an error, but happens a lot when old players
3229 * join in with more stuff equipped than they are now allowed. 3010 * join in with more stuff equipped than they are now allowed.
… …
3237 /* need to unapply something. However, if this something 3018 /* need to unapply something. However, if this something
3238 * is different than we had found before, it means they need 3019 * is different than we had found before, it means they need
3239 * to apply multiple objects 3020 * to apply multiple objects
3240 */ 3021 */
3241 retval |= CAN_APPLY_UNAPPLY; 3022 retval |= CAN_APPLY_UNAPPLY;
3023
3242 if (!tmp) 3024 if (!tmp)
3243 tmp = tmp1; 3025 tmp = tmp1;
3244 else if (tmp != tmp1) 3026 else if (tmp != tmp1)
3245 {
3246 retval |= CAN_APPLY_UNAPPLY_MULT; 3027 retval |= CAN_APPLY_UNAPPLY_MULT;
3247 } 3028
3248 /* This object isn't using up all the slots, so there must 3029 /* This object isn't using up all the slots, so there must
3249 * be another. If so, and it the new item doesn't need all 3030 * be another. If so, and it the new item doesn't need all
3250 * the slots, the player then has a choice. 3031 * the slots, the player then has a choice.
3251 */ 3032 */
3252 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 3033 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
3034 && abs (op->slot[i].info) < who->slot[i].info)
3253 retval |= CAN_APPLY_UNAPPLY_CHOICE; 3035 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3254 3036
3255 /* Does unequippint 'tmp1' free up enough slots for this to be 3037 /* Does unequippint 'tmp1' free up enough slots for this to be
3256 * equipped? If not, there must be something else to unapply. 3038 * equipped? If not, there must be something else to unapply.
3257 */ 3039 */
3258 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3040 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3259 retval |= CAN_APPLY_UNAPPLY_MULT; 3041 retval |= CAN_APPLY_UNAPPLY_MULT;
3260
3261 } 3042 }
3262 } /* if not enough free slots */ 3043 } /* if not enough free slots */
3263 } /* if this object uses location i */ 3044 } /* if this object uses location i */
3264 } /* for i -> num_body_locations loop */ 3045 } /* for i -> num_body_locations loop */
3265 3046
… …
3270 * and weapons all use the same slot. Similar for horn/rod/wand - they 3051 * and weapons all use the same slot. Similar for horn/rod/wand - they
3271 * all use the same location. 3052 * all use the same location.
3272 */ 3053 */
3273 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3054 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3274 retval |= CAN_APPLY_RESTRICTION; 3055 retval |= CAN_APPLY_RESTRICTION;
3056
3275 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3057 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3276 retval |= CAN_APPLY_RESTRICTION; 3058 retval |= CAN_APPLY_RESTRICTION;
3277 3059
3278
3279 if (who->type != PLAYER) 3060 if (who->type != PLAYER)
3280 { 3061 {
3281 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3062 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3282 retval |= CAN_APPLY_RESTRICTION; 3063 retval |= CAN_APPLY_RESTRICTION;
3064
3283 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3065 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3284 retval |= CAN_APPLY_RESTRICTION; 3066 retval |= CAN_APPLY_RESTRICTION;
3067
3285 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3068 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3286 retval |= CAN_APPLY_RESTRICTION; 3069 retval |= CAN_APPLY_RESTRICTION;
3070
3287 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3071 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3288 retval |= CAN_APPLY_RESTRICTION; 3072 retval |= CAN_APPLY_RESTRICTION;
3289 } 3073 }
3074
3290 return retval; 3075 return retval;
3291} 3076}
3292
3293
3294 3077
3295/** 3078/**
3296 * who is the object using the object. It can be a monster. 3079 * who is the object using the object. It can be a monster.
3297 * op is the object they are using. op is an equipment type item, 3080 * op is the object they are using. op is an equipment type item,
3298 * eg, one which you put on and keep on for a while, and not something 3081 * eg, one which you put on and keep on for a while, and not something
… …
3307 * AP_UNAPPLY=always unapply). 3090 * AP_UNAPPLY=always unapply).
3308 * 3091 *
3309 * Optional flags: 3092 * Optional flags:
3310 * AP_NO_MERGE: don't merge an unapplied object with other objects 3093 * AP_NO_MERGE: don't merge an unapplied object with other objects
3311 * AP_IGNORE_CURSE: unapply cursed items 3094 * AP_IGNORE_CURSE: unapply cursed items
3095 * AP_NO_READY: do not ready skills when applying skill tools
3312 * 3096 *
3313 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3097 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3314 * 3098 *
3315 * apply_special() doesn't check for unpaid items. 3099 * apply_special() doesn't check for unpaid items.
3316 */ 3100 */
3101
3102#define LACK_ITEM_POWER \
3103 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3104
3317int 3105int
3318apply_special (object *who, object *op, int aflags) 3106apply_special (object *who, object *op, int aflags)
3319{ 3107{
3320 int basic_flag = aflags & AP_BASIC_FLAGS; 3108 int basic_flag = aflags & AP_BASIC_FLAGS;
3321 object *tmp, *tmp2, *skop = NULL; 3109 object *tmp, *tmp2, *skop = NULL;
3322 int i;
3323 3110
3324 if (who == NULL) 3111 if (who == NULL)
3325 { 3112 {
3326 LOG (llevError, "apply_special() from object without environment.\n"); 3113 LOG (llevError, "apply_special() from object without environment.\n");
3327 return 1; 3114 return 1;
… …
3337 if (basic_flag == AP_APPLY) 3124 if (basic_flag == AP_APPLY)
3338 return 0; 3125 return 0;
3339 3126
3340 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3127 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3341 { 3128 {
3342 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3129 who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
3343 return 1; 3130 return 1;
3344 } 3131 }
3132
3345 return unapply_special (who, op, aflags); 3133 return unapply_special (who, op, aflags);
3346 } 3134 }
3347 3135
3348 if (basic_flag == AP_UNAPPLY) 3136 if (basic_flag == AP_UNAPPLY)
3349 return 0; 3137 return 0;
3350 3138
3351 i = can_apply_object (who, op); 3139 // if the item is combat/ranged, wield the relevant slot first
3140 // to resolve conflicts.
3141 if (player *pl = who->contr)
3142 switch (op->slottype ())
3143 {
3144 case slot_combat: who->change_weapon (pl->combat_ob); break;
3145 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3146 }
3147
3148 splay (op);
3352 3149
3353 /* Can't just apply this object. Lets see what not and what to do */ 3150 /* Can't just apply this object. Lets see what not and what to do */
3354 if (i) 3151 if (int i = can_apply_object (who, op))
3355 { 3152 {
3356 if (i & CAN_APPLY_NEVER) 3153 if (i & CAN_APPLY_NEVER)
3357 { 3154 {
3358 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3155 who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
3359 return 1; 3156 return 1;
3360 } 3157 }
3361 else if (i & CAN_APPLY_RESTRICTION) 3158 else if (i & CAN_APPLY_RESTRICTION)
3362 { 3159 {
3363 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3160 who->failmsg (format (
3161 "You have a prohibition against using a %s. "
3162 "H<Your belief, profession or class prevents you from applying this item.>",
3163 query_name (op)
3164 ));
3364 return 1; 3165 return 1;
3365 } 3166 }
3167
3366 if (who->type != PLAYER) 3168 if (who->type != PLAYER)
3367 { 3169 {
3368 /* Some error, so don't try to equip something more */ 3170 /* Some error, so don't try to equip something more */
3369 if (unapply_for_ob (who, op, aflags)) 3171 if (unapply_for_ob (who, op, aflags))
3370 return 1; 3172 return 1;
3371 } 3173 }
3372 else 3174 else
3373 { 3175 {
3374 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3176 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3375 { 3177 {
3376 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3178 who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
3377 unapply_for_ob (who, op, AP_PRINT); 3179 unapply_for_ob (who, op, AP_PRINT);
3378 return 1; 3180 return 1;
3379 } 3181 }
3380 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3182 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3381 {
3382 i = unapply_for_ob (who, op, aflags); 3183 if (unapply_for_ob (who, op, aflags))
3383 if (i)
3384 return 1; 3184 return 1;
3385 } 3185 }
3386 }
3387 } 3186 }
3187
3388 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3188 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3389 { 3189 {
3390 skop = find_skill_by_name (who, op->skill); 3190 skop = find_skill_by_name (who, op->skill);
3191
3391 if (!skop) 3192 if (!skop)
3392 { 3193 {
3393 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3194 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3394 return 1; 3195 return 1;
3395 } 3196 }
3396 else 3197 else
3397 {
3398 /* While experience will be credited properly, we want to change the 3198 /* While experience will be credited properly, we want to change the
3399 * skill so that the dam and wc get updated 3199 * skill so that the dam and wc get updated
3400 */ 3200 */
3401 change_skill (who, skop, 0); 3201 who->change_skill (skop);
3402 }
3403 }
3404
3405 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3406 { 3202 }
3407 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3203
3204 if (who->type == PLAYER
3205 && op->item_power
3206 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3207 {
3208 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3408 return 1; 3209 return 1;
3409 } 3210 }
3410
3411 3211
3412 /* Ok. We are now at the state where we can apply the new object. 3212 /* Ok. We are now at the state where we can apply the new object.
3413 * Note that we don't have the checks for can_use_... 3213 * Note that we don't have the checks for can_use_...
3414 * below - that is already taken care of by can_apply_object. 3214 * below - that is already taken care of by can_apply_object.
3415 */ 3215 */
3416
3417
3418 if (op->nrof > 1) 3216 if (op->nrof > 1)
3419 tmp = get_split_ob (op, op->nrof - 1); 3217 tmp = get_split_ob (op, op->nrof - 1);
3420 else 3218 else
3421 tmp = NULL; 3219 tmp = 0;
3422 3220
3423 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3221 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3424 return RESULT_INT (0); 3222 return RESULT_INT (0);
3425 3223
3426 switch (op->type) 3224 switch (op->type)
3427 { 3225 {
3428 case WEAPON: 3226 case WEAPON:
3429 if (!check_weapon_power (who, op->last_eat)) 3227 if (!check_weapon_power (who, op->last_eat))
3430 { 3228 {
3431 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3229 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER);
3432 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3230
3433 if (tmp != NULL) 3231 if (tmp)
3434 (void) insert_ob_in_ob (tmp, who); 3232 insert_ob_in_ob (tmp, who);
3233
3435 return 1; 3234 return 1;
3436 } 3235 }
3236
3237 //TODO: this obviously fails for players using a shorter prefix
3238 // i.e. "R" can use Ragnarok's sword.
3437 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3239 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3438 { 3240 {
3439 /* if the weapon does not have the name as the character, can't use it. */ 3241 /* if the weapon does not have the name as the character, can't use it. */
3440 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3242 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3441 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3243 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3244
3442 if (tmp != NULL) 3245 if (tmp)
3443 (void) insert_ob_in_ob (tmp, who); 3246 insert_ob_in_ob (tmp, who);
3247
3444 return 1; 3248 return 1;
3445 } 3249 }
3250
3251 if (!skop)
3252 {
3253 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3254 return 1;
3255 }
3256
3446 SET_FLAG (op, FLAG_APPLIED); 3257 SET_FLAG (op, FLAG_APPLIED);
3447
3448 if (skop)
3449 change_skill (who, skop, 1); 3258 who->change_skill (skop);
3450 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3259
3260 if (who->contr)
3261 who->change_weapon (who->contr->combat_ob = op);
3262
3263 who->statusmsg (format ("You wield %s.", query_name (op)));
3264
3451 SET_FLAG (who, FLAG_READY_WEAPON); 3265 SET_FLAG (who, FLAG_READY_WEAPON);
3452
3453 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3454
3455 (void) change_abil (who, op); 3266 change_abil (who, op);
3456 break; 3267 break;
3457 3268
3458 case ARMOUR: 3269 case ARMOUR:
3459 case HELMET: 3270 case HELMET:
3460 case SHIELD: 3271 case SHIELD:
… …
3464 case BRACERS: 3275 case BRACERS:
3465 case CLOAK: 3276 case CLOAK:
3466 case RING: 3277 case RING:
3467 case AMULET: 3278 case AMULET:
3468 SET_FLAG (op, FLAG_APPLIED); 3279 SET_FLAG (op, FLAG_APPLIED);
3469 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3280 who->statusmsg (format ("You wear %s.", query_name (op)));
3470 (void) change_abil (who, op); 3281 change_abil (who, op);
3471 break; 3282 break;
3283
3472 case LAMP: 3284 case LAMP:
3473 if (op->stats.food < 1) 3285 if (op->stats.food < 1)
3474 { 3286 {
3475 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3287 who->failmsg (format (
3288 "Your %s is out of fuel! "
3289 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3290 &op->name
3291 ));
3476 return 1; 3292 return 1;
3477 } 3293 }
3478 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3294
3295 who->statusmsg (format ("You turn on your %s.", &op->name));
3296
3479 tmp2 = arch_to_object (op->other_arch); 3297 tmp2 = arch_to_object (op->other_arch);
3480 tmp2->stats.food = op->stats.food; 3298 tmp2->stats.food = op->stats.food;
3481 SET_FLAG (tmp2, FLAG_APPLIED); 3299 SET_FLAG (tmp2, FLAG_APPLIED);
3300
3482 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3301 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3483 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3302 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3303
3484 insert_ob_in_ob (tmp2, who); 3304 insert_ob_in_ob (tmp2, who);
3485 3305
3486 /* Remove the old lantern */ 3306 /* Remove the old lantern */
3487 if (who->type == PLAYER) 3307 if (who->type == PLAYER)
3488 esrv_del_item (who->contr, op->count); 3308 esrv_del_item (who->contr, op->count);
3489 3309
3490 op->destroy (); 3310 op->destroy ();
3491 3311
3492 /* insert the portion that was split off */ 3312 /* insert the portion that was split off */
3493 if (tmp != NULL) 3313 if (tmp)
3494 { 3314 {
3495 (void) insert_ob_in_ob (tmp, who); 3315 insert_ob_in_ob (tmp, who);
3496 if (who->type == PLAYER) 3316 if (who->type == PLAYER)
3497 esrv_send_item (who, tmp); 3317 esrv_send_item (who, tmp);
3498 } 3318 }
3499 fix_player (who); 3319
3320 who->update_stats ();
3321
3500 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3322 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3501 {
3502 if (who->type == PLAYER) 3323 if (who->type == PLAYER)
3503 { 3324 {
3504 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3325 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3505 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3326 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3506 } 3327 }
3507 } 3328
3508 if (who->type == PLAYER) 3329 if (who->type == PLAYER)
3509 esrv_send_item (who, tmp2); 3330 esrv_send_item (who, tmp2);
3331
3510 return 0; 3332 return 0;
3333
3334 case SKILL_TOOL:
3335 // applying a skill tool also readies the skill
3336 SET_FLAG (op, FLAG_APPLIED);
3337
3338 if (!(aflags & AP_NO_READY))
3339 {
3340 skop = find_skill_by_name (who, op->skill);
3341 if (!skop->flag [FLAG_APPLIED])
3342 apply_special (who, skop, AP_APPLY);
3343 }
3511 break; 3344 break;
3512 3345
3513 /* this part is needed for skill-tools */
3514 case SKILL: 3346 case SKILL:
3515 case SKILL_TOOL: 3347 if (player *pl = who->contr)
3516 if (who->chosen_skill)
3517 { 3348 {
3518 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3349 if (IS_COMBAT_SKILL (op->subtype))
3519 return 1;
3520 }
3521 if (who->type == PLAYER)
3522 { 3350 {
3523 who->contr->shoottype = range_skill; 3351 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3524 who->contr->ranges[range_skill] = op; 3352 {
3353 for (object *item = who->inv; item; item = item->below)
3354 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3355 {
3356 if (item->skill == op->skill)
3357 {
3358 who->change_weapon (pl->combat_ob = item);
3359 goto found_weapon;
3360 }
3361 }
3362
3363 who->failmsg (format (
3364 "You need to apply a '%s' melee weapon before readying this skill. "
3365 "H<Some skills need an item, in this case a melee weapon, to function.>",
3366 &op->skill
3367 ));
3368 return 1;
3369
3370 found_weapon:;
3371 }
3372 else
3373 who->change_weapon (pl->combat_ob = op);
3374 }
3375 else if (IS_RANGED_SKILL (op->subtype))
3376 {
3377 if (skill_flags [op->subtype] & SF_NEED_BOW)
3378 {
3379 for (object *item = who->inv; item; item = item->below)
3380 if (item->type == BOW && item->flag [FLAG_APPLIED])
3381 {
3382 //TODO: bows should/must all have skill missile weapon right now
3383 who->change_weapon (pl->ranged_ob = item);
3384 goto found_bow;
3385 }
3386
3387 who->failmsg (
3388 "You need to apply a missile weapon before readying this skill. "
3389 "H<Some skills need an item, in this case a missile weapon, to function.>"
3390 );
3391 return 1;
3392
3393 found_bow:;
3394 }
3395 else
3396 who->change_weapon (pl->ranged_ob = op);
3397 }
3398
3525 if (!op->invisible) 3399 if (!op->invisible)
3526 { 3400 {
3527 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3401 who->statusmsg (format (
3528 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3402 "You ready %s."
3403 "You can now use the skill: %s.",
3404 query_name (op),
3405 &op->skill
3406 ));
3529 } 3407 }
3530 else 3408 else
3531 {
3532 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3409 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
3533 }
3534 } 3410 }
3411 else
3412 {
3535 SET_FLAG (op, FLAG_APPLIED); 3413 SET_FLAG (op, FLAG_APPLIED);
3536 (void) change_abil (who, op); 3414 change_abil (who, op);
3537 who->chosen_skill = op; 3415 who->chosen_skill = op;
3538 SET_FLAG (who, FLAG_READY_SKILL); 3416 SET_FLAG (who, FLAG_READY_SKILL);
3417 }
3418
3539 break; 3419 break;
3540 3420
3541 case BOW: 3421 case BOW:
3542 if (!check_weapon_power (who, op->last_eat)) 3422 if (!check_weapon_power (who, op->last_eat))
3543 { 3423 {
3544 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3424 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3545 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3425
3546 if (tmp != NULL) 3426 if (tmp)
3547 (void) insert_ob_in_ob (tmp, who); 3427 insert_ob_in_ob (tmp, who);
3428
3548 return 1; 3429 return 1;
3549 } 3430 }
3431
3550 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3432 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3551 { 3433 {
3552 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3434 who->failmsg ("The weapon does not recognize you as its owner. "
3435 "H<Its name indicates that it belongs to somebody else.>");
3553 if (tmp != NULL) 3436 if (tmp)
3554 (void) insert_ob_in_ob (tmp, who); 3437 insert_ob_in_ob (tmp, who);
3438
3555 return 1; 3439 return 1;
3556 } 3440 }
3441
3557 /*FALLTHROUGH*/ case WAND: 3442 /*FALLTHROUGH*/
3443 case WAND:
3558 case ROD: 3444 case ROD:
3559 case HORN: 3445 case HORN:
3560 /* check for skill, alter player status */ 3446 /* check for skill, alter player status */
3447
3448 if (!skop)
3449 {
3450 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3451 return 1;
3452 }
3453
3561 SET_FLAG (op, FLAG_APPLIED); 3454 SET_FLAG (op, FLAG_APPLIED);
3562 if (skop)
3563 change_skill (who, skop, 0); 3455 who->change_skill (skop);
3564 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3565 3456
3566 if (who->type == PLAYER) 3457 if (who->contr)
3567 { 3458 {
3459 who->contr->ranged_ob = op;
3460
3461 who->statusmsg (format ("You ready %s.", query_name (op)));
3462
3568 if (op->type == BOW) 3463 if (op->type == BOW)
3569 { 3464 {
3465 who->current_weapon = op;
3570 (void) change_abil (who, op); 3466 change_abil (who, op);
3571 new_draw_info_format (NDI_UNIQUE, 0, who,
3572 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3467 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3573 who->contr->shoottype = range_bow;
3574 }
3575 else
3576 {
3577 who->contr->shoottype = range_misc;
3578 } 3468 }
3579 } 3469 }
3580 else 3470 else
3581 { 3471 {
3582 if (op->type == BOW) 3472 if (op->type == BOW)
3583 SET_FLAG (who, FLAG_READY_BOW); 3473 SET_FLAG (who, FLAG_READY_BOW);
3584 else 3474 else
3585 SET_FLAG (who, FLAG_READY_RANGE); 3475 SET_FLAG (who, FLAG_READY_RANGE);
3586 } 3476 }
3477
3587 break; 3478 break;
3588 3479
3589 case BUILDER: 3480 case BUILDER:
3590 if (who->contr->ranges[range_builder]) 3481 if (who->type == PLAYER)
3482 {
3483 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3484 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3591 unapply_special (who, who->contr->ranges[range_builder], 0); 3485 unapply_special (who, who->contr->ranged_ob, 0);
3592 who->contr->shoottype = range_builder; 3486
3487 who->statusmsg (format ("You ready your %s.", query_name (op)));
3488
3593 who->contr->ranges[range_builder] = op; 3489 who->contr->ranged_ob = op;
3594 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3490 }
3595 break; 3491 break;
3596 3492
3597 default: 3493 default:
3598 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3494 who->statusmsg (format ("You apply %s.", query_name (op)));
3599 } /* end of switch op->type */ 3495 }
3600 3496
3601 SET_FLAG (op, FLAG_APPLIED); 3497 SET_FLAG (op, FLAG_APPLIED);
3602 3498
3603 if (tmp != NULL) 3499 if (tmp)
3604 tmp = insert_ob_in_ob (tmp, who); 3500 tmp = insert_ob_in_ob (tmp, who);
3605 3501
3606 fix_player (who); 3502 who->update_stats ();
3607 3503
3608 /* We exclude spell casting objects. The fire code will set the 3504 /* We exclude spell casting objects. The fire code will set the
3609 * been applied flag when they are used - until that point, 3505 * been applied flag when they are used - until that point,
3610 * you don't know anything about them. 3506 * you don't know anything about them.
3611 */ 3507 */
3612 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3508 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3613 SET_FLAG (op, FLAG_BEEN_APPLIED); 3509 SET_FLAG (op, FLAG_BEEN_APPLIED);
3614 3510
3615 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3511 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3616 {
3617 if (who->type == PLAYER) 3512 if (who->type == PLAYER)
3618 { 3513 {
3619 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3514 who->failmsg (
3515 "Oops, it feels deadly cold! "
3516 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3517 );
3620 SET_FLAG (op, FLAG_KNOWN_CURSED); 3518 SET_FLAG (op, FLAG_KNOWN_CURSED);
3621 } 3519 }
3622 } 3520
3623 if (who->type == PLAYER) 3521 if (who->type == PLAYER)
3624 { 3522 {
3625 /* if multiple objects were applied, update both slots */ 3523 /* if multiple objects were applied, update both slots */
3626 if (tmp) 3524 if (tmp)
3627 esrv_send_item (who, tmp); 3525 esrv_send_item (who, tmp);
3526
3628 esrv_send_item (who, op); 3527 esrv_send_item (who, op);
3629 } 3528 }
3529
3630 return 0; 3530 return 0;
3631} 3531}
3632
3633 3532
3634int 3533int
3635monster_apply_special (object *who, object *op, int aflags) 3534monster_apply_special (object *who, object *op, int aflags)
3636{ 3535{
3637 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3536 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3638 return 1; 3537 return 1;
3538
3639 return apply_special (who, op, aflags); 3539 return apply_special (who, op, aflags);
3640} 3540}
3641 3541
3642/** 3542/**
3643 * Map was just loaded, handle op's initialisation. 3543 * Map was just loaded, handle op's initialisation.
… …
3651 int i; 3551 int i;
3652 3552
3653 switch (op->type) 3553 switch (op->type)
3654 { 3554 {
3655 case SHOP_FLOOR: 3555 case SHOP_FLOOR:
3656 if (!HAS_RANDOM_ITEMS (op)) 3556 if (!op->has_random_items ())
3657 return 0; 3557 return 0;
3658 3558
3659 do 3559 do
3660 { 3560 {
3661 i = 10; /* let's give it 10 tries */ 3561 i = 10; /* let's give it 10 tries */
… …
3681 3581
3682 case TREASURE: 3582 case TREASURE:
3683 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3583 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3684 return 0; 3584 return 0;
3685 3585
3686 while ((op->stats.hp--) > 0) 3586 while (op->stats.hp-- > 0)
3687 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3587 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3688 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3588 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3689 3589
3690 /* If we generated an object and put it in this object inventory, 3590 /* If we generated an object and put it in this object inventory,
3691 * move it to the parent object as the current object is about 3591 * move it to the parent object as the current object is about
… …
3708 } 3608 }
3709 return tmp ? 1 : 0; 3609 return tmp ? 1 : 0;
3710} 3610}
3711 3611
3712/** 3612/**
3713 * fix_auto_apply goes through the entire map (only the first time 3613 * fix_auto_apply goes through the entire map every time a map
3714 * when an original map is loaded) and performs special actions for 3614 * is loaded or swapped in and performs special actions for
3715 * certain objects (most initialization of chests and creation of 3615 * certain objects (most initialization of chests and creation of
3716 * treasures and stuff). Calls auto_apply if appropriate. 3616 * treasures and stuff). Calls auto_apply if appropriate.
3717 */ 3617 */
3718void 3618void
3719fix_auto_apply (maptile *m) 3619maptile::fix_auto_apply ()
3720{ 3620{
3721 object *tmp, *above = NULL; 3621 if (!spaces)
3722 int x, y;
3723
3724 if (m == NULL)
3725 return; 3622 return;
3726 3623
3727 for (x = 0; x < MAP_WIDTH (m); x++) 3624 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3728 for (y = 0; y < MAP_HEIGHT (m); y++) 3625 for (object *tmp = ms->bot; tmp; )
3729 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3730 { 3626 {
3731 above = tmp->above; 3627 object *above = tmp->above;
3732 3628
3733 if (tmp->inv) 3629 if (tmp->inv)
3734 { 3630 {
3735 object *invtmp, *invnext; 3631 object *invtmp, *invnext;
3736 3632
3737 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3633 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3738 { 3634 {
3739 invnext = invtmp->below; 3635 invnext = invtmp->below;
3740 3636
3741 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3637 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3742 auto_apply (invtmp); 3638 auto_apply (invtmp);
3743 else if (invtmp->type == TREASURE && HAS_RANDOM_ITEMS (invtmp)) 3639 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3744 { 3640 {
3745 while ((invtmp->stats.hp--) > 0) 3641 while ((invtmp->stats.hp--) > 0)
3746 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3747
3748 invtmp->randomitems = NULL;
3749 }
3750 else if (invtmp && invtmp->arch
3751 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && HAS_RANDOM_ITEMS (invtmp))
3752 {
3753 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3642 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3643
3644 invtmp->randomitems = NULL;
3645 }
3646 else if (invtmp && invtmp->arch
3647 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3648 {
3649 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3754 /* Need to clear this so that we never try to create 3650 /* Need to clear this so that we never try to create
3755 * treasure again for this object 3651 * treasure again for this object
3756 */ 3652 */
3757 invtmp->randomitems = NULL; 3653 invtmp->randomitems = NULL;
3758 } 3654 }
3759 } 3655 }
3760 /* This is really temporary - the code at the bottom will 3656 /* This is really temporary - the code at the bottom will
3761 * also set randomitems to null. The problem is there are bunches 3657 * also set randomitems to null. The problem is there are bunches
3762 * of maps/players already out there with items that have spells 3658 * of maps/players already out there with items that have spells
3763 * which haven't had the randomitems set to null yet. 3659 * which haven't had the randomitems set to null yet.
3764 * MSW 2004-05-13 3660 * MSW 2004-05-13
3765 * 3661 *
3766 * And if it's a spellbook, it's better to set randomitems to NULL too, 3662 * And if it's a spellbook, it's better to set randomitems to NULL too,
3767 * else you get two spells in the book ^_- 3663 * else you get two spells in the book ^_-
3768 * Ryo 2004-08-16 3664 * Ryo 2004-08-16
3769 */ 3665 */
3770 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3666 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3771 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3667 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3772 tmp->randomitems = NULL;
3773
3774 }
3775
3776 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3777 auto_apply (tmp);
3778 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && HAS_RANDOM_ITEMS (tmp))
3779 {
3780 while ((tmp->stats.hp--) > 0)
3781 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3782 tmp->randomitems = NULL; 3668 tmp->randomitems = NULL;
3669
3783 } 3670 }
3671
3672 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3673 auto_apply (tmp);
3674 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3675 {
3676 while ((tmp->stats.hp--) > 0)
3677 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3678 tmp->randomitems = NULL;
3679 }
3784 else if (tmp->type == TIMED_GATE) 3680 else if (tmp->type == TIMED_GATE)
3785 { 3681 {
3786 object *head = tmp->head != NULL ? tmp->head : tmp; 3682 object *head = tmp->head != NULL ? tmp->head : tmp;
3787 3683
3788 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3684 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3789 {
3790 tmp->speed = 0; 3685 tmp->set_speed (0);
3791 update_ob_speed (tmp);
3792 }
3793 } 3686 }
3794 /* This function can be called everytime a map is loaded, even when 3687 /* This function can be called everytime a map is loaded, even when
3795 * swapping back in. As such, we don't want to create the treasure 3688 * swapping back in. As such, we don't want to create the treasure
3796 * over and ove again, so after we generate the treasure, blank out 3689 * over and ove again, so after we generate the treasure, blank out
3797 * randomitems so if it is swapped in again, it won't make anything. 3690 * randomitems so if it is swapped in again, it won't make anything.
3798 * This is a problem for the above objects, because they have counters 3691 * This is a problem for the above objects, because they have counters
3799 * which say how many times to make the treasure. 3692 * which say how many times to make the treasure.
3800 */ 3693 */
3801 else if (tmp && tmp->arch && tmp->type != PLAYER 3694 else if (tmp && tmp->arch && tmp->type != PLAYER
3802 && tmp->type != TREASURE && tmp->type != SPELL 3695 && tmp->type != TREASURE && tmp->type != SPELL
3803 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && HAS_RANDOM_ITEMS (tmp)) 3696 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3804 { 3697 {
3805 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3698 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3806 tmp->randomitems = NULL; 3699 tmp->randomitems = NULL;
3807 } 3700 }
3701
3702 // close all containers
3703 else if (tmp->type == CONTAINER)
3704 tmp->flag [FLAG_APPLIED] = 0;
3705
3706 tmp = above;
3808 } 3707 }
3809 3708
3810 for (x = 0; x < MAP_WIDTH (m); x++) 3709 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3811 for (y = 0; y < MAP_HEIGHT (m); y++) 3710 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3812 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3813 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3711 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3814 check_trigger (tmp, tmp->above); 3712 check_trigger (tmp, tmp->above);
3815} 3713}
3816 3714
3817/** 3715/**
3818 * Handles player eating food that temporarily changes status (resistances, stats). 3716 * Handles player eating food that temporarily changes status (resistances, stats).
3819 * This used to call cast_change_attr(), but 3717 * This used to call cast_change_attr(), but
3820 * that doesn't work with the new spell code. Since we know what 3718 * that doesn't work with the new spell code. Since we know what
3821 * the food changes, just grab a force and use that instead. 3719 * the food changes, just grab a force and use that instead.
3822 */ 3720 */
3823
3824void 3721void
3825eat_special_food (object *who, object *food) 3722eat_special_food (object *who, object *food)
3826{ 3723{
3827 object *force; 3724 object *force;
3828 int i, did_one = 0; 3725 int i, did_one = 0;
3829 sint8 k;
3830 3726
3831 force = get_archetype (FORCE_NAME); 3727 force = get_archetype (FORCE_NAME);
3832 3728
3833 for (i = 0; i < NUM_STATS; i++) 3729 for (i = 0; i < NUM_STATS; i++)
3834 { 3730 if (sint8 k = food->stats.stat (i))
3835 k = get_attr_value (&food->stats, i);
3836 if (k)
3837 { 3731 {
3838 set_attr_value (&force->stats, i, k); 3732 force->stats.stat (i) = k;
3839 did_one = 1; 3733 did_one = 1;
3840 } 3734 }
3841 }
3842 3735
3843 /* check if we can protect the eater */ 3736 /* check if we can protect the eater */
3844 for (i = 0; i < NROFATTACKS; i++) 3737 for (i = 0; i < NROFATTACKS; i++)
3845 { 3738 {
3846 if (food->resist[i] > 0) 3739 if (food->resist[i] > 0)
3847 { 3740 {
3848 force->resist[i] = food->resist[i] / 2; 3741 force->resist[i] = food->resist[i] / 2;
3849 did_one = 1; 3742 did_one = 1;
3850 } 3743 }
3851 } 3744 }
3745
3852 if (did_one) 3746 if (did_one)
3853 { 3747 {
3854 force->speed = 0.1; 3748 force->set_speed (0.1);
3855 update_ob_speed (force);
3856 /* bigger morsel of food = longer effect time */ 3749 /* bigger morsel of food = longer effect time */
3857 force->stats.food = food->stats.food / 5; 3750 force->duration = food->stats.food / 5;
3858 SET_FLAG (force, FLAG_IS_USED_UP);
3859 SET_FLAG (force, FLAG_APPLIED); 3751 SET_FLAG (force, FLAG_APPLIED);
3860 change_abil (who, force); 3752 change_abil (who, force);
3861 insert_ob_in_ob (force, who); 3753 insert_ob_in_ob (force, who);
3862 } 3754 }
3863 else 3755 else
… …
3866 /* check for hp, sp change */ 3758 /* check for hp, sp change */
3867 if (food->stats.hp != 0) 3759 if (food->stats.hp != 0)
3868 { 3760 {
3869 if (QUERY_FLAG (food, FLAG_CURSED)) 3761 if (QUERY_FLAG (food, FLAG_CURSED))
3870 { 3762 {
3871 strcpy (who->contr->killer, food->name); 3763 assign (who->contr->killer, food->name);
3872 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3764 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3873 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3765 who->failmsg ("Eck!...that was poisonous!");
3874 } 3766 }
3875 else 3767 else
3876 { 3768 {
3877 if (food->stats.hp > 0) 3769 if (food->stats.hp > 0)
3878 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better."); 3770 who->statusmsg ("You begin to feel better.");
3879 else 3771 else
3880 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3772 who->failmsg ("Eck!...that was poisonous!");
3773
3881 who->stats.hp += food->stats.hp; 3774 who->stats.hp += food->stats.hp;
3882 } 3775 }
3883 } 3776 }
3884 if (food->stats.sp != 0) 3777 if (food->stats.sp != 0)
3885 { 3778 {
3886 if (QUERY_FLAG (food, FLAG_CURSED)) 3779 if (QUERY_FLAG (food, FLAG_CURSED))
3887 { 3780 {
3888 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!"); 3781 who->failmsg ("You are drained of mana!");
3889 who->stats.sp -= food->stats.sp; 3782 who->stats.sp -= food->stats.sp;
3890 if (who->stats.sp < 0) 3783 if (who->stats.sp < 0)
3891 who->stats.sp = 0; 3784 who->stats.sp = 0;
3892 } 3785 }
3893 else 3786 else
3894 { 3787 {
3895 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3788 who->statusmsg ("You feel a rush of magical energy!");
3896 who->stats.sp += food->stats.sp; 3789 who->stats.sp += food->stats.sp;
3897 /* place limit on max sp from food? */ 3790 /* place limit on max sp from food? */
3898 } 3791 }
3899 } 3792 }
3900 fix_player (who);
3901}
3902 3793
3794 who->update_stats ();
3795}
3903 3796
3904/** 3797/**
3905 * Designed primarily to light torches/lanterns/etc. 3798 * Designed primarily to light torches/lanterns/etc.
3906 * Also burns up burnable material too. First object in the inventory is 3799 * Also burns up burnable material too. First object in the inventory is
3907 * the selected object to "burn". -b.t. 3800 * the selected object to "burn". -b.t.
3908 */ 3801 */
3909
3910void 3802void
3911apply_lighter (object *who, object *lighter) 3803apply_lighter (object *who, object *lighter)
3912{ 3804{
3913 object *item; 3805 object *item;
3914 int is_player_env = 0; 3806 int is_player_env = 0;
3915 char item_name[MAX_BUF];
3916 3807
3917 item = find_marked_object (who); 3808 item = find_marked_object (who);
3918 if (item) 3809 if (item)
3919 { 3810 {
3920 if (lighter->last_eat && lighter->stats.food) 3811 if (lighter->last_eat && lighter->stats.food)
3921 { /* lighter gets used up */ 3812 { /* lighter gets used up */
3922 /* Split multiple lighters if they're being used up. Otherwise * 3813 /* Split multiple lighters if they're being used up. Otherwise *
3923 * one charge from each would be used up. --DAMN */ 3814 * one charge from each would be used up. --DAMN */
3924 if (lighter->nrof > 1) 3815 if (lighter->nrof > 1)
3925 { 3816 {
3926 object *oneLighter = object::create (); 3817 object *oneLighter = lighter->clone ();
3927 3818
3928 lighter->copy_to (oneLighter);
3929 lighter->nrof -= 1; 3819 lighter->nrof -= 1;
3930 oneLighter->nrof = 1; 3820 oneLighter->nrof = 1;
3931 oneLighter->stats.food--; 3821 oneLighter->stats.food--;
3932 esrv_send_item (who, lighter); 3822 esrv_send_item (who, lighter);
3933 oneLighter = insert_ob_in_ob (oneLighter, who); 3823 oneLighter = insert_ob_in_ob (oneLighter, who);
… …
3935 } 3825 }
3936 else 3826 else
3937 lighter->stats.food--; 3827 lighter->stats.food--;
3938 } 3828 }
3939 else if (lighter->last_eat) 3829 else if (lighter->last_eat)
3830 {
3940 { /* no charges left in lighter */ 3831 /* no charges left in lighter */
3941 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3832 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3942 return; 3833 return;
3943 } 3834 }
3835
3944 /* Perhaps we should split what we are trying to light on fire? 3836 /* Perhaps we should split what we are trying to light on fire?
3945 * I can't see many times when you would want to light multiple 3837 * I can't see many times when you would want to light multiple
3946 * objects at once. 3838 * objects at once.
3947 */ 3839 */
3948 /* If the item is destroyed, we don't have a valid pointer to the 3840
3949 * name object, so make a copy so the message we print out makes
3950 * some sense.
3951 */
3952 strcpy (item_name, item->name);
3953 if (who == is_player_inv (item)) 3841 if (who == item->in_player ())
3954 is_player_env = 1; 3842 is_player_env = 1;
3955 3843
3956 save_throw_object (item, AT_FIRE, who); 3844 save_throw_object (item, AT_FIRE, who);
3957 /* Change to check count and not freed, since the object pointer 3845
3958 * may have gotten recycled
3959 */
3960 if (item->destroyed ()) 3846 if (item->destroyed ())
3961 { 3847 {
3962 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3848 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3963 /* Need to update the player so that the players glow radius 3849 /* Need to update the player so that the players glow radius
3964 * gets changed. 3850 * gets changed.
3965 */ 3851 */
3966 if (is_player_env) 3852 if (is_player_env)
3967 fix_player (who); 3853 who->update_stats ();
3968 } 3854 }
3969 else 3855 else
3970 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3856 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3971 } 3857 }
3972 else /* nothing to light */ 3858 else
3973 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object."); 3859 who->failmsg ("You need to mark a lightable object.");
3974
3975} 3860}
3976 3861
3977/** 3862/**
3978 * op made some mistake with a scroll, this takes care of punishment. 3863 * op made some mistake with a scroll, this takes care of punishment.
3979 * scroll_failure()- hacked directly from spell_failure 3864 * scroll_failure()- hacked directly from spell_failure
… …
3986 3871
3987 if (failure <= -1 && failure > -15) 3872 if (failure <= -1 && failure > -15)
3988 { /* wonder */ 3873 { /* wonder */
3989 object *tmp; 3874 object *tmp;
3990 3875
3991 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3876 op->failmsg ("Your spell warps!");
3992 tmp = get_archetype (SPELL_WONDER); 3877 tmp = get_archetype (SPELL_WONDER);
3993 cast_wonder (op, op, 0, tmp); 3878 cast_wonder (op, op, 0, tmp);
3994 tmp->destroy (); 3879 tmp->destroy ();
3995 } 3880 }
3996 else if (failure <= -15 && failure > -35) 3881 else if (failure <= -15 && failure > -35)
3997 { /* drain mana */ 3882 { /* drain mana */
3998 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3883 op->failmsg ("Your mana is drained!");
3999 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3884 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
4000 if (op->stats.sp < 0) 3885 if (op->stats.sp < 0)
4001 op->stats.sp = 0; 3886 op->stats.sp = 0;
4002 } 3887 }
4003 else if (settings.spell_failure_effects == TRUE) 3888 else if (settings.spell_failure_effects == TRUE)
4004 { 3889 {
4005 if (failure <= -35 && failure > -60) 3890 if (failure <= -35 && failure > -60)
4006 { /* confusion */ 3891 { /* confusion */
4007 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3892 op->failmsg ("The magic recoils on you!");
4008 confuse_player (op, op, power); 3893 confuse_player (op, op, power);
4009 } 3894 }
4010 else if (failure <= -60 && failure > -70) 3895 else if (failure <= -60 && failure > -70)
4011 { /* paralysis */ 3896 { /* paralysis */
4012 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!"); 3897 op->failmsg ("The magic recoils and paralyzes you!");
4013 paralyze_player (op, op, power); 3898 paralyze_player (op, op, power);
4014 } 3899 }
4015 else if (failure <= -70 && failure > -80) 3900 else if (failure <= -70 && failure > -80)
4016 { /* blind */ 3901 { /* blind */
4017 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3902 op->failmsg ("The magic recoils on you!");
4018 blind_player (op, op, power); 3903 blind_player (op, op, power);
4019 } 3904 }
4020 else if (failure <= -80) 3905 else if (failure <= -80)
4021 { /* blast the immediate area */ 3906 { /* blast the immediate area */
4022 object *tmp;
4023
4024 tmp = get_archetype (LOOSE_MANA); 3907 object *tmp = get_archetype (LOOSE_MANA);
4025 cast_magic_storm (op, tmp, power); 3908 cast_magic_storm (op, tmp, power);
4026 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3909 op->failmsg ("You unleash uncontrolled mana!");
4027 tmp->destroy (); 3910 tmp->destroy ();
4028 } 3911 }
4029 } 3912 }
4030} 3913}
4031 3914
… …
4051 */ 3934 */
4052 int i, j; 3935 int i, j;
4053 3936
4054 for (i = 0; i < NUM_STATS; i++) 3937 for (i = 0; i < NUM_STATS; i++)
4055 { 3938 {
4056 sint8 stat = get_attr_value (stats, i); 3939 int race_bonus = pl->arch->stats.stat (i);
4057 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3940 sint8 stat = stats->stat (i) + ns->stat (i);
4058 3941
4059 stat += get_attr_value (ns, i);
4060 if (stat > 20 + race_bonus) 3942 if (stat > 20 + race_bonus)
4061 { 3943 {
4062 excess_stat++; 3944 excess_stat++;
4063 stat = 20 + race_bonus; 3945 stat = 20 + race_bonus;
4064 } 3946 }
4065 set_attr_value (stats, i, stat); 3947
3948 stats->stat (i) = stat;
4066 } 3949 }
4067 3950
4068 for (j = 0; excess_stat > 0 && j < 100; j++) 3951 for (j = 0; excess_stat > 0 && j < 100; j++)
4069 { /* try 100 times to assign excess stats */ 3952 { /* try 100 times to assign excess stats */
4070 int i = rndm (0, 6); 3953 int i = rndm (0, 6);
4071 int stat = get_attr_value (stats, i);
4072 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
4073 3954
4074 if (i == CHA) 3955 if (i == CHA)
4075 continue; /* exclude cha from this */ 3956 continue; /* exclude cha from this */
3957
3958 int stat = stats->stat (i);
3959 int race_bonus = pl->arch->stats.stat (i);
4076 if (stat < 20 + race_bonus) 3960 if (stat < 20 + race_bonus)
4077 { 3961 {
4078 change_attr_value (stats, i, 1); 3962 change_attr_value (stats, i, 1);
4079 excess_stat--; 3963 excess_stat--;
4080 } 3964 }
… …
4083 /* insert the randomitems from the change's treasurelist into 3967 /* insert the randomitems from the change's treasurelist into
4084 * the player ref: player.c 3968 * the player ref: player.c
4085 */ 3969 */
4086 if (change->randomitems != NULL) 3970 if (change->randomitems != NULL)
4087 give_initial_items (pl, change->randomitems); 3971 give_initial_items (pl, change->randomitems);
4088
4089 3972
4090 /* set up the face, for some races. */ 3973 /* set up the face, for some races. */
4091 3974
4092 /* first, look for the force object banning 3975 /* first, look for the force object banning
4093 * changing the face. Certain races never change face with class. 3976 * changing the face. Certain races never change face with class.
… …
4138 char got[MAX_BUF]; 4021 char got[MAX_BUF];
4139 int len; 4022 int len;
4140 4023
4141 if (!pl || !transformer) 4024 if (!pl || !transformer)
4142 return; 4025 return;
4026
4143 marked = find_marked_object (pl); 4027 marked = find_marked_object (pl);
4028
4144 if (!marked) 4029 if (!marked)
4145 { 4030 {
4146 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 4031 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
4147 return; 4032 return;
4148 } 4033 }
4034
4149 if (!marked->slaying) 4035 if (!marked->slaying)
4150 { 4036 {
4151 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4037 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4152 return; 4038 return;
4153 } 4039 }
4040
4154 /* check whether they are compatible or not */ 4041 /* check whether they are compatible or not */
4155 find = strstr (marked->slaying, transformer->arch->name); 4042 find = strstr (marked->slaying, transformer->arch->archname);
4156 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 4043 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4157 { 4044 {
4158 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4045 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4159 return; 4046 return;
4160 } 4047 }
4048
4161 find += strlen (transformer->arch->name) + 1; 4049 find += strlen (transformer->arch->archname) + 1;
4162 /* Item can be used, now find how many and what it yields */ 4050 /* Item can be used, now find how many and what it yields */
4163 if (isdigit (*(find))) 4051 if (isdigit (*(find)))
4164 { 4052 {
4165 yield = atoi (find); 4053 yield = atoi (find);
4166 if (yield < 1) 4054 if (yield < 1)
… …
4172 else 4060 else
4173 yield = 1; 4061 yield = 1;
4174 4062
4175 while (isdigit (*find)) 4063 while (isdigit (*find))
4176 find++; 4064 find++;
4065
4177 while (*find == ' ') 4066 while (*find == ' ')
4178 find++; 4067 find++;
4068
4179 memset (got, 0, MAX_BUF); 4069 memset (got, 0, MAX_BUF);
4070
4180 if ((separator = strchr (find, ';')) != NULL) 4071 if ((separator = strchr (find, ';')) != NULL)
4181 {
4182 len = separator - find; 4072 len = separator - find;
4183 }
4184 else 4073 else
4185 {
4186 len = strlen (find); 4074 len = strlen (find);
4187 } 4075
4188 if (len > MAX_BUF - 1) 4076 if (len > MAX_BUF - 1)
4189 len = MAX_BUF - 1; 4077 len = MAX_BUF - 1;
4078
4190 strcpy (got, find); 4079 strcpy (got, find);
4191 got[len] = '\0'; 4080 got[len] = '\0';
4192 4081
4193 /* Now create new item, remove used ones when required. */ 4082 /* Now create new item, remove used ones when required. */
4194 new_item = get_archetype (got); 4083 new_item = get_archetype (got);
4195 if (!new_item) 4084 if (!new_item)
4196 { 4085 {
4197 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0)); 4086 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
4198 return; 4087 return;
4199 } 4088 }
4200 4089
4201 new_item->nrof = yield; 4090 new_item->nrof = yield;
4091
4202 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4092 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4093
4203 insert_ob_in_ob (new_item, pl); 4094 insert_ob_in_ob (new_item, pl);
4204 esrv_send_inventory (pl, pl); 4095 esrv_send_inventory (pl, pl);
4205 /* Eat up one item */ 4096 /* Eat up one item */
4206 decrease_ob_nr (marked, 1); 4097 decrease_ob_nr (marked, 1);
4098
4207 /* Eat one transformer if needed */ 4099 /* Eat one transformer if needed */
4208 if (transformer->stats.food) 4100 if (transformer->stats.food)
4209 if (--transformer->stats.food == 0) 4101 if (--transformer->stats.food == 0)
4210 decrease_ob_nr (transformer, 1); 4102 decrease_ob_nr (transformer, 1);
4211} 4103}
4104

Diff Legend

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