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.83 by root, Mon Sep 29 11:52:34 2008 UTC vs.
Revision 1.125 by root, Mon Nov 12 03:48:34 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <spells.h> 26#include <spells.h>
… …
33/* This returns a random spell from 'ob'. If skill is set, then 34/* This returns a random spell from 'ob'. If skill is set, then
34 * the spell must be of this skill, it can be NULL in which case all 35 * the spell must be of this skill, it can be NULL in which case all
35 * matching spells are used. 36 * matching spells are used.
36 */ 37 */
37object * 38object *
38find_random_spell_in_ob (object *ob, const char *skill) 39find_random_spell_in_ob (object *ob, shstr_cmp skill)
39{ 40{
40 int k = 0, s; 41 int k = 0, s;
41 42
42 for (object *tmp = ob->inv; tmp; tmp = tmp->below) 43 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
43 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 44 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
… …
45 46
46 /* No spells, no need to progess further */ 47 /* No spells, no need to progess further */
47 if (!k) 48 if (!k)
48 return NULL; 49 return NULL;
49 50
50 s = RANDOM () % k; 51 s = rndm (k);
51 52
52 for (object *tmp = ob->inv; tmp; tmp = tmp->below) 53 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
53 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 54 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
54 if (!s) 55 if (!s)
55 return tmp; 56 return tmp;
… …
82 */ 83 */
83void 84void
84spell_effect (object *spob, int x, int y, maptile *map, object *originator) 85spell_effect (object *spob, int x, int y, maptile *map, object *originator)
85{ 86{
86 if (spob->other_arch) 87 if (spob->other_arch)
87 map->insert (arch_to_object (spob->other_arch), x, y, originator); 88 map->insert (spob->other_arch->instance (), x, y, originator);
88} 89}
89 90
90static int 91static int
91attuned_bonus (object *caster, object *spell, int level) 92attuned_bonus (object *caster, object *spell, int level)
92{ 93{
… …
126 level = lerp (level, (int)spell->level, 100, 1, 100); 127 level = lerp (level, (int)spell->level, 100, 1, 100);
127 128
128 /* Always make this at least 1. If this is zero, we get divide by zero 129 /* Always make this at least 1. If this is zero, we get divide by zero
129 * errors in various places. 130 * errors in various places.
130 */ 131 */
131 return max (level, 1); 132 return clamp (level, 1, settings.max_level);
132} 133}
133 134
134/* The following function scales the spellpoint cost of 135/* The following function scales the spellpoint cost of
135 * a spell by it's increased effectiveness. Some of the 136 * a spell by it's increased effectiveness. Some of the
136 * lower level spells become incredibly vicious at high 137 * lower level spells become incredibly vicious at high
… …
148 int sp, grace, level = casting_level (caster, spell); 149 int sp, grace, level = casting_level (caster, spell);
149 150
150 if (settings.spellpoint_level_depend == TRUE) 151 if (settings.spellpoint_level_depend == TRUE)
151 { 152 {
152 if (spell->stats.sp && spell->stats.maxsp) 153 if (spell->stats.sp && spell->stats.maxsp)
153 {
154 sp = (int) (spell->stats.sp * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxsp))); 154 sp = spell->stats.sp * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxsp));
155 }
156 else 155 else
157 sp = spell->stats.sp; 156 sp = spell->stats.sp;
158 157
159 sp *= (int) PATH_SP_MULT (caster, spell); 158 sp *= (int) PATH_SP_MULT (caster, spell);
160 if (!sp && spell->stats.sp) 159 if (!sp && spell->stats.sp)
161 sp = 1; 160 sp = 1;
162 161
163 if (spell->stats.grace && spell->stats.maxgrace) 162 if (spell->stats.grace && spell->stats.maxgrace)
164 {
165 grace = (int) (spell->stats.grace * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxgrace))); 163 grace = spell->stats.grace * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxgrace));
166 }
167 else 164 else
168 grace = spell->stats.grace; 165 grace = spell->stats.grace;
169 166
170 grace *= (int) PATH_SP_MULT (caster, spell); 167 grace *= PATH_SP_MULT (caster, spell);
171 if (spell->stats.grace && !grace) 168 if (spell->stats.grace && !grace)
172 grace = 1; 169 grace = 1;
173 } 170 }
174 else 171 else
175 { 172 {
… …
181 if (spell->stats.grace && !grace) 178 if (spell->stats.grace && !grace)
182 grace = 1; 179 grace = 1;
183 } 180 }
184 181
185 if (flags == SPELL_HIGHEST) 182 if (flags == SPELL_HIGHEST)
186 return MAX (sp, grace); 183 return max (sp, grace);
187 else if (flags == SPELL_GRACE) 184 else if (flags == SPELL_GRACE)
188 return grace; 185 return grace;
189 else if (flags == SPELL_MANA) 186 else if (flags == SPELL_MANA)
190 return sp; 187 return sp;
191 else 188 else
… …
247/* Checks to see if player knows the spell. If the name is the same 244/* Checks to see if player knows the spell. If the name is the same
248 * as an existing spell, we presume they know it. 245 * as an existing spell, we presume they know it.
249 * returns 1 if they know the spell, 0 if they don't. 246 * returns 1 if they know the spell, 0 if they don't.
250 */ 247 */
251object * 248object *
252check_spell_known (object *op, const char *name) 249check_spell_known (object *op, shstr_cmp name)
253{ 250{
254 object *spop; 251 object *spop;
255 shstr_cmp name_ (name);
256 252
257 for (spop = op->inv; spop; spop = spop->below) 253 for (spop = op->inv; spop; spop = spop->below)
258 if (spop->type == SPELL && spop->name == name) 254 if (spop->type == SPELL && spop->name == name)
259 return spop; 255 return spop;
260 256
… …
270 * exact match, we also return NULL. 266 * exact match, we also return NULL.
271 */ 267 */
272object * 268object *
273lookup_spell_by_name (object *op, const char *spname) 269lookup_spell_by_name (object *op, const char *spname)
274{ 270{
275 object *spob1 = NULL, *spob2 = NULL, *spob; 271 object *spob1 = 0, *spob2 = 0;
276 int nummatch = 0; 272 int nummatch = 0;
277 273
278 if (spname == NULL) 274 if (!spname)
279 return NULL; 275 return 0;
280 276
281 /* Try to find the spell. We store the results in spob1 277 /* Try to find the spell. We store the results in spob1
282 * and spob2 - spob1 is only taking the length of 278 * and spob2 - spob1 is only taking the length of
283 * the past spname, spob2 uses the length of the spell name. 279 * the past spname, spob2 uses the length of the spell name.
284 */ 280 */
285 for (spob = op->inv; spob; spob = spob->below) 281 for (object *spob = op->inv; spob; spob = spob->below)
286 { 282 {
287 if (spob->type == SPELL) 283 if (spob->type == SPELL)
288 { 284 {
285 // TODO: WTF?
289 if (!strncmp (spob->name, spname, strlen (spname))) 286 if (!strncmp (spob->name, spname, strlen (spname)))
290 { 287 {
291 nummatch++; 288 nummatch++;
292 spob1 = spob; 289 spob1 = spob;
293 } 290 }
… …
298 * fall into this category). It shouldn't be hard to 295 * fall into this category). It shouldn't be hard to
299 * make sure spell names don't overlap in that fashion. 296 * make sure spell names don't overlap in that fashion.
300 */ 297 */
301 if (spob2) 298 if (spob2)
302 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name); 299 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name);
300
303 spob2 = spob; 301 spob2 = spob;
304 } 302 }
305 } 303 }
306 } 304 }
307 /* if we have best match, return it. Otherwise, if we have one match 305 /* if we have best match, return it. Otherwise, if we have one match
308 * on the loser match, return that, otehrwise null 306 * on the loser match, return that, otehrwise null
309 */ 307 */
310 if (spob2) 308 if (spob2)
311 return spob2; 309 return spob2;
310
312 if (spob1 && nummatch == 1) 311 if (spob1 && nummatch == 1)
313 return spob1; 312 return spob1;
313
314 return NULL; 314 return NULL;
315} 315}
316 316
317/* reflwall - decides weither the (spell-)object sp_op will 317/* reflwall - decides weither the (spell-)object sp_op will
318 * be reflected from the given mapsquare. Returns 1 if true. 318 * be reflected from the given mapsquare. Returns 1 if true.
… …
326{ 326{
327 if (OUT_OF_REAL_MAP (m, x, y)) 327 if (OUT_OF_REAL_MAP (m, x, y))
328 return 0; 328 return 0;
329 329
330 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above) 330 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
331 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 331 if (op->flag [FLAG_REFL_SPELL]
332 && (!QUERY_FLAG (op, FLAG_ALIVE) 332 && (!op->flag [FLAG_ALIVE]
333 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 333 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
334 return 1; 334 return 1;
335 335
336 return 0; 336 return 0;
337} 337}
338 338
339/* cast_create_object: creates object new_op in direction dir 339/* cast_create_object: creates object new_op in direction dir
340 * or if that is blocked, beneath the player (op). 340 * or if that is blocked, beneath the player (op).
341 * we pass 'caster', but don't use it for anything. 341 * we pass 'caster', but don't use it for anything.
342 * This is really just a simple wrapper function . 342 * This is really just a simple wrapper function .
343 * returns the direction that the object was actually placed 343 * returns true to indicate whether the operation was successful.
344 * in. 344 * destroys the object is unsuccessful.
345 */ 345 */
346int 346bool
347cast_create_obj (object *op, object *caster, object *new_op, int dir) 347cast_create_obj (object *op, object *caster, object *new_op, int dir)
348{ 348{
349 maptile *m; 349 mapxy pos (op);
350 sint16 sx, sy; 350 pos.move (dir);
351 351
352 if (dir && 352 if (!pos.normalise ()
353 ((get_map_flags (op->map, &m, op->x + freearr_x[dir], op->y + freearr_y[dir], &sx, &sy) & P_OUT_OF_MAP) || 353 || pos->blocks (op) // perversely enough, we check if the palyer can reach that space
354 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))) 354 || !new_op->can_drop_at (pos.m, pos.x, pos.y)
355 { 355 )
356 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
357 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
358 dir = 0;
359 } 356 {
357 op->failmsg ("Your spell fizzles! H<Something is in the way.>");
358 new_op->destroy ();
359 return 0;
360 }
360 361
361 SET_FLAG (new_op, FLAG_IDENTIFIED); 362 new_op->set_flag (FLAG_IDENTIFIED);
362 op->map->insert (new_op,
363 op->x + freearr_x[dir], op->y + freearr_y[dir],
364 op,
365 dir ? 0 : INS_BELOW_ORIGINATOR);
366 363
364 pos.insert (new_op, op, dir ? 0 : INS_BELOW_ORIGINATOR);
365
367 return dir; 366 return 1;
367}
368
369static bool
370mergable_owner (object *o1, object *o2)
371{
372 if (o1 == o2)
373 return 1;
374
375 if (!o1 || !o2)
376 return 0;
377
378 if (o1->flag [FLAG_FRIENDLY] != o1->flag [FLAG_FRIENDLY])
379 return 0;
380
381 if (o1->is_player () || o2->is_player ())
382 return 0;
383
384 return 1;
368} 385}
369 386
370/* Returns true if it is ok to put spell *op on the space/may provided. 387/* Returns true if it is ok to put spell *op on the space/may provided.
371 * immune_stop is basically the attacktype of the spell (why 388 * immune_stop is basically the attacktype of the spell (why
372 * passed as a different value, not sure of). If immune_stop 389 * passed as a different value, not sure of). If immune_stop
373 * has the AT_MAGIC bit set, and there is a counterwall 390 * has the AT_MAGIC bit set, and there is a counterwall
374 * on the space, the object doesn't get placed. if immune stop 391 * on the space, the object doesn't get placed. if immune stop
375 * does not have AT_MAGIC, then counterwalls do not effect the spell. 392 * does not have AT_MAGIC, then counterwalls do not effect the spell.
376 *
377 */ 393 */
378int 394int
379ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 395ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
380{ 396{
381 if (!xy_normalise (m, x, y)) 397 if (!xy_normalise (m, x, y))
… …
385 ms.update (); 401 ms.update ();
386 402
387 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 403 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
388 return 0; 404 return 0;
389 405
406 int max_effects = 5; // max. number of similar spells per mapspace
407
390 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 408 for (object *tmp = ms.top; tmp; tmp = tmp->below)
391 { 409 {
392 /* If there is a counterspell on the space, and this 410 /* If there is a counterspell on the space, and this
393 * object is using magic, don't progress. I believe we could 411 * object is using magic, don't progress. I believe we could
394 * leave this out and let in progress, and other areas of the code 412 * leave this out and let in progress, and other areas of the code
395 * will then remove it, but that would seem to to use more 413 * will then remove it, but that would seem to to use more
… …
397 * on top of a counterwall spell (may hit the player before being 415 * on top of a counterwall spell (may hit the player before being
398 * removed.) On the other hand, it may be more dramatic for the 416 * removed.) On the other hand, it may be more dramatic for the
399 * spell to actually hit the counterwall and be sucked up. 417 * spell to actually hit the counterwall and be sucked up.
400 */ 418 */
401 if ((tmp->attacktype & AT_COUNTERSPELL) 419 if ((tmp->attacktype & AT_COUNTERSPELL)
402 && !QUERY_FLAG (tmp, FLAG_MONSTER) 420 && !tmp->flag [FLAG_MONSTER]
403 && (tmp->type != PLAYER) 421 && (tmp->type != PLAYER)
404 && (tmp->type != WEAPON) 422 && (tmp->type != WEAPON)
405 && (tmp->type != BOW) 423 && (tmp->type != BOW)
406 && (tmp->type != ARROW) 424 && (tmp->type != ARROW)
407 && (tmp->type != GOLEM) 425 && (tmp->type != GOLEM)
408 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX: 426 && !tmp->flag [FLAG_IS_FLOOR] // XXX:
409 // we special case floor here because there 427 // we special case floor here because there
410 // are sometimes spell effect floors 428 // are sometimes spell effect floors
411 // which are used to inflict damage 429 // which are used to inflict damage
412 // (and those shouldn't go away from 430 // (and those shouldn't go away from
413 // sanctuary) see also: permanent lava 431 // sanctuary) see also: permanent lava
414 && (immune_stop & AT_MAGIC)) 432 && (immune_stop & AT_MAGIC))
415 return 0; 433 return 0;
416 434
417 /* This is to prevent 'out of control' spells. Basically, this
418 * limits one spell effect per space per spell. This is definately
419 * needed for performance reasons, and just for playability I believe.
420 * there are no such things as multispaced spells right now, so
421 * we don't need to worry about the head.
422 */
423 if ((tmp->stats.maxhp == op->stats.maxhp) && (tmp->type == op->type) && (tmp->subtype == op->subtype))
424 return 0;
425
426 /*
427 * Combine similar spell effects into one spell effect. Needed for
428 * performance reasons with meteor swarm and the like, but also for
429 * playability reasons.
430 */
431 if (tmp->arch == op->arch /* no harm if not comparing by name here */
432 && tmp->type == op->type 435 if (tmp->type == op->type)
433 && tmp->subtype == op->subtype
434 && tmp->owner == op->owner
435 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
436 { 436 {
437 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 437 if (tmp->subtype == op->subtype
438 tmp->range = MAX (tmp->range, op->range); 438 && tmp->arch == op->arch /* no harm if not comparing by name here */)
439 tmp->duration = MAX (tmp->duration, op->duration); 439 {
440 /* This is to prevent 'out of control' spells. Basically, this
441 * limits one spell effect per space per spell. This is definately
442 * needed for performance reasons, and just for playability I believe.
443 * there are no such things as multispaced spells right now, so
444 * we don't need to worry about the head.
445 */
446 if (tmp->stats.maxhp == op->stats.maxhp)
447 return 0;
448
449 /*
450 * Combine similar spell effects into one spell effect. Needed for
451 * performance reasons with meteor swarm and the like, but also for
452 * playability reasons.
453 */
454 if (((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
455 if (mergable_owner (tmp, op))
456 {
457 // if same owner, then combine, but reduce advantage of multiple spells
458 max_it (tmp->stats.dam, op->stats.dam);
459 max_it (tmp->range , op->range);
460 max_it (tmp->duration , op->duration);
461 return 0;
462 }
463 }
464
465 // if there are too many spell effects on this space,
466 // then don't allow more of them, for performance reasons.
467 if (tmp->type == SPELL_EFFECT
468 && !--max_effects)
440 return 0; 469 return 0;
441 } 470 }
442 471
443 /* Perhaps we should also put checks in for no magic and unholy 472 /* Perhaps we should also put checks in for no magic and unholy
444 * ground to prevent it from moving along? 473 * ground to prevent it from moving along?
445 */ 474 */
… …
484 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 513 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
485 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 514 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
486 if (!tailor_god_spell (tmp, op)) 515 if (!tailor_god_spell (tmp, op))
487 return 0; 516 return 0;
488 517
489 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 518 if (tmp->flag [FLAG_IS_TURNABLE])
490 SET_ANIMATION (tmp, dir); 519 SET_ANIMATION (tmp, dir);
491 520
492 if ((tmp = op->map->insert (tmp, x, y, op))) 521 if ((tmp = op->map->insert (tmp, x, y, op)))
493 move_spell_effect (tmp); 522 move_spell_effect (tmp);
494 523
… …
502 ****************************************************************************/ 531 ****************************************************************************/
503void 532void
504regenerate_rod (object *rod) 533regenerate_rod (object *rod)
505{ 534{
506 if (rod->stats.hp < rod->stats.maxhp) 535 if (rod->stats.hp < rod->stats.maxhp)
507 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10); 536 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 20);
508} 537}
509 538
510void 539void
511drain_rod_charge (object *rod) 540drain_rod_charge (object *rod)
512{ 541{
… …
532 { 561 {
533 tmp = op->owner; 562 tmp = op->owner;
534 /* If the owner does not exist, or is not a monster, than apply the spell 563 /* If the owner does not exist, or is not a monster, than apply the spell
535 * to the caster. 564 * to the caster.
536 */ 565 */
537 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 566 if (!tmp || !tmp->flag [FLAG_MONSTER])
538 tmp = op; 567 tmp = op;
539 } 568 }
540 else 569 else
541 { 570 {
542 maptile *m = op->map; 571 maptile *m = op->map;
… …
590 continue; 619 continue;
591 620
592 tmp = GET_MAP_OB (mp, nx, ny); 621 tmp = GET_MAP_OB (mp, nx, ny);
593 622
594 while (tmp != NULL && (((owner_type == PLAYER && 623 while (tmp != NULL && (((owner_type == PLAYER &&
595 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 624 !tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_GENERATOR]) ||
596 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 625 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
597 tmp = tmp->above; 626 tmp = tmp->above;
598 627
599 if (tmp != NULL && can_see_monsterP (m, x, y, i)) 628 if (tmp != NULL && can_see_monsterP (m, x, y, i))
600 return freedir[i]; 629 return freedir[i];
… …
604 633
605/* put_a_monster: puts a monster named monstername near by 634/* put_a_monster: puts a monster named monstername near by
606 * op. This creates the treasures for the monsters, and 635 * op. This creates the treasures for the monsters, and
607 * also deals with multipart monsters properly. 636 * also deals with multipart monsters properly.
608 */ 637 */
609void 638static void
610put_a_monster (object *op, const char *monstername) 639put_a_monster (object *op, const char *monstername)
611{ 640{
612 object *tmp, *head = NULL, *prev = NULL; 641 object *tmp, *head = NULL, *prev = NULL;
613 archetype *at; 642 archetype *at;
614 int dir; 643 int dir;
… …
629 * insert multipart monsters properly 658 * insert multipart monsters properly
630 */ 659 */
631 //TODO: use expand_tail + ... 660 //TODO: use expand_tail + ...
632 while (at != NULL) 661 while (at != NULL)
633 { 662 {
634 tmp = arch_to_object (at); 663 tmp = at->instance ();
635 tmp->x = op->x + freearr_x[dir] + at->x; 664 tmp->x = op->x + freearr_x[dir] + at->x;
636 tmp->y = op->y + freearr_y[dir] + at->y; 665 tmp->y = op->y + freearr_y[dir] + at->y;
637 tmp->map = op->map; 666 tmp->map = op->map;
638 if (head) 667 if (head)
639 { 668 {
… …
670 * Note that this is not used by any spells (summon evil monsters 699 * Note that this is not used by any spells (summon evil monsters
671 * use to call this, but best I can tell, that spell/ability was 700 * use to call this, but best I can tell, that spell/ability was
672 * never used. This is however used by various failures on the 701 * never used. This is however used by various failures on the
673 * players part (alchemy, reincarnation, etc) 702 * players part (alchemy, reincarnation, etc)
674 */ 703 */
675
676int 704int
677summon_hostile_monsters (object *op, int n, const char *monstername) 705summon_hostile_monsters (object *op, int n, const char *monstername)
678{ 706{
679 int i; 707 int i;
680 708
… …
745 { 773 {
746 SET_ANIMATION (op, ATTACKS[i].face); 774 SET_ANIMATION (op, ATTACKS[i].face);
747 } 775 }
748} 776}
749 777
750
751/* prayer_failure: This is called when a player fails 778/* prayer_failure: This is called when a player fails
752 * at casting a prayer. 779 * at casting a prayer.
753 * op is the player. 780 * op is the player.
754 * failure is basically how much grace they had. 781 * failure is basically how much grace they had.
755 * power is how much grace the spell would normally take to cast. 782 * power is how much grace the spell would normally take to cast.
756 */ 783 */
757 784
758void 785#define HINT_GRACE " H<Make sure you always have enough grace points for your prayers.>"
786
787static void
759prayer_failure (object *op, int failure, int power) 788prayer_failure (object *op, int failure, int power)
760{ 789{
761 const char *godname; 790 const char *godname;
762 object *tmp; 791 object *tmp;
763 792
764 if (!strcmp ((godname = determine_god (op)), "none")) 793 if (!strcmp ((godname = determine_god (op)), "none"))
765 godname = "Your spirit"; 794 godname = "Your spirit";
766 795
767 if (failure <= -20 && failure > -40) /* wonder */ 796 if (failure <= -20 && failure > -40) /* wonder */
768 { 797 {
769 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); 798 op->failmsgf ("%s gives a sign to renew your faith." HINT_GRACE, godname);
770 tmp = get_archetype (SPELL_WONDER); 799 tmp = archetype::get (SPELL_WONDER);
771 cast_cone (op, op, 0, tmp); 800 cast_cone (op, op, 0, tmp);
772 tmp->destroy (); 801 tmp->destroy ();
773 } 802 }
774 803
775 else if (failure <= -40 && failure > -60) /* confusion */ 804 else if (failure <= -40 && failure > -60) /* confusion */
776 { 805 {
777 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); 806 op->failmsg ("Your diety touches your mind!" HINT_GRACE);
778 confuse_player (op, op, 99); 807 confuse_player (op, op, 99);
779 } 808 }
780 else if (failure <= -60 && failure > -150) /* paralysis */ 809 else if (failure <= -60 && failure > -150) /* paralysis */
781 { 810 {
782 new_draw_info_format (NDI_UNIQUE, 0, op, "%s requires you to pray NOW.", godname); 811 op->failmsgf ("%s requires you to pray NOW. "
783 new_draw_info (NDI_UNIQUE, 0, op, "You comply, ignoring all else."); 812 "You comply, ignoring all else." HINT_GRACE,
813 godname);
784 paralyze_player (op, op, 99); 814 paralyze_player (op, op, 99);
785 } 815 }
786 else if (failure <= -150) /* blast the immediate area */ 816 else if (failure <= -150) /* blast the immediate area */
787 { 817 {
788 tmp = get_archetype (GOD_POWER); 818 tmp = archetype::get (GOD_POWER);
789 new_draw_info_format (NDI_UNIQUE, 0, op, "%s smites you!", godname); 819 op->failmsgf ("%s smites you!" HINT_GRACE, godname);
790 cast_magic_storm (op, tmp, power); 820 cast_magic_storm (op, tmp, power);
791 } 821 }
792} 822}
793 823
794/* 824/*
795 * spell_failure() handles the various effects for differing degrees 825 * spell_failure() handles the various effects for differing degrees
796 * of failure badness. 826 * of failure badness.
797 * op is the player that failed. 827 * op is the player that failed.
798 * failure is a random value of how badly you failed. 828 * failure is a random value of how badly you failed.
799 * power is how many spellpoints you'd normally need for the spell. 829 * power is how many spellpoints you'd normally need for the spell.
800 * skill is the skill you'd need to cast the spell. 830 * skill is the skill you'd need to cast the spell.
801 */ 831 */
802
803void 832void
804spell_failure (object *op, int failure, int power, object *skill) 833spell_failure (object *op, int failure, int power, object *skill)
805{ 834{
806 object *tmp; 835 object *tmp;
807 836
808 if (settings.spell_failure_effects == FALSE) 837 if (settings.spell_failure_effects == FALSE)
809 return; 838 return;
810 839
811 if (failure <= -20 && failure > -40) /* wonder */ 840 if (failure <= -20 && failure > -40) /* wonder */
812 { 841 {
813 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); 842 op->failmsg ("Your spell causes an unexpected effect.");
814 tmp = get_archetype (SPELL_WONDER); 843 tmp = archetype::get (SPELL_WONDER);
815 cast_cone (op, op, 0, tmp); 844 cast_cone (op, op, 0, tmp);
816 tmp->destroy (); 845 tmp->destroy ();
817 } 846 }
818 847
819 else if (failure <= -40 && failure > -60) /* confusion */ 848 else if (failure <= -40 && failure > -60) /* confusion */
820 { 849 {
821 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); 850 op->failmsg ("Your magic recoils on you, making you confused!");
822 confuse_player (op, op, 99); 851 confuse_player (op, op, 99);
823 } 852 }
824 else if (failure <= -60 && failure > -80) /* paralysis */ 853 else if (failure <= -60 && failure > -80) /* paralysis */
825 { 854 {
826 new_draw_info (NDI_UNIQUE, 0, op, "Your magic stuns you!"); 855 op->failmsg ("Your magic stuns you!");
827 paralyze_player (op, op, 99); 856 paralyze_player (op, op, 99);
828 } 857 }
829 else if (failure <= -80) /* blast the immediate area */ 858 else if (failure <= -80) /* blast the immediate area */
830 { 859 {
831 object *tmp; 860 object *tmp;
832 861
833 /* Safety check to make sure we don't get any mana storms in scorn */ 862 /* Safety check to make sure we don't get any mana storms in scorn */
834 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC) 863 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)
835 { 864 {
836 new_draw_info (NDI_UNIQUE, 0, op, "The magic warps and you are turned inside out!"); 865 op->failmsg ("The magic warps and you are turned inside out!");
837 hit_player (op, 9998, op, AT_INTERNAL, 1); 866 hit_player (op, 9998, op, AT_INTERNAL, 1);
838 867
839 } 868 }
840 else 869 else
841 { 870 {
842 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 871 op->failmsg ("You lose control of the mana! The uncontrolled magic blasts you!");
843 tmp = get_archetype (LOOSE_MANA); 872 tmp = archetype::get (LOOSE_MANA);
844 tmp->level = skill->level; 873 tmp->level = skill->level;
845 874
846 /* increase the area of destruction a little for more powerful spells */ 875 /* increase the area of destruction a little for more powerful spells */
847 tmp->range += isqrt (power); 876 tmp->range += isqrt (power);
848 877
… …
856 tmp->insert_at (op); 885 tmp->insert_at (op);
857 } 886 }
858 } 887 }
859} 888}
860 889
861int 890static int
862cast_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 *spellparam)
863{ 892{
864 int success;
865 object *spell;
866
867 if (!spell_ob->other_arch) 893 if (!spell_ob->other_arch)
868 { 894 {
869 LOG (llevError, "cast_party_spell: empty other arch\n"); 895 LOG (llevError, "cast_party_spell: empty other arch\n");
870 return 0; 896 return 0;
871 } 897 }
872 898
873 spell = arch_to_object (spell_ob->other_arch); 899 object *spell = spell_ob->other_arch->instance ();
874 900
875 /* Always cast spell on caster */ 901 /* Always cast spell on caster */
876 success = cast_spell (op, caster, dir, spell, stringarg); 902 int success = cast_spell (op, caster, dir, spell, spellparam);
877 903
878 if (caster->contr->party == NULL) 904 if (!op->contr || !op->contr->party)
879 { 905 {
880 spell->remove (); 906 spell->remove ();
881 return success; 907 return success;
882 } 908 }
883 909
884 for_all_players (pl) 910 for_all_players (pl)
885 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 911 if ((pl->ob->contr->party == op->contr->party)
912 && on_same_map (pl->ob, op)
913 && pl->ob != op)
886 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 914 cast_spell (pl->ob, caster, pl->ob->facing, spell, spellparam);
887 915
888 spell->remove (); 916 spell->remove ();
889 return success; 917 return success;
890} 918}
891 919
… …
897 * same as op. 925 * same as op.
898 * dir is the direction to cast in. Note in some cases, if the spell 926 * dir is the direction to cast in. Note in some cases, if the spell
899 * is self only, dir really doesn't make a difference. 927 * is self only, dir really doesn't make a difference.
900 * spell_ob is the spell object that is being cast. From that, 928 * spell_ob is the spell object that is being cast. From that,
901 * we can determine what to do. 929 * we can determine what to do.
902 * stringarg is any options that are being used. It can be NULL. Almost 930 * spellparam is any options that are being used. It can be NULL. Almost
903 * certainly, only players will set it. It is basically used as optional 931 * certainly, only players will set it. It is basically used as optional
904 * parameters to a spell (eg, item to create, information for marking runes, 932 * parameters to a spell (eg, item to create, information for marking runes,
905 * etc. 933 * etc.
906 * returns 1 on successful cast, or 0 on error. These values should really 934 * returns 1 on successful cast, or 0 on error. These values should really
907 * be swapped, so that 0 is successful, and non zero is failure, with a code 935 * be swapped, so that 0 is successful, and non zero is failure, with a code
… …
915 * if it is a player casting the spell (op->type == PLAYER, op == caster), 943 * if it is a player casting the spell (op->type == PLAYER, op == caster),
916 * this function will decrease the mana/grace appropriately. For other 944 * this function will decrease the mana/grace appropriately. For other
917 * objects, the caller should do what it considers appropriate. 945 * objects, the caller should do what it considers appropriate.
918 */ 946 */
919int 947int
920cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 948cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
921{ 949{
922 const char *godname; 950 const char *godname;
923 int success = 0, cast_level = 0; 951 int success = 0;
924 object *skill = NULL; 952
953 // make sure spells always take a while, so a) we don't flood the
954 // user with messages and b) too many failures can be harmful (smiting).
955 op->speed_left -= 4 * op->speed; // ~0.5s on failure
925 956
926 if (!spell_ob) 957 if (!spell_ob)
927 { 958 {
928 LOG (llevError, "cast_spell: null spell object passed\n"); 959 LOG (llevError, "cast_spell: null spell object passed\n");
929 return 0; 960 return 0;
… …
940 } 971 }
941 972
942 /* if caster is a spell casting object, this normally shouldn't be 973 /* if caster is a spell casting object, this normally shouldn't be
943 * an issue, because they don't have any spellpaths set up. 974 * an issue, because they don't have any spellpaths set up.
944 */ 975 */
945 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST)) 976 if (caster->path_denied & spell_ob->path_attuned && !caster->flag [FLAG_WIZCAST])
946 { 977 {
947 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 978 op->failmsg ("That spell path is denied to you.");
948 return 0; 979 return 0;
949 } 980 }
981
982 object *skill = 0;
950 983
951 /* if it is a player casting the spell, and they are really casting it 984 /* if it is a player casting the spell, and they are really casting it
952 * (vs it coming from a wand, scroll, or whatever else), do some 985 * (vs it coming from a wand, scroll, or whatever else), do some
953 * checks. We let monsters do special things - eg, they 986 * checks. We let monsters do special things - eg, they
954 * don't need the skill, bypass level checks, etc. The monster function 987 * don't need the SKILL, BYpass level checks, etc. The monster function
955 * should take care of that. 988 * should take care of that.
956 * Remove the wiz check here and move it further down - some spells 989 * Remove the wiz check here and move it further down - some spells
957 * need to have the right skill pointer passed, so we need to 990 * need to have the right skill pointer passed, so we need to
958 * at least process that code. 991 * at least process that code.
959 */ 992 */
… …
963 { 996 {
964 skill = find_skill_by_name (op, spell_ob->skill); 997 skill = find_skill_by_name (op, spell_ob->skill);
965 998
966 if (!skill) 999 if (!skill)
967 { 1000 {
968 op->failmsg (format ("You need the skill %s to cast %s! " 1001 op->failmsgf ("You need the %s skill to cast %s! "
969 "H<You either need to learn the skill via a skill scroll " 1002 "H<You either need to learn the skill via a skill scroll "
970 "or you need to wear a talisman or holy symbol.>", 1003 "or you need to wear a talisman, holy symbol or another skill tool.>",
971 &spell_ob->skill, &spell_ob->name)); 1004 &spell_ob->skill, &spell_ob->name);
972 return 0; 1005 return 0;
973 } 1006 }
974 1007
975 const char *msg = ""; 1008 const char *msg = "";
976 1009
977 int caster_level = skill->level; 1010 int caster_level = skill->level;
978 1011
979 if (op->path_attuned & spell_ob->path_attuned) 1012 if (op->path_attuned & spell_ob->path_attuned)
980 { 1013 {
981 caster_level += min (cast_level * 2, ATTUNE_REPELL); 1014 caster_level += min (caster_level, ATTUNE_REPELL);
982 msg = " (attuned)"; 1015 msg = " (attuned)";
983 } 1016 }
984 1017
985 if (op->path_repelled & spell_ob->path_attuned) 1018 if (op->path_repelled & spell_ob->path_attuned)
986 { 1019 {
987 caster_level = ATTUNE_REPELL; // negative is ok 1020 caster_level -= ATTUNE_REPELL; // negative is ok
988 msg = " (repelled)"; 1021 msg = " (repelled)";
989 } 1022 }
990 1023
991 if (spell_ob->level > caster_level) 1024 if (spell_ob->level > caster_level)
992 { 1025 {
993 op->failmsg (format ("You lack enough skill to cast that spell! " 1026 op->failmsgf ("You lack enough skill to cast that spell! "
994 "H<Your effective cast level is %d%s, but level %d is required.>", 1027 "H<Your effective cast level is %d%s, but level %d is required.>",
995 caster_level, msg, spell_ob->level)); 1028 caster_level, msg, spell_ob->level);
996 if (!op->is_wiz ()) 1029 if (!op->is_wiz ())
997 return 0; 1030 return 0;
998 } 1031 }
999 } 1032 }
1000 1033
1001 /* If the caster is the wiz, they don't ever fail, and don't have 1034 /* If the caster is the wiz, they don't ever fail, and don't have
1002 * to have sufficient grace/mana. 1035 * to have sufficient grace/mana.
1003 */ 1036 */
1004 if (!QUERY_FLAG (op, FLAG_WIZ)) 1037 if (!op->flag [FLAG_WIZCAST])
1005 { 1038 {
1006 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1039 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1007 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1040 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1008 { 1041 {
1009 op->failmsg ("You don't have enough mana!"); 1042 op->failmsg ("You don't have enough mana!");
… …
1017 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1050 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1018 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname)); 1051 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1019 else 1052 else
1020 { 1053 {
1021 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1054 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1022 op->failmsg (format ("%s ignores your prayer.", godname)); 1055 op->failmsgf ("%s ignores your prayer.", godname);
1023 return 0; 1056 return 0;
1024 } 1057 }
1025 } 1058 }
1026 1059
1027 /* player/monster is trying to cast the spell. might fumble it */ 1060 /* player/monster is trying to cast the spell. might fumble it */
1028 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1061 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1029 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1062 (spell_ob->level / (float) max (1, op->level) * cleric_chance[op->stats.Wis]))
1030 { 1063 {
1031 op->contr->play_sound (sound_find ("fumble_spell")); 1064 op->contr->play_sound (sound_find ("fumble_spell"));
1032 op->failmsg ("You fumble the prayer."); 1065 op->failmsg ("You fumble the prayer.");
1033 1066
1034 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1067 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
… …
1057 * not alive, then this would mean that the mapmaker put the 1090 * not alive, then this would mean that the mapmaker put the
1058 * objects on the space - presume that they know what they are 1091 * objects on the space - presume that they know what they are
1059 * doing. 1092 * doing.
1060 */ 1093 */
1061 1094
1062 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1095 if ((mflags & P_SAFE) && !op->flag [FLAG_WIZCAST]) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1063 { 1096 {
1097 op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
1064 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!"); 1098 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1065 return 0; 1099 return 0;
1066 } 1100 }
1067 1101
1068 if ((spell_ob->type == SPELL) 1102 if ((spell_ob->type == SPELL)
1069 && (caster->type != POTION) 1103 && (caster->type != POTION)
1070 && !QUERY_FLAG (op, FLAG_WIZCAST) 1104 && !op->flag [FLAG_WIZCAST]
1071 && (QUERY_FLAG (caster, FLAG_ALIVE) 1105 && (caster->flag [FLAG_ALIVE]
1072 || QUERY_FLAG (op, FLAG_ALIVE)) 1106 || op->flag [FLAG_ALIVE])
1073 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace))) 1107 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)))
1074 { 1108 {
1075 if (op->type != PLAYER) 1109 if (op->type != PLAYER)
1076 return 0; 1110 return 0;
1077 1111
1078 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1112 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1079 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1113 op->failmsgf ("This ground is unholy! %s ignores you.", godname);
1080 else if (object *item = op->contr->ranged_ob) 1114 else if (object *item = op->contr->ranged_ob)
1081 { 1115 {
1082 if (item->type == SPELL) 1116 if (item->type == SPELL)
1083 op->failmsg ("Something blocks your spellcasting."); 1117 op->failmsg ("Something blocks your spellcasting.");
1084 else if (item->type == SCROLL) 1118 else if (item->type == SCROLL)
… …
1090 op->failmsg ("Something blocks the spell!"); 1124 op->failmsg ("Something blocks the spell!");
1091 1125
1092 return 0; 1126 return 0;
1093 } 1127 }
1094 1128
1129 // undo the flood protection from earlier
1130 op->speed_left += 4 * op->speed; // ~0.5s on failure
1131
1095 /* Take into account how long it takes to cast the spell. 1132 /* Take into account how long it takes to cast the spell.
1096 * if the player is casting it, then we use the time in 1133 * if the player is casting it, then we use the time in
1097 * the spell object. If it is a spell object, have it 1134 * the spell object. If it is a spell object, have it
1098 * take two ticks. Things that cast spells on the players 1135 * take two ticks. Things that cast spells on the players
1099 * behalf (eg, altars, and whatever else) shouldn't cost 1136 * behalf (eg, altars, and whatever else) shouldn't cost
1100 * the player any time. 1137 * the player any time.
1101 * Ignore casting time for firewalls 1138 * Ignore casting time for firewalls
1102 */ 1139 */
1103 if (caster == op && caster->type != FIREWALL) 1140 if (caster == op && caster->type != FIREWALL)
1104 { 1141 {
1105 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1142 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1106 /* Other portions of the code may also decrement the speed of the player, so 1143 /* Other portions of the code may also decrement the speed of the player, so
1107 * put a lower limit so that the player isn't stuck here too long 1144 * put a lower limit so that the player isn't stuck here too long
1108 */ 1145 */
1109 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1146 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed)
1110 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1147 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1111 } 1148 }
1112 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1149 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1113 op->speed_left -= 2 * FABS (op->speed); 1150 op->speed_left -= 2 * op->speed;
1114 1151
1115 if (op->type == PLAYER && op == caster) 1152 if (op->type == PLAYER && op == caster)
1116 { 1153 {
1117 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1154 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1118 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1155 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1123 * object requires. 1160 * object requires.
1124 */ 1161 */
1125 if (op != caster && !skill && caster->skill) 1162 if (op != caster && !skill && caster->skill)
1126 { 1163 {
1127 skill = find_skill_by_name (op, caster->skill); 1164 skill = find_skill_by_name (op, caster->skill);
1165
1128 if (!skill) 1166 if (!skill)
1129 { 1167 {
1130 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster))); 1168 op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
1131 return 0; 1169 return 0;
1132 } 1170 }
1133
1134 op->change_skill (skill); /* needed for proper exp credit */
1135 } 1171 }
1136 1172
1137 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg))) 1173 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
1138 return RESULT_INT (0); 1174 return RESULT_INT (0);
1139 1175
1176 // temporaroly replace chosen_skill by skill, we assume skill *could* be applied,
1177 // at least temporarily, which might not be true due to slot restrictions, but hey
1178 // invoke requires it basically.
1179
1180 object *chosen_skill = op->chosen_skill;
1181 op->chosen_skill = skill;
1182
1140 switch (spell_ob->subtype) 1183 switch (spell_ob->subtype)
1141 { 1184 {
1142 /* The order of case statements is same as the order they show up 1185 /* The order of case statements is same as the order they show up
1143 * in in spells.h. 1186 * in spells.h.
1144 */ 1187 */
1145 case SP_RAISE_DEAD: 1188 case SP_RAISE_DEAD:
1146 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1189 success = cast_raise_dead_spell (op, caster, spell_ob, dir, spellparam);
1147 break; 1190 break;
1148 1191
1149 case SP_RUNE: 1192 case SP_RUNE:
1150 success = write_rune (op, caster, spell_ob, dir, stringarg); 1193 success = write_rune (op, caster, spell_ob, dir, spellparam);
1151 break; 1194 break;
1152 1195
1153 case SP_MAKE_MARK: 1196 case SP_MAKE_MARK:
1154 success = write_mark (op, spell_ob, stringarg); 1197 success = write_mark (op, spell_ob, spellparam);
1155 break; 1198 break;
1156 1199
1157 case SP_BOLT: 1200 case SP_BOLT:
1158 success = fire_bolt (op, caster, dir, spell_ob, skill); 1201 success = fire_bolt (op, caster, dir, spell_ob, skill);
1159 break; 1202 break;
… …
1188 1231
1189 case SP_DIMENSION_DOOR: 1232 case SP_DIMENSION_DOOR:
1190 /* dimension door needs the actual caster, because that is what is 1233 /* dimension door needs the actual caster, because that is what is
1191 * moved. 1234 * moved.
1192 */ 1235 */
1193 success = dimension_door (op, caster, spell_ob, dir); 1236 success = dimension_door (op, caster, spell_ob, dir, spellparam);
1194 break; 1237 break;
1195 1238
1196 case SP_MAGIC_MAPPING: 1239 case SP_MAGIC_MAPPING:
1197 if (op->type == PLAYER) 1240 if (op->type == PLAYER)
1198 { 1241 {
… …
1231 case SP_HEALING: 1274 case SP_HEALING:
1232 success = cast_heal (op, caster, spell_ob, dir); 1275 success = cast_heal (op, caster, spell_ob, dir);
1233 break; 1276 break;
1234 1277
1235 case SP_CREATE_FOOD: 1278 case SP_CREATE_FOOD:
1236 success = cast_create_food (op, caster, spell_ob, dir, stringarg); 1279 success = cast_create_food (op, caster, spell_ob, dir, spellparam);
1237 break; 1280 break;
1238 1281
1239 case SP_EARTH_TO_DUST: 1282 case SP_EARTH_TO_DUST:
1240 success = cast_earth_to_dust (op, caster, spell_ob); 1283 success = cast_earth_to_dust (op, caster, spell_ob);
1241 break; 1284 break;
… …
1251 case SP_CURSE: 1294 case SP_CURSE:
1252 success = cast_curse (op, caster, spell_ob, dir); 1295 success = cast_curse (op, caster, spell_ob, dir);
1253 break; 1296 break;
1254 1297
1255 case SP_SUMMON_MONSTER: 1298 case SP_SUMMON_MONSTER:
1256 success = summon_object (op, caster, spell_ob, dir, stringarg); 1299 success = summon_object (op, caster, spell_ob, dir, spellparam);
1257 break; 1300 break;
1258 1301
1259 case SP_CHARGING: 1302 case SP_CHARGING:
1260 success = recharge (op, caster, spell_ob); 1303 success = recharge (op, caster, spell_ob);
1261 break; 1304 break;
… …
1294 break; 1337 break;
1295 1338
1296 case SP_MOVING_BALL: 1339 case SP_MOVING_BALL:
1297 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1340 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1298 { 1341 {
1299 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name)); 1342 op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
1300 success = 0; 1343 success = 0;
1301 } 1344 }
1302 else 1345 else
1303 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob); 1346 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1304 break; 1347 break;
… …
1315 /* in rune.c */ 1358 /* in rune.c */
1316 success = dispel_rune (op, caster, spell_ob, skill, dir); 1359 success = dispel_rune (op, caster, spell_ob, skill, dir);
1317 break; 1360 break;
1318 1361
1319 case SP_CREATE_MISSILE: 1362 case SP_CREATE_MISSILE:
1320 success = cast_create_missile (op, caster, spell_ob, dir, stringarg); 1363 success = cast_create_missile (op, caster, spell_ob, dir, spellparam);
1321 break; 1364 break;
1322 1365
1323 case SP_CONSECRATE: 1366 case SP_CONSECRATE:
1324 success = cast_consecrate (op, caster, spell_ob); 1367 success = cast_consecrate (op, caster, spell_ob);
1325 break; 1368 break;
… …
1347 case SP_AURA: 1390 case SP_AURA:
1348 success = create_aura (op, caster, spell_ob); 1391 success = create_aura (op, caster, spell_ob);
1349 break; 1392 break;
1350 1393
1351 case SP_PARTY_SPELL: 1394 case SP_PARTY_SPELL:
1352 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1395 success = cast_party_spell (op, caster, dir, spell_ob, spellparam);
1353 break; 1396 break;
1354 1397
1355 default: 1398 default:
1356 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1399 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1357 } 1400 }
1401
1402 // restore chosen_skill
1403 op->chosen_skill = chosen_skill;
1358 1404
1359 op->play_sound ( 1405 op->play_sound (
1360 success 1406 success
1361 ? spell_ob->sound 1407 ? spell_ob->sound
1362 ? spell_ob->sound 1408 ? spell_ob->sound
… …
1416 move_aura (op); 1462 move_aura (op);
1417 break; 1463 break;
1418 } 1464 }
1419} 1465}
1420 1466
1421/* this checks to see if something special should happen if
1422 * something runs into the object.
1423 */
1424void
1425check_spell_effect (object *op)
1426{
1427 switch (op->subtype)
1428 {
1429 case SP_BOLT:
1430 move_bolt (op);
1431 return;
1432
1433 case SP_BULLET:
1434 check_bullet (op);
1435 return;
1436 }
1437}
1438
1439/* This is called by move_apply. Basically, if someone 1467/* This is called by move_apply. Basically, if someone
1440 * moves onto a spell effect and the walk_on or fly_on flags 1468 * moves onto a spell effect and the walk_on or fly_on flags
1441 * are set, this is called. This should only be called for 1469 * are set, this is called. This should only be called for
1442 * objects of the appropriate type. 1470 * objects of the appropriate type.
1443 */ 1471 */
… …
1445apply_spell_effect (object *spell, object *victim) 1473apply_spell_effect (object *spell, object *victim)
1446{ 1474{
1447 switch (spell->subtype) 1475 switch (spell->subtype)
1448 { 1476 {
1449 case SP_CONE: 1477 case SP_CONE:
1450 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->speed && spell->attacktype) 1478 if (victim->flag [FLAG_ALIVE] && spell->has_active_speed () && spell->attacktype)
1451 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1479 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1452 break; 1480 break;
1453 1481
1454 case SP_MAGIC_MISSILE: 1482 case SP_MAGIC_MISSILE:
1455 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1483 if (victim->flag [FLAG_ALIVE])
1456 { 1484 {
1457 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1485 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1458 spell->destroy (); 1486 spell->destroy ();
1459 } 1487 }
1460 break; 1488 break;
1461 1489
1462 case SP_MOVING_BALL: 1490 case SP_MOVING_BALL:
1463 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1491 if (victim->flag [FLAG_ALIVE])
1464 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1492 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1465 else if (victim->materialname) 1493 else if (victim->material != MATERIAL_NULL)
1466 save_throw_object (victim, spell->attacktype, spell); 1494 save_throw_object (victim, spell->attacktype, spell);
1467 1495
1468 break; 1496 break;
1469 } 1497 }
1470} 1498}
1471 1499
1500/**
1501 * This function will let a fireball explode at the position of
1502 * the victim with a specific maximum level.
1503 */
1504void
1505create_exploding_ball_at (object *victim, int level)
1506{
1507 object *ball = archetype::get (EXPLODING_FIREBALL);
1508 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1509 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1510 ball->insert_at (victim);
1511}

Diff Legend

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