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.61 by root, Sat Sep 8 07:24:31 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 */
… …
458 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 451 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."); 452 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
460 dir = 0; 453 dir = 0;
461 } 454 }
462 455
456 SET_FLAG (new_op, FLAG_IDENTIFIED);
463 op->map->insert (new_op, 457 op->map->insert (new_op,
464 op->x + freearr_x[dir], op->y + freearr_y[dir], 458 op->x + freearr_x[dir], op->y + freearr_y[dir],
465 op, 459 op,
466 dir ? 0 : INS_BELOW_ORIGINATOR); 460 dir ? 0 : INS_BELOW_ORIGINATOR);
467 461
… …
557 * dir: direction to fire in. 551 * dir: direction to fire in.
558 * spell: spell that is being fired. It uses other_arch for the archetype 552 * spell: spell that is being fired. It uses other_arch for the archetype
559 * to fire. 553 * to fire.
560 * returns 0 on failure, 1 on success. 554 * returns 0 on failure, 1 on success.
561 */ 555 */
562
563int 556int
564fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 557fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
565{ 558{
566 object *tmp; 559 object *tmp;
567 int mflags; 560 int mflags;
… …
627 ****************************************************************************/ 620 ****************************************************************************/
628void 621void
629regenerate_rod (object *rod) 622regenerate_rod (object *rod)
630{ 623{
631 if (rod->stats.hp < rod->stats.maxhp) 624 if (rod->stats.hp < rod->stats.maxhp)
632 { 625 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} 626}
639
640 627
641void 628void
642drain_rod_charge (object *rod) 629drain_rod_charge (object *rod)
643{ 630{
644 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 631 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
… …
754 741
755 /* find a free square nearby 742 /* find a free square nearby
756 * first we check the closest square for free squares 743 * first we check the closest square for free squares
757 */ 744 */
758 745
759 dir = find_first_free_spot (&at->clone, op->map, op->x, op->y); 746 dir = find_first_free_spot (at, op->map, op->x, op->y);
760 if (dir != -1) 747 if (dir != -1)
761 { 748 {
762 /* This is basically grabbed for generate monster. Fixed 971225 to 749 /* This is basically grabbed for generate monster. Fixed 971225 to
763 * insert multipart monsters properly 750 * insert multipart monsters properly
764 */ 751 */
752 //TODO: use expand_tail + ...
765 while (at != NULL) 753 while (at != NULL)
766 { 754 {
767 tmp = arch_to_object (at); 755 tmp = arch_to_object (at);
768 tmp->x = op->x + freearr_x[dir] + at->clone.x; 756 tmp->x = op->x + freearr_x[dir] + at->x;
769 tmp->y = op->y + freearr_y[dir] + at->clone.y; 757 tmp->y = op->y + freearr_y[dir] + at->y;
770 tmp->map = op->map; 758 tmp->map = op->map;
771 if (head) 759 if (head)
772 { 760 {
773 tmp->head = head; 761 tmp->head = head;
774 prev->more = tmp; 762 prev->more = tmp;
775 } 763 }
764
776 if (!head) 765 if (!head)
777 head = tmp; 766 head = tmp;
767
778 prev = tmp; 768 prev = tmp;
769
779 at = at->more; 770 at = (archetype *)at->more;
780 } 771 }
781 772
782 if (head->randomitems) 773 if (head->randomitems)
783 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 774 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
784 775
… …
997 if (!spell_ob->other_arch) 988 if (!spell_ob->other_arch)
998 { 989 {
999 LOG (llevError, "cast_party_spell: empty other arch\n"); 990 LOG (llevError, "cast_party_spell: empty other arch\n");
1000 return 0; 991 return 0;
1001 } 992 }
993
1002 spell = arch_to_object (spell_ob->other_arch); 994 spell = arch_to_object (spell_ob->other_arch);
1003 995
1004 /* Always cast spell on caster */ 996 /* Always cast spell on caster */
1005 success = cast_spell (op, caster, dir, spell, stringarg); 997 success = cast_spell (op, caster, dir, spell, stringarg);
1006 998
1007 if (caster->contr->party == NULL) 999 if (caster->contr->party == NULL)
1008 { 1000 {
1009 spell->remove (); 1001 spell->remove ();
1010 return success; 1002 return success;
1011 } 1003 }
1004
1012 for_all_players (pl) 1005 for_all_players (pl)
1013 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 1006 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); 1007 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1016 } 1008
1017 spell->remove (); 1009 spell->remove ();
1018 return success; 1010 return success;
1019} 1011}
1020 1012
1021/* This is where the main dispatch when someone casts a spell. 1013/* This is where the main dispatch when someone casts a spell.
… …
1047 */ 1039 */
1048int 1040int
1049cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 1041cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1050{ 1042{
1051 const char *godname; 1043 const char *godname;
1052 int success = 0, mflags, cast_level = 0; 1044 int success = 0, cast_level = 0;
1053 object *skill = NULL; 1045 object *skill = NULL;
1054 1046
1055 if (!spell_ob) 1047 if (!spell_ob)
1056 { 1048 {
1057 LOG (llevError, "cast_spell: null spell object passed\n"); 1049 LOG (llevError, "cast_spell: null spell object passed\n");
… …
1087 * at least process that code. 1079 * at least process that code.
1088 */ 1080 */
1089 if (op->type == PLAYER && op == caster) 1081 if (op->type == PLAYER && op == caster)
1090 { 1082 {
1091 cast_level = caster_level (caster, spell_ob); 1083 cast_level = caster_level (caster, spell_ob);
1084
1092 if (spell_ob->skill) 1085 if (spell_ob->skill)
1093 { 1086 {
1094 skill = find_skill_by_name (op, spell_ob->skill); 1087 skill = find_skill_by_name (op, spell_ob->skill);
1088
1095 if (!skill) 1089 if (!skill)
1096 { 1090 {
1097 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 1091 op->failmsg (format ("You need the skill %s to cast %s!", &spell_ob->skill, &spell_ob->name));
1098 return 0; 1092 return 0;
1099 } 1093 }
1094
1100 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 1095 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
1101 { 1096 {
1102 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 1097 op->failmsg ("You lack enough skill to cast that spell!");
1103 return 0; 1098 return 0;
1104 } 1099 }
1105 } 1100 }
1101
1106 /* If the caster is the wiz, they don't ever fail, and don't have 1102 /* If the caster is the wiz, they don't ever fail, and don't have
1107 * to have sufficient grace/mana. 1103 * to have sufficient grace/mana.
1108 */ 1104 */
1109 if (!QUERY_FLAG (op, FLAG_WIZ)) 1105 if (!QUERY_FLAG (op, FLAG_WIZ))
1110 { 1106 {
1111 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1107 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1112 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1108 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1113 { 1109 {
1114 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1110 op->failmsg ("You don't have enough mana!");
1115 return 0; 1111 return 0;
1116 } 1112 }
1117 1113
1118 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1114 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1119 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1115 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1120 { 1116 {
1121 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1117 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) 1118 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); 1119 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1125 }
1126 else 1120 else
1127 { 1121 {
1128 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1122 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); 1123 op->failmsg (format ("%s ignores your prayer.", godname));
1130 return 0; 1124 return 0;
1131 } 1125 }
1132 } 1126 }
1133 1127
1134 /* player/monster is trying to cast the spell. might fumble it */ 1128 /* player/monster is trying to cast the spell. might fumble it */
1135 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1129 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])) 1130 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1137 { 1131 {
1138 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1132 op->contr->play_sound (sound_find ("fumble_spell"));
1139 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1133 op->failmsg ("You fumble the prayer.");
1140
1141 if (settings.casting_time == TRUE)
1142 op->casting_time = -1;
1143 1134
1144 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1135 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1145 return 0; 1136 return 0;
1146 } 1137 }
1147 else if (spell_ob->stats.sp) 1138 else if (spell_ob->stats.sp)
1148 { 1139 {
1149 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35; 1140 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1150 1141
1151 if (failure < 0) 1142 if (failure < 0)
1152 { 1143 {
1153 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1144 op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1154 if (settings.spell_failure_effects == TRUE) 1145 if (settings.spell_failure_effects == TRUE)
1155 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1146 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1156 1147
1157 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1148 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1158 return 0; 1149 return 0;
1159 } 1150 }
1160 } 1151 }
1161 } 1152 }
1162 } 1153 }
1163 1154
1164 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1155 int mflags = op->ms ().flags ();
1165 1156
1166 /* See if we can cast a spell here. If the caster and op are 1157 /* 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 1158 * not alive, then this would mean that the mapmaker put the
1168 * objects on the space - presume that they know what they are 1159 * objects on the space - presume that they know what they are
1169 * doing. 1160 * doing.
1170 */ 1161 */
1171 1162
1172 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1163 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1173 { 1164 {
1174 new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!."); 1165 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1175 return 0; 1166 return 0;
1176 } 1167 }
1177 1168
1178 if ((spell_ob->type == SPELL) 1169 if ((spell_ob->type == SPELL)
1179 && (caster->type != POTION) 1170 && (caster->type != POTION)
… …
1184 { 1175 {
1185 if (op->type != PLAYER) 1176 if (op->type != PLAYER)
1186 return 0; 1177 return 0;
1187 1178
1188 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1179 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); 1180 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1190 else 1181 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 { 1182 {
1208 op->spellarg = strdup (stringarg); 1183 if (item->type == SPELL)
1209 } 1184 op->failmsg ("Something blocks your spellcasting.");
1185 else if (item->type == SCROLL)
1186 op->failmsg ("Something blocks the magic of your scroll.");
1210 else 1187 else
1211 op->spellarg = NULL; 1188 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 } 1189 }
1220 else 1190 else
1221 { /* casting_time == 0 */ 1191 op->failmsg ("Something blocks the spell!");
1222 op->casting_time = -1; 1192
1223 spell_ob = op->spell; 1193 return 0;
1224 stringarg = op->spellarg;
1225 }
1226 }
1227 else
1228 { 1194 }
1195
1229 /* Take into account how long it takes to cast the spell. 1196 /* Take into account how long it takes to cast the spell.
1230 * if the player is casting it, then we use the time in 1197 * if the player is casting it, then we use the time in
1231 * the spell object. If it is a spell object, have it 1198 * the spell object. If it is a spell object, have it
1232 * take two ticks. Things that cast spells on the players 1199 * take two ticks. Things that cast spells on the players
1233 * behalf (eg, altars, and whatever else) shouldn't cost 1200 * behalf (eg, altars, and whatever else) shouldn't cost
1234 * the player any time. 1201 * the player any time.
1235 * Ignore casting time for firewalls 1202 * Ignore casting time for firewalls
1203 */
1204 if (caster == op && caster->type != FIREWALL)
1205 {
1206 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1207 /* Other portions of the code may also decrement the speed of the player, so
1208 * put a lower limit so that the player isn't stuck here too long
1236 */ 1209 */
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)) 1210 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); 1211 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1245 } 1212 }
1246 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1213 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); 1214 op->speed_left -= 2 * FABS (op->speed);
1249 }
1250 }
1251 1215
1252 if (op->type == PLAYER && op == caster) 1216 if (op->type == PLAYER && op == caster)
1253 { 1217 {
1254 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1218 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); 1219 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1262 if (op != caster && !skill && caster->skill) 1226 if (op != caster && !skill && caster->skill)
1263 { 1227 {
1264 skill = find_skill_by_name (op, caster->skill); 1228 skill = find_skill_by_name (op, caster->skill);
1265 if (!skill) 1229 if (!skill)
1266 { 1230 {
1267 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1231 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1268 return 0; 1232 return 0;
1269 } 1233 }
1234
1270 change_skill (op, skill, 0); /* needed for proper exp credit */ 1235 op->change_skill (skill); /* needed for proper exp credit */
1271 } 1236 }
1237
1238 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1239 return RESULT_INT (0);
1272 1240
1273 switch (spell_ob->subtype) 1241 switch (spell_ob->subtype)
1274 { 1242 {
1275 /* The order of case statements is same as the order they show up 1243 /* The order of case statements is same as the order they show up
1276 * in in spells.h. 1244 * in in spells.h.
1277 */ 1245 */
1278 case SP_RAISE_DEAD: 1246 case SP_RAISE_DEAD:
1279 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1247 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1280 break; 1248 break;
1281 1249
1282 case SP_RUNE: 1250 case SP_RUNE:
… …
1397#ifdef NO_POLYMORPH 1365#ifdef NO_POLYMORPH
1398 /* Not great, but at least provide feedback so if players do have 1366 /* 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 1367 * polymorph (ie, find it as a preset item or left over from before
1400 * it was disabled), they get some feedback. 1368 * it was disabled), they get some feedback.
1401 */ 1369 */
1402 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1370 op->failmsg ("The spell fizzles!");
1403 success = 0; 1371 success = 0;
1404#else 1372#else
1405 success = cast_polymorph (op, caster, spell_ob, dir); 1373 success = cast_polymorph (op, caster, spell_ob, dir);
1406#endif 1374#endif
1407 break; 1375 break;
… …
1427 break; 1395 break;
1428 1396
1429 case SP_MOVING_BALL: 1397 case SP_MOVING_BALL:
1430 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1398 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1431 { 1399 {
1432 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name); 1400 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1433 success = 0; 1401 success = 0;
1434 } 1402 }
1435 else 1403 else
1436 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1404 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);
1437 break; 1405 break;
… …
1479 1447
1480 case SP_AURA: 1448 case SP_AURA:
1481 success = create_aura (op, caster, spell_ob); 1449 success = create_aura (op, caster, spell_ob);
1482 break; 1450 break;
1483 1451
1484 case SP_TOWN_PORTAL:
1485 success = cast_create_town_portal (op, caster, spell_ob, dir);
1486 break;
1487
1488 case SP_PARTY_SPELL: 1452 case SP_PARTY_SPELL:
1489 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1453 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1490 break; 1454 break;
1491 1455
1492 default: 1456 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); 1457 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 { 1458 }
1505 free (stringarg); 1459
1506 stringarg = 0; 1460 op->play_sound (
1507 } 1461 success
1462 ? spell_ob->sound
1463 ? spell_ob->sound
1464 : sound_find ("spell_success")
1465 : sound_find ("fumble_spell")
1466 );
1508 1467
1509 return success; 1468 return success;
1510} 1469}
1511 1470
1512
1513/* This is called from time.c/process_object(). That function 1471/* This is called from time.c/process_object(). That function
1514 * calls this for any SPELL_EFFECT type objects. This function 1472 * calls this for any SPELL_EFFECT type objects. This function
1515 * then dispatches them to the appropriate specific routines. 1473 * then dispatches them to the appropriate specific routines.
1516 */ 1474 */
1517void 1475void
1518move_spell_effect (object *op) 1476move_spell_effect (object *op)
1519{ 1477{
… …
1610 else if (victim->materialname) 1568 else if (victim->materialname)
1611 save_throw_object (victim, spell->attacktype, spell); 1569 save_throw_object (victim, spell->attacktype, spell);
1612 break; 1570 break;
1613 } 1571 }
1614} 1572}
1573

Diff Legend

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