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.102 by root, Fri Nov 6 13:31:47 2009 UTC vs.
Revision 1.131 by root, Sat Nov 17 23:40:04 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <global.h> 26#include <global.h>
26#include <spells.h> 27#include <spells.h>
… …
83 */ 84 */
84void 85void
85spell_effect (object *spob, int x, int y, maptile *map, object *originator) 86spell_effect (object *spob, int x, int y, maptile *map, object *originator)
86{ 87{
87 if (spob->other_arch) 88 if (spob->other_arch)
88 map->insert (arch_to_object (spob->other_arch), x, y, originator); 89 map->insert (spob->other_arch->instance (), x, y, originator);
89} 90}
90 91
91static int 92static int
92attuned_bonus (object *caster, object *spell, int level) 93attuned_bonus (object *caster, object *spell, int level)
93{ 94{
… …
149 int sp, grace, level = casting_level (caster, spell); 150 int sp, grace, level = casting_level (caster, spell);
150 151
151 if (settings.spellpoint_level_depend == TRUE) 152 if (settings.spellpoint_level_depend == TRUE)
152 { 153 {
153 if (spell->stats.sp && spell->stats.maxsp) 154 if (spell->stats.sp && spell->stats.maxsp)
154 {
155 sp = (int) (spell->stats.sp * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxsp))); 155 sp = spell->stats.sp * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxsp));
156 }
157 else 156 else
158 sp = spell->stats.sp; 157 sp = spell->stats.sp;
159 158
160 sp *= (int) PATH_SP_MULT (caster, spell); 159 sp *= (int) PATH_SP_MULT (caster, spell);
161 if (!sp && spell->stats.sp) 160 if (!sp && spell->stats.sp)
162 sp = 1; 161 sp = 1;
163 162
164 if (spell->stats.grace && spell->stats.maxgrace) 163 if (spell->stats.grace && spell->stats.maxgrace)
165 {
166 grace = (int) (spell->stats.grace * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxgrace))); 164 grace = spell->stats.grace * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxgrace));
167 }
168 else 165 else
169 grace = spell->stats.grace; 166 grace = spell->stats.grace;
170 167
171 grace *= (int) PATH_SP_MULT (caster, spell); 168 grace *= PATH_SP_MULT (caster, spell);
172 if (spell->stats.grace && !grace) 169 if (spell->stats.grace && !grace)
173 grace = 1; 170 grace = 1;
174 } 171 }
175 else 172 else
176 { 173 {
… …
182 if (spell->stats.grace && !grace) 179 if (spell->stats.grace && !grace)
183 grace = 1; 180 grace = 1;
184 } 181 }
185 182
186 if (flags == SPELL_HIGHEST) 183 if (flags == SPELL_HIGHEST)
187 return MAX (sp, grace); 184 return max (sp, grace);
188 else if (flags == SPELL_GRACE) 185 else if (flags == SPELL_GRACE)
189 return grace; 186 return grace;
190 else if (flags == SPELL_MANA) 187 else if (flags == SPELL_MANA)
191 return sp; 188 return sp;
192 else 189 else
… …
259 return spop; 256 return spop;
260 257
261 return 0; 258 return 0;
262} 259}
263 260
264/* 261/*
265 * Look at object 'op' and see if they know the spell 262 * Look at object 'op' and see if they know the spell
266 * spname. This is pretty close to check_spell_known 263 * spname. This is pretty close to check_spell_known
267 * above, but it uses a looser matching mechanism. 264 * above, but it uses a looser matching mechanism.
268 * returns the matching spell object, or NULL. 265 * returns the matching spell object, or NULL.
269 * If we match multiple spells but don't get an 266 * If we match multiple spells but don't get an
270 * exact match, we also return NULL. 267 * exact match, we also return NULL.
271 */ 268 */
272object * 269object *
273lookup_spell_by_name (object *op, const char *spname) 270object::find_spell (const_utf8_string prefix) const
274{ 271{
275 object *spob1 = 0, *spob2 = 0; 272 if (shstr_cmp name = prefix)
276 int nummatch = 0; 273 {
277 274 // case 1, match spell name exactly
278 if (!spname)
279 return 0;
280
281 /* Try to find the spell. We store the results in spob1
282 * and spob2 - spob1 is only taking the length of
283 * the past spname, spob2 uses the length of the spell name.
284 */
285 for (object *spob = op->inv; spob; spob = spob->below) 275 for (object *spob = inv; spob; spob = spob->below)
276 if (spob->name == name && spob->type == SPELL)
277 return spob;
286 { 278 }
279 else
280 {
281 // case 2, match prefix
282 int len = strlen (prefix);
283
284 for (object *spob = inv; spob; spob = spob->below)
287 if (spob->type == SPELL) 285 if (spob->type == SPELL
288 { 286 && spob->name.length () < len
289 // TODO: WTF? 287 && prefix [spob->name.length ()] <= ' '
290 if (!strncmp (spob->name, spname, strlen (spname))) 288 && !memcmp (prefix, spob->name, spob->name.length ()))
291 {
292 nummatch++;
293 spob1 = spob;
294 }
295 else if (!strncmp (spob->name, spname, strlen (spob->name)))
296 {
297 /* if spells have ambiguous names, it makes matching
298 * really difficult. (eg, fire and fireball would
299 * fall into this category). It shouldn't be hard to
300 * make sure spell names don't overlap in that fashion.
301 */
302 if (spob2)
303 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name);
304
305 spob2 = spob;
306 }
307 }
308 }
309 /* if we have best match, return it. Otherwise, if we have one match
310 * on the loser match, return that, otehrwise null
311 */
312 if (spob2)
313 return spob2; 289 return spob;
290 }
314 291
315 if (spob1 && nummatch == 1)
316 return spob1;
317
318 return NULL; 292 return 0;
319} 293}
320 294
321/* reflwall - decides weither the (spell-)object sp_op will 295/* reflwall - decides weither the (spell-)object sp_op will
322 * be reflected from the given mapsquare. Returns 1 if true. 296 * be reflected from the given mapsquare. Returns 1 if true.
323 * (Note that for living creatures there is a small chance that 297 * (Note that for living creatures there is a small chance that
… …
330{ 304{
331 if (OUT_OF_REAL_MAP (m, x, y)) 305 if (OUT_OF_REAL_MAP (m, x, y))
332 return 0; 306 return 0;
333 307
334 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above) 308 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
335 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 309 if (op->flag [FLAG_REFL_SPELL]
336 && (!QUERY_FLAG (op, FLAG_ALIVE) 310 && (!op->flag [FLAG_ALIVE]
337 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 311 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
338 return 1; 312 return 1;
339 313
340 return 0; 314 return 0;
341} 315}
342 316
343/* cast_create_object: creates object new_op in direction dir 317/* cast_create_object: creates object new_op in direction dir
344 * or if that is blocked, beneath the player (op). 318 * or if that is blocked, beneath the player (op).
345 * we pass 'caster', but don't use it for anything. 319 * we pass 'caster', but don't use it for anything.
346 * This is really just a simple wrapper function . 320 * This is really just a simple wrapper function .
347 * returns the direction that the object was actually placed 321 * returns true to indicate whether the operation was successful.
348 * in. 322 * destroys the object is unsuccessful.
349 */ 323 */
350int 324bool
351cast_create_obj (object *op, object *caster, object *new_op, int dir) 325cast_create_obj (object *op, object *caster, object *new_op, int dir)
352{ 326{
353 maptile *m; 327 mapxy pos (op);
354 sint16 sx, sy; 328 pos.move (dir);
355 329
356 if (dir && 330 if (!pos.normalise ()
357 ((get_map_flags (op->map, &m, op->x + freearr_x[dir], op->y + freearr_y[dir], &sx, &sy) & P_OUT_OF_MAP) || 331 || pos->blocks (op) // perversely enough, we check if the palyer can reach that space
358 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))) 332 || !new_op->can_drop_at (pos.m, pos.x, pos.y)
359 { 333 )
360 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
361 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
362 dir = 0;
363 } 334 {
335 op->failmsg ("Your spell fizzles! H<Something is in the way.>");
336 new_op->destroy ();
337 return 0;
338 }
364 339
365 SET_FLAG (new_op, FLAG_IDENTIFIED); 340 new_op->set_flag (FLAG_IDENTIFIED);
366 op->map->insert (new_op,
367 op->x + freearr_x[dir], op->y + freearr_y[dir],
368 op,
369 dir ? 0 : INS_BELOW_ORIGINATOR);
370 341
342 pos.insert (new_op, op, dir ? 0 : INS_BELOW_ORIGINATOR);
343
371 return dir; 344 return 1;
372} 345}
373 346
374static bool 347static bool
375mergable_owner (object *o1, object *o2) 348mergable_owner (object *o1, object *o2)
376{ 349{
… …
390} 363}
391 364
392/* Returns true if it is ok to put spell *op on the space/may provided. 365/* Returns true if it is ok to put spell *op on the space/may provided.
393 * immune_stop is basically the attacktype of the spell (why 366 * immune_stop is basically the attacktype of the spell (why
394 * passed as a different value, not sure of). If immune_stop 367 * passed as a different value, not sure of). If immune_stop
395 * has the AT_MAGIC bit set, and there is a counterwall 368 * has the AT_MAGIC bit set, and there is a counterwall
396 * on the space, the object doesn't get placed. if immune stop 369 * on the space, the object doesn't get placed. if immune stop
397 * does not have AT_MAGIC, then counterwalls do not effect the spell. 370 * does not have AT_MAGIC, then counterwalls do not effect the spell.
398 */ 371 */
399int 372int
400ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 373ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
… …
408 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 381 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
409 return 0; 382 return 0;
410 383
411 int max_effects = 5; // max. number of similar spells per mapspace 384 int max_effects = 5; // max. number of similar spells per mapspace
412 385
413 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 386 for (object *tmp = ms.top; tmp; tmp = tmp->below)
414 { 387 {
415 /* If there is a counterspell on the space, and this 388 /* If there is a counterspell on the space, and this
416 * object is using magic, don't progress. I believe we could 389 * object is using magic, don't progress. I believe we could
417 * leave this out and let in progress, and other areas of the code 390 * leave this out and let in progress, and other areas of the code
418 * will then remove it, but that would seem to to use more 391 * will then remove it, but that would seem to to use more
… …
420 * on top of a counterwall spell (may hit the player before being 393 * on top of a counterwall spell (may hit the player before being
421 * removed.) On the other hand, it may be more dramatic for the 394 * removed.) On the other hand, it may be more dramatic for the
422 * spell to actually hit the counterwall and be sucked up. 395 * spell to actually hit the counterwall and be sucked up.
423 */ 396 */
424 if ((tmp->attacktype & AT_COUNTERSPELL) 397 if ((tmp->attacktype & AT_COUNTERSPELL)
425 && !QUERY_FLAG (tmp, FLAG_MONSTER) 398 && !tmp->flag [FLAG_MONSTER]
426 && (tmp->type != PLAYER) 399 && (tmp->type != PLAYER)
427 && (tmp->type != WEAPON) 400 && (tmp->type != WEAPON)
428 && (tmp->type != BOW) 401 && (tmp->type != BOW)
429 && (tmp->type != ARROW) 402 && (tmp->type != ARROW)
430 && (tmp->type != GOLEM) 403 && (tmp->type != GOLEM)
431 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX: 404 && !tmp->flag [FLAG_IS_FLOOR] // XXX:
432 // we special case floor here because there 405 // we special case floor here because there
433 // are sometimes spell effect floors 406 // are sometimes spell effect floors
434 // which are used to inflict damage 407 // which are used to inflict damage
435 // (and those shouldn't go away from 408 // (and those shouldn't go away from
436 // sanctuary) see also: permanent lava 409 // sanctuary) see also: permanent lava
… …
518 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 491 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
519 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 492 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
520 if (!tailor_god_spell (tmp, op)) 493 if (!tailor_god_spell (tmp, op))
521 return 0; 494 return 0;
522 495
523 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 496 if (tmp->flag [FLAG_IS_TURNABLE])
524 SET_ANIMATION (tmp, dir); 497 SET_ANIMATION (tmp, dir);
525 498
526 if ((tmp = op->map->insert (tmp, x, y, op))) 499 if ((tmp = op->map->insert (tmp, x, y, op)))
527 move_spell_effect (tmp); 500 move_spell_effect (tmp);
528 501
… …
536 ****************************************************************************/ 509 ****************************************************************************/
537void 510void
538regenerate_rod (object *rod) 511regenerate_rod (object *rod)
539{ 512{
540 if (rod->stats.hp < rod->stats.maxhp) 513 if (rod->stats.hp < rod->stats.maxhp)
541 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10); 514 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 20);
542} 515}
543 516
544void 517void
545drain_rod_charge (object *rod) 518drain_rod_charge (object *rod)
546{ 519{
… …
566 { 539 {
567 tmp = op->owner; 540 tmp = op->owner;
568 /* If the owner does not exist, or is not a monster, than apply the spell 541 /* If the owner does not exist, or is not a monster, than apply the spell
569 * to the caster. 542 * to the caster.
570 */ 543 */
571 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 544 if (!tmp || !tmp->flag [FLAG_MONSTER])
572 tmp = op; 545 tmp = op;
573 } 546 }
574 else 547 else
575 { 548 {
576 maptile *m = op->map; 549 maptile *m = op->map;
577 sint16 x = op->x + freearr_x[dir]; 550 sint16 x = op->x + DIRX (dir);
578 sint16 y = op->y + freearr_y[dir]; 551 sint16 y = op->y + DIRY (dir);
579 552
580 tmp = xy_normalise (m, x, y) 553 tmp = xy_normalise (m, x, y)
581 ? m->at (x, y).player () 554 ? m->at (x, y).player ()
582 : 0; 555 : 0;
583 } 556 }
… …
614 if (exclude && exclude->type) 587 if (exclude && exclude->type)
615 owner_type = exclude->type; 588 owner_type = exclude->type;
616 589
617 for (i = rndm (1, 8); i < max; i++) 590 for (i = rndm (1, 8); i < max; i++)
618 { 591 {
619 nx = x + freearr_x[i]; 592 nx = x + DIRX (i);
620 ny = y + freearr_y[i]; 593 ny = y + DIRY (i);
621 mp = m; 594 mp = m;
622 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 595 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
623 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) 596 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
624 continue; 597 continue;
625 598
626 tmp = GET_MAP_OB (mp, nx, ny); 599 tmp = GET_MAP_OB (mp, nx, ny);
627 600
628 while (tmp != NULL && (((owner_type == PLAYER && 601 while (tmp != NULL && (((owner_type == PLAYER &&
629 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 602 !tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_GENERATOR]) ||
630 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 603 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
631 tmp = tmp->above; 604 tmp = tmp->above;
632 605
633 if (tmp != NULL && can_see_monsterP (m, x, y, i)) 606 if (tmp != NULL && can_see_monsterP (m, x, y, i))
634 return freedir[i]; 607 return freedir[i];
… …
651 624
652 if ((at = archetype::find (monstername)) == NULL) 625 if ((at = archetype::find (monstername)) == NULL)
653 return; 626 return;
654 627
655 /* find a free square nearby 628 /* find a free square nearby
656 * first we check the closest square for free squares 629 * first we check the closest square for free squares
657 */ 630 */
658 631
659 dir = find_first_free_spot (at, op->map, op->x, op->y); 632 dir = find_first_free_spot (at, op->map, op->x, op->y);
660 if (dir != -1) 633 if (dir != -1)
661 { 634 {
… …
663 * insert multipart monsters properly 636 * insert multipart monsters properly
664 */ 637 */
665 //TODO: use expand_tail + ... 638 //TODO: use expand_tail + ...
666 while (at != NULL) 639 while (at != NULL)
667 { 640 {
668 tmp = arch_to_object (at); 641 tmp = at->instance ();
669 tmp->x = op->x + freearr_x[dir] + at->x; 642 tmp->x = op->x + DIRX (dir) + at->x;
670 tmp->y = op->y + freearr_y[dir] + at->y; 643 tmp->y = op->y + DIRY (dir) + at->y;
671 tmp->map = op->map; 644 tmp->map = op->map;
672 if (head) 645 if (head)
673 { 646 {
674 tmp->head = head; 647 tmp->head = head;
675 prev->more = tmp; 648 prev->more = tmp;
… …
687 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 660 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
688 661
689 insert_ob_in_map (head, op->map, op, 0); 662 insert_ob_in_map (head, op->map, op, 0);
690 663
691 /* thought it'd be cool to insert a burnout, too. */ 664 /* thought it'd be cool to insert a burnout, too. */
692 op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op); 665 op->map->insert (archetype::get (shstr_burnout), op->x + DIRX (dir), op->y + DIRY (dir), op);
693 } 666 }
694} 667}
695 668
696/* peterm: function which summons hostile monsters and 669/* peterm: function which summons hostile monsters and
697 * places them in nearby squares. 670 * places them in nearby squares.
… …
748 { AT_PARALYZE, 9}, 721 { AT_PARALYZE, 9},
749 { AT_FEAR, 10}, 722 { AT_FEAR, 10},
750}; 723};
751 724
752/* shuffle_attack: peterm 725/* shuffle_attack: peterm
753 * This routine shuffles the attack of op to one of the 726 * This routine shuffles the attack of op to one of the
754 * ones in the list. It does this at random. It also 727 * ones in the list. It does this at random. It also
755 * chooses a face appropriate to the attack that is 728 * chooses a face appropriate to the attack that is
756 * being committed by that square at the moment. 729 * being committed by that square at the moment.
757 * right now it's being used by color spray and create pool of 730 * right now it's being used by color spray and create pool of
758 * chaos. 731 * chaos.
759 * This could really be a better implementation - the 732 * This could really be a better implementation - the
760 * faces and attacktypes above are hardcoded, which is never 733 * faces and attacktypes above are hardcoded, which is never
761 * good. The faces refer to faces in the animation sequence. 734 * good. The faces refer to faces in the animation sequence.
… …
784 * at casting a prayer. 757 * at casting a prayer.
785 * op is the player. 758 * op is the player.
786 * failure is basically how much grace they had. 759 * failure is basically how much grace they had.
787 * power is how much grace the spell would normally take to cast. 760 * power is how much grace the spell would normally take to cast.
788 */ 761 */
762
763#define HINT_GRACE " H<Make sure you always have enough grace points for your prayers.>"
764
789static void 765static void
790prayer_failure (object *op, int failure, int power) 766prayer_failure (object *op, int failure, int power)
791{ 767{
792 const char *godname; 768 const char *godname;
793 object *tmp; 769 object *tmp;
… …
795 if (!strcmp ((godname = determine_god (op)), "none")) 771 if (!strcmp ((godname = determine_god (op)), "none"))
796 godname = "Your spirit"; 772 godname = "Your spirit";
797 773
798 if (failure <= -20 && failure > -40) /* wonder */ 774 if (failure <= -20 && failure > -40) /* wonder */
799 { 775 {
800 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); 776 op->failmsgf ("%s gives a sign to renew your faith." HINT_GRACE, godname);
801 tmp = get_archetype (SPELL_WONDER); 777 tmp = archetype::get (SPELL_WONDER);
802 cast_cone (op, op, 0, tmp); 778 cast_cone (op, op, 0, tmp);
803 tmp->destroy (); 779 tmp->destroy ();
804 } 780 }
805 781
806 else if (failure <= -40 && failure > -60) /* confusion */ 782 else if (failure <= -40 && failure > -60) /* confusion */
807 { 783 {
808 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); 784 op->failmsg ("Your diety touches your mind!" HINT_GRACE);
809 confuse_player (op, op, 99); 785 confuse_player (op, op, 99);
810 } 786 }
811 else if (failure <= -60 && failure > -150) /* paralysis */ 787 else if (failure <= -60 && failure > -150) /* paralysis */
812 { 788 {
813 new_draw_info_format (NDI_UNIQUE, 0, op, "%s requires you to pray NOW.", godname); 789 op->failmsgf ("%s requires you to pray NOW. "
814 new_draw_info (NDI_UNIQUE, 0, op, "You comply, ignoring all else."); 790 "You comply, ignoring all else." HINT_GRACE,
791 godname);
815 paralyze_player (op, op, 99); 792 paralyze_player (op, op, 99);
816 } 793 }
817 else if (failure <= -150) /* blast the immediate area */ 794 else if (failure <= -150) /* blast the immediate area */
818 { 795 {
819 tmp = get_archetype (GOD_POWER); 796 tmp = archetype::get (GOD_POWER);
820 new_draw_info_format (NDI_UNIQUE, 0, op, "%s smites you!", godname); 797 op->failmsgf ("%s smites you!" HINT_GRACE, godname);
821 cast_magic_storm (op, tmp, power); 798 cast_magic_storm (op, tmp, power);
822 } 799 }
823} 800}
824 801
825/* 802/*
826 * spell_failure() handles the various effects for differing degrees 803 * spell_failure() handles the various effects for differing degrees
827 * of failure badness. 804 * of failure badness.
828 * op is the player that failed. 805 * op is the player that failed.
829 * failure is a random value of how badly you failed. 806 * failure is a random value of how badly you failed.
830 * power is how many spellpoints you'd normally need for the spell. 807 * power is how many spellpoints you'd normally need for the spell.
831 * skill is the skill you'd need to cast the spell. 808 * skill is the skill you'd need to cast the spell.
832 */ 809 */
833
834void 810void
835spell_failure (object *op, int failure, int power, object *skill) 811spell_failure (object *op, int failure, int power, object *skill)
836{ 812{
837 object *tmp; 813 object *tmp;
838 814
839 if (settings.spell_failure_effects == FALSE) 815 if (settings.spell_failure_effects == FALSE)
840 return; 816 return;
841 817
842 if (failure <= -20 && failure > -40) /* wonder */ 818 if (failure <= -20 && failure > -40) /* wonder */
843 { 819 {
844 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); 820 op->failmsg ("Your spell causes an unexpected effect.");
845 tmp = get_archetype (SPELL_WONDER); 821 tmp = archetype::get (SPELL_WONDER);
846 cast_cone (op, op, 0, tmp); 822 cast_cone (op, op, 0, tmp);
847 tmp->destroy (); 823 tmp->destroy ();
848 } 824 }
849 825
850 else if (failure <= -40 && failure > -60) /* confusion */ 826 else if (failure <= -40 && failure > -60) /* confusion */
851 { 827 {
852 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); 828 op->failmsg ("Your magic recoils on you, making you confused!");
853 confuse_player (op, op, 99); 829 confuse_player (op, op, 99);
854 } 830 }
855 else if (failure <= -60 && failure > -80) /* paralysis */ 831 else if (failure <= -60 && failure > -80) /* paralysis */
856 { 832 {
857 new_draw_info (NDI_UNIQUE, 0, op, "Your magic stuns you!"); 833 op->failmsg ("Your magic stuns you!");
858 paralyze_player (op, op, 99); 834 paralyze_player (op, op, 99);
859 } 835 }
860 else if (failure <= -80) /* blast the immediate area */ 836 else if (failure <= -80) /* blast the immediate area */
861 { 837 {
862 object *tmp; 838 object *tmp;
863 839
864 /* Safety check to make sure we don't get any mana storms in scorn */ 840 /* Safety check to make sure we don't get any mana storms in scorn */
865 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC) 841 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)
866 { 842 {
867 new_draw_info (NDI_UNIQUE, 0, op, "The magic warps and you are turned inside out!"); 843 op->failmsg ("The magic warps and you are turned inside out!");
868 hit_player (op, 9998, op, AT_INTERNAL, 1); 844 hit_player (op, 9998, op, AT_INTERNAL, 1);
869 845
870 } 846 }
871 else 847 else
872 { 848 {
873 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 849 op->failmsg ("You lose control of the mana! The uncontrolled magic blasts you!");
874 tmp = get_archetype (LOOSE_MANA); 850 tmp = archetype::get (LOOSE_MANA);
875 tmp->level = skill->level; 851 tmp->level = skill->level;
876 852
877 /* increase the area of destruction a little for more powerful spells */ 853 /* increase the area of destruction a little for more powerful spells */
878 tmp->range += isqrt (power); 854 tmp->range += isqrt (power);
879 855
… …
896 { 872 {
897 LOG (llevError, "cast_party_spell: empty other arch\n"); 873 LOG (llevError, "cast_party_spell: empty other arch\n");
898 return 0; 874 return 0;
899 } 875 }
900 876
901 object *spell = arch_to_object (spell_ob->other_arch); 877 object *spell = spell_ob->other_arch->instance ();
902 878
903 /* Always cast spell on caster */ 879 /* Always cast spell on caster */
904 int success = cast_spell (op, caster, dir, spell, spellparam); 880 int success = cast_spell (op, caster, dir, spell, spellparam);
905 881
906 if (!op->contr || !op->contr->party) 882 if (!op->contr || !op->contr->party)
… …
949int 925int
950cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam) 926cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
951{ 927{
952 const char *godname; 928 const char *godname;
953 int success = 0; 929 int success = 0;
954 object *skill = NULL; 930
931 // make sure spells always take a while, so a) we don't flood the
932 // user with messages and b) too many failures can be harmful (smiting).
933 op->speed_left -= 4 * op->speed; // ~0.5s on failure
955 934
956 if (!spell_ob) 935 if (!spell_ob)
957 { 936 {
958 LOG (llevError, "cast_spell: null spell object passed\n"); 937 LOG (llevError, "cast_spell: null spell object passed\n");
959 return 0; 938 return 0;
… …
967 { 946 {
968 LOG (llevError, "cast_spell: null caster object passed\n"); 947 LOG (llevError, "cast_spell: null caster object passed\n");
969 return 0; 948 return 0;
970 } 949 }
971 950
972 /* if caster is a spell casting object, this normally shouldn't be 951 /* if caster is a spell casting object, this normally shouldn't be
973 * an issue, because they don't have any spellpaths set up. 952 * an issue, because they don't have any spellpaths set up.
974 */ 953 */
975 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST)) 954 if (caster->path_denied & spell_ob->path_attuned && !caster->flag [FLAG_WIZCAST])
976 { 955 {
977 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 956 op->failmsg ("That spell path is denied to you.");
978 return 0; 957 return 0;
979 } 958 }
980 959
960 object *skill = 0;
961
981 /* if it is a player casting the spell, and they are really casting it 962 /* if it is a player casting the spell, and they are really casting it
982 * (vs it coming from a wand, scroll, or whatever else), do some 963 * (vs it coming from a wand, scroll, or whatever else), do some
983 * checks. We let monsters do special things - eg, they 964 * checks. We let monsters do special things - eg, they
984 * don't need the skill, bypass level checks, etc. The monster function 965 * don't need the SKILL, BYpass level checks, etc. The monster function
985 * should take care of that. 966 * should take care of that.
986 * Remove the wiz check here and move it further down - some spells 967 * Remove the wiz check here and move it further down - some spells
987 * need to have the right skill pointer passed, so we need to 968 * need to have the right skill pointer passed, so we need to
988 * at least process that code. 969 * at least process that code.
989 */ 970 */
… …
993 { 974 {
994 skill = find_skill_by_name (op, spell_ob->skill); 975 skill = find_skill_by_name (op, spell_ob->skill);
995 976
996 if (!skill) 977 if (!skill)
997 { 978 {
998 op->failmsg (format ("You need the skill %s to cast %s! " 979 op->failmsgf ("You need the %s skill to cast %s! "
999 "H<You either need to learn the skill via a skill scroll " 980 "H<You either need to learn the skill via a skill scroll "
1000 "or you need to wear a talisman or holy symbol.>", 981 "or you need to wear a talisman, holy symbol or another skill tool.>",
1001 &spell_ob->skill, &spell_ob->name)); 982 &spell_ob->skill, &spell_ob->name);
1002 return 0; 983 return 0;
1003 } 984 }
1004 985
1005 const char *msg = ""; 986 const char *msg = "";
1006 987
1007 int caster_level = skill->level; 988 int caster_level = skill->level;
… …
1018 msg = " (repelled)"; 999 msg = " (repelled)";
1019 } 1000 }
1020 1001
1021 if (spell_ob->level > caster_level) 1002 if (spell_ob->level > caster_level)
1022 { 1003 {
1023 op->failmsg (format ("You lack enough skill to cast that spell! " 1004 op->failmsgf ("You lack enough skill to cast that spell! "
1024 "H<Your effective cast level is %d%s, but level %d is required.>", 1005 "H<Your effective cast level is %d%s, but level %d is required.>",
1025 caster_level, msg, spell_ob->level)); 1006 caster_level, msg, spell_ob->level);
1026 if (!op->is_wiz ()) 1007 if (!op->is_wiz ())
1027 return 0; 1008 return 0;
1028 } 1009 }
1029 } 1010 }
1030 1011
1031 /* If the caster is the wiz, they don't ever fail, and don't have 1012 /* If the caster is the wiz, they don't ever fail, and don't have
1032 * to have sufficient grace/mana. 1013 * to have sufficient grace/mana.
1033 */ 1014 */
1034 if (!QUERY_FLAG (op, FLAG_WIZCAST)) 1015 if (!op->flag [FLAG_WIZCAST])
1035 { 1016 {
1036 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1017 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1037 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1018 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1038 { 1019 {
1039 op->failmsg ("You don't have enough mana!"); 1020 op->failmsg ("You don't have enough mana!");
… …
1047 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1028 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1048 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname)); 1029 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1049 else 1030 else
1050 { 1031 {
1051 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1032 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1052 op->failmsg (format ("%s ignores your prayer.", godname)); 1033 op->failmsgf ("%s ignores your prayer.", godname);
1053 return 0; 1034 return 0;
1054 } 1035 }
1055 } 1036 }
1056 1037
1057 /* player/monster is trying to cast the spell. might fumble it */ 1038 /* player/monster is trying to cast the spell. might fumble it */
1058 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1039 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1059 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1040 (spell_ob->level / (float) max (1, op->level) * cleric_chance[op->stats.Wis]))
1060 { 1041 {
1061 op->contr->play_sound (sound_find ("fumble_spell")); 1042 op->contr->play_sound (sound_find ("fumble_spell"));
1062 op->failmsg ("You fumble the prayer."); 1043 op->failmsg ("You fumble the prayer.");
1063 1044
1064 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1045 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
… …
1087 * not alive, then this would mean that the mapmaker put the 1068 * not alive, then this would mean that the mapmaker put the
1088 * objects on the space - presume that they know what they are 1069 * objects on the space - presume that they know what they are
1089 * doing. 1070 * doing.
1090 */ 1071 */
1091 1072
1092 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1073 if ((mflags & P_SAFE) && !op->flag [FLAG_WIZCAST]) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1093 { 1074 {
1075 op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
1094 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!"); 1076 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1095 return 0; 1077 return 0;
1096 } 1078 }
1097 1079
1098 if ((spell_ob->type == SPELL) 1080 if ((spell_ob->type == SPELL)
1099 && (caster->type != POTION) 1081 && (caster->type != POTION)
1100 && !QUERY_FLAG (op, FLAG_WIZCAST) 1082 && !op->flag [FLAG_WIZCAST]
1101 && (QUERY_FLAG (caster, FLAG_ALIVE) 1083 && (caster->flag [FLAG_ALIVE]
1102 || QUERY_FLAG (op, FLAG_ALIVE)) 1084 || op->flag [FLAG_ALIVE])
1103 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace))) 1085 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)))
1104 { 1086 {
1105 if (op->type != PLAYER) 1087 if (op->type != PLAYER)
1106 return 0; 1088 return 0;
1107 1089
1108 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1090 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1109 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1091 op->failmsgf ("This ground is unholy! %s ignores you.", godname);
1110 else if (object *item = op->contr->ranged_ob) 1092 else if (object *item = op->contr->ranged_ob)
1111 { 1093 {
1112 if (item->type == SPELL) 1094 if (item->type == SPELL)
1113 op->failmsg ("Something blocks your spellcasting."); 1095 op->failmsg ("Something blocks your spellcasting.");
1114 else if (item->type == SCROLL) 1096 else if (item->type == SCROLL)
… …
1120 op->failmsg ("Something blocks the spell!"); 1102 op->failmsg ("Something blocks the spell!");
1121 1103
1122 return 0; 1104 return 0;
1123 } 1105 }
1124 1106
1107 // undo the flood protection from earlier
1108 op->speed_left += 4 * op->speed; // ~0.5s on failure
1109
1125 /* Take into account how long it takes to cast the spell. 1110 /* Take into account how long it takes to cast the spell.
1126 * if the player is casting it, then we use the time in 1111 * if the player is casting it, then we use the time in
1127 * the spell object. If it is a spell object, have it 1112 * the spell object. If it is a spell object, have it
1128 * take two ticks. Things that cast spells on the players 1113 * take two ticks. Things that cast spells on the players
1129 * behalf (eg, altars, and whatever else) shouldn't cost 1114 * behalf (eg, altars, and whatever else) shouldn't cost
1130 * the player any time. 1115 * the player any time.
1131 * Ignore casting time for firewalls 1116 * Ignore casting time for firewalls
1132 */ 1117 */
1133 if (caster == op && caster->type != FIREWALL) 1118 if (caster == op && caster->type != FIREWALL)
1134 { 1119 {
1135 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1120 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1136 /* Other portions of the code may also decrement the speed of the player, so 1121 /* Other portions of the code may also decrement the speed of the player, so
1137 * put a lower limit so that the player isn't stuck here too long 1122 * put a lower limit so that the player isn't stuck here too long
1138 */ 1123 */
1139 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1124 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed)
1140 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1125 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1141 } 1126 }
1142 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1127 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1143 op->speed_left -= 2 * FABS (op->speed); 1128 op->speed_left -= 2 * op->speed;
1144 1129
1145 if (op->type == PLAYER && op == caster) 1130 if (op->type == PLAYER && op == caster)
1146 { 1131 {
1147 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1132 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1148 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1133 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1153 * object requires. 1138 * object requires.
1154 */ 1139 */
1155 if (op != caster && !skill && caster->skill) 1140 if (op != caster && !skill && caster->skill)
1156 { 1141 {
1157 skill = find_skill_by_name (op, caster->skill); 1142 skill = find_skill_by_name (op, caster->skill);
1143
1158 if (!skill) 1144 if (!skill)
1159 { 1145 {
1160 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster))); 1146 op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
1161 return 0; 1147 return 0;
1162 } 1148 }
1163
1164 op->change_skill (skill); /* needed for proper exp credit */
1165 } 1149 }
1166 1150
1167 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam))) 1151 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
1168 return RESULT_INT (0); 1152 return RESULT_INT (0);
1153
1154 // temporaroly replace chosen_skill by skill, we assume skill *could* be applied,
1155 // at least temporarily, which might not be true due to slot restrictions, but hey
1156 // invoke requires it basically.
1157
1158 object *chosen_skill = op->chosen_skill;
1159 op->chosen_skill = skill;
1169 1160
1170 switch (spell_ob->subtype) 1161 switch (spell_ob->subtype)
1171 { 1162 {
1172 /* The order of case statements is same as the order they show up 1163 /* The order of case statements is same as the order they show up
1173 * in spells.h. 1164 * in spells.h.
… …
1324 break; 1315 break;
1325 1316
1326 case SP_MOVING_BALL: 1317 case SP_MOVING_BALL:
1327 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1318 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1328 { 1319 {
1329 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name)); 1320 op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
1330 success = 0; 1321 success = 0;
1331 } 1322 }
1332 else 1323 else
1333 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob); 1324 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1334 break; 1325 break;
… …
1383 break; 1374 break;
1384 1375
1385 default: 1376 default:
1386 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1377 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1387 } 1378 }
1379
1380 // restore chosen_skill
1381 op->chosen_skill = chosen_skill;
1388 1382
1389 op->play_sound ( 1383 op->play_sound (
1390 success 1384 success
1391 ? spell_ob->sound 1385 ? spell_ob->sound
1392 ? spell_ob->sound 1386 ? spell_ob->sound
… …
1457apply_spell_effect (object *spell, object *victim) 1451apply_spell_effect (object *spell, object *victim)
1458{ 1452{
1459 switch (spell->subtype) 1453 switch (spell->subtype)
1460 { 1454 {
1461 case SP_CONE: 1455 case SP_CONE:
1462 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->speed && spell->attacktype) 1456 if (victim->flag [FLAG_ALIVE] && spell->has_active_speed () && spell->attacktype)
1463 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1457 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1464 break; 1458 break;
1465 1459
1466 case SP_MAGIC_MISSILE: 1460 case SP_MAGIC_MISSILE:
1467 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1461 if (victim->flag [FLAG_ALIVE])
1468 { 1462 {
1469 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1463 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1470 spell->destroy (); 1464 spell->destroy ();
1471 } 1465 }
1472 break; 1466 break;
1473 1467
1474 case SP_MOVING_BALL: 1468 case SP_MOVING_BALL:
1475 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1469 if (victim->flag [FLAG_ALIVE])
1476 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1470 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1477 else if (victim->materialname) 1471 else if (victim->material != MATERIAL_NULL)
1478 save_throw_object (victim, spell->attacktype, spell); 1472 save_throw_object (victim, spell->attacktype, spell);
1479 1473
1480 break; 1474 break;
1481 } 1475 }
1482} 1476}
… …
1486 * the victim with a specific maximum level. 1480 * the victim with a specific maximum level.
1487 */ 1481 */
1488void 1482void
1489create_exploding_ball_at (object *victim, int level) 1483create_exploding_ball_at (object *victim, int level)
1490{ 1484{
1491 object *ball = get_archetype (EXPLODING_FIREBALL); 1485 object *ball = archetype::get (EXPLODING_FIREBALL);
1492 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1; 1486 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1493 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2; 1487 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1494 ball->insert_at (victim); 1488 ball->insert_at (victim);
1495} 1489}

Diff Legend

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