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.31 by root, Sun Dec 3 20:26:35 2006 UTC vs.
Revision 1.148 by root, Tue Apr 22 04:06:07 2008 UTC

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

Diff Legend

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