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.113 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.206 by root, Fri Oct 23 03:08:35 2009 UTC

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

Diff Legend

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