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

Diff Legend

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