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.36 by root, Wed Feb 7 02:04:47 2007 UTC vs.
Revision 1.73 by root, Sat May 17 14:11:13 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
23 */ 22 */
24
25 23
26#include <global.h> 24#include <global.h>
27#include <spells.h> 25#include <spells.h>
28#include <object.h> 26#include <object.h>
29#include <errno.h> 27#include <errno.h>
… …
79 dest->skill = spob->skill; 77 dest->skill = spob->skill;
80 else 78 else
81 dest->skill = caster->skill; 79 dest->skill = caster->skill;
82} 80}
83 81
84/* init_spells: This should really be called check_spells, as that
85 * is what it does. It goes through the spells looking for any
86 * obvious errors. This was most useful in debugging when re-doing
87 * all the spells to catch simple errors. To use it all the time
88 * will result in it spitting out messages that aren't really errors.
89 */
90void
91init_spells (void)
92{
93#ifdef SPELL_DEBUG
94 static int init_spells_done = 0;
95 int i;
96 archetype *at;
97
98 if (init_spells_done)
99 return;
100 LOG (llevDebug, "Checking spells...\n");
101
102 for (at = first_archetype; at; at = at->next)
103 {
104 if (at->clone.type == SPELL)
105 {
106 if (at->clone.skill)
107 {
108 for (i = 1; i < NUM_SKILLS; i++)
109 if (!strcmp (skill_names[i], at->clone.skill))
110 break;
111 if (i == NUM_SKILLS)
112 {
113 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill);
114 }
115 }
116 /* other_arch is already checked for in the loader */
117 }
118 }
119
120 i = 0;
121 while (spell_mapping[i])
122 {
123 if (!archetype::find (spell_mapping[i]))
124 {
125 LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
126 }
127 i++;
128 }
129 LOG (llevDebug, "Checking spells completed.\n");
130#endif
131}
132
133/* Dumps all the spells - now also dumps skill associated with the spell.
134 * not sure what this would be used for, as the data seems pretty
135 * minimal, but easy enough to keep around.
136 */
137void
138dump_spells (void)
139{
140 archetype *at;
141
142 for (at = first_archetype; at; at = at->next)
143 {
144 if (at->clone.type == SPELL)
145 {
146 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name,
147 &at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level);
148 }
149 }
150}
151
152/* pretty basic function - basically just takes 82/* pretty basic function - basically just takes
153 * an object, sets the x,y, and calls insert_ob_in_map 83 * an object, sets the x,y, and calls insert_ob_in_map
154 */ 84 */
155void 85void
156spell_effect (object *spob, int x, int y, maptile *map, object *originator) 86spell_effect (object *spob, int x, int y, maptile *map, object *originator)
… …
170 * Returns modified level. 100 * Returns modified level.
171 */ 101 */
172int 102int
173min_casting_level (object *caster, object *spell) 103min_casting_level (object *caster, object *spell)
174{ 104{
175 int new_level;
176
177 if (caster->path_denied & spell->path_attuned) 105 if (caster->path_denied & spell->path_attuned)
178 return 1; 106 return 1;
179 107
180 new_level = spell->level 108 int new_level = spell->level
181 + (caster->path_repelled & spell->path_attuned ? +2 : 0) 109 + (caster->path_repelled & spell->path_attuned ? +8 : 0)
182 + (caster->path_attuned & spell->path_attuned ? -2 : 0); 110 + (caster->path_attuned & spell->path_attuned ? -8 : 0);
183 111
184 return max (1, new_level); 112 return max (1, new_level);
185} 113}
186 114
187/* This function returns the effective level the spell 115/* This function returns the effective level the spell
188 * is being cast at. 116 * is being cast at.
189 * Note that I changed the repelled/attuned bonus to 2 from 5. 117 * Note that I changed the repelled/attuned bonus to 2 from 5.
190 * This is because the new code compares casting_level against 118 * This is because the new code compares casting_level against
191 * min_caster_level, so the difference is effectively 4 119 * min_caster_level, so the difference is effectively 4
192 */ 120 */
193
194int 121int
195caster_level (object *caster, object *spell) 122caster_level (object *caster, object *spell)
196{ 123{
197 int level = caster->level; 124 int level = caster->level;
198 125
199 /* If this is a player, try to find the matching skill */ 126 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
200 if (caster->type == PLAYER && spell->skill) 127 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
128 {
129 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
130 int sk_level = skill ? skill->level : 1;
131
132 level = min (level, sk_level + level / 10 + 1);
133 }
134 else if (caster->type == PLAYER && spell->skill) /* If this is a player, try to find the matching skill */
201 for (int i = 0; i < NUM_SKILLS; i++) 135 for (int i = 0; i < NUM_SKILLS; i++)
202 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill) 136 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
203 { 137 {
204 level = caster->contr->last_skill_ob[i]->level; 138 level = caster->contr->last_skill_ob[i]->level;
205 break; 139 break;
206 } 140 }
207 141
208 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
209 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
210 {
211 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
212 int sk_level = skill ? skill->level : 1;
213
214 level = MIN (level, sk_level + level / 10 + 1);
215 }
216
217 /* Got valid caster level. Now adjust for attunement */ 142 /* Got valid caster level. Now adjust for attunement */
218 level += ((caster->path_repelled & spell->path_attuned) ? -2 : 0) + ((caster->path_attuned & spell->path_attuned) ? 2 : 0); 143 level += caster->path_repelled & spell->path_attuned ? -8 : 0;
144 level += caster->path_attuned & spell->path_attuned ? +8 : 0;
219 145
220 /* Always make this at least 1. If this is zero, we get divide by zero 146 /* Always make this at least 1. If this is zero, we get divide by zero
221 * errors in various places. 147 * errors in various places.
222 */ 148 */
223 if (level < 1)
224 level = 1;
225
226 return level; 149 return max (level, 1);
227} 150}
228 151
229/* The following function scales the spellpoint cost of 152/* The following function scales the spellpoint cost of
230 * a spell by it's increased effectiveness. Some of the 153 * a spell by it's increased effectiveness. Some of the
231 * lower level spells become incredibly vicious at high 154 * lower level spells become incredibly vicious at high
… …
270 else 193 else
271 { 194 {
272 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 195 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
273 if (spell->stats.sp && !sp) 196 if (spell->stats.sp && !sp)
274 sp = 1; 197 sp = 1;
198
275 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 199 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
276 if (spell->stats.grace && !grace) 200 if (spell->stats.grace && !grace)
277 grace = 1; 201 grace = 1;
278 } 202 }
203
279 if (flags == SPELL_HIGHEST) 204 if (flags == SPELL_HIGHEST)
280 return MAX (sp, grace); 205 return MAX (sp, grace);
281 else if (flags == SPELL_GRACE) 206 else if (flags == SPELL_GRACE)
282 return grace; 207 return grace;
283 else if (flags == SPELL_MANA) 208 else if (flags == SPELL_MANA)
… …
287 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags); 212 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
288 return 0; 213 return 0;
289 } 214 }
290} 215}
291 216
292
293/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 217/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
294 * spob is the spell we are adjusting. 218 * spob is the spell we are adjusting.
295 */ 219 */
296int 220int
297SP_level_dam_adjust (object *caster, object *spob) 221SP_level_dam_adjust (object *caster, object *spob)
298{ 222{
223 if (!spob->dam_modifier)
224 return 0;
225
299 int level = caster_level (caster, spob); 226 int level = caster_level (caster, spob);
300 int adj = level - min_casting_level (caster, spob); 227 return max (0, level - min_casting_level (caster, spob)) / spob->dam_modifier;
301
302 if (adj < 0)
303 adj = 0;
304 if (spob->dam_modifier)
305 adj /= spob->dam_modifier;
306 else
307 adj = 0;
308 return adj;
309} 228}
310 229
311/* Adjust the strength of the spell based on level. 230/* Adjust the strength of the spell based on level.
312 * This is basically the same as SP_level_dam_adjust above, 231 * This is basically the same as SP_level_dam_adjust above,
313 * but instead looks at the level_modifier value. 232 * but instead looks at the level_modifier value.
314 */ 233 */
315int 234int
316SP_level_duration_adjust (object *caster, object *spob) 235SP_level_duration_adjust (object *caster, object *spob)
317{ 236{
237 if (!spob->duration_modifier)
238 return 0;
239
318 int level = caster_level (caster, spob); 240 int level = caster_level (caster, spob);
319 int adj = level - min_casting_level (caster, spob); 241 return max (0, level - min_casting_level (caster, spob)) / spob->duration_modifier;
320
321 if (adj < 0)
322 adj = 0;
323 if (spob->duration_modifier)
324 adj /= spob->duration_modifier;
325 else
326 adj = 0;
327
328 return adj;
329} 242}
330 243
331/* Adjust the strength of the spell based on level. 244/* Adjust the strength of the spell based on level.
332 * This is basically the same as SP_level_dam_adjust above, 245 * This is basically the same as SP_level_dam_adjust above,
333 * but instead looks at the level_modifier value. 246 * but instead looks at the level_modifier value.
334 */ 247 */
335int 248int
336SP_level_range_adjust (object *caster, object *spob) 249SP_level_range_adjust (object *caster, object *spob)
337{ 250{
251 if (!spob->range_modifier)
252 return 0;
253
338 int level = caster_level (caster, spob); 254 int level = caster_level (caster, spob);
339 int adj = level - min_casting_level (caster, spob); 255 return (level - min_casting_level (caster, spob)) / spob->range_modifier;
340
341 if (adj < 0)
342 adj = 0;
343 if (spob->range_modifier)
344 adj /= spob->range_modifier;
345 else
346 adj = 0;
347
348 return adj;
349} 256}
350 257
351/* Checks to see if player knows the spell. If the name is the same 258/* Checks to see if player knows the spell. If the name is the same
352 * as an existing spell, we presume they know it. 259 * as an existing spell, we presume they know it.
353 * returns 1 if they know the spell, 0 if they don't. 260 * returns 1 if they know the spell, 0 if they don't.
354 */ 261 */
355object * 262object *
356check_spell_known (object *op, const char *name) 263check_spell_known (object *op, const char *name)
357{ 264{
358 object *spop; 265 object *spop;
266 shstr_cmp name_ (name);
359 267
360 for (spop = op->inv; spop; spop = spop->below) 268 for (spop = op->inv; spop; spop = spop->below)
361 if (spop->type == SPELL && !strcmp (spop->name, name)) 269 if (spop->type == SPELL && spop->name == name)
362 return spop; 270 return spop;
363 271
364 return NULL; 272 return 0;
365} 273}
366 274
367 275
368/* 276/*
369 * Look at object 'op' and see if they know the spell 277 * Look at object 'op' and see if they know the spell
… …
462 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 370 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
463 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 371 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
464 dir = 0; 372 dir = 0;
465 } 373 }
466 374
375 SET_FLAG (new_op, FLAG_IDENTIFIED);
467 op->map->insert (new_op, 376 op->map->insert (new_op,
468 op->x + freearr_x[dir], op->y + freearr_y[dir], 377 op->x + freearr_x[dir], op->y + freearr_y[dir],
469 op, 378 op,
470 dir ? 0 : INS_BELOW_ORIGINATOR); 379 dir ? 0 : INS_BELOW_ORIGINATOR);
471 380
… …
500 * resources, and may not work as well if a player is standing 409 * resources, and may not work as well if a player is standing
501 * on top of a counterwall spell (may hit the player before being 410 * on top of a counterwall spell (may hit the player before being
502 * removed.) On the other hand, it may be more dramatic for the 411 * removed.) On the other hand, it may be more dramatic for the
503 * spell to actually hit the counterwall and be sucked up. 412 * spell to actually hit the counterwall and be sucked up.
504 */ 413 */
505 if ((tmp->attacktype & AT_COUNTERSPELL) && 414 if ((tmp->attacktype & AT_COUNTERSPELL)
506 (tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) && 415 && !QUERY_FLAG (tmp, FLAG_MONSTER)
507 (tmp->type != WEAPON) && (tmp->type != BOW) && (tmp->type != ARROW) && (tmp->type != GOLEM) && (immune_stop & AT_MAGIC)) 416 && (tmp->type != PLAYER)
417 && (tmp->type != WEAPON)
418 && (tmp->type != BOW)
419 && (tmp->type != ARROW)
420 && (tmp->type != GOLEM)
421 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX:
422 // we special case floor here because there
423 // are sometimes spell effect floors
424 // which are used to inflict damage
425 // (and those shouldn't go away from
426 // sanctuary) see also: permanent lava
427 && (immune_stop & AT_MAGIC))
508 return 0; 428 return 0;
509 429
510 /* This is to prevent 'out of control' spells. Basically, this 430 /* This is to prevent 'out of control' spells. Basically, this
511 * limits one spell effect per space per spell. This is definately 431 * limits one spell effect per space per spell. This is definately
512 * needed for performance reasons, and just for playability I believe. 432 * needed for performance reasons, and just for playability I believe.
… …
519 /* 439 /*
520 * Combine similar spell effects into one spell effect. Needed for 440 * Combine similar spell effects into one spell effect. Needed for
521 * performance reasons with meteor swarm and the like, but also for 441 * performance reasons with meteor swarm and the like, but also for
522 * playability reasons. 442 * playability reasons.
523 */ 443 */
524 if (tmp->arch == op->arch 444 if (tmp->arch == op->arch /* no harm if not comparing by name here */
525 && tmp->type == op->type 445 && tmp->type == op->type
526 && tmp->subtype == op->subtype 446 && tmp->subtype == op->subtype
527 && tmp->owner == op->owner 447 && tmp->owner == op->owner
528 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) 448 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
529 { 449 {
… …
550 * dir: direction to fire in. 470 * dir: direction to fire in.
551 * spell: spell that is being fired. It uses other_arch for the archetype 471 * spell: spell that is being fired. It uses other_arch for the archetype
552 * to fire. 472 * to fire.
553 * returns 0 on failure, 1 on success. 473 * returns 0 on failure, 1 on success.
554 */ 474 */
555
556int 475int
557fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 476fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
558{ 477{
559 object *tmp;
560 int mflags;
561 maptile *m;
562
563 if (spell->other_arch == NULL) 478 if (!spell->other_arch)
564 return 0; 479 return 0;
565 480
566 m = op->map; 481 mapxy pos (op->map, x, y);//TODO, should not pass x, y
567 mflags = get_map_flags (m, &m, x, y, &x, &y);
568 if (mflags & P_OUT_OF_MAP)
569 {
570 return 0;
571 }
572 482
573 tmp = arch_to_object (spell->other_arch); 483 pos.move (dir ? dir : rndm (1, 8));
574 484
575 if (tmp == NULL) 485 if (!pos.normalise ())
576 return 0; 486 return 0;
577 487
578 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y))) 488 object *tmp = spell->other_arch->instance ();
489
490 if (!tmp)
491 return 0;
492
493 if (pos.ms ().blocks (tmp))
579 { 494 {
580 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n"); 495 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast this spell on top of a wall!\n");
581 tmp->destroy (); 496 tmp->destroy ();
582 return 0; 497 return 0;
583 } 498 }
584 499
585 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 500 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
… …
589 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 504 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
590 tmp->attacktype = spell->attacktype; 505 tmp->attacktype = spell->attacktype;
591 tmp->x = x; 506 tmp->x = x;
592 tmp->y = y; 507 tmp->y = y;
593 tmp->direction = dir; 508 tmp->direction = dir;
594 if (op->owner != NULL)
595 tmp->set_owner (op); 509 tmp->set_owner (op);
596 else
597 tmp->set_owner (op);
598 tmp->level = caster_level (caster, spell); 510 tmp->level = caster_level (caster, spell);
599 set_spell_skill (op, caster, spell, tmp); 511 set_spell_skill (op, caster, spell, tmp);
600 512
601 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 513 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
602 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 514 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
603 {
604 if (!tailor_god_spell (tmp, op)) 515 if (!tailor_god_spell (tmp, op))
605 return 0; 516 return 0;
606 } 517
607 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 518 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
608 SET_ANIMATION (tmp, dir); 519 SET_ANIMATION (tmp, dir);
609 520
610 if ((tmp = insert_ob_in_map (tmp, m, op, 0))) 521 if ((tmp = op->map->insert (tmp, x, y, op)))
611 move_spell_effect (tmp); 522 move_spell_effect (tmp);
612 523
613 return 1; 524 return 1;
614} 525}
615 526
… …
620 ****************************************************************************/ 531 ****************************************************************************/
621void 532void
622regenerate_rod (object *rod) 533regenerate_rod (object *rod)
623{ 534{
624 if (rod->stats.hp < rod->stats.maxhp) 535 if (rod->stats.hp < rod->stats.maxhp)
625 { 536 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
626 rod->stats.hp += 1 + rod->stats.maxhp / 10;
627
628 if (rod->stats.hp > rod->stats.maxhp)
629 rod->stats.hp = rod->stats.maxhp;
630 }
631} 537}
632
633 538
634void 539void
635drain_rod_charge (object *rod) 540drain_rod_charge (object *rod)
636{ 541{
637 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 542 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
638} 543}
639
640
641
642 544
643/* this function is commonly used to find a friendly target for 545/* this function is commonly used to find a friendly target for
644 * spells such as heal or protection or armour 546 * spells such as heal or protection or armour
645 * op is what is looking for the target (which can be a player), 547 * op is what is looking for the target (which can be a player),
646 * dir is the direction we are looking in. Return object found, or 548 * dir is the direction we are looking in. Return object found, or
647 * NULL if no good object. 549 * NULL if no good object.
648 */ 550 */
649
650object * 551object *
651find_target_for_friendly_spell (object *op, int dir) 552find_target_for_friendly_spell (object *op, int dir)
652{ 553{
653 object *tmp; 554 object *tmp;
654 maptile *m;
655 sint16 x, y;
656 int mflags;
657 555
658 /* I don't really get this block - if op isn't a player or rune, 556 /* I don't really get this block - if op isn't a player or rune,
659 * we then make the owner of this object the target. 557 * we then make the owner of this object the target.
660 * The owner could very well be no where near op. 558 * The owner could very well be no where near op.
661 */ 559 */
… …
668 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 566 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER))
669 tmp = op; 567 tmp = op;
670 } 568 }
671 else 569 else
672 { 570 {
673 m = op->map; 571 maptile *m = op->map;
674 x = op->x + freearr_x[dir]; 572 sint16 x = op->x + freearr_x[dir];
675 y = op->y + freearr_y[dir]; 573 sint16 y = op->y + freearr_y[dir];
676
677 mflags = get_map_flags (m, &m, x, y, &x, &y);
678
679 if (mflags & P_OUT_OF_MAP)
680 tmp = 0;
681 else 574
575 tmp = xy_normalise (m, x, y)
682 tmp = m->at (x, y).player (); 576 ? m->at (x, y).player ()
577 : 0;
683 } 578 }
684 579
685 /* didn't find a player there, look in current square for a player */ 580 /* didn't find a player there, look in current square for a player */
686 if (!tmp) 581 if (!tmp)
687 tmp = op->ms ().player (); 582 tmp = op->ms ().player ();
688 583
689 return tmp; 584 return tmp;
690} 585}
691
692
693 586
694/* raytrace: 587/* raytrace:
695 * spell_find_dir(map, x, y, exclude) will search first the center square 588 * spell_find_dir(map, x, y, exclude) will search first the center square
696 * then some close squares in the given map at the given coordinates for 589 * then some close squares in the given map at the given coordinates for
697 * live objects. 590 * live objects.
… …
700 * monsters/generators only. If not, the spell will hunt players only. 593 * monsters/generators only. If not, the spell will hunt players only.
701 * It returns the direction toward the first/closest live object if it finds 594 * It returns the direction toward the first/closest live object if it finds
702 * any, otherwise -1. 595 * any, otherwise -1.
703 * note that exclude can be NULL, in which case all bets are off. 596 * note that exclude can be NULL, in which case all bets are off.
704 */ 597 */
705
706int 598int
707spell_find_dir (maptile *m, int x, int y, object *exclude) 599spell_find_dir (maptile *m, int x, int y, object *exclude)
708{ 600{
709 int i, max = SIZEOFFREE; 601 int i, max = SIZEOFFREE;
710 sint16 nx, ny; 602 sint16 nx, ny;
… …
737 return freedir[i]; 629 return freedir[i];
738 } 630 }
739 return -1; /* flag for "keep going the way you were" */ 631 return -1; /* flag for "keep going the way you were" */
740} 632}
741 633
742
743
744/* put_a_monster: puts a monster named monstername near by 634/* put_a_monster: puts a monster named monstername near by
745 * op. This creates the treasures for the monsters, and 635 * op. This creates the treasures for the monsters, and
746 * also deals with multipart monsters properly. 636 * also deals with multipart monsters properly.
747 */ 637 */
748
749void 638void
750put_a_monster (object *op, const char *monstername) 639put_a_monster (object *op, const char *monstername)
751{ 640{
752 object *tmp, *head = NULL, *prev = NULL; 641 object *tmp, *head = NULL, *prev = NULL;
753 archetype *at; 642 archetype *at;
… …
760 649
761 /* find a free square nearby 650 /* find a free square nearby
762 * first we check the closest square for free squares 651 * first we check the closest square for free squares
763 */ 652 */
764 653
765 dir = find_first_free_spot (&at->clone, op->map, op->x, op->y); 654 dir = find_first_free_spot (at, op->map, op->x, op->y);
766 if (dir != -1) 655 if (dir != -1)
767 { 656 {
768 /* This is basically grabbed for generate monster. Fixed 971225 to 657 /* This is basically grabbed for generate monster. Fixed 971225 to
769 * insert multipart monsters properly 658 * insert multipart monsters properly
770 */ 659 */
660 //TODO: use expand_tail + ...
771 while (at != NULL) 661 while (at != NULL)
772 { 662 {
773 tmp = arch_to_object (at); 663 tmp = arch_to_object (at);
774 tmp->x = op->x + freearr_x[dir] + at->clone.x; 664 tmp->x = op->x + freearr_x[dir] + at->x;
775 tmp->y = op->y + freearr_y[dir] + at->clone.y; 665 tmp->y = op->y + freearr_y[dir] + at->y;
776 tmp->map = op->map; 666 tmp->map = op->map;
777 if (head) 667 if (head)
778 { 668 {
779 tmp->head = head; 669 tmp->head = head;
780 prev->more = tmp; 670 prev->more = tmp;
781 } 671 }
672
782 if (!head) 673 if (!head)
783 head = tmp; 674 head = tmp;
675
784 prev = tmp; 676 prev = tmp;
677
785 at = at->more; 678 at = (archetype *)at->more;
786 } 679 }
787 680
788 if (head->randomitems) 681 if (head->randomitems)
789 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 682 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
790 683
791 insert_ob_in_map (head, op->map, op, 0); 684 insert_ob_in_map (head, op->map, op, 0);
792 685
793 /* thought it'd be cool to insert a burnout, too. */ 686 /* thought it'd be cool to insert a burnout, too. */
794 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op); 687 op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
795 } 688 }
796} 689}
797 690
798/* peterm: function which summons hostile monsters and 691/* peterm: function which summons hostile monsters and
799 * places them in nearby squares. 692 * places them in nearby squares.
… …
826{ 719{
827 int attacktype; 720 int attacktype;
828 int face; 721 int face;
829} ATTACKS[22] = 722} ATTACKS[22] =
830{ 723{
831 {
832 AT_PHYSICAL, 0}, 724 { AT_PHYSICAL, 0},
833 {
834 AT_PHYSICAL, 0}, /*face = explosion */ 725 { AT_PHYSICAL, 0}, /*face = explosion */
835 {
836 AT_PHYSICAL, 0}, 726 { AT_PHYSICAL, 0},
837 {
838 AT_MAGIC, 1}, 727 { AT_MAGIC, 1},
839 {
840 AT_MAGIC, 1}, /* face = last-burnout */ 728 { AT_MAGIC, 1}, /* face = last-burnout */
841 {
842 AT_MAGIC, 1}, 729 { AT_MAGIC, 1},
843 {
844 AT_FIRE, 2}, 730 { AT_FIRE, 2},
845 {
846 AT_FIRE, 2}, /* face = fire.... */ 731 { AT_FIRE, 2}, /* face = fire.... */
847 {
848 AT_FIRE, 2}, 732 { AT_FIRE, 2},
849 {
850 AT_ELECTRICITY, 3}, 733 { AT_ELECTRICITY, 3},
851 {
852 AT_ELECTRICITY, 3}, /* ball_lightning */ 734 { AT_ELECTRICITY, 3}, /* ball_lightning */
853 {
854 AT_ELECTRICITY, 3}, 735 { AT_ELECTRICITY, 3},
855 {
856 AT_COLD, 4}, 736 { AT_COLD, 4},
857 {
858 AT_COLD, 4}, /* face=icestorm */ 737 { AT_COLD, 4}, /* face=icestorm */
859 {
860 AT_COLD, 4}, 738 { AT_COLD, 4},
861 {
862 AT_CONFUSION, 5}, 739 { AT_CONFUSION, 5},
863 {
864 AT_POISON, 7}, 740 { AT_POISON, 7},
865 {
866 AT_POISON, 7}, /* face = acid sphere. generator */ 741 { AT_POISON, 7}, /* face = acid sphere. generator */
867 {
868 AT_POISON, 7}, /* poisoncloud face */ 742 { AT_POISON, 7}, /* poisoncloud face */
869 {
870 AT_SLOW, 8}, 743 { AT_SLOW, 8},
871 {
872 AT_PARALYZE, 9}, 744 { AT_PARALYZE, 9},
873 {
874AT_FEAR, 10}}; 745 { AT_FEAR, 10},
875 746};
876
877 747
878/* shuffle_attack: peterm 748/* shuffle_attack: peterm
879 * This routine shuffles the attack of op to one of the 749 * This routine shuffles the attack of op to one of the
880 * ones in the list. It does this at random. It also 750 * ones in the list. It does this at random. It also
881 * chooses a face appropriate to the attack that is 751 * chooses a face appropriate to the attack that is
… …
1019 889
1020int 890int
1021cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 891cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1022{ 892{
1023 int success; 893 int success;
1024 player *pl;
1025 object *spell; 894 object *spell;
1026 895
1027 if (!spell_ob->other_arch) 896 if (!spell_ob->other_arch)
1028 { 897 {
1029 LOG (llevError, "cast_party_spell: empty other arch\n"); 898 LOG (llevError, "cast_party_spell: empty other arch\n");
1030 return 0; 899 return 0;
1031 } 900 }
901
1032 spell = arch_to_object (spell_ob->other_arch); 902 spell = arch_to_object (spell_ob->other_arch);
1033 903
1034 /* Always cast spell on caster */ 904 /* Always cast spell on caster */
1035 success = cast_spell (op, caster, dir, spell, stringarg); 905 success = cast_spell (op, caster, dir, spell, stringarg);
1036 906
1037 if (caster->contr->party == NULL) 907 if (caster->contr->party == NULL)
1038 { 908 {
1039 spell->remove (); 909 spell->remove ();
1040 return success; 910 return success;
1041 } 911 }
912
1042 for_all_players (pl) 913 for_all_players (pl)
1043 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 914 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1044 {
1045 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 915 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1046 } 916
1047 spell->remove (); 917 spell->remove ();
1048 return success; 918 return success;
1049} 919}
1050 920
1051/* This is where the main dispatch when someone casts a spell. 921/* This is where the main dispatch when someone casts a spell.
… …
1073 * 943 *
1074 * if it is a player casting the spell (op->type == PLAYER, op == caster), 944 * if it is a player casting the spell (op->type == PLAYER, op == caster),
1075 * this function will decrease the mana/grace appropriately. For other 945 * this function will decrease the mana/grace appropriately. For other
1076 * objects, the caller should do what it considers appropriate. 946 * objects, the caller should do what it considers appropriate.
1077 */ 947 */
1078
1079int 948int
1080cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 949cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1081{ 950{
1082 const char *godname; 951 const char *godname;
1083 int success = 0, mflags, cast_level = 0, old_shoottype; 952 int success = 0, cast_level = 0;
1084 object *skill = NULL; 953 object *skill = NULL;
1085
1086 old_shoottype = op->contr ? op->contr->shoottype : 0;
1087 954
1088 if (!spell_ob) 955 if (!spell_ob)
1089 { 956 {
1090 LOG (llevError, "cast_spell: null spell object passed\n"); 957 LOG (llevError, "cast_spell: null spell object passed\n");
1091 return 0; 958 return 0;
… …
1120 * at least process that code. 987 * at least process that code.
1121 */ 988 */
1122 if (op->type == PLAYER && op == caster) 989 if (op->type == PLAYER && op == caster)
1123 { 990 {
1124 cast_level = caster_level (caster, spell_ob); 991 cast_level = caster_level (caster, spell_ob);
992
1125 if (spell_ob->skill) 993 if (spell_ob->skill)
1126 { 994 {
1127 skill = find_skill_by_name (op, spell_ob->skill); 995 skill = find_skill_by_name (op, spell_ob->skill);
996
1128 if (!skill) 997 if (!skill)
1129 { 998 {
1130 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 999 op->failmsg (format ("You need the skill %s to cast %s! "
1000 "H<You either need to learn the skill via a skill scroll "
1001 "or you need to wear a talisman or holy symbol.>",
1002 &spell_ob->skill, &spell_ob->name));
1131 return 0; 1003 return 0;
1132 } 1004 }
1005
1006 int casting_level = min_casting_level (op, spell_ob);
1007
1133 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 1008 if (casting_level > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
1134 { 1009 {
1135 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 1010 op->failmsg (format ("You lack enough skill to cast that spell! "
1011 "H<Your cast level is %d, but level %d is required. Maybe you are repelled?>",
1012 cast_level, casting_level));
1136 return 0; 1013 return 0;
1137 } 1014 }
1138 } 1015 }
1016
1139 /* If the caster is the wiz, they don't ever fail, and don't have 1017 /* If the caster is the wiz, they don't ever fail, and don't have
1140 * to have sufficient grace/mana. 1018 * to have sufficient grace/mana.
1141 */ 1019 */
1142 if (!QUERY_FLAG (op, FLAG_WIZ)) 1020 if (!QUERY_FLAG (op, FLAG_WIZ))
1143 { 1021 {
1144 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1022 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1145 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1023 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1146 { 1024 {
1147 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1025 op->failmsg ("You don't have enough mana!");
1148 return 0; 1026 return 0;
1149 } 1027 }
1150 1028
1151 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1029 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1152 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1030 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1153 { 1031 {
1154 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1032 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1155 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1033 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1156 {
1157 new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname); 1034 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1158 }
1159 else 1035 else
1160 { 1036 {
1161 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1037 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1162 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1038 op->failmsg (format ("%s ignores your prayer.", godname));
1163 return 0; 1039 return 0;
1164 } 1040 }
1165 } 1041 }
1166 1042
1167 /* player/monster is trying to cast the spell. might fumble it */ 1043 /* player/monster is trying to cast the spell. might fumble it */
1168 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1044 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1169 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1045 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1170 { 1046 {
1171 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1047 op->contr->play_sound (sound_find ("fumble_spell"));
1172 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1048 op->failmsg ("You fumble the prayer.");
1173
1174 if (settings.casting_time == TRUE)
1175 op->casting_time = -1;
1176 1049
1177 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1050 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1178 return 0; 1051 return 0;
1179 } 1052 }
1180 else if (spell_ob->stats.sp) 1053 else if (spell_ob->stats.sp)
1181 { 1054 {
1182 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35; 1055 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1183 1056
1184 if (failure < 0) 1057 if (failure < 0)
1185 { 1058 {
1186 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1059 op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1187 if (settings.spell_failure_effects == TRUE) 1060 if (settings.spell_failure_effects == TRUE)
1188 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1061 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1189 op->contr->shoottype = (rangetype) old_shoottype; 1062
1190 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1063 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1191 return 0; 1064 return 0;
1192 } 1065 }
1193 } 1066 }
1194 } 1067 }
1195 } 1068 }
1196 1069
1197 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1070 int mflags = op->ms ().flags ();
1198 1071
1199 /* See if we can cast a spell here. If the caster and op are 1072 /* See if we can cast a spell here. If the caster and op are
1200 * not alive, then this would mean that the mapmaker put the 1073 * not alive, then this would mean that the mapmaker put the
1201 * objects on the space - presume that they know what they are 1074 * objects on the space - presume that they know what they are
1202 * doing. 1075 * doing.
1203 */ 1076 */
1204 1077
1205 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1078 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1206 { 1079 {
1207 new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!."); 1080 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1208 return 0; 1081 return 0;
1209 } 1082 }
1210 1083
1211 if ((spell_ob->type == SPELL) 1084 if ((spell_ob->type == SPELL)
1212 && (caster->type != POTION) 1085 && (caster->type != POTION)
… …
1217 { 1090 {
1218 if (op->type != PLAYER) 1091 if (op->type != PLAYER)
1219 return 0; 1092 return 0;
1220 1093
1221 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1094 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1222 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); 1095 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1223 else 1096 else if (object *item = op->contr->ranged_ob)
1224 switch (op->contr->shoottype)
1225 { 1097 {
1226 case range_magic: 1098 if (item->type == SPELL)
1227 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1099 op->failmsg ("Something blocks your spellcasting.");
1228 break; 1100 else if (item->type == SCROLL)
1229 case range_misc: 1101 op->failmsg ("Something blocks the magic of your scroll.");
1230 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1231 break;
1232 case range_golem:
1233 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
1234 break;
1235 default:
1236 break;
1237 }
1238 return 0;
1239 }
1240
1241 if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1242 {
1243 if (op->casting_time == -1)
1244 { /* begin the casting */
1245 op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1246 op->spell = spell_ob;
1247 /* put the stringarg into the object struct so that when the
1248 * spell is actually cast, it knows about the stringarg.
1249 * necessary for the invoke command spells.
1250 */
1251 if (stringarg)
1252 {
1253 op->spellarg = strdup (stringarg);
1254 }
1255 else 1102 else
1256 op->spellarg = NULL; 1103 op->failmsg ("Something blocks the magic of your item.");
1257 return 0;
1258 }
1259 else if (op->casting_time != 0)
1260 {
1261 if (op->type == PLAYER)
1262 new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1263 return 0;
1264 } 1104 }
1265 else 1105 else
1266 { /* casting_time == 0 */ 1106 op->failmsg ("Something blocks the spell!");
1267 op->casting_time = -1; 1107
1268 spell_ob = op->spell; 1108 return 0;
1269 stringarg = op->spellarg;
1270 }
1271 }
1272 else
1273 { 1109 }
1110
1274 /* Take into account how long it takes to cast the spell. 1111 /* Take into account how long it takes to cast the spell.
1275 * if the player is casting it, then we use the time in 1112 * if the player is casting it, then we use the time in
1276 * the spell object. If it is a spell object, have it 1113 * the spell object. If it is a spell object, have it
1277 * take two ticks. Things that cast spells on the players 1114 * take two ticks. Things that cast spells on the players
1278 * behalf (eg, altars, and whatever else) shouldn't cost 1115 * behalf (eg, altars, and whatever else) shouldn't cost
1279 * the player any time. 1116 * the player any time.
1280 * Ignore casting time for firewalls 1117 * Ignore casting time for firewalls
1118 */
1119 if (caster == op && caster->type != FIREWALL)
1120 {
1121 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1122 /* Other portions of the code may also decrement the speed of the player, so
1123 * put a lower limit so that the player isn't stuck here too long
1281 */ 1124 */
1282 if (caster == op && caster->type != FIREWALL)
1283 {
1284 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1285 /* Other portions of the code may also decrement the speed of the player, so
1286 * put a lower limit so that the player isn't stuck here too long
1287 */
1288 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1125 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
1289 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1126 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1290 } 1127 }
1291 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1128 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1292 {
1293 op->speed_left -= 2 * FABS (op->speed); 1129 op->speed_left -= 2 * FABS (op->speed);
1294 }
1295 }
1296 1130
1297 if (op->type == PLAYER && op == caster) 1131 if (op->type == PLAYER && op == caster)
1298 { 1132 {
1299 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1133 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1300 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1134 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1307 if (op != caster && !skill && caster->skill) 1141 if (op != caster && !skill && caster->skill)
1308 { 1142 {
1309 skill = find_skill_by_name (op, caster->skill); 1143 skill = find_skill_by_name (op, caster->skill);
1310 if (!skill) 1144 if (!skill)
1311 { 1145 {
1312 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1146 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1313 return 0; 1147 return 0;
1314 } 1148 }
1149
1315 change_skill (op, skill, 0); /* needed for proper exp credit */ 1150 op->change_skill (skill); /* needed for proper exp credit */
1316 } 1151 }
1152
1153 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1154 return RESULT_INT (0);
1317 1155
1318 switch (spell_ob->subtype) 1156 switch (spell_ob->subtype)
1319 { 1157 {
1320 /* The order of case statements is same as the order they show up 1158 /* The order of case statements is same as the order they show up
1321 * in in spells.h. 1159 * in in spells.h.
1322 */ 1160 */
1323 case SP_RAISE_DEAD: 1161 case SP_RAISE_DEAD:
1324 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1162 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1325 break; 1163 break;
1326 1164
1327 case SP_RUNE: 1165 case SP_RUNE:
… …
1355 case SP_SMITE: 1193 case SP_SMITE:
1356 success = cast_smite_spell (op, caster, dir, spell_ob); 1194 success = cast_smite_spell (op, caster, dir, spell_ob);
1357 break; 1195 break;
1358 1196
1359 case SP_MAGIC_MISSILE: 1197 case SP_MAGIC_MISSILE:
1360 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1198 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1361 break; 1199 break;
1362 1200
1363 case SP_SUMMON_GOLEM: 1201 case SP_SUMMON_GOLEM:
1364 success = summon_golem (op, caster, dir, spell_ob); 1202 success = summon_golem (op, caster, dir, spell_ob);
1365 old_shoottype = range_golem;
1366 break; 1203 break;
1367 1204
1368 case SP_DIMENSION_DOOR: 1205 case SP_DIMENSION_DOOR:
1369 /* dimension door needs the actual caster, because that is what is 1206 /* dimension door needs the actual caster, because that is what is
1370 * moved. 1207 * moved.
… …
1443#ifdef NO_POLYMORPH 1280#ifdef NO_POLYMORPH
1444 /* Not great, but at least provide feedback so if players do have 1281 /* Not great, but at least provide feedback so if players do have
1445 * polymorph (ie, find it as a preset item or left over from before 1282 * polymorph (ie, find it as a preset item or left over from before
1446 * it was disabled), they get some feedback. 1283 * it was disabled), they get some feedback.
1447 */ 1284 */
1448 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1285 op->failmsg ("The spell fizzles!");
1449 success = 0; 1286 success = 0;
1450#else 1287#else
1451 success = cast_polymorph (op, caster, spell_ob, dir); 1288 success = cast_polymorph (op, caster, spell_ob, dir);
1452#endif 1289#endif
1453 break; 1290 break;
… …
1473 break; 1310 break;
1474 1311
1475 case SP_MOVING_BALL: 1312 case SP_MOVING_BALL:
1476 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1313 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1477 { 1314 {
1478 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name); 1315 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1479 success = 0; 1316 success = 0;
1480 } 1317 }
1481 else 1318 else
1482 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1319 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1483 break; 1320 break;
1484 1321
1485 case SP_SWARM: 1322 case SP_SWARM:
1486 success = fire_swarm (op, caster, spell_ob, dir); 1323 success = fire_swarm (op, caster, spell_ob, dir);
1487 break; 1324 break;
… …
1503 success = cast_consecrate (op, caster, spell_ob); 1340 success = cast_consecrate (op, caster, spell_ob);
1504 break; 1341 break;
1505 1342
1506 case SP_ANIMATE_WEAPON: 1343 case SP_ANIMATE_WEAPON:
1507 success = animate_weapon (op, caster, spell_ob, dir); 1344 success = animate_weapon (op, caster, spell_ob, dir);
1508 old_shoottype = range_golem;
1509 break; 1345 break;
1510 1346
1511 case SP_LIGHT: 1347 case SP_LIGHT:
1512 success = cast_light (op, caster, spell_ob, dir); 1348 success = cast_light (op, caster, spell_ob, dir);
1513 break; 1349 break;
… …
1526 1362
1527 case SP_AURA: 1363 case SP_AURA:
1528 success = create_aura (op, caster, spell_ob); 1364 success = create_aura (op, caster, spell_ob);
1529 break; 1365 break;
1530 1366
1531 case SP_TOWN_PORTAL:
1532 success = cast_create_town_portal (op, caster, spell_ob, dir);
1533 break;
1534
1535 case SP_PARTY_SPELL: 1367 case SP_PARTY_SPELL:
1536 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1368 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1537 break; 1369 break;
1538 1370
1539 default: 1371 default:
1540 if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1541 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1372 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1542 }
1543
1544 /* FIXME - we need some better sound suppport */
1545 // yes, for example, augment map info with the spell effect
1546 // so clients can calculate the sounds themselves
1547 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1548
1549 /* free the spell arg */
1550 if (settings.casting_time == TRUE && stringarg)
1551 { 1373 }
1552 free (stringarg); 1374
1553 stringarg = NULL; 1375 op->play_sound (
1554 } 1376 success
1555 /* perhaps a bit of a hack, but if using a wand, it has to change the skill 1377 ? spell_ob->sound
1556 * to something like use_magic_item, but you really want to be able to fire 1378 ? spell_ob->sound
1557 * it again. 1379 : sound_find ("spell_success")
1558 */ 1380 : sound_find ("fumble_spell")
1559 if (op->contr) 1381 );
1560 op->contr->shoottype = (rangetype) old_shoottype;
1561 1382
1562 return success; 1383 return success;
1563} 1384}
1564 1385
1565
1566/* This is called from time.c/process_object(). That function 1386/* This is called from time.c/process_object(). That function
1567 * calls this for any SPELL_EFFECT type objects. This function 1387 * calls this for any SPELL_EFFECT type objects. This function
1568 * then dispatches them to the appropriate specific routines. 1388 * then dispatches them to the appropriate specific routines.
1569 */ 1389 */
1570void 1390void
1571move_spell_effect (object *op) 1391move_spell_effect (object *op)
1572{ 1392{
… …
1663 else if (victim->materialname) 1483 else if (victim->materialname)
1664 save_throw_object (victim, spell->attacktype, spell); 1484 save_throw_object (victim, spell->attacktype, spell);
1665 break; 1485 break;
1666 } 1486 }
1667} 1487}
1488

Diff Legend

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