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

Diff Legend

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