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

Diff Legend

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