1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program 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 2 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, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 at <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 | |
34 | extern char *spell_mapping[]; |
32 | extern 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 |
… | |
… | |
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 | |
|
|
157 | void |
154 | void |
158 | spell_effect (object *spob, int x, int y, maptile *map, object *originator) |
155 | spell_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 | */ |
182 | int |
171 | int |
183 | min_casting_level (object *caster, object *spell) |
172 | min_casting_level (object *caster, object *spell) |
… | |
… | |
186 | |
175 | |
187 | if (caster->path_denied & spell->path_attuned) |
176 | if (caster->path_denied & spell->path_attuned) |
188 | return 1; |
177 | return 1; |
189 | |
178 | |
190 | new_level = spell->level |
179 | new_level = spell->level |
191 | + ((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) |
|
|
181 | + (caster->path_attuned & spell->path_attuned ? -2 : 0); |
192 | |
182 | |
193 | return (new_level < 1) ? 1 : new_level; |
183 | return max (1, new_level); |
194 | } |
184 | } |
195 | |
|
|
196 | |
185 | |
197 | /* This function returns the effective level the spell |
186 | /* This function returns the effective level the spell |
198 | * is being cast at. |
187 | * is being cast at. |
199 | * 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. |
200 | * This is because the new code compares casting_level against |
189 | * This is because the new code compares casting_level against |
201 | * min_caster_level, so the difference is effectively 4 |
190 | * min_caster_level, so the difference is effectively 4 |
202 | */ |
191 | */ |
203 | |
|
|
204 | int |
192 | int |
205 | caster_level (object *caster, object *spell) |
193 | caster_level (object *caster, object *spell) |
206 | { |
194 | { |
207 | int level = caster->level; |
195 | int level = caster->level; |
208 | |
196 | |
… | |
… | |
223 | |
211 | |
224 | level = MIN (level, sk_level + level / 10 + 1); |
212 | level = MIN (level, sk_level + level / 10 + 1); |
225 | } |
213 | } |
226 | |
214 | |
227 | /* Got valid caster level. Now adjust for attunement */ |
215 | /* Got valid caster level. Now adjust for attunement */ |
228 | 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; |
229 | |
218 | |
230 | /* 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 |
231 | * errors in various places. |
220 | * errors in various places. |
232 | */ |
221 | */ |
233 | if (level < 1) |
|
|
234 | level = 1; |
|
|
235 | |
|
|
236 | return level; |
222 | return max (level, 1); |
237 | } |
223 | } |
238 | |
224 | |
239 | /* The following function scales the spellpoint cost of |
225 | /* The following function scales the spellpoint cost of |
240 | * a spell by it's increased effectiveness. Some of the |
226 | * a spell by it's increased effectiveness. Some of the |
241 | * lower level spells become incredibly vicious at high |
227 | * lower level spells become incredibly vicious at high |
… | |
… | |
441 | { |
427 | { |
442 | object *op; |
428 | object *op; |
443 | |
429 | |
444 | if (OUT_OF_REAL_MAP (m, x, y)) |
430 | if (OUT_OF_REAL_MAP (m, x, y)) |
445 | return 0; |
431 | return 0; |
446 | 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) |
447 | if (QUERY_FLAG (op, FLAG_REFL_SPELL) && (!QUERY_FLAG (op, FLAG_ALIVE) || |
433 | if (QUERY_FLAG (op, FLAG_REFL_SPELL) |
448 | 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))) |
449 | return 1; |
436 | return 1; |
450 | |
437 | |
451 | return 0; |
438 | return 0; |
452 | } |
439 | } |
453 | |
440 | |
… | |
… | |
470 | { |
457 | { |
471 | 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."); |
472 | 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."); |
473 | dir = 0; |
460 | dir = 0; |
474 | } |
461 | } |
475 | new_op->x = op->x + freearr_x[dir]; |
462 | |
476 | new_op->y = op->y + freearr_y[dir]; |
463 | op->map->insert (new_op, |
477 | if (dir == 0) |
464 | op->x + freearr_x[dir], op->y + freearr_y[dir], |
478 | insert_ob_in_map (new_op, op->map, op, INS_BELOW_ORIGINATOR); |
465 | op, |
479 | else |
466 | dir ? 0 : INS_BELOW_ORIGINATOR); |
480 | insert_ob_in_map (new_op, op->map, op, 0); |
467 | |
481 | return dir; |
468 | return dir; |
482 | } |
469 | } |
483 | |
470 | |
484 | /* 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. |
485 | * immune_stop is basically the attacktype of the spell (why |
472 | * immune_stop is basically the attacktype of the spell (why |
… | |
… | |
487 | * has the AT_MAGIC bit set, and there is a counterwall |
474 | * has the AT_MAGIC bit set, and there is a counterwall |
488 | * 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 |
489 | * 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. |
490 | * |
477 | * |
491 | */ |
478 | */ |
492 | |
|
|
493 | int |
479 | int |
494 | ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) |
480 | ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) |
495 | { |
481 | { |
496 | object *tmp; |
482 | if (!xy_normalise (m, x, y)) |
497 | int mflags; |
|
|
498 | maptile *mp; |
|
|
499 | |
|
|
500 | mp = m; |
|
|
501 | mflags = get_map_flags (m, &mp, x, y, &x, &y); |
|
|
502 | |
|
|
503 | if (mflags & P_OUT_OF_MAP) |
|
|
504 | return 0; |
483 | return 0; |
505 | |
484 | |
506 | 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)) |
507 | return 0; |
488 | return 0; |
508 | |
489 | |
509 | for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above) |
490 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
510 | { |
491 | { |
511 | /* If there is a counterspell on the space, and this |
492 | /* If there is a counterspell on the space, and this |
512 | * object is using magic, don't progress. I believe we could |
493 | * object is using magic, don't progress. I believe we could |
513 | * 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 |
514 | * 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 |
515 | * 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 |
516 | * 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 |
517 | * 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 |
518 | * spell to actually hit the counterwall and be sucked up. |
499 | * spell to actually hit the counterwall and be sucked up. |
519 | */ |
500 | */ |
520 | if ((tmp->attacktype & AT_COUNTERSPELL) && |
501 | if ((tmp->attacktype & AT_COUNTERSPELL) |
521 | (tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) && |
502 | && !QUERY_FLAG (tmp, FLAG_MONSTER) |
522 | (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)) |
523 | return 0; |
515 | return 0; |
524 | |
516 | |
525 | /* This is to prevent 'out of control' spells. Basically, this |
517 | /* This is to prevent 'out of control' spells. Basically, this |
526 | * limits one spell effect per space per spell. This is definately |
518 | * limits one spell effect per space per spell. This is definately |
527 | * needed for performance reasons, and just for playability I believe. |
519 | * needed for performance reasons, and just for playability I believe. |
… | |
… | |
537 | * playability reasons. |
529 | * playability reasons. |
538 | */ |
530 | */ |
539 | if (tmp->arch == op->arch |
531 | if (tmp->arch == op->arch |
540 | && tmp->type == op->type |
532 | && tmp->type == op->type |
541 | && tmp->subtype == op->subtype |
533 | && tmp->subtype == op->subtype |
|
|
534 | && tmp->owner == op->owner |
542 | && 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))) |
543 | { |
536 | { |
544 | tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); |
537 | tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); |
545 | tmp->range = MAX (tmp->range, op->range); |
538 | tmp->range = MAX (tmp->range, op->range); |
546 | tmp->duration = MAX (tmp->duration, op->duration); |
539 | tmp->duration = MAX (tmp->duration, op->duration); |
547 | return 0; |
540 | return 0; |
… | |
… | |
549 | |
542 | |
550 | /* 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 |
551 | * ground to prevent it from moving along? |
544 | * ground to prevent it from moving along? |
552 | */ |
545 | */ |
553 | } |
546 | } |
|
|
547 | |
554 | /* If it passes the above tests, it must be OK */ |
548 | /* If it passes the above tests, it must be OK */ |
555 | return 1; |
549 | return 1; |
556 | } |
550 | } |
557 | |
551 | |
558 | /* fire_arch_from_position: fires an archetype. |
552 | /* fire_arch_from_position: fires an archetype. |
… | |
… | |
589 | return 0; |
583 | return 0; |
590 | |
584 | |
591 | 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))) |
592 | { |
586 | { |
593 | 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"); |
594 | tmp->destroy (0); |
588 | tmp->destroy (); |
595 | return 0; |
589 | return 0; |
596 | } |
590 | } |
597 | |
|
|
598 | |
|
|
599 | |
591 | |
600 | 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); |
601 | tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); |
593 | tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); |
602 | /* 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 */ |
603 | tmp->stats.food = tmp->duration; |
595 | tmp->stats.food = tmp->duration; |
604 | tmp->range = spell->range + SP_level_range_adjust (caster, spell); |
596 | tmp->range = spell->range + SP_level_range_adjust (caster, spell); |
605 | tmp->attacktype = spell->attacktype; |
597 | tmp->attacktype = spell->attacktype; |
606 | tmp->x = x; |
598 | tmp->x = x; |
607 | tmp->y = y; |
599 | tmp->y = y; |
608 | tmp->direction = dir; |
600 | tmp->direction = dir; |
609 | if (get_owner (op) != NULL) |
601 | if (op->owner != NULL) |
610 | copy_owner (tmp, op); |
602 | tmp->set_owner (op); |
611 | else |
603 | else |
612 | set_owner (tmp, op); |
604 | tmp->set_owner (op); |
613 | tmp->level = caster_level (caster, spell); |
605 | tmp->level = caster_level (caster, spell); |
614 | set_spell_skill (op, caster, spell, tmp); |
606 | set_spell_skill (op, caster, spell, tmp); |
615 | |
607 | |
616 | /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ |
608 | /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ |
617 | if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) |
609 | if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) |
… | |
… | |
620 | return 0; |
612 | return 0; |
621 | } |
613 | } |
622 | if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) |
614 | if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) |
623 | SET_ANIMATION (tmp, dir); |
615 | SET_ANIMATION (tmp, dir); |
624 | |
616 | |
625 | if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) |
617 | if ((tmp = insert_ob_in_map (tmp, m, op, 0))) |
626 | return 1; |
|
|
627 | |
|
|
628 | move_spell_effect (tmp); |
618 | move_spell_effect (tmp); |
629 | |
619 | |
630 | return 1; |
620 | return 1; |
631 | } |
621 | } |
632 | |
|
|
633 | |
|
|
634 | |
622 | |
635 | /***************************************************************************** |
623 | /***************************************************************************** |
636 | * |
624 | * |
637 | * Code related to rods - perhaps better located in another file? |
625 | * Code related to rods - perhaps better located in another file? |
638 | * |
626 | * |
639 | ****************************************************************************/ |
627 | ****************************************************************************/ |
640 | |
|
|
641 | void |
628 | void |
642 | regenerate_rod (object *rod) |
629 | regenerate_rod (object *rod) |
643 | { |
630 | { |
644 | if (rod->stats.hp < rod->stats.maxhp) |
631 | if (rod->stats.hp < rod->stats.maxhp) |
645 | { |
632 | { |
… | |
… | |
654 | void |
641 | void |
655 | drain_rod_charge (object *rod) |
642 | drain_rod_charge (object *rod) |
656 | { |
643 | { |
657 | rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); |
644 | rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); |
658 | } |
645 | } |
659 | |
|
|
660 | |
|
|
661 | |
|
|
662 | |
646 | |
663 | /* this function is commonly used to find a friendly target for |
647 | /* this function is commonly used to find a friendly target for |
664 | * spells such as heal or protection or armour |
648 | * spells such as heal or protection or armour |
665 | * op is what is looking for the target (which can be a player), |
649 | * op is what is looking for the target (which can be a player), |
666 | * dir is the direction we are looking in. Return object found, or |
650 | * dir is the direction we are looking in. Return object found, or |
667 | * NULL if no good object. |
651 | * NULL if no good object. |
668 | */ |
652 | */ |
669 | |
|
|
670 | object * |
653 | object * |
671 | find_target_for_friendly_spell (object *op, int dir) |
654 | find_target_for_friendly_spell (object *op, int dir) |
672 | { |
655 | { |
673 | object *tmp; |
656 | object *tmp; |
674 | maptile *m; |
|
|
675 | sint16 x, y; |
|
|
676 | int mflags; |
|
|
677 | |
657 | |
678 | /* I don't really get this block - if op isn't a player or rune, |
658 | /* I don't really get this block - if op isn't a player or rune, |
679 | * we then make the owner of this object the target. |
659 | * we then make the owner of this object the target. |
680 | * The owner could very well be no where near op. |
660 | * The owner could very well be no where near op. |
681 | */ |
661 | */ |
682 | if (op->type != PLAYER && op->type != RUNE) |
662 | if (op->type != PLAYER && op->type != RUNE) |
683 | { |
663 | { |
684 | tmp = get_owner (op); |
664 | tmp = op->owner; |
685 | /* If the owner does not exist, or is not a monster, than apply the spell |
665 | /* If the owner does not exist, or is not a monster, than apply the spell |
686 | * to the caster. |
666 | * to the caster. |
687 | */ |
667 | */ |
688 | if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) |
668 | if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) |
689 | tmp = op; |
669 | tmp = op; |
690 | } |
670 | } |
691 | else |
671 | else |
692 | { |
672 | { |
693 | m = op->map; |
673 | maptile *m = op->map; |
694 | x = op->x + freearr_x[dir]; |
674 | sint16 x = op->x + freearr_x[dir]; |
695 | y = op->y + freearr_y[dir]; |
675 | sint16 y = op->y + freearr_y[dir]; |
696 | |
|
|
697 | mflags = get_map_flags (m, &m, x, y, &x, &y); |
|
|
698 | |
|
|
699 | if (mflags & P_OUT_OF_MAP) |
|
|
700 | tmp = NULL; |
|
|
701 | else |
|
|
702 | { |
676 | |
703 | for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) |
677 | tmp = xy_normalise (m, x, y) |
704 | if (tmp->type == PLAYER) |
678 | ? m->at (x, y).player () |
705 | break; |
679 | : 0; |
706 | } |
|
|
707 | } |
680 | } |
|
|
681 | |
708 | /* didn't find a player there, look in current square for a player */ |
682 | /* didn't find a player there, look in current square for a player */ |
709 | if (tmp == NULL) |
683 | if (!tmp) |
710 | for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
684 | tmp = op->ms ().player (); |
711 | { |
|
|
712 | if (tmp->type == PLAYER) |
|
|
713 | break; |
|
|
714 | } |
|
|
715 | |
685 | |
716 | return tmp; |
686 | return tmp; |
717 | } |
687 | } |
718 | |
688 | |
719 | |
689 | |
… | |
… | |
751 | mp = m; |
721 | mp = m; |
752 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
722 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
753 | if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) |
723 | if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) |
754 | continue; |
724 | continue; |
755 | |
725 | |
756 | tmp = get_map_ob (mp, nx, ny); |
726 | tmp = GET_MAP_OB (mp, nx, ny); |
757 | |
727 | |
758 | while (tmp != NULL && (((owner_type == PLAYER && |
728 | while (tmp != NULL && (((owner_type == PLAYER && |
759 | !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || |
729 | !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || |
760 | (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) |
730 | (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) |
761 | tmp = tmp->above; |
731 | tmp = tmp->above; |
… | |
… | |
764 | return freedir[i]; |
734 | return freedir[i]; |
765 | } |
735 | } |
766 | return -1; /* flag for "keep going the way you were" */ |
736 | return -1; /* flag for "keep going the way you were" */ |
767 | } |
737 | } |
768 | |
738 | |
769 | |
|
|
770 | |
|
|
771 | /* put_a_monster: puts a monster named monstername near by |
739 | /* put_a_monster: puts a monster named monstername near by |
772 | * op. This creates the treasures for the monsters, and |
740 | * op. This creates the treasures for the monsters, and |
773 | * also deals with multipart monsters properly. |
741 | * also deals with multipart monsters properly. |
774 | */ |
742 | */ |
775 | |
|
|
776 | void |
743 | void |
777 | put_a_monster (object *op, const char *monstername) |
744 | put_a_monster (object *op, const char *monstername) |
778 | { |
745 | { |
779 | object *tmp, *head = NULL, *prev = NULL; |
746 | object *tmp, *head = NULL, *prev = NULL; |
780 | archetype *at; |
747 | archetype *at; |
… | |
… | |
816 | create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); |
783 | create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); |
817 | |
784 | |
818 | insert_ob_in_map (head, op->map, op, 0); |
785 | insert_ob_in_map (head, op->map, op, 0); |
819 | |
786 | |
820 | /* thought it'd be cool to insert a burnout, too. */ |
787 | /* thought it'd be cool to insert a burnout, too. */ |
821 | tmp = get_archetype ("burnout"); |
788 | op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op); |
822 | tmp->map = op->map; |
|
|
823 | tmp->x = op->x + freearr_x[dir]; |
|
|
824 | tmp->y = op->y + freearr_y[dir]; |
|
|
825 | insert_ob_in_map (tmp, op->map, op, 0); |
|
|
826 | } |
789 | } |
827 | } |
790 | } |
828 | |
791 | |
829 | /* peterm: function which summons hostile monsters and |
792 | /* peterm: function which summons hostile monsters and |
830 | * places them in nearby squares. |
793 | * places them in nearby squares. |
… | |
… | |
857 | { |
820 | { |
858 | int attacktype; |
821 | int attacktype; |
859 | int face; |
822 | int face; |
860 | } ATTACKS[22] = |
823 | } ATTACKS[22] = |
861 | { |
824 | { |
862 | { |
|
|
863 | AT_PHYSICAL, 0}, |
825 | { AT_PHYSICAL, 0}, |
864 | { |
|
|
865 | AT_PHYSICAL, 0}, /*face = explosion */ |
826 | { AT_PHYSICAL, 0}, /*face = explosion */ |
866 | { |
|
|
867 | AT_PHYSICAL, 0}, |
827 | { AT_PHYSICAL, 0}, |
868 | { |
|
|
869 | AT_MAGIC, 1}, |
828 | { AT_MAGIC, 1}, |
870 | { |
|
|
871 | AT_MAGIC, 1}, /* face = last-burnout */ |
829 | { AT_MAGIC, 1}, /* face = last-burnout */ |
872 | { |
|
|
873 | AT_MAGIC, 1}, |
830 | { AT_MAGIC, 1}, |
874 | { |
|
|
875 | AT_FIRE, 2}, |
831 | { AT_FIRE, 2}, |
876 | { |
|
|
877 | AT_FIRE, 2}, /* face = fire.... */ |
832 | { AT_FIRE, 2}, /* face = fire.... */ |
878 | { |
|
|
879 | AT_FIRE, 2}, |
833 | { AT_FIRE, 2}, |
880 | { |
|
|
881 | AT_ELECTRICITY, 3}, |
834 | { AT_ELECTRICITY, 3}, |
882 | { |
|
|
883 | AT_ELECTRICITY, 3}, /* ball_lightning */ |
835 | { AT_ELECTRICITY, 3}, /* ball_lightning */ |
884 | { |
|
|
885 | AT_ELECTRICITY, 3}, |
836 | { AT_ELECTRICITY, 3}, |
886 | { |
|
|
887 | AT_COLD, 4}, |
837 | { AT_COLD, 4}, |
888 | { |
|
|
889 | AT_COLD, 4}, /* face=icestorm */ |
838 | { AT_COLD, 4}, /* face=icestorm */ |
890 | { |
|
|
891 | AT_COLD, 4}, |
839 | { AT_COLD, 4}, |
892 | { |
|
|
893 | AT_CONFUSION, 5}, |
840 | { AT_CONFUSION, 5}, |
894 | { |
|
|
895 | AT_POISON, 7}, |
841 | { AT_POISON, 7}, |
896 | { |
|
|
897 | AT_POISON, 7}, /* face = acid sphere. generator */ |
842 | { AT_POISON, 7}, /* face = acid sphere. generator */ |
898 | { |
|
|
899 | AT_POISON, 7}, /* poisoncloud face */ |
843 | { AT_POISON, 7}, /* poisoncloud face */ |
900 | { |
|
|
901 | AT_SLOW, 8}, |
844 | { AT_SLOW, 8}, |
902 | { |
|
|
903 | AT_PARALYZE, 9}, |
845 | { AT_PARALYZE, 9}, |
904 | { |
|
|
905 | AT_FEAR, 10}}; |
846 | { AT_FEAR, 10}, |
906 | |
847 | }; |
907 | |
|
|
908 | |
848 | |
909 | /* shuffle_attack: peterm |
849 | /* shuffle_attack: peterm |
910 | * This routine shuffles the attack of op to one of the |
850 | * This routine shuffles the attack of op to one of the |
911 | * ones in the list. It does this at random. It also |
851 | * ones in the list. It does this at random. It also |
912 | * chooses a face appropriate to the attack that is |
852 | * chooses a face appropriate to the attack that is |
… | |
… | |
957 | if (failure <= -20 && failure > -40) /* wonder */ |
897 | if (failure <= -20 && failure > -40) /* wonder */ |
958 | { |
898 | { |
959 | new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); |
899 | new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); |
960 | tmp = get_archetype (SPELL_WONDER); |
900 | tmp = get_archetype (SPELL_WONDER); |
961 | cast_cone (op, op, 0, tmp); |
901 | cast_cone (op, op, 0, tmp); |
962 | tmp->destroy (0); |
902 | tmp->destroy (); |
963 | } |
903 | } |
964 | |
904 | |
965 | else if (failure <= -40 && failure > -60) /* confusion */ |
905 | else if (failure <= -40 && failure > -60) /* confusion */ |
966 | { |
906 | { |
967 | new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); |
907 | new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); |
… | |
… | |
1001 | if (failure <= -20 && failure > -40) /* wonder */ |
941 | if (failure <= -20 && failure > -40) /* wonder */ |
1002 | { |
942 | { |
1003 | new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); |
943 | new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); |
1004 | tmp = get_archetype (SPELL_WONDER); |
944 | tmp = get_archetype (SPELL_WONDER); |
1005 | cast_cone (op, op, 0, tmp); |
945 | cast_cone (op, op, 0, tmp); |
1006 | tmp->destroy (0); |
946 | tmp->destroy (); |
1007 | } |
947 | } |
1008 | |
948 | |
1009 | else if (failure <= -40 && failure > -60) /* confusion */ |
949 | else if (failure <= -40 && failure > -60) /* confusion */ |
1010 | { |
950 | { |
1011 | new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); |
951 | new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); |
… | |
… | |
1030 | else |
970 | else |
1031 | { |
971 | { |
1032 | new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); |
972 | new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); |
1033 | tmp = get_archetype (LOOSE_MANA); |
973 | tmp = get_archetype (LOOSE_MANA); |
1034 | tmp->level = skill->level; |
974 | tmp->level = skill->level; |
1035 | tmp->x = op->x; |
|
|
1036 | tmp->y = op->y; |
|
|
1037 | |
975 | |
1038 | /* increase the area of destruction a little for more powerful spells */ |
976 | /* increase the area of destruction a little for more powerful spells */ |
1039 | tmp->range += isqrt (power); |
977 | tmp->range += isqrt (power); |
1040 | |
978 | |
1041 | if (power > 25) |
979 | if (power > 25) |
1042 | tmp->stats.dam = 25 + isqrt (power); |
980 | tmp->stats.dam = 25 + isqrt (power); |
1043 | else |
981 | else |
1044 | tmp->stats.dam = power; /* nasty recoils! */ |
982 | tmp->stats.dam = power; /* nasty recoils! */ |
1045 | |
983 | |
1046 | tmp->stats.maxhp = tmp->count; |
984 | tmp->stats.maxhp = tmp->count; |
1047 | insert_ob_in_map (tmp, op->map, NULL, 0); |
985 | |
|
|
986 | tmp->insert_at (op); |
1048 | } |
987 | } |
1049 | } |
988 | } |
1050 | } |
989 | } |
1051 | |
990 | |
1052 | int |
991 | int |
1053 | cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) |
992 | cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) |
1054 | { |
993 | { |
1055 | int success; |
994 | int success; |
1056 | player *pl; |
|
|
1057 | object *spell; |
995 | object *spell; |
1058 | |
996 | |
1059 | if (!spell_ob->other_arch) |
997 | if (!spell_ob->other_arch) |
1060 | { |
998 | { |
1061 | LOG (llevError, "cast_party_spell: empty other arch\n"); |
999 | LOG (llevError, "cast_party_spell: empty other arch\n"); |
… | |
… | |
1069 | if (caster->contr->party == NULL) |
1007 | if (caster->contr->party == NULL) |
1070 | { |
1008 | { |
1071 | spell->remove (); |
1009 | spell->remove (); |
1072 | return success; |
1010 | return success; |
1073 | } |
1011 | } |
1074 | for (pl = first_player; pl != NULL; pl = pl->next) |
1012 | for_all_players (pl) |
1075 | if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) |
1013 | if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) |
1076 | { |
1014 | { |
1077 | cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); |
1015 | cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); |
1078 | } |
1016 | } |
1079 | spell->remove (); |
1017 | spell->remove (); |
… | |
… | |
1105 | * |
1043 | * |
1106 | * if it is a player casting the spell (op->type == PLAYER, op == caster), |
1044 | * if it is a player casting the spell (op->type == PLAYER, op == caster), |
1107 | * this function will decrease the mana/grace appropriately. For other |
1045 | * this function will decrease the mana/grace appropriately. For other |
1108 | * objects, the caller should do what it considers appropriate. |
1046 | * objects, the caller should do what it considers appropriate. |
1109 | */ |
1047 | */ |
1110 | |
|
|
1111 | int |
1048 | int |
1112 | cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) |
1049 | cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) |
1113 | { |
1050 | { |
1114 | const char *godname; |
1051 | const char *godname; |
1115 | int success = 0, mflags, cast_level = 0, old_shoottype; |
1052 | int success = 0, mflags, cast_level = 0; |
1116 | object *skill = NULL; |
1053 | object *skill = NULL; |
1117 | |
|
|
1118 | old_shoottype = op->contr ? op->contr->shoottype : 0; |
|
|
1119 | |
1054 | |
1120 | if (!spell_ob) |
1055 | if (!spell_ob) |
1121 | { |
1056 | { |
1122 | LOG (llevError, "cast_spell: null spell object passed\n"); |
1057 | LOG (llevError, "cast_spell: null spell object passed\n"); |
1123 | return 0; |
1058 | return 0; |
… | |
… | |
1177 | SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) |
1112 | SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) |
1178 | { |
1113 | { |
1179 | new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); |
1114 | new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); |
1180 | return 0; |
1115 | return 0; |
1181 | } |
1116 | } |
|
|
1117 | |
1182 | if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && |
1118 | if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && |
1183 | SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) |
1119 | SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) |
1184 | { |
1120 | { |
1185 | if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - |
1121 | if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - |
1186 | 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) |
1122 | 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) |
… | |
… | |
1199 | if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < |
1135 | if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < |
1200 | (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) |
1136 | (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) |
1201 | { |
1137 | { |
1202 | play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); |
1138 | play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); |
1203 | new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); |
1139 | new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); |
|
|
1140 | |
1204 | if (settings.casting_time == TRUE) |
1141 | if (settings.casting_time == TRUE) |
1205 | { |
|
|
1206 | op->casting_time = -1; |
1142 | op->casting_time = -1; |
1207 | } |
1143 | |
1208 | op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); |
1144 | op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); |
1209 | return 0; |
1145 | return 0; |
1210 | } |
1146 | } |
1211 | else if (spell_ob->stats.sp) |
1147 | else if (spell_ob->stats.sp) |
1212 | { |
1148 | { |
… | |
… | |
1215 | if (failure < 0) |
1151 | if (failure < 0) |
1216 | { |
1152 | { |
1217 | new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); |
1153 | new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); |
1218 | if (settings.spell_failure_effects == TRUE) |
1154 | if (settings.spell_failure_effects == TRUE) |
1219 | spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); |
1155 | spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); |
1220 | op->contr->shoottype = (rangetype) old_shoottype; |
1156 | |
1221 | op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); |
1157 | op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); |
1222 | return 0; |
1158 | return 0; |
1223 | } |
1159 | } |
1224 | } |
1160 | } |
1225 | } |
1161 | } |
… | |
… | |
1248 | { |
1184 | { |
1249 | if (op->type != PLAYER) |
1185 | if (op->type != PLAYER) |
1250 | return 0; |
1186 | return 0; |
1251 | |
1187 | |
1252 | if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) |
1188 | if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) |
1253 | new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); |
1189 | new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); |
1254 | else |
1190 | else |
1255 | switch (op->contr->shoottype) |
|
|
1256 | { |
|
|
1257 | case range_magic: |
|
|
1258 | new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); |
1191 | new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!"); |
1259 | break; |
1192 | |
1260 | case range_misc: |
|
|
1261 | new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item."); |
|
|
1262 | break; |
|
|
1263 | case range_golem: |
|
|
1264 | new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll."); |
|
|
1265 | break; |
|
|
1266 | default: |
|
|
1267 | break; |
|
|
1268 | } |
|
|
1269 | return 0; |
1193 | return 0; |
1270 | } |
1194 | } |
1271 | |
1195 | |
1272 | if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL) |
1196 | if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL) |
1273 | { |
1197 | { |
… | |
… | |
1279 | * spell is actually cast, it knows about the stringarg. |
1203 | * spell is actually cast, it knows about the stringarg. |
1280 | * necessary for the invoke command spells. |
1204 | * necessary for the invoke command spells. |
1281 | */ |
1205 | */ |
1282 | if (stringarg) |
1206 | if (stringarg) |
1283 | { |
1207 | { |
1284 | op->spellarg = strdup_local (stringarg); |
1208 | op->spellarg = strdup (stringarg); |
1285 | } |
1209 | } |
1286 | else |
1210 | else |
1287 | op->spellarg = NULL; |
1211 | op->spellarg = NULL; |
1288 | return 0; |
1212 | return 0; |
1289 | } |
1213 | } |
… | |
… | |
1391 | success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); |
1315 | success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); |
1392 | break; |
1316 | break; |
1393 | |
1317 | |
1394 | case SP_SUMMON_GOLEM: |
1318 | case SP_SUMMON_GOLEM: |
1395 | success = summon_golem (op, caster, dir, spell_ob); |
1319 | success = summon_golem (op, caster, dir, spell_ob); |
1396 | old_shoottype = range_golem; |
|
|
1397 | break; |
1320 | break; |
1398 | |
1321 | |
1399 | case SP_DIMENSION_DOOR: |
1322 | case SP_DIMENSION_DOOR: |
1400 | /* dimension door needs the actual caster, because that is what is |
1323 | /* dimension door needs the actual caster, because that is what is |
1401 | * moved. |
1324 | * moved. |
… | |
… | |
1534 | success = cast_consecrate (op, caster, spell_ob); |
1457 | success = cast_consecrate (op, caster, spell_ob); |
1535 | break; |
1458 | break; |
1536 | |
1459 | |
1537 | case SP_ANIMATE_WEAPON: |
1460 | case SP_ANIMATE_WEAPON: |
1538 | success = animate_weapon (op, caster, spell_ob, dir); |
1461 | success = animate_weapon (op, caster, spell_ob, dir); |
1539 | old_shoottype = range_golem; |
|
|
1540 | break; |
1462 | break; |
1541 | |
1463 | |
1542 | case SP_LIGHT: |
1464 | case SP_LIGHT: |
1543 | success = cast_light (op, caster, spell_ob, dir); |
1465 | success = cast_light (op, caster, spell_ob, dir); |
1544 | break; |
1466 | break; |
… | |
… | |
1579 | |
1501 | |
1580 | /* free the spell arg */ |
1502 | /* free the spell arg */ |
1581 | if (settings.casting_time == TRUE && stringarg) |
1503 | if (settings.casting_time == TRUE && stringarg) |
1582 | { |
1504 | { |
1583 | free (stringarg); |
1505 | free (stringarg); |
1584 | stringarg = NULL; |
1506 | stringarg = 0; |
1585 | } |
1507 | } |
1586 | /* perhaps a bit of a hack, but if using a wand, it has to change the skill |
|
|
1587 | * to something like use_magic_item, but you really want to be able to fire |
|
|
1588 | * it again. |
|
|
1589 | */ |
|
|
1590 | if (op->contr) |
|
|
1591 | op->contr->shoottype = (rangetype) old_shoottype; |
|
|
1592 | |
1508 | |
1593 | return success; |
1509 | return success; |
1594 | } |
1510 | } |
1595 | |
1511 | |
1596 | |
1512 | |
… | |
… | |
1682 | if (QUERY_FLAG (victim, FLAG_ALIVE)) |
1598 | if (QUERY_FLAG (victim, FLAG_ALIVE)) |
1683 | { |
1599 | { |
1684 | hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); |
1600 | hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); |
1685 | |
1601 | |
1686 | if (!spell->destroyed ()) |
1602 | if (!spell->destroyed ()) |
1687 | { |
|
|
1688 | spell->remove (); |
|
|
1689 | spell->destroy (0); |
1603 | spell->destroy (); |
1690 | } |
|
|
1691 | } |
1604 | } |
1692 | break; |
1605 | break; |
1693 | |
1606 | |
1694 | case SP_MOVING_BALL: |
1607 | case SP_MOVING_BALL: |
1695 | if (QUERY_FLAG (victim, FLAG_ALIVE)) |
1608 | if (QUERY_FLAG (victim, FLAG_ALIVE)) |
1696 | hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); |
1609 | hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); |
1697 | else if (victim->material || victim->materialname) |
1610 | else if (victim->materialname) |
1698 | save_throw_object (victim, spell->attacktype, spell); |
1611 | save_throw_object (victim, spell->attacktype, spell); |
1699 | break; |
1612 | break; |
1700 | } |
1613 | } |
1701 | } |
1614 | } |