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.109 by root, Sun Nov 29 17:41:08 2009 UTC vs.
Revision 1.125 by root, Mon Nov 12 03:48:34 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <spells.h> 26#include <spells.h>
… …
158 sp *= (int) PATH_SP_MULT (caster, spell); 158 sp *= (int) PATH_SP_MULT (caster, spell);
159 if (!sp && spell->stats.sp) 159 if (!sp && spell->stats.sp)
160 sp = 1; 160 sp = 1;
161 161
162 if (spell->stats.grace && spell->stats.maxgrace) 162 if (spell->stats.grace && spell->stats.maxgrace)
163 grace = spell->stats.grace * (1.0 + max (0, float (level - spell->level) / spell->stats.maxgrace)); 163 grace = spell->stats.grace * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxgrace));
164 else 164 else
165 grace = spell->stats.grace; 165 grace = spell->stats.grace;
166 166
167 grace *= PATH_SP_MULT (caster, spell); 167 grace *= PATH_SP_MULT (caster, spell);
168 if (spell->stats.grace && !grace) 168 if (spell->stats.grace && !grace)
… …
326{ 326{
327 if (OUT_OF_REAL_MAP (m, x, y)) 327 if (OUT_OF_REAL_MAP (m, x, y))
328 return 0; 328 return 0;
329 329
330 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above) 330 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
331 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 331 if (op->flag [FLAG_REFL_SPELL]
332 && (!QUERY_FLAG (op, FLAG_ALIVE) 332 && (!op->flag [FLAG_ALIVE]
333 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 333 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
334 return 1; 334 return 1;
335 335
336 return 0; 336 return 0;
337} 337}
338 338
339/* cast_create_object: creates object new_op in direction dir 339/* cast_create_object: creates object new_op in direction dir
340 * or if that is blocked, beneath the player (op). 340 * or if that is blocked, beneath the player (op).
341 * we pass 'caster', but don't use it for anything. 341 * we pass 'caster', but don't use it for anything.
342 * This is really just a simple wrapper function . 342 * This is really just a simple wrapper function .
343 * returns the direction that the object was actually placed 343 * returns true to indicate whether the operation was successful.
344 * in. 344 * destroys the object is unsuccessful.
345 */ 345 */
346int 346bool
347cast_create_obj (object *op, object *caster, object *new_op, int dir) 347cast_create_obj (object *op, object *caster, object *new_op, int dir)
348{ 348{
349 maptile *m; 349 mapxy pos (op);
350 sint16 sx, sy; 350 pos.move (dir);
351 351
352 if (dir && 352 if (!pos.normalise ()
353 ((get_map_flags (op->map, &m, op->x + freearr_x[dir], op->y + freearr_y[dir], &sx, &sy) & P_OUT_OF_MAP) || 353 || pos->blocks (op) // perversely enough, we check if the palyer can reach that space
354 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))) 354 || !new_op->can_drop_at (pos.m, pos.x, pos.y)
355 { 355 )
356 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
357 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
358 dir = 0;
359 } 356 {
357 op->failmsg ("Your spell fizzles! H<Something is in the way.>");
358 new_op->destroy ();
359 return 0;
360 }
360 361
361 SET_FLAG (new_op, FLAG_IDENTIFIED); 362 new_op->set_flag (FLAG_IDENTIFIED);
362 op->map->insert (new_op,
363 op->x + freearr_x[dir], op->y + freearr_y[dir],
364 op,
365 dir ? 0 : INS_BELOW_ORIGINATOR);
366 363
364 pos.insert (new_op, op, dir ? 0 : INS_BELOW_ORIGINATOR);
365
367 return dir; 366 return 1;
368} 367}
369 368
370static bool 369static bool
371mergable_owner (object *o1, object *o2) 370mergable_owner (object *o1, object *o2)
372{ 371{
… …
404 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 403 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
405 return 0; 404 return 0;
406 405
407 int max_effects = 5; // max. number of similar spells per mapspace 406 int max_effects = 5; // max. number of similar spells per mapspace
408 407
409 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 408 for (object *tmp = ms.top; tmp; tmp = tmp->below)
410 { 409 {
411 /* If there is a counterspell on the space, and this 410 /* If there is a counterspell on the space, and this
412 * object is using magic, don't progress. I believe we could 411 * object is using magic, don't progress. I believe we could
413 * leave this out and let in progress, and other areas of the code 412 * leave this out and let in progress, and other areas of the code
414 * will then remove it, but that would seem to to use more 413 * will then remove it, but that would seem to to use more
… …
416 * on top of a counterwall spell (may hit the player before being 415 * on top of a counterwall spell (may hit the player before being
417 * removed.) On the other hand, it may be more dramatic for the 416 * removed.) On the other hand, it may be more dramatic for the
418 * spell to actually hit the counterwall and be sucked up. 417 * spell to actually hit the counterwall and be sucked up.
419 */ 418 */
420 if ((tmp->attacktype & AT_COUNTERSPELL) 419 if ((tmp->attacktype & AT_COUNTERSPELL)
421 && !QUERY_FLAG (tmp, FLAG_MONSTER) 420 && !tmp->flag [FLAG_MONSTER]
422 && (tmp->type != PLAYER) 421 && (tmp->type != PLAYER)
423 && (tmp->type != WEAPON) 422 && (tmp->type != WEAPON)
424 && (tmp->type != BOW) 423 && (tmp->type != BOW)
425 && (tmp->type != ARROW) 424 && (tmp->type != ARROW)
426 && (tmp->type != GOLEM) 425 && (tmp->type != GOLEM)
427 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX: 426 && !tmp->flag [FLAG_IS_FLOOR] // XXX:
428 // we special case floor here because there 427 // we special case floor here because there
429 // are sometimes spell effect floors 428 // are sometimes spell effect floors
430 // which are used to inflict damage 429 // which are used to inflict damage
431 // (and those shouldn't go away from 430 // (and those shouldn't go away from
432 // sanctuary) see also: permanent lava 431 // sanctuary) see also: permanent lava
… …
514 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 513 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
515 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 514 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
516 if (!tailor_god_spell (tmp, op)) 515 if (!tailor_god_spell (tmp, op))
517 return 0; 516 return 0;
518 517
519 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 518 if (tmp->flag [FLAG_IS_TURNABLE])
520 SET_ANIMATION (tmp, dir); 519 SET_ANIMATION (tmp, dir);
521 520
522 if ((tmp = op->map->insert (tmp, x, y, op))) 521 if ((tmp = op->map->insert (tmp, x, y, op)))
523 move_spell_effect (tmp); 522 move_spell_effect (tmp);
524 523
… …
562 { 561 {
563 tmp = op->owner; 562 tmp = op->owner;
564 /* If the owner does not exist, or is not a monster, than apply the spell 563 /* If the owner does not exist, or is not a monster, than apply the spell
565 * to the caster. 564 * to the caster.
566 */ 565 */
567 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 566 if (!tmp || !tmp->flag [FLAG_MONSTER])
568 tmp = op; 567 tmp = op;
569 } 568 }
570 else 569 else
571 { 570 {
572 maptile *m = op->map; 571 maptile *m = op->map;
… …
620 continue; 619 continue;
621 620
622 tmp = GET_MAP_OB (mp, nx, ny); 621 tmp = GET_MAP_OB (mp, nx, ny);
623 622
624 while (tmp != NULL && (((owner_type == PLAYER && 623 while (tmp != NULL && (((owner_type == PLAYER &&
625 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 624 !tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_GENERATOR]) ||
626 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 625 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
627 tmp = tmp->above; 626 tmp = tmp->above;
628 627
629 if (tmp != NULL && can_see_monsterP (m, x, y, i)) 628 if (tmp != NULL && can_see_monsterP (m, x, y, i))
630 return freedir[i]; 629 return freedir[i];
… …
780 * at casting a prayer. 779 * at casting a prayer.
781 * op is the player. 780 * op is the player.
782 * failure is basically how much grace they had. 781 * failure is basically how much grace they had.
783 * power is how much grace the spell would normally take to cast. 782 * power is how much grace the spell would normally take to cast.
784 */ 783 */
784
785#define HINT_GRACE " H<Make sure you always have enough grace points for your prayers.>"
786
785static void 787static void
786prayer_failure (object *op, int failure, int power) 788prayer_failure (object *op, int failure, int power)
787{ 789{
788 const char *godname; 790 const char *godname;
789 object *tmp; 791 object *tmp;
… …
791 if (!strcmp ((godname = determine_god (op)), "none")) 793 if (!strcmp ((godname = determine_god (op)), "none"))
792 godname = "Your spirit"; 794 godname = "Your spirit";
793 795
794 if (failure <= -20 && failure > -40) /* wonder */ 796 if (failure <= -20 && failure > -40) /* wonder */
795 { 797 {
796 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); 798 op->failmsgf ("%s gives a sign to renew your faith." HINT_GRACE, godname);
797 tmp = get_archetype (SPELL_WONDER); 799 tmp = archetype::get (SPELL_WONDER);
798 cast_cone (op, op, 0, tmp); 800 cast_cone (op, op, 0, tmp);
799 tmp->destroy (); 801 tmp->destroy ();
800 } 802 }
801 803
802 else if (failure <= -40 && failure > -60) /* confusion */ 804 else if (failure <= -40 && failure > -60) /* confusion */
803 { 805 {
804 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); 806 op->failmsg ("Your diety touches your mind!" HINT_GRACE);
805 confuse_player (op, op, 99); 807 confuse_player (op, op, 99);
806 } 808 }
807 else if (failure <= -60 && failure > -150) /* paralysis */ 809 else if (failure <= -60 && failure > -150) /* paralysis */
808 { 810 {
809 new_draw_info_format (NDI_UNIQUE, 0, op, "%s requires you to pray NOW.", godname); 811 op->failmsgf ("%s requires you to pray NOW. "
810 new_draw_info (NDI_UNIQUE, 0, op, "You comply, ignoring all else."); 812 "You comply, ignoring all else." HINT_GRACE,
813 godname);
811 paralyze_player (op, op, 99); 814 paralyze_player (op, op, 99);
812 } 815 }
813 else if (failure <= -150) /* blast the immediate area */ 816 else if (failure <= -150) /* blast the immediate area */
814 { 817 {
815 tmp = get_archetype (GOD_POWER); 818 tmp = archetype::get (GOD_POWER);
816 new_draw_info_format (NDI_UNIQUE, 0, op, "%s smites you!", godname); 819 op->failmsgf ("%s smites you!" HINT_GRACE, godname);
817 cast_magic_storm (op, tmp, power); 820 cast_magic_storm (op, tmp, power);
818 } 821 }
819} 822}
820 823
821/* 824/*
822 * spell_failure() handles the various effects for differing degrees 825 * spell_failure() handles the various effects for differing degrees
823 * of failure badness. 826 * of failure badness.
824 * op is the player that failed. 827 * op is the player that failed.
825 * failure is a random value of how badly you failed. 828 * failure is a random value of how badly you failed.
826 * power is how many spellpoints you'd normally need for the spell. 829 * power is how many spellpoints you'd normally need for the spell.
827 * skill is the skill you'd need to cast the spell. 830 * skill is the skill you'd need to cast the spell.
828 */ 831 */
829
830void 832void
831spell_failure (object *op, int failure, int power, object *skill) 833spell_failure (object *op, int failure, int power, object *skill)
832{ 834{
833 object *tmp; 835 object *tmp;
834 836
835 if (settings.spell_failure_effects == FALSE) 837 if (settings.spell_failure_effects == FALSE)
836 return; 838 return;
837 839
838 if (failure <= -20 && failure > -40) /* wonder */ 840 if (failure <= -20 && failure > -40) /* wonder */
839 { 841 {
840 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); 842 op->failmsg ("Your spell causes an unexpected effect.");
841 tmp = get_archetype (SPELL_WONDER); 843 tmp = archetype::get (SPELL_WONDER);
842 cast_cone (op, op, 0, tmp); 844 cast_cone (op, op, 0, tmp);
843 tmp->destroy (); 845 tmp->destroy ();
844 } 846 }
845 847
846 else if (failure <= -40 && failure > -60) /* confusion */ 848 else if (failure <= -40 && failure > -60) /* confusion */
847 { 849 {
848 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); 850 op->failmsg ("Your magic recoils on you, making you confused!");
849 confuse_player (op, op, 99); 851 confuse_player (op, op, 99);
850 } 852 }
851 else if (failure <= -60 && failure > -80) /* paralysis */ 853 else if (failure <= -60 && failure > -80) /* paralysis */
852 { 854 {
853 new_draw_info (NDI_UNIQUE, 0, op, "Your magic stuns you!"); 855 op->failmsg ("Your magic stuns you!");
854 paralyze_player (op, op, 99); 856 paralyze_player (op, op, 99);
855 } 857 }
856 else if (failure <= -80) /* blast the immediate area */ 858 else if (failure <= -80) /* blast the immediate area */
857 { 859 {
858 object *tmp; 860 object *tmp;
859 861
860 /* Safety check to make sure we don't get any mana storms in scorn */ 862 /* Safety check to make sure we don't get any mana storms in scorn */
861 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC) 863 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)
862 { 864 {
863 new_draw_info (NDI_UNIQUE, 0, op, "The magic warps and you are turned inside out!"); 865 op->failmsg ("The magic warps and you are turned inside out!");
864 hit_player (op, 9998, op, AT_INTERNAL, 1); 866 hit_player (op, 9998, op, AT_INTERNAL, 1);
865 867
866 } 868 }
867 else 869 else
868 { 870 {
869 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 871 op->failmsg ("You lose control of the mana! The uncontrolled magic blasts you!");
870 tmp = get_archetype (LOOSE_MANA); 872 tmp = archetype::get (LOOSE_MANA);
871 tmp->level = skill->level; 873 tmp->level = skill->level;
872 874
873 /* increase the area of destruction a little for more powerful spells */ 875 /* increase the area of destruction a little for more powerful spells */
874 tmp->range += isqrt (power); 876 tmp->range += isqrt (power);
875 877
… …
945int 947int
946cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam) 948cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
947{ 949{
948 const char *godname; 950 const char *godname;
949 int success = 0; 951 int success = 0;
950 object *skill = NULL; 952
953 // make sure spells always take a while, so a) we don't flood the
954 // user with messages and b) too many failures can be harmful (smiting).
955 op->speed_left -= 4 * op->speed; // ~0.5s on failure
951 956
952 if (!spell_ob) 957 if (!spell_ob)
953 { 958 {
954 LOG (llevError, "cast_spell: null spell object passed\n"); 959 LOG (llevError, "cast_spell: null spell object passed\n");
955 return 0; 960 return 0;
… …
966 } 971 }
967 972
968 /* if caster is a spell casting object, this normally shouldn't be 973 /* if caster is a spell casting object, this normally shouldn't be
969 * an issue, because they don't have any spellpaths set up. 974 * an issue, because they don't have any spellpaths set up.
970 */ 975 */
971 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST)) 976 if (caster->path_denied & spell_ob->path_attuned && !caster->flag [FLAG_WIZCAST])
972 { 977 {
973 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 978 op->failmsg ("That spell path is denied to you.");
974 return 0; 979 return 0;
975 } 980 }
981
982 object *skill = 0;
976 983
977 /* if it is a player casting the spell, and they are really casting it 984 /* if it is a player casting the spell, and they are really casting it
978 * (vs it coming from a wand, scroll, or whatever else), do some 985 * (vs it coming from a wand, scroll, or whatever else), do some
979 * checks. We let monsters do special things - eg, they 986 * checks. We let monsters do special things - eg, they
980 * don't need the skill, bypass level checks, etc. The monster function 987 * don't need the SKILL, BYpass level checks, etc. The monster function
981 * should take care of that. 988 * should take care of that.
982 * Remove the wiz check here and move it further down - some spells 989 * Remove the wiz check here and move it further down - some spells
983 * need to have the right skill pointer passed, so we need to 990 * need to have the right skill pointer passed, so we need to
984 * at least process that code. 991 * at least process that code.
985 */ 992 */
… …
989 { 996 {
990 skill = find_skill_by_name (op, spell_ob->skill); 997 skill = find_skill_by_name (op, spell_ob->skill);
991 998
992 if (!skill) 999 if (!skill)
993 { 1000 {
994 op->failmsg (format ("You need the skill %s to cast %s! " 1001 op->failmsgf ("You need the %s skill to cast %s! "
995 "H<You either need to learn the skill via a skill scroll " 1002 "H<You either need to learn the skill via a skill scroll "
996 "or you need to wear a talisman or holy symbol.>", 1003 "or you need to wear a talisman, holy symbol or another skill tool.>",
997 &spell_ob->skill, &spell_ob->name)); 1004 &spell_ob->skill, &spell_ob->name);
998 return 0; 1005 return 0;
999 } 1006 }
1000 1007
1001 const char *msg = ""; 1008 const char *msg = "";
1002 1009
1003 int caster_level = skill->level; 1010 int caster_level = skill->level;
… …
1014 msg = " (repelled)"; 1021 msg = " (repelled)";
1015 } 1022 }
1016 1023
1017 if (spell_ob->level > caster_level) 1024 if (spell_ob->level > caster_level)
1018 { 1025 {
1019 op->failmsg (format ("You lack enough skill to cast that spell! " 1026 op->failmsgf ("You lack enough skill to cast that spell! "
1020 "H<Your effective cast level is %d%s, but level %d is required.>", 1027 "H<Your effective cast level is %d%s, but level %d is required.>",
1021 caster_level, msg, spell_ob->level)); 1028 caster_level, msg, spell_ob->level);
1022 if (!op->is_wiz ()) 1029 if (!op->is_wiz ())
1023 return 0; 1030 return 0;
1024 } 1031 }
1025 } 1032 }
1026 1033
1027 /* If the caster is the wiz, they don't ever fail, and don't have 1034 /* If the caster is the wiz, they don't ever fail, and don't have
1028 * to have sufficient grace/mana. 1035 * to have sufficient grace/mana.
1029 */ 1036 */
1030 if (!QUERY_FLAG (op, FLAG_WIZCAST)) 1037 if (!op->flag [FLAG_WIZCAST])
1031 { 1038 {
1032 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1039 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1033 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1040 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1034 { 1041 {
1035 op->failmsg ("You don't have enough mana!"); 1042 op->failmsg ("You don't have enough mana!");
… …
1043 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1050 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1044 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname)); 1051 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1045 else 1052 else
1046 { 1053 {
1047 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1054 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1048 op->failmsg (format ("%s ignores your prayer.", godname)); 1055 op->failmsgf ("%s ignores your prayer.", godname);
1049 return 0; 1056 return 0;
1050 } 1057 }
1051 } 1058 }
1052 1059
1053 /* player/monster is trying to cast the spell. might fumble it */ 1060 /* player/monster is trying to cast the spell. might fumble it */
… …
1083 * not alive, then this would mean that the mapmaker put the 1090 * not alive, then this would mean that the mapmaker put the
1084 * objects on the space - presume that they know what they are 1091 * objects on the space - presume that they know what they are
1085 * doing. 1092 * doing.
1086 */ 1093 */
1087 1094
1088 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1095 if ((mflags & P_SAFE) && !op->flag [FLAG_WIZCAST]) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1089 { 1096 {
1097 op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
1090 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!"); 1098 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1091 return 0; 1099 return 0;
1092 } 1100 }
1093 1101
1094 if ((spell_ob->type == SPELL) 1102 if ((spell_ob->type == SPELL)
1095 && (caster->type != POTION) 1103 && (caster->type != POTION)
1096 && !QUERY_FLAG (op, FLAG_WIZCAST) 1104 && !op->flag [FLAG_WIZCAST]
1097 && (QUERY_FLAG (caster, FLAG_ALIVE) 1105 && (caster->flag [FLAG_ALIVE]
1098 || QUERY_FLAG (op, FLAG_ALIVE)) 1106 || op->flag [FLAG_ALIVE])
1099 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace))) 1107 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)))
1100 { 1108 {
1101 if (op->type != PLAYER) 1109 if (op->type != PLAYER)
1102 return 0; 1110 return 0;
1103 1111
1104 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1112 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1105 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1113 op->failmsgf ("This ground is unholy! %s ignores you.", godname);
1106 else if (object *item = op->contr->ranged_ob) 1114 else if (object *item = op->contr->ranged_ob)
1107 { 1115 {
1108 if (item->type == SPELL) 1116 if (item->type == SPELL)
1109 op->failmsg ("Something blocks your spellcasting."); 1117 op->failmsg ("Something blocks your spellcasting.");
1110 else if (item->type == SCROLL) 1118 else if (item->type == SCROLL)
… …
1116 op->failmsg ("Something blocks the spell!"); 1124 op->failmsg ("Something blocks the spell!");
1117 1125
1118 return 0; 1126 return 0;
1119 } 1127 }
1120 1128
1129 // undo the flood protection from earlier
1130 op->speed_left += 4 * op->speed; // ~0.5s on failure
1131
1121 /* Take into account how long it takes to cast the spell. 1132 /* Take into account how long it takes to cast the spell.
1122 * if the player is casting it, then we use the time in 1133 * if the player is casting it, then we use the time in
1123 * the spell object. If it is a spell object, have it 1134 * the spell object. If it is a spell object, have it
1124 * take two ticks. Things that cast spells on the players 1135 * take two ticks. Things that cast spells on the players
1125 * behalf (eg, altars, and whatever else) shouldn't cost 1136 * behalf (eg, altars, and whatever else) shouldn't cost
… …
1149 * object requires. 1160 * object requires.
1150 */ 1161 */
1151 if (op != caster && !skill && caster->skill) 1162 if (op != caster && !skill && caster->skill)
1152 { 1163 {
1153 skill = find_skill_by_name (op, caster->skill); 1164 skill = find_skill_by_name (op, caster->skill);
1165
1154 if (!skill) 1166 if (!skill)
1155 { 1167 {
1156 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster))); 1168 op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
1157 return 0; 1169 return 0;
1158 } 1170 }
1159
1160 op->change_skill (skill); /* needed for proper exp credit */
1161 } 1171 }
1162 1172
1163 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam))) 1173 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
1164 return RESULT_INT (0); 1174 return RESULT_INT (0);
1175
1176 // temporaroly replace chosen_skill by skill, we assume skill *could* be applied,
1177 // at least temporarily, which might not be true due to slot restrictions, but hey
1178 // invoke requires it basically.
1179
1180 object *chosen_skill = op->chosen_skill;
1181 op->chosen_skill = skill;
1165 1182
1166 switch (spell_ob->subtype) 1183 switch (spell_ob->subtype)
1167 { 1184 {
1168 /* The order of case statements is same as the order they show up 1185 /* The order of case statements is same as the order they show up
1169 * in spells.h. 1186 * in spells.h.
… …
1320 break; 1337 break;
1321 1338
1322 case SP_MOVING_BALL: 1339 case SP_MOVING_BALL:
1323 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1340 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1324 { 1341 {
1325 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name)); 1342 op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
1326 success = 0; 1343 success = 0;
1327 } 1344 }
1328 else 1345 else
1329 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob); 1346 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1330 break; 1347 break;
… …
1379 break; 1396 break;
1380 1397
1381 default: 1398 default:
1382 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1399 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1383 } 1400 }
1401
1402 // restore chosen_skill
1403 op->chosen_skill = chosen_skill;
1384 1404
1385 op->play_sound ( 1405 op->play_sound (
1386 success 1406 success
1387 ? spell_ob->sound 1407 ? spell_ob->sound
1388 ? spell_ob->sound 1408 ? spell_ob->sound
… …
1453apply_spell_effect (object *spell, object *victim) 1473apply_spell_effect (object *spell, object *victim)
1454{ 1474{
1455 switch (spell->subtype) 1475 switch (spell->subtype)
1456 { 1476 {
1457 case SP_CONE: 1477 case SP_CONE:
1458 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->has_active_speed () && spell->attacktype) 1478 if (victim->flag [FLAG_ALIVE] && spell->has_active_speed () && spell->attacktype)
1459 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1479 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1460 break; 1480 break;
1461 1481
1462 case SP_MAGIC_MISSILE: 1482 case SP_MAGIC_MISSILE:
1463 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1483 if (victim->flag [FLAG_ALIVE])
1464 { 1484 {
1465 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1485 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1466 spell->destroy (); 1486 spell->destroy ();
1467 } 1487 }
1468 break; 1488 break;
1469 1489
1470 case SP_MOVING_BALL: 1490 case SP_MOVING_BALL:
1471 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1491 if (victim->flag [FLAG_ALIVE])
1472 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1492 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1473 else if (victim->material != MATERIAL_NULL) 1493 else if (victim->material != MATERIAL_NULL)
1474 save_throw_object (victim, spell->attacktype, spell); 1494 save_throw_object (victim, spell->attacktype, spell);
1475 1495
1476 break; 1496 break;
… …
1482 * the victim with a specific maximum level. 1502 * the victim with a specific maximum level.
1483 */ 1503 */
1484void 1504void
1485create_exploding_ball_at (object *victim, int level) 1505create_exploding_ball_at (object *victim, int level)
1486{ 1506{
1487 object *ball = get_archetype (EXPLODING_FIREBALL); 1507 object *ball = archetype::get (EXPLODING_FIREBALL);
1488 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1; 1508 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1489 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2; 1509 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1490 ball->insert_at (victim); 1510 ball->insert_at (victim);
1491} 1511}

Diff Legend

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