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.104 by root, Sun Nov 8 23:05:22 2009 UTC vs.
Revision 1.121 by root, Sun May 1 16:58:18 2011 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 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.
… …
83 */ 83 */
84void 84void
85spell_effect (object *spob, int x, int y, maptile *map, object *originator) 85spell_effect (object *spob, int x, int y, maptile *map, object *originator)
86{ 86{
87 if (spob->other_arch) 87 if (spob->other_arch)
88 map->insert (arch_to_object (spob->other_arch), x, y, originator); 88 map->insert (spob->other_arch->instance (), x, y, originator);
89} 89}
90 90
91static int 91static int
92attuned_bonus (object *caster, object *spell, int level) 92attuned_bonus (object *caster, object *spell, int level)
93{ 93{
… …
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}
… …
356 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 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."); 357 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
358 dir = 0; 358 dir = 0;
359 } 359 }
360 360
361 SET_FLAG (new_op, FLAG_IDENTIFIED); 361 new_op->set_flag (FLAG_IDENTIFIED);
362 op->map->insert (new_op, 362 op->map->insert (new_op,
363 op->x + freearr_x[dir], op->y + freearr_y[dir], 363 op->x + freearr_x[dir], op->y + freearr_y[dir],
364 op, 364 op,
365 dir ? 0 : INS_BELOW_ORIGINATOR); 365 dir ? 0 : INS_BELOW_ORIGINATOR);
366 366
… …
404 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 404 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
405 return 0; 405 return 0;
406 406
407 int max_effects = 5; // max. number of similar spells per mapspace 407 int max_effects = 5; // max. number of similar spells per mapspace
408 408
409 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 409 for (object *tmp = ms.top; tmp; tmp = tmp->below)
410 { 410 {
411 /* If there is a counterspell on the space, and this 411 /* If there is a counterspell on the space, and this
412 * object is using magic, don't progress. I believe we could 412 * 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 413 * 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 414 * 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 416 * 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 417 * removed.) On the other hand, it may be more dramatic for the
418 * spell to actually hit the counterwall and be sucked up. 418 * spell to actually hit the counterwall and be sucked up.
419 */ 419 */
420 if ((tmp->attacktype & AT_COUNTERSPELL) 420 if ((tmp->attacktype & AT_COUNTERSPELL)
421 && !QUERY_FLAG (tmp, FLAG_MONSTER) 421 && !tmp->flag [FLAG_MONSTER]
422 && (tmp->type != PLAYER) 422 && (tmp->type != PLAYER)
423 && (tmp->type != WEAPON) 423 && (tmp->type != WEAPON)
424 && (tmp->type != BOW) 424 && (tmp->type != BOW)
425 && (tmp->type != ARROW) 425 && (tmp->type != ARROW)
426 && (tmp->type != GOLEM) 426 && (tmp->type != GOLEM)
427 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX: 427 && !tmp->flag [FLAG_IS_FLOOR] // XXX:
428 // we special case floor here because there 428 // we special case floor here because there
429 // are sometimes spell effect floors 429 // are sometimes spell effect floors
430 // which are used to inflict damage 430 // which are used to inflict damage
431 // (and those shouldn't go away from 431 // (and those shouldn't go away from
432 // sanctuary) see also: permanent lava 432 // sanctuary) see also: permanent lava
… …
514 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 514 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
515 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 515 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
516 if (!tailor_god_spell (tmp, op)) 516 if (!tailor_god_spell (tmp, op))
517 return 0; 517 return 0;
518 518
519 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 519 if (tmp->flag [FLAG_IS_TURNABLE])
520 SET_ANIMATION (tmp, dir); 520 SET_ANIMATION (tmp, dir);
521 521
522 if ((tmp = op->map->insert (tmp, x, y, op))) 522 if ((tmp = op->map->insert (tmp, x, y, op)))
523 move_spell_effect (tmp); 523 move_spell_effect (tmp);
524 524
… …
562 { 562 {
563 tmp = op->owner; 563 tmp = op->owner;
564 /* If the owner does not exist, or is not a monster, than apply the spell 564 /* If the owner does not exist, or is not a monster, than apply the spell
565 * to the caster. 565 * to the caster.
566 */ 566 */
567 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 567 if (!tmp || !tmp->flag [FLAG_MONSTER])
568 tmp = op; 568 tmp = op;
569 } 569 }
570 else 570 else
571 { 571 {
572 maptile *m = op->map; 572 maptile *m = op->map;
… …
620 continue; 620 continue;
621 621
622 tmp = GET_MAP_OB (mp, nx, ny); 622 tmp = GET_MAP_OB (mp, nx, ny);
623 623
624 while (tmp != NULL && (((owner_type == PLAYER && 624 while (tmp != NULL && (((owner_type == PLAYER &&
625 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 625 !tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_GENERATOR]) ||
626 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 626 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
627 tmp = tmp->above; 627 tmp = tmp->above;
628 628
629 if (tmp != NULL && can_see_monsterP (m, x, y, i)) 629 if (tmp != NULL && can_see_monsterP (m, x, y, i))
630 return freedir[i]; 630 return freedir[i];
… …
659 * insert multipart monsters properly 659 * insert multipart monsters properly
660 */ 660 */
661 //TODO: use expand_tail + ... 661 //TODO: use expand_tail + ...
662 while (at != NULL) 662 while (at != NULL)
663 { 663 {
664 tmp = arch_to_object (at); 664 tmp = at->instance ();
665 tmp->x = op->x + freearr_x[dir] + at->x; 665 tmp->x = op->x + freearr_x[dir] + at->x;
666 tmp->y = op->y + freearr_y[dir] + at->y; 666 tmp->y = op->y + freearr_y[dir] + at->y;
667 tmp->map = op->map; 667 tmp->map = op->map;
668 if (head) 668 if (head)
669 { 669 {
… …
780 * at casting a prayer. 780 * at casting a prayer.
781 * op is the player. 781 * op is the player.
782 * failure is basically how much grace they had. 782 * failure is basically how much grace they had.
783 * power is how much grace the spell would normally take to cast. 783 * power is how much grace the spell would normally take to cast.
784 */ 784 */
785
786#define HINT_GRACE " H<Make sure you always have enough grace points for your prayers.>"
787
785static void 788static void
786prayer_failure (object *op, int failure, int power) 789prayer_failure (object *op, int failure, int power)
787{ 790{
788 const char *godname; 791 const char *godname;
789 object *tmp; 792 object *tmp;
… …
791 if (!strcmp ((godname = determine_god (op)), "none")) 794 if (!strcmp ((godname = determine_god (op)), "none"))
792 godname = "Your spirit"; 795 godname = "Your spirit";
793 796
794 if (failure <= -20 && failure > -40) /* wonder */ 797 if (failure <= -20 && failure > -40) /* wonder */
795 { 798 {
796 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); 799 op->failmsgf ("%s gives a sign to renew your faith." HINT_GRACE, godname);
797 tmp = get_archetype (SPELL_WONDER); 800 tmp = archetype::get (SPELL_WONDER);
798 cast_cone (op, op, 0, tmp); 801 cast_cone (op, op, 0, tmp);
799 tmp->destroy (); 802 tmp->destroy ();
800 } 803 }
801 804
802 else if (failure <= -40 && failure > -60) /* confusion */ 805 else if (failure <= -40 && failure > -60) /* confusion */
803 { 806 {
804 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); 807 op->failmsg ("Your diety touches your mind!" HINT_GRACE);
805 confuse_player (op, op, 99); 808 confuse_player (op, op, 99);
806 } 809 }
807 else if (failure <= -60 && failure > -150) /* paralysis */ 810 else if (failure <= -60 && failure > -150) /* paralysis */
808 { 811 {
809 new_draw_info_format (NDI_UNIQUE, 0, op, "%s requires you to pray NOW.", godname); 812 op->failmsgf ("%s requires you to pray NOW. "
810 new_draw_info (NDI_UNIQUE, 0, op, "You comply, ignoring all else."); 813 "You comply, ignoring all else." HINT_GRACE,
814 godname);
811 paralyze_player (op, op, 99); 815 paralyze_player (op, op, 99);
812 } 816 }
813 else if (failure <= -150) /* blast the immediate area */ 817 else if (failure <= -150) /* blast the immediate area */
814 { 818 {
815 tmp = get_archetype (GOD_POWER); 819 tmp = archetype::get (GOD_POWER);
816 new_draw_info_format (NDI_UNIQUE, 0, op, "%s smites you!", godname); 820 op->failmsgf ("%s smites you!" HINT_GRACE, godname);
817 cast_magic_storm (op, tmp, power); 821 cast_magic_storm (op, tmp, power);
818 } 822 }
819} 823}
820 824
821/* 825/*
… …
835 if (settings.spell_failure_effects == FALSE) 839 if (settings.spell_failure_effects == FALSE)
836 return; 840 return;
837 841
838 if (failure <= -20 && failure > -40) /* wonder */ 842 if (failure <= -20 && failure > -40) /* wonder */
839 { 843 {
840 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); 844 op->failmsg ("Your spell causes an unexpected effect.");
841 tmp = get_archetype (SPELL_WONDER); 845 tmp = archetype::get (SPELL_WONDER);
842 cast_cone (op, op, 0, tmp); 846 cast_cone (op, op, 0, tmp);
843 tmp->destroy (); 847 tmp->destroy ();
844 } 848 }
845 849
846 else if (failure <= -40 && failure > -60) /* confusion */ 850 else if (failure <= -40 && failure > -60) /* confusion */
847 { 851 {
848 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); 852 op->failmsg ("Your magic recoils on you, making you confused!");
849 confuse_player (op, op, 99); 853 confuse_player (op, op, 99);
850 } 854 }
851 else if (failure <= -60 && failure > -80) /* paralysis */ 855 else if (failure <= -60 && failure > -80) /* paralysis */
852 { 856 {
853 new_draw_info (NDI_UNIQUE, 0, op, "Your magic stuns you!"); 857 op->failmsg ("Your magic stuns you!");
854 paralyze_player (op, op, 99); 858 paralyze_player (op, op, 99);
855 } 859 }
856 else if (failure <= -80) /* blast the immediate area */ 860 else if (failure <= -80) /* blast the immediate area */
857 { 861 {
858 object *tmp; 862 object *tmp;
859 863
860 /* Safety check to make sure we don't get any mana storms in scorn */ 864 /* 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) 865 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)
862 { 866 {
863 new_draw_info (NDI_UNIQUE, 0, op, "The magic warps and you are turned inside out!"); 867 op->failmsg ("The magic warps and you are turned inside out!");
864 hit_player (op, 9998, op, AT_INTERNAL, 1); 868 hit_player (op, 9998, op, AT_INTERNAL, 1);
865 869
866 } 870 }
867 else 871 else
868 { 872 {
869 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 873 op->failmsg ("You lose control of the mana! The uncontrolled magic blasts you!");
870 tmp = get_archetype (LOOSE_MANA); 874 tmp = archetype::get (LOOSE_MANA);
871 tmp->level = skill->level; 875 tmp->level = skill->level;
872 876
873 /* increase the area of destruction a little for more powerful spells */ 877 /* increase the area of destruction a little for more powerful spells */
874 tmp->range += isqrt (power); 878 tmp->range += isqrt (power);
875 879
… …
892 { 896 {
893 LOG (llevError, "cast_party_spell: empty other arch\n"); 897 LOG (llevError, "cast_party_spell: empty other arch\n");
894 return 0; 898 return 0;
895 } 899 }
896 900
897 object *spell = arch_to_object (spell_ob->other_arch); 901 object *spell = spell_ob->other_arch->instance ();
898 902
899 /* Always cast spell on caster */ 903 /* Always cast spell on caster */
900 int success = cast_spell (op, caster, dir, spell, spellparam); 904 int success = cast_spell (op, caster, dir, spell, spellparam);
901 905
902 if (!op->contr || !op->contr->party) 906 if (!op->contr || !op->contr->party)
… …
945int 949int
946cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam) 950cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
947{ 951{
948 const char *godname; 952 const char *godname;
949 int success = 0; 953 int success = 0;
950 object *skill = NULL; 954
955 // make sure spells always take a while, so a) we don't flood the
956 // user with messages and b) too many failures can be harmful (smiting).
957 op->speed_left -= 4 * op->speed; // ~0.5s on failure
951 958
952 if (!spell_ob) 959 if (!spell_ob)
953 { 960 {
954 LOG (llevError, "cast_spell: null spell object passed\n"); 961 LOG (llevError, "cast_spell: null spell object passed\n");
955 return 0; 962 return 0;
… …
966 } 973 }
967 974
968 /* if caster is a spell casting object, this normally shouldn't be 975 /* if caster is a spell casting object, this normally shouldn't be
969 * an issue, because they don't have any spellpaths set up. 976 * an issue, because they don't have any spellpaths set up.
970 */ 977 */
971 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST)) 978 if (caster->path_denied & spell_ob->path_attuned && !caster->flag [FLAG_WIZCAST])
972 { 979 {
973 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 980 op->failmsg ("That spell path is denied to you.");
974 return 0; 981 return 0;
975 } 982 }
983
984 object *skill = 0;
976 985
977 /* if it is a player casting the spell, and they are really casting it 986 /* 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 987 * (vs it coming from a wand, scroll, or whatever else), do some
979 * checks. We let monsters do special things - eg, they 988 * checks. We let monsters do special things - eg, they
980 * don't need the skill, bypass level checks, etc. The monster function 989 * don't need the SKILL, BYpass level checks, etc. The monster function
981 * should take care of that. 990 * should take care of that.
982 * Remove the wiz check here and move it further down - some spells 991 * 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 992 * need to have the right skill pointer passed, so we need to
984 * at least process that code. 993 * at least process that code.
985 */ 994 */
… …
989 { 998 {
990 skill = find_skill_by_name (op, spell_ob->skill); 999 skill = find_skill_by_name (op, spell_ob->skill);
991 1000
992 if (!skill) 1001 if (!skill)
993 { 1002 {
994 op->failmsg (format ("You need the skill %s to cast %s! " 1003 op->failmsgf ("You need the %s skill to cast %s! "
995 "H<You either need to learn the skill via a skill scroll " 1004 "H<You either need to learn the skill via a skill scroll "
996 "or you need to wear a talisman or holy symbol.>", 1005 "or you need to wear a talisman, holy symbol or another skill tool.>",
997 &spell_ob->skill, &spell_ob->name)); 1006 &spell_ob->skill, &spell_ob->name);
998 return 0; 1007 return 0;
999 } 1008 }
1000 1009
1001 const char *msg = ""; 1010 const char *msg = "";
1002 1011
1003 int caster_level = skill->level; 1012 int caster_level = skill->level;
… …
1014 msg = " (repelled)"; 1023 msg = " (repelled)";
1015 } 1024 }
1016 1025
1017 if (spell_ob->level > caster_level) 1026 if (spell_ob->level > caster_level)
1018 { 1027 {
1019 op->failmsg (format ("You lack enough skill to cast that spell! " 1028 op->failmsgf ("You lack enough skill to cast that spell! "
1020 "H<Your effective cast level is %d%s, but level %d is required.>", 1029 "H<Your effective cast level is %d%s, but level %d is required.>",
1021 caster_level, msg, spell_ob->level)); 1030 caster_level, msg, spell_ob->level);
1022 if (!op->is_wiz ()) 1031 if (!op->is_wiz ())
1023 return 0; 1032 return 0;
1024 } 1033 }
1025 } 1034 }
1026 1035
1027 /* If the caster is the wiz, they don't ever fail, and don't have 1036 /* If the caster is the wiz, they don't ever fail, and don't have
1028 * to have sufficient grace/mana. 1037 * to have sufficient grace/mana.
1029 */ 1038 */
1030 if (!QUERY_FLAG (op, FLAG_WIZCAST)) 1039 if (!op->flag [FLAG_WIZCAST])
1031 { 1040 {
1032 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1041 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1033 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1042 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1034 { 1043 {
1035 op->failmsg ("You don't have enough mana!"); 1044 op->failmsg ("You don't have enough mana!");
… …
1043 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1052 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)); 1053 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1045 else 1054 else
1046 { 1055 {
1047 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1056 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)); 1057 op->failmsgf ("%s ignores your prayer.", godname);
1049 return 0; 1058 return 0;
1050 } 1059 }
1051 } 1060 }
1052 1061
1053 /* player/monster is trying to cast the spell. might fumble it */ 1062 /* player/monster is trying to cast the spell. might fumble it */
… …
1083 * not alive, then this would mean that the mapmaker put the 1092 * not alive, then this would mean that the mapmaker put the
1084 * objects on the space - presume that they know what they are 1093 * objects on the space - presume that they know what they are
1085 * doing. 1094 * doing.
1086 */ 1095 */
1087 1096
1088 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1097 if ((mflags & P_SAFE) && !op->flag [FLAG_WIZCAST]) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1089 { 1098 {
1099 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!"); 1100 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1091 return 0; 1101 return 0;
1092 } 1102 }
1093 1103
1094 if ((spell_ob->type == SPELL) 1104 if ((spell_ob->type == SPELL)
1095 && (caster->type != POTION) 1105 && (caster->type != POTION)
1096 && !QUERY_FLAG (op, FLAG_WIZCAST) 1106 && !op->flag [FLAG_WIZCAST]
1097 && (QUERY_FLAG (caster, FLAG_ALIVE) 1107 && (caster->flag [FLAG_ALIVE]
1098 || QUERY_FLAG (op, FLAG_ALIVE)) 1108 || op->flag [FLAG_ALIVE])
1099 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace))) 1109 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)))
1100 { 1110 {
1101 if (op->type != PLAYER) 1111 if (op->type != PLAYER)
1102 return 0; 1112 return 0;
1103 1113
1104 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1114 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1105 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1115 op->failmsgf ("This ground is unholy! %s ignores you.", godname);
1106 else if (object *item = op->contr->ranged_ob) 1116 else if (object *item = op->contr->ranged_ob)
1107 { 1117 {
1108 if (item->type == SPELL) 1118 if (item->type == SPELL)
1109 op->failmsg ("Something blocks your spellcasting."); 1119 op->failmsg ("Something blocks your spellcasting.");
1110 else if (item->type == SCROLL) 1120 else if (item->type == SCROLL)
… …
1116 op->failmsg ("Something blocks the spell!"); 1126 op->failmsg ("Something blocks the spell!");
1117 1127
1118 return 0; 1128 return 0;
1119 } 1129 }
1120 1130
1131 // undo the flood protection from earlier
1132 op->speed_left += 4 * op->speed; // ~0.5s on failure
1133
1121 /* Take into account how long it takes to cast the spell. 1134 /* Take into account how long it takes to cast the spell.
1122 * if the player is casting it, then we use the time in 1135 * if the player is casting it, then we use the time in
1123 * the spell object. If it is a spell object, have it 1136 * the spell object. If it is a spell object, have it
1124 * take two ticks. Things that cast spells on the players 1137 * take two ticks. Things that cast spells on the players
1125 * behalf (eg, altars, and whatever else) shouldn't cost 1138 * behalf (eg, altars, and whatever else) shouldn't cost
1126 * the player any time. 1139 * the player any time.
1127 * Ignore casting time for firewalls 1140 * Ignore casting time for firewalls
1128 */ 1141 */
1129 if (caster == op && caster->type != FIREWALL) 1142 if (caster == op && caster->type != FIREWALL)
1130 { 1143 {
1131 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * fabs (op->speed); 1144 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1132 /* Other portions of the code may also decrement the speed of the player, so 1145 /* Other portions of the code may also decrement the speed of the player, so
1133 * put a lower limit so that the player isn't stuck here too long 1146 * put a lower limit so that the player isn't stuck here too long
1134 */ 1147 */
1135 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * fabs (op->speed)) 1148 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed)
1136 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * fabs (op->speed); 1149 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1137 } 1150 }
1138 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1151 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1139 op->speed_left -= 2 * fabs (op->speed); 1152 op->speed_left -= 2 * op->speed;
1140 1153
1141 if (op->type == PLAYER && op == caster) 1154 if (op->type == PLAYER && op == caster)
1142 { 1155 {
1143 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1156 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1144 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1157 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1149 * object requires. 1162 * object requires.
1150 */ 1163 */
1151 if (op != caster && !skill && caster->skill) 1164 if (op != caster && !skill && caster->skill)
1152 { 1165 {
1153 skill = find_skill_by_name (op, caster->skill); 1166 skill = find_skill_by_name (op, caster->skill);
1167
1154 if (!skill) 1168 if (!skill)
1155 { 1169 {
1156 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster))); 1170 op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
1157 return 0; 1171 return 0;
1158 } 1172 }
1159
1160 op->change_skill (skill); /* needed for proper exp credit */
1161 } 1173 }
1162 1174
1163 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam))) 1175 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
1164 return RESULT_INT (0); 1176 return RESULT_INT (0);
1177
1178 // temporaroly replace chosen_skill by skill, we assume skill *could* be applied,
1179 // at least temporarily, which might not be true due to slot restrictions, but hey
1180 // invoke requires it basically.
1181
1182 object *chosen_skill = op->chosen_skill;
1183 op->chosen_skill = skill;
1165 1184
1166 switch (spell_ob->subtype) 1185 switch (spell_ob->subtype)
1167 { 1186 {
1168 /* The order of case statements is same as the order they show up 1187 /* The order of case statements is same as the order they show up
1169 * in spells.h. 1188 * in spells.h.
… …
1320 break; 1339 break;
1321 1340
1322 case SP_MOVING_BALL: 1341 case SP_MOVING_BALL:
1323 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1342 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1324 { 1343 {
1325 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name)); 1344 op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
1326 success = 0; 1345 success = 0;
1327 } 1346 }
1328 else 1347 else
1329 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob); 1348 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1330 break; 1349 break;
… …
1379 break; 1398 break;
1380 1399
1381 default: 1400 default:
1382 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1401 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1383 } 1402 }
1403
1404 // restore chosen_skill
1405 op->chosen_skill = chosen_skill;
1384 1406
1385 op->play_sound ( 1407 op->play_sound (
1386 success 1408 success
1387 ? spell_ob->sound 1409 ? spell_ob->sound
1388 ? spell_ob->sound 1410 ? spell_ob->sound
… …
1453apply_spell_effect (object *spell, object *victim) 1475apply_spell_effect (object *spell, object *victim)
1454{ 1476{
1455 switch (spell->subtype) 1477 switch (spell->subtype)
1456 { 1478 {
1457 case SP_CONE: 1479 case SP_CONE:
1458 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->has_active_speed () && spell->attacktype) 1480 if (victim->flag [FLAG_ALIVE] && spell->has_active_speed () && spell->attacktype)
1459 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1481 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1460 break; 1482 break;
1461 1483
1462 case SP_MAGIC_MISSILE: 1484 case SP_MAGIC_MISSILE:
1463 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1485 if (victim->flag [FLAG_ALIVE])
1464 { 1486 {
1465 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1487 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1466 spell->destroy (); 1488 spell->destroy ();
1467 } 1489 }
1468 break; 1490 break;
1469 1491
1470 case SP_MOVING_BALL: 1492 case SP_MOVING_BALL:
1471 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1493 if (victim->flag [FLAG_ALIVE])
1472 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1494 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1473 else if (victim->materialname) 1495 else if (victim->material != MATERIAL_NULL)
1474 save_throw_object (victim, spell->attacktype, spell); 1496 save_throw_object (victim, spell->attacktype, spell);
1475 1497
1476 break; 1498 break;
1477 } 1499 }
1478} 1500}
… …
1482 * the victim with a specific maximum level. 1504 * the victim with a specific maximum level.
1483 */ 1505 */
1484void 1506void
1485create_exploding_ball_at (object *victim, int level) 1507create_exploding_ball_at (object *victim, int level)
1486{ 1508{
1487 object *ball = get_archetype (EXPLODING_FIREBALL); 1509 object *ball = archetype::get (EXPLODING_FIREBALL);
1488 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1; 1510 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; 1511 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1490 ball->insert_at (victim); 1512 ball->insert_at (victim);
1491} 1513}

Diff Legend

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