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.42 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.62 by root, Sun Oct 21 01:35:14 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <spells.h> 25#include <spells.h>
27#include <object.h> 26#include <object.h>
… …
96 95
97 if (init_spells_done) 96 if (init_spells_done)
98 return; 97 return;
99 LOG (llevDebug, "Checking spells...\n"); 98 LOG (llevDebug, "Checking spells...\n");
100 99
101 for (at = first_archetype; at; at = at->next) 100 for_all_archetypes (at)
102 { 101 {
103 if (at->clone.type == SPELL) 102 if (at->type == SPELL)
104 { 103 {
105 if (at->clone.skill) 104 if (at->skill)
106 { 105 {
107 for (i = 1; i < NUM_SKILLS; i++) 106 for (i = 1; i < NUM_SKILLS; i++)
108 if (!strcmp (skill_names[i], at->clone.skill)) 107 if (!strcmp (skill_names[i], at->skill))
109 break; 108 break;
110 if (i == NUM_SKILLS) 109 if (i == NUM_SKILLS)
111 { 110 {
112 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill); 111 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->skill);
113 } 112 }
114 } 113 }
115 /* other_arch is already checked for in the loader */ 114 /* other_arch is already checked for in the loader */
116 } 115 }
117 } 116 }
… …
132/* Dumps all the spells - now also dumps skill associated with the spell. 131/* Dumps all the spells - now also dumps skill associated with the spell.
133 * not sure what this would be used for, as the data seems pretty 132 * not sure what this would be used for, as the data seems pretty
134 * minimal, but easy enough to keep around. 133 * minimal, but easy enough to keep around.
135 */ 134 */
136void 135void
137dump_spells (void) 136dump_spells ()
138{ 137{
139 archetype *at; 138 for_all_archetypes (at)
140
141 for (at = first_archetype; at; at = at->next)
142 {
143 if (at->clone.type == SPELL) 139 if (at->type == SPELL)
144 {
145 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name, 140 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->object::name,
146 &at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level); 141 &at->archname, at->other_arch ? &at->other_arch->archname : "<nil>", &at->skill, at->level);
147 }
148 }
149} 142}
150 143
151/* pretty basic function - basically just takes 144/* pretty basic function - basically just takes
152 * an object, sets the x,y, and calls insert_ob_in_map 145 * an object, sets the x,y, and calls insert_ob_in_map
153 */ 146 */
… …
270 sp = 1; 263 sp = 1;
271 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 264 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
272 if (spell->stats.grace && !grace) 265 if (spell->stats.grace && !grace)
273 grace = 1; 266 grace = 1;
274 } 267 }
268
275 if (flags == SPELL_HIGHEST) 269 if (flags == SPELL_HIGHEST)
276 return MAX (sp, grace); 270 return MAX (sp, grace);
277 else if (flags == SPELL_GRACE) 271 else if (flags == SPELL_GRACE)
278 return grace; 272 return grace;
279 else if (flags == SPELL_MANA) 273 else if (flags == SPELL_MANA)
… …
283 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags); 277 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
284 return 0; 278 return 0;
285 } 279 }
286} 280}
287 281
288
289/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 282/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
290 * spob is the spell we are adjusting. 283 * spob is the spell we are adjusting.
291 */ 284 */
292int 285int
293SP_level_dam_adjust (object *caster, object *spob) 286SP_level_dam_adjust (object *caster, object *spob)
294{ 287{
288 if (!spob->dam_modifier)
289 return 0;
290
295 int level = caster_level (caster, spob); 291 int level = caster_level (caster, spob);
296 int adj = level - min_casting_level (caster, spob); 292 return max (0, level - min_casting_level (caster, spob)) / spob->dam_modifier;
297
298 if (adj < 0)
299 adj = 0;
300 if (spob->dam_modifier)
301 adj /= spob->dam_modifier;
302 else
303 adj = 0;
304 return adj;
305} 293}
306 294
307/* Adjust the strength of the spell based on level. 295/* Adjust the strength of the spell based on level.
308 * This is basically the same as SP_level_dam_adjust above, 296 * This is basically the same as SP_level_dam_adjust above,
309 * but instead looks at the level_modifier value. 297 * but instead looks at the level_modifier value.
310 */ 298 */
311int 299int
312SP_level_duration_adjust (object *caster, object *spob) 300SP_level_duration_adjust (object *caster, object *spob)
313{ 301{
302 if (!spob->duration_modifier)
303 return 0;
304
314 int level = caster_level (caster, spob); 305 int level = caster_level (caster, spob);
315 int adj = level - min_casting_level (caster, spob); 306 return max (0, level - min_casting_level (caster, spob)) / spob->duration_modifier;
316
317 if (adj < 0)
318 adj = 0;
319 if (spob->duration_modifier)
320 adj /= spob->duration_modifier;
321 else
322 adj = 0;
323
324 return adj;
325} 307}
326 308
327/* Adjust the strength of the spell based on level. 309/* Adjust the strength of the spell based on level.
328 * This is basically the same as SP_level_dam_adjust above, 310 * This is basically the same as SP_level_dam_adjust above,
329 * but instead looks at the level_modifier value. 311 * but instead looks at the level_modifier value.
330 */ 312 */
331int 313int
332SP_level_range_adjust (object *caster, object *spob) 314SP_level_range_adjust (object *caster, object *spob)
333{ 315{
316 if (!spob->range_modifier)
317 return 0;
318
334 int level = caster_level (caster, spob); 319 int level = caster_level (caster, spob);
335 int adj = level - min_casting_level (caster, spob); 320 return (level - min_casting_level (caster, spob)) / spob->range_modifier;
336
337 if (adj < 0)
338 adj = 0;
339 if (spob->range_modifier)
340 adj /= spob->range_modifier;
341 else
342 adj = 0;
343
344 return adj;
345} 321}
346 322
347/* Checks to see if player knows the spell. If the name is the same 323/* Checks to see if player knows the spell. If the name is the same
348 * as an existing spell, we presume they know it. 324 * as an existing spell, we presume they know it.
349 * returns 1 if they know the spell, 0 if they don't. 325 * returns 1 if they know the spell, 0 if they don't.
… …
458 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 434 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
459 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 435 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
460 dir = 0; 436 dir = 0;
461 } 437 }
462 438
439 SET_FLAG (new_op, FLAG_IDENTIFIED);
463 op->map->insert (new_op, 440 op->map->insert (new_op,
464 op->x + freearr_x[dir], op->y + freearr_y[dir], 441 op->x + freearr_x[dir], op->y + freearr_y[dir],
465 op, 442 op,
466 dir ? 0 : INS_BELOW_ORIGINATOR); 443 dir ? 0 : INS_BELOW_ORIGINATOR);
467 444
… …
557 * dir: direction to fire in. 534 * dir: direction to fire in.
558 * spell: spell that is being fired. It uses other_arch for the archetype 535 * spell: spell that is being fired. It uses other_arch for the archetype
559 * to fire. 536 * to fire.
560 * returns 0 on failure, 1 on success. 537 * returns 0 on failure, 1 on success.
561 */ 538 */
562
563int 539int
564fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 540fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
565{ 541{
566 object *tmp; 542 object *tmp;
567 int mflags; 543 int mflags;
… …
627 ****************************************************************************/ 603 ****************************************************************************/
628void 604void
629regenerate_rod (object *rod) 605regenerate_rod (object *rod)
630{ 606{
631 if (rod->stats.hp < rod->stats.maxhp) 607 if (rod->stats.hp < rod->stats.maxhp)
632 { 608 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
633 rod->stats.hp += 1 + rod->stats.maxhp / 10;
634
635 if (rod->stats.hp > rod->stats.maxhp)
636 rod->stats.hp = rod->stats.maxhp;
637 }
638} 609}
639
640 610
641void 611void
642drain_rod_charge (object *rod) 612drain_rod_charge (object *rod)
643{ 613{
644 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 614 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
… …
754 724
755 /* find a free square nearby 725 /* find a free square nearby
756 * first we check the closest square for free squares 726 * first we check the closest square for free squares
757 */ 727 */
758 728
759 dir = find_first_free_spot (&at->clone, op->map, op->x, op->y); 729 dir = find_first_free_spot (at, op->map, op->x, op->y);
760 if (dir != -1) 730 if (dir != -1)
761 { 731 {
762 /* This is basically grabbed for generate monster. Fixed 971225 to 732 /* This is basically grabbed for generate monster. Fixed 971225 to
763 * insert multipart monsters properly 733 * insert multipart monsters properly
764 */ 734 */
735 //TODO: use expand_tail + ...
765 while (at != NULL) 736 while (at != NULL)
766 { 737 {
767 tmp = arch_to_object (at); 738 tmp = arch_to_object (at);
768 tmp->x = op->x + freearr_x[dir] + at->clone.x; 739 tmp->x = op->x + freearr_x[dir] + at->x;
769 tmp->y = op->y + freearr_y[dir] + at->clone.y; 740 tmp->y = op->y + freearr_y[dir] + at->y;
770 tmp->map = op->map; 741 tmp->map = op->map;
771 if (head) 742 if (head)
772 { 743 {
773 tmp->head = head; 744 tmp->head = head;
774 prev->more = tmp; 745 prev->more = tmp;
775 } 746 }
747
776 if (!head) 748 if (!head)
777 head = tmp; 749 head = tmp;
750
778 prev = tmp; 751 prev = tmp;
752
779 at = at->more; 753 at = (archetype *)at->more;
780 } 754 }
781 755
782 if (head->randomitems) 756 if (head->randomitems)
783 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 757 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
784 758
… …
997 if (!spell_ob->other_arch) 971 if (!spell_ob->other_arch)
998 { 972 {
999 LOG (llevError, "cast_party_spell: empty other arch\n"); 973 LOG (llevError, "cast_party_spell: empty other arch\n");
1000 return 0; 974 return 0;
1001 } 975 }
976
1002 spell = arch_to_object (spell_ob->other_arch); 977 spell = arch_to_object (spell_ob->other_arch);
1003 978
1004 /* Always cast spell on caster */ 979 /* Always cast spell on caster */
1005 success = cast_spell (op, caster, dir, spell, stringarg); 980 success = cast_spell (op, caster, dir, spell, stringarg);
1006 981
1007 if (caster->contr->party == NULL) 982 if (caster->contr->party == NULL)
1008 { 983 {
1009 spell->remove (); 984 spell->remove ();
1010 return success; 985 return success;
1011 } 986 }
987
1012 for_all_players (pl) 988 for_all_players (pl)
1013 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 989 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1014 {
1015 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 990 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1016 } 991
1017 spell->remove (); 992 spell->remove ();
1018 return success; 993 return success;
1019} 994}
1020 995
1021/* This is where the main dispatch when someone casts a spell. 996/* This is where the main dispatch when someone casts a spell.
… …
1047 */ 1022 */
1048int 1023int
1049cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 1024cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1050{ 1025{
1051 const char *godname; 1026 const char *godname;
1052 int success = 0, mflags, cast_level = 0; 1027 int success = 0, cast_level = 0;
1053 object *skill = NULL; 1028 object *skill = NULL;
1054 1029
1055 if (!spell_ob) 1030 if (!spell_ob)
1056 { 1031 {
1057 LOG (llevError, "cast_spell: null spell object passed\n"); 1032 LOG (llevError, "cast_spell: null spell object passed\n");
… …
1087 * at least process that code. 1062 * at least process that code.
1088 */ 1063 */
1089 if (op->type == PLAYER && op == caster) 1064 if (op->type == PLAYER && op == caster)
1090 { 1065 {
1091 cast_level = caster_level (caster, spell_ob); 1066 cast_level = caster_level (caster, spell_ob);
1067
1092 if (spell_ob->skill) 1068 if (spell_ob->skill)
1093 { 1069 {
1094 skill = find_skill_by_name (op, spell_ob->skill); 1070 skill = find_skill_by_name (op, spell_ob->skill);
1071
1095 if (!skill) 1072 if (!skill)
1096 { 1073 {
1097 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 1074 op->failmsg (format ("You need the skill %s to cast %s!", &spell_ob->skill, &spell_ob->name));
1098 return 0; 1075 return 0;
1099 } 1076 }
1077
1100 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 1078 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
1101 { 1079 {
1102 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 1080 op->failmsg ("You lack enough skill to cast that spell!");
1103 return 0; 1081 return 0;
1104 } 1082 }
1105 } 1083 }
1084
1106 /* If the caster is the wiz, they don't ever fail, and don't have 1085 /* If the caster is the wiz, they don't ever fail, and don't have
1107 * to have sufficient grace/mana. 1086 * to have sufficient grace/mana.
1108 */ 1087 */
1109 if (!QUERY_FLAG (op, FLAG_WIZ)) 1088 if (!QUERY_FLAG (op, FLAG_WIZ))
1110 { 1089 {
1111 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1090 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1112 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1091 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1113 { 1092 {
1114 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1093 op->failmsg ("You don't have enough mana!");
1115 return 0; 1094 return 0;
1116 } 1095 }
1117 1096
1118 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1097 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1119 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1098 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1120 { 1099 {
1121 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1100 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1122 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1101 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1123 {
1124 new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname); 1102 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1125 }
1126 else 1103 else
1127 { 1104 {
1128 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1105 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1129 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1106 op->failmsg (format ("%s ignores your prayer.", godname));
1130 return 0; 1107 return 0;
1131 } 1108 }
1132 } 1109 }
1133 1110
1134 /* player/monster is trying to cast the spell. might fumble it */ 1111 /* player/monster is trying to cast the spell. might fumble it */
1135 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1112 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1136 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1113 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1137 { 1114 {
1138 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1115 op->contr->play_sound (sound_find ("fumble_spell"));
1139 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1116 op->failmsg ("You fumble the prayer.");
1140
1141 if (settings.casting_time == TRUE)
1142 op->casting_time = -1;
1143 1117
1144 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1118 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1145 return 0; 1119 return 0;
1146 } 1120 }
1147 else if (spell_ob->stats.sp) 1121 else if (spell_ob->stats.sp)
1148 { 1122 {
1149 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35; 1123 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1150 1124
1151 if (failure < 0) 1125 if (failure < 0)
1152 { 1126 {
1153 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1127 op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1154 if (settings.spell_failure_effects == TRUE) 1128 if (settings.spell_failure_effects == TRUE)
1155 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1129 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1156 1130
1157 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1131 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1158 return 0; 1132 return 0;
1159 } 1133 }
1160 } 1134 }
1161 } 1135 }
1162 } 1136 }
1163 1137
1164 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1138 int mflags = op->ms ().flags ();
1165 1139
1166 /* See if we can cast a spell here. If the caster and op are 1140 /* See if we can cast a spell here. If the caster and op are
1167 * not alive, then this would mean that the mapmaker put the 1141 * not alive, then this would mean that the mapmaker put the
1168 * objects on the space - presume that they know what they are 1142 * objects on the space - presume that they know what they are
1169 * doing. 1143 * doing.
1170 */ 1144 */
1171 1145
1172 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1146 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1173 { 1147 {
1174 new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!."); 1148 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1175 return 0; 1149 return 0;
1176 } 1150 }
1177 1151
1178 if ((spell_ob->type == SPELL) 1152 if ((spell_ob->type == SPELL)
1179 && (caster->type != POTION) 1153 && (caster->type != POTION)
… …
1184 { 1158 {
1185 if (op->type != PLAYER) 1159 if (op->type != PLAYER)
1186 return 0; 1160 return 0;
1187 1161
1188 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1162 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1189 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); 1163 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1190 else 1164 else if (object *item = op->contr->ranged_ob)
1191 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!");
1192
1193 return 0;
1194 }
1195
1196 if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1197 {
1198 if (op->casting_time == -1)
1199 { /* begin the casting */
1200 op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1201 op->spell = spell_ob;
1202 /* put the stringarg into the object struct so that when the
1203 * spell is actually cast, it knows about the stringarg.
1204 * necessary for the invoke command spells.
1205 */
1206 if (stringarg)
1207 { 1165 {
1208 op->spellarg = strdup (stringarg); 1166 if (item->type == SPELL)
1209 } 1167 op->failmsg ("Something blocks your spellcasting.");
1168 else if (item->type == SCROLL)
1169 op->failmsg ("Something blocks the magic of your scroll.");
1210 else 1170 else
1211 op->spellarg = NULL; 1171 op->failmsg ("Something blocks the magic of your item.");
1212 return 0;
1213 }
1214 else if (op->casting_time != 0)
1215 {
1216 if (op->type == PLAYER)
1217 new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1218 return 0;
1219 } 1172 }
1220 else 1173 else
1221 { /* casting_time == 0 */ 1174 op->failmsg ("Something blocks the spell!");
1222 op->casting_time = -1; 1175
1223 spell_ob = op->spell; 1176 return 0;
1224 stringarg = op->spellarg;
1225 }
1226 }
1227 else
1228 { 1177 }
1178
1229 /* Take into account how long it takes to cast the spell. 1179 /* Take into account how long it takes to cast the spell.
1230 * if the player is casting it, then we use the time in 1180 * if the player is casting it, then we use the time in
1231 * the spell object. If it is a spell object, have it 1181 * the spell object. If it is a spell object, have it
1232 * take two ticks. Things that cast spells on the players 1182 * take two ticks. Things that cast spells on the players
1233 * behalf (eg, altars, and whatever else) shouldn't cost 1183 * behalf (eg, altars, and whatever else) shouldn't cost
1234 * the player any time. 1184 * the player any time.
1235 * Ignore casting time for firewalls 1185 * Ignore casting time for firewalls
1186 */
1187 if (caster == op && caster->type != FIREWALL)
1188 {
1189 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1190 /* Other portions of the code may also decrement the speed of the player, so
1191 * put a lower limit so that the player isn't stuck here too long
1236 */ 1192 */
1237 if (caster == op && caster->type != FIREWALL)
1238 {
1239 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1240 /* Other portions of the code may also decrement the speed of the player, so
1241 * put a lower limit so that the player isn't stuck here too long
1242 */
1243 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1193 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
1244 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1194 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1245 } 1195 }
1246 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1196 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1247 {
1248 op->speed_left -= 2 * FABS (op->speed); 1197 op->speed_left -= 2 * FABS (op->speed);
1249 }
1250 }
1251 1198
1252 if (op->type == PLAYER && op == caster) 1199 if (op->type == PLAYER && op == caster)
1253 { 1200 {
1254 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1201 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1255 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1202 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1262 if (op != caster && !skill && caster->skill) 1209 if (op != caster && !skill && caster->skill)
1263 { 1210 {
1264 skill = find_skill_by_name (op, caster->skill); 1211 skill = find_skill_by_name (op, caster->skill);
1265 if (!skill) 1212 if (!skill)
1266 { 1213 {
1267 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1214 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1268 return 0; 1215 return 0;
1269 } 1216 }
1217
1270 change_skill (op, skill, 0); /* needed for proper exp credit */ 1218 op->change_skill (skill); /* needed for proper exp credit */
1271 } 1219 }
1220
1221 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1222 return RESULT_INT (0);
1272 1223
1273 switch (spell_ob->subtype) 1224 switch (spell_ob->subtype)
1274 { 1225 {
1275 /* The order of case statements is same as the order they show up 1226 /* The order of case statements is same as the order they show up
1276 * in in spells.h. 1227 * in in spells.h.
1277 */ 1228 */
1278 case SP_RAISE_DEAD: 1229 case SP_RAISE_DEAD:
1279 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1230 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1280 break; 1231 break;
1281 1232
1282 case SP_RUNE: 1233 case SP_RUNE:
… …
1397#ifdef NO_POLYMORPH 1348#ifdef NO_POLYMORPH
1398 /* Not great, but at least provide feedback so if players do have 1349 /* Not great, but at least provide feedback so if players do have
1399 * polymorph (ie, find it as a preset item or left over from before 1350 * polymorph (ie, find it as a preset item or left over from before
1400 * it was disabled), they get some feedback. 1351 * it was disabled), they get some feedback.
1401 */ 1352 */
1402 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1353 op->failmsg ("The spell fizzles!");
1403 success = 0; 1354 success = 0;
1404#else 1355#else
1405 success = cast_polymorph (op, caster, spell_ob, dir); 1356 success = cast_polymorph (op, caster, spell_ob, dir);
1406#endif 1357#endif
1407 break; 1358 break;
… …
1427 break; 1378 break;
1428 1379
1429 case SP_MOVING_BALL: 1380 case SP_MOVING_BALL:
1430 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1381 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1431 { 1382 {
1432 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name); 1383 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1433 success = 0; 1384 success = 0;
1434 } 1385 }
1435 else 1386 else
1436 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1387 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);
1437 break; 1388 break;
… …
1479 1430
1480 case SP_AURA: 1431 case SP_AURA:
1481 success = create_aura (op, caster, spell_ob); 1432 success = create_aura (op, caster, spell_ob);
1482 break; 1433 break;
1483 1434
1484 case SP_TOWN_PORTAL:
1485 success = cast_create_town_portal (op, caster, spell_ob, dir);
1486 break;
1487
1488 case SP_PARTY_SPELL: 1435 case SP_PARTY_SPELL:
1489 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1436 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1490 break; 1437 break;
1491 1438
1492 default: 1439 default:
1493 if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1494 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1440 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1495 }
1496
1497 /* FIXME - we need some better sound suppport */
1498 // yes, for example, augment map info with the spell effect
1499 // so clients can calculate the sounds themselves
1500 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1501
1502 /* free the spell arg */
1503 if (settings.casting_time == TRUE && stringarg)
1504 { 1441 }
1505 free (stringarg); 1442
1506 stringarg = 0; 1443 op->play_sound (
1507 } 1444 success
1445 ? spell_ob->sound
1446 ? spell_ob->sound
1447 : sound_find ("spell_success")
1448 : sound_find ("fumble_spell")
1449 );
1508 1450
1509 return success; 1451 return success;
1510} 1452}
1511 1453
1512
1513/* This is called from time.c/process_object(). That function 1454/* This is called from time.c/process_object(). That function
1514 * calls this for any SPELL_EFFECT type objects. This function 1455 * calls this for any SPELL_EFFECT type objects. This function
1515 * then dispatches them to the appropriate specific routines. 1456 * then dispatches them to the appropriate specific routines.
1516 */ 1457 */
1517void 1458void
1518move_spell_effect (object *op) 1459move_spell_effect (object *op)
1519{ 1460{
… …
1610 else if (victim->materialname) 1551 else if (victim->materialname)
1611 save_throw_object (victim, spell->attacktype, spell); 1552 save_throw_object (victim, spell->attacktype, spell);
1612 break; 1553 break;
1613 } 1554 }
1614} 1555}
1556

Diff Legend

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