ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_effect.C
(Generate patch)

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.29 by root, Sat Dec 30 22:01:39 2006 UTC vs.
Revision 1.71 by root, Wed Aug 29 20:40:25 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <object.h> 25#include <object.h>
26#include <living.h> 26#include <living.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 27#include <sproto.h>
29#endif
30#include <spells.h> 28#include <spells.h>
31#include <sounds.h> 29#include <sounds.h>
32 30
33/* cast_magic_storm: This is really used mostly for spell 31/* cast_magic_storm: This is really used mostly for spell
34 * fumbles at the like. tmp is the object to propogate. 32 * fumbles at the like. tmp is the object to propogate.
… …
71 return 0; 69 return 0;
72 } 70 }
73 if (!(random_roll (0, 3, op, PREFER_HIGH))) 71 if (!(random_roll (0, 3, op, PREFER_HIGH)))
74 { 72 {
75 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 73 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
76 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 74 op->play_sound (sound_find ("ob_explode"));
77 esrv_del_item (op->contr, wand->count); 75 esrv_del_item (op->contr, wand->count);
78 wand->destroy (); 76 wand->destroy ();
79 tmp = get_archetype ("fireball"); 77 tmp = get_archetype ("fireball");
80 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 78 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
81 79
… …
105 ncharges = 1; 103 ncharges = 1;
106 104
107 wand->stats.food += ncharges; 105 wand->stats.food += ncharges;
108 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 106 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
109 107
110 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 108 if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))
111 { 109 {
112 SET_FLAG (wand, FLAG_ANIMATE); 110 SET_FLAG (wand, FLAG_ANIMATE);
113 wand->set_speed (wand->arch->clone.speed); 111 wand->set_speed (wand->arch->speed);
114 } 112 }
115 113
116 return 1; 114 return 1;
117} 115}
118 116
… …
124 * great a plus, the default is used. 122 * great a plus, the default is used.
125 * The # of arrows created also goes up with level, so if a 30th level mage 123 * The # of arrows created also goes up with level, so if a 30th level mage
126 * wants LOTS of arrows, and doesn't care what the plus is he could 124 * wants LOTS of arrows, and doesn't care what the plus is he could
127 * create nonnmagic arrows, or even -1, etc... 125 * create nonnmagic arrows, or even -1, etc...
128 */ 126 */
129
130int 127int
131cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg) 128cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)
132{ 129{
133 int missile_plus = 0, bonus_plus = 0; 130 int missile_plus = 0, bonus_plus = 0;
134 const char *missile_name; 131 const char *missile_name;
… …
155 /* If it starts with a letter, presume it is a description */ 152 /* If it starts with a letter, presume it is a description */
156 if (isalpha (*stringarg)) 153 if (isalpha (*stringarg))
157 { 154 {
158 artifact *al = find_artifactlist (missile->type)->items; 155 artifact *al = find_artifactlist (missile->type)->items;
159 156
160 for (; al != NULL; al = al->next) 157 for (; al; al = al->next)
161 if (!strcasecmp (al->item->name, stringarg)) 158 if (!strcasecmp (al->item->name, stringarg))
162 break; 159 break;
163 160
164 if (!al) 161 if (!al)
165 { 162 {
… …
225 if (stringarg) 222 if (stringarg)
226 { 223 {
227 at = find_archetype_by_object_type_name (FOOD, stringarg); 224 at = find_archetype_by_object_type_name (FOOD, stringarg);
228 if (at == NULL) 225 if (at == NULL)
229 at = find_archetype_by_object_type_name (DRINK, stringarg); 226 at = find_archetype_by_object_type_name (DRINK, stringarg);
230 if (at == NULL || at->clone.stats.food > food_value) 227 if (at == NULL || at->stats.food > food_value)
231 stringarg = NULL; 228 stringarg = NULL;
232 } 229 }
233 230
234 if (!stringarg) 231 if (!stringarg)
235 { 232 {
… …
241 * We don't use flesh types because the weight values of those need 238 * We don't use flesh types because the weight values of those need
242 * to be altered from the donor. 239 * to be altered from the donor.
243 */ 240 */
244 241
245 /* We assume the food items don't have multiple parts */ 242 /* We assume the food items don't have multiple parts */
246 for (at_tmp = first_archetype; at_tmp != NULL; at_tmp = at_tmp->next) 243 for_all_archetypes (at_tmp)
247 { 244 {
248 if (at_tmp->clone.type == FOOD || at_tmp->clone.type == DRINK) 245 if (at_tmp->type == FOOD || at_tmp->type == DRINK)
249 { 246 {
250 /* Basically, if the food value is something that is creatable 247 /* Basically, if the food value is something that is creatable
251 * under the limits of the spell and it is higher than 248 * under the limits of the spell and it is higher than
252 * the item we have now, take it instead. 249 * the item we have now, take it instead.
253 */ 250 */
254 if (at_tmp->clone.stats.food <= food_value && (!at || at_tmp->clone.stats.food > at->clone.stats.food)) 251 if (at_tmp->stats.food <= food_value
252 && (!at
253 || at_tmp->stats.food > at->stats.food
254 || (at_tmp->stats.food == at->stats.food
255 && at_tmp->weight < at->weight)))
255 at = at_tmp; 256 at = at_tmp;
256 } 257 }
257 } 258 }
258 } 259 }
260
259 /* Pretty unlikely (there are some very low food items), but you never 261 /* Pretty unlikely (there are some very low food items), but you never
260 * know 262 * know
261 */ 263 */
262 if (!at) 264 if (!at)
263 { 265 {
264 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food."); 266 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");
265 return 0; 267 return 0;
266 } 268 }
267 269
268 food_value /= at->clone.stats.food; 270 food_value /= at->stats.food;
269 new_op = arch_to_object (at); 271 new_op = arch_to_object (at);
270 new_op->nrof = food_value; 272 new_op->nrof = food_value;
271 273
272 new_op->value = 0; 274 new_op->value = 0;
273 if (new_op->nrof < 1) 275 if (new_op->nrof < 1)
… …
288 if (!dir) 290 if (!dir)
289 { 291 {
290 examine_monster (op, op); 292 examine_monster (op, op);
291 return 1; 293 return 1;
292 } 294 }
295
293 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 296 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
294 for (r = 1; r < maxrange; r++) 297 for (r = 1; r < maxrange; r++)
295 { 298 {
296 sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir]; 299 sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir];
297 300
… …
317 examine_monster (op, tmp); 320 examine_monster (op, tmp);
318 return 1; 321 return 1;
319 } 322 }
320 } 323 }
321 } 324 }
325
322 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing."); 326 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
323 return 1; 327 return 1;
324} 328}
325
326 329
327/* This checks to see if 'pl' is invisible to 'mon'. 330/* This checks to see if 'pl' is invisible to 'mon'.
328 * does race check, undead check, etc 331 * does race check, undead check, etc
329 * Returns TRUE if mon can't see pl, false 332 * Returns TRUE if mon can't see pl, false
330 * otherwise. This doesn't check range, walls, etc. It 333 * otherwise. This doesn't check range, walls, etc. It
… …
332 * pl is invisible. 335 * pl is invisible.
333 */ 336 */
334int 337int
335makes_invisible_to (object *pl, object *mon) 338makes_invisible_to (object *pl, object *mon)
336{ 339{
337
338 if (!pl->invisible) 340 if (!pl->invisible)
339 return 0; 341 return 0;
342
340 if (pl->type == PLAYER) 343 if (pl->type == PLAYER)
341 { 344 {
342 /* If race isn't set, then invisible unless it is undead */ 345 /* If race isn't set, then invisible unless it is undead */
343 if (!pl->contr->invis_race) 346 if (!pl->contr->invis_race)
344 { 347 {
345 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 348 if (QUERY_FLAG (mon, FLAG_UNDEAD))
346 return 0; 349 return 0;
350
347 return 1; 351 return 1;
348 } 352 }
353
349 /* invis_race is set if we get here */ 354 /* invis_race is set if we get here */
350 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon)) 355 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))
351 return 1; 356 return 1;
357
352 /* No race, can't be invisible to it */ 358 /* No race, can't be invisible to it */
353 if (!mon->race) 359 if (!mon->race)
354 return 0; 360 return 0;
361
355 if (strstr (mon->race, pl->contr->invis_race)) 362 if (strstr (mon->race, pl->contr->invis_race))
356 return 1; 363 return 1;
364
357 /* Nothing matched above, return 0 */ 365 /* Nothing matched above, return 0 */
358 return 0; 366 return 0;
359 } 367 }
360 else 368 else
361 { 369 {
… …
374 * normal applies. 382 * normal applies.
375 */ 383 */
376int 384int
377cast_invisible (object *op, object *caster, object *spell_ob) 385cast_invisible (object *op, object *caster, object *spell_ob)
378{ 386{
379 object *tmp;
380
381 if (op->invisible > 1000) 387 if (op->invisible > 1000)
382 { 388 {
383 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further"); 389 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further");
384 return 0; 390 return 0;
385 } 391 }
… …
401 else 407 else
402 op->contr->tmp_invis = 1; 408 op->contr->tmp_invis = 1;
403 409
404 op->contr->hidden = 0; 410 op->contr->hidden = 0;
405 } 411 }
412
406 if (makes_invisible_to (op, op)) 413 if (makes_invisible_to (op, op))
407 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!"); 414 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!");
408 else 415 else
409 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!"); 416 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!");
410 417
411 update_object (op, UP_OBJ_FACE); 418 update_object (op, UP_OBJ_CHANGE);
412 419
413 /* Only search the active objects - only these should actually do 420 /* Only search the active objects - only these should actually do
414 * harm to the player. 421 * harm to the player.
415 */ 422 */
416 for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next) 423 for_all_actives (tmp)
417 if (tmp->enemy == op) 424 if (tmp->enemy == op)
418 tmp->enemy = NULL; 425 tmp->enemy = 0;
426
419 return 1; 427 return 1;
420} 428}
421 429
422/* earth to dust spell. Basically destroys earthwalls in the area. 430/* earth to dust spell. Basically destroys earthwalls in the area.
423 */ 431 */
… …
451 next = tmp->above; 459 next = tmp->above;
452 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 460 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
453 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 461 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
454 } 462 }
455 } 463 }
464
456 return 1; 465 return 1;
457} 466}
458
459 467
460void 468void
461execute_word_of_recall (object *op) 469execute_word_of_recall (object *op)
462{ 470{
463 object *wor = op; 471 if (object *pl = op->in_player ())
464 472 {
465 while (op != NULL && op->type != PLAYER) 473 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
466 op = op->env;
467
468 if (op != NULL && op->map)
469 if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST)))
470 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you."); 474 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
471 else 475 else
476 {
477 // remove first so we do not call update_stats
478 op->remove ();
472 op->enter_exit (wor); 479 pl->enter_exit (op);
480 }
481 }
473 482
474 wor->destroy (); 483 op->destroy ();
475} 484}
476 485
477/* Word of recall causes the player to return 'home'. 486/* Word of recall causes the player to return 'home'.
478 * we put a force into the player object, so that there is a 487 * we put a force into the player object, so that there is a
479 * time delay effect. 488 * time delay effect.
… …
519 */ 528 */
520 EXIT_PATH (dummy) = op->contr->savebed_map; 529 EXIT_PATH (dummy) = op->contr->savebed_map;
521 EXIT_X (dummy) = op->contr->bed_x; 530 EXIT_X (dummy) = op->contr->bed_x;
522 EXIT_Y (dummy) = op->contr->bed_y; 531 EXIT_Y (dummy) = op->contr->bed_y;
523 532
524 (void) insert_ob_in_ob (dummy, op); 533 op->insert (dummy);
534
525 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 535 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
536
526 return 1; 537 return 1;
527} 538}
528 539
529/* cast_wonder 540/* cast_wonder
530 * wonder is really just a spell that will likely cast another 541 * wonder is really just a spell that will likely cast another
… …
563} 574}
564 575
565int 576int
566perceive_self (object *op) 577perceive_self (object *op)
567{ 578{
568 char *cp = describe_item (op, op), buf[MAX_BUF]; 579 const char *cp = describe_item (op, op);
569 archetype *at = archetype::find (ARCH_DEPLETION); 580 archetype *at = archetype::find (ARCH_DEPLETION);
570 object *tmp;
571 int i;
572 581
582 dynbuf_text buf;
583
584 if (player *pl = op->contr)
585 if (object *race = archetype::find (op->race))
586 buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";
587
573 tmp = find_god (determine_god (op)); 588 if (object *god = find_god (determine_god (op)))
574 if (tmp) 589 buf << "You worship " << &god->name << ".\n";
575 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s", &tmp->name);
576 else 590 else
577 new_draw_info (NDI_UNIQUE, 0, op, "You worship no god"); 591 buf << "You worship no god.\n";
578 592
579 tmp = present_arch_in_ob (at, op); 593 object *tmp = present_arch_in_ob (at, op);
580 594
581 if (*cp == '\0' && tmp == NULL) 595 if (*cp == '\0' && tmp == NULL)
582 new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane"); 596 buf << "You feel very mundane. ";
583 else 597 else
584 { 598 {
585 new_draw_info (NDI_UNIQUE, 0, op, "You have:"); 599 buf << "You have: " << cp << ".\n";
586 new_draw_info (NDI_UNIQUE, 0, op, cp); 600
587 if (tmp != NULL) 601 if (tmp)
588 {
589 for (i = 0; i < NUM_STATS; i++) 602 for (int i = 0; i < NUM_STATS; i++)
590 { 603 if (tmp->stats.stat (i) < 0)
591 if (get_attr_value (&tmp->stats, i) < 0) 604 buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
592 {
593 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -(get_attr_value (&tmp->stats, i)));
594 }
595 }
596 }
597 } 605 }
598 606
599 if (is_dragon_pl (op)) 607 if (is_dragon_pl (op))
600 {
601 /* now grab the 'dragon_ability'-force from the player's inventory */ 608 /* now grab the 'dragon_ability'-force from the player's inventory */
602 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 609 for (tmp = op->inv; tmp; tmp = tmp->below)
603 { 610 {
604 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 611 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
605 { 612 {
606 if (tmp->stats.exp == 0) 613 if (tmp->stats.exp == 0)
607 {
608 sprintf (buf, "Your metabolism isn't focused on anything."); 614 buf << "Your metabolism isn't focused on anything.\n";
609 }
610 else 615 else
611 {
612 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 616 buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
613 } 617
614 new_draw_info (NDI_UNIQUE, 0, op, buf);
615 break; 618 break;
616 } 619 }
617 } 620 }
618 }
619 return 1;
620}
621 621
622/* int cast_create_town_portal (object *op, object *caster, int dir) 622 buf << '\0'; // zero-terminate
623 *
624 * This function cast the spell of town portal for op
625 *
626 * The spell operates in two passes. During the first one a place
627 * is marked as a destination for the portal. During the second one,
628 * 2 portals are created, one in the position the player cast it and
629 * one in the destination place. The portal are synchronized and 2 forces
630 * are inserted in the player to destruct the portal next time player
631 * creates a new portal pair.
632 * This spell has a side effect that it allows people to meet each other
633 * in a permanent, private, appartements by making a town portal from it
634 * to the town or another public place. So, check if the map is unique and if
635 * so return an error
636 *
637 * Code by Tchize (david.delbecq@usa.net)
638 */
639int
640cast_create_town_portal (object *op, object *caster, object *spell, int dir)
641{
642 object *dummy, *force, *old_force, *tmp;
643 archetype *perm_portal;
644 char portal_name[1024], portal_message[1024];
645 maptile *exitmap;
646 int op_level;
647 623
648 /* Check to see if the map the player is currently on is a per player unique 624 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
649 * map. This can be determined in that per player unique maps have the
650 * full pathname listed.
651 */
652 if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
653 {
654 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You can't cast that here.\n");
655 return 0;
656 }
657
658 /* The first thing to do is to check if we have a marked destination
659 * dummy is used to make a check inventory for the force
660 */
661 dummy = arch_to_object (spell->other_arch);
662 if (dummy == NULL)
663 {
664 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
665 LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
666 return 0;
667 }
668
669 force = check_inv_recursive (op, dummy);
670
671 if (force == NULL)
672 {
673 /* Here we know there is no destination marked up.
674 * We have 2 things to do:
675 * 1. Mark the destination in the player inventory.
676 * 2. Let the player know it worked.
677 */
678 dummy->name = op->map->path;
679 EXIT_X (dummy) = op->x;
680 EXIT_Y (dummy) = op->y;
681 insert_ob_in_ob (dummy, op);
682 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind.\nYou feel you are able to come here from anywhere.");
683 return 1;
684 }
685
686 dummy->destroy ();
687
688 /* Here we know where the town portal should go to
689 * We should kill any existing portal associated with the player.
690 * Than we should create the 2 portals.
691 * For each of them, we need:
692 * - To create the portal with the name of the player+destination map
693 * - set the owner of the town portal
694 * - To mark the position of the portal in the player's inventory
695 * for easier destruction.
696 *
697 * The mark works has follow:
698 * slaying: Existing town portal
699 * hp, sp : x & y of the associated portal
700 * name : name of the portal
701 * race : map the portal is in
702 */
703
704 /* First step: killing existing town portals */
705 dummy = get_archetype (spell->race);
706 if (dummy == NULL)
707 {
708 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
709 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
710 return 0;
711 }
712
713 perm_portal = archetype::find (spell->slaying);
714
715 /* To kill a town portal, we go trough the player's inventory,
716 * for each marked portal in player's inventory,
717 * -We try load the associated map (if impossible, consider the portal destructed)
718 * -We find any portal in the specified location.
719 * If it has the good name, we destruct it.
720 * -We destruct the force indicating that portal.
721 */
722 while ((old_force = check_inv_recursive (op, dummy)))
723 {
724 exitmap = maptile::find_map (old_force->race, op->map);
725
726 if (exitmap)
727 {
728 int exitx = EXIT_X (old_force);
729 int exity = EXIT_Y (old_force);
730
731 tmp = present_arch (perm_portal, exitmap, exitx, exity);
732 while (tmp)
733 {
734 if (tmp->name == old_force->name)
735 {
736 tmp->destroy ();
737 break;
738 }
739
740 tmp = tmp->above;
741 }
742 }
743
744 old_force->destroy ();
745 }
746
747 dummy->destroy ();
748
749 /* Creating the portals.
750 * The very first thing to do is to ensure
751 * access to the destination map.
752 * If we can't, don't fizzle. Simply warn player.
753 * This ensure player pays his mana for the spell
754 * because HE is responsible of forgotting.
755 * 'force' is the destination of the town portal, which we got
756 * from the players inventory above.
757 */
758
759 /* Ensure exit map is loaded */
760 exitmap = maptile::find_map (force->name, 0);
761
762 /* If we were unable to load (ex. random map deleted), warn player */
763 if (!exitmap)
764 {
765 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
766 force->destroy ();
767 return 1;
768 }
769
770 op_level = caster_level (caster, spell);
771 if (op_level < 15)
772 snprintf (portal_message, 1024,
773 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
774 &op->name);
775 else if (op_level < 30)
776 snprintf (portal_message, 1024,
777 "\n%s's portal smells of ozone.\nYou do a lot of movements and finally pass\nthrough the small hole in the air\n", &op->name);
778 else if (op_level < 60)
779 snprintf (portal_message, 1024, "\nA shining door opens in the air in front of you,\nshowing you the path to another place.\n");
780 else
781 snprintf (portal_message, 1024, "\nAs you walk through %s's portal, flowers come out\nfrom the ground around you.\nYou feel awed.\n",
782 &op->name);
783
784 /* Create a portal in front of player
785 * dummy contain the portal and
786 * force contain the track to kill it later
787 */
788 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
789 dummy = get_archetype (spell->slaying); /*The portal */
790 if (dummy == NULL)
791 {
792 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
793 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
794 return 0;
795 }
796
797 EXIT_PATH (dummy) = force->name;
798 EXIT_X (dummy) = EXIT_X (force);
799 EXIT_Y (dummy) = EXIT_Y (force);
800 dummy->name = dummy->name_pl = portal_name;
801 dummy->msg = portal_message;
802 dummy->race = op->name; /*Save the owner of the portal */
803 cast_create_obj (op, caster, dummy, 0);
804
805 /* Now we need to to create a town portal marker inside the player
806 * object, so on future castings, we can know that he has an active
807 * town portal.
808 */
809 tmp = get_archetype (spell->race);
810 if (tmp == NULL)
811 {
812 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
813 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
814 return 0;
815 }
816
817 tmp->race = op->map->path;
818 tmp->name = portal_name;
819 EXIT_X (tmp) = dummy->x;
820 EXIT_Y (tmp) = dummy->y;
821 op->insert (tmp);
822
823 /* Create a portal in the destination map
824 * dummy contain the portal and
825 * force the track to kill it later
826 * the 'force' variable still contains the 'reminder' of
827 * where this portal goes to.
828 */
829 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
830 dummy = get_archetype (spell->slaying); /*The portal */
831 if (dummy == NULL)
832 {
833 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
834 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
835 return 0;
836 }
837
838 EXIT_PATH (dummy) = op->map->path;
839 EXIT_X (dummy) = op->x;
840 EXIT_Y (dummy) = op->y;
841 dummy->name = dummy->name_pl = portal_name;
842 dummy->msg = portal_message;
843 dummy->race = op->name; /*Save the owner of the portal */
844 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
845
846 /* Now we create another town portal marker that
847 * points back to the one we just made
848 */
849 tmp = get_archetype (spell->race);
850 if (tmp == NULL)
851 {
852 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
853 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
854 return 0;
855 }
856
857 tmp->race = force->name;
858 tmp->name = portal_name;
859 EXIT_X (tmp) = dummy->x;
860 EXIT_Y (tmp) = dummy->y;
861 insert_ob_in_ob (tmp, op);
862
863 /* Describe the player what happened
864 */
865 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
866 force->destroy ();
867 625
868 return 1; 626 return 1;
869} 627}
870 628
871/* This creates magic walls. Really, it can create most any object, 629/* This creates magic walls. Really, it can create most any object,
… …
969 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 727 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
970 return 0; 728 return 0;
971 } 729 }
972 730
973 /* If this is a spellcasting wall, need to insert the spell object */ 731 /* If this is a spellcasting wall, need to insert the spell object */
974 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 732 if (tmp->other_arch && tmp->other_arch->type == SPELL)
975 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 733 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
976 734
977 /* This code causes the wall to extend some distance in 735 /* This code causes the wall to extend some distance in
978 * each direction, or until an obstruction is encountered. 736 * each direction, or until an obstruction is encountered.
979 * posblocked and negblocked help determine how far the 737 * posblocked and negblocked help determine how far the
… …
999 { 757 {
1000 object *tmp2 = tmp->clone (); 758 object *tmp2 = tmp->clone ();
1001 m->insert (tmp2, x, y, op); 759 m->insert (tmp2, x, y, op);
1002 760
1003 /* If this is a spellcasting wall, need to insert the spell object */ 761 /* If this is a spellcasting wall, need to insert the spell object */
1004 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 762 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1005 tmp2->insert (arch_to_object (tmp2->other_arch)); 763 tmp2->insert (arch_to_object (tmp2->other_arch));
1006 764
1007 } 765 }
1008 else 766 else
1009 posblocked = 1; 767 posblocked = 1;
… …
1016 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 774 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1017 { 775 {
1018 object *tmp2 = tmp->clone (); 776 object *tmp2 = tmp->clone ();
1019 m->insert (tmp2, x, y, op); 777 m->insert (tmp2, x, y, op);
1020 778
1021 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 779 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1022 tmp2->insert (arch_to_object (tmp2->other_arch)); 780 tmp2->insert (arch_to_object (tmp2->other_arch));
1023 } 781 }
1024 else 782 else
1025 negblocked = 1; 783 negblocked = 1;
1026 } 784 }
… …
1142 900
1143 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 901 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1144 return 1; 902 return 1;
1145} 903}
1146 904
1147
1148/* cast_heal: Heals something. 905/* cast_heal: Heals something.
1149 * op is the caster. 906 * op is the caster.
1150 * dir is the direction he is casting it in. 907 * dir is the direction he is casting it in.
1151 * spell is the spell object. 908 * spell is the spell object.
1152 */ 909 */
… …
1158 object *poison; 915 object *poison;
1159 int heal = 0, success = 0; 916 int heal = 0, success = 0;
1160 917
1161 tmp = find_target_for_friendly_spell (op, dir); 918 tmp = find_target_for_friendly_spell (op, dir);
1162 919
1163 if (tmp == NULL) 920 if (!tmp)
1164 return 0; 921 return 0;
1165 922
1166 /* Figure out how many hp this spell might cure. 923 /* Figure out how many hp this spell might cure.
1167 * could be zero if this spell heals effects, not damage. 924 * could be zero if this spell heals effects, not damage.
1168 */ 925 */
… …
1171 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp; 928 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp;
1172 929
1173 if (heal) 930 if (heal)
1174 { 931 {
1175 if (tmp->stats.hp >= tmp->stats.maxhp) 932 if (tmp->stats.hp >= tmp->stats.maxhp)
1176 {
1177 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed."); 933 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed.");
1178 }
1179 else 934 else
1180 { 935 {
1181 /* See how many points we actually heal. Instead of messages 936 /* See how many points we actually heal. Instead of messages
1182 * based on type of spell, we instead do messages based 937 * based on type of spell, we instead do messages based
1183 * on amount of damage healed. 938 * on amount of damage healed.
1184 */ 939 */
1185 if (heal > (tmp->stats.maxhp - tmp->stats.hp)) 940 if (heal > tmp->stats.maxhp - tmp->stats.hp)
1186 heal = tmp->stats.maxhp - tmp->stats.hp; 941 heal = tmp->stats.maxhp - tmp->stats.hp;
942
1187 tmp->stats.hp += heal; 943 tmp->stats.hp += heal;
1188 944
1189 if (tmp->stats.hp >= tmp->stats.maxhp) 945 if (tmp->stats.hp >= tmp->stats.maxhp)
1190 {
1191 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!"); 946 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
1192 }
1193 else if (heal > 50) 947 else if (heal > 50)
1194 {
1195 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!"); 948 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!");
1196 }
1197 else if (heal > 25) 949 else if (heal > 25)
1198 {
1199 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close."); 950 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close.");
1200 }
1201 else if (heal > 10) 951 else if (heal > 10)
1202 {
1203 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade."); 952 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade.");
1204 }
1205 else 953 else
1206 {
1207 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close."); 954 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close.");
1208 } 955
1209 success = 1; 956 success = 1;
1210 } 957 }
1211 } 958 }
959
1212 if (spell->attacktype & AT_DISEASE) 960 if (spell->attacktype & AT_DISEASE)
1213 if (cure_disease (tmp, op)) 961 if (cure_disease (tmp, op, spell))
1214 success = 1; 962 success = 1;
1215 963
1216 if (spell->attacktype & AT_POISON) 964 if (spell->attacktype & AT_POISON)
1217 { 965 {
1218 at = archetype::find ("poisoning"); 966 at = archetype::find ("poisoning");
… …
1222 success = 1; 970 success = 1;
1223 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 971 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
1224 poison->stats.food = 1; 972 poison->stats.food = 1;
1225 } 973 }
1226 } 974 }
975
1227 if (spell->attacktype & AT_CONFUSION) 976 if (spell->attacktype & AT_CONFUSION)
1228 { 977 {
1229 poison = present_in_ob_by_name (FORCE, "confusion", tmp); 978 poison = present_in_ob_by_name (FORCE, "confusion", tmp);
1230 if (poison) 979 if (poison)
1231 { 980 {
1232 success = 1; 981 success = 1;
1233 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 982 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
1234 poison->duration = 1; 983 poison->duration = 1;
1235 } 984 }
1236 } 985 }
986
1237 if (spell->attacktype & AT_BLIND) 987 if (spell->attacktype & AT_BLIND)
1238 { 988 {
1239 at = archetype::find ("blindness"); 989 at = archetype::find ("blindness");
1240 poison = present_arch_in_ob (at, tmp); 990 poison = present_arch_in_ob (at, tmp);
1241 if (poison) 991 if (poison)
… …
1243 success = 1; 993 success = 1;
1244 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return."); 994 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
1245 poison->stats.food = 1; 995 poison->stats.food = 1;
1246 } 996 }
1247 } 997 }
998
1248 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp) 999 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp)
1249 { 1000 {
1250 tmp->stats.sp += spell->last_sp; 1001 tmp->stats.sp += spell->last_sp;
1251 if (tmp->stats.sp > tmp->stats.maxsp) 1002 if (tmp->stats.sp > tmp->stats.maxsp)
1252 tmp->stats.sp = tmp->stats.maxsp; 1003 tmp->stats.sp = tmp->stats.maxsp;
1253 success = 1; 1004 success = 1;
1254 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!"); 1005 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!");
1255 } 1006 }
1007
1256 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace) 1008 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace)
1257 { 1009 {
1258 tmp->stats.grace += spell->last_grace; 1010 tmp->stats.grace += spell->last_grace;
1259 if (tmp->stats.grace > tmp->stats.maxgrace) 1011 if (tmp->stats.grace > tmp->stats.maxgrace)
1260 tmp->stats.grace = tmp->stats.maxgrace; 1012 tmp->stats.grace = tmp->stats.maxgrace;
1261 success = 1; 1013 success = 1;
1262 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!"); 1014 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1263 } 1015 }
1016
1264 if (spell->stats.food && tmp->stats.food < 999) 1017 if (spell->stats.food && tmp->stats.food < 999)
1265 { 1018 {
1266 tmp->stats.food += spell->stats.food; 1019 tmp->stats.food += spell->stats.food;
1020
1267 if (tmp->stats.food > 999) 1021 if (tmp->stats.food > 999)
1268 tmp->stats.food = 999; 1022 tmp->stats.food = 999;
1023
1269 success = 1; 1024 success = 1;
1270 /* We could do something a bit better like the messages for healing above */ 1025 /* We could do something a bit better like the messages for healing above */
1271 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food"); 1026 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1272 } 1027 }
1028
1273 return success; 1029 return success;
1274} 1030}
1275
1276 1031
1277/* This is used for the spells that gain stats. There are no spells 1032/* This is used for the spells that gain stats. There are no spells
1278 * right now that icnrease wis/int/pow on a temp basis, so no 1033 * right now that icnrease wis/int/pow on a temp basis, so no
1279 * good comments for those. 1034 * good comments for those.
1280 */ 1035 */
1281static const char *const no_gain_msgs[NUM_STATS] = { 1036static const char *const no_gain_msgs[NUM_STATS] = {
1282 "You grow no stronger.", 1037 "You grow no stronger.",
1283 "You grow no more agile.", 1038 "You grow no more agile.",
1284 "You don't feel any healthier.", 1039 "You don't feel any healthier.",
1285 "no wis", 1040 "You didn't grow any more intelligent.",
1041 "You do not feel any wiser.",
1042 "You don't feel any more powerful."
1286 "You are no easier to look at.", 1043 "You are no easier to look at.",
1287 "no int",
1288 "no pow"
1289}; 1044};
1290 1045
1291int 1046int
1292cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1047cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1293{ 1048{
… …
1344 } 1099 }
1345 else 1100 else
1346 { 1101 {
1347 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1102 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1348 } 1103 }
1104
1349 return 1; 1105 return 1;
1350 } 1106 }
1107
1351 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1108 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1352 force->speed = 1.0; 1109 force->speed = 1.0;
1353 force->speed_left = -1.0; 1110 force->speed_left = -1.0;
1354 SET_FLAG (force, FLAG_APPLIED); 1111 SET_FLAG (force, FLAG_APPLIED);
1355 1112
… …
1361 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob); 1118 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob);
1362 if (force->resist[i] > 100) 1119 if (force->resist[i] > 100)
1363 force->resist[i] = 100; 1120 force->resist[i] = 100;
1364 } 1121 }
1365 } 1122 }
1123
1366 if (spell_ob->stats.hp) 1124 if (spell_ob->stats.hp)
1367 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob); 1125 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
1368 1126
1369 if (tmp->type == PLAYER) 1127 if (tmp->type == PLAYER)
1370 { 1128 {
1371 /* Stat adjustment spells */ 1129 /* Stat adjustment spells */
1372 for (i = 0; i < NUM_STATS; i++) 1130 for (i = 0; i < NUM_STATS; i++)
1373 { 1131 {
1374 sint8 stat = get_attr_value (&spell_ob->stats, i), k, sm; 1132 if (sint8 stat = spell_ob->stats.stat (i))
1375
1376 if (stat)
1377 { 1133 {
1378 sm = 0; 1134 sint8 sm = 0;
1379 for (k = 0; k < stat; k++) 1135 for (sint8 k = 0; k < stat; k++)
1380 sm += rndm (1, 3); 1136 sm += rndm (1, 3);
1381 1137
1382 if ((get_attr_value (&tmp->stats, i) + sm) > (15 + 5 * stat)) 1138 if (tmp->stats.stat (i) + sm > 15 + 5 * stat)
1383 { 1139 sm = max (0, (15 + 5 * stat) - tmp->stats.stat (i));
1384 sm = (15 + 5 * stat) - get_attr_value (&tmp->stats, i); 1140
1385 if (sm < 0) 1141 force->stats.stat (i) = sm;
1386 sm = 0; 1142
1387 }
1388 set_attr_value (&force->stats, i, sm);
1389 if (!sm) 1143 if (!sm)
1390 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]); 1144 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);
1391 } 1145 }
1392 } 1146 }
1393 } 1147 }
… …
1414 force->attacktype = spell_ob->attacktype; 1168 force->attacktype = spell_ob->attacktype;
1415 1169
1416 insert_ob_in_ob (force, tmp); 1170 insert_ob_in_ob (force, tmp);
1417 change_abil (tmp, force); /* Mostly to display any messages */ 1171 change_abil (tmp, force); /* Mostly to display any messages */
1418 tmp->update_stats (); 1172 tmp->update_stats ();
1173
1419 return 1; 1174 return 1;
1420} 1175}
1421 1176
1422/* This used to be part of cast_change_ability, but it really didn't make 1177/* This used to be part of cast_change_ability, but it really didn't make
1423 * a lot of sense, since most of the values it derives are from the god 1178 * a lot of sense, since most of the values it derives are from the god
1424 * of the caster. 1179 * of the caster.
1425 */ 1180 */
1426
1427int 1181int
1428cast_bless (object *op, object *caster, object *spell_ob, int dir) 1182cast_bless (object *op, object *caster, object *spell_ob, int dir)
1429{ 1183{
1430 int i; 1184 int i;
1431 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp; 1185 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;
… …
1526 insert_ob_in_ob (force, tmp); 1280 insert_ob_in_ob (force, tmp);
1527 tmp->update_stats (); 1281 tmp->update_stats ();
1528 return 1; 1282 return 1;
1529} 1283}
1530 1284
1531
1532
1533/* Alchemy code by Mark Wedel 1285/* Alchemy code by Mark Wedel
1534 * 1286 *
1535 * This code adds a new spell, called alchemy. Alchemy will turn 1287 * This code adds a new spell, called alchemy. Alchemy will turn
1536 * objects to gold nuggets, the value of the gold nuggets being 1288 * objects to pyrite ("false gold"), henceforth called gold nuggets.
1537 * about 90% of that of the item itself. It uses the value of the
1538 * object before charisma adjustments, because the nuggets themselves
1539 * will be will be adjusted by charisma when sold.
1540 * 1289 *
1541 * Large nuggets are worth 25 gp each (base). You will always get 1290 * The value of the gold nuggets being about 90% of that of the item
1542 * the maximum number of large nuggets you could get. 1291 * itself. It uses the value of the object before charisma adjustments,
1543 * Small nuggets are worth 1 gp each (base). You will get from 0 1292 * because the nuggets themselves will be will be adjusted by charisma
1544 * to the max amount of small nuggets as you could get. 1293 * when sold.
1545 *
1546 * For example, if an item is worth 110 gold, you will get
1547 * 4 large nuggets, and from 0-10 small nuggets.
1548 * 1294 *
1549 * There is also a chance (1:30) that you will get nothing at all 1295 * There is also a chance (1:30) that you will get nothing at all
1550 * for the object. There is also a maximum weight that will be 1296 * for the object. There is also a maximum weight that will be
1551 * alchemied. 1297 * alchemised.
1552 */ 1298 */
1553
1554/* I didn't feel like passing these as arguements to the
1555 * two functions that need them. Real values are put in them
1556 * when the spell is cast, and these are freed when the spell
1557 * is finished.
1558 */
1559static object *small, *large;
1560
1561static void 1299static void
1562alchemy_object (object *obj, int *small_nuggets, int *large_nuggets, int *weight) 1300alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1563{ 1301{
1564 uint64 value = query_cost (obj, NULL, F_TRUE); 1302 uint64 value = query_cost (obj, NULL, F_TRUE);
1565 1303
1566 /* Give third price when we alchemy money (This should hopefully 1304 /* Give third price when we alchemy money (This should hopefully
1567 * make it so that it isn't worth it to alchemy money, sell 1305 * make it so that it isn't worth it to alchemy money, sell
1568 * the nuggets, alchemy the gold from that, etc. 1306 * the nuggets, alchemy the gold from that, etc.
1569 * Otherwise, give 9 silver on the gold for other objects, 1307 * Otherwise, give 9 silver on the gold for other objects,
1570 * so that it would still be more affordable to haul 1308 * so that it would still be more affordable to haul
1571 * the stuff back to town. 1309 * the stuff back to town.
1572 */ 1310 */
1573
1574 if (QUERY_FLAG (obj, FLAG_UNPAID)) 1311 if (QUERY_FLAG (obj, FLAG_UNPAID))
1575 value = 0; 1312 value = 0;
1576 else if (obj->type == MONEY || obj->type == GEM) 1313 else if (obj->type == MONEY || obj->type == GEM)
1577 value /= 3; 1314 value /= 3;
1578 else 1315 else
1579 value = (value * 9) / 10; 1316 value = value * 9 / 10;
1580 1317
1581 value /= 4; // fix by GHJ, don't understand, pcg
1582
1583 if ((obj->value > 0) && rndm (0, 29)) 1318 if (obj->value > 0 && rndm (0, 29))
1584 { 1319 total_value += value;
1585 int count;
1586 1320
1587 count = value / large->value;
1588 *large_nuggets += count;
1589 value -= (uint64) count *(uint64) large->value;
1590
1591 count = value / small->value;
1592 *small_nuggets += count;
1593 }
1594
1595 /* Turn 25 small nuggets into 1 large nugget. If the value
1596 * of large nuggets is not evenly divisable by the small nugget
1597 * value, take off an extra small_nugget (Assuming small_nuggets!=0)
1598 */
1599 if (*small_nuggets * small->value >= large->value)
1600 {
1601 (*large_nuggets)++;
1602 *small_nuggets -= large->value / small->value;
1603 if (*small_nuggets && large->value % small->value)
1604 (*small_nuggets)--;
1605 }
1606 weight += obj->weight; 1321 total_weight += obj->total_weight ();
1322
1607 obj->destroy (); 1323 obj->destroy ();
1608} 1324}
1609 1325
1610static void
1611update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y)
1612{
1613 object *tmp;
1614 int flag = 0;
1615
1616 /* Put any nuggets below the player, but we can only pass this
1617 * flag if we are on the same space as the player
1618 */
1619 if (x == op->x && y == op->y && op->map == m)
1620 flag = INS_BELOW_ORIGINATOR;
1621
1622 if (small_nuggets)
1623 {
1624 tmp = small->clone ();
1625 tmp->nrof = small_nuggets;
1626 m->insert (tmp, x, y, op, flag);
1627 }
1628
1629 if (large_nuggets)
1630 {
1631 tmp = large->clone ();
1632 tmp->nrof = large_nuggets;
1633 m->insert (tmp, x, y, op, flag);
1634 }
1635}
1636
1637int 1326int
1638alchemy (object *op, object *caster, object *spell_ob) 1327alchemy (object *op, object *caster, object *spell_ob)
1639{ 1328{
1640 int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags;
1641 sint16 nx, ny;
1642 object *next, *tmp;
1643 maptile *mp;
1644
1645 if (op->type != PLAYER) 1329 if (op->type != PLAYER)
1646 return 0; 1330 return 0;
1647 1331
1332 archetype *nugget[3];
1333
1334 nugget[0] = archetype::find ("pyrite3");
1335 nugget[1] = archetype::find ("pyrite2");
1336 nugget[2] = archetype::find ("pyrite");
1337
1648 /* Put a maximum weight of items that can be alchemied. Limits the power 1338 /* Put a maximum weight of items that can be alchemised. Limits the power
1649 * some, and also prevents people from alcheming every table/chair/clock 1339 * some, and also prevents people from alchemising every table/chair/clock
1650 * in sight 1340 * in sight
1651 */ 1341 */
1652 weight_max = spell_ob->duration + +SP_level_duration_adjust (caster, spell_ob); 1342 int duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1653 weight_max *= 1000; 1343 int weight_max = duration * 1000;
1654 small = get_archetype ("smallnugget"), large = get_archetype ("largenugget"); 1344 uint64 value_max = duration * 1000;
1655 1345
1346 int weight = 0;
1347
1656 for (y = op->y - 1; y <= op->y + 1; y++) 1348 for (int y = op->y - 1; y <= op->y + 1; y++)
1657 { 1349 {
1658 for (x = op->x - 1; x <= op->x + 1; x++) 1350 for (int x = op->x - 1; x <= op->x + 1; x++)
1659 { 1351 {
1352 uint64 value = 0;
1353
1660 nx = x; 1354 sint16 nx = x;
1661 ny = y; 1355 sint16 ny = y;
1662 1356
1663 mp = op->map; 1357 maptile *mp = op->map;
1664 1358
1665 mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny); 1359 int mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny);
1666 1360
1667 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC)) 1361 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC))
1668 continue; 1362 continue;
1669 1363
1670 /* Treat alchemy a little differently - most spell effects 1364 /* Treat alchemy a little differently - most spell effects
… …
1672 * ground level effect. 1366 * ground level effect.
1673 */ 1367 */
1674 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK) 1368 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK)
1675 continue; 1369 continue;
1676 1370
1677 small_nuggets = 0; 1371 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1678 large_nuggets = 0;
1679
1680 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = next)
1681 { 1372 {
1682 next = tmp->above; 1373 next = tmp->above;
1374
1683 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1375 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1684 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1376 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1685 { 1377 {
1686
1687 if (tmp->inv) 1378 if (tmp->inv)
1688 { 1379 {
1689 object *next1, *tmp1; 1380 object *next1, *tmp1;
1690 1381
1691 for (tmp1 = tmp->inv; tmp1 != NULL; tmp1 = next1) 1382 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1692 { 1383 {
1693 next1 = tmp1->below; 1384 next1 = tmp1->below;
1694 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1385 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&
1695 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1386 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))
1696 alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight); 1387 alchemy_object (tmp1, value, weight);
1697 } 1388 }
1698 } 1389 }
1390
1699 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight); 1391 alchemy_object (tmp, value, weight);
1700 1392
1701 if (weight > weight_max) 1393 if (weight > weight_max)
1702 { 1394 break;
1703 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1704 large->destroy ();
1705 small->destroy ();
1706 return 1;
1707 } 1395 }
1708 } /* is alchemable object */
1709 } /* process all objects on this space */
1710
1711 /* Insert all the nuggets at one time. This probably saves time, but
1712 * it also prevents us from alcheming nuggets that were just created
1713 * with this spell.
1714 */ 1396 }
1715 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1397
1398 value -= rndm (value >> 4);
1399 value = min (value, value_max);
1400
1401 for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1402 if (int nrof = value / nugget [i]->value)
1403 {
1404 value -= nrof * nugget[i]->value;
1405
1406 object *tmp = arch_to_object (nugget[i]);
1407 tmp->nrof = nrof;
1408 tmp->flag [FLAG_IDENTIFIED] = true;
1409 op->map->insert (tmp, x, y, op, 0);
1716 } 1410 }
1717 }
1718 1411
1719 large->destroy (); 1412 if (weight > weight_max)
1720 small->destroy (); 1413 goto bailout;
1721 /* reset this so that if player standing on a big pile of stuff, 1414 }
1722 * it is redrawn properly. 1415 }
1723 */ 1416
1724 op->contr->ns->look_position = 0; 1417bailout:
1725 return 1; 1418 return 1;
1726} 1419}
1727 1420
1728 1421
1729/* This function removes the cursed/damned status on equipped 1422/* This function removes the cursed/damned status on equipped
… …
1756 } 1449 }
1757 1450
1758 if (op->type == PLAYER) 1451 if (op->type == PLAYER)
1759 { 1452 {
1760 if (success) 1453 if (success)
1761 {
1762 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now."); 1454 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now.");
1763 }
1764 else 1455 else
1765 { 1456 {
1766 if (was_one) 1457 if (was_one)
1767 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse."); 1458 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse.");
1768 else 1459 else
… …
1792 { 1483 {
1793 identify (tmp); 1484 identify (tmp);
1794 1485
1795 if (op->type == PLAYER) 1486 if (op->type == PLAYER)
1796 { 1487 {
1797 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op)); 1488 new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op));
1798 1489
1799 if (tmp->msg) 1490 if (tmp->msg)
1800 { 1491 {
1801 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1492 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1802 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1493 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
… …
1814 * stuff on the floor. Only identify stuff on the floor if the spell 1505 * stuff on the floor. Only identify stuff on the floor if the spell
1815 * was not fully used. 1506 * was not fully used.
1816 */ 1507 */
1817 if (num_ident) 1508 if (num_ident)
1818 { 1509 {
1819 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1510 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1820 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1511 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1821 { 1512 {
1822 identify (tmp); 1513 identify (tmp);
1823 1514
1824 if (op->type == PLAYER) 1515 if (op->type == PLAYER)
1825 { 1516 {
1826 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op)); 1517 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op));
1827 1518
1828 if (tmp->msg) 1519 if (tmp->msg)
1829 { 1520 {
1830 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1521 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1831 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1522 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
… …
2181 /* Basically, if the object is magical and not counterspell, 1872 /* Basically, if the object is magical and not counterspell,
2182 * we will more or less remove the object. Don't counterspell 1873 * we will more or less remove the object. Don't counterspell
2183 * monsters either. 1874 * monsters either.
2184 */ 1875 */
2185 1876
2186 if (head->attacktype & AT_MAGIC && 1877 if (head->attacktype & AT_MAGIC
2187 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level)) 1878 && !(head->attacktype & AT_COUNTERSPELL)
1879 && !QUERY_FLAG (head, FLAG_MONSTER)
1880 && (op->level > head->level))
2188 head->destroy (); 1881 head->destroy ();
2189 else 1882 else
2190 switch (head->type) 1883 switch (head->type)
2191 { 1884 {
2192 case SPELL_EFFECT: 1885 case SPELL_EFFECT:
1886 // XXX: Don't affect floor spelleffects. See also XXX comment
1887 // about sanctuary in spell_util.C
1888 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1889 continue;
1890
2193 if (op->level > head->level) 1891 if (op->level > head->level)
2194 head->destroy (); 1892 head->destroy ();
2195 1893
2196 break; 1894 break;
2197 1895
… …
2264 * This code was very odd - code early on would only let players use the spell, 1962 * This code was very odd - code early on would only let players use the spell,
2265 * yet the code wass full of player checks. I've presumed that the code 1963 * yet the code wass full of player checks. I've presumed that the code
2266 * that only let players use it was correct, and removed all the other 1964 * that only let players use it was correct, and removed all the other
2267 * player checks. MSW 2003-01-06 1965 * player checks. MSW 2003-01-06
2268 */ 1966 */
2269
2270int 1967int
2271animate_weapon (object *op, object *caster, object *spell, int dir) 1968animate_weapon (object *op, object *caster, object *spell, int dir)
2272{ 1969{
2273 object *weapon, *tmp; 1970 object *weapon, *tmp;
2274 char buf[MAX_BUF]; 1971 char buf[MAX_BUF];
2275 int a, i; 1972 int a, i;
2276 sint16 x, y; 1973 sint16 x, y;
2277 maptile *m; 1974 maptile *m;
2278 materialtype_t *mt;
2279 1975
2280 if (!spell->other_arch) 1976 if (!spell->other_arch)
2281 { 1977 {
2282 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 1978 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
2283 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name); 1979 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
… …
2286 /* exit if it's not a player using this spell. */ 1982 /* exit if it's not a player using this spell. */
2287 if (op->type != PLAYER) 1983 if (op->type != PLAYER)
2288 return 0; 1984 return 0;
2289 1985
2290 /* if player already has a golem, abort */ 1986 /* if player already has a golem, abort */
2291 if (op->contr->ranges[range_golem]) 1987 if (object *golem = op->contr->golem)
2292 { 1988 {
2293 control_golem (op->contr->ranges[range_golem], dir); 1989 control_golem (golem, dir);
2294 return 0; 1990 return 0;
2295 } 1991 }
2296 1992
2297 /* if no direction specified, pick one */ 1993 /* if no direction specified, pick one */
2298 if (!dir) 1994 if (!dir)
… …
2302 x = op->x + freearr_x[dir]; 1998 x = op->x + freearr_x[dir];
2303 y = op->y + freearr_y[dir]; 1999 y = op->y + freearr_y[dir];
2304 2000
2305 /* if there's no place to put the golem, abort */ 2001 /* if there's no place to put the golem, abort */
2306 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 2002 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) ||
2307 ((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type)) 2003 ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2308 { 2004 {
2309 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 2005 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2310 return 0; 2006 return 0;
2311 } 2007 }
2312 2008
… …
2316 if (!weapon) 2012 if (!weapon)
2317 { 2013 {
2318 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2014 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2319 return 0; 2015 return 0;
2320 } 2016 }
2321 if (spell->race && strcmp (weapon->arch->name, spell->race)) 2017 if (spell->race && strcmp (weapon->arch->archname, spell->race))
2322 { 2018 {
2323 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2019 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2324 return 0; 2020 return 0;
2325 } 2021 }
2326 if (weapon->type != WEAPON) 2022 if (weapon->type != WEAPON)
… …
2344 /* create the golem object */ 2040 /* create the golem object */
2345 tmp = arch_to_object (spell->other_arch); 2041 tmp = arch_to_object (spell->other_arch);
2346 2042
2347 /* if animated by a player, give the player control of the golem */ 2043 /* if animated by a player, give the player control of the golem */
2348 CLEAR_FLAG (tmp, FLAG_MONSTER); 2044 CLEAR_FLAG (tmp, FLAG_MONSTER);
2349 SET_FLAG (tmp, FLAG_FRIENDLY);
2350 tmp->stats.exp = 0; 2045 tmp->stats.exp = 0;
2351 add_friendly_object (tmp); 2046 add_friendly_object (tmp);
2352 tmp->type = GOLEM; 2047 tmp->type = GOLEM;
2353 tmp->set_owner (op); 2048 tmp->set_owner (op);
2049 op->contr->golem = tmp;
2354 set_spell_skill (op, caster, spell, tmp); 2050 set_spell_skill (op, caster, spell, tmp);
2355 op->contr->ranges[range_golem] = tmp;
2356 op->contr->shoottype = range_golem;
2357 2051
2358 /* Give the weapon to the golem now. A bit of a hack to check the 2052 /* Give the weapon to the golem now. A bit of a hack to check the
2359 * removed flag - it should only be set if get_split_object was 2053 * removed flag - it should only be set if get_split_object was
2360 * used above. 2054 * used above.
2361 */ 2055 */
2362 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2056 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2363 weapon->remove (); 2057 weapon->remove ();
2058
2364 insert_ob_in_ob (weapon, tmp); 2059 insert_ob_in_ob (weapon, tmp);
2365 esrv_send_item (op, weapon); 2060 esrv_send_item (op, weapon);
2366 /* To do everything necessary to let a golem use the weapon is a pain, 2061 /* To do everything necessary to let a golem use the weapon is a pain,
2367 * so instead, just set it as equipped (otherwise, we need to update 2062 * so instead, just set it as equipped (otherwise, we need to update
2368 * body_info, skills, etc) 2063 * body_info, skills, etc)
… …
2396 2091
2397 /* attacktype */ 2092 /* attacktype */
2398 if (!tmp->attacktype) 2093 if (!tmp->attacktype)
2399 tmp->attacktype = AT_PHYSICAL; 2094 tmp->attacktype = AT_PHYSICAL;
2400 2095
2401 mt = NULL;
2402 if (op->materialname != NULL)
2403 mt = name_to_material (op->materialname); 2096 if (materialtype_t *mt = name_to_material (op->materialname))
2404 if (mt != NULL)
2405 { 2097 {
2406 for (i = 0; i < NROFATTACKS; i++) 2098 for (i = 0; i < NROFATTACKS; i++)
2407 tmp->resist[i] = 50 - (mt->save[i] * 5); 2099 tmp->resist[i] = 50 - (mt->save[i] * 5);
2408 a = mt->save[0]; 2100 a = mt->save[0];
2409 } 2101 }
… …
2411 { 2103 {
2412 for (i = 0; i < NROFATTACKS; i++) 2104 for (i = 0; i < NROFATTACKS; i++)
2413 tmp->resist[i] = 5; 2105 tmp->resist[i] = 5;
2414 a = 10; 2106 a = 10;
2415 } 2107 }
2108
2416 /* Set weapon's immunity */ 2109 /* Set weapon's immunity */
2417 tmp->resist[ATNR_CONFUSION] = 100; 2110 tmp->resist[ATNR_CONFUSION] = 100;
2418 tmp->resist[ATNR_POISON] = 100; 2111 tmp->resist[ATNR_POISON] = 100;
2419 tmp->resist[ATNR_SLOW] = 100; 2112 tmp->resist[ATNR_SLOW] = 100;
2420 tmp->resist[ATNR_PARALYZE] = 100; 2113 tmp->resist[ATNR_PARALYZE] = 100;
… …
2426 2119
2427 /* Improve weapon's armour value according to best save vs. physical of its material */ 2120 /* Improve weapon's armour value according to best save vs. physical of its material */
2428 2121
2429 if (a > 14) 2122 if (a > 14)
2430 a = 14; 2123 a = 14;
2124
2431 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2125 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2432 2126
2433 /* Determine golem's speed */ 2127 /* Determine golem's speed */
2434 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell))); 2128 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2435 2129
… …
2480 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2174 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
2481 } 2175 }
2482 return success; 2176 return success;
2483} 2177}
2484 2178
2485
2486
2487
2488
2489/* create an aura spell object and put it in the player's inventory. 2179/* create an aura spell object and put it in the player's inventory.
2490 * as usual, op is player, caster is the object casting the spell, 2180 * as usual, op is player, caster is the object casting the spell,
2491 * spell is the spell object itself. 2181 * spell is the spell object itself.
2492 */ 2182 */
2493int 2183int
… …
2504 2194
2505 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell); 2195 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2506 2196
2507 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2197 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2508 2198
2509 new_aura->set_owner (op);
2510 set_spell_skill (op, caster, spell, new_aura); 2199 set_spell_skill (op, caster, spell, new_aura);
2511 new_aura->attacktype = spell->attacktype; 2200 new_aura->attacktype = spell->attacktype;
2512 2201
2513 new_aura->level = caster_level (caster, spell); 2202 new_aura->level = caster_level (caster, spell);
2203
2514 if (refresh) 2204 if (refresh)
2515 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 2205 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2516 else 2206 else
2517 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 2207 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
2208
2518 insert_ob_in_ob (new_aura, op); 2209 insert_ob_in_ob (new_aura, op);
2210 new_aura->set_owner (op);
2211
2519 return 1; 2212 return 1;
2520} 2213}
2521 2214
2522 2215
2523/* move aura function. An aura is a part of someone's inventory, 2216/* move aura function. An aura is a part of someone's inventory,
… …
2590} 2283}
2591 2284
2592/* moves the peacemaker spell. 2285/* moves the peacemaker spell.
2593 * op is the piece object. 2286 * op is the piece object.
2594 */ 2287 */
2595
2596void 2288void
2597move_peacemaker (object *op) 2289move_peacemaker (object *op)
2598{ 2290{
2599 object *tmp; 2291 object *tmp;
2600 2292

Diff Legend

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