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.24 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.41 by root, Sat Apr 28 17:51:58 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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
25#include <global.h> 26#include <global.h>
26#include <spells.h> 27#include <spells.h>
27#include <object.h> 28#include <object.h>
28#include <errno.h> 29#include <errno.h>
29#ifndef __CEXTRACT__
30# include <sproto.h> 30#include <sproto.h>
31#endif
32#include <sounds.h> 31#include <sounds.h>
33 32
34extern char *spell_mapping[]; 33extern char *spell_mapping[];
35 34
36/* This returns a random spell from 'ob'. If skill is set, then 35/* This returns a random spell from 'ob'. If skill is set, then
… …
151} 150}
152 151
153/* pretty basic function - basically just takes 152/* pretty basic function - basically just takes
154 * an object, sets the x,y, and calls insert_ob_in_map 153 * an object, sets the x,y, and calls insert_ob_in_map
155 */ 154 */
156
157void 155void
158spell_effect (object *spob, int x, int y, maptile *map, object *originator) 156spell_effect (object *spob, int x, int y, maptile *map, object *originator)
159{ 157{
160
161 if (spob->other_arch != NULL) 158 if (spob->other_arch)
162 { 159 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} 160}
171 161
172/* 162/*
173 * This function takes a caster and spell and presents the 163 * This function takes a caster and spell and presents the
174 * effective level the caster needs to be to cast the spell. 164 * effective level the caster needs to be to cast the spell.
175 * basically, it just adjusts the spell->level with attuned/repelled 165 * basically, it just adjusts the spell->level with attuned/repelled
176 * spellpaths. Was called path_level_mod 166 * spellpaths. Was called path_level_mod.
177 * 167 *
178 * caster is person casting hte spell. 168 * caster is person casting the spell.
179 * spell is the spell object. 169 * spell is the spell object.
180 * Returns modified level. 170 * Returns modified level.
181 */ 171 */
182int 172int
183min_casting_level (object *caster, object *spell) 173min_casting_level (object *caster, object *spell)
… …
186 176
187 if (caster->path_denied & spell->path_attuned) 177 if (caster->path_denied & spell->path_attuned)
188 return 1; 178 return 1;
189 179
190 new_level = spell->level 180 new_level = spell->level
191 + ((caster->path_repelled & spell->path_attuned) ? +2 : 0) + ((caster->path_attuned & spell->path_attuned) ? -2 : 0); 181 + (caster->path_repelled & spell->path_attuned ? +2 : 0)
182 + (caster->path_attuned & spell->path_attuned ? -2 : 0);
192 183
193 return (new_level < 1) ? 1 : new_level; 184 return max (1, new_level);
194} 185}
195
196 186
197/* This function returns the effective level the spell 187/* This function returns the effective level the spell
198 * is being cast at. 188 * is being cast at.
199 * Note that I changed the repelled/attuned bonus to 2 from 5. 189 * Note that I changed the repelled/attuned bonus to 2 from 5.
200 * This is because the new code compares casting_level against 190 * This is because the new code compares casting_level against
201 * min_caster_level, so the difference is effectively 4 191 * min_caster_level, so the difference is effectively 4
202 */ 192 */
203
204int 193int
205caster_level (object *caster, object *spell) 194caster_level (object *caster, object *spell)
206{ 195{
207 int level = caster->level; 196 int level = caster->level;
208 197
… …
223 212
224 level = MIN (level, sk_level + level / 10 + 1); 213 level = MIN (level, sk_level + level / 10 + 1);
225 } 214 }
226 215
227 /* Got valid caster level. Now adjust for attunement */ 216 /* 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); 217 level += caster->path_repelled & spell->path_attuned ? -2 : 0;
218 level += caster->path_attuned & spell->path_attuned ? +2 : 0;
229 219
230 /* Always make this at least 1. If this is zero, we get divide by zero 220 /* Always make this at least 1. If this is zero, we get divide by zero
231 * errors in various places. 221 * errors in various places.
232 */ 222 */
233 if (level < 1)
234 level = 1;
235
236 return level; 223 return max (level, 1);
237} 224}
238 225
239/* The following function scales the spellpoint cost of 226/* The following function scales the spellpoint cost of
240 * a spell by it's increased effectiveness. Some of the 227 * a spell by it's increased effectiveness. Some of the
241 * lower level spells become incredibly vicious at high 228 * lower level spells become incredibly vicious at high
… …
444 if (OUT_OF_REAL_MAP (m, x, y)) 431 if (OUT_OF_REAL_MAP (m, x, y))
445 return 0; 432 return 0;
446 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 433 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
447 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 434 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
448 && (!QUERY_FLAG (op, FLAG_ALIVE) 435 && (!QUERY_FLAG (op, FLAG_ALIVE)
449 || sp_op->type == LIGHTNING // XXX: elmex: why is LIGHTNING special cased here?
450 // most spells use subtypes for bolts today...
451 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 436 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
452 return 1; 437 return 1;
453 438
454 return 0; 439 return 0;
455} 440}
… …
473 { 458 {
474 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 459 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
475 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 460 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
476 dir = 0; 461 dir = 0;
477 } 462 }
478 new_op->x = op->x + freearr_x[dir]; 463
479 new_op->y = op->y + freearr_y[dir]; 464 op->map->insert (new_op,
480 if (dir == 0) 465 op->x + freearr_x[dir], op->y + freearr_y[dir],
481 insert_ob_in_map (new_op, op->map, op, INS_BELOW_ORIGINATOR); 466 op,
482 else 467 dir ? 0 : INS_BELOW_ORIGINATOR);
483 insert_ob_in_map (new_op, op->map, op, 0); 468
484 return dir; 469 return dir;
485} 470}
486 471
487/* Returns true if it is ok to put spell *op on the space/may provided. 472/* Returns true if it is ok to put spell *op on the space/may provided.
488 * immune_stop is basically the attacktype of the spell (why 473 * immune_stop is basically the attacktype of the spell (why
… …
490 * has the AT_MAGIC bit set, and there is a counterwall 475 * has the AT_MAGIC bit set, and there is a counterwall
491 * on the space, the object doesn't get placed. if immune stop 476 * on the space, the object doesn't get placed. if immune stop
492 * does not have AT_MAGIC, then counterwalls do not effect the spell. 477 * does not have AT_MAGIC, then counterwalls do not effect the spell.
493 * 478 *
494 */ 479 */
495
496int 480int
497ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 481ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
498{ 482{
499 object *tmp; 483 if (!xy_normalise (m, x, y))
500 int mflags;
501 maptile *mp;
502
503 mp = m;
504 mflags = get_map_flags (m, &mp, x, y, &x, &y);
505
506 if (mflags & P_OUT_OF_MAP)
507 return 0; 484 return 0;
508 485
509 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (mp, x, y))) 486 mapspace &ms = m->at (x, y);
487
488 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
510 return 0; 489 return 0;
511 490
512 for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above) 491 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
513 { 492 {
514 /* If there is a counterspell on the space, and this 493 /* If there is a counterspell on the space, and this
515 * object is using magic, don't progress. I believe we could 494 * object is using magic, don't progress. I believe we could
516 * leave this out and let in progress, and other areas of the code 495 * leave this out and let in progress, and other areas of the code
517 * will then remove it, but that would seem to to use more 496 * will then remove it, but that would seem to to use more
518 * resources, and may not work as well if a player is standing 497 * resources, and may not work as well if a player is standing
519 * on top of a counterwall spell (may hit the player before being 498 * on top of a counterwall spell (may hit the player before being
520 * removed.) On the other hand, it may be more dramatic for the 499 * removed.) On the other hand, it may be more dramatic for the
521 * spell to actually hit the counterwall and be sucked up. 500 * spell to actually hit the counterwall and be sucked up.
522 */ 501 */
523 if ((tmp->attacktype & AT_COUNTERSPELL) && 502 if ((tmp->attacktype & AT_COUNTERSPELL)
524 (tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) && 503 && !QUERY_FLAG (tmp, FLAG_MONSTER)
525 (tmp->type != WEAPON) && (tmp->type != BOW) && (tmp->type != ARROW) && (tmp->type != GOLEM) && (immune_stop & AT_MAGIC)) 504 && (tmp->type != PLAYER)
505 && (tmp->type != WEAPON)
506 && (tmp->type != BOW)
507 && (tmp->type != ARROW)
508 && (tmp->type != GOLEM)
509 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX:
510 // we special case floor here because there
511 // are sometimes spell effect floors
512 // which are used to inflict damage
513 // (and those shouldn't go away from
514 // sanctuary) see also: permanent lava
515 && (immune_stop & AT_MAGIC))
526 return 0; 516 return 0;
527 517
528 /* This is to prevent 'out of control' spells. Basically, this 518 /* This is to prevent 'out of control' spells. Basically, this
529 * limits one spell effect per space per spell. This is definately 519 * limits one spell effect per space per spell. This is definately
530 * needed for performance reasons, and just for playability I believe. 520 * needed for performance reasons, and just for playability I believe.
… …
540 * playability reasons. 530 * playability reasons.
541 */ 531 */
542 if (tmp->arch == op->arch 532 if (tmp->arch == op->arch
543 && tmp->type == op->type 533 && tmp->type == op->type
544 && tmp->subtype == op->subtype 534 && tmp->subtype == op->subtype
535 && tmp->owner == op->owner
545 && tmp->owner == op->owner && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) 536 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
546 { 537 {
547 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 538 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam);
548 tmp->range = MAX (tmp->range, op->range); 539 tmp->range = MAX (tmp->range, op->range);
549 tmp->duration = MAX (tmp->duration, op->duration); 540 tmp->duration = MAX (tmp->duration, op->duration);
550 return 0; 541 return 0;
… …
552 543
553 /* Perhaps we should also put checks in for no magic and unholy 544 /* Perhaps we should also put checks in for no magic and unholy
554 * ground to prevent it from moving along? 545 * ground to prevent it from moving along?
555 */ 546 */
556 } 547 }
548
557 /* If it passes the above tests, it must be OK */ 549 /* If it passes the above tests, it must be OK */
558 return 1; 550 return 1;
559} 551}
560 552
561/* fire_arch_from_position: fires an archetype. 553/* fire_arch_from_position: fires an archetype.
… …
621 return 0; 613 return 0;
622 } 614 }
623 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 615 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
624 SET_ANIMATION (tmp, dir); 616 SET_ANIMATION (tmp, dir);
625 617
626 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 618 if ((tmp = insert_ob_in_map (tmp, m, op, 0)))
627 return 1;
628
629 move_spell_effect (tmp); 619 move_spell_effect (tmp);
630 620
631 return 1; 621 return 1;
632} 622}
633
634
635 623
636/***************************************************************************** 624/*****************************************************************************
637 * 625 *
638 * Code related to rods - perhaps better located in another file? 626 * Code related to rods - perhaps better located in another file?
639 * 627 *
640 ****************************************************************************/ 628 ****************************************************************************/
641
642void 629void
643regenerate_rod (object *rod) 630regenerate_rod (object *rod)
644{ 631{
645 if (rod->stats.hp < rod->stats.maxhp) 632 if (rod->stats.hp < rod->stats.maxhp)
646 { 633 {
… …
655void 642void
656drain_rod_charge (object *rod) 643drain_rod_charge (object *rod)
657{ 644{
658 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 645 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
659} 646}
660
661
662
663 647
664/* this function is commonly used to find a friendly target for 648/* this function is commonly used to find a friendly target for
665 * spells such as heal or protection or armour 649 * spells such as heal or protection or armour
666 * op is what is looking for the target (which can be a player), 650 * op is what is looking for the target (which can be a player),
667 * dir is the direction we are looking in. Return object found, or 651 * dir is the direction we are looking in. Return object found, or
668 * NULL if no good object. 652 * NULL if no good object.
669 */ 653 */
670
671object * 654object *
672find_target_for_friendly_spell (object *op, int dir) 655find_target_for_friendly_spell (object *op, int dir)
673{ 656{
674 object *tmp; 657 object *tmp;
675 maptile *m;
676 sint16 x, y;
677 int mflags;
678 658
679 /* I don't really get this block - if op isn't a player or rune, 659 /* I don't really get this block - if op isn't a player or rune,
680 * we then make the owner of this object the target. 660 * we then make the owner of this object the target.
681 * The owner could very well be no where near op. 661 * The owner could very well be no where near op.
682 */ 662 */
… …
689 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 669 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER))
690 tmp = op; 670 tmp = op;
691 } 671 }
692 else 672 else
693 { 673 {
694 m = op->map; 674 maptile *m = op->map;
695 x = op->x + freearr_x[dir]; 675 sint16 x = op->x + freearr_x[dir];
696 y = op->y + freearr_y[dir]; 676 sint16 y = op->y + freearr_y[dir];
697
698 mflags = get_map_flags (m, &m, x, y, &x, &y);
699
700 if (mflags & P_OUT_OF_MAP)
701 tmp = NULL;
702 else
703 { 677
704 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 678 tmp = xy_normalise (m, x, y)
705 if (tmp->type == PLAYER) 679 ? m->at (x, y).player ()
706 break; 680 : 0;
707 }
708 } 681 }
682
709 /* didn't find a player there, look in current square for a player */ 683 /* didn't find a player there, look in current square for a player */
710 if (tmp == NULL) 684 if (!tmp)
711 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 685 tmp = op->ms ().player ();
712 {
713 if (tmp->type == PLAYER)
714 break;
715 }
716 686
717 return tmp; 687 return tmp;
718} 688}
719 689
720 690
… …
765 return freedir[i]; 735 return freedir[i];
766 } 736 }
767 return -1; /* flag for "keep going the way you were" */ 737 return -1; /* flag for "keep going the way you were" */
768} 738}
769 739
770
771
772/* put_a_monster: puts a monster named monstername near by 740/* put_a_monster: puts a monster named monstername near by
773 * op. This creates the treasures for the monsters, and 741 * op. This creates the treasures for the monsters, and
774 * also deals with multipart monsters properly. 742 * also deals with multipart monsters properly.
775 */ 743 */
776
777void 744void
778put_a_monster (object *op, const char *monstername) 745put_a_monster (object *op, const char *monstername)
779{ 746{
780 object *tmp, *head = NULL, *prev = NULL; 747 object *tmp, *head = NULL, *prev = NULL;
781 archetype *at; 748 archetype *at;
… …
817 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 784 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
818 785
819 insert_ob_in_map (head, op->map, op, 0); 786 insert_ob_in_map (head, op->map, op, 0);
820 787
821 /* thought it'd be cool to insert a burnout, too. */ 788 /* thought it'd be cool to insert a burnout, too. */
822 tmp = get_archetype ("burnout"); 789 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
823 tmp->map = op->map;
824 tmp->x = op->x + freearr_x[dir];
825 tmp->y = op->y + freearr_y[dir];
826 insert_ob_in_map (tmp, op->map, op, 0);
827 } 790 }
828} 791}
829 792
830/* peterm: function which summons hostile monsters and 793/* peterm: function which summons hostile monsters and
831 * places them in nearby squares. 794 * places them in nearby squares.
… …
858{ 821{
859 int attacktype; 822 int attacktype;
860 int face; 823 int face;
861} ATTACKS[22] = 824} ATTACKS[22] =
862{ 825{
863 {
864 AT_PHYSICAL, 0}, 826 { AT_PHYSICAL, 0},
865 {
866 AT_PHYSICAL, 0}, /*face = explosion */ 827 { AT_PHYSICAL, 0}, /*face = explosion */
867 {
868 AT_PHYSICAL, 0}, 828 { AT_PHYSICAL, 0},
869 {
870 AT_MAGIC, 1}, 829 { AT_MAGIC, 1},
871 {
872 AT_MAGIC, 1}, /* face = last-burnout */ 830 { AT_MAGIC, 1}, /* face = last-burnout */
873 {
874 AT_MAGIC, 1}, 831 { AT_MAGIC, 1},
875 {
876 AT_FIRE, 2}, 832 { AT_FIRE, 2},
877 {
878 AT_FIRE, 2}, /* face = fire.... */ 833 { AT_FIRE, 2}, /* face = fire.... */
879 {
880 AT_FIRE, 2}, 834 { AT_FIRE, 2},
881 {
882 AT_ELECTRICITY, 3}, 835 { AT_ELECTRICITY, 3},
883 {
884 AT_ELECTRICITY, 3}, /* ball_lightning */ 836 { AT_ELECTRICITY, 3}, /* ball_lightning */
885 {
886 AT_ELECTRICITY, 3}, 837 { AT_ELECTRICITY, 3},
887 {
888 AT_COLD, 4}, 838 { AT_COLD, 4},
889 {
890 AT_COLD, 4}, /* face=icestorm */ 839 { AT_COLD, 4}, /* face=icestorm */
891 {
892 AT_COLD, 4}, 840 { AT_COLD, 4},
893 {
894 AT_CONFUSION, 5}, 841 { AT_CONFUSION, 5},
895 {
896 AT_POISON, 7}, 842 { AT_POISON, 7},
897 {
898 AT_POISON, 7}, /* face = acid sphere. generator */ 843 { AT_POISON, 7}, /* face = acid sphere. generator */
899 {
900 AT_POISON, 7}, /* poisoncloud face */ 844 { AT_POISON, 7}, /* poisoncloud face */
901 {
902 AT_SLOW, 8}, 845 { AT_SLOW, 8},
903 {
904 AT_PARALYZE, 9}, 846 { AT_PARALYZE, 9},
905 {
906AT_FEAR, 10}}; 847 { AT_FEAR, 10},
907 848};
908
909 849
910/* shuffle_attack: peterm 850/* shuffle_attack: peterm
911 * This routine shuffles the attack of op to one of the 851 * This routine shuffles the attack of op to one of the
912 * ones in the list. It does this at random. It also 852 * ones in the list. It does this at random. It also
913 * chooses a face appropriate to the attack that is 853 * chooses a face appropriate to the attack that is
… …
1031 else 971 else
1032 { 972 {
1033 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 973 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!");
1034 tmp = get_archetype (LOOSE_MANA); 974 tmp = get_archetype (LOOSE_MANA);
1035 tmp->level = skill->level; 975 tmp->level = skill->level;
1036 tmp->x = op->x;
1037 tmp->y = op->y;
1038 976
1039 /* increase the area of destruction a little for more powerful spells */ 977 /* increase the area of destruction a little for more powerful spells */
1040 tmp->range += isqrt (power); 978 tmp->range += isqrt (power);
1041 979
1042 if (power > 25) 980 if (power > 25)
1043 tmp->stats.dam = 25 + isqrt (power); 981 tmp->stats.dam = 25 + isqrt (power);
1044 else 982 else
1045 tmp->stats.dam = power; /* nasty recoils! */ 983 tmp->stats.dam = power; /* nasty recoils! */
1046 984
1047 tmp->stats.maxhp = tmp->count; 985 tmp->stats.maxhp = tmp->count;
1048 insert_ob_in_map (tmp, op->map, NULL, 0); 986
987 tmp->insert_at (op);
1049 } 988 }
1050 } 989 }
1051} 990}
1052 991
1053int 992int
1054cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 993cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1055{ 994{
1056 int success; 995 int success;
1057 player *pl;
1058 object *spell; 996 object *spell;
1059 997
1060 if (!spell_ob->other_arch) 998 if (!spell_ob->other_arch)
1061 { 999 {
1062 LOG (llevError, "cast_party_spell: empty other arch\n"); 1000 LOG (llevError, "cast_party_spell: empty other arch\n");
… …
1070 if (caster->contr->party == NULL) 1008 if (caster->contr->party == NULL)
1071 { 1009 {
1072 spell->remove (); 1010 spell->remove ();
1073 return success; 1011 return success;
1074 } 1012 }
1075 for (pl = first_player; pl != NULL; pl = pl->next) 1013 for_all_players (pl)
1076 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 1014 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1077 { 1015 {
1078 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 1016 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1079 } 1017 }
1080 spell->remove (); 1018 spell->remove ();
… …
1178 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1116 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1179 { 1117 {
1180 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1118 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana.");
1181 return 0; 1119 return 0;
1182 } 1120 }
1121
1183 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1122 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1184 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1123 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1185 { 1124 {
1186 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1125 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1187 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1126 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
… …
1200 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1139 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1201 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1140 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1202 { 1141 {
1203 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1142 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
1204 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1143 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell.");
1144
1205 if (settings.casting_time == TRUE) 1145 if (settings.casting_time == TRUE)
1206 {
1207 op->casting_time = -1; 1146 op->casting_time = -1;
1208 } 1147
1209 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1148 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1210 return 0; 1149 return 0;
1211 } 1150 }
1212 else if (spell_ob->stats.sp) 1151 else if (spell_ob->stats.sp)
1213 { 1152 {
… …
1690 break; 1629 break;
1691 1630
1692 case SP_MOVING_BALL: 1631 case SP_MOVING_BALL:
1693 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1632 if (QUERY_FLAG (victim, FLAG_ALIVE))
1694 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1633 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1695 else if (victim->material || victim->materialname) 1634 else if (victim->materialname)
1696 save_throw_object (victim, spell->attacktype, spell); 1635 save_throw_object (victim, spell->attacktype, spell);
1697 break; 1636 break;
1698 } 1637 }
1699} 1638}

Diff Legend

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