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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.17 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.50 by root, Mon Jun 4 12:19:09 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) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,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 it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23
24 24
25#include <global.h> 25#include <global.h>
26#include <spells.h> 26#include <spells.h>
27#include <object.h> 27#include <object.h>
28#include <errno.h> 28#include <errno.h>
29#ifndef __CEXTRACT__
30# include <sproto.h> 29#include <sproto.h>
31#endif
32#include <sounds.h> 30#include <sounds.h>
33 31
34extern char *spell_mapping[]; 32extern char *spell_mapping[];
35 33
36/* This returns a random spell from 'ob'. If skill is set, then 34/* This returns a random spell from 'ob'. If skill is set, then
… …
143 for (at = first_archetype; at; at = at->next) 141 for (at = first_archetype; at; at = at->next)
144 { 142 {
145 if (at->clone.type == SPELL) 143 if (at->clone.type == SPELL)
146 { 144 {
147 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name, 145 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name,
148 &at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level); 146 &at->archname, at->clone.other_arch ? &at->clone.other_arch->archname : "<nil>", &at->clone.skill, at->clone.level);
149 } 147 }
150 } 148 }
151} 149}
152 150
153/* pretty basic function - basically just takes 151/* pretty basic function - basically just takes
154 * an object, sets the x,y, and calls insert_ob_in_map 152 * an object, sets the x,y, and calls insert_ob_in_map
155 */ 153 */
156
157void 154void
158spell_effect (object *spob, int x, int y, maptile *map, object *originator) 155spell_effect (object *spob, int x, int y, maptile *map, object *originator)
159{ 156{
160
161 if (spob->other_arch != NULL) 157 if (spob->other_arch)
162 { 158 map->insert (arch_to_object (spob->other_arch), x, y, originator);
163 object *effect = arch_to_object (spob->other_arch);
164
165 effect->x = x;
166 effect->y = y;
167
168 insert_ob_in_map (effect, map, originator, 0);
169 }
170} 159}
171 160
172/* 161/*
173 * This function takes a caster and spell and presents the 162 * This function takes a caster and spell and presents the
174 * effective level the caster needs to be to cast the spell. 163 * effective level the caster needs to be to cast the spell.
175 * basically, it just adjusts the spell->level with attuned/repelled 164 * basically, it just adjusts the spell->level with attuned/repelled
176 * spellpaths. Was called path_level_mod 165 * spellpaths. Was called path_level_mod.
177 * 166 *
178 * caster is person casting hte spell. 167 * caster is person casting the spell.
179 * spell is the spell object. 168 * spell is the spell object.
180 * Returns modified level. 169 * Returns modified level.
181 */ 170 */
182int 171int
183min_casting_level (object *caster, object *spell) 172min_casting_level (object *caster, object *spell)
184{ 173{
185 int new_level; 174 int new_level;
186 175
187 if (caster->path_denied & spell->path_attuned) 176 if (caster->path_denied & spell->path_attuned)
188 {
189 /* This case is not a bug, just the fact that this function is
190 * usually called BEFORE checking for path_deny. -AV
191 */
192#if 0
193 LOG (llevError, "BUG: path_level_mod (arch %s, name %s): casting denied " "spell\n", caster->arch->name, caster->name);
194#endif
195 return 1; 177 return 1;
196 } 178
197 new_level = spell->level 179 new_level = spell->level
198 + ((caster->path_repelled & spell->path_attuned) ? +2 : 0) + ((caster->path_attuned & spell->path_attuned) ? -2 : 0); 180 + (caster->path_repelled & spell->path_attuned ? +2 : 0)
199 return (new_level < 1) ? 1 : new_level; 181 + (caster->path_attuned & spell->path_attuned ? -2 : 0);
200}
201 182
183 return max (1, new_level);
184}
202 185
203/* This function returns the effective level the spell 186/* This function returns the effective level the spell
204 * is being cast at. 187 * is being cast at.
205 * Note that I changed the repelled/attuned bonus to 2 from 5. 188 * Note that I changed the repelled/attuned bonus to 2 from 5.
206 * This is because the new code compares casting_level against 189 * This is because the new code compares casting_level against
207 * min_caster_level, so the difference is effectively 4 190 * min_caster_level, so the difference is effectively 4
208 */ 191 */
209
210int 192int
211caster_level (object *caster, object *spell) 193caster_level (object *caster, object *spell)
212{ 194{
213 int level = caster->level; 195 int level = caster->level;
214 196
215 /* If this is a player, try to find the matching skill */ 197 /* If this is a player, try to find the matching skill */
216 if (caster->type == PLAYER && spell->skill) 198 if (caster->type == PLAYER && spell->skill)
217 {
218 int i;
219
220 for (i = 0; i < NUM_SKILLS; i++) 199 for (int i = 0; i < NUM_SKILLS; i++)
221 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill) 200 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
222 { 201 {
223 level = caster->contr->last_skill_ob[i]->level; 202 level = caster->contr->last_skill_ob[i]->level;
224 break; 203 break;
225 } 204 }
226 }
227 205
228 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */ 206 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
229 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 207 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
230 { 208 {
231 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM); 209 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
… …
233 211
234 level = MIN (level, sk_level + level / 10 + 1); 212 level = MIN (level, sk_level + level / 10 + 1);
235 } 213 }
236 214
237 /* Got valid caster level. Now adjust for attunement */ 215 /* Got valid caster level. Now adjust for attunement */
238 level += ((caster->path_repelled & spell->path_attuned) ? -2 : 0) + ((caster->path_attuned & spell->path_attuned) ? 2 : 0); 216 level += caster->path_repelled & spell->path_attuned ? -2 : 0;
217 level += caster->path_attuned & spell->path_attuned ? +2 : 0;
239 218
240 /* Always make this at least 1. If this is zero, we get divide by zero 219 /* Always make this at least 1. If this is zero, we get divide by zero
241 * errors in various places. 220 * errors in various places.
242 */ 221 */
243 if (level < 1)
244 level = 1;
245 return level; 222 return max (level, 1);
246} 223}
247 224
248/* The following function scales the spellpoint cost of 225/* The following function scales the spellpoint cost of
249 * a spell by it's increased effectiveness. Some of the 226 * a spell by it's increased effectiveness. Some of the
250 * lower level spells become incredibly vicious at high 227 * lower level spells become incredibly vicious at high
… …
450{ 427{
451 object *op; 428 object *op;
452 429
453 if (OUT_OF_REAL_MAP (m, x, y)) 430 if (OUT_OF_REAL_MAP (m, x, y))
454 return 0; 431 return 0;
455 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 432 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
456 if (QUERY_FLAG (op, FLAG_REFL_SPELL) && (!QUERY_FLAG (op, FLAG_ALIVE) || 433 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
457 sp_op->type == LIGHTNING || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 434 && (!QUERY_FLAG (op, FLAG_ALIVE)
435 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
458 return 1; 436 return 1;
459 437
460 return 0; 438 return 0;
461} 439}
462 440
… …
479 { 457 {
480 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 458 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
481 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 459 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
482 dir = 0; 460 dir = 0;
483 } 461 }
484 new_op->x = op->x + freearr_x[dir]; 462
485 new_op->y = op->y + freearr_y[dir]; 463 op->map->insert (new_op,
486 if (dir == 0) 464 op->x + freearr_x[dir], op->y + freearr_y[dir],
487 insert_ob_in_map (new_op, op->map, op, INS_BELOW_ORIGINATOR); 465 op,
488 else 466 dir ? 0 : INS_BELOW_ORIGINATOR);
489 insert_ob_in_map (new_op, op->map, op, 0); 467
490 return dir; 468 return dir;
491} 469}
492 470
493/* Returns true if it is ok to put spell *op on the space/may provided. 471/* Returns true if it is ok to put spell *op on the space/may provided.
494 * immune_stop is basically the attacktype of the spell (why 472 * immune_stop is basically the attacktype of the spell (why
… …
496 * has the AT_MAGIC bit set, and there is a counterwall 474 * has the AT_MAGIC bit set, and there is a counterwall
497 * on the space, the object doesn't get placed. if immune stop 475 * on the space, the object doesn't get placed. if immune stop
498 * does not have AT_MAGIC, then counterwalls do not effect the spell. 476 * does not have AT_MAGIC, then counterwalls do not effect the spell.
499 * 477 *
500 */ 478 */
501
502int 479int
503ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 480ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
504{ 481{
505 object *tmp; 482 if (!xy_normalise (m, x, y))
506 int mflags;
507 maptile *mp;
508
509 mp = m;
510 mflags = get_map_flags (m, &mp, x, y, &x, &y);
511
512 if (mflags & P_OUT_OF_MAP)
513 return 0; 483 return 0;
514 484
515 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (mp, x, y))) 485 mapspace &ms = m->at (x, y);
486
487 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
516 return 0; 488 return 0;
517 489
518 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above) 490 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
519 { 491 {
520 /* If there is a counterspell on the space, and this 492 /* If there is a counterspell on the space, and this
521 * object is using magic, don't progress. I believe we could 493 * object is using magic, don't progress. I believe we could
522 * leave this out and let in progress, and other areas of the code 494 * leave this out and let in progress, and other areas of the code
523 * will then remove it, but that would seem to to use more 495 * will then remove it, but that would seem to to use more
524 * resources, and may not work as well if a player is standing 496 * resources, and may not work as well if a player is standing
525 * on top of a counterwall spell (may hit the player before being 497 * on top of a counterwall spell (may hit the player before being
526 * removed.) On the other hand, it may be more dramatic for the 498 * removed.) On the other hand, it may be more dramatic for the
527 * spell to actually hit the counterwall and be sucked up. 499 * spell to actually hit the counterwall and be sucked up.
528 */ 500 */
529 if ((tmp->attacktype & AT_COUNTERSPELL) && 501 if ((tmp->attacktype & AT_COUNTERSPELL)
530 (tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) && 502 && !QUERY_FLAG (tmp, FLAG_MONSTER)
531 (tmp->type != WEAPON) && (tmp->type != BOW) && (tmp->type != ARROW) && (tmp->type != GOLEM) && (immune_stop & AT_MAGIC)) 503 && (tmp->type != PLAYER)
504 && (tmp->type != WEAPON)
505 && (tmp->type != BOW)
506 && (tmp->type != ARROW)
507 && (tmp->type != GOLEM)
508 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX:
509 // we special case floor here because there
510 // are sometimes spell effect floors
511 // which are used to inflict damage
512 // (and those shouldn't go away from
513 // sanctuary) see also: permanent lava
514 && (immune_stop & AT_MAGIC))
532 return 0; 515 return 0;
533 516
534 /* This is to prevent 'out of control' spells. Basically, this 517 /* This is to prevent 'out of control' spells. Basically, this
535 * limits one spell effect per space per spell. This is definately 518 * limits one spell effect per space per spell. This is definately
536 * needed for performance reasons, and just for playability I believe. 519 * needed for performance reasons, and just for playability I believe.
… …
546 * playability reasons. 529 * playability reasons.
547 */ 530 */
548 if (tmp->arch == op->arch 531 if (tmp->arch == op->arch
549 && tmp->type == op->type 532 && tmp->type == op->type
550 && tmp->subtype == op->subtype 533 && tmp->subtype == op->subtype
534 && tmp->owner == op->owner
551 && tmp->owner == op->owner && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) 535 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
552 { 536 {
553 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 537 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam);
554 tmp->range = MAX (tmp->range, op->range); 538 tmp->range = MAX (tmp->range, op->range);
555 tmp->duration = MAX (tmp->duration, op->duration); 539 tmp->duration = MAX (tmp->duration, op->duration);
556 return 0; 540 return 0;
… …
558 542
559 /* Perhaps we should also put checks in for no magic and unholy 543 /* Perhaps we should also put checks in for no magic and unholy
560 * ground to prevent it from moving along? 544 * ground to prevent it from moving along?
561 */ 545 */
562 } 546 }
547
563 /* If it passes the above tests, it must be OK */ 548 /* If it passes the above tests, it must be OK */
564 return 1; 549 return 1;
565} 550}
566 551
567/* fire_arch_from_position: fires an archetype. 552/* fire_arch_from_position: fires an archetype.
… …
598 return 0; 583 return 0;
599 584
600 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y))) 585 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
601 { 586 {
602 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n"); 587 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
603 free_object (tmp); 588 tmp->destroy ();
604 return 0; 589 return 0;
605 } 590 }
606
607
608 591
609 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 592 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
610 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 593 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
611 /* code in time.c uses food for some things, duration for others */ 594 /* code in time.c uses food for some things, duration for others */
612 tmp->stats.food = tmp->duration; 595 tmp->stats.food = tmp->duration;
613 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 596 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
614 tmp->attacktype = spell->attacktype; 597 tmp->attacktype = spell->attacktype;
615 tmp->x = x; 598 tmp->x = x;
616 tmp->y = y; 599 tmp->y = y;
617 tmp->direction = dir; 600 tmp->direction = dir;
618 if (get_owner (op) != NULL) 601 if (op->owner != NULL)
619 copy_owner (tmp, op); 602 tmp->set_owner (op);
620 else 603 else
621 set_owner (tmp, op); 604 tmp->set_owner (op);
622 tmp->level = caster_level (caster, spell); 605 tmp->level = caster_level (caster, spell);
623 set_spell_skill (op, caster, spell, tmp); 606 set_spell_skill (op, caster, spell, tmp);
624 607
625 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 608 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
626 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 609 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
… …
629 return 0; 612 return 0;
630 } 613 }
631 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 614 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
632 SET_ANIMATION (tmp, dir); 615 SET_ANIMATION (tmp, dir);
633 616
634 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 617 if ((tmp = insert_ob_in_map (tmp, m, op, 0)))
635 return 1;
636
637 move_spell_effect (tmp); 618 move_spell_effect (tmp);
638 619
639 return 1; 620 return 1;
640} 621}
641
642
643 622
644/***************************************************************************** 623/*****************************************************************************
645 * 624 *
646 * Code related to rods - perhaps better located in another file? 625 * Code related to rods - perhaps better located in another file?
647 * 626 *
648 ****************************************************************************/ 627 ****************************************************************************/
649
650void 628void
651regenerate_rod (object *rod) 629regenerate_rod (object *rod)
652{ 630{
653 if (rod->stats.hp < rod->stats.maxhp) 631 if (rod->stats.hp < rod->stats.maxhp)
654 { 632 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
655 rod->stats.hp += 1 + rod->stats.maxhp / 10;
656
657 if (rod->stats.hp > rod->stats.maxhp)
658 rod->stats.hp = rod->stats.maxhp;
659 }
660} 633}
661
662 634
663void 635void
664drain_rod_charge (object *rod) 636drain_rod_charge (object *rod)
665{ 637{
666 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 638 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
667} 639}
668
669
670
671 640
672/* this function is commonly used to find a friendly target for 641/* this function is commonly used to find a friendly target for
673 * spells such as heal or protection or armour 642 * spells such as heal or protection or armour
674 * op is what is looking for the target (which can be a player), 643 * op is what is looking for the target (which can be a player),
675 * dir is the direction we are looking in. Return object found, or 644 * dir is the direction we are looking in. Return object found, or
676 * NULL if no good object. 645 * NULL if no good object.
677 */ 646 */
678
679object * 647object *
680find_target_for_friendly_spell (object *op, int dir) 648find_target_for_friendly_spell (object *op, int dir)
681{ 649{
682 object *tmp; 650 object *tmp;
683 maptile *m;
684 sint16 x, y;
685 int mflags;
686 651
687 /* I don't really get this block - if op isn't a player or rune, 652 /* I don't really get this block - if op isn't a player or rune,
688 * we then make the owner of this object the target. 653 * we then make the owner of this object the target.
689 * The owner could very well be no where near op. 654 * The owner could very well be no where near op.
690 */ 655 */
691 if (op->type != PLAYER && op->type != RUNE) 656 if (op->type != PLAYER && op->type != RUNE)
692 { 657 {
693 tmp = get_owner (op); 658 tmp = op->owner;
694 /* If the owner does not exist, or is not a monster, than apply the spell 659 /* If the owner does not exist, or is not a monster, than apply the spell
695 * to the caster. 660 * to the caster.
696 */ 661 */
697 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 662 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER))
698 tmp = op; 663 tmp = op;
699 } 664 }
700 else 665 else
701 { 666 {
702 m = op->map; 667 maptile *m = op->map;
703 x = op->x + freearr_x[dir]; 668 sint16 x = op->x + freearr_x[dir];
704 y = op->y + freearr_y[dir]; 669 sint16 y = op->y + freearr_y[dir];
705
706 mflags = get_map_flags (m, &m, x, y, &x, &y);
707
708 if (mflags & P_OUT_OF_MAP)
709 tmp = NULL;
710 else
711 { 670
712 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 671 tmp = xy_normalise (m, x, y)
713 if (tmp->type == PLAYER) 672 ? m->at (x, y).player ()
714 break; 673 : 0;
715 }
716 } 674 }
675
717 /* didn't find a player there, look in current square for a player */ 676 /* didn't find a player there, look in current square for a player */
718 if (tmp == NULL) 677 if (!tmp)
719 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 678 tmp = op->ms ().player ();
720 {
721 if (tmp->type == PLAYER)
722 break;
723 }
724 679
725 return tmp; 680 return tmp;
726} 681}
727 682
728 683
… …
760 mp = m; 715 mp = m;
761 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 716 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
762 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) 717 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
763 continue; 718 continue;
764 719
765 tmp = get_map_ob (mp, nx, ny); 720 tmp = GET_MAP_OB (mp, nx, ny);
766 721
767 while (tmp != NULL && (((owner_type == PLAYER && 722 while (tmp != NULL && (((owner_type == PLAYER &&
768 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 723 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) ||
769 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 724 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
770 tmp = tmp->above; 725 tmp = tmp->above;
… …
773 return freedir[i]; 728 return freedir[i];
774 } 729 }
775 return -1; /* flag for "keep going the way you were" */ 730 return -1; /* flag for "keep going the way you were" */
776} 731}
777 732
778
779
780/* put_a_monster: puts a monster named monstername near by 733/* put_a_monster: puts a monster named monstername near by
781 * op. This creates the treasures for the monsters, and 734 * op. This creates the treasures for the monsters, and
782 * also deals with multipart monsters properly. 735 * also deals with multipart monsters properly.
783 */ 736 */
784
785void 737void
786put_a_monster (object *op, const char *monstername) 738put_a_monster (object *op, const char *monstername)
787{ 739{
788 object *tmp, *head = NULL, *prev = NULL; 740 object *tmp, *head = NULL, *prev = NULL;
789 archetype *at; 741 archetype *at;
… …
825 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 777 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
826 778
827 insert_ob_in_map (head, op->map, op, 0); 779 insert_ob_in_map (head, op->map, op, 0);
828 780
829 /* thought it'd be cool to insert a burnout, too. */ 781 /* thought it'd be cool to insert a burnout, too. */
830 tmp = get_archetype ("burnout"); 782 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
831 tmp->map = op->map;
832 tmp->x = op->x + freearr_x[dir];
833 tmp->y = op->y + freearr_y[dir];
834 insert_ob_in_map (tmp, op->map, op, 0);
835 } 783 }
836} 784}
837 785
838/* peterm: function which summons hostile monsters and 786/* peterm: function which summons hostile monsters and
839 * places them in nearby squares. 787 * places them in nearby squares.
… …
866{ 814{
867 int attacktype; 815 int attacktype;
868 int face; 816 int face;
869} ATTACKS[22] = 817} ATTACKS[22] =
870{ 818{
871 {
872 AT_PHYSICAL, 0}, 819 { AT_PHYSICAL, 0},
873 {
874 AT_PHYSICAL, 0}, /*face = explosion */ 820 { AT_PHYSICAL, 0}, /*face = explosion */
875 {
876 AT_PHYSICAL, 0}, 821 { AT_PHYSICAL, 0},
877 {
878 AT_MAGIC, 1}, 822 { AT_MAGIC, 1},
879 {
880 AT_MAGIC, 1}, /* face = last-burnout */ 823 { AT_MAGIC, 1}, /* face = last-burnout */
881 {
882 AT_MAGIC, 1}, 824 { AT_MAGIC, 1},
883 {
884 AT_FIRE, 2}, 825 { AT_FIRE, 2},
885 {
886 AT_FIRE, 2}, /* face = fire.... */ 826 { AT_FIRE, 2}, /* face = fire.... */
887 {
888 AT_FIRE, 2}, 827 { AT_FIRE, 2},
889 {
890 AT_ELECTRICITY, 3}, 828 { AT_ELECTRICITY, 3},
891 {
892 AT_ELECTRICITY, 3}, /* ball_lightning */ 829 { AT_ELECTRICITY, 3}, /* ball_lightning */
893 {
894 AT_ELECTRICITY, 3}, 830 { AT_ELECTRICITY, 3},
895 {
896 AT_COLD, 4}, 831 { AT_COLD, 4},
897 {
898 AT_COLD, 4}, /* face=icestorm */ 832 { AT_COLD, 4}, /* face=icestorm */
899 {
900 AT_COLD, 4}, 833 { AT_COLD, 4},
901 {
902 AT_CONFUSION, 5}, 834 { AT_CONFUSION, 5},
903 {
904 AT_POISON, 7}, 835 { AT_POISON, 7},
905 {
906 AT_POISON, 7}, /* face = acid sphere. generator */ 836 { AT_POISON, 7}, /* face = acid sphere. generator */
907 {
908 AT_POISON, 7}, /* poisoncloud face */ 837 { AT_POISON, 7}, /* poisoncloud face */
909 {
910 AT_SLOW, 8}, 838 { AT_SLOW, 8},
911 {
912 AT_PARALYZE, 9}, 839 { AT_PARALYZE, 9},
913 {
914AT_FEAR, 10}}; 840 { AT_FEAR, 10},
915 841};
916
917 842
918/* shuffle_attack: peterm 843/* shuffle_attack: peterm
919 * This routine shuffles the attack of op to one of the 844 * This routine shuffles the attack of op to one of the
920 * ones in the list. It does this at random. It also 845 * ones in the list. It does this at random. It also
921 * chooses a face appropriate to the attack that is 846 * chooses a face appropriate to the attack that is
… …
966 if (failure <= -20 && failure > -40) /* wonder */ 891 if (failure <= -20 && failure > -40) /* wonder */
967 { 892 {
968 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); 893 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname);
969 tmp = get_archetype (SPELL_WONDER); 894 tmp = get_archetype (SPELL_WONDER);
970 cast_cone (op, op, 0, tmp); 895 cast_cone (op, op, 0, tmp);
971 free_object (tmp); 896 tmp->destroy ();
972 } 897 }
973 898
974 else if (failure <= -40 && failure > -60) /* confusion */ 899 else if (failure <= -40 && failure > -60) /* confusion */
975 { 900 {
976 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); 901 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!");
… …
1010 if (failure <= -20 && failure > -40) /* wonder */ 935 if (failure <= -20 && failure > -40) /* wonder */
1011 { 936 {
1012 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); 937 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect.");
1013 tmp = get_archetype (SPELL_WONDER); 938 tmp = get_archetype (SPELL_WONDER);
1014 cast_cone (op, op, 0, tmp); 939 cast_cone (op, op, 0, tmp);
1015 free_object (tmp); 940 tmp->destroy ();
1016 } 941 }
1017 942
1018 else if (failure <= -40 && failure > -60) /* confusion */ 943 else if (failure <= -40 && failure > -60) /* confusion */
1019 { 944 {
1020 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); 945 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!");
… …
1039 else 964 else
1040 { 965 {
1041 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 966 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!");
1042 tmp = get_archetype (LOOSE_MANA); 967 tmp = get_archetype (LOOSE_MANA);
1043 tmp->level = skill->level; 968 tmp->level = skill->level;
1044 tmp->x = op->x;
1045 tmp->y = op->y;
1046 969
1047 /* increase the area of destruction a little for more powerful spells */ 970 /* increase the area of destruction a little for more powerful spells */
1048 tmp->range += isqrt (power); 971 tmp->range += isqrt (power);
1049 972
1050 if (power > 25) 973 if (power > 25)
1051 tmp->stats.dam = 25 + isqrt (power); 974 tmp->stats.dam = 25 + isqrt (power);
1052 else 975 else
1053 tmp->stats.dam = power; /* nasty recoils! */ 976 tmp->stats.dam = power; /* nasty recoils! */
1054 977
1055 tmp->stats.maxhp = tmp->count; 978 tmp->stats.maxhp = tmp->count;
1056 insert_ob_in_map (tmp, op->map, NULL, 0); 979
980 tmp->insert_at (op);
1057 } 981 }
1058 } 982 }
1059} 983}
1060 984
1061int 985int
1062cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 986cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1063{ 987{
1064 int success; 988 int success;
1065 player *pl;
1066 object *spell; 989 object *spell;
1067 990
1068 if (!spell_ob->other_arch) 991 if (!spell_ob->other_arch)
1069 { 992 {
1070 LOG (llevError, "cast_party_spell: empty other arch\n"); 993 LOG (llevError, "cast_party_spell: empty other arch\n");
… …
1075 /* Always cast spell on caster */ 998 /* Always cast spell on caster */
1076 success = cast_spell (op, caster, dir, spell, stringarg); 999 success = cast_spell (op, caster, dir, spell, stringarg);
1077 1000
1078 if (caster->contr->party == NULL) 1001 if (caster->contr->party == NULL)
1079 { 1002 {
1080 remove_ob (spell); 1003 spell->remove ();
1081 return success; 1004 return success;
1082 } 1005 }
1083 for (pl = first_player; pl != NULL; pl = pl->next) 1006 for_all_players (pl)
1084 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 1007 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1085 { 1008 {
1086 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 1009 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1087 } 1010 }
1088 remove_ob (spell); 1011 spell->remove ();
1089 return success; 1012 return success;
1090} 1013}
1091 1014
1092/* This is where the main dispatch when someone casts a spell. 1015/* This is where the main dispatch when someone casts a spell.
1093 * 1016 *
… …
1114 * 1037 *
1115 * if it is a player casting the spell (op->type == PLAYER, op == caster), 1038 * if it is a player casting the spell (op->type == PLAYER, op == caster),
1116 * this function will decrease the mana/grace appropriately. For other 1039 * this function will decrease the mana/grace appropriately. For other
1117 * objects, the caller should do what it considers appropriate. 1040 * objects, the caller should do what it considers appropriate.
1118 */ 1041 */
1119
1120int 1042int
1121cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 1043cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1122{ 1044{
1123 const char *godname; 1045 const char *godname;
1124 int success = 0, mflags, cast_level = 0, old_shoottype; 1046 int success = 0, mflags, cast_level = 0;
1125 object *skill = NULL; 1047 object *skill = NULL;
1126
1127 old_shoottype = op->contr ? op->contr->shoottype : 0;
1128 1048
1129 if (!spell_ob) 1049 if (!spell_ob)
1130 { 1050 {
1131 LOG (llevError, "cast_spell: null spell object passed\n"); 1051 LOG (llevError, "cast_spell: null spell object passed\n");
1132 return 0; 1052 return 0;
… …
1143 } 1063 }
1144 1064
1145 /* if caster is a spell casting object, this normally shouldn't be 1065 /* if caster is a spell casting object, this normally shouldn't be
1146 * an issue, because they don't have any spellpaths set up. 1066 * an issue, because they don't have any spellpaths set up.
1147 */ 1067 */
1148 if (caster->path_denied & spell_ob->path_attuned) 1068 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST))
1149 { 1069 {
1150 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 1070 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you.");
1151 return 0; 1071 return 0;
1152 } 1072 }
1153 1073
… …
1161 * at least process that code. 1081 * at least process that code.
1162 */ 1082 */
1163 if (op->type == PLAYER && op == caster) 1083 if (op->type == PLAYER && op == caster)
1164 { 1084 {
1165 cast_level = caster_level (caster, spell_ob); 1085 cast_level = caster_level (caster, spell_ob);
1086
1166 if (spell_ob->skill) 1087 if (spell_ob->skill)
1167 { 1088 {
1168 skill = find_skill_by_name (op, spell_ob->skill); 1089 skill = find_skill_by_name (op, spell_ob->skill);
1090
1169 if (!skill) 1091 if (!skill)
1170 { 1092 {
1171 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 1093 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name);
1172 return 0; 1094 return 0;
1173 } 1095 }
1096
1174 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 1097 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
1175 { 1098 {
1176 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 1099 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell.");
1177 return 0; 1100 return 0;
1178 } 1101 }
1179 } 1102 }
1103
1180 /* If the caster is the wiz, they don't ever fail, and don't have 1104 /* If the caster is the wiz, they don't ever fail, and don't have
1181 * to have sufficient grace/mana. 1105 * to have sufficient grace/mana.
1182 */ 1106 */
1183 if (!QUERY_FLAG (op, FLAG_WIZ)) 1107 if (!QUERY_FLAG (op, FLAG_WIZ))
1184 { 1108 {
… …
1186 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1110 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1187 { 1111 {
1188 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1112 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana.");
1189 return 0; 1113 return 0;
1190 } 1114 }
1115
1191 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1116 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1192 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1117 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1193 { 1118 {
1194 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1119 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1195 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1120 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
… …
1208 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1133 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1209 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1134 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1210 { 1135 {
1211 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1136 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
1212 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1137 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell.");
1213 if (settings.casting_time == TRUE) 1138
1214 {
1215 op->casting_time = -1;
1216 }
1217 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1139 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1218 return 0; 1140 return 0;
1219 } 1141 }
1220 else if (spell_ob->stats.sp) 1142 else if (spell_ob->stats.sp)
1221 { 1143 {
… …
1224 if (failure < 0) 1146 if (failure < 0)
1225 { 1147 {
1226 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1148 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use.");
1227 if (settings.spell_failure_effects == TRUE) 1149 if (settings.spell_failure_effects == TRUE)
1228 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1150 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1229 op->contr->shoottype = (rangetype) old_shoottype; 1151
1230 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1152 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1231 return 0; 1153 return 0;
1232 } 1154 }
1233 } 1155 }
1234 } 1156 }
… …
1257 { 1179 {
1258 if (op->type != PLAYER) 1180 if (op->type != PLAYER)
1259 return 0; 1181 return 0;
1260 1182
1261 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1183 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1262 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); 1184 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname);
1263 else 1185 else if (object *item = op->contr->ranged_ob)
1264 switch (op->contr->shoottype)
1265 { 1186 {
1266 case range_magic: 1187 if (item->type == SPELL)
1267 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1188 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting.");
1268 break; 1189 else if (item->type == SCROLL)
1269 case range_misc:
1270 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1271 break;
1272 case range_golem:
1273 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll."); 1190 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
1274 break;
1275 default:
1276 break;
1277 }
1278 return 0;
1279 }
1280
1281 if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1282 {
1283 if (op->casting_time == -1)
1284 { /* begin the casting */
1285 op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1286 op->spell = spell_ob;
1287 /* put the stringarg into the object struct so that when the
1288 * spell is actually cast, it knows about the stringarg.
1289 * necessary for the invoke command spells.
1290 */
1291 if (stringarg)
1292 {
1293 op->spellarg = strdup_local (stringarg);
1294 }
1295 else 1191 else
1296 op->spellarg = NULL; 1192 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1297 return 0;
1298 }
1299 else if (op->casting_time != 0)
1300 {
1301 if (op->type == PLAYER)
1302 new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1303 return 0;
1304 } 1193 }
1305 else 1194 else
1306 { /* casting_time == 0 */ 1195 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!");
1307 op->casting_time = -1; 1196
1308 spell_ob = op->spell; 1197 return 0;
1309 stringarg = op->spellarg;
1310 }
1311 }
1312 else
1313 { 1198 }
1199
1314 /* Take into account how long it takes to cast the spell. 1200 /* Take into account how long it takes to cast the spell.
1315 * if the player is casting it, then we use the time in 1201 * if the player is casting it, then we use the time in
1316 * the spell object. If it is a spell object, have it 1202 * the spell object. If it is a spell object, have it
1317 * take two ticks. Things that cast spells on the players 1203 * take two ticks. Things that cast spells on the players
1318 * behalf (eg, altars, and whatever else) shouldn't cost 1204 * behalf (eg, altars, and whatever else) shouldn't cost
1319 * the player any time. 1205 * the player any time.
1320 * Ignore casting time for firewalls 1206 * Ignore casting time for firewalls
1207 */
1208 if (caster == op && caster->type != FIREWALL)
1209 {
1210 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1211 /* Other portions of the code may also decrement the speed of the player, so
1212 * put a lower limit so that the player isn't stuck here too long
1321 */ 1213 */
1322 if (caster == op && caster->type != FIREWALL)
1323 {
1324 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1325 /* Other portions of the code may also decrement the speed of the player, so
1326 * put a lower limit so that the player isn't stuck here too long
1327 */
1328 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1214 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
1329 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1215 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1330 } 1216 }
1331 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1217 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1332 {
1333 op->speed_left -= 2 * FABS (op->speed); 1218 op->speed_left -= 2 * FABS (op->speed);
1334 }
1335 }
1336 1219
1337 if (op->type == PLAYER && op == caster) 1220 if (op->type == PLAYER && op == caster)
1338 { 1221 {
1339 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1222 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1340 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1223 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1350 if (!skill) 1233 if (!skill)
1351 { 1234 {
1352 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1235 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster));
1353 return 0; 1236 return 0;
1354 } 1237 }
1238
1355 change_skill (op, skill, 0); /* needed for proper exp credit */ 1239 op->change_skill (skill); /* needed for proper exp credit */
1356 } 1240 }
1241
1242 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1243 return RESULT_INT (0);
1357 1244
1358 switch (spell_ob->subtype) 1245 switch (spell_ob->subtype)
1359 { 1246 {
1360 /* The order of case statements is same as the order they show up 1247 /* The order of case statements is same as the order they show up
1361 * in in spells.h. 1248 * in in spells.h.
1362 */ 1249 */
1363 case SP_RAISE_DEAD: 1250 case SP_RAISE_DEAD:
1364 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1251 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1365 break; 1252 break;
1366 1253
1367 case SP_RUNE: 1254 case SP_RUNE:
… …
1400 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1287 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);
1401 break; 1288 break;
1402 1289
1403 case SP_SUMMON_GOLEM: 1290 case SP_SUMMON_GOLEM:
1404 success = summon_golem (op, caster, dir, spell_ob); 1291 success = summon_golem (op, caster, dir, spell_ob);
1405 old_shoottype = range_golem;
1406 break; 1292 break;
1407 1293
1408 case SP_DIMENSION_DOOR: 1294 case SP_DIMENSION_DOOR:
1409 /* dimension door needs the actual caster, because that is what is 1295 /* dimension door needs the actual caster, because that is what is
1410 * moved. 1296 * moved.
… …
1543 success = cast_consecrate (op, caster, spell_ob); 1429 success = cast_consecrate (op, caster, spell_ob);
1544 break; 1430 break;
1545 1431
1546 case SP_ANIMATE_WEAPON: 1432 case SP_ANIMATE_WEAPON:
1547 success = animate_weapon (op, caster, spell_ob, dir); 1433 success = animate_weapon (op, caster, spell_ob, dir);
1548 old_shoottype = range_golem;
1549 break; 1434 break;
1550 1435
1551 case SP_LIGHT: 1436 case SP_LIGHT:
1552 success = cast_light (op, caster, spell_ob, dir); 1437 success = cast_light (op, caster, spell_ob, dir);
1553 break; 1438 break;
… …
1566 1451
1567 case SP_AURA: 1452 case SP_AURA:
1568 success = create_aura (op, caster, spell_ob); 1453 success = create_aura (op, caster, spell_ob);
1569 break; 1454 break;
1570 1455
1571 case SP_TOWN_PORTAL:
1572 success = cast_create_town_portal (op, caster, spell_ob, dir);
1573 break;
1574
1575 case SP_PARTY_SPELL: 1456 case SP_PARTY_SPELL:
1576 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1457 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1577 break; 1458 break;
1578 1459
1579 default: 1460 default:
1580 if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1581 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1461 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1582 } 1462 }
1583 1463
1584 /* FIXME - we need some better sound suppport */ 1464 /* FIXME - we need some better sound suppport */
1585 // yes, for example, augment map info with the spell effect 1465 // yes, for example, augment map info with the spell effect
1586 // so clients can calculate the sounds themselves 1466 // so clients can calculate the sounds themselves
1587 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype); 1467 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1588 1468
1589 /* free the spell arg */
1590 if (settings.casting_time == TRUE && stringarg)
1591 {
1592 free (stringarg);
1593 stringarg = NULL;
1594 }
1595 /* perhaps a bit of a hack, but if using a wand, it has to change the skill
1596 * to something like use_magic_item, but you really want to be able to fire
1597 * it again.
1598 */
1599 if (op->contr)
1600 op->contr->shoottype = (rangetype) old_shoottype;
1601
1602 return success; 1469 return success;
1603} 1470}
1604 1471
1605 1472
1606/* This is called from time.c/process_object(). That function 1473/* This is called from time.c/process_object(). That function
… …
1691 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1558 if (QUERY_FLAG (victim, FLAG_ALIVE))
1692 { 1559 {
1693 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1560 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1694 1561
1695 if (!spell->destroyed ()) 1562 if (!spell->destroyed ())
1696 { 1563 spell->destroy ();
1697 remove_ob (spell);
1698 free_object (spell);
1699 }
1700 } 1564 }
1701 break; 1565 break;
1702 1566
1703 case SP_MOVING_BALL: 1567 case SP_MOVING_BALL:
1704 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1568 if (QUERY_FLAG (victim, FLAG_ALIVE))
1705 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1569 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1706 else if (victim->material || victim->materialname) 1570 else if (victim->materialname)
1707 save_throw_object (victim, spell->attacktype, spell); 1571 save_throw_object (victim, spell->attacktype, spell);
1708 break; 1572 break;
1709 } 1573 }
1710} 1574}

Diff Legend

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